Refresh rt_apache.conf so that it has a working example appropriate

for the only version in the tree. Added another sed statement in the
ebuild to remove excess slashes. Fixed reconfig so that it actually
does what it's supposed to do, and do so quietly so that the message
isn't lost. Cleaned up postinstall and have it point to our wiki page
instead of an outdated, flash heavy guide. This package now does
everything it promised, but didn't deliver.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1BBFDA0

6 files changed, 98 insertions, 97 deletions

diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog
index 20efc8029916..7fa2cc1158b0 100644
--- a/www-apps/rt/ChangeLog
+++ b/www-apps/rt/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for www-apps/rt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.89 2014/11/16 21:04:09 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.90 2014/11/18 20:25:29 titanofold Exp $
+
+*rt-4.2.9-r1 (18 Nov 2014)
+
+  18 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org> -rt-4.2.9.ebuild,
+  +rt-4.2.9-r1.ebuild, files/postinstall-en.txt, files/reconfig,
+  files/rt_apache2.conf:
+  Refresh rt_apache.conf so that it has a working example appropriate
+  for the only version in the tree. Added another sed statement in the
+  ebuild to remove excess slashes. Fixed reconfig so that it actually
+  does what it's supposed to do, and do so quietly so that the message
+  isn't lost. Cleaned up postinstall and have it point to our wiki page
+  instead of an outdated, flash heavy guide. This package now does
+  everything it promised, but didn't deliver.
 
   16 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org> rt-4.2.9.ebuild:
   Add missing dependency. If we are not using Lighttpd and not FastCGI, we need
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 4f71f8fe66e5..a33ce446dbfc 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -2,20 +2,20 @@
 Hash: SHA256
 
 AUX config.layout-gentoo 741 SHA256 1a880f8fd268519371b5321c5a80db30c0da07c2ab474e773141953403e8ae03 SHA512 d3cb968a528ccb19f64ef249f2df503e82d1763a22ea939cd202b9a0626c1d335e2b8a8db65b191e2cff105926e422670c6d435b579069a10d9c433e6bd1e0fb WHIRLPOOL e707ac51542c6b65747c20d148a45d6f33776312c19772bc54fe49c73873f5215e05987e3008940d75d3b4b2996ae75a763aa3cd0b3cf01dc65dea503fba6525
-AUX postinstall-en.txt 703 SHA256 497e75437529d61f69b628b0f7ab4ffa51dd0be9292220e657c4148345ab5a35 SHA512 884bc62b848a77338ee55472f57c47f31f675edab7fa0ffc1fc8f958be1248f8f5232248bfb4f5aa414572020d9982c958a055c2e5d125efde05dc9fa6985d64 WHIRLPOOL f95a386d7fb585908c3e9e47b720704b1f269fc7a76bba6e5b1d9280755f1790e143d512f8883cb9bc222866887ca1b875f0a3de4eab91c73fbeadb4ed559fae
-AUX reconfig 2125 SHA256 a360f48f994d7317ccf0aeadffc86f1db9a61cf361d480ef4de41d96f3d5a507 SHA512 43f403203dad24627f1be8d74ee4d60c2a49b23c00515b67faee47d97ff348c82094f10730a01f578c4884ef3268cef1179657a5ef2afa0697121b61bba54162 WHIRLPOOL bf5cb060f3ea8d844186b9f4e43662fb3cd18582b9c8dc26f156e89ed9772042d19046696402bba40fee26b36dbafd3c852feb82a34ed260986a8c15c4ca79df
+AUX postinstall-en.txt 620 SHA256 c9ff770be0a5367c9648f5ffaa027f8daedd6ac31440046134fcb059bd917b23 SHA512 2f65fd215b426f965632bec81857ad7ddb091aadb75803d136ee9ab337d0ad17b58229239dc916a8955d6bc5e838751c124b5427d776a83a4acd7f74c204f093 WHIRLPOOL a5b4bea1f18a07f56353ca76b016e72b917fbe88182d1a1330b1b193e75906b90d24e883c99f01d21e03117bc206dabd6d66edd0bb9748583ec324984956e7c4
+AUX reconfig 2133 SHA256 82743e18319eafecf66c5b804c193d9ca3c72d8fc41a9493b1ae91b8e14b5fe3 SHA512 bfeedd02918240fb1b79fe9a5f62b6bda85e3f9df2c55dd9a93deb490495bb269579a999a71bd135fe43f247774039e34947c39689461ef4083b482f02fa3c56 WHIRLPOOL 9e9c4138dc4337174e3f67813d1926c7c88228bdd5747af8df15e6dee4547bdd165f19df25dce4fd523a9fdc6bbd389eee4495146bbb055fdcaab0c384317579
 AUX rt.conf.d.2 336 SHA256 f41dd245b73b65de21c04307994048c6517523deb36dd753891cce510ee3ea53 SHA512 1e76183290a92fee036e8fb0dc095a2c9ad2fa3494be8546123119fad00d5c882152be97b8e84e77dc2e3eae5dbad0906a1ef65f1802333b7f0937d97e11a510 WHIRLPOOL 9caed3c35b495bc0226305daaa01687e8096b57437a9515845ac7c6a8ea1a909bc555954244cf00bcc1ddbfb874f7aab82e4e5eb4148c0ce46a4e3fa85efe3b3
 AUX rt.init.d.2 1424 SHA256 dcaddd4045fbc05f44b78505ebd6429026602910a65851eaab0ddca078ab282e SHA512 908459752c1837900d3c64bd8d88b7c46c73d4db22eaf4bd72d2cc016f0c06e2fc78d0c0bc4f0ce28c005f717372e4ba46060269d2177bf6148f8db87766483f WHIRLPOOL a2e44bf6be10a9b8d9cb7ece05dfb7ea38d0eddecca6d5792ef06b9f9414df95953c09acb2101e742c8a8565549d473de41432dc53861144bb4eb6d486935b9e
-AUX rt_apache2.conf 550 SHA256 db52d05f10cb6ed1bb236ed9e6fc5cc7574b5949c5cb85b5719d0132cbb072cc SHA512 030c585590231abcf875cd8dd66e2350e346fc073f811922415d9ab390ab4b23f5915fd06ec72fece5fb00026b2e015b7a2843765c3e507ec6b665552c5be3d5 WHIRLPOOL 942fb53a24eeb96c30d5c77c0ba8fe1bbacc645900a9b736752402f251b2c06173ecc753ddfdb2a205bf8e13698bc6cc90923dbc114ac72d73bf920038df7db5
+AUX rt_apache2.conf 498 SHA256 77a079f7a00e85e2e7f2b2534f553bf5d9e4e3ea8cdf67adc6c231018883158d SHA512 3a6c55593956f786401141f5bf9fcc6ee795985e69986161269e46cd52875bb788fbe96ea95d1038414c68a34275e3c7ea79a3ff6ea6edd8cc0ed49e2e515518 WHIRLPOOL 3dac1f5b351a6dfe036afbf165e6f162648159ebe396dd892ea3a13ca726ae33be1330acb7f153130c9c7c351abb181b8f666a5993286d9679aa0671a6b16c56
 AUX rt_apache2_fcgi.conf 989 SHA256 7dff43c9fb73daa06c9c4841199e7618758250129946ec9d20adf5a1852e4e91 SHA512 58df2f37961eedec8260e2feeda75530b50ce2fa748e2188d47825e9da78ddbf12559a4d3485ab01df89a6ebcddab3fa75215fdca5b35583cf863a7be1c1ccc7 WHIRLPOOL c811079d962e9e5d810e612f017d3d5749a00f9ae2bc83ea19242592d440437d69a0dee446ac013ab4d36afea048d0a7e6219e5ce70af4780a735f300150af65
 DIST rt-4.2.9.tar.gz 7496950 SHA256 1cbfe4f824637de45cc093ab87260ef9bbac11ba724b93c01f39a6d4e9592613 SHA512 a5a8b4cd1ca59a8e99a78634bd0fb6f4c9ac428b3088f5b3a8c87312a49b69273f332d3a6370c7be2d394ed2cd834f8b85b4bc1537f27e3687d79b17513d1aaa WHIRLPOOL 17799292d6700f28e7a462afbab64a2b7dae2e06e34992506a7c51efe9d9f9fe37e65cf76e0ca04130d2c49d7221185d6115040656e4d9d9d06cff281ff2f190
-EBUILD rt-4.2.9.ebuild 7504 SHA256 d400217b44dd7bd79998a32a902c9685a5b740e7cf6ca9597e2808284f0d6eae SHA512 ae42219ff0acf8f31d71a7ebd5e1f3f79c9bd02f8f8012fe88b6460e4eefe1ce58f0441d87dde220cffbcd3db369388681c00736fcb7dd8232927975ccaa05d9 WHIRLPOOL ebb7e12b15b550ed1d160cedf266ecc6f7c9dc24d28cd58f1e0d0bee8218cf364463ed60c59132de1d1afdbf06505272ce9879b6d4375462564513ebc2879d88
-MISC ChangeLog 13925 SHA256 2bcf5ed8228d4544bf47fc53c0ef8817fef169f4d16948712377424fb9b504a7 SHA512 f13f33cc48a27a75a0dcf91dee3377152341502c4dcaca38c30ec8096ae6850b9516a4686dd24aca651f07ec22ee09b07d790caf6e7e1e1f5868ab90f018f8f3 WHIRLPOOL ee3fb4e796575076d83287ed217a7f8e7f73af0003c4162ef2dcdf9e3584a04b879ffcc2610e13d07365e804f5a67827dc9a4458b4e176a9d13ab09c3a2a7b68
+EBUILD rt-4.2.9-r1.ebuild 7537 SHA256 61a70ba8451a291099d7439b82fd88fa543394ab7528242d11859a5e2e1ca345 SHA512 8804a11a22d9d723b5b09f48d29740a4c9a02ffa6fa5966ed85bd36425b23e60689b2ffad2fde2b4135230e09633b324b450dc9b53161a4c061fde30abac49ed WHIRLPOOL 5b4f274d685df91283bb091d1b9f31225c1aa089640add679a81286593a234c5605d5928b1bc3dfbcef670a041d61ce61dff5e9b95f5fad335ac13b517ba69d3
+MISC ChangeLog 14585 SHA256 8f153cd0aeea7a29bcc62d58d7253344ea943fb8d5b218b91ebf848bff304590 SHA512 66dff6989d5584f2dd517cb66dab7fbc3fe5ca3526042f2c335ccbc63926d484224fda322d95a8579970eedede0bf55b9a26dafc9f4a8b40ff47b2113f210ba7 WHIRLPOOL 5a6acd9d8240ef8ac85fcfb01f617f831593b9e302aad7ae826ec4c9db77e35249f013d3b08b0d211500ead8b31e6c4a241278a8d9fef1ec09cc61010185e501
 MISC metadata.xml 564 SHA256 a261da27b08561f8a52676e849b12974d6aa01ee8a6ca2d3ba8269d96332db94 SHA512 30ea53c1bd6bdb1e11573723c32324181e278e6006a06b9b17d9c22ab99ff5e1db963be09e073c2f7842b0bb30024a62629984fecff759e3b883a8da97998aa0 WHIRLPOOL d06b6e5a42dab1fc118ab71438b7e4a905dcea6f0084dca6c4e47d1d3ccbaa167430cefedb11046603671948c2dff56ea4ef0495afd5cc654fd3e5b31b24e410
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRpEUsACgkQVxOqA9G7/aBn2wD6ApxmySpBjV/CHFw9P0s3sFrK
-WLMbCsiOLaBUFl96DT8A/jDsgl5r6qY7GPyIeL5xGWJbkZP1GgegzaP5T2+IbcHL
-=D+YC
+iF4EAREIAAYFAlRrqzsACgkQVxOqA9G7/aDqRAD+KB6oHH/nSEAmNkHkI0x1efuh
+GoJLh1DV+7bwJ9HFND4A/2PQ/5p1BO55ZKPUe9f4RySMZEhZS52kiFDWvLIabfSC
+=R9gB
 -----END PGP SIGNATURE-----
diff --git a/www-apps/rt/files/postinstall-en.txt b/www-apps/rt/files/postinstall-en.txt
index c77c0a11e922..a476c18c46b3 100644
--- a/www-apps/rt/files/postinstall-en.txt
+++ b/www-apps/rt/files/postinstall-en.txt
@@ -1,19 +1,19 @@
+Please follow the Gentoo install guide found at:
 
-***********************************************************
-Now you need to configure your RT installation.
-Please follow the Gentoo install guide found at
-http://wiki.bestpractical.com/index.cgi?GentooInstallGuide
+    https://wiki.gentoo.com/wiki/Request_Tracker
 
 Your local config files are located here:
-${VHOST_ROOT}/${PN}-${PVR}/etc/RT_Config.pm
-${VHOST_ROOT}/${PN}-${PVR}/etc/RT_SiteConfig.pm
 
-If you need more help, consider searching the mailing list (Google site:lists.fsck.com )
+    ${VHOST_ROOT}/${PN}-${PVR}/etc
 
-***********************************************************
+************************************************************************
+*    NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE    *
+************************************************************************
 
-NOTE:
+Some file locations have changed. Everything is now installed, for real
+this time, into:
 
-Some file locations have changed. Everything is now installed into
-${VHOST_ROOT}. RT executables are no longer in /usr/bin
-You may need to modify your existing configuration files accordingly.
+    ${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 b/www-apps/rt/files/reconfig
index b066ec52532c..9a1919965386 100644
--- a/www-apps/rt/files/reconfig
+++ b/www-apps/rt/files/reconfig
@@ -2,54 +2,55 @@
 PF=${PN}-${PVR}
 
 die() {
-	echo "#####"
-	echo $1
-	echo "#####"
-	exit 1
+    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/* etc/RT_Config.pm lib/RT.pm sbin/* || die
-       
-       if [[ -e ${VHOST_ROOT}/${PF}/lib/RT/Generated.pm ]]; then
-               sed -e "s|${MY_HOSTROOTDIR}/${PF}|${VHOST_ROOT}/${PF}|g
-                       s|${MY_HTDOCSDIR}|${MY_INSTALLDIR}|g" -i lib/RT/Generated.pm || die
-       fi
+    # So, some craziness happens during the install process. First, we
+    # have doubled slashes, which the ebuild dutifully removes, but
+    # then, at some point, ${ED} is removed including its trailing
+    # slash, which leaves us with relative path references. That's why
+    # we remove the leading slash instead of the trailing slash in the
+    # variables below so that the sed statement will actually match
+    # what we mean.
+    echo "Replacing ${ROOT#/}${MY_HOSTROOTDIR#/} with ${VHOST_ROOT}/${PF}"
+    echo "Replacing ${ROOT#/}${MY_HTDOCSDIR#/} with ${MY_INSTALLDIR}"
+    echo "Replacing RT_DIR with ${VHOST_ROOT}/${PF}"
 
-	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
-	echo "You may need to update your database. For each item in the output below"
-	echo "whose name is greater than your previously installed RT version,"
-	echo "run the following commands, specifying YOUR_DBA_USER:"
-	echo "${VHOST_ROOT}/${PF}/sbin/rt-setup-database --action schema --datadir ${VHOST_ROOT}/${PF}/upgrade/<version> --dba YOUR_DBA_USER --prompt-for-dba-password"
-	echo "${VHOST_ROOT}/${PF}/sbin/rt-setup-database --action acl --datadir ${VHOST_ROOT}/${PF}/upgrade/<version> --dba YOUR_DBA_USER -prompt-for-dba-password"
-	echo "${VHOST_ROOT}/${PF}/sbin/rt-setup-database --action insert --datadir ${VHOST_ROOT}/${PF}/upgrade/<version> --dba YOUR_DBA_USER --prompt-for-dba-password"
-	echo "Note that some upgrade directories don't have all 3 items (schema, acl, insert)"
-	echo "You can skip missing items safely"
-	echo "Don't forget to read the online installation guide for more details"
-	ls
+    for file in $(find ${VHOST_ROOT}/${PF} -type f) ; do
+        sed -e "s|${ROOT#/}${MY_HOSTROOTDIR#/}/${PF}|${VHOST_ROOT}/${PF}|g" \
+            -e "s|${ROOT#/}${MY_HTDOCSDIR#/}|${MY_INSTALLDIR}|g" \
+            -e "s|RT_DIR|${VHOST_ROOT}/${PF}|g" \
+            -i "${file}" || die
+    done
 
+    echo
+    echo "If you're upgrading RT, you may need to update your database."
+    echo "Take a look in:"
+    echo
+    echo "  ${VHOST_ROOT}/${PF}/upgrade"
+    echo
+    echo "Iterate through each sub-directory, in order, whose name is greater"
+    echo "than your previously installed RT version, and run the following"
+    echo "commands:"
+    echo
+    for step in schema acl insert ; do
+        echo "  ${VHOST_ROOT}/${PF}/sbin/rt-setup-database \\"
+        echo "    --action ${step} --dba DBSUPERUSER --prompt-for-dba-password \\"
+        echo "    --datadir ${VHOST_ROOT}/${PF}/upgrade/<version> "
+        echo
+    done
+    echo "Note that some upgrade directories don't have all 3 items (schema,"
+    echo "acl, insert) and you can skip them safely."
+    echo
+    echo "Don't forget to read the online installation guide for more details"
 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}
+    echo "Please examine the contents of the following directories and delete"
+    echo "anything that is no longer necessary:"
+    echo
+    echo "  ${VHOST_ROOT}/${PF}"
+    echo "  ${MY_INSTALLDIR}"
 fi
diff --git a/www-apps/rt/files/rt_apache2.conf b/www-apps/rt/files/rt_apache2.conf
index 363c34f45bf7..bab0a2951c16 100644
--- a/www-apps/rt/files/rt_apache2.conf
+++ b/www-apps/rt/files/rt_apache2.conf
@@ -1,31 +1,16 @@
-<IfDefine PERL>
-<VirtualHost MY_RT_DOMAIN:80>
-	ServerName MY_RT_DOMAIN
-	DocumentRoot HTDOCS
-	ServerAdmin YOUR_EMAIL_HERE
+# Copy the contents of this file to the appropriate location in your
+# Apache configuration.
 
-	AddDefaultCharset UTF-8
+# Adjust the Location path if you have RT being served from a
+# subdirectory instead of from root. (i.e., example.com/rt instead of
+# rt.example.com)
+<Location />
+    SetHandler modperl
+    PerlResponseHandler Plack::Handler::Apache2
+    PerlSetVar psgi_app RT_DIR/sbin/rt-server
+</Location>
 
-	<IfDefine USERDIR>
-		UserDir disabled
-	</IfDefine>
-
-	PerlModule Apache::DBI
-	PerlRequire RT_DIR/bin/webmux.pl
-
-	<Location />
-		SetHandler perl-script
-		PerlHandler RT::Mason
-		PerlSetEnv PERL5LIB /usr/lib
-	</Location>
-
-	<Directory "HTDOCS">
-		Options Indexes FollowSymLinks
-		AllowOverride None
-		Order allow,deny
-		Allow from all
-	</Directory>
-</VirtualHost>
-</IfDefine>
-
-# vim: ts=4 filetype=apache
+<Perl>
+    use Plack::Handler::Apache2;
+    Plack::Handler::Apache2->preload("RT_DIR/sbin/rt-server");
+</Perl>
diff --git a/www-apps/rt/rt-4.2.9.ebuild b/www-apps/rt/rt-4.2.9-r1.ebuild
index aaae90c0b1f6..52ef1f460e87 100644
--- a/www-apps/rt/rt-4.2.9.ebuild
+++ b/www-apps/rt/rt-4.2.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-4.2.9.ebuild,v 1.2 2014/11/16 21:04:09 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-4.2.9-r1.ebuild,v 1.1 2014/11/18 20:25:29 titanofold Exp $
 
 EAPI=5
 
@@ -193,8 +193,10 @@ pkg_setup() {
 src_prepare() {
 	# add Gentoo-specific 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
+	sed -e "s|PREFIX|${D}/${MY_HOSTROOTDIR}/${PF}|g" \
+		-e "s|HTMLDIR|${D}/${MY_HTDOCSDIR}|g" \
+		-e 's|/\+|/|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