Remove old versions, stable on alpha.

7 files changed, 10 insertions, 131 deletions

diff --git a/dev-python/mod_python/ChangeLog b/dev-python/mod_python/ChangeLog
index 4d7dfdd5ce5b..177f0a0fc84b 100644
--- a/dev-python/mod_python/ChangeLog
+++ b/dev-python/mod_python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/mod_python
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.22 2004/06/25 01:34:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.23 2004/07/12 01:13:15 kloeri Exp $
+
+  12 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
+  -mod_python-3.0.4-r1.ebuild, -mod_python-3.0.4-r2.ebuild,
+  mod_python-3.1.3.ebuild:
+  Remove old versions, stable on alpha.
 
   24 May 2004; Bryan Østergaard <kloeri@gentoo.org> mod_python-3.1.3.ebuild:
   Keyworded ~alpha, requested in bug #51550.
diff --git a/dev-python/mod_python/Manifest b/dev-python/mod_python/Manifest
index 1038e433131f..3ace53606270 100644
--- a/dev-python/mod_python/Manifest
+++ b/dev-python/mod_python/Manifest
@@ -1,12 +1,8 @@
 MD5 e3fe1ef2a654696a5be60895f688b11e mod_python-2.7.10.ebuild 2464
-MD5 c64ac7ff121b0f28b826d2966142f118 mod_python-3.0.4-r1.ebuild 1849
-MD5 3b92b6eb0566206a80862f2fab5b8dbf mod_python-3.1.3.ebuild 1766
-MD5 bc30b954ff14b654b5658010d21b8824 mod_python-3.0.4-r2.ebuild 1850
-MD5 e89bfcb2d97955871e5c98368edd1a80 ChangeLog 3433
+MD5 8989942f990b80748c69a086c753530d mod_python-3.1.3.ebuild 1763
+MD5 d5c5c89f128a32335975b3a1f30d8c0a ChangeLog 3611
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 05bbbfafd26dcf70f83fcc2b015751dc files/16_mod_python.conf 1106
-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 67e42121ddce856c5d7021b3eca7abdb files/digest-mod_python-3.1.3 65
diff --git a/dev-python/mod_python/files/digest-mod_python-3.0.4-r1 b/dev-python/mod_python/files/digest-mod_python-3.0.4-r1
deleted file mode 100644
index 3eefc4f3ee99..000000000000
--- a/dev-python/mod_python/files/digest-mod_python-3.0.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d4a51a049f84c5150878625911d8f1d5 mod_python-3.0.4.tgz 218692
diff --git a/dev-python/mod_python/files/digest-mod_python-3.0.4-r2 b/dev-python/mod_python/files/digest-mod_python-3.0.4-r2
deleted file mode 100644
index 3eefc4f3ee99..000000000000
--- a/dev-python/mod_python/files/digest-mod_python-3.0.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d4a51a049f84c5150878625911d8f1d5 mod_python-3.0.4.tgz 218692
diff --git a/dev-python/mod_python/mod_python-3.0.4-r1.ebuild b/dev-python/mod_python/mod_python-3.0.4-r1.ebuild
deleted file mode 100644
index 24e7eff5579e..000000000000
--- a/dev-python/mod_python/mod_python-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2004 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.0.4-r1.ebuild,v 1.4 2004/06/25 01:34:21 agriffis Exp $
-
-inherit python
-
-DESCRIPTION="An Apache2 DSO providing an embedded Python interpreter"
-HOMEPAGE="http://www.modpython.org/"
-SRC_URI="mirror://apache/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
-	# remove optimisations, we do that outside portage
-	sed -i -e 's:--optimize 2:--prefix=${DESTDIR}/usr --no-compile:' 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-extramodules
-	make install DESTDIR=${D} LIBEXECDIR=/usr/lib/apache2-extramodules || die
-	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() {
-	python_version
-	python_mod_optimize /usr/lib/python${PYVER}/site-packages/mod_python
-
-	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."
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
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
deleted file mode 100644
index 400343360ace..000000000000
--- a/dev-python/mod_python/mod_python-3.0.4-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2004 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.0.4-r2.ebuild,v 1.4 2004/06/25 01:34:21 agriffis Exp $
-
-inherit python
-
-DESCRIPTION="An Apache2 DSO providing an embedded Python interpreter"
-HOMEPAGE="http://www.modpython.org/"
-SRC_URI="mirror://apache/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
-	# remove optimisations, we do that outside portage
-	sed -i -e 's:--optimize 2:--prefix=${DESTDIR}/usr --no-compile:' 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-extramodules
-	make install DESTDIR=${D} LIBEXECDIR=/usr/lib/apache2-extramodules || die
-	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/${PF}/html/icons
-	doins doc-html/icons/*
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/lib/python${PYVER}/site-packages/mod_python
-
-	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/${PF}/html/index.html."
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/dev-python/mod_python/mod_python-3.1.3.ebuild b/dev-python/mod_python/mod_python-3.1.3.ebuild
index 6975c7ca093a..366c1783b625 100644
--- a/dev-python/mod_python/mod_python-3.1.3.ebuild
+++ b/dev-python/mod_python/mod_python-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.3.ebuild,v 1.6 2004/06/25 01:34:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.1.3.ebuild,v 1.7 2004/07/12 01:13:15 kloeri Exp $
 
 inherit python
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.modpython.org/"
 SRC_URI="mirror://apache/modpython/${P}.tgz"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="x86 ~alpha ppc"
+KEYWORDS="x86 alpha ppc"
 IUSE=""
 DEPEND="dev-lang/python
 	>=net-www/apache-2.0"