Version bump and general cleanup per bug #75037.

(Portage version: 2.0.53)

8 files changed, 44 insertions, 48 deletions

diff --git a/www-apache/mod_survey/ChangeLog b/www-apache/mod_survey/ChangeLog
index 906baef76819..e863cd482d5b 100644
--- a/www-apache/mod_survey/ChangeLog
+++ b/www-apache/mod_survey/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apache/mod_survey
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_survey/ChangeLog,v 1.6 2005/05/24 14:29:45 mcummings Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_survey/ChangeLog,v 1.7 2006/01/07 17:11:23 rl03 Exp $
+
+*mod_survey-3.2.3_pre2 (07 Jan 2006)
+
+  07 Jan 2006; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  -files/reconfig, metadata.xml, -mod_survey-3.2.0.ebuild,
+  +mod_survey-3.2.3_pre2.ebuild:
+  Version bump and general cleanup per bug #75037.
 
   24 May 2005; Michael Cummings <mcummings@gentoo.org>
   mod_survey-3.2.0.ebuild:
diff --git a/www-apache/mod_survey/Manifest b/www-apache/mod_survey/Manifest
index b3291794c946..d79c3360c75d 100644
--- a/www-apache/mod_survey/Manifest
+++ b/www-apache/mod_survey/Manifest
@@ -1,6 +1,5 @@
 MD5 e8998eaaf8cb2c01687412bd3d6e77aa ChangeLog 1004
-MD5 14d833e6ab31ed6765dd0116b0576876 files/digest-mod_survey-3.2.0 67
-MD5 6e46d5897e70491662270bc3de8c0236 files/postinstall-en.txt 407
-MD5 c778b2cb7c0d593c715c3be9020d4d24 files/reconfig 218
-MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 4d2c527c4427d4f61d81614cadc48c2c mod_survey-3.2.0.ebuild 1902
+MD5 f9af89edc8c1f89343a626d9801d6a90 files/digest-mod_survey-3.2.3_pre2 128
+MD5 ba2e5fb76687abf0c16d16eda59d7981 files/postinstall-en.txt 262
+MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
+MD5 43df3801e7a16023f95a73f18dc1b74d mod_survey-3.2.3_pre2.ebuild 2074
diff --git a/www-apache/mod_survey/files/digest-mod_survey-3.2.0 b/www-apache/mod_survey/files/digest-mod_survey-3.2.0
deleted file mode 100644
index 05ffae87c433..000000000000
--- a/www-apache/mod_survey/files/digest-mod_survey-3.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 70d11a7c7131e5e739f34f035a4145d8 modsurvey-3.2.0.tar.gz 403437
diff --git a/www-apache/mod_survey/files/digest-mod_survey-3.2.3_pre2 b/www-apache/mod_survey/files/digest-mod_survey-3.2.3_pre2
new file mode 100644
index 000000000000..f50fc4235a22
--- /dev/null
+++ b/www-apache/mod_survey/files/digest-mod_survey-3.2.3_pre2
@@ -0,0 +1,2 @@
+MD5 3eba7ae6b43e15a02277e5fa9e3b1ace docs32x.tgz 672458
+MD5 378a114ca25743ecf60ff1afa5a845c2 modsurvey-3.2.3-pre2.tar.gz 497291
diff --git a/www-apache/mod_survey/files/postinstall-en.txt b/www-apache/mod_survey/files/postinstall-en.txt
index 5b029265223b..fc3ebf951609 100644
--- a/www-apache/mod_survey/files/postinstall-en.txt
+++ b/www-apache/mod_survey/files/postinstall-en.txt
@@ -1,9 +1,6 @@
+1. Execute sed -i "|/usr/lib/mod_survey/webroot|${VHOST_ROOT}/${PN}|g" /usr/lib/mod_survey/survey.conf
 
-If you are using Apache 1, execute:
-# cp /usr/lib/mod_survey/survey.conf /etc/apache/conf/addon-modules/99_mod_survey.conf
-# echo "Include conf/addon-modules/99_mod_survey.conf" >>	/etc/apache/conf/apache.conf
+2. Copy /usr/lib/mod_survey/survey.conf to your Apache modules directory.
 
-If you are using Apache 2, execute:
-# cp /usr/lib/mod_survey/survey.conf /etc/apache2/conf/modules.d/99_mod_survey.conf
-
-Now restart Apache and test your installation: http://YOURHOST/mod_survey
+3. Restart Apache and test your installation:
+ http://${VHOST_HOSTNAME}/mod_survey
diff --git a/www-apache/mod_survey/files/reconfig b/www-apache/mod_survey/files/reconfig
deleted file mode 100644
index fd53f2a2b155..000000000000
--- a/www-apache/mod_survey/files/reconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if [ $1 = "start" -o $1 = "install" ]; then
-	sed -i "s|/usr/lib/mod_survey/webroot/|${VHOST_ROOT}/webroot/|g" /usr/lib/mod_survey/survey.conf
-	chown apache:apache /var/lib/mod_survey/data
-else
-	echo $1
-fi
diff --git a/www-apache/mod_survey/metadata.xml b/www-apache/mod_survey/metadata.xml
index d8b96be3c5cd..95c06f0095bb 100644
--- a/www-apache/mod_survey/metadata.xml
+++ b/www-apache/mod_survey/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>bug-wranglers@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
+<herd>web-apps</herd>
 </pkgmetadata>
diff --git a/www-apache/mod_survey/mod_survey-3.2.0.ebuild b/www-apache/mod_survey/mod_survey-3.2.3_pre2.ebuild
index 449365f079d0..659a16f28434 100644
--- a/www-apache/mod_survey/mod_survey-3.2.0.ebuild
+++ b/www-apache/mod_survey/mod_survey-3.2.3_pre2.ebuild
@@ -1,22 +1,27 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.0.ebuild,v 1.6 2005/05/24 14:29:45 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_survey/mod_survey-3.2.3_pre2.ebuild,v 1.1 2006/01/07 17:11:23 rl03 Exp $
 
 inherit webapp
 
+WEBAPP_MANUAL_SLOT="yes"
+SLOT="0"
+
 DESCRIPTION="XML-defined web questionnaires as a plug-in module for Apache"
 HOMEPAGE="http://gathering.itm.mh.se/modsurvey/"
 KEYWORDS="~x86 ~ppc ~amd64"
 
-IUSE="apache2 postgres mysql"
-MY_P=${P/mod_survey/modsurvey}
-S=${WORKDIR}/${MY_P}
-SRC_URI="http://gathering.itm.mh.se/modsurvey/download/${MY_P}.tar.gz"
+IUSE="apache2 doc mysql postgres"
+MY_PN=${PN/_/}
+MY_PV=${PV/_/-}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+SRC_URI="http://gathering.itm.mh.se/${MY_PN}/download/test/${MY_PN}-${MY_PV}.tar.gz
+	doc? ( http://gathering.itm.mh.se/${MY_PN}/download/test/docs32x.tgz )"
 
 DEPEND=">=dev-lang/perl-5.6.1"
 RDEPEND="${DEPEND}
 		apache2? ( >=net-www/apache-2 >=www-apache/mod_perl-1.99 )
-		!apache2? ( >=net-www/apache-1 >=www-apache/mod_perl-1.27 )
+		!apache2? ( >=net-www/apache-1 <www-apache/mod_perl-1.99 )
 		postgres? ( >=dev-perl/DBI-1.38	dev-perl/DBD-Pg )
 		mysql? ( >=dev-perl/DBI-1.38 dev-perl/DBD-mysql )
 		>=perl-core/CGI-3.0.0"
@@ -26,38 +31,37 @@ src_unpack() {
 	webapp_pkg_setup
 	unpack ${A}
 	cd ${S}
+	rm -f docs/LICENSE.txt
 	sed -i "s|/usr/local/mod_survey/|${D}/usr/lib/mod_survey/|g" installer.pl
-}
+	use doc && unpack docs32x.tgz
 
-src_compile() {
-	:;
+	# create answers for the install script
+	! use apache2 && echo -e "\n\n\n\n\n\n\n\nyes\n\n" > ${T}/out
 }
 
 src_install() {
 	webapp_src_preinst
+
 	dodir /usr/lib/mod_survey
 	dodir /var/lib/mod_survey/data
+	fowners apache:apache /var/lib/mod_survey/data
+	dodir ${MY_HOSTROOTDIR}/${PN}
 
-	rm -f docs/LICENSE.txt
 	dodoc README.txt docs/*
-	rm -rf README.txt docs/
 
 	if use apache2; then
 		perl installer.pl < /dev/null > /dev/null 2>&1
-		dosed /usr/lib/mod_survey/survey.conf
 	else
-		echo -e "\n\n\n\n\n\n\nyes\n\n" > out
-		perl installer.pl < out > /dev/null 2>&1
-		rm -f out
-		dosed /usr/lib/mod_survey/survey.conf
+		perl installer.pl < ${T}/out > /dev/null 2>&1
 	fi
-	sed -i "s|\/usr\/lib\/mod_survey\/data\/|\/var\/lib\/mod_survey\/data\/|" ${D}/usr/lib/mod_survey/survey.conf
+	dosed /usr/lib/mod_survey/survey.conf
+	sed -i "s|/usr/lib/mod_survey/data/|/var/lib/mod_survey/data/|" ${D}/usr/lib/mod_survey/survey.conf
 
 	# 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}
-	webapp_hook_script ${FILESDIR}/reconfig
+	cp -R webroot/* ${D}/${MY_HOSTROOTDIR}/${PN}
+
 	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
 	webapp_src_install
 }