gentoo resync : 09.12.2017

6 files changed, 15 insertions, 15 deletions

diff --git a/profiles/arch/amd64/lib32/make.defaults b/profiles/arch/amd64/lib32/make.defaults
new file mode 100644
index 000000000000..19b102e42e0e
--- /dev/null
+++ b/profiles/arch/amd64/lib32/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+LIBDIR_x86="lib32"
+SYMLINK_LIB="yes"
diff --git a/profiles/arch/amd64/lib32/parent b/profiles/arch/amd64/lib32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/amd64/lib32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index a9d2cc0549dc..1ca36a8d4f3d 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -18,10 +18,9 @@ DEFAULT_ABI="amd64"
 ABI="amd64"
 
 LIBDIR_amd64="lib64"
-# TODO: move this to a deprecated subprofile
-LIBDIR_x86="lib32"
+LIBDIR_x86="lib"
 LIBDIR_x32="libx32"
-SYMLINK_LIB="yes"
+SYMLINK_LIB="no"
 
 # 64bit specific settings.
 CFLAGS_amd64="-m64"
diff --git a/profiles/arch/amd64/x32/make.defaults b/profiles/arch/amd64/x32/make.defaults
index 16e4a413a4cc..ad093457f3a2 100644
--- a/profiles/arch/amd64/x32/make.defaults
+++ b/profiles/arch/amd64/x32/make.defaults
@@ -5,9 +5,6 @@ DEFAULT_ABI="x32"
 ABI="x32"
 MULTILIB_ABIS="amd64 x86 x32"
 
-LIBDIR_x86="lib"
-SYMLINK_LIB="no"
-
 # Michał Górny <mgorny@gentoo.org> (01 Jul 2014)
 # Default to abi_x86_x32 for packages that don't have it forced.
 ABI_X86="x32"
diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask
index f997bb167982..4cce0b3608ea 100644
--- a/profiles/arch/arm/armv7a/package.mask
+++ b/profiles/arch/arm/armv7a/package.mask
@@ -1,14 +1,6 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# James Le Cuirot <chewi@gentoo.org> (05 Aug 2016)
-# The ARM32 JIT code is broken as of 7.2.6.6. Without this, Java 7 is
-# no faster than Java 8. It seems more likely that Java 8 will see a
-# new HotSpot port before this breakage is fixed. Earlier versions
-# have vulnerabilities so please switch to icedtea(-bin):8.
-dev-java/icedtea:7
-dev-java/icedtea-bin:7
-
 # James Le Cuirot <chewi@gentoo.org> (09 Jan 2016)
 # This is built for armv6 so unmask against the wider arm mask.
 -dev-java/oracle-jdk-bin
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index b28dda4b5f2a..95f0481da04f 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -3,6 +3,12 @@
 
 # This file requires >=portage-2.1.1
 
+# Hans de Graaff <graaff@gentoo.org> (8 Dec 2017)
+# Test dependencies are no longer keyworded due to dropped Rails
+# keyword.
+dev-ruby/asciidoctor test
+dev-ruby/tilt:0 test
+
 # Tim Harder <radhermit@gentoo.org> (11 Sep 2017)
 # Pulls in dev-ruby/asciidoctor which has too large of a ruby testing
 # dep tree that is unkeyworded at this time.