summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-06-25 22:24:34 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-06-25 22:24:34 +0000
commit5d3ab7903de02cab7f0fb5386e618712894e4297 (patch)
tree29763029361fe5014a6093d4d366a577539e1236
parentStable on amd64 wrt bug #318541 (diff)
downloadgentoo-2-5d3ab7903de02cab7f0fb5386e618712894e4297.tar.gz
gentoo-2-5d3ab7903de02cab7f0fb5386e618712894e4297.tar.bz2
gentoo-2-5d3ab7903de02cab7f0fb5386e618712894e4297.zip
Fix usage of python_set_active_version() and python_pkg_setup() (bug #313549).
(Portage version: HEAD/cvs/Linux x86_64)
-rw-r--r--media-libs/vips/ChangeLog6
-rw-r--r--media-libs/vips/vips-7.22.1.ebuild8
2 files changed, 10 insertions, 4 deletions
diff --git a/media-libs/vips/ChangeLog b/media-libs/vips/ChangeLog
index e69114c75736..be807fc674cc 100644
--- 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/vips-7.22.1.ebuild b/media-libs/vips/vips-7.22.1.ebuild
index 80392ba06523..34d0e4dfa06c 100644
--- 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() {