Don't call deprecated python_version() (bug #311233).

Package-Manager: portage-15841-svn/cvs/Linux x86_64

3 files changed, 24 insertions, 17 deletions

diff --git a/www-apache/mod_python/ChangeLog b/www-apache/mod_python/ChangeLog
index 72a297ee2404..453e83c85409 100644
--- a/www-apache/mod_python/ChangeLog
+++ b/www-apache/mod_python/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_python
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/ChangeLog,v 1.19 2009/09/17 10:50:39 hollow Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/ChangeLog,v 1.20 2010/03/26 18:45:13 arfrever Exp $
+
+  26 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  mod_python-3.3.1-r1.ebuild:
+  Don't call deprecated python_version() (bug #311233).
 
   17 Sep 2009; Benedikt Böhm <hollow@gentoo.org> -mod_python-3.3.1.ebuild:
   cleanup
diff --git a/www-apache/mod_python/Manifest b/www-apache/mod_python/Manifest
index 9607f1d9bbe4..85043c879f82 100644
--- a/www-apache/mod_python/Manifest
+++ b/www-apache/mod_python/Manifest
@@ -3,6 +3,6 @@ AUX mod_python-3.3.1-LDFLAGS.patch 517 RMD160 f3932bacdf3d284188bf92c7286e70e72b
 AUX mod_python-3.3.1-apache-2.4.patch 1284 RMD160 e3010097c6525ee6ae30cc6605b3c93303027092 SHA1 fd3dcb9a860992202b9ed8077c18afba8abc44dd SHA256 75a620f20c68b1c3a8353249956e717f317abbdb810729ea11072415435f11e6
 AUX mod_python-apr_brigade_sentinel.patch 520 RMD160 63527bf7374051ab1408a2c5df924f16caa4c9ed SHA1 4710248b4f02108bdc5cb6ee3ca8453175a54cdb SHA256 d2cf3ed0d8261dbe8262a394e9723601bc6d87ec24ea8dbcb1b3bc5c58eaa67b
 DIST mod_python-3.3.1.tgz 447954 RMD160 f78f93172963317f4318f8f2455419743c8fb4f5 SHA1 e538170fd78e09408b6d8593da980b126a0fef93 SHA256 ad2331fd5fcfd720ef9e3482973fc2d06eff36ba0c44693cfa42056a62175a6b
-EBUILD mod_python-3.3.1-r1.ebuild 1669 RMD160 6188fa8a311ff082f4ec781a988e9b48a9cbefab SHA1 21dd582949f57c954fb5473ad104db07562e6936 SHA256 6edbab884253386cf0eaff175f688156ad0d2ba5ba84df5435970895cdfb0fa1
-MISC ChangeLog 11092 RMD160 11d50c0288d68b01709ddbaad7872aefd54872df SHA1 f51b96441563b648e354a41bdf43f1410b6f8223 SHA256 061c7bef26bf20804031a65e1432595ac274aa4f80968c99d3428afc56c37619
+EBUILD mod_python-3.3.1-r1.ebuild 1605 RMD160 a31712305c9f2e9a75d1ebde5d0836e89d1f48d3 SHA1 38dfa9507420872c2928f5e2d4b62a98cea2e8ea SHA256 69fc2401be676a068d4acbd9a0a23e337376785ff390cc5f636cef7deb1d2896
+MISC ChangeLog 11254 RMD160 73b529ebe3b5d0c7a1c03b075fa585191f10c92f SHA1 bd0cda870ae68ab3332fcfa2a4d26364e26c9ad8 SHA256 bb01445625d90a5b3be7710cb14abe95fd0600d204d0782cabbc65797f7e0fd2
 MISC metadata.xml 1085 RMD160 310896be489387af5fa6ddd0ff71e76e937046f5 SHA1 7d85ace0fdbdb904078092813167e37849adfcde SHA256 db3fffe1dc8c7e619fc661ba7bc9bacb0c1404a0ead197c1418ccc53c584ef32
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
index 55777bdb7d56..c05ff2987a5f 100644
--- a/www-apache/mod_python/mod_python-3.3.1-r1.ebuild
+++ b/www-apache/mod_python/mod_python-3.3.1-r1.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.5 2009/08/07 02:41:32 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_python/mod_python-3.3.1-r1.ebuild,v 1.6 2010/03/26 18:45:13 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
 
-inherit autotools eutils python apache-module multilib
-
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+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=""
 
-DEPEND="dev-lang/python"
-RDEPEND="${DEPEND}"
+DEPEND=""
+RDEPEND=""
 
 APACHE2_MOD_CONF="16_${PN}"
 APACHE2_MOD_DEFINE="PYTHON"
@@ -25,6 +26,10 @@ DOCFILES="README NEWS CREDITS"
 
 need_apache2
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-apr_brigade_sentinel.patch"
 	epatch "${FILESDIR}/${P}-apache-2.4.patch"
@@ -51,21 +56,19 @@ src_install() {
 }
 
 src_test() {
-	python_version
 	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"
+	"$(PYTHON)" test.py || die "tests failed"
 }
 
 pkg_postinst() {
-	python_version
-	python_mod_optimize $(python_get_sitedir)/mod_python
 	apache-module_pkg_postinst
+	python_mod_optimize mod_python
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/mod_python
+	python_mod_cleanup mod_python
 }