[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/ppc/, profiles/prefix/darwin/macos/arch/x64/, ...

2024-01-05 Thread Sam James 
commit: f5b85f21e57fd8aa0ef74fd97dd9c745c8a7e344
Author: Igor V. Kovalenko  gmail  com>
AuthorDate: Sat Dec  9 11:52:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 09:52:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5b85f21

media-libs/libmpg123: Drop, replaced with media-sound/mpg123-base and mpg123 
metapackage

Bug: https://bugs.gentoo.org/915858
Signed-off-by: Igor V. Kovalenko  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34190
Signed-off-by: Sam James  gentoo.org>

 media-libs/libmpg123/Manifest  |   1 -
 .../mpg123-1.32.3-build-programs-component.patch   |  55 -
 .../mpg123-1.32.3-build-with-installed-libs.patch  | 252 -
 media-libs/libmpg123/libmpg123-1.32.3-r1.ebuild|  94 
 media-libs/libmpg123/metadata.xml  |  17 --
 profiles/arch/amd64/package.use.mask   |   1 -
 .../prefix/darwin/macos/arch/ppc/package.use.mask  |   1 -
 .../prefix/darwin/macos/arch/x64/package.use.mask  |   1 -
 8 files changed, 422 deletions(-)

diff --git a/media-libs/libmpg123/Manifest b/media-libs/libmpg123/Manifest
deleted file mode 100644
index 1baeb7a33f18..
--- a/media-libs/libmpg123/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mpg123-1.32.3.tar.bz2 054 BLAKE2B 
67f889403c2bb639d675ec5ebea5a19c4b7174971d62bdd8d940ad659e6b0c06dada38422fc9d71b878917aa89e305ec48c8faa78d65d507cd6a0c9a79951359
 SHA512 
946c1073b6eebfd65333ec543df1caeea25864479e9c8e153fb53d8b636cc756d8d81947f7b5cbedbbfb1ea664d3fb27562ed36e7726d95e80591bd2ad622afc

diff --git 
a/media-libs/libmpg123/files/mpg123-1.32.3-build-programs-component.patch 
b/media-libs/libmpg123/files/mpg123-1.32.3-build-programs-component.patch
deleted file mode 100644
index ea20c8a445f6..
--- a/media-libs/libmpg123/files/mpg123-1.32.3-build-programs-component.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-build: add programs component
-
-From: Igor V. Kovalenko 
-
-Upstream PR: https://github.com/madebr/mpg123/pull/11
-Bug: https://bugs.gentoo.org/915858

- configure.ac |   20 ++--
- 1 file changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e47c7d5b..db37ff9b 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -440,6 +440,21 @@ AC_ARG_ENABLE(libsyn123,
-   ]
- )
- 
-+AC_ARG_ENABLE(programs,
-+  [AS_HELP_STRING([--enable-programs], [build (only) programs (with 
--disable-components)])],
-+  [
-+if test "x$enableval" = xyes
-+then
-+  build_programs=yes
-+else
-+  build_programs=no
-+fi
-+  ],
-+  [
-+build_programs=no
-+  ]
-+)
-+
- if test "x$build_all" = xyes; then
-   build_programs=yes
-   build_libmpg123=yes
-@@ -447,8 +462,6 @@ if test "x$build_all" = xyes; then
-   build_libout123_modules=yes
-   build_libsyn123=yes
-   components="programs"
--else
--  build_programs=no
- fi
- 
- AM_CONDITIONAL([BUILD_PROGRAMS],  [ test "x$build_programs" = xyes ])
-@@ -474,6 +487,9 @@ fi
- if test "x$build_libsyn123" = xyes; then
-   components="$components libsyn123"
- fi
-+if test "x$build_programs" = xyes; then
-+  components="$components programs"
-+fi
- components=$(echo $components)
- 
- dnl ## Configurable Options

diff --git 
a/media-libs/libmpg123/files/mpg123-1.32.3-build-with-installed-libs.patch 
b/media-libs/libmpg123/files/mpg123-1.32.3-build-with-installed-libs.patch
deleted file mode 100644
index aec0ef87ebbf..
--- a/media-libs/libmpg123/files/mpg123-1.32.3-build-with-installed-libs.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-build: allow building with installed libmpg123 libsyn123 libout123
-
-From: Igor V. Kovalenko 
-
-Upstream PR: https://github.com/madebr/mpg123/pull/11
-Bug: https://bugs.gentoo.org/915858

- Makefile.am |   18 +++---
- configure.ac|   33 +++--
- libmpg123.pc.in |2 +-
- libout123.pc.in |2 +-
- libsyn123.pc.in |2 +-
- src/Makemodule.am   |   30 +++---
- src/libmpg123/Makemodule.am |2 +-
- src/libout123/Makemodule.am |2 +-
- src/libsyn123/Makemodule.am |2 +-
- 9 files changed, 67 insertions(+), 26 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 5b58dc4d..be3bfed0 100644
 a/Makefile.am
-+++ b/Makefile.am
-@@ -37,13 +37,25 @@ AM_CPPFLAGS = -DPKGLIBDIR="\"$(pkglibdir)\""
- AM_CPPFLAGS += \
-   $(LTDLINCL) \
-   -I$(top_srcdir)/src \
--  -I$(top_srcdir)/src/compat \
-+  -I$(top_srcdir)/src/compat
-+
-+if BUILD_LIBMPG123
-+AM_CPPFLAGS += \
-   -I$(top_srcdir)/src/libmpg123 \
-+  -I$(top_builddir)/src/libmpg123
-+endif
-+
-+if BUILD_LIBSYN123
-+AM_CPPFLAGS += \
-   -I$(top_srcdir)/src/libsyn123 \
-+  -I$(top_builddir)/src/libsyn123
-+endif
-+
-+if BUILD_LIBOUT123
-+AM_CPPFLAGS += \
-   -I$(top_srcdir)/src/libout123 \
--  -I$(top_builddir)/src/libmpg123 \
--  -I$(top_builddir)/src/libsyn123 \
-

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/ppc/

2020-12-22 Thread Fabian Groffen 
commit: f48bb64c9b0a3161f7510c3995e08f6e3ff0ce68
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Dec 22 20:21:29 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Dec 22 20:25:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f48bb64c

profiles/prefix/darwin/macos/arch/ppc/package.mask: update binutils-apple

drop masks for removed versions
unmask binutils-apple-8.2.1-r100,
for it compiles with FSF GCC and is able to build FSF GCC.
(e.g. we can deprecate gcc-apple!)

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/arch/ppc/package.mask | 15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.mask 
b/profiles/prefix/darwin/macos/arch/ppc/package.mask
index 05a1b5c5c54..fd829701ef5 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.mask
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.mask
@@ -7,12 +7,9 @@
 
 # Fabian Groffen  (2012-03-05)
 # Apple removed entire PowerPC support from ld in ld64-128.2 (4.3)
-# a backport of PPC support was kept until compilation with gcc-apple
-# was no longer possible since 7.0.
-# The only working versions are 3.2 and (patched) 6.3, however the
-# latter causes bus errors whilst compiling e.g. GCC
-=sys-devel/binutils-apple-4.3-r2
-=sys-devel/binutils-apple-5.1-r1
-=sys-devel/binutils-apple-6.1-r1
-=sys-devel/binutils-apple-6.3-r2
->sys-devel/binutils-apple-6.9
+# darwin-xtools added back support and allows to be compiled from FSF
+# GCC for version ld64-274.2 (8.2.1), so basically 3.2.3 and the xtools
+# version 8.2.1 are unmasked for us, allowing a non-gcc-apple path, we
+# dropped all versions inbetween, mask the incompatible ones remaining
+=sys-devel/binutils-apple-8.2.1-r1
+=sys-devel/binutils-apple-11.3.1-r1

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/ppc/

2019-02-20 Thread Fabian Groffen 
commit: eb9ebf786c314fe872df01cad1e15c23e5ca663b
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Feb 20 10:41:01 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Feb 20 10:41:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9ebf78

prefix/darwin/macos/arch/ppc/package.mask: drop gcc-8 mask

GCC-8 is fixed now

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/arch/ppc/package.mask | 6 --
 1 file changed, 6 deletions(-)

diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.mask 
b/profiles/prefix/darwin/macos/arch/ppc/package.mask
index af8de618585..0214b3b9b33 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.mask
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.mask
@@ -5,12 +5,6 @@
 # All the Mac OS X profiles inherit from their matching arch profile here.
 
 
-# Fabian Groffen  (25 Dec 2018)
-# GCC-8.2.0 has a faulty libgcc_s, which causes C++ exceptions not the
-# caught in certain conditions.  ld64 is the notable condition leading
-# to configure believing every function it checks is available.
->=sys-devel/gcc-8
-
 # Fabian Groffen  (22 Dec 2018)
 # this version of libffi causes gcc to buserror
 =dev-libs/libffi-3.3_rc0

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/ppc/

2019-01-28 Thread Fabian Groffen 
commit: 9ec71f06c08cd6bafeaeddb92abd57473ff1e456
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Jan 28 10:04:36 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Jan 28 10:37:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ec71f06

profiles/prefix/darwin/macos/arch/ppc/package.mask: clarify gcc mask

Remove mentioning of Perl as problem with GCC-8, it is actually the
linker that has a problem with libgcc_s' implementation of stack
unwinding.

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/arch/ppc/package.mask | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.mask 
b/profiles/prefix/darwin/macos/arch/ppc/package.mask
index bdbdebe73aa..af8de618585 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.mask
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.mask
@@ -6,9 +6,9 @@
 
 
 # Fabian Groffen  (25 Dec 2018)
-# GCC-8.2.0 causes a problem with Perl-5.28 where Configure wrongly
-# believes every function it checks is available.  Need to revisit this
-# at a later point.
+# GCC-8.2.0 has a faulty libgcc_s, which causes C++ exceptions not the
+# caught in certain conditions.  ld64 is the notable condition leading
+# to configure believing every function it checks is available.
 >=sys-devel/gcc-8
 
 # Fabian Groffen  (22 Dec 2018)

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/ppc/

2018-12-25 Thread Fabian Groffen 
commit: 85ec000bd5125ac2f179ae92304c0c35bff16630
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Dec 25 12:53:35 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Dec 25 12:56:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85ec000b

profiles/prefix/darwin/macos/arch/ppc: mask gcc and binutils-apple versions

gcc-8.2.0 compiles and runs, but seems to cause issues with Perl's
Configure -- since it's still out there kind of experimentally, mask it
for now.

binutils-apple-6.3 looked like a viable path to use a more recent
compiler, but causes bus errors during gcc compilations, so avoid it for
now, to be revisited once we have a more stable environment.

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/arch/ppc/package.mask | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.mask 
b/profiles/prefix/darwin/macos/arch/ppc/package.mask
index 49904ab58f0..bdbdebe73aa 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.mask
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.mask
@@ -5,7 +5,13 @@
 # All the Mac OS X profiles inherit from their matching arch profile here.
 
 
-# Fabian Gtoffen  (22 Dec 2018)
+# Fabian Groffen  (25 Dec 2018)
+# GCC-8.2.0 causes a problem with Perl-5.28 where Configure wrongly
+# believes every function it checks is available.  Need to revisit this
+# at a later point.
+>=sys-devel/gcc-8
+
+# Fabian Groffen  (22 Dec 2018)
 # this version of libffi causes gcc to buserror
 =dev-libs/libffi-3.3_rc0
 
@@ -13,8 +19,10 @@
 # Apple removed entire PowerPC support from ld in ld64-128.2 (4.3)
 # a backport of PPC support was kept until compilation with gcc-apple
 # was no longer possible since 7.0.
-# The only working/supported versions are 3.2 and 6.3
+# The only working versions are 3.2 and (patched) 6.3, however the
+# latter causes bus errors whilst compiling e.g. GCC
 =sys-devel/binutils-apple-4.3-r2
 =sys-devel/binutils-apple-5.1-r1
 =sys-devel/binutils-apple-6.1-r1
+=sys-devel/binutils-apple-6.3-r2
 >sys-devel/binutils-apple-6.9

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/ppc/

2018-12-22 Thread Fabian Groffen 
commit: 21806ae0e6199de70ce9586a07cd54db5fdd2e0c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Dec 22 09:34:36 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Dec 22 09:34:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21806ae0

profiles/prefix/darwin/macos/arch/ppc/package.mask: mask libffi-3.3_rc0

We observe bus errors with GCC when using this version, so hold it back
for now.

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/arch/ppc/package.mask | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.mask 
b/profiles/prefix/darwin/macos/arch/ppc/package.mask
index 19fd3907bd1..49904ab58f0 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.mask
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.mask
@@ -1,10 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # The 32-bits profile is inherited by the 64-bits one!
 # All the Mac OS X profiles inherit from their matching arch profile here.
 
 
+# Fabian Gtoffen  (22 Dec 2018)
+# this version of libffi causes gcc to buserror
+=dev-libs/libffi-3.3_rc0
+
 # Fabian Groffen  (5 Mar 2012)
 # Apple removed entire PowerPC support from ld in ld64-128.2 (4.3)
 # a backport of PPC support was kept until compilation with gcc-apple

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/ppc/

2018-12-10 Thread Fabian Groffen 
commit: 1abff63ff277933d2a9c6a27b9797375c728515b
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Dec 10 14:27:51 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Dec 10 14:27:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1abff63f

profiles/prefix/darwin/macos/arch/pcc/package.mask: update binutils mask

binutils-apple-6.3 is the last version that has a working linker for
ppc-macos via user-contributed patches to keep PowerPC support.

Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/darwin/macos/arch/ppc/package.mask | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.mask 
b/profiles/prefix/darwin/macos/arch/ppc/package.mask
index 55f215184f4..19fd3907bd1 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.mask
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.mask
@@ -6,5 +6,11 @@
 
 
 # Fabian Groffen  (5 Mar 2012)
-# Apple removed entire PowerPC support from ld in ld64-128.2
->=sys-devel/binutils-apple-4.3
+# Apple removed entire PowerPC support from ld in ld64-128.2 (4.3)
+# a backport of PPC support was kept until compilation with gcc-apple
+# was no longer possible since 7.0.
+# The only working/supported versions are 3.2 and 6.3
+=sys-devel/binutils-apple-4.3-r2
+=sys-devel/binutils-apple-5.1-r1
+=sys-devel/binutils-apple-6.1-r1
+>sys-devel/binutils-apple-6.9

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/ppc/, profiles/prefix/darwin/macos/arch/x86/, ...

2016-12-20 Thread Fabian Groffen 
commit: a94f9b561fab4a9bd328a55cb3a3909db04e35b7
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Dec 20 14:59:28 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Dec 20 14:59:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a94f9b56

profiles/prefix: add LLVM_TARGETS for Darwin profiles

 profiles/prefix/darwin/macos/arch/ppc/package.use.force   | 8 
 profiles/prefix/darwin/macos/arch/ppc64/package.use.force | 8 
 profiles/prefix/darwin/macos/arch/x64/package.use.force   | 8 
 profiles/prefix/darwin/macos/arch/x86/package.use.force   | 4 
 4 files changed, 28 insertions(+)

diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.use.force 
b/profiles/prefix/darwin/macos/arch/ppc/package.use.force
new file mode 100644
index ..35d9858
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.use.force
@@ -0,0 +1,8 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Fabian Groffen  (20 Dec 2016)
+# Force the host target to avoid dependency hell
+sys-devel/clang llvm_targets_PowerPC
+sys-devel/llvm llvm_targets_PowerPC

diff --git a/profiles/prefix/darwin/macos/arch/ppc64/package.use.force 
b/profiles/prefix/darwin/macos/arch/ppc64/package.use.force
new file mode 100644
index ..35d9858
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/ppc64/package.use.force
@@ -0,0 +1,8 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Fabian Groffen  (20 Dec 2016)
+# Force the host target to avoid dependency hell
+sys-devel/clang llvm_targets_PowerPC
+sys-devel/llvm llvm_targets_PowerPC

diff --git a/profiles/prefix/darwin/macos/arch/x64/package.use.force 
b/profiles/prefix/darwin/macos/arch/x64/package.use.force
new file mode 100644
index ..6339ecd
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/x64/package.use.force
@@ -0,0 +1,8 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Fabian Groffen  (20 Dec 2016)
+# Force the host target to avoid dependency hell
+sys-devel/clang llvm_targets_X86
+sys-devel/llvm llvm_targets_X86

diff --git a/profiles/prefix/darwin/macos/arch/x86/package.use.force 
b/profiles/prefix/darwin/macos/arch/x86/package.use.force
index 815fec8..6339ecd 100644
--- a/profiles/prefix/darwin/macos/arch/x86/package.use.force
+++ b/profiles/prefix/darwin/macos/arch/x86/package.use.force
@@ -2,3 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Fabian Groffen  (20 Dec 2016)
+# Force the host target to avoid dependency hell
+sys-devel/clang llvm_targets_X86
+sys-devel/llvm llvm_targets_X86

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/ppc/, profiles/prefix/darwin/macos/arch/x64/, ...

2016-04-29 Thread Fabian Groffen 
commit: 872ed3541b475cf1e9d0a7d0021621aab137
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Apr 29 12:47:16 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Apr 29 12:47:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872e

profiles/prefix/darwin/macos: add appropriate mask/force for ABI USE-flags, bug 
#579454

 profiles/prefix/darwin/macos/arch/ppc/use.force | 3 ++-
 profiles/prefix/darwin/macos/arch/ppc/use.mask  | 7 +++
 profiles/prefix/darwin/macos/arch/x64/use.force | 3 ++-
 profiles/prefix/darwin/macos/arch/x64/use.mask  | 7 +++
 profiles/prefix/darwin/macos/arch/x86/use.force | 3 ++-
 profiles/prefix/darwin/macos/arch/x86/use.mask  | 7 +++
 6 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/profiles/prefix/darwin/macos/arch/ppc/use.force 
b/profiles/prefix/darwin/macos/arch/ppc/use.force
index 50b02bf..63e95a3 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/use.force
+++ b/profiles/prefix/darwin/macos/arch/ppc/use.force
@@ -1,6 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # Force the flag corresponding to the default ABI
+ppc-macos
 abi_ppc_32

diff --git a/profiles/prefix/darwin/macos/arch/ppc/use.mask 
b/profiles/prefix/darwin/macos/arch/ppc/use.mask
new file mode 100644
index 000..2c96250
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/ppc/use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Unmask the flag corresponding to the default ABI
+-ppc-macos
+-abi_ppc_32

diff --git a/profiles/prefix/darwin/macos/arch/x64/use.force 
b/profiles/prefix/darwin/macos/arch/x64/use.force
index 953c261..b6d3947 100644
--- a/profiles/prefix/darwin/macos/arch/x64/use.force
+++ b/profiles/prefix/darwin/macos/arch/x64/use.force
@@ -1,6 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # Force the flag corresponding to the default ABI
+x64-macos
 abi_x86_64

diff --git a/profiles/prefix/darwin/macos/arch/x64/use.mask 
b/profiles/prefix/darwin/macos/arch/x64/use.mask
new file mode 100644
index 000..9702d75
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/x64/use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Unmask the flag corresponding to the default ABI
+-x64-macos
+-abi_x86_64

diff --git a/profiles/prefix/darwin/macos/arch/x86/use.force 
b/profiles/prefix/darwin/macos/arch/x86/use.force
index 6324061..8f00cb9 100644
--- a/profiles/prefix/darwin/macos/arch/x86/use.force
+++ b/profiles/prefix/darwin/macos/arch/x86/use.force
@@ -1,6 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # Force the flag corresponding to the default ABI
+x86-macos
 abi_x86_32

diff --git a/profiles/prefix/darwin/macos/arch/x86/use.mask 
b/profiles/prefix/darwin/macos/arch/x86/use.mask
new file mode 100644
index 000..3ab4866
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/x86/use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Unmask the flag corresponding to the default ABI
+-x86-macos
+-abi_x86_32