summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2014-03-16 20:08:21 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2014-03-16 20:08:21 +0000
commitb73f788a1f6a82f367e150c590c8e2903ede79a0 (patch)
tree8f1ff6c9cc25e137d6475738dc449b2a69a535d5 /profiles/targets
parentfix for bug 503446 CVE-2014-2237 (diff)
downloadhistorical-b73f788a1f6a82f367e150c590c8e2903ede79a0.tar.gz
historical-b73f788a1f6a82f367e150c590c8e2903ede79a0.tar.bz2
historical-b73f788a1f6a82f367e150c590c8e2903ede79a0.zip
Do not inherit the server target in the developer target anymore
Diffstat (limited to 'profiles/targets')
-rw-r--r--profiles/targets/developer/make.defaults11
-rw-r--r--profiles/targets/developer/parent1
2 files changed, 9 insertions, 3 deletions
diff --git a/profiles/targets/developer/make.defaults b/profiles/targets/developer/make.defaults
index 271cf5ee17e6..3de6c7b20c27 100644
--- a/profiles/targets/developer/make.defaults
+++ b/profiles/targets/developer/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/developer/make.defaults,v 1.12 2012/08/12 08:35:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/developer/make.defaults,v 1.13 2014/03/16 20:08:20 dilfridge Exp $
# Remove "multilib-strict" for now wrt #424423
FEATURES="collision-protect sign splitdebug test test-fail-continue userpriv usersandbox"
@@ -13,3 +13,10 @@ I_KNOW_WHAT_I_AM_DOING="yes"
# Log eqawarn messages
PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"
+
+# Settings that previously were in targets/server, we dont inherit that anymore as
+# it is going away.
+# USE="-perl -python snmp truetype xml"
+# perl and python are now disabled by default anyway, truetype and xml are enabled
+# by the also inherited desktop profile
+USE="snmp"
diff --git a/profiles/targets/developer/parent b/profiles/targets/developer/parent
index 70b69b192450..5b26f1c370aa 100644
--- a/profiles/targets/developer/parent
+++ b/profiles/targets/developer/parent
@@ -1,2 +1 @@
-../server
../desktop