Fixed variables in reconfig hook. Closes #99853.

Package-Manager: portage-2.0.51.22-r2

7 files changed, 34 insertions, 172 deletions

diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog
index b29a7d92f45e..1b361215eb86 100644
--- a/www-apps/rt/ChangeLog
+++ b/www-apps/rt/ChangeLog
@@ -1,6 +1,11 @@
 # 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.12 2005/06/21 11:09:49 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.13 2005/07/29 18:21:25 rl03 Exp $
+
+  29 Jul 2005; Renat Lumpau <rl03@gentoo.org>
+  files/3.4.2/postinstall-en.txt, files/3.4.2/reconfig, -rt-3.4.2.ebuild,
+  rt-3.4.2-r1.ebuild:
+  Finally fixed variables in the hook script. Fixes #99853.
 
   21 Jun 2005; Renat Lumpau <rl03@gentoo.org> files/3.4.2/rt.init.d:
   Fixed initscript.
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 1af42cc6ff5f..c5512c269e38 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -1,28 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ad78ebb8d4f31942a62a147457ca3140 rt-3.4.2-r1.ebuild 5357
+MD5 14fe0046e82aad3f7ea3637e4918e614 rt-3.4.2-r1.ebuild 5405
 MD5 e28b5c19f33196d18983e2db57aad44f rt-3.2.1.ebuild 4217
-MD5 36a06c6979f2d93df52d5f5867fd96ee rt-3.4.2.ebuild 3722
-MD5 6314c8ddade7275dbf3dfd5d8dad4f84 ChangeLog 2569
+MD5 baea2333b11946abf90e5918aead2a3a ChangeLog 2772
 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 af335c7cab7bfc09dbd08feba51d2879 files/digest-rt-3.4.2 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 efba744a8f997643ae37f912ac0d72db files/3.4.2/postinstall-en.txt 687
+MD5 3a24e1ccdc0d6b7c6b0d40e19c586365 files/3.4.2/postinstall-en.txt 703
 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 1be40f6b7f40406cd2a9dfcd25483357 files/3.4.2/reconfig 1303
+MD5 c02db12a48f7dcd9c1e03bd88bec5713 files/3.4.2/reconfig 1136
 MD5 73c354dd8ba0f64a74e5c6cd01b33834 files/3.4.2/rt_apache2_fcgi.conf 993
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCt/WSEzitwsaoONoRAtbhAKCzDoM+fNac8tNnTlWNzEJcTCQynwCeO3zy
-KcTBooc3mZBUIY4Q9AmYsPU=
-=r8er
+iD8DBQFC6nO+EzitwsaoONoRAl5qAKC0znuT+pEvaIfLxxVNFt+A745pbwCfQVXv
+oW0J7gI5kQ/RKlVMBAdgR6o=
+=dBDT
 -----END PGP SIGNATURE-----
diff --git a/www-apps/rt/files/3.4.2/postinstall-en.txt b/www-apps/rt/files/3.4.2/postinstall-en.txt
index 821fbb28b410..9a1c3a3301fd 100644
--- a/www-apps/rt/files/3.4.2/postinstall-en.txt
+++ b/www-apps/rt/files/3.4.2/postinstall-en.txt
@@ -5,8 +5,8 @@ Please follow the Gentoo install guide found at
 http://wiki.bestpractical.com/index.cgi?GentooInstallGuide
 
 Your local config files are located here:
-${VHOST_ROOT}/${P}/etc/RT_Config.pm
-${VHOST_ROOT}/${P}/etc/RT_SiteConfig.pm
+${VHOST_ROOT}/${PV}-${PVR}/etc/RT_Config.pm
+${VHOST_ROOT}/${PV}-${PVR}/etc/RT_SiteConfig.pm
 
 If you need more help, consider searching the mailing list (Google site:lists.fsck.com )
 
diff --git a/www-apps/rt/files/3.4.2/reconfig b/www-apps/rt/files/3.4.2/reconfig
index f2fdfe0451dc..2bdba4c548b3 100644
--- a/www-apps/rt/files/3.4.2/reconfig
+++ b/www-apps/rt/files/3.4.2/reconfig
@@ -1,33 +1,29 @@
 #!/bin/bash
+PF=${PN}-${PVR}
 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/* etc/RT_Config.pm
+	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
 
 	# fix Apache configs
-	sed -e "s|RT_DIR|${VHOST_ROOT}/${P}|g
-		s|HTDOCS|${MY_INSTALLDIR}|g" -i ${MY_SERVERCONFIGDIR}/apache*
+	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}/${P}/upgrade
+	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}/${P}/upgrade/<version>"
-	echo "rt-setup-database --action acl --datadir ${VHOST_ROOT}/${P}/upgrade/<version>"
-	echo "rt-setup-database --action insert --datadir ${VHOST_ROOT}/${P}/upgrade/<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
-	# braindead - set ${P}
-	MY_PV=$(basename $(dirname ${MY_HOSTROOTDIR}))
-	MY_PN=$(basename $(dirname $(dirname ${MY_HOSTROOTDIR})))
-	MY_P="${MY_PN}-${MY_PV}"
-
-	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
+	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
diff --git a/www-apps/rt/files/digest-rt-3.4.2 b/www-apps/rt/files/digest-rt-3.4.2
deleted file mode 100644
index 550fde369b98..000000000000
--- a/www-apps/rt/files/digest-rt-3.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a50158055fff423a557d43335ae1dc81 rt-3.4.2.tar.gz 1359775
diff --git a/www-apps/rt/rt-3.4.2-r1.ebuild b/www-apps/rt/rt-3.4.2-r1.ebuild
index e5d1b28bb20d..0188c1918db1 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.1 2005/06/21 02:12:38 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.4.2-r1.ebuild,v 1.2 2005/07/29 18:21:25 rl03 Exp $
 
 inherit webapp eutils
 
@@ -12,9 +12,10 @@ 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"
+KEYWORDS="~x86 ~ppc"
 
 DEPEND="
+	>=net-www/webapp-config-1.11-r1
 	>=dev-lang/perl-5.8.3
 	>=dev-perl/Params-Validate-0.02
 	dev-perl/Cache-Cache
@@ -143,8 +144,8 @@ src_unpack() {
 
 	# 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
+	sed -e "s|PREFIX|${D}/${MY_HOSTROOTDIR}/${PF}|
+			s|HTMLDIR|${D}/${MY_HTDOCSDIR}|g" -i ./config.layout || die
 }
 
 src_compile() {
@@ -177,10 +178,10 @@ src_install() {
 	make install
 
 	# make sure we don't clobber existing site configuration
-	rm -f ${D}/${MY_HOSTROOTDIR}/${P}/etc/RT_SiteConfig.pm
+	rm -f ${D}/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
 
 	# copy upgrade files
-	cp -R etc/upgrade ${D}/${MY_HOSTROOTDIR}/${P}
+	cp -R etc/upgrade ${D}/${MY_HOSTROOTDIR}/${PF}
 
 	cd ${D}
 	grep -Rl "${D}" * | xargs dosed
diff --git a/www-apps/rt/rt-3.4.2.ebuild b/www-apps/rt/rt-3.4.2.ebuild
deleted file mode 100644
index 7fef4c24cae7..000000000000
--- a/www-apps/rt/rt-3.4.2.ebuild
+++ /dev/null
@@ -1,137 +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.2.ebuild,v 1.3 2005/06/21 02:12:38 rl03 Exp $
-
-inherit webapp eutils
-
-IUSE="mysql postgres fastcgi"
-#IUSE="mysql postgres fastcgi apache2"
-
-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
-	>=dev-perl/HTML-Mason-1.23
-	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/Apache-DBI-0.92
-	>=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/Apache-Test
-	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 )
-	fastcgi? ( dev-perl/FCGI net-www/mod_fastcgi )
-	!fastcgi? ( =www-apache/libapreq-1* )
-	=net-www/apache-1*"
-
-#	apache2? ( >=net-www/apache-2 >=www-apache/libapreq2 )
-#	!apache2? ( =net-www/apache-1* =www-apache/libapreq-1* )
-
-
-LICENSE="GPL-2"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	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,"
-	ewarn "http://bestpractical.com/pub/rt/devel/rt2-to-rt3.tar.gz"
-	ewarn "and follow the included instructions."
-	ewarn
-	enewgroup rt >/dev/null
-}
-
-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() {
-	./configure --enable-layout=Gentoo \
-		--with-web-user=apache \
-		--with-web-group=apache
-
-	# 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
-
-	# copy upgrade files
-	cp -R etc/upgrade ${D}/${MY_HOSTROOTDIR}/${P}
-
-	# make sure we don't clobber existing site configuration
-	rm -f ${D}/${MY_HOSTROOTDIR}/${P}/etc/RT_SiteConfig.pm
-
-	cd ${D}
-	grep -Rl "${D}" * | xargs dosed
-	chmod +r ${D}/${MY_HOSTROOTDIR}/${P}/etc/RT*
-
-	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
-}