summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2012-11-24 21:08:09 +0000
committerMichał Górny <mgorny@gentoo.org>2012-11-24 21:08:09 +0000
commit8cded4ec6d13a0395ed680ca5510a2bc92f7a59a (patch)
treefe81ff38c9ce500437c2d321ddbc6bb93c85970f /profiles/base
parentStabilize for everyone (diff)
downloadgentoo-2-8cded4ec6d13a0395ed680ca5510a2bc92f7a59a.tar.gz
gentoo-2-8cded4ec6d13a0395ed680ca5510a2bc92f7a59a.tar.bz2
gentoo-2-8cded4ec6d13a0395ed680ca5510a2bc92f7a59a.zip
Introduce PYTHON_SINGLE_TARGET for Python packages not supporting multiple Python implementations.
Diffstat (limited to 'profiles/base')
-rw-r--r--profiles/base/ChangeLog6
-rw-r--r--profiles/base/make.defaults5
2 files changed, 8 insertions, 3 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 2cf1871e9fdb..60988b0d3588 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for Gentoo base-profile
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.463 2012/11/24 00:57:56 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.464 2012/11/24 21:08:09 mgorny Exp $
+
+ 24 Nov 2012; Michał Górny <mgorny@gentoo.org> make.defaults:
+ Introduce PYTHON_SINGLE_TARGET for Python packages not supporting multiple
+ Python implementations.
24 Nov 2012; <creffett@gentoo.org> package.use.mask:
Mask php USE flag for libkolab and libkolabxml
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index ece143db199c..00761b68735b 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.89 2012/11/16 17:45:13 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.90 2012/11/24 21:08:09 mgorny Exp $
#
# System-wide defaults for the Portage system
# See portage(5) manpage
@@ -16,7 +16,7 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
# Env vars to expand into USE vars. Modifying this requires prior
# discussion on gentoo-dev@gentoo.org.
-USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES ENLIGHTENMENT_MODULES FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS FFTOOLS PYTHON_TARGETS CURL_SSL OPENMPI_FABRICS OPENMPI_RM OPENMPI_OFED_FEATURES LIBREOFFICE_EXTENSIONS VOICEMAIL_STORAGE"
+USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES ENLIGHTENMENT_MODULES FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS FFTOOLS PYTHON_TARGETS CURL_SSL OPENMPI_FABRICS OPENMPI_RM OPENMPI_OFED_FEATURES LIBREOFFICE_EXTENSIONS VOICEMAIL_STORAGE PYTHON_SINGLE_TARGET"
# USE_EXPAND variables whose contents are not shown in package manager
# output. Changes need discussion on gentoo-dev.
@@ -123,3 +123,4 @@ BOOTSTRAP_USE="cxx unicode"
# Mike Gilbert <floppym@gentoo.org> (15 May 2012)
# Default target(s) for python-r1.eclass
PYTHON_TARGETS="python2_7 python3_2"
+PYTHON_SINGLE_TARGET="python2_7"