Added proper FastCGI support for Apache1 and Apache2. Added lighttpd support.

Package-Manager: portage-2.0.51.22-r1

16 files changed, 402 insertions, 30 deletions

diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog
index b872fa797830..4a2281931113 100644
--- a/www-apps/rt/ChangeLog
+++ b/www-apps/rt/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for www-apps/rt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.10 2005/06/15 13:25:49 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.11 2005/06/21 02:12:38 rl03 Exp $
+
+*rt-3.4.2-r1 (21 Jun 2005)
+
+  21 Jun 2005; Renat Lumpau <rl03@gentoo.org> +files/3.2.1/reconfig,
+  +files/3.4.2/config.layout-gentoo, -files/reconfig-3.4.2,
+  +files/3.4.2/postinstall-en.txt, +files/3.2.1/postinstall-en.txt,
+  +files/3.4.2/reconfig, -files/postinstall-en-3.4.2.txt,
+  +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/config.layout-gentoo,
+  -files/postinstall-en.txt, -files/reconfig, -files/rt_apache.conf,
+  rt-3.2.1.ebuild, rt-3.4.2.ebuild, +rt-3.4.2-r1.ebuild:
+  Added proper FastCGI support for Apache1 and Apache2. Added lighttpd support.
 
   15 Jun 2005; David Holm <dholm@gentoo.org> rt-3.4.2.ebuild:
   Added to ~ppc.
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 8dbccf72febb..60184a9658d2 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -1,12 +1,28 @@
-MD5 b3631336bddd3dc491992fda6d70d558 ChangeLog 1808
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ad78ebb8d4f31942a62a147457ca3140 rt-3.4.2-r1.ebuild 5357
+MD5 e28b5c19f33196d18983e2db57aad44f rt-3.2.1.ebuild 4217
+MD5 36a06c6979f2d93df52d5f5867fd96ee rt-3.4.2.ebuild 3722
+MD5 62980925acc10af7bc396248dbbdb854 ChangeLog 2479
 MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
-MD5 1c784be45b571bfad5f6d6a78b9ed335 rt-3.2.1.ebuild 4204
-MD5 61ac7b350e4a8824b4429dd092219890 rt-3.4.2.ebuild 3711
+MD5 af335c7cab7bfc09dbd08feba51d2879 files/digest-rt-3.4.2-r1 61
 MD5 5f5c3f76ea4676e743612e38341780fe files/digest-rt-3.2.1 61
-MD5 15fc088b37155656e008679f3c07eea7 files/postinstall-en.txt 1648
-MD5 0706d6edcd1c4e23f526d611c9c6b531 files/reconfig 1170
-MD5 4dcfdbf63b882b398473d975b34fa23e files/config.layout-gentoo 616
 MD5 af335c7cab7bfc09dbd08feba51d2879 files/digest-rt-3.4.2 61
-MD5 f10e5a91df99b3628925509bad35efe0 files/postinstall-en-3.4.2.txt 689
-MD5 cb9bc69c23176e3d72d89f7b04461864 files/reconfig-3.4.2 1345
-MD5 85b9344f8e24073b64ab0ecc09033691 files/rt_apache.conf 406
+MD5 15fc088b37155656e008679f3c07eea7 files/3.2.1/postinstall-en.txt 1648
+MD5 0706d6edcd1c4e23f526d611c9c6b531 files/3.2.1/reconfig 1170
+MD5 4dcfdbf63b882b398473d975b34fa23e files/3.4.2/config.layout-gentoo 616
+MD5 b54ebbfd3fc1dd2a49d396e3dba2b857 files/3.4.2/rt_apache1_fcgi.conf 990
+MD5 efba744a8f997643ae37f912ac0d72db files/3.4.2/postinstall-en.txt 687
+MD5 3d2e627499ec86839cc0099719fcc3bd files/3.4.2/rt_apache.conf 574
+MD5 c807deb11e08ab9f37a658bd5e971c7f files/3.4.2/rt.conf.d 405
+MD5 2a44970aa65730024c61a5cb50323cb3 files/3.4.2/rt.init.d 968
+MD5 1be40f6b7f40406cd2a9dfcd25483357 files/3.4.2/reconfig 1303
+MD5 73c354dd8ba0f64a74e5c6cd01b33834 files/3.4.2/rt_apache2_fcgi.conf 993
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCt3enEzitwsaoONoRAqBVAJ47NmsZEPfxZyNX3AzfmvVBPP0iDACg0XTz
+wFCkyzvwOXr5wFr4OGQU9mk=
+=q4mE
+-----END PGP SIGNATURE-----
diff --git a/www-apps/rt/files/postinstall-en.txt b/www-apps/rt/files/3.2.1/postinstall-en.txt
index e2f9ad510ff6..e2f9ad510ff6 100644
--- a/www-apps/rt/files/postinstall-en.txt
+++ b/www-apps/rt/files/3.2.1/postinstall-en.txt
diff --git a/www-apps/rt/files/reconfig b/www-apps/rt/files/3.2.1/reconfig
index 7f831600df69..7f831600df69 100644
--- a/www-apps/rt/files/reconfig
+++ b/www-apps/rt/files/3.2.1/reconfig
diff --git a/www-apps/rt/files/config.layout-gentoo b/www-apps/rt/files/3.4.2/config.layout-gentoo
index d612b24d1cc7..d612b24d1cc7 100644
--- a/www-apps/rt/files/config.layout-gentoo
+++ b/www-apps/rt/files/3.4.2/config.layout-gentoo
diff --git a/www-apps/rt/files/postinstall-en-3.4.2.txt b/www-apps/rt/files/3.4.2/postinstall-en.txt
index a9b11f7fca0a..821fbb28b410 100644
--- a/www-apps/rt/files/postinstall-en-3.4.2.txt
+++ b/www-apps/rt/files/3.4.2/postinstall-en.txt
@@ -15,5 +15,5 @@ If you need more help, consider searching the mailing list (Google site:lists.fs
 NOTE:
 
 Some file locations have changed. Everything is now installed into
-${VHOST_ROOT}. RT executables are no longer in /usr/bin. 
+${VHOST_ROOT}. RT executables are no longer in /usr/bin
 You may need to modify your existing configuration files accordingly.
diff --git a/www-apps/rt/files/reconfig-3.4.2 b/www-apps/rt/files/3.4.2/reconfig
index 8e7f12449da3..f2fdfe0451dc 100644
--- a/www-apps/rt/files/reconfig-3.4.2
+++ b/www-apps/rt/files/3.4.2/reconfig
@@ -3,13 +3,11 @@ if [ $1 = "install" ]; then
 	# fix location
 	cd ${VHOST_ROOT}/${P}
 	sed -e "s|${MY_HOSTROOTDIR}/${P}|${VHOST_ROOT}/${P}|g
-		s|${MY_HTDOCSDIR}|${MY_INSTALLDIR}|g" -i bin/* lib/RT.pm sbin/*
+		s|${MY_HTDOCSDIR}|${MY_INSTALLDIR}|g" -i bin/* lib/RT.pm sbin/* etc/RT_Config.pm
 
-	# fix Apache config
-	sed -e "s|WEBMUX|${VHOST_ROOT}/${P}/bin/webmux.pl|" -i ${MY_SERVERCONFIGDIR}/apache1-rt_apache.conf
-
-	# fix permissions
-	chown -R  ${VHOST_SERVER_GID}:${VHOST_SERVER_UID} ${VHOST_ROOT}/${P}/var
+	# fix Apache configs
+	sed -e "s|RT_DIR|${VHOST_ROOT}/${P}|g
+		s|HTDOCS|${MY_INSTALLDIR}|g" -i ${MY_SERVERCONFIGDIR}/apache*
 
 	# check for upgrades
 	cd ${VHOST_ROOT}/${P}/upgrade
@@ -28,8 +26,8 @@ elif [ $1 = "clean" ]; then
 	MY_PN=$(basename $(dirname $(dirname ${MY_HOSTROOTDIR})))
 	MY_P="${MY_PN}-${MY_PV}"
 
-	if [ ! "${VHOST_ROOT}${MY_P}a" = "a" ]; then 
-		rm -rf ${VHOST_ROOT}/${MY_P}/bin ${VHOST_ROOT}/${MY_P}/lib/RT.pm ${VHOST_ROOT}/${MY_P}/sbin
+	if [[ "${VHOST_ROOT}${MY_P}" ]]; then 
+		rm -rf ${VHOST_ROOT}/${MY_P}/bin ${VHOST_ROOT}/${MY_P}/lib/RT.pm ${VHOST_ROOT}/${MY_P}/sbin ${VHOST_ROOT}/${MY_P}/etc/RT_Config.pm
 	else
 		echo "Variables not set!"
 	fi
diff --git a/www-apps/rt/files/3.4.2/rt.conf.d b/www-apps/rt/files/3.4.2/rt.conf.d
new file mode 100644
index 000000000000..e43336fa8ecf
--- /dev/null
+++ b/www-apps/rt/files/3.4.2/rt.conf.d
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 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 $
+
+# Config file for /etc/init.d/rt
+
+RTUSER=rt
+RTGROUP=lighttpd
+
+# set RTPATH to rt's root
+RTPATH=/var/www/localhost/rt-3.4.2
+
+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/3.4.2/rt.init.d
new file mode 100755
index 000000000000..a19aa0ffa51a
--- /dev/null
+++ b/www-apps/rt/files/3.4.2/rt.init.d
@@ -0,0 +1,38 @@
+#!/sbin/runscript
+# Copyright 1999-2005 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.1 2005/06/21 02:12:38 rl03 Exp $
+
+depend() {
+	use mysql postgresql lighttpd
+}
+
+start() {
+	ebegin "Starting RT"
+	rm -f ${FCGI_SOCKET_PATH}
+	env -i PATH=$PATH FCGI_SOCKET_PATH=${FCGI_SOCKET_PATH}\
+		/sbin/start-stop-daemon -o --quiet --start \
+		--startas ${RTPATH}/bin/mason_handler.fcgi \
+		--pidfile ${PIDFILE} -c ${RTUSER} -g ${RTGROUP} -b -d ${RTPATH}
+	# if you experience problems, comment out the line above
+	# and uncomment the line below
+	# --pidfile ${PIDFILE} -c ${RTUSER} -g ${RTGROUP}  -d ${RTPATH}
+
+	eend $?
+	while true; do
+		[[ -a ${FCGI_SOCKET_PATH} ]] && break
+		sleep 1
+	done
+	chmod g+rwx ${FCGI_SOCKET_PATH}
+}
+
+stop() {
+	ebegin "Stopping RT"
+	/sbin/start-stop-daemon -o --quiet --stop --pidfile ${PIDFILE}
+	eend $?
+}
+
+restart() {
+	svc_stop
+	svc_start
+}
diff --git a/www-apps/rt/files/rt_apache.conf b/www-apps/rt/files/3.4.2/rt_apache.conf
index bea5ffc493c0..896f642c55af 100644
--- a/www-apps/rt/files/rt_apache.conf
+++ b/www-apps/rt/files/3.4.2/rt_apache.conf
@@ -2,14 +2,16 @@
     <VirtualHost MY_RT_DOMAIN:80>
         ServerName MY_RT_DOMAIN
 
-        DocumentRoot DOCUMENT_ROOT
+        DocumentRoot HTDOCS
 	ServerAdmin YOUR_EMAIL_HERE
 
         AddDefaultCharset UTF-8
-        UserDir disabled
+	<IfDefine USERDIR>
+	        UserDir disabled
+	</IfDefine>
  
         PerlModule Apache::DBI
-        PerlRequire WEBMUX
+        PerlRequire RT_DIR/bin/webmux.pl
  
 	<Location />
 		SetHandler perl-script
@@ -17,5 +19,12 @@
 		PerlSetEnv PERL5LIB /usr/lib
 	</Location>
 
+	<Directory "HTDOCS">
+		Options Indexes FollowSymLinks
+		AllowOverride None
+		Order allow,deny
+		Allow from all
+	</Directory>
+
     </VirtualHost>
 </IfDefine>
diff --git a/www-apps/rt/files/3.4.2/rt_apache1_fcgi.conf b/www-apps/rt/files/3.4.2/rt_apache1_fcgi.conf
new file mode 100644
index 000000000000..0bff8a0556f9
--- /dev/null
+++ b/www-apps/rt/files/3.4.2/rt_apache1_fcgi.conf
@@ -0,0 +1,41 @@
+<IfDefine FASTCGI>
+
+	# Tell FastCGI to put its temporary files somewhere sane.
+	FastCgiIpcDir /tmp
+
+	# Tell FastCGI that it should use apache's "suexec" binary to call any FastCGI script.
+	# This is a GLOBAL setting
+	FastCgiWrapper /usr/sbin/suexec
+
+	# Apache 1.3 discards the user and group parameters on the FastCgiServer line.
+	# Apache 2.0 requires them.
+	FastCgiServer RT_DIR/bin/mason_handler.fcgi -idle-timeout 120 -user rt -group rt -processes 4
+
+
+	<VirtualHost MY_RT_DOMAIN:80>
+		ServerName MY_RT_DOMAIN
+		
+		DocumentRoot HTDOCS
+		ServerAdmin YOUR_EMAIL_HERE
+
+		AddDefaultCharset UTF-8
+		<IfDefine USERDIR>
+			UserDir disabled
+		</IfDefine>
+
+		# Set the rt user and group as the executing user for this virtual host
+		User rt
+		Group rt
+
+		AddHandler fastcgi-script fcgi
+		ScriptAlias / RT_DIR/bin/mason_handler.fcgi/
+
+		 <Directory "HTDOCS">
+			Options Indexes FollowSymLinks
+			AllowOverride None
+			Order allow,deny
+			Allow from all
+		</Directory>
+
+	</VirtualHost>
+</IfDefine>
diff --git a/www-apps/rt/files/3.4.2/rt_apache2_fcgi.conf b/www-apps/rt/files/3.4.2/rt_apache2_fcgi.conf
new file mode 100644
index 000000000000..aa6ccdc9a04e
--- /dev/null
+++ b/www-apps/rt/files/3.4.2/rt_apache2_fcgi.conf
@@ -0,0 +1,39 @@
+<IfDefine FASTCGI>
+
+	# Tell FastCGI to put its temporary files somewhere sane.
+	FastCgiIpcDir /tmp
+
+	# Tell FastCGI that it should use apache's "suexec" binary to call any FastCGI script.
+	# This is a GLOBAL setting
+	FastCgiWrapper /usr/sbin/suexec2
+
+	# Apache 1.3 discards the user and group parameters on the FastCgiServer line.
+	# Apache 2.0 requires them.
+	FastCgiServer RT_DIR/bin/mason_handler.fcgi -idle-timeout 120 -user rt -group rt -processes 4
+
+
+	<VirtualHost MY_RT_DOMAIN:80>
+		ServerName MY_RT_DOMAIN
+		
+		DocumentRoot HTDOCS
+		ServerAdmin YOUR_EMAIL_HERE
+
+		AddDefaultCharset UTF-8
+		<IfDefine USERDIR>
+			UserDir disabled
+		</IfDefine>
+
+		# Set the rt user and group as the executing user for this virtual host
+		SuexecUserGroup rt rt
+		AddHandler fastcgi-script fcgi
+		ScriptAlias / RT_DIR/bin/mason_handler.fcgi/
+
+		 <Directory "HTDOCS">
+			Options Indexes FollowSymLinks
+			AllowOverride None
+			Order allow,deny
+			Allow from all
+		</Directory>
+
+	</VirtualHost>
+</IfDefine>
diff --git a/www-apps/rt/files/digest-rt-3.4.2-r1 b/www-apps/rt/files/digest-rt-3.4.2-r1
new file mode 100644
index 000000000000..550fde369b98
--- /dev/null
+++ b/www-apps/rt/files/digest-rt-3.4.2-r1
@@ -0,0 +1 @@
+MD5 a50158055fff423a557d43335ae1dc81 rt-3.4.2.tar.gz 1359775
diff --git a/www-apps/rt/rt-3.2.1.ebuild b/www-apps/rt/rt-3.2.1.ebuild
index c2945ad910a2..4f7bbaa08762 100644
--- a/www-apps/rt/rt-3.2.1.ebuild
+++ b/www-apps/rt/rt-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.1.ebuild,v 1.5 2005/05/10 00:24:12 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.2.1.ebuild,v 1.6 2005/06/21 02:12:38 rl03 Exp $
 
 inherit webapp eutils
 
@@ -140,7 +140,7 @@ src_install() {
 	grep -Rl "${D}" * | xargs dosed
 	chmod +r ${D}/${MY_HOSTROOTDIR}/rt-config/RT*
 
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_hook_script ${FILESDIR}/reconfig
+	webapp_postinst_txt en ${FILESDIR}/${PV}/postinstall-en.txt
+	webapp_hook_script ${FILESDIR}/${PV}/reconfig
 	webapp_src_install
 }
diff --git a/www-apps/rt/rt-3.4.2-r1.ebuild b/www-apps/rt/rt-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..e5d1b28bb20d
--- /dev/null
+++ b/www-apps/rt/rt-3.4.2-r1.ebuild
@@ -0,0 +1,203 @@
+# 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.2-r1.ebuild,v 1.1 2005/06/21 02:12:38 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
+	ftp://ftp.eu.uu.net/pub/unix/ticketing/${PN}/release/${P}.tar.gz
+	ftp://rhinst.ece.cmu.edu/${PN}/release/${P}.tar.gz"
+
+KEYWORDS="~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
+	>=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/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-Test
+		>=dev-perl/Apache-DBI-0.92
+		apache2? ( >=net-www/apache-2 dev-perl/FCGI net-www/mod_fastcgi )
+		!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} /bin/false /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}
+
+	# add Gentoo-specific layout
+	cat ${FILESDIR}/${PV}/config.layout-gentoo >> config.layout
+	sed -e "s|PREFIX|${D}/${MY_HOSTROOTDIR}/${P}|
+			s|HTMLDIR|${D}/${MY_HTDOCSDIR}|g" -i ./config.layout
+}
+
+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
+	if `make testdeps | grep "MISSING"`; then
+		ewarn "Missing Perl dependency!"
+		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}/${P}/etc/RT_SiteConfig.pm
+
+	# copy upgrade files
+	cp -R etc/upgrade ${D}/${MY_HOSTROOTDIR}/${P}
+
+	cd ${D}
+	grep -Rl "${D}" * | xargs dosed
+
+	if ! useq lighttpd; then
+		if ! useq apache2; then
+			webapp_server_configfile apache1 ${FILESDIR}/${PV}/rt_apache.conf
+			webapp_server_configfile apache1 ${FILESDIR}/${PV}/rt_apache1_fcgi.conf
+		else
+			webapp_server_configfile apache2 ${FILESDIR}/${PV}/rt_apache2_fcgi.conf
+		fi
+	else
+		newinitd ${FILESDIR}/${PV}/${PN}.init.d ${PN}
+		insinto /etc/conf.d
+		newins ${FILESDIR}/${PV}/${PN}.conf.d ${PN}
+	fi
+	webapp_postinst_txt en ${FILESDIR}/${PV}/postinstall-en.txt
+	webapp_hook_script ${FILESDIR}/${PV}/reconfig
+	webapp_src_install
+}
diff --git a/www-apps/rt/rt-3.4.2.ebuild b/www-apps/rt/rt-3.4.2.ebuild
index 8fb692511315..7fef4c24cae7 100644
--- a/www-apps/rt/rt-3.4.2.ebuild
+++ b/www-apps/rt/rt-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.2 2005/06/15 13:25:49 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.4.2.ebuild,v 1.3 2005/06/21 02:12:38 rl03 Exp $
 
 inherit webapp eutils
 
@@ -95,7 +95,7 @@ src_unpack() {
 	cd ${S}
 
 	# add Gentoo-specific layout
-	cat ${FILESDIR}/config.layout-gentoo >> config.layout
+	cat ${FILESDIR}/${PV}/config.layout-gentoo >> config.layout
 	sed -e "s|PREFIX|${D}/${MY_HOSTROOTDIR}/${P}|
 			s|HTMLDIR|${D}/${MY_HTDOCSDIR}|g" -i ./config.layout
 
@@ -130,8 +130,8 @@ src_install() {
 	grep -Rl "${D}" * | xargs dosed
 	chmod +r ${D}/${MY_HOSTROOTDIR}/${P}/etc/RT*
 
-	webapp_server_configfile apache1 ${FILESDIR}/rt_apache.conf
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en-${PV}.txt
-	webapp_hook_script ${FILESDIR}/reconfig-${PV}
+	webapp_server_configfile apache1 ${FILESDIR}/${PV}/rt_apache.conf
+	webapp_postinst_txt en ${FILESDIR}/${PV}/postinstall-en.txt
+	webapp_hook_script ${FILESDIR}/${PV}/reconfig
 	webapp_src_install
 }