summaryrefslogtreecommitdiff
path: root/profiles
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-rw-r--r--profiles/base/make.defaults19
-rw-r--r--profiles/base/package.use.stable.mask8
-rw-r--r--profiles/package.mask30
-rw-r--r--profiles/use.local.desc3
4 files changed, 40 insertions, 20 deletions
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index ee84bc0b7f0f..e7a3077c777c 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -49,10 +49,6 @@ LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer"
# By default build all koffice / calligra features.
CALLIGRA_FEATURES="kexi words flow plan sheets stage tables krita karbon braindump author"
-# Ole Markus With <olemarkus@gentoo.org> (09 Oct 2010)
-# Default PHP targets (should always be latest stable version)
-PHP_TARGETS="php5-6"
-
# Andreas K. Huettel <dilfridge@gentoo.org> (28 Sep 2010)
# Small default list of enabled plugins for collectd
COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog"
@@ -145,3 +141,18 @@ TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE="1"
# Aaron W. Swenson <titanofold@gentoo.org> (9 Jul 2017)
# Default target(s) for postgres{,-multi}.eclass
POSTGRES_TARGETS="postgres9_5"
+
+# Michael Orlitzky <mjo@gentoo.org> (17 Nov 2017)
+#
+# Default PHP targets, used only for extensions at the moment.
+#
+# The value of this variable should be chosen to be "least annoying by
+# default." For example, some packages support only php-5.x and some
+# only php-7.x. By having both "php5-6" and php7-0" in PHP_TARGETS, we
+# ensure that users who don't care one way or the other don't have to
+# mess with this variable in order to install those packages.
+#
+# Moreover, it should only contain targets that have a stable version
+# of PHP, to avoid pulling in an unstable PHP on stable systems.
+#
+PHP_TARGETS="php5-6 php7-0"
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index f05f779bca86..ec52ae87822d 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in package.use.mask
+# Andreas Sturmlechner <asturm@gentoo.org> (16 Nov 2017)
+# Requires PYTHON_TARGETS="python3_5", bug #620940
+kde-apps/kdegames-meta python
+
# Brian Evans <grknight@gentoo.org (6 Nov 2017)
# Requires stable phpunit
dev-php/PEAR-Text_Password test
@@ -44,10 +48,6 @@ kde-apps/kopete cryptography
# Unstable dependencies.
dev-util/rpmdevtools emacs
-# Andreas Sturmlechner <asturm@gentoo.org> (06 Aug 2017)
-# Requires dev-lang/python-3.5 stabilisation
->=kde-apps/kdegames-meta-17.04.3 python
-
# Patrick McLean <chutzpah@gentoo.org> (11 Jul 2017)
# Requires >=net-dns/libidn2-2.0 stabilization
net-dns/dnsmasq libidn2
diff --git a/profiles/package.mask b/profiles/package.mask
index d25a7d16b0ba..b59da46e44c1 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,25 @@
#--- END OF EXAMPLES ---
+# Andreas Sturmlechner <asturm@gentoo.org> (16 Nov 2017)
+# Qt4WebKit is ancient and full of security holes.
+# Masked for removal in 30 days. Bug #620684
+dev-qt/qtwebkit:4
+
+# Andreas Sturmlechner <asturm@gentoo.org> (16 Nov 2017)
+# Depends on dead Qt4WebKit. Masked for removal in 30 days. Bug #620826
+<app-misc/anki-2.1
+
+# Andreas Sturmlechner <asturm@gentoo.org> (16 Nov 2017)
+# Depends on dead Qt4WebKit. Masked for removal in 30 days. Bug #620702
+<media-gfx/freecad-0.17
+
+# Andreas Sturmlechner <asturm@gentoo.org> (16 Nov 2017)
+# Depends on dead Qt4WebKit. Masked for removal in 30 days. Bug #620736
+=net-misc/teamviewer-10*
+=net-misc/teamviewer-11*
+=net-misc/teamviewer-12*
+
# Anthony G. Basile <blueness@gentoo.org> (13 Nov 2017)
# Masked for removal in 30 days. Deprecated in favor of net-misc/nyx.
net-misc/arm
@@ -245,17 +264,6 @@ sys-devel/automake:1.8
# See also bug #634494. Masked for removal on 2017-11-30
dev-tex/texmfind
-# Andreas Sturmlechner <asturm@gentoo.org> (16 Oct 2017)
-# Qt4WebKit is ancient and is likely to have more holes
-# in it than swiss cheese. Bug #620684
-dev-qt/qtwebkit:4
-
-# Andreas Sturmlechner <asturm@gentoo.org> (16 Oct 2017)
-# Reverse-deps on dead Qt4WebKit. Bug #620684
-<app-misc/anki-2.1
-<media-gfx/freecad-0.17
->=net-misc/teamviewer-10
-
# Kent Fredric <kentnl@gentoo.org> (14 Oct 2017)
# 12 years without upstream responding to bugs, code almost
# irredeemably unmaintainable and with no way to demonstrate it
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b857f5802215..468721ce4f74 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4343,6 +4343,7 @@ media-plugins/audacious-plugins:scrobbler - Build with scrobbler/LastFM submissi
media-plugins/audacious-plugins:sid - Build with SID (Commodore 64 Audio) support
media-plugins/audacious-plugins:soxr - Build with SoX Resampler support
media-plugins/audacious-plugins:speedpitch - Enable speed/pitch effects
+media-plugins/calf:experimental - Enable experimental features/plugins
media-plugins/calf:lv2 - Add support for Ladspa V2
media-plugins/frei0r-plugins:facedetect - Enables building of facedetect plugin, which depends on media-libs/opencv
media-plugins/frei0r-plugins:scale0tilt - Enables building of scale0tilt and vectorscope plugins, which depend on media-libs/gavl
@@ -7455,6 +7456,7 @@ sec-policy/selinux-base:unconfined - Enable support for the unconfined SELinux m
sec-policy/selinux-base-policy:unconfined - Enable support for the unconfined SELinux policy module
sys-apps/accountsservice:elogind - Use sys-auth/elogind instead of sys-auth/consolekit for session tracking
sys-apps/accountsservice:systemd - Use sys-apps/systemd instead of sys-auth/consolekit for session tracking
+sys-apps/baselayout:usrmerge - Activate the /usr merge when stages are built
sys-apps/busybox:make-symlinks - Create all the appropriate symlinks in /bin and /sbin.
sys-apps/busybox:math - Enable math support in gawk (requires libm)
sys-apps/busybox:mdev - Create the appropriate symlink in /sbin and install mdev.conf and support files
@@ -8099,7 +8101,6 @@ sys-kernel/mips-sources:ip27 - Enables additional support for SGI Origin (IP27)
sys-kernel/mips-sources:ip28 - Enables additional support for SGI Indigo2 Impact R10000 (IP28)
sys-kernel/mips-sources:ip30 - Enables support for SGI Octane (IP30, 'Speedracer')
sys-kernel/rt-sources:deblob - Remove binary blobs from kernel sources to provide libre license compliance.
-sys-kernel/spl:debug-log - Enable additional diagnostics
sys-kernel/tuxonice-sources:experimental - Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".
sys-libs/binutils-libs:64-bit-bfd - Support 64-bit targets even on 32-bit hosts (is ignored on 64-bit hosts)
sys-libs/binutils-libs:multitarget - Enable all possible targets in libbfd