Version bump (including some cleanup and added tests). Dropped old version with security issue (bug #169286).

(Portage version: 2.1.2.2)

5 files changed, 35 insertions, 31 deletions

diff --git a/dev-python/mod_python/ChangeLog b/dev-python/mod_python/ChangeLog
index 904766185666..2ccd127d635f 100644
--- a/dev-python/mod_python/ChangeLog
+++ b/dev-python/mod_python/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/mod_python
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.55 2007/03/10 21:49:38 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.56 2007/03/16 11:02:42 dev-zero Exp $
+
+*mod_python-3.3.1 (16 Mar 2007)
+
+  16 Mar 2007; Tiziano Müller <dev-zero@gentoo.org>
+  -files/mod_python-3.1.4-configure-bash-3.1.patch,
+  -mod_python-3.1.4-r1.ebuild, +mod_python-3.3.1.ebuild:
+  Version bump (including some cleanup and added tests). Dropped old version
+  with security issue (bug #169286).
 
   10 Mar 2007; Bryan Østergaard <kloeri@gentoo.org>
   mod_python-3.2.10.ebuild:
diff --git a/dev-python/mod_python/files/digest-mod_python-3.1.4-r1 b/dev-python/mod_python/files/digest-mod_python-3.1.4-r1
deleted file mode 100644
index e72694d0806b..000000000000
--- a/dev-python/mod_python/files/digest-mod_python-3.1.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 607175958137b06bcda91110414c82a1 mod_python-3.1.4.tgz 308510
-RMD160 395fdf56a349717dadba418ce91cd5699cf0970f mod_python-3.1.4.tgz 308510
-SHA256 f8e1925a0ade1adf4b5528e892eb347b013100d6c30b0e43209143b427c976a5 mod_python-3.1.4.tgz 308510
diff --git a/dev-python/mod_python/files/digest-mod_python-3.3.1 b/dev-python/mod_python/files/digest-mod_python-3.3.1
new file mode 100644
index 000000000000..aa3e51bc56e3
--- /dev/null
+++ b/dev-python/mod_python/files/digest-mod_python-3.3.1
@@ -0,0 +1,3 @@
+MD5 a3b0150176b726bd2833dac3a7837dc5 mod_python-3.3.1.tgz 447954
+RMD160 f78f93172963317f4318f8f2455419743c8fb4f5 mod_python-3.3.1.tgz 447954
+SHA256 ad2331fd5fcfd720ef9e3482973fc2d06eff36ba0c44693cfa42056a62175a6b mod_python-3.3.1.tgz 447954
diff --git a/dev-python/mod_python/files/mod_python-3.1.4-configure-bash-3.1.patch b/dev-python/mod_python/files/mod_python-3.1.4-configure-bash-3.1.patch
deleted file mode 100644
index f3b5071963b0..000000000000
--- a/dev-python/mod_python/files/mod_python-3.1.4-configure-bash-3.1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'configure.in'
---- configure.in	
-+++ configure.in	
-@@ -275,7 +275,7 @@
- # get the mod_python version
- AC_SUBST(MP_VERSION)
- MP_VERSION=`awk '/MPV_STRING/ {print $3}' src/include/mpversion.h`
--MP_VERSION=`echo $MP_VERSION | sed s/\\"//g`                                      
-+MP_VERSION=`echo $MP_VERSION | sed s/\"//g`                                      
- 
- AC_OUTPUT(Makefile src/Makefile Doc/Makefile test/testconf.py dist/setup.py dist/Makefile)
- 
-
diff --git a/dev-python/mod_python/mod_python-3.1.4-r1.ebuild b/dev-python/mod_python/mod_python-3.3.1.ebuild
index d5985ed15b3b..1a80010aa254 100644
--- a/dev-python/mod_python/mod_python-3.1.4-r1.ebuild
+++ b/dev-python/mod_python/mod_python-3.3.1.ebuild
@@ -1,10 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.1.4-r1.ebuild,v 1.12 2007/01/15 19:59:55 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.3.1.ebuild,v 1.1 2007/03/16 11:02:42 dev-zero Exp $
 
-inherit python eutils apache-module multilib autotools
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=none
 
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+inherit python apache-module multilib autotools
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 
 DESCRIPTION="An Apache2 module providing an embedded Python interpreter."
 HOMEPAGE="http://www.modpython.org/"
@@ -19,7 +22,7 @@ RDEPEND="${DEPEND}"
 APACHE2_MOD_CONF="16_${PN}"
 APACHE2_MOD_DEFINE="PYTHON"
 
-DOCFILES="README NEWS CREDITS COPYRIGHT"
+DOCFILES="README NEWS CREDITS"
 
 need_apache2
 
@@ -28,21 +31,16 @@ src_unpack() {
 	cd "${S}"
 
 	# Remove optimisations, we do that outside Portage
-	sed -ie 's:--optimize 2:--no-compile:' "dist/Makefile.in"
-
-	# Fix compilation when using Python 2.3 or newer
-	if has_version ">=dev-lang/python-2.3" ; then
-		sed -ie 's:LONG_LONG:PY_LONG_LONG:g' "${S}/src/requestobject.c"
-	fi
+	sed -i \
+		-e 's:--optimize 2:--no-compile:' \
+		"dist/Makefile.in"
 
-	# Fix configure with Bash 3.1
-	epatch "${FILESDIR}/${P}-configure-bash-3.1.patch"
 	eautoconf
 }
 
 src_compile() {
 	econf --with-apxs=${APXS2} || die "econf failed"
-	emake OPT="`apxs2 -q CFLAGS` -fPIC" || die "emake failed"
+	emake OPT="`apxs2 -q CFLAGS` -fPIC" || die "econf failed"
 }
 
 src_install() {
@@ -51,6 +49,16 @@ src_install() {
 	apache-module_src_install
 }
 
+src_test() {
+	python_version
+	cd test
+	PYTHONPATH="$(ls -d ${S}/dist/build/lib.*)"
+	sed -i \
+		-e "120ios.environ['PYTHONPATH']=\"${PYTHONPATH}\"" \
+		test.py || die "sed failed"
+	"${python}" test.py || die "tests failed"
+}
+
 pkg_postinst() {
 	python_version
 	python_mod_optimize "/usr/$(get_libdir)/python${PYVER}/site-packages/mod_python"
@@ -58,5 +66,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_version
+	python_mod_cleanup "/usr/$(get_libdir)/python${PYVER}/site-packages/mod_python"
 }