commit: 8ac25df019a480ca19dc0913ba7810148eb5a221
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 14:07:57 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=8ac25df0
sys-devel/binutils-apple: remove cross-compile SLOT magic once copied from
binutils/toolchain.eclass, bug #593392
Package-Manager: portage-2.2.28
sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild | 6 +-----
sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild | 6 +-----
sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild | 6 +-----
sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild | 6 +-----
sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild | 6 +-----
sys-devel/binutils-apple/binutils-apple-7.0.ebuild | 6 +-----
sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild | 6 +-----
sys-devel/binutils-apple/binutils-apple-7.1.ebuild | 6 +-----
sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild | 6 +-----
sys-devel/binutils-apple/binutils-apple-7.2.ebuild | 6 +-----
sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild | 6 +-----
sys-devel/binutils-apple/binutils-apple-7.3.ebuild | 6 +-----
12 files changed, 12 insertions(+), 60 deletions(-)
diff --git a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
index 15692ec..7fc3013 100644
--- a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
@@ -40,11 +40,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
fi
is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-if is_cross ; then
- SLOT="${CTARGET}-4"
-else
- SLOT="4"
-fi
+SLOT="4"
LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
INCPATH=${LIBPATH}/include
diff --git a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
index 9e3d115..58c2d4e 100644
--- a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
@@ -41,11 +41,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
fi
is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-if is_cross ; then
- SLOT="${CTARGET}-5"
-else
- SLOT="5"
-fi
+SLOT="5"
LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
INCPATH=${LIBPATH}/include
diff --git a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
index b85a90c..99e5309 100644
--- a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
@@ -42,11 +42,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
fi
is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-if is_cross ; then
- SLOT="${CTARGET}-6"
-else
- SLOT="6"
-fi
+SLOT="6"
LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
INCPATH=${LIBPATH}/include
diff --git a/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
b/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
index 75fdff2..da9d320 100644
--- a/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
@@ -43,11 +43,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
fi
is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-if is_cross ; then
- SLOT="${CTARGET}-6"
-else
- SLOT="6"
-fi
+SLOT="6"
LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
INCPATH=${LIBPATH}/include
diff --git a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
index 017df46..dfa6214 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
@@ -47,11 +47,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
fi
is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-if is_cross ; then
- SLOT="${CTARGET}-7"
-else
- SLOT="7"
-fi
+SLOT="7"
LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
INCPATH=${LIBPATH}/include
diff --git a/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
b/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
index 0cd3df8..0227bb2 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
@@ -52,11 +52,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
fi
is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-if is_cross ; then
- SLOT="${CTARGET}-7"
-else
- SLOT="7"
-fi
+SLOT="7"
LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
INCPATH=${LIBPATH}/include
diff --git a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
index a56e1b0..82bc725 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
@@ -47,11 +47,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
fi
is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-if is_cross ; then
- SLOT="${CTARGET}-7"
-else
- SLOT="7"
-fi
+SLOT="7"
LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
INCPATH=${LIBPATH}/include
diff --git a/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
b/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
index 10bb084..3840d04 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
@@ -52,11 +52,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
fi
is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-if is_cross ; then
- SLOT="${CTARGET}-7"
-else
- SLOT="7"
-fi
+SLOT="7"
LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
INCPATH=${LIBPATH}/include
diff --git a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
index e1886af..abd7401 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
@@ -48,11 +48,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
fi
is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-if is_cross ; then
- SLOT="${CTARGET}-7"
-else
- SLOT="7"
-fi
+SLOT="7"
LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
INCPATH=${LIBPATH}/include
diff --git a/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
b/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
index 82a9a7a..d064f41 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
@@ -52,11 +52,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
fi
is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-if is_cross ; then
- SLOT="${CTARGET}-7"
-else
- SLOT="7"
-fi
+SLOT="7"
LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
INCPATH=${LIBPATH}/include
diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
index 733b6af..70febd4 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
@@ -49,11 +49,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
fi
is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-if is_cross ; then
- SLOT="${CTARGET}-7"
-else
- SLOT="7"
-fi
+SLOT="7"
LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
INCPATH=${LIBPATH}/include
diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
b/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
index 6828f5a..e177c38 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
@@ -49,11 +49,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
fi
is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-if is_cross ; then
- SLOT="${CTARGET}-7"
-else
- SLOT="7"
-fi
+SLOT="7"
LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
INCPATH=${LIBPATH}/include
