gentoo resync : 31.12.2017 (final resync this year)

4 files changed, 0 insertions, 9 deletions

diff --git a/profiles/prefix/sunos/solaris/arch/sparc/make.defaults b/profiles/prefix/sunos/solaris/arch/sparc/make.defaults
index 552a0bfb3103..92d16c9bef5c 100644
--- a/profiles/prefix/sunos/solaris/arch/sparc/make.defaults
+++ b/profiles/prefix/sunos/solaris/arch/sparc/make.defaults
@@ -1,11 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-USE_EXPAND="ABI_SPARC"
-
 # multilib build stuff, single ABI (no multilib)
 MULTILIB_ABIS="sparc32"
 DEFAULT_ABI="sparc32"
 ABI="sparc32"
-IUSE_IMPLICIT="abi_sparc_32"
 LIBDIR_sparc32="lib"
diff --git a/profiles/prefix/sunos/solaris/arch/sparc/use.force b/profiles/prefix/sunos/solaris/arch/sparc/use.force
index 50cdf1705691..4592c02daad9 100644
--- a/profiles/prefix/sunos/solaris/arch/sparc/use.force
+++ b/profiles/prefix/sunos/solaris/arch/sparc/use.force
@@ -3,4 +3,3 @@
 
 # Force the flag corresponding to the default ABI
 sparc-solaris
-abi_sparc_32
diff --git a/profiles/prefix/sunos/solaris/package.mask b/profiles/prefix/sunos/solaris/package.mask
index 24de66646f72..5e9d14563ad5 100644
--- a/profiles/prefix/sunos/solaris/package.mask
+++ b/profiles/prefix/sunos/solaris/package.mask
@@ -6,10 +6,6 @@
 # has multiple compilation issue, resolved for 1.1.8, bug #602990
 =app-misc/pax-utils-1.1.7
 
-# Fabian Groffen <grobian@gentoo.org> (13 Jun 2015)
-# Needs patching to compile (d_type and DT_REG), bug #551696
-=app-portage/portage-utils-0.56
-
 # Fabian Groffen <grobian@gentoo.org> (14 Jan 2014)
 # util-linux has no business on Solaris systems
 sys-apps/util-linux
diff --git a/profiles/prefix/sunos/use.mask b/profiles/prefix/sunos/use.mask
index 9d6ae2553211..940968ee8e62 100644
--- a/profiles/prefix/sunos/use.mask
+++ b/profiles/prefix/sunos/use.mask
@@ -16,7 +16,6 @@ clvm
 directfb
 djbfft
 fbcon
-fmod
 ggi
 gpm
 hardened