Fixes for bug #119193.

(Portage version: 2.0.53)

5 files changed, 78 insertions, 16 deletions

diff --git a/www-apache/mod_survey/ChangeLog b/www-apache/mod_survey/ChangeLog
index e863cd482d5b..ea33eba41035 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.7 2006/01/07 17:11:23 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_survey/ChangeLog,v 1.8 2006/01/16 18:08:43 rl03 Exp $
+
+*mod_survey-3.2.3_pre2-r1 (16 Jan 2006)
+
+  16 Jan 2006; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +mod_survey-3.2.3_pre2-r1.ebuild:
+  Fixes for bug #119193.
 
 *mod_survey-3.2.3_pre2 (07 Jan 2006)
 
diff --git a/www-apache/mod_survey/Manifest b/www-apache/mod_survey/Manifest
index 7165cc2d7ed1..516123c3a92c 100644
--- a/www-apache/mod_survey/Manifest
+++ b/www-apache/mod_survey/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 83a2f7bc293c0e97c1866393e493f1e0 ChangeLog 1253
 MD5 f9af89edc8c1f89343a626d9801d6a90 files/digest-mod_survey-3.2.3_pre2 128
-MD5 ba2e5fb76687abf0c16d16eda59d7981 files/postinstall-en.txt 262
+MD5 f9af89edc8c1f89343a626d9801d6a90 files/digest-mod_survey-3.2.3_pre2-r1 128
+MD5 597d4a1386896cc5e4e3f269da7cf10f files/postinstall-en.txt 158
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
+MD5 ef16fc578c63673cfff326c8aca06857 mod_survey-3.2.3_pre2-r1.ebuild 1977
 MD5 e3e204459afd4c4af8afc1c4685fe437 mod_survey-3.2.3_pre2.ebuild 2074
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDv/ZGEzitwsaoONoRAjN4AJ4mvsQbS61anXVnes1IrKaFz5TxlQCg10Gf
-KjHjtq/R9XxQrmMi57mQyJA=
-=+VKi
------END PGP SIGNATURE-----
diff --git a/www-apache/mod_survey/files/digest-mod_survey-3.2.3_pre2-r1 b/www-apache/mod_survey/files/digest-mod_survey-3.2.3_pre2-r1
new file mode 100644
index 000000000000..f50fc4235a22
--- /dev/null
+++ b/www-apache/mod_survey/files/digest-mod_survey-3.2.3_pre2-r1
@@ -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 fc3ebf951609..ec2278a04f01 100644
--- a/www-apache/mod_survey/files/postinstall-en.txt
+++ b/www-apache/mod_survey/files/postinstall-en.txt
@@ -1,6 +1,4 @@
-1. Execute sed -i "|/usr/lib/mod_survey/webroot|${VHOST_ROOT}/${PN}|g" /usr/lib/mod_survey/survey.conf
+0. Copy /usr/lib/mod_survey/survey.conf to your Apache modules directory.
 
-2. Copy /usr/lib/mod_survey/survey.conf to your Apache modules directory.
-
-3. Restart Apache and test your installation:
+1. Restart Apache and test your installation:
  http://${VHOST_HOSTNAME}/mod_survey
diff --git a/www-apache/mod_survey/mod_survey-3.2.3_pre2-r1.ebuild b/www-apache/mod_survey/mod_survey-3.2.3_pre2-r1.ebuild
new file mode 100644
index 000000000000..f44e74bb84a9
--- /dev/null
+++ b/www-apache/mod_survey/mod_survey-3.2.3_pre2-r1.ebuild
@@ -0,0 +1,64 @@
+# 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_pre2-r1.ebuild,v 1.1 2006/01/16 18:08:43 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 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.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"
+LICENSE="GPL-2"
+
+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
+
+	if ! use apache2; then
+		sed "s|\$isa2 = \"Off\"|\$isa2 = \"On\"|" -i installer.pl
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodir /usr/lib/mod_survey
+	dodir /var/lib/mod_survey/data
+	dodir ${MY_HOSTROOTDIR}/${PN}
+
+	dodoc README.txt docs/*
+
+	perl installer.pl < /dev/null > /dev/null 2>&1
+	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}/${PN}
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_src_install
+	fowners apache:apache /var/lib/mod_survey/data
+}