summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-01-16 19:02:10 +0000
committerMichał Górny <mgorny@gentoo.org>2013-01-16 19:02:10 +0000
commit67825362ae486985338c5b99f76d442d56478932 (patch)
treea4e65fd9f2c623fb1aa8bc01efeb48023f55bab3 /eclass/mozcoreconf-2.eclass
parentStable for ppc64, wrt bug #451930 (diff)
downloadgentoo-2-67825362ae486985338c5b99f76d442d56478932.tar.gz
gentoo-2-67825362ae486985338c5b99f76d442d56478932.tar.bz2
gentoo-2-67825362ae486985338c5b99f76d442d56478932.zip
Migrate Mozilla packages to python-any-r1 for build-time Python dep.
Diffstat (limited to 'eclass/mozcoreconf-2.eclass')
-rw-r--r--eclass/mozcoreconf-2.eclass15
1 files changed, 9 insertions, 6 deletions
diff --git a/eclass/mozcoreconf-2.eclass b/eclass/mozcoreconf-2.eclass
index eff9d87e9c3f..30e79dec0768 100644
--- a/eclass/mozcoreconf-2.eclass
+++ b/eclass/mozcoreconf-2.eclass
@@ -1,11 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v 1.26 2013/01/16 16:00:10 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v 1.27 2013/01/16 19:02:10 mgorny Exp $
#
# mozcoreconf.eclass : core options for mozilla
# inherit mozconfig-2 if you need USE flags
-inherit multilib flag-o-matic python versionator
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads,sqlite'
+
+inherit multilib flag-o-matic python-any-r1 versionator
IUSE="${IUSE} custom-cflags custom-optimization"
@@ -16,7 +19,7 @@ RDEPEND="x11-libs/libXrender
DEPEND="${RDEPEND}
virtual/pkgconfig
- =dev-lang/python-2.7*[threads,sqlite]"
+ ${PYTHON_DEPS}"
# mozconfig_annotate: add an annotated line to .mozconfig
#
@@ -92,13 +95,13 @@ moz_pkgsetup() {
export USE_PTHREADS=1
export ALDFLAGS=${LDFLAGS}
- python_set_active_version 2
-
if [[ $(gcc-major-version) -eq 3 ]]; then
ewarn "Unsupported compiler detected, DO NOT file bugs for"
ewarn "outdated compilers. Bugs opened with gcc-3 will be closed"
ewarn "invalid."
fi
+
+ python-any-r1_pkg_setup
}
mozconfig_init() {