Fixed libapreq2/mod_perl2 dependency wrt bug #67686, bug #61893, bug #73115.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 35 insertions, 30 deletions

diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog
index 579d990f5491..1eb7e8fc08fb 100644
--- a/www-apps/rt/ChangeLog
+++ b/www-apps/rt/ChangeLog
@@ -1,6 +1,10 @@
 # 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.15 2005/08/04 14:35:50 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.16 2005/08/08 22:37:13 rl03 Exp $
+
+  08 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/3.4.2/reconfig,
+  rt-3.4.2-r1.ebuild:
+  Fixed libapreq2/mod_perl2 dependency wrt bug #67686, bug #61893, bug #73115.
 
   04 Aug 2005; Michael Cummings <mcummings@gentoo.org> rt-3.4.2-r1.ebuild:
   Corrected Apache-Test dep since mod_perl-2 blocks it - made it an ||
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 744c93b63d22..f1a61c1babf8 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9361d98286bf89c6c5387f4bca5c4e35 ChangeLog 3007
+MD5 a338f5d67864fd950b0b660aee05ca55 rt-3.4.2-r1.ebuild 5439
+MD5 e28b5c19f33196d18983e2db57aad44f rt-3.2.1.ebuild 4217
+MD5 851ce0fa870aeb21cf60e52fb447149b ChangeLog 3172
+MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
+MD5 af335c7cab7bfc09dbd08feba51d2879 files/digest-rt-3.4.2-r1 61
+MD5 5f5c3f76ea4676e743612e38341780fe files/digest-rt-3.2.1 61
 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 3a24e1ccdc0d6b7c6b0d40e19c586365 files/3.4.2/postinstall-en.txt 703
-MD5 cdd30f8b9acde7b7ff5a686ea8fe66cc files/3.4.2/reconfig 1193
+MD5 3d2e627499ec86839cc0099719fcc3bd files/3.4.2/rt_apache.conf 574
 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 bf81df666e02df7b1e6f73ee9908a767 files/3.4.2/reconfig 1206
 MD5 73c354dd8ba0f64a74e5c6cd01b33834 files/3.4.2/rt_apache2_fcgi.conf 993
-MD5 5f5c3f76ea4676e743612e38341780fe files/digest-rt-3.2.1 61
-MD5 af335c7cab7bfc09dbd08feba51d2879 files/digest-rt-3.4.2-r1 61
-MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
-MD5 e28b5c19f33196d18983e2db57aad44f rt-3.2.1.ebuild 4217
-MD5 304bde5ecfb02cde688f36a7f970db14 rt-3.4.2-r1.ebuild 5440
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC8kYWI1lqEGTUzyQRAjofAJ4oz298p3d4mk+9A7kaWD6gtpWQgQCfWAuR
-NKxlLR4eYDRelIaiQwvRWjo=
-=xraL
+iD8DBQFC996kEzitwsaoONoRAtEfAJ4/X89JwfXnzAH+rIqhY+YEXYutPACbBNKn
+JrkVzkA7hxNUbB1a3d4TDwo=
+=HQ3Y
 -----END PGP SIGNATURE-----
diff --git a/www-apps/rt/files/3.4.2/reconfig b/www-apps/rt/files/3.4.2/reconfig
index eb4752533853..e71d24fdbb70 100644
--- a/www-apps/rt/files/3.4.2/reconfig
+++ b/www-apps/rt/files/3.4.2/reconfig
@@ -30,9 +30,9 @@ if [ $1 = "install" ]; then
 	ls
 
 elif [ $1 = "clean" ]; then
-	if [[ "${VHOST_ROOT}${PF}" ]]; then 
-		rm -rf ${VHOST_ROOT}/${PF}/bin ${VHOST_ROOT}/${PF}/lib/RT.pm ${VHOST_ROOT}/${PF}/sbin
-	else
-		echo "Variables not set!"
-	fi
+	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/rt-3.4.2-r1.ebuild b/www-apps/rt/rt-3.4.2-r1.ebuild
index 250a956a7e7c..ab0fdb39d678 100644
--- a/www-apps/rt/rt-3.4.2-r1.ebuild
+++ b/www-apps/rt/rt-3.4.2-r1.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-r1.ebuild,v 1.4 2005/08/04 16:44:40 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.4.2-r1.ebuild,v 1.5 2005/08/08 22:37:13 rl03 Exp $
 
 inherit webapp eutils
 
@@ -67,9 +67,10 @@ RDEPEND="
 	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 >=www-apache/mod_perl-2 )
 		>=dev-perl/Apache-DBI-0.92
-		apache2? ( >=net-www/apache-2 dev-perl/FCGI net-www/mod_fastcgi )
+		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* ) ) )
@@ -186,17 +187,17 @@ src_install() {
 	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
+	if useq lighttpd; then
 		newinitd ${FILESDIR}/${PV}/${PN}.init.d ${PN}
 		insinto /etc/conf.d
 		newins ${FILESDIR}/${PV}/${PN}.conf.d ${PN}
+	else
+		if useq apache2; then
+			webapp_server_configfile apache2 ${FILESDIR}/${PV}/rt_apache2_fcgi.conf
+		else
+			webapp_server_configfile apache1 ${FILESDIR}/${PV}/rt_apache.conf
+			webapp_server_configfile apache1 ${FILESDIR}/${PV}/rt_apache1_fcgi.conf
+		fi
 	fi
 	webapp_postinst_txt en ${FILESDIR}/${PV}/postinstall-en.txt
 	webapp_hook_script ${FILESDIR}/${PV}/reconfig