Cleanup in FILESDIR

(Portage version: 2.1_pre3-r1)

18 files changed, 36 insertions, 569 deletions

diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog
index a55c376f362c..d144dc85fb57 100644
--- a/www-apps/rt/ChangeLog
+++ b/www-apps/rt/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for www-apps/rt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.28 2006/01/14 01:48:28 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.29 2006/01/26 21:10:33 rl03 Exp $
+
+  26 Jan 2006; Renat Lumpau <rl03@gentoo.org> -files/3.4.2/Callback.patch,
+  -files/3.4.2/postinstall-en.txt, -files/3.4.2/config.layout-gentoo,
+  -files/3.4.2/reconfig, -files/3.4.2/rt.conf.d, -files/3.4.2/rt.init.d,
+  -files/3.4.2/rt_apache.conf, -files/3.4.2/rt_apache1_fcgi.conf,
+  -files/3.4.2/rt_apache2_fcgi.conf, -files/3.4.2/rt_apache2.conf,
+  -files/3.4.4/reconfig, +files/3.4.5/postinstall-en.txt,
+  +files/3.4.5/reconfig, +files/config.layout-gentoo, +files/rt.conf.d,
+  +files/rt.init.d, +files/rt_apache.conf, +files/rt_apache1_fcgi.conf,
+  +files/rt_apache2_fcgi.conf, +files/rt_apache2.conf, -rt-3.4.3.ebuild,
+  -rt-3.4.4.ebuild, rt-3.4.5.ebuild:
+  Cleanup in FILESDIR
 
   14 Jan 2006; Renat Lumpau <rl03@gentoo.org> rt-3.4.5.ebuild:
   Fixed perl deps
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 5866a084456a..e21bf8399fe4 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -1,33 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0b1be3e218fc1ca826a770997bcbd323 ChangeLog 4626
 MD5 15fc088b37155656e008679f3c07eea7 files/3.2.1/postinstall-en.txt 1648
 MD5 ea7fd972eafdc6962d1c3a0cdeba47e7 files/3.2.1/reconfig 1213
-MD5 cee32ca276838f6d74230c66d0bfc961 files/3.4.2/Callback.patch 1567
-MD5 4dcfdbf63b882b398473d975b34fa23e files/3.4.2/config.layout-gentoo 616
-MD5 c915d8b7646d69d0dc32fae2bfaf298a files/3.4.2/postinstall-en.txt 703
-MD5 ab9254622d4be36732c1ed102031a0ce files/3.4.2/reconfig 1231
-MD5 c807deb11e08ab9f37a658bd5e971c7f files/3.4.2/rt.conf.d 405
-MD5 54a1cd04dc0d0788ce920d941e5601d0 files/3.4.2/rt.init.d 1019
-MD5 3d2e627499ec86839cc0099719fcc3bd files/3.4.2/rt_apache.conf 574
-MD5 b54ebbfd3fc1dd2a49d396e3dba2b857 files/3.4.2/rt_apache1_fcgi.conf 990
-MD5 3d2e627499ec86839cc0099719fcc3bd files/3.4.2/rt_apache2.conf 574
-MD5 73c354dd8ba0f64a74e5c6cd01b33834 files/3.4.2/rt_apache2_fcgi.conf 993
-MD5 7255563978025158e1e0df47269d5e72 files/3.4.4/reconfig 1189
+MD5 c915d8b7646d69d0dc32fae2bfaf298a files/3.4.5/postinstall-en.txt 703
+MD5 7255563978025158e1e0df47269d5e72 files/3.4.5/reconfig 1189
+MD5 4dcfdbf63b882b398473d975b34fa23e files/config.layout-gentoo 616
 MD5 5f5c3f76ea4676e743612e38341780fe files/digest-rt-3.2.1 61
-MD5 74849aa771037cfdb03fc4a8b8d01af6 files/digest-rt-3.4.3 61
-MD5 a859c86fce7cdcad017a5858ede1c0e6 files/digest-rt-3.4.4 61
 MD5 2cd305185482550f2c47117bae4aec86 files/digest-rt-3.4.5 61
+MD5 f91285f30264df95da6c80ef43dd2d6e files/rt.conf.d 405
+MD5 5603bfb7291506bb75666f94bc46ec0d files/rt.init.d 1019
+MD5 3d2e627499ec86839cc0099719fcc3bd files/rt_apache.conf 574
+MD5 b54ebbfd3fc1dd2a49d396e3dba2b857 files/rt_apache1_fcgi.conf 990
+MD5 3d2e627499ec86839cc0099719fcc3bd files/rt_apache2.conf 574
+MD5 73c354dd8ba0f64a74e5c6cd01b33834 files/rt_apache2_fcgi.conf 993
 MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
 MD5 939107934a799efb520c62c057341273 rt-3.2.1.ebuild 4362
-MD5 ead23ec5d52fefb7d8ba409ff8302d32 rt-3.4.3.ebuild 5999
-MD5 ec84cbf93ee4b1263f5ad967e4507099 rt-3.4.4.ebuild 5897
-MD5 dea59afd35273a811524b83b8eb3e799 rt-3.4.5.ebuild 5938
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDyFh2EzitwsaoONoRAlF9AJ9or6zjTEyVKNIQm6VSr2QDCfFaqACfRlkb
-lo3LW37nQnAJ9bwnRSBg/vU=
-=QFRV
------END PGP SIGNATURE-----
+MD5 3a94236c95d654d386dab1866fe746a6 rt-3.4.5.ebuild 5882
diff --git a/www-apps/rt/files/3.4.2/Callback.patch b/www-apps/rt/files/3.4.2/Callback.patch
deleted file mode 100644
index e3850e21cfb4..000000000000
--- a/www-apps/rt/files/3.4.2/Callback.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -upr rt-3.4.3/html/Elements/Callback rt-3.4.3_fixed/html/Elements/Callback
---- rt-3.4.3/html/Elements/Callback	2005-02-01 09:20:40.000000000 -0500
-+++ rt-3.4.3_fixed/html/Elements/Callback	2005-10-24 10:13:58.000000000 -0400
-@@ -53,14 +53,27 @@ my $CacheKey = "Callback--$Page--$_Callb
- my $callbacks = $cache{$CacheKey} || $m->notes($CacheKey);
- 
- if (!$callbacks) {
--    my $path = "/Callbacks/*$Page/$_CallbackName";
--
--    $callbacks = [
--        # Skip backup files, and files without a leading package name
--        grep { !/^\.|~$/ and $_ ne "/Callbacks/$Page/$_CallbackName" }
--        $m->interp->resolver->glob_path($path)
--    ];
-+    my $path  = "/Callbacks/*$Page/$_CallbackName";
- 
-+    # Due to API changes after Mason 1.28, we have to check for which
-+    # version we're running when getting the component roots
-+    my @roots = map { $_->[1] }
-+                    $HTML::Mason::VERSION <= 1.28
-+                        ? $m->interp->resolver->comp_root_array
-+                        : $m->interp->comp_root_array;
-+    
-+    my %seen;
-+    
-+    for my $root (@roots) {
-+        push @$callbacks,
-+            # Skip backup files, files without a leading package name,
-+            # and files we've already seen
-+            grep {     !/^\.|~$/
-+                   and $_ ne "/Callbacks/$Page/$_CallbackName"
-+                   and not $seen{$_}++ }
-+                 $m->interp->resolver->glob_path($path, $root);
-+    }
-+    
-     $m->notes($CacheKey => $callbacks);
-     $cache{$Page,$_CallbackName} = $callbacks if !$RT::DevelMode;
- }
diff --git a/www-apps/rt/files/3.4.2/reconfig b/www-apps/rt/files/3.4.2/reconfig
deleted file mode 100644
index 4f69cd0998d4..000000000000
--- a/www-apps/rt/files/3.4.2/reconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-PF=${PN}-${PVR}
-
-die() {
-	echo "#####"
-	echo $1
-	echo "#####"
-	exit 1
-}
-
-if [ $1 = "install" ]; then
-	# fix location
-	cd ${VHOST_ROOT}/${PF}
-	sed -e "s|${MY_HOSTROOTDIR}/${PF}|${VHOST_ROOT}/${PF}|g
-		s|${MY_HTDOCSDIR}|${MY_INSTALLDIR}|g" -i bin/* lib/RT.pm sbin/* etc/RT_Config.pm || die
-
-	# don't fix Apache configs - breaks sandbox
-	# sed -e "s|RT_DIR|${VHOST_ROOT}/${PF}|g
-	#	s|HTDOCS|${MY_INSTALLDIR}|g" -i ${MY_SERVERCONFIGDIR}/apache* || die
-
-	# check for upgrades
-	cd ${VHOST_ROOT}/${PF}/upgrade
-	echo "You may need to update your database."
-	echo "For each item in the output below"
-	echo "whose name is greater than your previously installed RT version,"
-	echo "rt-setup-database --action schema --datadir ${VHOST_ROOT}/${PF}/upgrade/<version>"
-	echo "rt-setup-database --action acl --datadir ${VHOST_ROOT}/${PF}/upgrade/<version>"
-	echo "rt-setup-database --action insert --datadir ${VHOST_ROOT}/${PF}/upgrade/<version>"
-	echo "Don't forget to read the online installation guide for more details"
-	ls
-
-elif [ $1 = "clean" ]; then
-	echo "Please examine the contents of the following directories"
-	echo "and delete anything that is no longer necessary"
-	echo
-	echo ${VHOST_ROOT}/${PF}
-	echo ${MY_INSTALLDIR}
-fi
diff --git a/www-apps/rt/files/3.4.2/postinstall-en.txt b/www-apps/rt/files/3.4.5/postinstall-en.txt
index c77c0a11e922..c77c0a11e922 100644
--- a/www-apps/rt/files/3.4.2/postinstall-en.txt
+++ b/www-apps/rt/files/3.4.5/postinstall-en.txt
diff --git a/www-apps/rt/files/3.4.4/reconfig b/www-apps/rt/files/3.4.5/reconfig
index 6830548da6e8..6830548da6e8 100644
--- a/www-apps/rt/files/3.4.4/reconfig
+++ b/www-apps/rt/files/3.4.5/reconfig
diff --git a/www-apps/rt/files/3.4.2/config.layout-gentoo b/www-apps/rt/files/config.layout-gentoo
index d612b24d1cc7..d612b24d1cc7 100644
--- a/www-apps/rt/files/3.4.2/config.layout-gentoo
+++ b/www-apps/rt/files/config.layout-gentoo
diff --git a/www-apps/rt/files/digest-rt-3.4.3 b/www-apps/rt/files/digest-rt-3.4.3
deleted file mode 100644
index a713d483d3de..000000000000
--- a/www-apps/rt/files/digest-rt-3.4.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 98650a74975bafb8ba952b1cc0a4e42b rt-3.4.3.tar.gz 1400633
diff --git a/www-apps/rt/files/digest-rt-3.4.4 b/www-apps/rt/files/digest-rt-3.4.4
deleted file mode 100644
index dbea74493d34..000000000000
--- a/www-apps/rt/files/digest-rt-3.4.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 769d77eea39006be643cbd2db4820ba3 rt-3.4.4.tar.gz 1393950
diff --git a/www-apps/rt/files/3.4.2/rt.conf.d b/www-apps/rt/files/rt.conf.d
index e43336fa8ecf..5fa292d2aefb 100644
--- a/www-apps/rt/files/3.4.2/rt.conf.d
+++ b/www-apps/rt/files/rt.conf.d
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/files/3.4.2/rt.conf.d,v 1.1 2005/06/21 02:12:38 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/files/rt.conf.d,v 1.1 2006/01/26 21:10:33 rl03 Exp $
 
 # Config file for /etc/init.d/rt
 
@@ -8,7 +8,7 @@ RTUSER=rt
 RTGROUP=lighttpd
 
 # set RTPATH to rt's root
-RTPATH=/var/www/localhost/rt-3.4.2
+RTPATH=/var/www/localhost/rt-3.4.5
 
 FCGI_SOCKET_PATH=${RTPATH}/var/appSocket
 PIDFILE=${RTPATH}/var/pid
diff --git a/www-apps/rt/files/3.4.2/rt.init.d b/www-apps/rt/files/rt.init.d
index 79fafd826bf1..eeaf79e4b4b7 100755..100644
--- a/www-apps/rt/files/3.4.2/rt.init.d
+++ b/www-apps/rt/files/rt.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/files/3.4.2/rt.init.d,v 1.2 2005/06/21 11:09:49 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/files/rt.init.d,v 1.1 2006/01/26 21:10:33 rl03 Exp $
 
 depend() {
 	use mysql postgresql lighttpd
diff --git a/www-apps/rt/files/3.4.2/rt_apache.conf b/www-apps/rt/files/rt_apache.conf
index 896f642c55af..896f642c55af 100644
--- a/www-apps/rt/files/3.4.2/rt_apache.conf
+++ b/www-apps/rt/files/rt_apache.conf
diff --git a/www-apps/rt/files/3.4.2/rt_apache1_fcgi.conf b/www-apps/rt/files/rt_apache1_fcgi.conf
index 0bff8a0556f9..0bff8a0556f9 100644
--- a/www-apps/rt/files/3.4.2/rt_apache1_fcgi.conf
+++ b/www-apps/rt/files/rt_apache1_fcgi.conf
diff --git a/www-apps/rt/files/3.4.2/rt_apache2.conf b/www-apps/rt/files/rt_apache2.conf
index 896f642c55af..896f642c55af 100644
--- a/www-apps/rt/files/3.4.2/rt_apache2.conf
+++ b/www-apps/rt/files/rt_apache2.conf
diff --git a/www-apps/rt/files/3.4.2/rt_apache2_fcgi.conf b/www-apps/rt/files/rt_apache2_fcgi.conf
index aa6ccdc9a04e..aa6ccdc9a04e 100644
--- a/www-apps/rt/files/3.4.2/rt_apache2_fcgi.conf
+++ b/www-apps/rt/files/rt_apache2_fcgi.conf
diff --git a/www-apps/rt/rt-3.4.3.ebuild b/www-apps/rt/rt-3.4.3.ebuild
deleted file mode 100644
index b31f57103990..000000000000
--- a/www-apps/rt/rt-3.4.3.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.4.3.ebuild,v 1.8 2005/11/20 16:50:38 stuart Exp $
-
-inherit webapp eutils
-
-IUSE="mysql postgres fastcgi apache2 lighttpd"
-
-DESCRIPTION="RT is an enterprise-grade ticketing system"
-HOMEPAGE="http://www.bestpractical.com/rt/"
-SRC_URI="http://download.bestpractical.com/pub/${PN}/release/${P}.tar.gz
-	ftp://ftp.eu.uu.net/pub/unix/ticketing/${PN}/release/${P}.tar.gz
-	ftp://rhinst.ece.cmu.edu/${PN}/release/${P}.tar.gz"
-
-KEYWORDS="~ppc ~x86"
-
-DEPEND="
-	>=dev-lang/perl-5.8.3
-	>=dev-perl/Params-Validate-0.02
-	dev-perl/Cache-Cache
-	>=dev-perl/Exception-Class-1.14
-	perl-core/CGI
-	>dev-perl/HTML-Mason-1.28
-	dev-perl/MLDBM
-	dev-perl/FreezeThaw
-	>=dev-perl/Apache-Session-1.53
-	>=dev-perl/XML-RSS-1.05
-	>=dev-perl/HTTP-Server-Simple-0.07
-	>=dev-perl/HTTP-Server-Simple-Mason-0.05
-	dev-perl/HTML-Tree
-	dev-perl/HTML-Format
-	dev-perl/libwww-perl
-	>=dev-perl/DBI-1.37
-	dev-perl/Test-Inline
-	>=dev-perl/class-returnvalue-0.40
-	>=dev-perl/dbix-searchbuilder-1.27
-	dev-perl/text-template
-	dev-perl/HTML-Parser
-	>=dev-perl/HTML-Scrubber-0.08
-	>=dev-perl/log-dispatch-2.0
-	>=dev-perl/locale-maketext-lexicon-0.32
-	dev-perl/locale-maketext-fuzzy
-	>=dev-perl/MIME-tools-5.417
-	>=dev-perl/MailTools-1.60
-	dev-perl/text-wrapper
-	dev-perl/Text-WikiFormat
-	dev-perl/Time-modules
-	dev-perl/TermReadKey
-	>=dev-perl/Text-Quoted-1.3
-	>=dev-perl/Tree-Simple-1.04
-	dev-perl/Module-Versions-Report
-	dev-perl/Cache-Simple-TimedExpiry
-	dev-perl/XML-Simple
-	dev-perl/regexp-common
-	dev-perl/WWW-Mechanize
-	dev-perl/Test-WWW-Mechanize
-	dev-perl/Module-Refresh
-
-	dev-perl/Font-AFM
-	dev-perl/text-autoformat
-	dev-perl/text-reform
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/mta
-	mysql? ( >=dev-db/mysql-4.0.13 >=dev-perl/DBD-mysql-2.1018 )
-	postgres? ( >=dev-db/postgresql-7.4.2-r1 >=dev-perl/DBD-Pg-1.41 )
-	!lighttpd? (
-		>=dev-perl/Apache-DBI-0.92
-		apache2? ( >=net-www/apache-2
-			fastcgi? ( dev-perl/FCGI net-www/mod_fastcgi )
-			!fastcgi? ( >=www-apache/libapreq2-2.06 ) )
-		!apache2? ( =net-www/apache-1*
-			fastcgi? ( dev-perl/FCGI net-www/mod_fastcgi )
-			!fastcgi? ( =www-apache/libapreq-1* ) ) )
-	lighttpd? (
-		>=www-servers/lighttpd-1.3.13
-		dev-perl/FCGI )
-"
-
-LICENSE="GPL-2"
-
-add_user_rt() {
-	# add new user
-	# suexec2 requires uid >= 1000; enewuser is of no help here
-	# From: Mike Frysinger <vapier@gentoo.org>
-	# Date: Fri, 17 Jun 2005 08:41:44 -0400
-	# i'd pick a 5 digit # if i were you
-
-	local euser="rt"
-
-	# first check if username rt exists
-	if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
-		# check uid
-		rt_uid=$(egetent passwd "${euser}" | cut -d: -f3)
-		if $(expr ${rt_uid} '<' 1000 > /dev/null); then
-			ewarn "uid of user rt is less than 1000. suexec2 will not work."
-			ewarn "If you want to use FastCGI, please delete the user 'rt'"
-			ewarn "from your system and re-emerge www-apps/rt"
-			epause
-		fi
-		return 0 # all is well
-	fi
-
-	# add user
-	# stolen from enewuser
-	local pwrange euid
-
-	pwrange=$(seq 10001 11001)
-	for euid in ${pwrange} ; do
-		[[ -z $(egetent passwd ${euid}) ]] && break
-	done
-	if [[ ${euid} == "11001" ]]; then
-		# she gets around, doesn't she?
-		die "No available uid's found"
-	fi
-
-	einfo " - Userid: ${euid}"
-
-	enewuser rt ${euid} -1 /dev/null rt > /dev/null
-	return 0
-}
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if useq mysql; then
-		ewarn "RT needs MySQL with innodb support"
-	fi
-	ewarn
-	ewarn "If you are upgrading from an existing _RT2_ installation,"
-	ewarn "stop this ebuild (Ctrl-C now), download the upgrade tool,"
-	ewarn "http://bestpractical.com/pub/rt/devel/rt2-to-rt3.tar.gz"
-	ewarn "and follow the included instructions."
-	ewarn
-	enewgroup rt >/dev/null
-	add_user_rt || die "Could not add user"
-
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/3.4.2/Callback.patch # fix for bug #109745
-
-	# add Gentoo-specific layout
-	cat ${FILESDIR}/3.4.2/config.layout-gentoo >> config.layout
-	sed -e "s|PREFIX|${D}/${MY_HOSTROOTDIR}/${PF}|
-			s|HTMLDIR|${D}/${MY_HTDOCSDIR}|g" -i ./config.layout || die
-
-	# don't need to check dev dependencies
-	sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" -i sbin/rt-test-dependencies.in || die
-}
-
-src_compile() {
-
-	local web="apache"
-	if useq lighttpd; then
-		web="lighttpd"
-	fi
-
-	./configure --enable-layout=Gentoo \
-		--with-bin-owner=rt \
-		--with-libs-owner=rt \
-		--with-libs-group=rt \
-		--with-rt-group=rt \
-		--with-web-user=${web} \
-		--with-web-group=${web}
-
-	# check for missing deps and ask to report if something is broken
-	local myconf="--verbose $(use_with mysql) \
-		$(use_with postgres pg) \
-		$(use_with fastcgi) \
-		$(use_with lighttpd fastcgi)"
-	if ! useq fastcgi && ! useq lighttpd; then
-		myconf="${myconf} $(use_with apache2 modperl2)"
-		! useq apache2 && myconf="${myconf} --with-modperl1"
-	fi
-
-	/usr/bin/perl ./sbin/rt-test-dependencies ${myconf} > ${T}/t
-	if grep -q "MISSING" ${T}/t; then
-		ewarn "Missing Perl dependency!"
-		ewarn
-		cat ${T}/t
-		ewarn
-		ewarn "Please file a bug in the Gentoo Bugzilla with the information above"
-		ewarn "and assign it to rl03@gentoo.org"
-		die "Missing dependencies."
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	make install
-
-	# make sure we don't clobber existing site configuration
-	rm -f ${D}/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
-
-	# copy upgrade files
-	cp -R etc/upgrade ${D}/${MY_HOSTROOTDIR}/${PF}
-
-	cd ${D}
-	grep -Rl "${D}" * | xargs dosed
-
-	if useq lighttpd; then
-		newinitd ${FILESDIR}/3.4.2/${PN}.init.d ${PN}
-		insinto /etc/conf.d
-		newins ${FILESDIR}/3.4.2/${PN}.conf.d ${PN}
-	else
-		if useq apache2; then
-			webapp_server_configfile apache2 ${FILESDIR}/3.4.2/rt_apache2_fcgi.conf
-		else
-			webapp_server_configfile apache1 ${FILESDIR}/3.4.2/rt_apache.conf
-			webapp_server_configfile apache1 ${FILESDIR}/3.4.2/rt_apache1_fcgi.conf
-		fi
-	fi
-	webapp_postinst_txt en ${FILESDIR}/3.4.2/postinstall-en.txt
-	webapp_hook_script ${FILESDIR}/3.4.2/reconfig
-	webapp_src_install
-}
diff --git a/www-apps/rt/rt-3.4.4.ebuild b/www-apps/rt/rt-3.4.4.ebuild
deleted file mode 100644
index cb94c411aa36..000000000000
--- a/www-apps/rt/rt-3.4.4.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.4.4.ebuild,v 1.1 2005/12/04 16:19:15 rl03 Exp $
-
-inherit webapp eutils
-
-IUSE="mysql postgres fastcgi apache2 lighttpd"
-
-DESCRIPTION="RT is an enterprise-grade ticketing system"
-HOMEPAGE="http://www.bestpractical.com/rt/"
-SRC_URI="http://download.bestpractical.com/pub/${PN}/release/${P}.tar.gz"
-
-KEYWORDS="~ppc ~x86"
-
-DEPEND="
-	>=dev-lang/perl-5.8.3
-	>=dev-perl/Params-Validate-0.02
-	dev-perl/Cache-Cache
-	>=dev-perl/Exception-Class-1.14
-	>=perl-core/Digest-MD5-2.27
-	>=perl-core/Storable-2.08
-	perl-core/CGI
-	>dev-perl/HTML-Mason-1.28
-	dev-perl/MLDBM
-	dev-perl/FreezeThaw
-	>=dev-perl/Apache-Session-1.53
-	>=dev-perl/XML-RSS-1.05
-	>=dev-perl/HTTP-Server-Simple-0.07
-	>=dev-perl/HTTP-Server-Simple-Mason-0.09
-	dev-perl/HTML-Tree
-	dev-perl/HTML-Format
-	dev-perl/libwww-perl
-	>=dev-perl/DBI-1.37
-	dev-perl/Test-Inline
-	>=dev-perl/class-returnvalue-0.40
-	>=dev-perl/dbix-searchbuilder-1.27
-	dev-perl/text-template
-	dev-perl/HTML-Parser
-	>=dev-perl/HTML-Scrubber-0.08
-	>=perl-core/File-Spec-0.8
-	>=dev-perl/log-dispatch-2.0
-	>=dev-perl/locale-maketext-lexicon-0.32
-	dev-perl/locale-maketext-fuzzy
-	>=dev-perl/MIME-tools-5.417
-	>=dev-perl/MailTools-1.60
-	dev-perl/text-wrapper
-	dev-perl/Text-WikiFormat
-	dev-perl/Time-modules
-	dev-perl/TermReadKey
-	>=dev-perl/Text-Quoted-1.3
-	>=dev-perl/Tree-Simple-1.04
-	dev-perl/Module-Versions-Report
-	dev-perl/Cache-Simple-TimedExpiry
-	dev-perl/XML-Simple
-	dev-perl/regexp-common
-	dev-perl/WWW-Mechanize
-	dev-perl/Test-WWW-Mechanize
-	dev-perl/Module-Refresh
-
-	dev-perl/Font-AFM
-	dev-perl/text-autoformat
-	dev-perl/text-reform
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/mta
-	mysql? ( >=dev-db/mysql-4.0.13 >=dev-perl/DBD-mysql-2.1018 )
-	postgres? ( >=dev-db/postgresql-7.4.2-r1 >=dev-perl/DBD-Pg-1.41 )
-	!lighttpd? (
-		>=dev-perl/Apache-DBI-0.92
-		apache2? ( >=net-www/apache-2
-			fastcgi? ( dev-perl/FCGI net-www/mod_fastcgi )
-			!fastcgi? ( >=www-apache/libapreq2-2.06
-						>=dev-perl/HTML-Mason-1.31 ) )
-		!apache2? ( =net-www/apache-1*
-			fastcgi? ( dev-perl/FCGI net-www/mod_fastcgi )
-			!fastcgi? ( =www-apache/libapreq-1* ) ) )
-	lighttpd? (
-		>=www-servers/lighttpd-1.3.13
-		dev-perl/FCGI )
-"
-
-LICENSE="GPL-2"
-
-add_user_rt() {
-	# add new user
-	# suexec2 requires uid >= 1000; enewuser is of no help here
-	# From: Mike Frysinger <vapier@gentoo.org>
-	# Date: Fri, 17 Jun 2005 08:41:44 -0400
-	# i'd pick a 5 digit # if i were you
-
-	local euser="rt"
-
-	# first check if username rt exists
-	if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
-		# check uid
-		rt_uid=$(egetent passwd "${euser}" | cut -d: -f3)
-		if $(expr ${rt_uid} '<' 1000 > /dev/null); then
-			ewarn "uid of user rt is less than 1000. suexec2 will not work."
-			ewarn "If you want to use FastCGI, please delete the user 'rt'"
-			ewarn "from your system and re-emerge www-apps/rt"
-			epause
-		fi
-		return 0 # all is well
-	fi
-
-	# add user
-	# stolen from enewuser
-	local pwrange euid
-
-	pwrange=$(seq 10001 11001)
-	for euid in ${pwrange} ; do
-		[[ -z $(egetent passwd ${euid}) ]] && break
-	done
-	if [[ ${euid} == "11001" ]]; then
-		# she gets around, doesn't she?
-		die "No available uid's found"
-	fi
-
-	einfo " - Userid: ${euid}"
-
-	enewuser rt ${euid} -1 /dev/null rt > /dev/null
-	return 0
-}
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if useq mysql; then
-		ewarn "RT needs MySQL with innodb support"
-	fi
-	ewarn
-	ewarn "If you are upgrading from an existing _RT2_ installation,"
-	ewarn "stop this ebuild (Ctrl-C now), download the upgrade tool,"
-	ewarn "http://bestpractical.com/pub/rt/devel/rt2-to-rt3.tar.gz"
-	ewarn "and follow the included instructions."
-	ewarn
-	epause 5
-	enewgroup rt >/dev/null
-	add_user_rt || die "Could not add user"
-
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# add Gentoo-specific layout
-	cat ${FILESDIR}/3.4.2/config.layout-gentoo >> config.layout
-	sed -e "s|PREFIX|${D}/${MY_HOSTROOTDIR}/${PF}|
-			s|HTMLDIR|${D}/${MY_HTDOCSDIR}|g" -i ./config.layout || die
-
-	# don't need to check dev dependencies
-	sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" -i sbin/rt-test-dependencies.in || die
-}
-
-src_compile() {
-
-	local web="apache"
-	if useq lighttpd; then
-		web="lighttpd"
-	fi
-
-	./configure --enable-layout=Gentoo \
-		--with-bin-owner=rt \
-		--with-libs-owner=rt \
-		--with-libs-group=rt \
-		--with-rt-group=rt \
-		--with-web-user=${web} \
-		--with-web-group=${web}
-
-	# check for missing deps and ask to report if something is broken
-	local myconf="--verbose $(use_with mysql) \
-		$(use_with postgres pg) \
-		$(use_with fastcgi) \
-		$(use_with lighttpd fastcgi)"
-	if ! useq fastcgi && ! useq lighttpd; then
-		myconf="${myconf} $(use_with apache2 modperl2)"
-		! useq apache2 && myconf="${myconf} --with-modperl1"
-	fi
-
-	/usr/bin/perl ./sbin/rt-test-dependencies ${myconf} > ${T}/t
-	if grep -q "MISSING" ${T}/t; then
-		ewarn "Missing Perl dependency!"
-		ewarn
-		cat ${T}/t
-		ewarn
-		ewarn "Please file a bug in the Gentoo Bugzilla with the information above"
-		ewarn "and assign it to rl03@gentoo.org"
-		die "Missing dependencies."
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	make install
-
-	# make sure we don't clobber existing site configuration
-	rm -f ${D}/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
-
-	# copy upgrade files
-	cp -R etc/upgrade ${D}/${MY_HOSTROOTDIR}/${PF}
-
-	cd ${D}
-	grep -Rl "${D}" * | xargs dosed
-
-	if useq lighttpd; then
-		newinitd ${FILESDIR}/3.4.2/${PN}.init.d ${PN}
-		insinto /etc/conf.d
-		newins ${FILESDIR}/3.4.2/${PN}.conf.d ${PN}
-	else
-		if useq apache2; then
-			local CONF="rt_apache2_fcgi.conf rt_apache2.conf"
-		else
-			local CONF="rt_apache1_fcgi.conf rt_apache.conf"
-		fi
-		cd ${FILESDIR}/3.4.2
-		cp ${CONF} ${D}/${MY_HOSTROOTDIR}/${PF}/etc
-	fi
-	webapp_postinst_txt en ${FILESDIR}/3.4.2/postinstall-en.txt
-	webapp_hook_script ${FILESDIR}/3.4.4/reconfig
-	webapp_src_install
-}
diff --git a/www-apps/rt/rt-3.4.5.ebuild b/www-apps/rt/rt-3.4.5.ebuild
index f9b6f83610c7..b74447e4f239 100644
--- a/www-apps/rt/rt-3.4.5.ebuild
+++ b/www-apps/rt/rt-3.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.4.5.ebuild,v 1.2 2006/01/14 01:48:28 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.4.5.ebuild,v 1.3 2006/01/26 21:10:33 rl03 Exp $
 
 inherit webapp eutils
 
@@ -135,9 +135,7 @@ add_user_rt() {
 pkg_setup() {
 	webapp_pkg_setup
 
-	if useq mysql; then
-		ewarn "RT needs MySQL with innodb support"
-	fi
+	use mysql && ewarn "RT needs MySQL with innodb support"
 	ewarn
 	ewarn "If you are upgrading from an existing _RT2_ installation,"
 	ewarn "stop this ebuild (Ctrl-C now), download the upgrade tool,"
@@ -155,7 +153,7 @@ src_unpack() {
 	cd ${S}
 
 	# add Gentoo-specific layout
-	cat ${FILESDIR}/3.4.2/config.layout-gentoo >> config.layout
+	cat ${FILESDIR}/config.layout-gentoo >> config.layout
 	sed -e "s|PREFIX|${D}/${MY_HOSTROOTDIR}/${PF}|
 			s|HTMLDIR|${D}/${MY_HTDOCSDIR}|g" -i ./config.layout || die
 
@@ -215,19 +213,17 @@ src_install() {
 	grep -Rl "${D}" * | xargs dosed
 
 	if useq lighttpd; then
-		newinitd ${FILESDIR}/3.4.2/${PN}.init.d ${PN}
-		insinto /etc/conf.d
-		newins ${FILESDIR}/3.4.2/${PN}.conf.d ${PN}
+		newinitd ${FILESDIR}/${PN}.init.d ${PN}
+		newconfd ${FILESDIR}/${PN}.conf.d ${PN}
 	else
 		if useq apache2; then
 			local CONF="rt_apache2_fcgi.conf rt_apache2.conf"
 		else
 			local CONF="rt_apache1_fcgi.conf rt_apache.conf"
 		fi
-		cd ${FILESDIR}/3.4.2
-		cp ${CONF} ${D}/${MY_HOSTROOTDIR}/${PF}/etc
+		cd ${FILESDIR} && cp ${CONF} ${D}/${MY_HOSTROOTDIR}/${PF}/etc
 	fi
-	webapp_postinst_txt en ${FILESDIR}/3.4.2/postinstall-en.txt
-	webapp_hook_script ${FILESDIR}/3.4.4/reconfig
+	webapp_postinst_txt en ${FILESDIR}/${PN}/postinstall-en.txt
+	webapp_hook_script ${FILESDIR}/${PN}/reconfig
 	webapp_src_install
 }