Fix usage of python_set_active_version() and python_pkg_setup() (bug #313549).

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/media-libs/vips/ChangeLog b/media-libs/vips/ChangeLog
index e69114c75736e26e886aeecd6c0e40f93a1807f8..be807fc674ccf835a18fe375d02c54c74754bd0b 100644 (file)
--- a/media-libs/vips/ChangeLog
+++ b/media-libs/vips/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/vips
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vips/ChangeLog,v 1.28 2010/06/25 09:53:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vips/ChangeLog,v 1.29 2010/06/25 22:24:34 arfrever Exp $
+
+  25 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  vips-7.22.1.ebuild:
+  Fix usage of python_set_active_version() and python_pkg_setup() (bug #313549).
 
 *vips-7.22.1 (25 Jun 2010)
 

diff --git a/media-libs/vips/Manifest b/media-libs/vips/Manifest
index e421f96d4dc6dad69614775656567c50e06abb83..3ef83d125964c6ed370d9342b26d2124226809f0 100644 (file)
--- a/media-libs/vips/Manifest
+++ b/media-libs/vips/Manifest
@@ -2,6 +2,6 @@ AUX vips-7.20.7-build.patch 1530 RMD160 ee1fee0007f55afc35bc68b2639677da0e985f76
 DIST vips-7.20.7.tar.gz 3082797 RMD160 cddd6175307030bc6aacd02a56253e45e884d2db SHA1 48566a8bdeaf2a060ddd40a71c69813b6aef8c5e SHA256 3738ed5efac6676862c1ff310cc5baa63f2401b5bc931fb3671b29ddc1b1a899
 DIST vips-7.22.1.tar.gz 3963160 RMD160 6badb5541f8cf992d3a1716febbe7fbc385a28e7 SHA1 1ddbd019c3b1629137d816a00e33e3003cf906d1 SHA256 cb0355e44e5a5511d36ed81bb96b23200cf5e64b5d9031e4bf27a201269468a8
 EBUILD vips-7.20.7.ebuild 1525 RMD160 aeec5ce6628e27450dc24946e80b8a69c1a20c67 SHA1 42fec2e469768ad34333edc6335e560b71e6f6fe SHA256 1a173fe8847cbaa03c97106280c711ce505f061212aa416fee71f3ab43236a3c
-EBUILD vips-7.22.1.ebuild 1550 RMD160 d1d872aac5d5b212c34a27ee361591092a3e3ebf SHA1 3cf73f0078be6630edc145bd733b93a9883a3558 SHA256 fc443b56b95312b23cae302c8f0870bc596e67424ca2951f0e8f33f1ac90a8a1
-MISC ChangeLog 3728 RMD160 3dde33b470d87f61e4a5b3c8d9ed922946bc6d10 SHA1 e9f6ef74e66229bbe3923275dd4b5ce299eaee7b SHA256 90bc80ae90990eec00bdd69149e0001f4d5a1ef222629a24b9d9725620b5c160
+EBUILD vips-7.22.1.ebuild 1582 RMD160 a6e61088b0df665d61f5ee389f845d17f0833f8a SHA1 ff7fef439b08de7da175662f1f0ee617c3898bdc SHA256 2d353f4e95001e0e317a5ee2e1b51ce4b861427aed0149d65171153737a782b5
+MISC ChangeLog 3910 RMD160 16ba5585fc8831ac9aa72e1e2ce4e4be9840eb91 SHA1 2506795b5adb62fca85abf9c6d667b6ad5811702 SHA256 8615dda5d317f5b368ce3524e0fdf1387cf66a803c9e42944c7e8728a07150f9
 MISC metadata.xml 251 RMD160 d329d8bf85ea35912d9cf8beb95035c37fefa835 SHA1 1860ebb1a70050d2f391bc1c22ca84923c2d1092 SHA256 41c90647285a5a56d63195420408513ff39ee338d867759a7426a3b0d9112bbd

diff --git a/media-libs/vips/vips-7.22.1.ebuild b/media-libs/vips/vips-7.22.1.ebuild
index 80392ba065232b58730dcd22f6b99bd449eb1dfb..34d0e4dfa06cdafdb259f3e491e91ab503858f35 100644 (file)
--- a/media-libs/vips/vips-7.22.1.ebuild
+++ b/media-libs/vips/vips-7.22.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vips/vips-7.22.1.ebuild,v 1.1 2010/06/25 09:20:57 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vips/vips-7.22.1.ebuild,v 1.2 2010/06/25 22:24:34 arfrever Exp $
 
 EAPI=2
 PYTHON_DEPEND="python? 2"
@@ -36,8 +36,10 @@ DEPEND="${RDEPEND}
        dev-util/gtk-doc-am"
 
 pkg_setup() {
-       python_set_active_version 2
-       python_pkg_setup
+       if use python; then
+               python_set_active_version 2
+               python_pkg_setup
+       fi
 }
 
 src_configure() {