fix #213235, #215871; cleanup

Package-Manager: portage-2.1.4.4

9 files changed, 93 insertions, 73 deletions

diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog
index 5f32c0016ad3..16eb8b5b3ae9 100644
--- a/www-apps/rt/ChangeLog
+++ b/www-apps/rt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/rt
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.55 2008/03/07 14:37:28 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.56 2008/04/03 09:57:12 hollow Exp $
+
+  03 Apr 2008; Benedikt Böhm <hollow@gentoo.org>
+  -files/3.4.5/postinstall-en.txt, -files/3.4.5/reconfig,
+  +files/postinstall-en.txt, +files/reconfig, files/rt.conf.d,
+  files/rt_apache2_fcgi.conf, files/rt_apache2.conf, rt-3.6.3.ebuild,
+  rt-3.6.6.ebuild:
+  fix #213235, #215871; cleanup
 
 *rt-3.6.6 (07 Mar 2008)
 
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 65325845ad49..6d6830149c95 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 3.4.5/postinstall-en.txt 703 RMD160 5bddbc2097afd96da1ff2993befdb1c8b27769ef SHA1 c212a6095f9191885ea335de1981a6a89437dd7f SHA256 497e75437529d61f69b628b0f7ab4ffa51dd0be9292220e657c4148345ab5a35
-AUX 3.4.5/reconfig 1585 RMD160 7f925ed321ec02f42cd1f8fe2c6b962961769e17 SHA1 3743d1cbf640cb7295559ae294934e2626cda2ec SHA256 dc54bf257e1ab8eecffdc4941744d4f7eb11691ef02ea5235f5c3ffd3cec9a0a
 AUX config.layout-gentoo 616 RMD160 5a67ad1cb45ad067f66c5348acfedc45841ab252 SHA1 67e1d7d24b4593f5a2301cf5584cb83109c6a497 SHA256 edf9ae9b820a072cacf2bc6f43b3147d746037ba299265c62bcfafb50be06759
-AUX rt.conf.d 399 RMD160 da84c7fc8ddba2e01cd58fe706cc64501ff8deeb SHA1 824af6197cc3da5cb832cec0bada938c13281a18 SHA256 6f705188c9b9c57dbb7a9726d00624dbd5c267d4dc7415d81fd972f4d3300542
+AUX postinstall-en.txt 703 RMD160 5bddbc2097afd96da1ff2993befdb1c8b27769ef SHA1 c212a6095f9191885ea335de1981a6a89437dd7f SHA256 497e75437529d61f69b628b0f7ab4ffa51dd0be9292220e657c4148345ab5a35
+AUX reconfig 1867 RMD160 0ac8d9dca3ce42e8bec0878362c0104213824c18 SHA1 c94f867b816bb08d1634f93f869f11666f758b45 SHA256 109c8db26ae98a84c27ddb896b613bc248a4a216a9f6e463fc52f8c380c38ff1
+AUX rt.conf.d 399 RMD160 3ff349449e9722497becf7f32cf8bb9667b98d33 SHA1 73f85eb60abb165f413aa2deda67f9ad4464ebc6 SHA256 26f04b0e22c1291cc806b115b66f8c17824c765607a3fd4797aecf184cbdff1e
 AUX rt.init.d 1013 RMD160 c6853447d8653cfbcf26316c0a432e3474298467 SHA1 bf7408b6c3a30a7a80ece3e51bf1b0446f68e5df SHA256 45f75de68ee588538d093eb6d57d8368004e075fecafff2f82bb0f2978da79d7
-AUX rt_apache2.conf 574 RMD160 19a49aca4870750ad397916f7a16433624be2b12 SHA1 70e337d2f3b3fd8295703672a1af1dc3bdd55d5a SHA256 7d801941fafb9656848fa3c57ee142203a66c121dfc0eef616a4ca2146644419
-AUX rt_apache2_fcgi.conf 993 RMD160 a59e337ff39bf9a1cb8793d63f5cc6583f2a0615 SHA1 8c20b094785f29f87ceca08ff7ea365d8ed93681 SHA256 166f5a60e443351228ba215a460603b106074e6f150e878a34ccd18b825026aa
+AUX rt_apache2.conf 550 RMD160 a9f463c8f7c4803a32f0e8380e594c2eb6f5f05a SHA1 b11218515f2c43cd2738be71e4e3b25ce8b4bb38 SHA256 db52d05f10cb6ed1bb236ed9e6fc5cc7574b5949c5cb85b5719d0132cbb072cc
+AUX rt_apache2_fcgi.conf 989 RMD160 f88807ad0db9806ee2c638e998ab10e9339a9ed6 SHA1 92ea95bae0a8c2b31b058385b789e9b7fce4f8b1 SHA256 7dff43c9fb73daa06c9c4841199e7618758250129946ec9d20adf5a1852e4e91
 DIST rt-3.6.3.tar.gz 1602818 RMD160 3eab454d374334e5df4939c2c4af316628b12965 SHA1 793de4655c0fa7bbfd3aa6eeefe5a1d143d07677 SHA256 fc29f1fd95b3cd4813e3fbdef1882e8cd6c4516c66b3e78237272bdd200a1a67
 DIST rt-3.6.6.tar.gz 1715913 RMD160 46d928304d0435f122cecb9a62df137bf47b0e56 SHA1 fa0f3787027851348f52eefda8fee13f30b43ca7 SHA256 509bac5ab588b0a69030d6ee91061e27dd124d9f8d795000b307e5d85a2dbf14
-EBUILD rt-3.6.3.ebuild 6215 RMD160 316f68c792d662f2d5525326e7d5a3a261a7c17b SHA1 56502269d5e4e321b62a97d63fb9e65327990f31 SHA256 08a8655b7ca2adba31ba5b213182bb318bbd11c04e3ac351d350cdf39bff4e03
-EBUILD rt-3.6.6.ebuild 6096 RMD160 f19a22d2a7cafeaf1aa783ef0f53d872a1ca1de8 SHA1 77e76bdbc8b5de313cc00be197b9ee2420335256 SHA256 c47876aac2b9bf4ebf74c612fcf14b4ac6e960b5047d85f14e431c3af408ba39
-MISC ChangeLog 8479 RMD160 79fbceb53e8f74b3452c484321c2de07c61bdfc1 SHA1 c0a5455b614fa4a7b38efef2fecc1d96f7d63780 SHA256 b4e74dd204adf4af5a41ad6418e27d2a9017cc2f164c5ea72cc0e0837ea4ac84
+EBUILD rt-3.6.3.ebuild 6249 RMD160 920f539dda59eb5bfe86f458b992271ff6a425cf SHA1 8b58d2888c2dced1ff548e0996e6263fde5f73a1 SHA256 beaae0415f4ecdfe3634fae006a73112e5b59fb0232a3d483acf79a4a15fc7d2
+EBUILD rt-3.6.6.ebuild 6145 RMD160 fd38e189622d3306fb4c271aab59cfd56a66e212 SHA1 5d96f427621c378b253a318d8d2975945de88f80 SHA256 26fb10b766ae7e35e33a5cfbc0b7ab1fcdcfbd76ab8eece9a08f2a796569c9d8
+MISC ChangeLog 8772 RMD160 b8bce6b8833a08181d37293008cf451265ddeaf3 SHA1 e7578fce61c59c2a44f08a317277fa7028961ae4 SHA256 6f7e6e9b52dab918f0127595cf96b65c2d4cdbbc4b56346979695cd9e3ee6c16
 MISC metadata.xml 224 RMD160 6473c0e4796e967137528ff82a99aad5b7e410c9 SHA1 b69add64067ccc2d56e521ac0e5799cc8a47fd75 SHA256 d093d9f523cc0019dc1107d9955a0b24fb0a796dbc032775dbdafe782c0c4066
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkfRUzQACgkQmPFBzbX68WEmVgCffI4CJQdHQ+r6ngha9h+98a5s
-/RMAn2oQVh3OGPn9MBT3IsPK0e/yjOPI
-=d5oA
+iD8DBQFH9KoEmPFBzbX68WERAqOBAKCL/8YtgWrTFV30HRd9rDYWABzS+QCeLs7Y
+RhE7bU6njYAd+rRblM2/uiU=
+=elsj
 -----END PGP SIGNATURE-----
diff --git a/www-apps/rt/files/3.4.5/postinstall-en.txt b/www-apps/rt/files/postinstall-en.txt
index c77c0a11e922..c77c0a11e922 100644
--- a/www-apps/rt/files/3.4.5/postinstall-en.txt
+++ b/www-apps/rt/files/postinstall-en.txt
diff --git a/www-apps/rt/files/3.4.5/reconfig b/www-apps/rt/files/reconfig
index 3c0153013985..e84018c3f9b8 100644
--- a/www-apps/rt/files/3.4.5/reconfig
+++ b/www-apps/rt/files/reconfig
@@ -14,8 +14,19 @@ if [ $1 = "install" ]; then
 	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
 
-	 sed -e "s|RT_DIR|${VHOST_ROOT}/${PF}|g
-		s|HTDOCS|${MY_INSTALLDIR}|g" -i ${VHOST_ROOT}/${PF}/etc/rt_apache* || die
+	if [[ -e ${VHOST_ROOT}/${PF}/etc/rt_apache2.conf ]]; then
+		sed -i \
+			-e "s|RT_DIR|${VHOST_ROOT}/${PF}|g"
+			-e "s|HTDOCS|${MY_INSTALLDIR}|g" \
+			${VHOST_ROOT}/${PF}/etc/rt_apache2.conf
+	fi
+
+	if [[ -e ${VHOST_ROOT}/${PF}/etc/rt_apache2_fcgi.conf ]]; then
+		sed -i \
+			-e "s|RT_DIR|${VHOST_ROOT}/${PF}|g"
+			-e "s|HTDOCS|${MY_INSTALLDIR}|g" \
+			${VHOST_ROOT}/${PF}/etc/rt_apache2_fcgi.conf
+	fi
 
 	# check for upgrades
 	cd ${VHOST_ROOT}/${PF}/upgrade
diff --git a/www-apps/rt/files/rt.conf.d b/www-apps/rt/files/rt.conf.d
index 5fa292d2aefb..294ac2a0bd46 100644
--- a/www-apps/rt/files/rt.conf.d
+++ b/www-apps/rt/files/rt.conf.d
@@ -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/files/rt.conf.d,v 1.1 2006/01/26 21:10:33 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/files/rt.conf.d,v 1.2 2008/04/03 09:57:12 hollow 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.5
+RTPATH=/var/www/localhost/@@PF@@
 
 FCGI_SOCKET_PATH=${RTPATH}/var/appSocket
 PIDFILE=${RTPATH}/var/pid
diff --git a/www-apps/rt/files/rt_apache2.conf b/www-apps/rt/files/rt_apache2.conf
index 896f642c55af..363c34f45bf7 100644
--- a/www-apps/rt/files/rt_apache2.conf
+++ b/www-apps/rt/files/rt_apache2.conf
@@ -1,18 +1,18 @@
 <IfDefine PERL>
-    <VirtualHost MY_RT_DOMAIN:80>
-        ServerName MY_RT_DOMAIN
-
-        DocumentRoot HTDOCS
+<VirtualHost MY_RT_DOMAIN:80>
+	ServerName MY_RT_DOMAIN
+	DocumentRoot HTDOCS
 	ServerAdmin YOUR_EMAIL_HERE
 
-        AddDefaultCharset UTF-8
+	AddDefaultCharset UTF-8
+
 	<IfDefine USERDIR>
-	        UserDir disabled
+		UserDir disabled
 	</IfDefine>
- 
-        PerlModule Apache::DBI
-        PerlRequire RT_DIR/bin/webmux.pl
- 
+
+	PerlModule Apache::DBI
+	PerlRequire RT_DIR/bin/webmux.pl
+
 	<Location />
 		SetHandler perl-script
 		PerlHandler RT::Mason
@@ -25,6 +25,7 @@
 		Order allow,deny
 		Allow from all
 	</Directory>
-
-    </VirtualHost>
+</VirtualHost>
 </IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apps/rt/files/rt_apache2_fcgi.conf b/www-apps/rt/files/rt_apache2_fcgi.conf
index aa6ccdc9a04e..2a93f8cea2b7 100644
--- a/www-apps/rt/files/rt_apache2_fcgi.conf
+++ b/www-apps/rt/files/rt_apache2_fcgi.conf
@@ -1,39 +1,38 @@
 <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>
+# 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>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apps/rt/rt-3.6.3.ebuild b/www-apps/rt/rt-3.6.3.ebuild
index 0600443f12fa..eaa5cb010c18 100644
--- a/www-apps/rt/rt-3.6.3.ebuild
+++ b/www-apps/rt/rt-3.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.6.3.ebuild,v 1.9 2008/02/05 15:04:28 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.6.3.ebuild,v 1.10 2008/04/03 09:57:12 hollow Exp $
 
 inherit webapp eutils depend.apache
 
@@ -231,12 +231,13 @@ src_install() {
 	if useq lighttpd; then
 		newinitd ${FILESDIR}/${PN}.init.d ${PN}
 		newconfd ${FILESDIR}/${PN}.conf.d ${PN}
+		dosed "s/@@PF@@/${PF}/g" /etc/conf.d/${PN}
 	else
 		local CONF="rt_apache2_fcgi.conf rt_apache2.conf"
 		cd ${FILESDIR} && cp ${CONF} ${D}/${MY_HOSTROOTDIR}/${PF}/etc
 	fi
-	webapp_postinst_txt en ${FILESDIR}/3.4.5/postinstall-en.txt
-	webapp_hook_script ${FILESDIR}/3.4.5/reconfig
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_hook_script ${FILESDIR}/reconfig
 
 	webapp_serverowned ${MY_HOSTROOTDIR}/${PF}/var
 	webapp_src_install
diff --git a/www-apps/rt/rt-3.6.6.ebuild b/www-apps/rt/rt-3.6.6.ebuild
index 30dad35a791b..e07752a19fa3 100644
--- a/www-apps/rt/rt-3.6.6.ebuild
+++ b/www-apps/rt/rt-3.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.6.6.ebuild,v 1.1 2008/03/07 14:37:28 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.6.6.ebuild,v 1.2 2008/04/03 09:57:12 hollow Exp $
 
 inherit webapp eutils depend.apache confutils
 
@@ -206,7 +206,7 @@ src_install() {
 	rm -f "${D}"/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
 
 	# fix paths
-	find "${D}" -type f -print0 | xargs -0 dosed
+	find "${D}" -type f -print0 | xargs -0 sed -i -e "s:${D}::g"
 
 	# copy upgrade files
 	insinto "${MY_HOSTROOTDIR}/${PF}"
@@ -215,14 +215,15 @@ src_install() {
 	if use lighttpd; then
 		newinitd "${FILESDIR}"/${PN}.init.d ${PN}
 		newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+		dosed "s/@@PF@@/${PF}/g" /etc/conf.d/${PN}
 	else
 		doins "${FILESDIR}"/{rt_apache2_fcgi.conf,rt_apache2.conf}
 	fi
 
 	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var
 
-	webapp_postinst_txt en "${FILESDIR}"/3.4.5/postinstall-en.txt
-	webapp_hook_script "${FILESDIR}"/3.4.5/reconfig
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_hook_script "${FILESDIR}"/reconfig
 
 	webapp_src_install
 }