Fixed #121041 for real.

Package-Manager: portage-2.1_pre3-r1

5 files changed, 20 insertions, 14 deletions

diff --git a/www-apache/mod_survey/ChangeLog b/www-apache/mod_survey/ChangeLog
index 0c2597187dd7..0ae1a22e1756 100644
--- a/www-apache/mod_survey/ChangeLog
+++ b/www-apache/mod_survey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_survey
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_survey/ChangeLog,v 1.11 2006/01/31 17:01:16 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_survey/ChangeLog,v 1.12 2006/01/31 22:06:14 rl03 Exp $
+
+*mod_survey-3.2.3-r2 (31 Jan 2006)
+
+  31 Jan 2006; Renat Lumpau <rl03@gentoo.org> files/reconfig,
+  -mod_survey-3.2.3-r1.ebuild, +mod_survey-3.2.3-r2.ebuild:
+  Fixed #121041 for real.
 
 *mod_survey-3.2.3-r1 (31 Jan 2006)
 
diff --git a/www-apache/mod_survey/Manifest b/www-apache/mod_survey/Manifest
index ab71be1409aa..eb528cc133e1 100644
--- a/www-apache/mod_survey/Manifest
+++ b/www-apache/mod_survey/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3ea952b9482ec9c56731164e6a789075 ChangeLog 2084
-MD5 a37f666937f5688f7467a09f127543ee files/digest-mod_survey-3.2.3-r1 133
+MD5 f56b814ce72601666339a93d2ad3d170 ChangeLog 2269
+MD5 a37f666937f5688f7467a09f127543ee files/digest-mod_survey-3.2.3-r2 133
 MD5 93b4750ff04770f08971e73b328c3486 files/language-list.txt 15
 MD5 e844b8372b46feedac36c6b5141c3696 files/postinstall-en.txt 158
-MD5 0663294143b6e81b1aed773a44aedf3e files/reconfig 244
+MD5 8d92b174d7809f56199ddc42c0e05b3a files/reconfig 304
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 d865c9aeb504fbd6d0eba11e84a34d33 mod_survey-3.2.3-r1.ebuild 3239
+MD5 3cfa9de0f5f872833cae6470e520598c mod_survey-3.2.3-r2.ebuild 3124
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD35foEzitwsaoONoRAuKBAJ9NJwEqO6f1jwRpnCtGeUGO2GVAggCgyzMs
-pXRLU1dd7ZOp7e/hamH2MY0=
-=aY1f
+iD8DBQFD39+UEzitwsaoONoRAh6CAJ0a5PhStIFhRvyHFdUaTqunlbWz0wCfe93c
+Pz4Vo/2w0eHMy+RjMOxJEk0=
+=JEAn
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_survey/files/digest-mod_survey-3.2.3-r1 b/www-apache/mod_survey/files/digest-mod_survey-3.2.3-r2
index 8ffb8f7569c3..8ffb8f7569c3 100644
--- a/www-apache/mod_survey/files/digest-mod_survey-3.2.3-r1
+++ b/www-apache/mod_survey/files/digest-mod_survey-3.2.3-r2
diff --git a/www-apache/mod_survey/files/reconfig b/www-apache/mod_survey/files/reconfig
index 92774268f8c2..15be772473f0 100644
--- a/www-apache/mod_survey/files/reconfig
+++ b/www-apache/mod_survey/files/reconfig
@@ -8,7 +8,9 @@ die() {
 }
 
 if [ $1 = "install" ]; then
-	sed -e "s|/usr/lib/mod_survey/webroot/|${VHOST_ROOT}/${PN}/|g" -i ${VHOST_ROOT}/${PN}/survey.conf || die
+	sed -e "s|/usr/lib/mod_survey/webroot/|${MY_INSTALLDIR}/|g
+			s|\"/mod_survey/\"|\"${VHOST_APPDIR}/\"|
+			s|Alias|#Alias|" -i ${VHOST_ROOT}/${PN}/survey.conf || die
 
 elif [ $1 = "clean" ]; then
 	echo $1
diff --git a/www-apache/mod_survey/mod_survey-3.2.3-r1.ebuild b/www-apache/mod_survey/mod_survey-3.2.3-r2.ebuild
index 6b4ac668e0c0..4c6cb166bd7b 100644
--- a/www-apache/mod_survey/mod_survey-3.2.3-r1.ebuild
+++ b/www-apache/mod_survey/mod_survey-3.2.3-r2.ebuild
@@ -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-apache/mod_survey/mod_survey-3.2.3-r1.ebuild,v 1.1 2006/01/31 17:01:17 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_survey/mod_survey-3.2.3-r2.ebuild,v 1.1 2006/01/31 22:06:14 rl03 Exp $
 
 inherit webapp
 
@@ -78,10 +78,8 @@ src_install() {
 	sed -i "s|/usr/lib/mod_survey/data/|/var/lib/mod_survey/data/|" ${D}/usr/lib/mod_survey/survey.conf
 	mv ${D}/usr/lib/mod_survey/survey.conf ${D}/${MY_HOSTROOTDIR}/${PN}
 
-	# install webroot using webapp.eclass
-	# webroot should not go into MY_HTDOCSDIR b/c that throws off Alias
 	rm -rf ${D}/usr/lib/mod_survey/webroot ${D}/usr/lib/mod_survey/data
-	cp -R webroot/* ${D}/${MY_HOSTROOTDIR}/${PN}
+	cp -R webroot/* ${D}/${MY_HTDOCSDIR}
 
 	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
 	webapp_hook_script ${FILESDIR}/reconfig
@@ -93,7 +91,7 @@ pkg_postinst(){
 	if [ ${#LINGUAS} -gt 2 ] && use nls; then
 		ewarn
 		ewarn "You have more than one language in LINGUAS"
-		ewarn "Due to the limitations of this packge, it was built"
+		ewarn "Due to the limitations of this package, it was built"
 		ewarn "only with ${LINGUAS:0:2} support. If this is not what"
 		ewarn "you intended, please place the language you desire"
 		ewarn "_first_ in the list of LINGUAS in /etc/make.conf"