Stable on x86.

6 files changed, 16 insertions, 67 deletions

diff --git a/dev-python/mod_python/ChangeLog b/dev-python/mod_python/ChangeLog
index 819f8e26d5a4..83c0405f50c6 100644
--- a/dev-python/mod_python/ChangeLog
+++ b/dev-python/mod_python/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/mod_python
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.16 2004/03/18 22:02:16 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.17 2004/04/01 01:52:07 kloeri Exp $
+
+  01 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> mod_python-2.7.10.ebuild,
+  mod_python-3.0.4-r2.ebuild, mod_python-3.0.4.ebuild:
+  Stable on x86.
 
 *mod_python-3.1.3 (29 Feb 2004)
 
diff --git a/dev-python/mod_python/Manifest b/dev-python/mod_python/Manifest
index 4198c39d9550..007ebd32bfb2 100644
--- a/dev-python/mod_python/Manifest
+++ b/dev-python/mod_python/Manifest
@@ -1,14 +1,12 @@
-MD5 bd87bc5760aea537ccb33141181edd1b mod_python-3.0.4.ebuild 1743
-MD5 e4c76a8d8cfd36c8b102bdf7db583855 mod_python-2.7.10.ebuild 2468
+MD5 85ffe6599381fe48f2792c912a4ef480 ChangeLog 2894
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 9652d61401ec4223b95e16b6afc84b53 mod_python-2.7.10.ebuild 2466
 MD5 48ad7614a54310d19160d57e87516d5c mod_python-3.0.4-r1.ebuild 1876
+MD5 ede7c8b8e6dfdac8aba03c29bc9023ba mod_python-3.0.4-r2.ebuild 1874
 MD5 8250e962c6ccfda2bddd04f3044d2b05 mod_python-3.1.3.ebuild 1780
-MD5 670a497a92cc4e4df6e313b70c7235d5 mod_python-3.0.4-r2.ebuild 1875
-MD5 7803ff27c8ce61462246df573064938c ChangeLog 2741
-MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 05bbbfafd26dcf70f83fcc2b015751dc files/16_mod_python.conf 1106
+MD5 eedde8a8dd90829d24fdb18cc86054f6 files/digest-mod_python-2.7.10 66
 MD5 1fbcf045bdfe9827a893a88a56407656 files/digest-mod_python-3.0.4-r1 65
 MD5 1fbcf045bdfe9827a893a88a56407656 files/digest-mod_python-3.0.4-r2 65
-MD5 01ce560a5062d990e685e78b756fa5ba files/mod_python.conf 70
-MD5 eedde8a8dd90829d24fdb18cc86054f6 files/digest-mod_python-2.7.10 66
-MD5 1fbcf045bdfe9827a893a88a56407656 files/digest-mod_python-3.0.4 65
 MD5 67e42121ddce856c5d7021b3eca7abdb files/digest-mod_python-3.1.3 65
+MD5 01ce560a5062d990e685e78b756fa5ba files/mod_python.conf 70
diff --git a/dev-python/mod_python/files/digest-mod_python-3.0.4 b/dev-python/mod_python/files/digest-mod_python-3.0.4
deleted file mode 100644
index 3eefc4f3ee99..000000000000
--- a/dev-python/mod_python/files/digest-mod_python-3.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d4a51a049f84c5150878625911d8f1d5 mod_python-3.0.4.tgz 218692
diff --git a/dev-python/mod_python/mod_python-2.7.10.ebuild b/dev-python/mod_python/mod_python-2.7.10.ebuild
index b23d01703cdd..3483179e22e0 100644
--- a/dev-python/mod_python/mod_python-2.7.10.ebuild
+++ b/dev-python/mod_python/mod_python-2.7.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-2.7.10.ebuild,v 1.1 2004/01/24 21:06:45 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-2.7.10.ebuild,v 1.2 2004/04/01 01:52:07 kloeri Exp $
 
 inherit python
 
@@ -9,7 +9,7 @@ SRC_URI="http://www.apache.org/dist/httpd/modpython/${P}.tgz"
 HOMEPAGE="http://www.modpython.org/"
 
 LICENSE="as-is"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/mod_python/mod_python-3.0.4-r2.ebuild b/dev-python/mod_python/mod_python-3.0.4-r2.ebuild
index a455b55e3069..fcd9ac9643b0 100644
--- a/dev-python/mod_python/mod_python-3.0.4-r2.ebuild
+++ b/dev-python/mod_python/mod_python-3.0.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.0.4-r2.ebuild,v 1.1 2004/01/29 22:40:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.0.4-r2.ebuild,v 1.2 2004/04/01 01:52:07 kloeri Exp $
 
 inherit python
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.modpython.org/"
 SRC_URI="http://www.apache.org/dist/httpd/modpython/${P}.tgz"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND="dev-lang/python
 	>=net-www/apache-2.0"
diff --git a/dev-python/mod_python/mod_python-3.0.4.ebuild b/dev-python/mod_python/mod_python-3.0.4.ebuild
deleted file mode 100644
index d8040d8953be..000000000000
--- a/dev-python/mod_python/mod_python-3.0.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.0.4.ebuild,v 1.2 2003/12/13 03:04:17 kloeri Exp $
-
-
-DESCRIPTION="An Apache2 DSO providing an embedded Python interpreter"
-HOMEPAGE="http://www.modpython.org/"
-SRC_URI="http://www.apache.org/dist/httpd/modpython/${P}.tgz"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND="dev-lang/python >=net-www/apache-2.0"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	sed -i -e 's:mod_python.so :mod_python.so $(DESTDIR):' Makefile.in
-	sed -i -e 's:--optimize 2:--prefix=${DESTDIR}/usr --optimize 2:' dist/Makefile.in
-
-	# Fix compilation when using Python-2.3
-	has_version ">=dev-lang/python-2.3" && \
-		sed -i -e 's:LONG_LONG:PY_LONG_LONG:g' \
-		"${S}/src/requestobject.c"
-}
-
-src_compile() {
-	./configure --with-apxs=/usr/sbin/apxs2 || die
-	make OPT="`apxs2 -q CFLAGS` -fPIC" || die
-}
-
-src_install() {
-	dodir /usr/lib/{apache2,apache2-extramodules}
-	make install DESTDIR=${D} || die
-	mv ${D}/usr/lib/apache2/${PN}.so ${D}/usr/lib/apache2-extramodules
-	rm -rf ${D}/usr/lib/apache2
-	insinto /etc/apache2/conf/modules.d
-	doins ${FILESDIR}/16_mod_python.conf
-	dodoc ${FILESDIR}/16_mod_python.conf README NEWS CREDITS COPYRIGHT
-	dohtml doc-html/*
-	insinto /usr/share/doc/${P}/html/icons
-	doins doc-html/icons/*
-}
-
-pkg_postinst() {
-	einfo "To have Apache run python programs, please do the following:"
-	einfo "Edit /etc/conf.d/apache2 and add \"-D PYTHON\""
-	einfo "That will setup Apache to load python when it starts."
-	einfo
-	einfo "If you're new to mod_python there's a manual and tutorial"
-	einfo "installed in /usr/share/doc/${P}/html/index.html."
-}