commit:     b3b0bbd4951104df59743d3b3622f6be39d71a42
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 14:04:45 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 14:08:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b0bbd4

sys-devel/gcc-apple: remove cross-compile SLOT magic once copied from 
gcc/toolchain.eclass, bug #593392

Package-Manager: portage-2.2.28

 sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild    | 10 ++--------
 sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild    | 10 ++--------
 sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild | 10 ++--------
 sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild | 10 ++--------
 4 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild 
b/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
index ffbf68a..2820073 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,14 +13,8 @@ HOMEPAGE="https://gcc.gnu.org";
 
SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE_VERS}.tar.gz";
 LICENSE="APSL-2 GPL-2"
 
-if is_crosscompile; then
-       SLOT="${CTARGET}-40"
-else
-       SLOT="40"
-fi
-
+SLOT="40"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-
 IUSE="nls objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4

diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild 
b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild
index bb02942..818bc37 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,14 +27,8 @@ case ${CHOST} in
        ;;
 esac
 
-if is_crosscompile; then
-       SLOT="${CTARGET}-42"
-else
-       SLOT="42"
-fi
-
+SLOT="42"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-
 IUSE="fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4

diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild 
b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild
index 0939af4..aca327a 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,14 +27,8 @@ case ${CHOST} in
        ;;
 esac
 
-if is_crosscompile; then
-       SLOT="${CTARGET}-42"
-else
-       SLOT="42"
-fi
-
+SLOT="42"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-
 IUSE="fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4

diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild 
b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
index 9d1eef4..1f088b9 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,14 +27,8 @@ case ${CHOST} in
        ;;
 esac
 
-if is_crosscompile; then
-       SLOT="${CTARGET}-42"
-else
-       SLOT="42"
-fi
-
+SLOT="42"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-
 IUSE="fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4

Reply via email to