Version bump, removed old versions

(Portage version: 2.0.53)

7 files changed, 13 insertions, 88 deletions

diff --git a/www-apache/mod_survey/ChangeLog b/www-apache/mod_survey/ChangeLog
index ea33eba41035..bf00f3ba3107 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.8 2006/01/16 18:08:43 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_survey/ChangeLog,v 1.9 2006/01/19 02:28:42 rl03 Exp $
+
+*mod_survey-3.2.3_pre3 (19 Jan 2006)
+
+  19 Jan 2006; Renat Lumpau <rl03@gentoo.org> -mod_survey-3.2.3_pre2.ebuild,
+  -mod_survey-3.2.3_pre2-r1.ebuild, +mod_survey-3.2.3_pre3.ebuild:
+  Version bump, removed old versions
 
 *mod_survey-3.2.3_pre2-r1 (16 Jan 2006)
 
diff --git a/www-apache/mod_survey/Manifest b/www-apache/mod_survey/Manifest
index c8c0302d0fa3..58c2741040be 100644
--- a/www-apache/mod_survey/Manifest
+++ b/www-apache/mod_survey/Manifest
@@ -1,17 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 aed973712277c0f9f373b76770b141b8 ChangeLog 1428
-MD5 f9af89edc8c1f89343a626d9801d6a90 files/digest-mod_survey-3.2.3_pre2 128
-MD5 f9af89edc8c1f89343a626d9801d6a90 files/digest-mod_survey-3.2.3_pre2-r1 128
+MD5 3dabbed5d590b1ad0f76111252a89542 files/digest-mod_survey-3.2.3_pre3 128
 MD5 597d4a1386896cc5e4e3f269da7cf10f files/postinstall-en.txt 158
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 de9f766e4e6a7a8c5b214b318262103e mod_survey-3.2.3_pre2-r1.ebuild 1980
-MD5 e3e204459afd4c4af8afc1c4685fe437 mod_survey-3.2.3_pre2.ebuild 2074
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDy+E3EzitwsaoONoRAteIAJ49BlQNLU7CITdEHp3iGEWuEqTBZACgv0NR
-CZXTxrMkbamxjYGIknpvjpE=
-=s+yG
------END PGP SIGNATURE-----
+MD5 b1db15cdef163dc33491bfe65dfa578c mod_survey-3.2.3_pre3.ebuild 1980
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
deleted file mode 100644
index f50fc4235a22..000000000000
--- a/www-apache/mod_survey/files/digest-mod_survey-3.2.3_pre2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3eba7ae6b43e15a02277e5fa9e3b1ace docs32x.tgz 672458
-MD5 378a114ca25743ecf60ff1afa5a845c2 modsurvey-3.2.3-pre2.tar.gz 497291
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
deleted file mode 100644
index f50fc4235a22..000000000000
--- a/www-apache/mod_survey/files/digest-mod_survey-3.2.3_pre2-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3eba7ae6b43e15a02277e5fa9e3b1ace docs32x.tgz 672458
-MD5 378a114ca25743ecf60ff1afa5a845c2 modsurvey-3.2.3-pre2.tar.gz 497291
diff --git a/www-apache/mod_survey/files/digest-mod_survey-3.2.3_pre3 b/www-apache/mod_survey/files/digest-mod_survey-3.2.3_pre3
new file mode 100644
index 000000000000..23687ea66a24
--- /dev/null
+++ b/www-apache/mod_survey/files/digest-mod_survey-3.2.3_pre3
@@ -0,0 +1,2 @@
+MD5 3eba7ae6b43e15a02277e5fa9e3b1ace docs32x.tgz 672458
+MD5 f18ca96b3a544ed19182191d9503673c modsurvey-3.2.3-pre3.tar.gz 502456
diff --git a/www-apache/mod_survey/mod_survey-3.2.3_pre2.ebuild b/www-apache/mod_survey/mod_survey-3.2.3_pre2.ebuild
deleted file mode 100644
index 659a16f28434..000000000000
--- a/www-apache/mod_survey/mod_survey-3.2.3_pre2.ebuild
+++ /dev/null
@@ -1,67 +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_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 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
-
-	# 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}
-
-	dodoc README.txt docs/*
-
-	if use apache2; then
-		perl installer.pl < /dev/null > /dev/null 2>&1
-	else
-		perl installer.pl < ${T}/out > /dev/null 2>&1
-	fi
-	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
-}
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_pre3.ebuild
index f44e74bb84a9..163973f8e401 100644
--- a/www-apache/mod_survey/mod_survey-3.2.3_pre2-r1.ebuild
+++ b/www-apache/mod_survey/mod_survey-3.2.3_pre3.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_pre2-r1.ebuild,v 1.1 2006/01/16 18:08:43 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_survey/mod_survey-3.2.3_pre3.ebuild,v 1.1 2006/01/19 02:28:42 rl03 Exp $
 
 inherit webapp
 
@@ -22,7 +22,7 @@ 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 )
+		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"