Revision bump. Closes bug #230211. Thanks Cilly <cilly@cilly.mine.nu> for the patch

(Portage version: 2.1.4.4)

3 files changed, 85 insertions, 1 deletions

diff --git a/www-apache/mod_python/ChangeLog b/www-apache/mod_python/ChangeLog
index 2f641bb7c5b8..a182ff10625c 100644
--- a/www-apache/mod_python/ChangeLog
+++ b/www-apache/mod_python/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apache/mod_python
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/ChangeLog,v 1.13 2008/05/29 18:12:41 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/ChangeLog,v 1.14 2008/08/25 01:42:55 neurogeek Exp $
+
+*mod_python-3.3.1-r1 (24 Aug 2008)
+
+  24 Aug 2008; Jesus Rivero <neurogeek@gentoo.org>
+  +files/mod_python-apr_brigade_sentinel.patch, +mod_python-3.3.1-r1.ebuild:
+  Revision bump. Closes bug #230211. Thanks Cilly <cilly@cilly.mine.nu> for
+  the patch
 
   29 May 2008; Ali Polatel <hawking@gentoo.org> mod_python-3.3.1.ebuild:
   python_mod_{cleanup,optimize} are ROOT aware.
diff --git a/www-apache/mod_python/files/mod_python-apr_brigade_sentinel.patch b/www-apache/mod_python/files/mod_python-apr_brigade_sentinel.patch
new file mode 100644
index 000000000000..95e3ea2eccfb
--- /dev/null
+++ b/www-apache/mod_python/files/mod_python-apr_brigade_sentinel.patch
@@ -0,0 +1,12 @@
+diff -burN mod_python-3.3.1.original/src/connobject.c mod_python-3.3.1/src/connobject.c
+--- mod_python-3.3.1.original/src/connobject.c	2006-12-03 05:36:37.000000000 +0100
++++ mod_python-3.3.1/src/connobject.c	2008-07-15 01:05:01.000000000 +0200
+@@ -139,7 +139,7 @@
+     bytes_read = 0;
+ 
+     while ((bytes_read < len || len == 0) &&
+-           !(b == APR_BRIGADE_SENTINEL(b) ||
++           !(b == APR_BRIGADE_SENTINEL(bb) ||
+              APR_BUCKET_IS_EOS(b) || APR_BUCKET_IS_FLUSH(b))) {
+ 
+         const char *data;
\ No newline at end of file
diff --git a/www-apache/mod_python/mod_python-3.3.1-r1.ebuild b/www-apache/mod_python/mod_python-3.3.1-r1.ebuild
new file mode 100644
index 000000000000..dd554ca98e76
--- /dev/null
+++ b/www-apache/mod_python/mod_python-3.3.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/mod_python-3.3.1-r1.ebuild,v 1.1 2008/08/25 01:42:55 neurogeek Exp $
+
+inherit eutils python apache-module multilib
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+DESCRIPTION="An Apache2 module providing an embedded Python interpreter."
+HOMEPAGE="http://www.modpython.org/"
+SRC_URI="mirror://apache/httpd/modpython/${P}.tgz"
+LICENSE="Apache-1.1"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-lang/python"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="16_${PN}"
+APACHE2_MOD_DEFINE="PYTHON"
+
+DOCFILES="README NEWS CREDITS"
+
+need_apache2
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-apr_brigade_sentinel.patch"
+	# Remove optimisations, we do that outside Portage
+	sed -i -e 's:--optimize 2:--no-compile:' dist/Makefile.in
+}
+
+src_compile() {
+	econf --with-apxs=${APXS} || die "econf failed"
+	sed -i -e 's/ -Wl,--hash-style  $//' src/Makefile
+	emake OPT="`apxs2 -q CFLAGS` -fPIC" || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dohtml -r doc-html/*
+	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 $(python_get_sitedir)/mod_python
+	apache-module_pkg_postinst
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/mod_python
+}