Version bump (bug #138576).

(Portage version: 2.1)
 (Signed Manifest commit)

3 files changed, 29 insertions, 110 deletions

diff --git a/www-apache/mod_survey/Manifest b/www-apache/mod_survey/Manifest
index eb528cc133e1..8fd45d003e60 100644
--- a/www-apache/mod_survey/Manifest
+++ b/www-apache/mod_survey/Manifest
@@ -1,17 +1,39 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f56b814ce72601666339a93d2ad3d170 ChangeLog 2269
-MD5 a37f666937f5688f7467a09f127543ee files/digest-mod_survey-3.2.3-r2 133
+AUX language-list.txt 15 RMD160 75371acf87bd4a0878d4537edb0a8c5b5e3f6163 SHA1 2ee552c72259773dc86ae739f466fbc8fe9a1179 SHA256 8390c1de74985e4afe829a5d872796e83ce732503a789a74b2fd22e345facffa
 MD5 93b4750ff04770f08971e73b328c3486 files/language-list.txt 15
+RMD160 75371acf87bd4a0878d4537edb0a8c5b5e3f6163 files/language-list.txt 15
+SHA256 8390c1de74985e4afe829a5d872796e83ce732503a789a74b2fd22e345facffa files/language-list.txt 15
+AUX postinstall-en.txt 158 RMD160 768b75129232255af63e41edc310ae5f551223d2 SHA1 788951b68461fda482114ccab220ea2f8ff6bbae SHA256 d879718ca7eafb8b61f86f00d2f9360be231e27f4d762688b371d5d113697c4a
 MD5 e844b8372b46feedac36c6b5141c3696 files/postinstall-en.txt 158
+RMD160 768b75129232255af63e41edc310ae5f551223d2 files/postinstall-en.txt 158
+SHA256 d879718ca7eafb8b61f86f00d2f9360be231e27f4d762688b371d5d113697c4a files/postinstall-en.txt 158
+AUX reconfig 304 RMD160 d86461a6aa2b23d933099336c7f95be09f04170b SHA1 3ba22fc2321e60e6c895a45a043113e0db7b142c SHA256 40f8ddfd701c7be72dbe0346fe57484f39b9cd65c8d3de18b5ceabb57cd12216
 MD5 8d92b174d7809f56199ddc42c0e05b3a files/reconfig 304
+RMD160 d86461a6aa2b23d933099336c7f95be09f04170b files/reconfig 304
+SHA256 40f8ddfd701c7be72dbe0346fe57484f39b9cd65c8d3de18b5ceabb57cd12216 files/reconfig 304
+DIST modsurvey-3.2.4.tgz 496604 RMD160 46027f08ddcb581dceb52121c1c37b177d6fde24 SHA1 23b93e84da6aa63ef430bc278cbaa950ab939305 SHA256 6130501fb6f39817fe842a613f9b2770519c59fed060b16447f1d75345aa14af
+DIST modsurvey-docs-3.2.4.tgz 678356 RMD160 507b89416cc1f39cc19d90c3f795191c8ca7a4b6 SHA1 dd85990bcdc4cde6afe7e91269b05471028653ba SHA256 53c0e0d4335ded221c30fa52c4202793b86aef370d7b92341fb4fcaac12c1fd6
+EBUILD mod_survey-3.2.4.ebuild 3109 RMD160 846dd11765763538f636316f6a68000c741d2758 SHA1 2819ebafa1ffda09f99e25d6ddc87272d96d3dbc SHA256 29485f39b44f58771ae4ccd4496dc2a711781f53dd33fd3af9c4c219f9974fe8
+MD5 a2ee5ca8ac3a6b7c4e931f466b3a648a mod_survey-3.2.4.ebuild 3109
+RMD160 846dd11765763538f636316f6a68000c741d2758 mod_survey-3.2.4.ebuild 3109
+SHA256 29485f39b44f58771ae4ccd4496dc2a711781f53dd33fd3af9c4c219f9974fe8 mod_survey-3.2.4.ebuild 3109
+MISC ChangeLog 2436 RMD160 2d1664bce3f2e4bab95532bc3de796e12a91ac11 SHA1 9d262a019f141ddd6d11559855e286401d08aec6 SHA256 f23ab30155e57b594135b0255bde2d13ad0b328772c97728ee8c68a8896804a9
+MD5 f183447b64e68891fde3529b3407b694 ChangeLog 2436
+RMD160 2d1664bce3f2e4bab95532bc3de796e12a91ac11 ChangeLog 2436
+SHA256 f23ab30155e57b594135b0255bde2d13ad0b328772c97728ee8c68a8896804a9 ChangeLog 2436
+MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 3cfa9de0f5f872833cae6470e520598c mod_survey-3.2.3-r2.ebuild 3124
+RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b metadata.xml 161
+SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 metadata.xml 161
+MD5 c7b28253ae198655ea0bcb70403a6e7f files/digest-mod_survey-3.2.4 491
+RMD160 2e4d26358fc1ab489db779b2f794069b54d63ee5 files/digest-mod_survey-3.2.4 491
+SHA256 1550467b09ad4c85ba4d5080eec26eae0d8b02239716805a07251d5da83a8405 files/digest-mod_survey-3.2.4 491
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFD39+UEzitwsaoONoRAh6CAJ0a5PhStIFhRvyHFdUaTqunlbWz0wCfe93c
-Pz4Vo/2w0eHMy+RjMOxJEk0=
-=JEAn
+iD8DBQFEpg7UEzitwsaoONoRAvM+AJ9/+qeZDPY71ozrlZ3I1pNjx/vXHACeLKjw
+k2RqKHGyNAweWcPB87sDS94=
+=aSe4
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_survey/files/digest-mod_survey-3.2.3-r2 b/www-apache/mod_survey/files/digest-mod_survey-3.2.3-r2
deleted file mode 100644
index 8ffb8f7569c3..000000000000
--- a/www-apache/mod_survey/files/digest-mod_survey-3.2.3-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 57d04d1037e8f1db49be3cea51f1ea1c modsurvey-3.2.3.tgz 420971
-MD5 bc167be2b64d20fc85234f8143b40774 modsurvey-docs-3.2.3.tgz 678399
diff --git a/www-apache/mod_survey/mod_survey-3.2.3-r2.ebuild b/www-apache/mod_survey/mod_survey-3.2.3-r2.ebuild
deleted file mode 100644
index 4c6cb166bd7b..000000000000
--- a/www-apache/mod_survey/mod_survey-3.2.3-r2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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-r2.ebuild,v 1.1 2006/01/31 22:06:14 rl03 Exp $
-
-inherit webapp
-
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
-
-DESCRIPTION="XML-defined web questionnaires as a plug-in module for Apache"
-HOMEPAGE="http://www.modsurvey.org"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-IUSE="apache2 doc mysql nls postgres"
-MY_PN=${PN/_/}
-MY_PV=${PV/_/-}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-SRC_URI="http://www.modsurvey.org/download/tarballs/${MY_PN}-${MY_PV}.tgz
-doc? ( http://www.modsurvey.org/download/tarballs/${MY_PN}-docs-${MY_PV}.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"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# stolen from app-admin/webalizer
-	# USE=nls has no real meaning if LINGUAS isn't set
-	if use nls && [ -z "${LINGUAS}" ]; then
-		ewarn "you must set LINGUAS in /etc/make.conf"
-		ewarn "if you want to USE=nls"
-		die "please either set LINGUAS or do not use nls"
-	fi
-}
-
-src_unpack() {
-	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 ${MY_PN}-docs-${PV}.tgz
-
-	# unfortunatly, this program only allows for one lang, so only the first
-	# entry in LINGUAS is used
-	if use nls; then
-		local locallang
-		if ! grep -q ${LINGUAS:0:2} ${FILESDIR}/language-list.txt; then
-			ewarn "Language ${LINGUAS:0:2} is not supported, using English"
-		else
-			einfo "Using language ${LINGUAS:0:2}"
-			locallang="$(grep ^${LINGUAS:0:2} ${FILESDIR}/language-list.txt)"
-			sed "s|\$lang = \"en\"|\$lang = \"${locallang}\"|" -i installer.pl
-		fi
-	fi
-
-	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
-	mv ${D}/usr/lib/mod_survey/survey.conf ${D}/${MY_HOSTROOTDIR}/${PN}
-
-	rm -rf ${D}/usr/lib/mod_survey/webroot ${D}/usr/lib/mod_survey/data
-	cp -R webroot/* ${D}/${MY_HTDOCSDIR}
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_hook_script ${FILESDIR}/reconfig
-	webapp_src_install
-	fowners apache:apache /var/lib/mod_survey/data
-}
-
-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 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"
-		ewarn
-	fi
-	webapp_pkg_postinst
-}