Cleanup old, redundant versions.

Package-Manager: portage-2.1.2_rc4-r8

diff --git a/dev-python/mod_python/Manifest b/dev-python/mod_python/Manifest
index 8c57a9e7cba5f0360641c6a67041bdd0391c8985..141a35a1d8e4879e1981bd4fab78947481ac1215 100644 (file)
--- a/dev-python/mod_python/Manifest
+++ b/dev-python/mod_python/Manifest
@@ -1,73 +1,40 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 16_mod_python-r1.conf 1101 RMD160 7221a2a77cc1481855bfac75191d666c642861b8 SHA1 2b2061929b9e2a6b2690b231718f269394151270 SHA256 fffa4ce78f0bbe242e88b19a23d1e69fcaa2cfad73954f72d78688ee3a9523d3
 MD5 fc933df167083c6c8abc4d2e28c6274d files/16_mod_python-r1.conf 1101
 RMD160 7221a2a77cc1481855bfac75191d666c642861b8 files/16_mod_python-r1.conf 1101
 SHA256 fffa4ce78f0bbe242e88b19a23d1e69fcaa2cfad73954f72d78688ee3a9523d3 files/16_mod_python-r1.conf 1101
-AUX 16_mod_python.conf 1106 RMD160 b06302aab6fc73f37b14cb2768096ab493c9b231 SHA1 be93a21c2cebcd9b32573ceb6c28e0df7037c4d2 SHA256 eb748fed2d394f49d1fb13e2594c79816f1389600e38be80cc5ffe971b83c117
-MD5 05bbbfafd26dcf70f83fcc2b015751dc files/16_mod_python.conf 1106
-RMD160 b06302aab6fc73f37b14cb2768096ab493c9b231 files/16_mod_python.conf 1106
-SHA256 eb748fed2d394f49d1fb13e2594c79816f1389600e38be80cc5ffe971b83c117 files/16_mod_python.conf 1106
 AUX mod_python-3.1.4-configure-bash-3.1.patch 473 RMD160 be33f1c882941d32b9c65224d12739ffe1d94319 SHA1 d6732c0f49bf109212e77e7200404231f2479568 SHA256 7d07b64ce193dd139c4e7ccb7fcb8ccc0ee7729202735b26e07307a52553b7fb
 MD5 437d3b6af39626eb8dfb88127db3883c files/mod_python-3.1.4-configure-bash-3.1.patch 473
 RMD160 be33f1c882941d32b9c65224d12739ffe1d94319 files/mod_python-3.1.4-configure-bash-3.1.patch 473
 SHA256 7d07b64ce193dd139c4e7ccb7fcb8ccc0ee7729202735b26e07307a52553b7fb files/mod_python-3.1.4-configure-bash-3.1.patch 473
-AUX publisher-2.diff 1383 RMD160 0e1c6a2bf22836fc5eb92c775f12f1e753d07240 SHA1 ed233c047d9248318be02d9a4da5c89da00d67f9 SHA256 828de8712538599f87acb0149a4a5c435a53aaba05262fc84e0527ad1f79b68d
-MD5 0779383c65d90a5161e7a11ab5bbbbec files/publisher-2.diff 1383
-RMD160 0e1c6a2bf22836fc5eb92c775f12f1e753d07240 files/publisher-2.diff 1383
-SHA256 828de8712538599f87acb0149a4a5c435a53aaba05262fc84e0527ad1f79b68d files/publisher-2.diff 1383
-DIST mod_python-2.7.11.tgz 175763
-DIST mod_python-3.1.3.tgz 293548
+DIST mod_python-2.7.11.tgz 175763 RMD160 1b34de01b3fa4bb27bb5a39396a2497db66fabd5 SHA1 8c123359f98a7acf077e078226fccdb0ff51c4ce SHA256 d56f21b37a85c6f2464b669faf071676302d636037fccf818722291126e851cf
 DIST mod_python-3.1.4.tgz 308510 RMD160 395fdf56a349717dadba418ce91cd5699cf0970f SHA1 d28022f6b14d0f7d01c6aed95a56e47f8df71f64 SHA256 f8e1925a0ade1adf4b5528e892eb347b013100d6c30b0e43209143b427c976a5
 DIST mod_python-3.2.10.tgz 365768 RMD160 2afdd0a80c815f8b9a1b33258e04ae17a12b7dbd SHA1 d3949d71c718e84b7897e9ce62fed26dea4c9584 SHA256 ac404c02ee052dcfbd8e303fe9148866c561be9b9a8a12cffee25276e147f13c
 EBUILD mod_python-2.7.11.ebuild 1662 RMD160 2ef719fb09427eb1b3f8d537f032183895b56eeb SHA1 e95215aaf80fc8973c817addd4a75d659f8b75b2 SHA256 4bfad933a85c0747901a337d0fa229fa65ab4ee90ac6a99737ec115ef8c91235
 MD5 3feede92d5dfa662a37af306bd5ef4f7 mod_python-2.7.11.ebuild 1662
 RMD160 2ef719fb09427eb1b3f8d537f032183895b56eeb mod_python-2.7.11.ebuild 1662
 SHA256 4bfad933a85c0747901a337d0fa229fa65ab4ee90ac6a99737ec115ef8c91235 mod_python-2.7.11.ebuild 1662
-EBUILD mod_python-3.1.3-r1.ebuild 1875 RMD160 db7f7210ccf4de0aa78939ef9173fdfea631222c SHA1 92822ca9d35e5c1d9a2caf90e93aee9a9ff2ccf1 SHA256 985daeab3897ebba1e603742623238b0ff774eacf143cfd58e42efaa2f774a5a
-MD5 c21328b1a8879707a158196fc9caa5c2 mod_python-3.1.3-r1.ebuild 1875
-RMD160 db7f7210ccf4de0aa78939ef9173fdfea631222c mod_python-3.1.3-r1.ebuild 1875
-SHA256 985daeab3897ebba1e603742623238b0ff774eacf143cfd58e42efaa2f774a5a mod_python-3.1.3-r1.ebuild 1875
 EBUILD mod_python-3.1.4-r1.ebuild 1595 RMD160 9422dfe20325cda3d55f161e426bcc65c20cbb05 SHA1 9a1f9b7a8ee753383906bb53ce47ee89f9198b7c SHA256 8785d6a36dc8a9a7c518adfac0065afcae2bc6e813ec7dabc7a13f08a8cacacd
 MD5 ca3c1ef63c53b3f7434c1c6c2189a22b mod_python-3.1.4-r1.ebuild 1595
 RMD160 9422dfe20325cda3d55f161e426bcc65c20cbb05 mod_python-3.1.4-r1.ebuild 1595
 SHA256 8785d6a36dc8a9a7c518adfac0065afcae2bc6e813ec7dabc7a13f08a8cacacd mod_python-3.1.4-r1.ebuild 1595
-EBUILD mod_python-3.1.4.ebuild 1472 RMD160 b130fb350ea76a43b3280746460e95eb0183ab79 SHA1 a9ef03a3a72fad1ef695e2ec70a9af0fd9619d25 SHA256 603bfc84f4ab00b0cf1656ae17167c8dbc7ad9a64574da11a4d4f809a4479043
-MD5 79bab2b35e9916b646d7850ed5a36143 mod_python-3.1.4.ebuild 1472
-RMD160 b130fb350ea76a43b3280746460e95eb0183ab79 mod_python-3.1.4.ebuild 1472
-SHA256 603bfc84f4ab00b0cf1656ae17167c8dbc7ad9a64574da11a4d4f809a4479043 mod_python-3.1.4.ebuild 1472
 EBUILD mod_python-3.2.10.ebuild 1478 RMD160 32fecc9101ae545c8921f2a73ea30b7bd9b15ecd SHA1 4cca150e1006791469c036170d3586c53a503c42 SHA256 160251f19aef176b78395eb53736909141ba1b9605784fc3506d20e793570a7a
 MD5 ca7d1ad44d6700e39f7d473cb5502e1d mod_python-3.2.10.ebuild 1478
 RMD160 32fecc9101ae545c8921f2a73ea30b7bd9b15ecd mod_python-3.2.10.ebuild 1478
 SHA256 160251f19aef176b78395eb53736909141ba1b9605784fc3506d20e793570a7a mod_python-3.2.10.ebuild 1478
-MISC ChangeLog 7321 RMD160 2b163fee8a0fb2a5577614adc0945c331b041237 SHA1 46a6a55d2b1f412e5439dd1d753e42f0ea761dfe SHA256 e74effe278789d8c2e22181a59d017991f952a9822217aa8774e6bcf69a3914b
-MD5 d8de5280f1fede6265c80501ea92a605 ChangeLog 7321
-RMD160 2b163fee8a0fb2a5577614adc0945c331b041237 ChangeLog 7321
-SHA256 e74effe278789d8c2e22181a59d017991f952a9822217aa8774e6bcf69a3914b ChangeLog 7321
+MISC ChangeLog 7519 RMD160 3f95f3ec7960972acc516ebe1af338dc6851acaf SHA1 921d6fa4cd9d1bec3477770ab8d452acb3684300 SHA256 90a0c6a0dcc83c5f7ba7166a106a666cf066649688bb19abfa1b733445e6721e
+MD5 1e3ba6ae68a7e6ca1a5fe7744645a480 ChangeLog 7519
+RMD160 3f95f3ec7960972acc516ebe1af338dc6851acaf ChangeLog 7519
+SHA256 90a0c6a0dcc83c5f7ba7166a106a666cf066649688bb19abfa1b733445e6721e ChangeLog 7519
 MISC metadata.xml 1061 RMD160 181f0edbb61dae133206cb760f9a1e485e960623 SHA1 2495194ebd305d7012702d3cd40a2d89d0b99eee SHA256 8055ef4e2954a77a90a3d3c48438fb7993442d22b2737c563ba3af67069e658a
 MD5 4238f8266f49d6a9dbe435b27aa5cbb2 metadata.xml 1061
 RMD160 181f0edbb61dae133206cb760f9a1e485e960623 metadata.xml 1061
 SHA256 8055ef4e2954a77a90a3d3c48438fb7993442d22b2737c563ba3af67069e658a metadata.xml 1061
-MD5 f9aea2b5454c22f2e134e3698099f890 files/digest-mod_python-2.7.11 66
-RMD160 b60c5c052c76fdf8c1ba7cc4d1ff25a6d1612f31 files/digest-mod_python-2.7.11 66
-SHA256 42c807da21cb2853ec0fb8cfe3e05805e824419b26efdb2bfdc2cf3460b2c3ba files/digest-mod_python-2.7.11 66
-MD5 67e42121ddce856c5d7021b3eca7abdb files/digest-mod_python-3.1.3-r1 65
-RMD160 a3c1e3a1f96b5147e5b981f5abba7b3ba2320bf8 files/digest-mod_python-3.1.3-r1 65
-SHA256 ad20dd020854998e455df7b287585573f516604124b6074cb35f713503b2081e files/digest-mod_python-3.1.3-r1 65
-MD5 e1f65b354684d5987a647397114fd4db files/digest-mod_python-3.1.4 241
-RMD160 b4e4b2dac0a148bd6eecd001e23bde78a522df68 files/digest-mod_python-3.1.4 241
-SHA256 8284a8bd265034aa07543a96029164848192d3826d6a9939df29374e46c364b8 files/digest-mod_python-3.1.4 241
+MD5 0e30d37f66c9dd6ef0f6e13a23320c60 files/digest-mod_python-2.7.11 244
+RMD160 db51645e95e03eb176a679f3822d74829c162397 files/digest-mod_python-2.7.11 244
+SHA256 e392658a3a80a850b811a0cf5957760931d401b9c4c10aaa809269b4719f9782 files/digest-mod_python-2.7.11 244
 MD5 e1f65b354684d5987a647397114fd4db files/digest-mod_python-3.1.4-r1 241
 RMD160 b4e4b2dac0a148bd6eecd001e23bde78a522df68 files/digest-mod_python-3.1.4-r1 241
 SHA256 8284a8bd265034aa07543a96029164848192d3826d6a9939df29374e46c364b8 files/digest-mod_python-3.1.4-r1 241
 MD5 7356bad2e0df6f2d04de41533b44a0f5 files/digest-mod_python-3.2.10 244
 RMD160 ad8a915266a5c1e9983b75d060ec14e616c9f2dd files/digest-mod_python-3.2.10 244
 SHA256 71ca744baad29cf4a061da86837b5ea7f31c11501008225018160c636be80de7 files/digest-mod_python-3.2.10 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFpo7HyuNVb5qfaOYRAuY8AJ0fHlWvaPzuG1849jk03IxbykATfgCgrjPI
-YaDspu0ddHs+DhEkDZCj00k=
-=eoGE
------END PGP SIGNATURE-----

diff --git a/dev-python/mod_python/files/16_mod_python.conf b/dev-python/mod_python/files/16_mod_python.conf
deleted file mode 100644 (file)
index b678da4..0000000
--- a/dev-python/mod_python/files/16_mod_python.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-<IfDefine PYTHON>
-  <IfModule !mod_python.c>
-    LoadModule python_module    extramodules/mod_python.so
-  </IfModule>
-</IfDefine>
-
-<IfModule mod_python.c>
-#
-# Mod_python is a module that embeds the Python language interpreter
-# within the server, allowing Apache handlers to be written in Python.
-#
-
-# This will cause files beneath /home/httpd/htdocs with the extension .spam
-# to be handled by the Python script /home/httpd/htdocs/eggs.py
-#
-#<Directory /home/httpd/htdocs>
-#    <IfModule mod_mime.c>
-#    AddHandler python-program .spam
-#    </IfModule>
-#    PythonHandler eggs
-#</Directory>
-
-# This will cause all requests to the /python heirachy of your
-# webserver to be handled by the python script /path/to/myhandler.py
-#
-#<Location /python>
-#    SetHandler python-program
-#    PythonPath "sys.path + ['/path/to']"
-#    PythonHandler myhandler
-#</Location>
-
-# This will cause all requests to the /python heirachy of your
-# webserver to be handled by mod_python's Publisher handler
-#
-#<Location /python>
-#    SetHandler python-program
-#    PythonHandler mod_python.publisher
-#</Location>
-
-</IfModule>

diff --git a/dev-python/mod_python/files/digest-mod_python-3.1.3-r1 b/dev-python/mod_python/files/digest-mod_python-3.1.3-r1
deleted file mode 100644 (file)
index 2e72ee8..0000000
--- a/dev-python/mod_python/files/digest-mod_python-3.1.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2e1983e35edd428f308b0dfeb1c23bfe mod_python-3.1.3.tgz 293548

diff --git a/dev-python/mod_python/files/digest-mod_python-3.1.4 b/dev-python/mod_python/files/digest-mod_python-3.1.4
deleted file mode 100644 (file)
index e72694d..0000000
--- a/dev-python/mod_python/files/digest-mod_python-3.1.4
+++ /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/publisher-2.diff b/dev-python/mod_python/files/publisher-2.diff
deleted file mode 100644 (file)
index 8916dc3..0000000
--- a/dev-python/mod_python/files/publisher-2.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-*** ../mod_python-3.1.3/lib/python/mod_python/publisher.py     Wed Feb  9 08:41:43 2005
---- lib/python/mod_python/publisher.py Wed Feb  9 08:53:15 2005
-***************
-*** 258,270 ****
-      (period) to find the last one we're looking for.
-      """
-  
-!     for obj_str in  object_str.split('.'):
-!         obj = getattr(obj, obj_str)
-  
-!         # object cannot be a module
-!         if type(obj) == ModuleType:
-              raise apache.SERVER_RETURN, apache.HTTP_NOT_FOUND
-  
-          realm, user, passwd = process_auth(req, obj, realm,
-                                             user, passwd)
-  
---- 258,282 ----
-      (period) to find the last one we're looking for.
-      """
-  
-!     parts = object_str.split('.')
-  
-!     for n in range(len(parts)):
-! 
-!         obj = getattr(obj, parts[n])
-!         obj_type = type(obj)
-! 
-!         # object cannot be a module or a class
-!         if obj_type in [ClassType, ModuleType]:
-              raise apache.SERVER_RETURN, apache.HTTP_NOT_FOUND
-  
-+         if n < (len(parts)-1):
-+             
-+             # all but the last object ...
-+ 
-+             # ...must be instance
-+             if obj_type != InstanceType:
-+                 raise apache.SERVER_RETURN, apache.HTTP_NOT_FOUND
-+             
-          realm, user, passwd = process_auth(req, obj, realm,
-                                             user, passwd)
-  

diff --git a/dev-python/mod_python/mod_python-3.1.3-r1.ebuild b/dev-python/mod_python/mod_python-3.1.3-r1.ebuild
deleted file mode 100644 (file)
index 2e0f0e9..0000000
--- a/dev-python/mod_python/mod_python-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.2 2005/04/24 09:35:04 blubb Exp $
-
-inherit python eutils
-
-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 alpha ppc ~sparc amd64"
-IUSE=""
-DEPEND="dev-lang/python
-       >=net-www/apache-2.0"
-
-src_unpack() {
-       unpack ${A} || die
-       cd ${S} || die
-       # remove optimisations, we do that outside portage
-       sed -i -e 's:--optimize 2:--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"
-       #Fixes publisher info leak bug# 80109 CAN-2005-0088
-       epatch ${FILESDIR}/publisher-2.diff
-}
-
-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.4.ebuild b/dev-python/mod_python/mod_python-3.1.4.ebuild
deleted file mode 100644 (file)
index 8434154..0000000
--- a/dev-python/mod_python/mod_python-3.1.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.ebuild,v 1.5 2007/01/11 19:25:40 phreak Exp $
-
-inherit python eutils apache-module
-
-DESCRIPTION="An Apache2 DSO 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="~x86 ~alpha ~ppc ~sparc ~amd64"
-IUSE=""
-DEPEND="dev-lang/python"
-
-#APACHE2_MOD_CONF="2.7.11/16_${PN}"
-APACHE2_MOD_DEFINE="PYTHON"
-
-DOCFILES="README NEWS CREDITS COPYRIGHT"
-
-need_apache2
-
-src_unpack() {
-       unpack ${A} || die "unpack failed"
-       cd ${S} || die "cd \$S failed"
-
-       # remove optimisations, we do that outside portage
-       sed -ie 's:--optimize 2:--no-compile:' dist/Makefile.in
-
-       # Fix compilation when using Python-2.3
-       if has_version ">=dev-lang/python-2.3"; then
-               sed -ie 's:LONG_LONG:PY_LONG_LONG:g' "${S}/src/requestobject.c"
-       fi
-}
-
-src_compile() {
-       ./configure --with-apxs=${APXS2} || die
-       emake OPT="`apxs2 -q CFLAGS` -fPIC" || die
-}
-
-src_install() {
-       emake DESTDIR=${D} install || die
-
-       dohtml -r doc-html/*
-
-       apache-module_src_install
-       insinto ${APACHE2_MODULES_CONFDIR}
-       newins ${FILESDIR}/16_${PN}-r1.conf 16_${PN}.conf
-}
-
-pkg_postinst() {
-       python_version
-       python_mod_optimize /usr/lib/python${PYVER}/site-packages/mod_python
-       apache-module_pkg_postinst
-}
-
-pkg_postrm() {
-       python_mod_cleanup
-}