13 files changed, 46 insertions, 11 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b29ee81f1f53..fe60b3ccde79 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index 5c3e42b53174..163006a1147b 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (20 May 2018)
+# media-gfx/ufraw is not stable
+media-gfx/imagemagick raw
+
+# Andreas Sturmlechner <asturm@gentoo.org> (20 May 2018)
+# media-libs/{libdc1394,x264} is not stable.
+media-video/libav ieee1394 x264
+media-video/ffmpeg ieee1394 x264
+
 # Andreas Sturmlechner <asturm@gentoo.org> (6 May 2018)
 # sci-visualization/gnuplot is not stable.
 app-admin/sysstat isag
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index a4caf255c0df..4322dfd663ac 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -4,6 +4,9 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Andreas Sturmlechner <asturm@gentoo.org> (20 May 2018)
+openal
+
 # Matt Turner <mattst88@gentoo.org> (22 Apr 2018)
 # media-gfx/gimp is ~hppa only
 gimp
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 27e802707739..d4d4995e561f 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -3,6 +3,11 @@
 
 # This file requires >=portage-2.1.1
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (21 May 2018)
+# LO kde support on x86 is broken, see bug 523496
+=app-office/libreoffice-bin-6.0* kde
+=app-office/libreoffice-bin-debug-6.0* kde
+
 # Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
 # media-libs/libaom not yet keyworded
 media-video/vlc aom
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 2637f1943f96..ddfdd8f215b0 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -100,7 +100,7 @@ USE="${USE} modules"
 # Manuel Rüger <mrueg@gentoo.org> (09 Sep 2015)
 # Default Ruby build target
 # Updated to include ruby23 on 21 Jan 2018
-RUBY_TARGETS="ruby22 ruby23"
+RUBY_TARGETS="ruby23"
 
 # Samuli Suominen <ssuominen@gentoo.org> (03 Dec 2009)
 # Enable USE cxx by default so base-system and toolchain pkgs can start using USE cxx
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index faab89ba17bd..e3f945f030f2 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> (21 May 2018)
+# Depends on lots of unstable dependencies
+dev-python/s3fs test
+
 # Andreas Sturmlechner <asturm@gentoo.org> (22 Apr 2018)
 # Not ready for stable, crashes LO on some systems.
 >=app-office/libreoffice-6.0 kde
diff --git a/profiles/default/linux/arm/17.0/musl/armv6j/eapi b/profiles/default/linux/arm/17.0/musl/armv6j/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/musl/armv6j/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/17.0/musl/armv6j/hardened/eapi b/profiles/default/linux/arm/17.0/musl/armv6j/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/musl/armv6j/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/17.0/musl/armv6j/hardened/parent b/profiles/default/linux/arm/17.0/musl/armv6j/hardened/parent
new file mode 100644
index 000000000000..3e3d7782bae7
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/musl/armv6j/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/hardened
diff --git a/profiles/default/linux/arm/17.0/musl/armv6j/make.defaults b/profiles/default/linux/arm/17.0/musl/armv6j/make.defaults
new file mode 100644
index 000000000000..e110341f12ab
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/musl/armv6j/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="armv6j-unknown-linux-musleabihf"
+CHOST_arm="${CHOST}"
+
+CFLAGS="-O2 -pipe -march=armv6j -mfpu=vfp -mfloat-abi=hard"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
diff --git a/profiles/default/linux/arm/17.0/musl/armv6j/parent b/profiles/default/linux/arm/17.0/musl/armv6j/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/musl/armv6j/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/package.mask b/profiles/package.mask
index 1191a4c63a9b..c4c8951ebdf1 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Lars Wendler <polynomial-c@gentoo.org> (22 May 2018)
+# Breaks revdeps (most likely because of GooHash removal).
+# See tracker bug https://bugs.gentoo.org/656264
+>=app-text/poppler-0.65.0
+
+# Matt Turner <mattst88@gentoo.org> (20 May 2018)
+# Removal in 30 days. Bug #655102
+x11-libs/libXfont
+
 # Matt Turner <mattst88@gentoo.org> (20 May 2018)
 # Unmaintained. Dead homepage. Depends on dead libXfont.
 # Removal in 30 days. Bug #655104
@@ -123,14 +132,6 @@ sci-libs/freesteam
 =dev-util/scons-3.0.1-r2
 
 # Michał Górny <mgorny@gentoo.org> (15 May 2018)
-# Distfile missing BLAKE2B hash.  The package is fetch-restricted,
-# the sources can apparently by only obtained by buying it, or filing
-# an academic license request and having it approved.  Please provide
-# the updated hash if you have the matching distfile.
-# Bug #642908.  Removal in 30 days.
-sci-libs/coinhsl
-
-# Michał Górny <mgorny@gentoo.org> (15 May 2018)
 # Remaining fetch-restricted game packages missing BLAKE2B hashes.
 # Please provide updated hashes if you have the matching distfiles.
 # Bug #642876.  Removal in 30 days.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index abb8fb31b005..a7537a67e841 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8452,8 +8452,6 @@ www-client/seamonkey:system-sqlite - Use the system-wide dev-db/sqlite installat
 www-client/surf:savedconfig - Without a saved config.h, this package depends on net-misc/curl and x11-terms/st for a default download mechanism
 www-client/uget:aria2 - Enable support for net-misc/aria2 through xmlrpc. You'll find the plugin in the app's settings.
 www-client/uget:control-socket - Enable JSON-RPC over unix domain socket
-www-client/uget:gtk3 - Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2
-www-client/uget:hide-temp-files - Make temporary files that are used while downloading hidden.
 www-client/uget:openssl - Use dev-libs/openssl instead of net-libs/gnutls
 www-client/uget:rss - Enable uGet feed messages
 www-client/w3m:gdk-pixbuf - Enable support for x11-libs/gdk-pixbuf