cleanup

Package-Manager: portage-2.1.4_rc11

5 files changed, 26 insertions, 87 deletions

diff --git a/www-apache/mod_python/ChangeLog b/www-apache/mod_python/ChangeLog
index ab7f21640848..1b4f713a0352 100644
--- a/www-apache/mod_python/ChangeLog
+++ b/www-apache/mod_python/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_python
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/ChangeLog,v 1.8 2007/11/23 13:24:14 drac Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/ChangeLog,v 1.9 2008/01/06 20:32:41 hollow Exp $
+
+  06 Jan 2008; Benedikt Böhm <hollow@gentoo.org> files/16_mod_python.conf,
+  -mod_python-3.2.10.ebuild:
+  cleanup
 
   23 Nov 2007; Samuli Suominen <drac@gentoo.org> mod_python-3.3.1.ebuild:
   amd64 stable wrt #199815
diff --git a/www-apache/mod_python/Manifest b/www-apache/mod_python/Manifest
index 8faaf4955365..a933fcfd14ab 100644
--- a/www-apache/mod_python/Manifest
+++ b/www-apache/mod_python/Manifest
@@ -1,28 +1,30 @@
-AUX 16_mod_python.conf 1101 RMD160 7221a2a77cc1481855bfac75191d666c642861b8 SHA1 2b2061929b9e2a6b2690b231718f269394151270 SHA256 fffa4ce78f0bbe242e88b19a23d1e69fcaa2cfad73954f72d78688ee3a9523d3
-MD5 fc933df167083c6c8abc4d2e28c6274d files/16_mod_python.conf 1101
-RMD160 7221a2a77cc1481855bfac75191d666c642861b8 files/16_mod_python.conf 1101
-SHA256 fffa4ce78f0bbe242e88b19a23d1e69fcaa2cfad73954f72d78688ee3a9523d3 files/16_mod_python.conf 1101
-DIST mod_python-3.2.10.tgz 365768 RMD160 2afdd0a80c815f8b9a1b33258e04ae17a12b7dbd SHA1 d3949d71c718e84b7897e9ce62fed26dea4c9584 SHA256 ac404c02ee052dcfbd8e303fe9148866c561be9b9a8a12cffee25276e147f13c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 16_mod_python.conf 1017 RMD160 e54858dae336ae822a5ca3405156ef7e44e9b1b6 SHA1 e45eebdfaa346efbbf27631d003cd7b67cd0eb89 SHA256 3580b3b421c902e190b06327539cf1fe0f2690312c9508f0a7bd4d5675128a93
+MD5 fcff5c2d8025e0acad6973967c8863af files/16_mod_python.conf 1017
+RMD160 e54858dae336ae822a5ca3405156ef7e44e9b1b6 files/16_mod_python.conf 1017
+SHA256 3580b3b421c902e190b06327539cf1fe0f2690312c9508f0a7bd4d5675128a93 files/16_mod_python.conf 1017
 DIST mod_python-3.3.1.tgz 447954 RMD160 f78f93172963317f4318f8f2455419743c8fb4f5 SHA1 e538170fd78e09408b6d8593da980b126a0fef93 SHA256 ad2331fd5fcfd720ef9e3482973fc2d06eff36ba0c44693cfa42056a62175a6b
-EBUILD mod_python-3.2.10.ebuild 1454 RMD160 4ffe3845a97ae3604eeb84ed7c59b0507e36a78d SHA1 be0fc1da55eb3413ea0023d21894424ac41f9400 SHA256 78a1b25be10d1f473b63d3fd90a273febd3d275b182f020a25cd615d3b3c7cc2
-MD5 f4b7e48e4c80fded8d5d9ad901cd6d15 mod_python-3.2.10.ebuild 1454
-RMD160 4ffe3845a97ae3604eeb84ed7c59b0507e36a78d mod_python-3.2.10.ebuild 1454
-SHA256 78a1b25be10d1f473b63d3fd90a273febd3d275b182f020a25cd615d3b3c7cc2 mod_python-3.2.10.ebuild 1454
 EBUILD mod_python-3.3.1.ebuild 1607 RMD160 a3871b6b8014b0f8646e1d353e5ad7e91423c275 SHA1 74b5d434728ee0bcf6d6d20bc7f0be89bf1a856c SHA256 01068239e7577e1116b6beb394f4304c7cb44e044852c84415a6913795d61c0a
 MD5 27d380e323bd5a3c570923ee30b1036d mod_python-3.3.1.ebuild 1607
 RMD160 a3871b6b8014b0f8646e1d353e5ad7e91423c275 mod_python-3.3.1.ebuild 1607
 SHA256 01068239e7577e1116b6beb394f4304c7cb44e044852c84415a6913795d61c0a mod_python-3.3.1.ebuild 1607
-MISC ChangeLog 9542 RMD160 7d99bc5c871d4580bfae95144c5393ae00d524ef SHA1 7ebe22b375a43504e82a90a12d891e6be8888462 SHA256 41ed0729ff947d01f11469406af507b4d13b263776831621a5ea14105924cca8
-MD5 28485134c23509ce82ede9d735bc5792 ChangeLog 9542
-RMD160 7d99bc5c871d4580bfae95144c5393ae00d524ef ChangeLog 9542
-SHA256 41ed0729ff947d01f11469406af507b4d13b263776831621a5ea14105924cca8 ChangeLog 9542
+MISC ChangeLog 9660 RMD160 61e5efc406b45c187ca7875e60240048cbe6b0d8 SHA1 ea6977d7c81f33d5f145802a9dff75cd1a3fb1e4 SHA256 662ce626f64ef6c15380e0ccb5fdf6db013bc37b95a00ee550e829b0fc197932
+MD5 6603f92e476310c33f9f595b57c09670 ChangeLog 9660
+RMD160 61e5efc406b45c187ca7875e60240048cbe6b0d8 ChangeLog 9660
+SHA256 662ce626f64ef6c15380e0ccb5fdf6db013bc37b95a00ee550e829b0fc197932 ChangeLog 9660
 MISC metadata.xml 1086 RMD160 498722cfbe864a9111382e60fbfefe7acad8015c SHA1 1dd90967f304172d9beadde4667af19f8fb91758 SHA256 bd095d51b46b1c8a2df7b8b929694e1b344c1cba184baa11d35e679296c33b91
 MD5 348eea35493dea3b9685324969ac0cef metadata.xml 1086
 RMD160 498722cfbe864a9111382e60fbfefe7acad8015c metadata.xml 1086
 SHA256 bd095d51b46b1c8a2df7b8b929694e1b344c1cba184baa11d35e679296c33b91 metadata.xml 1086
-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
 MD5 5b8e0f12041549152b28d724f32acf72 files/digest-mod_python-3.3.1 241
 RMD160 975fc2da673fd54cc697ad00858f57213854527e files/digest-mod_python-3.3.1 241
 SHA256 1148b94f4afb88c2a4ef1c6836d2bfabc0bb4e307974ec050f7113997898c8d6 files/digest-mod_python-3.3.1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeBOvQACgkQmPFBzbX68WESHwCeMKrM0r/m5MmNK5Mq/jW4Ihcy
+q34AniMkxLrvUFwFxH9Ru8xcob85rcS2
+=uszV
+-----END PGP SIGNATURE-----
diff --git a/www-apache/mod_python/files/16_mod_python.conf b/www-apache/mod_python/files/16_mod_python.conf
index c2df73cf8ff2..ae4657e89776 100644
--- a/www-apache/mod_python/files/16_mod_python.conf
+++ b/www-apache/mod_python/files/16_mod_python.conf
@@ -1,10 +1,6 @@
 <IfDefine PYTHON>
-  <IfModule !mod_python.c>
-    LoadModule python_module    modules/mod_python.so
-  </IfModule>
-</IfDefine>
+LoadModule python_module modules/mod_python.so
 
-<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.
@@ -37,4 +33,4 @@
 #    PythonHandler mod_python.publisher
 #</Location>
 
-</IfModule>
+</IfDefine>
diff --git a/www-apache/mod_python/files/digest-mod_python-3.2.10 b/www-apache/mod_python/files/digest-mod_python-3.2.10
deleted file mode 100644
index 6d9dfb733230..000000000000
--- a/www-apache/mod_python/files/digest-mod_python-3.2.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cc6439f546a6e70cfff7ca51b8c62541 mod_python-3.2.10.tgz 365768
-RMD160 2afdd0a80c815f8b9a1b33258e04ae17a12b7dbd mod_python-3.2.10.tgz 365768
-SHA256 ac404c02ee052dcfbd8e303fe9148866c561be9b9a8a12cffee25276e147f13c mod_python-3.2.10.tgz 365768
diff --git a/www-apache/mod_python/mod_python-3.2.10.ebuild b/www-apache/mod_python/mod_python-3.2.10.ebuild
deleted file mode 100644
index a05bb01e5cc6..000000000000
--- a/www-apache/mod_python/mod_python-3.2.10.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/www-apache/mod_python/mod_python-3.2.10.ebuild,v 1.1 2007/08/19 11:53:43 phreak Exp $
-
-inherit python apache-module multilib autotools
-
-KEYWORDS="alpha amd64 ia64 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 COPYRIGHT"
-
-need_apache2
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Remove optimisations, we do that outside Portage
-	sed -ie 's:--optimize 2:--no-compile:' "dist/Makefile.in"
-
-	# Fix compilation when using Python 2.3 or newer
-	if has_version ">=dev-lang/python-2.3" ; then
-		sed -ie 's:LONG_LONG:PY_LONG_LONG:g' "${S}/src/requestobject.c"
-	fi
-
-	eautoconf
-}
-
-src_compile() {
-	econf --with-apxs=${APXS2} || die "econf failed"
-	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
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize "/usr/$(get_libdir)/python${PYVER}/site-packages/mod_python"
-	apache-module_pkg_postinst
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}