Remove old.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key )

5 files changed, 7 insertions, 140 deletions

diff --git a/www-apache/mod_python/ChangeLog b/www-apache/mod_python/ChangeLog
index a9e3466cb233..c063774bbd89 100644
--- a/www-apache/mod_python/ChangeLog
+++ b/www-apache/mod_python/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_python
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/ChangeLog,v 1.35 2015/06/02 05:18:18 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/ChangeLog,v 1.36 2015/07/22 11:41:33 mrueg Exp $
+
+  22 Jul 2015; Manuel Rüger <mrueg@gentoo.org>
+  -files/mod_python-3.3.1-LDFLAGS.patch,
+  -files/mod_python-3.3.1-apache-2.4.patch,
+  -files/mod_python-apr_brigade_sentinel.patch, -mod_python-3.3.1-r1.ebuild:
+  Remove old.
 
   02 Jun 2015; Jack Morgan <jmorgan@gentoo.org> mod_python-3.5.0.ebuild:
   sparc stable wrt bug #529544
diff --git a/www-apache/mod_python/files/mod_python-3.3.1-LDFLAGS.patch b/www-apache/mod_python/files/mod_python-3.3.1-LDFLAGS.patch
deleted file mode 100644
index 0562f93db748..000000000000
--- a/www-apache/mod_python/files/mod_python-3.3.1-LDFLAGS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -267,10 +267,7 @@
- AC_MSG_CHECKING(linker flags used to link Python)
- AC_SUBST(LDFLAGS)
- PyLFS=`grep "^LINKFORSHARED=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' '   '`
--PyLDFLAGS=`grep "^LDFLAGS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' '   '`
--LDFLAGS="${LDFLAGS} ${PyLFS} ${PyLDFLAGS}"
--LDFLAGS="${LDFLAGS} ${PY_LDFLAGS}"
--AC_MSG_RESULT($PY_LDFLAGS)
-+LDFLAGS="${LDFLAGS} ${PyLFS}"
- 
- AC_MSG_CHECKING(where Python include files are)
- AC_SUBST(INCLUDES)
diff --git a/www-apache/mod_python/files/mod_python-3.3.1-apache-2.4.patch b/www-apache/mod_python/files/mod_python-3.3.1-apache-2.4.patch
deleted file mode 100644
index 135ef2e765b4..000000000000
--- a/www-apache/mod_python/files/mod_python-3.3.1-apache-2.4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-TODO:
-src/requestobject.c uses ap_requires() which has been removed in r368027.
-https://svn.apache.org/viewvc?view=rev&revision=368027
-
---- src/include/mod_python.h.in
-+++ src/include/mod_python.h.in
-@@ -72,6 +72,11 @@
- #endif
- #endif
- 
-+#if !AP_MODULE_MAGIC_AT_LEAST(20081201,0)
-+#define ap_unixd_config unixd_config
-+#define ap_unixd_set_global_mutex_perms unixd_set_global_mutex_perms
-+#endif
-+
- /* Python headers */
- /* this gets rid of some compile warnings */
- #if defined(_POSIX_THREADS)
---- src/mod_python.c
-+++ src/mod_python.c
-@@ -555,14 +555,14 @@
-         else {
- 
-             /*XXX As of httpd 2.0.4, the below should be just
--              a call to unixd_set_global_mutex_perms(mutex[n]); and
-+              a call to ap_unixd_set_global_mutex_perms(mutex[n]); and
-               nothing else... For now, while 2.0.48 isn't commonplace yet,
-               this ugly code should be here */
- 
- #if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
-             if  (!geteuid()) {
--                chown(fname, unixd_config.user_id, -1);
--                unixd_set_global_mutex_perms(mutex[n]);
-+                chown(fname, ap_unixd_config.user_id, -1);
-+                ap_unixd_set_global_mutex_perms(mutex[n]);
-             }
- #endif
-         }
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
deleted file mode 100644
index 95e3ea2eccfb..000000000000
--- a/www-apache/mod_python/files/mod_python-apr_brigade_sentinel.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 06705fce4885..000000000000
--- a/www-apache/mod_python/mod_python-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 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.9 2014/08/10 20:17:28 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit apache-module autotools eutils python
-
-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"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
-IUSE=""
-RESTRICT="test" # bug 343663
-
-DEPEND=""
-RDEPEND=""
-
-APACHE2_MOD_CONF="16_${PN}"
-APACHE2_MOD_DEFINE="PYTHON"
-
-DOCFILES="README NEWS CREDITS"
-
-need_apache2_2
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-apr_brigade_sentinel.patch"
-	epatch "${FILESDIR}/${P}-apache-2.4.patch"
-	epatch "${FILESDIR}/${P}-LDFLAGS.patch"
-
-	# Remove optimisations, we do that outside Portage
-	sed -i -e 's:--optimize 2:--no-compile:' dist/Makefile.in
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-apxs=${APXS}
-}
-
-src_compile() {
-	emake OPT="`apxs2 -q CFLAGS` -fPIC" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dohtml -r doc-html/*
-	apache-module_src_install
-}
-
-src_test() {
-	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() {
-	apache-module_pkg_postinst
-	python_mod_optimize mod_python
-}
-
-pkg_postrm() {
-	python_mod_cleanup mod_python
-}