gentoo resync : 03.02.2018

14 files changed, 22 insertions, 23 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 5e596449a923..b07e4273e853 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index 2bf7d3769e73..10b8a7a6d3f9 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -1,13 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
-# Not yet stable.
-elogind
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (26 May 2017)
 # dev-db/firebird is keyworded ~amd64
 firebird
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 118c3436da94..13064b699d26 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -1,13 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
-# Not yet stable.
-elogind
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (26 May 2017)
 # dev-db/firebird is keyworded ~x86
 firebird
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index ff5cb51e522b..7f51174a2e44 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2 Feb 2018)
+# This feature is not ready yet, see bug 146882 comment 26
+sys-libs/glibc compile-locales
+
 # Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
 # Depends on last-rited sci-visualization/xds-viewer
 sci-chemistry/xds-bin X
diff --git a/profiles/default/linux/arm64/17.0/prefix/kernel-3.2+/eapi b/profiles/default/linux/arm64/17.0/prefix/kernel-3.2+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/prefix/kernel-3.2+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/17.0/prefix/kernel-3.2+/parent b/profiles/default/linux/arm64/17.0/prefix/kernel-3.2+/parent
new file mode 100644
index 000000000000..b8a505e58f6c
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/prefix/kernel-3.2+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/prefix/standalone
diff --git a/profiles/default/linux/arm64/17.0/prefix/parent b/profiles/default/linux/arm64/17.0/prefix/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/hardened/linux/package.mask b/profiles/hardened/linux/package.mask
index e4c9930b0525..099e6f9e0e3a 100644
--- a/profiles/hardened/linux/package.mask
+++ b/profiles/hardened/linux/package.mask
@@ -1,11 +1,6 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
-# Requires >=icu-60, which is not available in 13.0 based profiles.
-# Please migrate to one of the new hardened profiles.
->=app-office/libreoffice-bin-5.4.4
->=app-office/libreoffice-bin-debug-5.4.4
-
 # Hardened versions of gcc-4.0* through gcc-4.2* are not available.
 =sys-devel/gcc-4.0*
 =sys-devel/gcc-4.1*
diff --git a/profiles/package.mask b/profiles/package.mask
index 7aa0f88a4990..85ae7a0a3378 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -39,11 +39,6 @@ media-sound/qtagconvert
 # Masked for removal in 30 days. Bug #644516
 media-sound/qpitch
 
-# Andreas Sturmlechner <asturm@gentoo.org> (31 Jan 2018)
-# No homepage, depends on deprecated Qt4.
-# Masked for removal in 30 days.
-app-dicts/qvortaro
-
 # Lars Wendler <polynomial-c@gentoo.org> (28 Jan 2018)
 # Masked for testing.
 # At least app-misc/mc is broken when using a 256color TERM setting.
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 8bdfb1d1dd93..ecb3607d80c9 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -350,6 +350,7 @@ x86-linux		default/linux/x86/17.0/prefix/kernel-3.2+	exp
 x86-linux		default/linux/x86/17.0/prefix/kernel-2.6.32+	exp
 x86-linux		default/linux/x86/17.0/prefix/kernel-2.6.16+	exp
 arm-linux		prefix/linux-standalone/arm/armv7a		exp
+arm64-linux		default/linux/arm64/17.0/prefix/kernel-3.2+	exp
 arm64-linux		prefix/linux-standalone/arm64			exp
 ppc64-linux		prefix/linux-standalone/ppc64			exp
 
diff --git a/profiles/releases/13.0/package.mask b/profiles/releases/13.0/package.mask
index 96c9a09c0b49..2a0fa24c12a7 100644
--- a/profiles/releases/13.0/package.mask
+++ b/profiles/releases/13.0/package.mask
@@ -1,6 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (29 Jan 2018)
+# Requires >=icu-60, which is not available in 13.0 based profiles.
+# Please migrate to one of the 17.0 release profiles.
+>=app-office/libreoffice-bin-5.4.4
+>=app-office/libreoffice-bin-debug-5.4.4
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (27 May 2017)
 # This release and later require C++11 or C++14
 # So we mask it here, and unmask in 17.0 release profiles
diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults
index 9546f24ac8fd..e1c557e03885 100644
--- a/profiles/targets/desktop/make.defaults
+++ b/profiles/targets/desktop/make.defaults
@@ -1,4 +1,4 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit cups dbus dri dts dvd dvdr emboss encode exif fam firefox flac gif glamor gpm gtk jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt3support qt5 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid"
+USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit cups dbus dri dts dvd dvdr emboss encode exif fam flac gif glamor gpm gtk jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt3support qt5 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid"
diff --git a/profiles/updates/1Q-2018 b/profiles/updates/1Q-2018
index 7a859264388a..9e33dc9c0c93 100644
--- a/profiles/updates/1Q-2018
+++ b/profiles/updates/1Q-2018
@@ -2,3 +2,4 @@ move app-portage/kuroo4 app-portage/kuroo
 slotmove app-portage/kuroo 4 0
 move dev-cpp/gsl dev-cpp/ms-gsl
 slotmove =dev-util/cucumber-3.1.0 3.0 3.1
+move app-admin/restart_services app-admin/restart-services
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 58494b1c9d65..6a2339206afd 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -7723,6 +7723,7 @@ sys-apps/ibm-powerpc-utils:rtas - Add support for the Run Time Abstraction Servi
 sys-apps/iotools:make-symlinks - Generate sub-command symlinks to iotools -- note that a lot are simple like "xor"
 sys-apps/ipmitool:openipmi - Use the system OpenIPMI implementation.
 sys-apps/iproute2:berkdb - build programs that use berkdb (just arpd)
+sys-apps/iproute2:elf - support loading eBPF programs from ELFs (e.g. LLVM's eBPF backend)
 sys-apps/iproute2:iptables - include support for iptables filtering
 sys-apps/iproute2:minimal - only install ip and tc programs, without eBPF support
 sys-apps/irqbalance:numa - Support balancing IRQs across NUMA nodes