summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-rw-r--r--profiles/arch.list1
-rw-r--r--profiles/arch/alpha/use.mask1
-rw-r--r--profiles/arch/amd64/package.use.mask4
-rw-r--r--profiles/arch/arm/use.mask1
-rw-r--r--profiles/arch/arm64/use.mask1
-rw-r--r--profiles/arch/base/use.mask1
-rw-r--r--profiles/arch/hppa/use.mask1
-rw-r--r--profiles/arch/ia64/package.use.mask8
-rw-r--r--profiles/arch/ia64/use.mask1
-rw-r--r--profiles/arch/mips/use.mask1
-rw-r--r--profiles/arch/nios2/use.mask1
-rw-r--r--profiles/arch/powerpc/package.use.stable.mask5
-rw-r--r--profiles/arch/riscv/make.defaults8
-rw-r--r--profiles/arch/riscv/package.use.mask6
-rw-r--r--profiles/arch/riscv/parent1
-rw-r--r--profiles/arch/riscv/use.force2
-rw-r--r--profiles/arch/s390/use.mask1
-rw-r--r--profiles/arch/sh/use.mask1
-rw-r--r--profiles/arch/sparc/use.mask1
-rw-r--r--profiles/arch/x86/package.use.mask8
-rw-r--r--profiles/base/make.defaults8
-rw-r--r--profiles/base/package.use2
-rw-r--r--profiles/base/package.use.mask35
-rw-r--r--profiles/base/package.use.stable.mask8
-rw-r--r--profiles/default/linux/package.use.mask10
-rw-r--r--profiles/default/linux/riscv/13.0/desktop/eapi1
-rw-r--r--profiles/default/linux/riscv/13.0/desktop/parent2
-rw-r--r--profiles/default/linux/riscv/13.0/developer/eapi1
-rw-r--r--profiles/default/linux/riscv/13.0/developer/parent2
-rw-r--r--profiles/default/linux/riscv/13.0/eapi1
-rw-r--r--profiles/default/linux/riscv/13.0/parent2
-rw-r--r--profiles/default/linux/riscv/eapi1
-rw-r--r--profiles/default/linux/riscv/parent3
-rw-r--r--profiles/default/linux/uclibc/amd64/make.defaults4
-rw-r--r--profiles/desc/qemu_softmmu_targets.desc1
-rw-r--r--profiles/desc/qemu_user_targets.desc5
-rw-r--r--profiles/desc/video_cards.desc1
-rw-r--r--profiles/features/selinux/package.use.mask5
-rw-r--r--profiles/hardened/linux/arm/package.mask13
-rw-r--r--profiles/hardened/linux/musl/amd64/make.defaults4
-rw-r--r--profiles/hardened/linux/musl/amd64/x32/eapi1
-rw-r--r--profiles/hardened/linux/musl/amd64/x32/make.defaults14
-rw-r--r--profiles/hardened/linux/musl/amd64/x32/parent1
-rw-r--r--profiles/hardened/linux/musl/amd64/x32/use.force7
-rw-r--r--profiles/hardened/linux/musl/amd64/x32/use.mask7
-rw-r--r--profiles/hardened/linux/musl/arm/package.mask9
-rw-r--r--profiles/hardened/linux/uclibc/arm/package.mask9
-rw-r--r--profiles/package.mask68
-rw-r--r--profiles/profiles.desc4
-rw-r--r--profiles/targets/desktop/plasma/package.use2
-rw-r--r--profiles/updates/3Q-20153
51 files changed, 183 insertions, 105 deletions
diff --git a/profiles/arch.list b/profiles/arch.list
index 5d07884b7e7f..270c9bc7b0cc 100644
--- a/profiles/arch.list
+++ b/profiles/arch.list
@@ -10,6 +10,7 @@ mips
nios2
ppc
ppc64
+riscv
s390
sh
sparc
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index 342d9792e647..a686d2c1de89 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -155,6 +155,7 @@ video_cards_ilo
# vmware wasn't added with mesa-8.0, but it should still be masked
video_cards_vmware
# llvm is not keyworded
+video_cards_amdgpu
video_cards_radeonsi
# dspam and dspam-web use this one
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index fe26c7107a7a..8e6c778c5b83 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -18,6 +18,10 @@
#--- END OF EXAMPLES ---
+# Mike Gilbert <floppym@gentoo.org> (05 Sep 2015)
+# sys-boot/gnu-efi is not supported on all archs.
+sys-apps/systemd -gnuefi
+
# James Le Cuirot <chewi@gentoo.org> (28 Jul 2015)
# JavaFX and the browser plugin are included on x64 Linux.
dev-java/oracle-jdk-bin -javafx -nsplugin
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index 199b1ec1369f..d403145f1bac 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -188,6 +188,7 @@ video_cards_voodoo
# Matt Turner <mattst88@gentoo.org>
# Mask more VIDEO_CARDs added with mesa-8.0
+video_cards_amdgpu
video_cards_r100
video_cards_r200
video_cards_r300
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index da626a5ad94e..380927935936 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -197,6 +197,7 @@ video_cards_voodoo
# Matt Turner <mattst88@gentoo.org>
# Mask more VIDEO_CARDs added with mesa-8.0
+video_cards_amdgpu
video_cards_r100
video_cards_r200
video_cards_r300
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 9e9bd76ee21e..54a139ff449c 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -11,6 +11,7 @@ mips
nios2
ppc
ppc64
+riscv
s390
sh
sparc
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index aae668a2c476..34b8b6811bc9 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -225,6 +225,7 @@ dri
# 2006/02/05 Donnie Berkholz <dberkholz@gentoo.org>
# Modular X: mask for architectures on which they aren't available
+video_cards_amdgpu
video_cards_apm
video_cards_ark
video_cards_ast
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 3403fd3c81b3..98707f56e8ef 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -2,6 +2,14 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+# Pacho Ramos <pacho@gentoo.org> (06 Sep 2015)
+# Missing keywords
+media-sound/pulseaudio ofono-headset
+
+# Mike Gilbert <floppym@gentoo.org> (05 Sep 2015)
+# sys-boot/gnu-efi is not supported on all archs.
+sys-apps/systemd -gnuefi
+
# James Le Cuirot <chewi@gentoo.org> (11 Jul 2015)
# Requires dev-java/fop but we don't support java on ia64.
gnome-extra/libgda reports
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index 8386d29d25c6..5b3829e59ff5 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -175,6 +175,7 @@ video_cards_ilo
# vmware wasn't added with mesa-8.0, but it should still be masked
video_cards_vmware
# llvm is not keyworded
+video_cards_amdgpu
video_cards_radeonsi
# Diego Pettenò <flameeyes@gentoo.org> (6 Dec 2006)
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index eaf7d0c29c6f..ceec8e0d293e 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -150,6 +150,7 @@ video_cards_voodoo
# Matt Turner <mattst88@gentoo.org>
# Mask more VIDEO_CARDs added with mesa-8.0
+video_cards_amdgpu
video_cards_r100
video_cards_r200
video_cards_r300
diff --git a/profiles/arch/nios2/use.mask b/profiles/arch/nios2/use.mask
index f8aa13d9ee10..a170c07ee82f 100644
--- a/profiles/arch/nios2/use.mask
+++ b/profiles/arch/nios2/use.mask
@@ -198,6 +198,7 @@ video_cards_voodoo
# Matt Turner <mattst88@gentoo.org>
# Mask more VIDEO_CARDs added with mesa-8.0
+video_cards_amdgpu
video_cards_r100
video_cards_r200
video_cards_r300
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index d6f6fe131a10..fb3dae3960ed 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -22,6 +22,11 @@
# Missing stable
dev-libs/protobuf python
+# Pacho Ramos <pacho@gentoo.org> (06 Sep 2015)
+# webkit-gtk is going to stay in ~all but amd64/x86
+# that are the only arches upstream is taking care
+>=x11-libs/wxGTK-3.0.2.0-r1 webkit
+
# Justin Lecher <jlec@gentoo.org> (21 Feb 2015)
# Needs stable GNOME-3
net-fs/netatalk tracker
diff --git a/profiles/arch/riscv/make.defaults b/profiles/arch/riscv/make.defaults
new file mode 100644
index 000000000000..17e6e78e9ef9
--- /dev/null
+++ b/profiles/arch/riscv/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Main RISC-V profile; endian/bitsize independent.
+
+ARCH="riscv"
+ACCEPT_KEYWORDS="riscv"
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
new file mode 100644
index 000000000000..6534d12ba4eb
--- /dev/null
+++ b/profiles/arch/riscv/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# libpcre doesn't support jit on RISC-V.
+dev-libs/libpcre jit
diff --git a/profiles/arch/riscv/parent b/profiles/arch/riscv/parent
new file mode 100644
index 000000000000..eb001c6e8ab8
--- /dev/null
+++ b/profiles/arch/riscv/parent
@@ -0,0 +1 @@
+../base
diff --git a/profiles/arch/riscv/use.force b/profiles/arch/riscv/use.force
new file mode 100644
index 000000000000..612aced6a1fa
--- /dev/null
+++ b/profiles/arch/riscv/use.force
@@ -0,0 +1,2 @@
+# Force the flag which corresponds to ARCH.
+riscv
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index 3687d153fe9f..5300c0bab676 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -111,6 +111,7 @@ input_devices_vmmouse
input_devices_synaptics
input_devices_tslib
input_devices_wacom
+video_cards_amdgpu
video_cards_apm
video_cards_ark
video_cards_ast
diff --git a/profiles/arch/sh/use.mask b/profiles/arch/sh/use.mask
index 6e2cba847c38..4d645f70fb2b 100644
--- a/profiles/arch/sh/use.mask
+++ b/profiles/arch/sh/use.mask
@@ -135,6 +135,7 @@ video_cards_voodoo
# Matt Turner <mattst88@gentoo.org>
# Mask more VIDEO_CARDs added with mesa-8.0
+video_cards_amdgpu
video_cards_r100
video_cards_r200
video_cards_r300
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index 17330a0a367e..9a5a8f7f20fc 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -260,6 +260,7 @@ video_cards_ilo
# vmware wasn't added with mesa-8.0, but it should still be masked
video_cards_vmware
# llvm is not keyworded
+video_cards_amdgpu
video_cards_radeonsi
# Diego Pettenò <flameeyes@gentoo.org> (6 Dec 2006)
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index de513c6f6097..c668421701d7 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -4,6 +4,10 @@
# This file requires >=portage-2.1.1
+# Mike Gilbert <floppym@gentoo.org> (05 Sep 2015)
+# sys-boot/gnu-efi is not supported on all archs.
+sys-apps/systemd -gnuefi
+
# Michael Palimaka <kensington@gentoo.org> (12 Aug 2015)
# Unkeyworded dependencies
kde-frameworks/kauth policykit
@@ -33,10 +37,6 @@ net-im/telepathy-connection-managers -steam
# >x11-drivers/nvidia-drivers-346 on x86 has no UVM support (bug #534156)
>x11-drivers/nvidia-drivers-346 uvm
-# Pacho Ramos <pacho@gentoo.org> (18 Jan 2015)
-# Missing keywords
-media-plugins/gst-plugins-meta vaapi
-
# Tim Harder <radhermit@gentoo.org> (11 Oct 2014)
# Unmask skype support for unstable keywords
net-im/bitlbee -skype
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index bda4edf634fd..7343f5b1c91f 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -9,7 +9,7 @@
IUSE_IMPLICIT="prefix prefix-guest"
USE_EXPAND_UNPREFIXED="ARCH"
USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa hppa-hpux ia64 ia64-hpux ia64-linux m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos ppc-openbsd s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa hppa-hpux ia64 ia64-hpux ia64-linux m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos ppc-openbsd riscv s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt"
USE_EXPAND_VALUES_ELIBC="AIX Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mintlib musl NetBSD OpenBSD SunOS uclibc Winnt"
USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt"
USE_EXPAND_VALUES_USERLAND="BSD GNU"
@@ -101,9 +101,9 @@ NETBEANS="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb p
# Build kernel modules from linux-mod by default:
USE="${USE} modules"
-# Manuel Rüger <mrueg@gentoo.org> (16 Mar 2014)
+# Manuel Rüger <mrueg@gentoo.org> (09 Sep 2015)
# Default Ruby build targets
-RUBY_TARGETS="ruby19 ruby20"
+RUBY_TARGETS="ruby20 ruby21"
# Samuli Suominen <ssuominen@gentoo.org> (03 Dec 2009)
# Enable USE cxx by default so base-system and toolchain pkgs can start using USE cxx
@@ -138,4 +138,4 @@ UNINSTALL_IGNORE="/lib/modules/* /var/run /var/lock"
# Andreas K. Hüttel <dilfridge@gentoo.org> (23 Aug 2013)
# Make emerge messages default to English as per Council decision
-LC_MESSAGES=C
+LC_MESSAGES="C"
diff --git a/profiles/base/package.use b/profiles/base/package.use
index 2a6aa7c576e6..127361dbac49 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -6,6 +6,8 @@
# Set here proper defaults to make the packages buildable by default,
# bugs #555930 and #472932
media-sound/gnome-music python_single_target_python3_4
+gnome-extra/gnome-builder python_single_target_python3_4
+media-video/pitivi python_single_target_python3_4
# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (27 Jul 2012)
# Modular X: Build the Xorg X server by default
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 03722aada477..1410650f066a 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -5,6 +5,39 @@
# This file requires >=portage-2.1.1
# New entries go on top.
+# Jason Zaman <perfinion@gentoo.org> (06 Sep 2015)
+# This is for cgmanager which is linux only.
+# Unmasked in default/linux/package.use.mask.
+sys-auth/consolekit cgroups
+
+# Mike Gilbert <floppym@gentoo.org> (05 Sep 2015)
+# sys-boot/gnu-efi is not supported on all archs.
+sys-apps/systemd gnuefi
+
+# Manuel Rüger <mrueg@gentoo.org> (03 Sep 2015)
+# Mask USE=ruby for packages that solely rely on the soon to be deprecated
+# ruby 1.9
+# See bug #547828
+<app-mobilephone/obexftp-0.24 ruby
+# See bug #541648
+<dev-libs/Ice-3.6 ruby
+# See bug #547768
+<net-irc/epic5-1.10-r1 ruby
+# See bug #547832
+sci-libs/gdal ruby
+# See bug #547834
+<sys-apps/paludis-2.4.0 ruby
+# See bug #480574
+media-libs/mlt ruby
+
+# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (02 Sep 2015)
+# x11-drivers/xf86-video-amdgpu is not keyworded on most arches
+x11-base/xorg-drivers video_cards_amdgpu
+
+# Andreas K. Huettel <dilfridge@gentoo.org> (1 Sep 2015)
+# Currently broken upstream. We still hope it will get fixed.
+app-office/libreoffice telepathy
+
# Johannes Huber <johu@gentoo.org> (28 Aug 2015)
# Dependency not in tree yet
kde-apps/kaccounts-integration kdepim
@@ -17,7 +50,7 @@ kde-apps/kaccounts-integration kdepim
# Michael Palimaka <kensington@gentoo.org> (27 Aug 2015)
# Unreleased dependencies
-kde-apps/dolphin thumbnail
+kde-apps/dolphin:5 thumbnail
# James Le Cuirot <chewi@gentoo.org> (18 Aug 2015)
# gcc[awt] is only used by gcj-jdk[awt] and that isn't needed by
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index aa3d222e9d2b..8cdc84c0f94f 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -83,18 +83,10 @@ media-video/mpv libcaca
# Not yet stabilized dependencies blocking sec bug 514886
app-office/libreoffice firebird
-# Mike Gilbert <floppym@gentoo.org> (30 May 2014)
-# >=net-libs/gnutls-3.1.4 is not going stable any time soon.
-sys-apps/systemd ssl
-
# Agostino Sarubbo <ago@gentoo.org> (31 Aug 2013)
# Clang is not stable
app-portage/eix clang
-# Pacho Ramos <pacho@gentoo.org> (17 Nov 2013)
-# Still needs gnutls-3
->=net-nntp/pan-0.139 ssl
-
# Sergey Popov <pinkbyte@gentoo.org> (28 Oct 2013)
# sys-cluster/cman is still in ~arch.
sys-cluster/pacemaker cman
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index a735ef9ab533..cc70abdf5c1a 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -2,6 +2,16 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+# Jason Zaman <perfinion@gentoo.org> (06 Sep 2015)
+# This is masked in base/package.use.mask as Linux only.
+sys-auth/consolekit -cgroups
+
+# Michael Palimaka <kensington@gentoo.org> (03 Sep 2015)
+# Native inotify support is preferred on linux.
+app-misc/strigi fam
+kde-base/kdelibs fam
+kde-frameworks/kcoreaddons fam
+
# Christian Ruppert <idl0r@gentoo.org> (23 Aug 2015)
# seccomp seems completely broken currently but has been added as global default
# apparently... #558100
diff --git a/profiles/default/linux/riscv/13.0/desktop/eapi b/profiles/default/linux/riscv/13.0/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/13.0/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/13.0/desktop/parent b/profiles/default/linux/riscv/13.0/desktop/parent
new file mode 100644
index 000000000000..ad6c5e126fbb
--- /dev/null
+++ b/profiles/default/linux/riscv/13.0/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/desktop
diff --git a/profiles/default/linux/riscv/13.0/developer/eapi b/profiles/default/linux/riscv/13.0/developer/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/13.0/developer/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/13.0/developer/parent b/profiles/default/linux/riscv/13.0/developer/parent
new file mode 100644
index 000000000000..4c893748ce71
--- /dev/null
+++ b/profiles/default/linux/riscv/13.0/developer/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/developer
diff --git a/profiles/default/linux/riscv/13.0/eapi b/profiles/default/linux/riscv/13.0/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/13.0/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/13.0/parent b/profiles/default/linux/riscv/13.0/parent
new file mode 100644
index 000000000000..7c0377510996
--- /dev/null
+++ b/profiles/default/linux/riscv/13.0/parent
@@ -0,0 +1,2 @@
+..
+../../../../releases/13.0
diff --git a/profiles/default/linux/riscv/eapi b/profiles/default/linux/riscv/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/parent b/profiles/default/linux/riscv/parent
new file mode 100644
index 000000000000..1f65d976126f
--- /dev/null
+++ b/profiles/default/linux/riscv/parent
@@ -0,0 +1,3 @@
+../../../base
+..
+../../../arch/riscv
diff --git a/profiles/default/linux/uclibc/amd64/make.defaults b/profiles/default/linux/uclibc/amd64/make.defaults
index 94caf16cb540..3e8b3eb0f8a0 100644
--- a/profiles/default/linux/uclibc/amd64/make.defaults
+++ b/profiles/default/linux/uclibc/amd64/make.defaults
@@ -20,6 +20,10 @@ CHOST_amd64=${CHOST}
LIBDIR_amd64="lib"
IUSE_IMPLICIT="abi_x86_64"
+# Anthony G. Basile <blueness@gentoo.org> (31 Aug 2015)
+# Relect these flags from arch/amd64 which we don't inherit
+CPU_FLAGS_X86="mmx mmxext sse sse2"
+
# Anthony G. Basile <blueness@gentoo.org> (26 Jan 2013)
# Unhide the CPU_FLAGS_X86 USE_EXPANDs.
USE_EXPAND_HIDDEN="-CPU_FLAGS_X86"
diff --git a/profiles/desc/qemu_softmmu_targets.desc b/profiles/desc/qemu_softmmu_targets.desc
index e473b2072785..96c635c703ee 100644
--- a/profiles/desc/qemu_softmmu_targets.desc
+++ b/profiles/desc/qemu_softmmu_targets.desc
@@ -29,6 +29,7 @@ sh4eb - system emulation target
sh4 - system emulation target
sparc - system emulation target
sparc64 - system emulation target
+tricore - system emulation target
unicore32 - system emulation target
x86_64 - system emulation target
xtensaeb - system emulation target
diff --git a/profiles/desc/qemu_user_targets.desc b/profiles/desc/qemu_user_targets.desc
index b4afce03ee3d..3f9efd2ac74a 100644
--- a/profiles/desc/qemu_user_targets.desc
+++ b/profiles/desc/qemu_user_targets.desc
@@ -22,9 +22,10 @@ mipsn32 - MIPS N32 ABI userspace emulation target
mipsn32el - MIPS N32 ABI LE userspace emulation target
mips - userspace emulation target
or32 - OpenRISC userspace emulation target
+ppc - PowerPC 32-bit big endian userspace emulation target
+ppc64 - PowerPC 64-bit big endian userspace emulation target
ppc64abi32 - userspace emulation target
-ppc64 - userspace emulation target
-ppc - userspace emulation target
+ppc64le - PowerPC 64-bit little endian userspace emulation target
s390x - userspace emulation target
sh4eb - userspace emulation target
sh4 - userspace emulation target
diff --git a/profiles/desc/video_cards.desc b/profiles/desc/video_cards.desc
index edd47c6dbccf..d60cebee92fb 100644
--- a/profiles/desc/video_cards.desc
+++ b/profiles/desc/video_cards.desc
@@ -6,6 +6,7 @@
# Keep it sorted.
+amdgpu - VIDEO_CARDS setting to build driver for AMDGPU video cards
apm - VIDEO_CARDS setting to build driver for apm video cards
ark - VIDEO_CARDS setting to build driver for ark video cards
ast - VIDEO_CARDS setting to build driver for ASpeedTech video cards
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index f3d42acdfe64..6d3a8f629683 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -19,6 +19,11 @@ app-portage/diffmask python_targets_pypy python_targets_pypy3
# Please see: https://wiki.gentoo.org/wiki/SELinux/FAQ#Can_I_use_SELinux_with_SystemD.3F
app-emulation/libvirt firewalld
gnome-base/gdm systemd wayland
+net-firewall/fwknop firewalld
sys-kernel/dracut dracut_modules_systemd
www-servers/uwsgi uwsgi_plugins_systemd_logger
x11-wm/mutter kms
+
+# Alex Brandt <alunduil@gentoo.org> (6 Sep 2015)
+# app-emulation/rkt[rkt_stage1_src] requires systemd which isn't available with selinux.
+app-emulation/rkt rkt_stage1_src
diff --git a/profiles/hardened/linux/arm/package.mask b/profiles/hardened/linux/arm/package.mask
deleted file mode 100644
index c97146ed3396..000000000000
--- a/profiles/hardened/linux/arm/package.mask
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Anthony G. Basile <blueness@gentoo.org> (08 May 2015)
-# Mask gcc 4.8 and above pending the fix of bug #518598
-=sys-devel/gcc-4.8*
-=sys-devel/gcc-4.9*
-=sys-devel/gcc-5.1*
-
-# >=sys-libs/glibc-2.20 requires >=sys-devel/gcc-4.8,
-# so we mask it as well pending the fix of bug #518598
->=sys-libs/glibc-2.20
diff --git a/profiles/hardened/linux/musl/amd64/make.defaults b/profiles/hardened/linux/musl/amd64/make.defaults
index 29634fdb7bfe..ee429b6bfd5a 100644
--- a/profiles/hardened/linux/musl/amd64/make.defaults
+++ b/profiles/hardened/linux/musl/amd64/make.defaults
@@ -20,6 +20,10 @@ CHOST_amd64=${CHOST}
LIBDIR_amd64="lib"
IUSE_IMPLICIT="abi_x86_64"
+# Anthony G. Basile <blueness@gentoo.org> (31 Aug 2015)
+# Relect these flags from arch/amd64 which we don't inherit
+CPU_FLAGS_X86="mmx mmxext sse sse2"
+
# Anthony G. Basile <blueness@gentoo.org> (26 Jan 2013)
# Unhide the CPU_FLAGS_X86 USE_EXPANDs.
USE_EXPAND_HIDDEN="-CPU_FLAGS_X86"
diff --git a/profiles/hardened/linux/musl/amd64/x32/eapi b/profiles/hardened/linux/musl/amd64/x32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/hardened/linux/musl/amd64/x32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/hardened/linux/musl/amd64/x32/make.defaults b/profiles/hardened/linux/musl/amd64/x32/make.defaults
new file mode 100644
index 000000000000..cf5a09254092
--- /dev/null
+++ b/profiles/hardened/linux/musl/amd64/x32/make.defaults
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+CHOST="x86_64-gentoo-linux-muslx32"
+
+# Anthony G. Basile <blueness@gentoo.org> (31 Aug 2015)
+# Multilib-related setup, bug #515130
+ABI="x32"
+DEFAULT_ABI="x32"
+MULTILIB_ABIS="x32"
+CHOST_x32=${CHOST}
+LIBDIR_x32="lib"
+IUSE_IMPLICIT="abi_x86_x32"
diff --git a/profiles/hardened/linux/musl/amd64/x32/parent b/profiles/hardened/linux/musl/amd64/x32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/hardened/linux/musl/amd64/x32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/hardened/linux/musl/amd64/x32/use.force b/profiles/hardened/linux/musl/amd64/x32/use.force
new file mode 100644
index 000000000000..71a90a0fac61
--- /dev/null
+++ b/profiles/hardened/linux/musl/amd64/x32/use.force
@@ -0,0 +1,7 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Force the flag which corresponds to arch/abi, bug #515130
+-abi_x86_64
+abi_x86_x32
diff --git a/profiles/hardened/linux/musl/amd64/x32/use.mask b/profiles/hardened/linux/musl/amd64/x32/use.mask
new file mode 100644
index 000000000000..182f7557c994
--- /dev/null
+++ b/profiles/hardened/linux/musl/amd64/x32/use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Force the flag which corresponds to arch/abi, bug #515130
+-abi_x86_x32
+abi_x86_64
diff --git a/profiles/hardened/linux/musl/arm/package.mask b/profiles/hardened/linux/musl/arm/package.mask
deleted file mode 100644
index 56c5f228bf93..000000000000
--- a/profiles/hardened/linux/musl/arm/package.mask
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Anthony G. Basile <blueness@gentoo.org> (08 May 2015)
-# Mask gcc 4.8 and above pending the fix of bug #518598
-=sys-devel/gcc-4.8*
-=sys-devel/gcc-4.9*
-=sys-devel/gcc-5.1*
diff --git a/profiles/hardened/linux/uclibc/arm/package.mask b/profiles/hardened/linux/uclibc/arm/package.mask
deleted file mode 100644
index 56c5f228bf93..000000000000
--- a/profiles/hardened/linux/uclibc/arm/package.mask
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Anthony G. Basile <blueness@gentoo.org> (08 May 2015)
-# Mask gcc 4.8 and above pending the fix of bug #518598
-=sys-devel/gcc-4.8*
-=sys-devel/gcc-4.9*
-=sys-devel/gcc-5.1*
diff --git a/profiles/package.mask b/profiles/package.mask
index d87998081214..de3cb51dd776 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,19 @@
#--- END OF EXAMPLES ---
+# Rick Farina <zerochaos@gentoo.org> (04 Sep 2015)
+# Ancient, please upgrade to ~arch version
+=net-analyzer/metasploit-2.7
+
+# Michael Palimaka <kensington@gentoo.org> (01 Sep 2015)
+# Fails to build (bug #559330). Dead upstream.
+# Masked for removal in 30 days.
+kde-misc/socket-sentry
+
+# Matt Turner <mattst88@gentoo.org> (28 Aug 2015)
+# Masked for removal in 30 days. Bug 482304
+x11-libs/libXevie
+
# Hans de Graaff <graaff@gentoo.org> (28 Aug 2015)
# Masked for removal in 30 days.
# Only needed for ruby18 which has been removed a long time
@@ -53,11 +66,6 @@ app-emulation/kvm-kmod
# last version does not compile. Bug #543644
sys-devel/dragonegg
-# Bernard Cafarelli <voyageur@gentoo.org> (24 Aug 2015)
-# New llvm version for testing
-=sys-devel/llvm-3.7.0*
-=sys-devel/clang-3.7.0*
-
# Andreas Sturmlechner <andreas.sturmlechner@gmail.com> (24 Aug 2015)
# Masked until >=sys-auth/consolekit-0.9.2 gets unmasked
=x11-misc/sddm-0.11.0-r2
@@ -173,10 +181,6 @@ kde-base/kdepim-strigi-analyzer
# Upcoming, too young to go into testing unmasked
dev-libs/iniparser:4
-# Matthew Thode <prometheanfire@gentoo.org> (04 Aug 2015)
-# removing old and never working horizon Bug #556710
-www-apps/horizon
-
# Mikle Kolyada <zlogene@hemtoo.org> (04 Aug 2015)
# Unmaintained since 2010. No longer available
# on CPAN and nothing in the tree depends on it.
@@ -188,27 +192,12 @@ dev-perl/gtk2-fu
# Bugs: 478174, 546192, 556200.
sys-apps/systemd-ui
-# Patrice Clement <monsieurp@gentoo.org> (3 Aug 2015)
-# Broken and no releases in 10 years (!).
-# Removal in 30 days. See bug #451790.
-www-servers/skunkweb
-
# Sergei Trofimovich <slyfox@gentoo.org> (2 Aug 2015)
# This package is a part of >=dev-lang/ghc-7.4. Gentoo
# ebuilds use that. You can safely uninstall dev-haskell/deepseq
# and fix leftovers with 'haskell-updater' run.
dev-haskell/deepseq
-# Patrice Clement <monsieurp@gentoo.org> (1 Aug 2015)
-# Package relying on j2me. Not useful anymore since j2me has long been removed.
-# Removal in 30 days. See bug #556460.
-dev-java/antenna
-
-# Patrice Clement <monsieurp@gentoo.org> (30 Jul 2015)
-# Broken and upstream dead isn't always a good mix.
-# Removal in 30 days. See bug #368049.
-dev-java/jjtraveler
-
# Pawel Hajdan, Jr. <phajdan.jr@gentoo.org> (28 Jul 2015)
# Dev channel releases are only for people who are developers or want more
# experimental features and accept a more unstable release.
@@ -253,11 +242,6 @@ sci-biology/flower
# Wrong version #553670
=sys-kernel/gentoo-sources-4.1.1
-# Brian Evans <grknight@gentoo.org> (19 Jun 2015)
-# The Cyphertite backup service is closing as of August 18th, 2015.
-# Package masked for removal in 30 days. bug 552578
-app-backup/cyphertite
-
# Patrick Lauer <patrick@gentoo.org> (14 Jun 2015)
# Has race condition / failure modes that make systems unusable
# See #551724 and duplicates
@@ -268,13 +252,6 @@ app-backup/cyphertite
dev-lang/php:7.0
=virtual/httpd-php-7.0
-# Brian Evans <grknight@gentoo.org> (30 Apr 2015)
-# It is unclear if dev-php/smarty-2* is affected by
-# security bug 526542. Masked for removal in 30 days
-# Please update your code to the latest version
-<dev-php/smarty-2.6.29
-=dev-php/PEAR-PhpDocumentor-1.4.4
-
# Ryan Hill <rhill@gentoo.org> (28 Apr 2015)
# Moving to /lib/gentoo/functions.sh broke the eclass
# by changing output it relies on. See bug #504118,
@@ -310,14 +287,6 @@ app-emulation/emul-linux-x86-soundlibs
app-emulation/emul-linux-x86-xlibs
app-emulation/emul-linux-x86-jna
-# Brian Evans <grknight@gentoo.org> (22 Mar 2015)
-# PHP 5.3.x is vulnerable to several security bugs and has
-# reached EOL status. (Bugs #533998, #537586, #537590, #538822, #541098)
-# Masked pending resolution to bug #538756
-dev-lang/php:5.3
-virtual/httpd-php:5.3
-=mail-client/squirrelmail-1.4.22
-
# Lars Wendler <polynomial-c@gentoo.org> (8 Mar 2015)
# Masked for testing
>=net-fs/samba-4.2.0
@@ -400,13 +369,6 @@ www-apps/trac-downloads
# Mask latest development version for testing
=x11-misc/lightdm-1.15*
-# Samuli Suominen <ssuominen@gentoo.org> (05 Nov 2014)
-# ConsoleKit2 from github by Eric Koegel, auth of xfce4-power-manager
-# The ConsoleKit in freedesktop.org git won't be continued anymore,
-# making this the new official release
-# Masked for testing
->=sys-auth/consolekit-0.9.2
-
# Mike Pagano <mpagano@gentoo.org> (16 Oct 2014)
# A regression in kernels 3.17.0 lead to file system corruption
# for affected systems. This has been fixed in >= 3.17.1
@@ -816,10 +778,6 @@ media-libs/shivavg
# not needed anymore for Asterisk 1.6.
net-misc/asterisk-spandsp_codec_g726
-# Doug Goldstein <cardoe@gentoo.org> (07 Jul 2010)
-# No actual Gentoo support yet. If you're interested, please see bug #295993
-net-misc/netcf
-
# Mike Frysinger <vapier@gentoo.org> (07 Mar 2010)
# Very old packages that people should have upgraded away from
# long ago. Courtesy mask ... time to upgrade.
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 26615a5f7921..9274218a35d8 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -132,6 +132,9 @@ ppc64 default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde
ppc64 default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde/systemd stable
ppc64 default/linux/powerpc/ppc64/13.0/64bit-userland/developer stable
+# RISC-V Profiles
+riscv default/linux/riscv/13.0 exp
+
# S390 Profiles
s390 default/linux/s390/13.0 exp
s390 default/linux/s390/13.0/s390x exp
@@ -186,6 +189,7 @@ amd64 hardened/linux/amd64/no-multilib stable
amd64 hardened/linux/amd64/no-multilib/selinux stable
amd64 hardened/linux/amd64/x32 dev
amd64 hardened/linux/musl/amd64 exp
+amd64 hardened/linux/musl/amd64/x32 exp
arm hardened/linux/arm/armv7a dev
arm hardened/linux/arm/armv6j dev
arm hardened/linux/musl/arm/armv7a exp
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 717e23878afa..695433194b52 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -47,7 +47,9 @@ kde-apps/solid-runtime -bluetooth
kde-base/baloo minimal
kde-base/kactivities minimal
kde-base/kde-meta -kdepim minimal
+kde-base/systemsettings -handbook
net-libs/libkpeople minimal
+net-p2p/ktorrent -plasma
sys-auth/polkit-kde-agent minimal
# Required by app-office/libreoffice
diff --git a/profiles/updates/3Q-2015 b/profiles/updates/3Q-2015
index 62a5e71359cb..7f5fa594e8b3 100644
--- a/profiles/updates/3Q-2015
+++ b/profiles/updates/3Q-2015
@@ -12,3 +12,6 @@ slotmove =sys-libs/ncurses-5.9-r3 5 0
slotmove =sys-libs/ncurses-5.9-r4 5 0
slotmove ~sys-libs/ncurses-6.0 5 0
move kde-base/baloo-widgets kde-apps/baloo-widgets
+slotmove =kde-apps/kde-base-artwork-15.08.0 5 4
+move x11-drivers/radeon-ucode sys-firmware/radeon-ucode
+move dev-python/pyDeComp dev-python/pydecomp