sys-devel/binutils-apple: bump to EAPI=5 and remove all conditional code from global...

Package-Manager: portage-2.2.28

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 7fc30131f784ca1100a0951fa9fb1448dd4e4888..a03dbc3f0644c59a1f8fe2f608c778e3cbf4199b 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -32,27 +32,12 @@ DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )
        || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-       if [[ ${CATEGORY} == cross-* ]] ; then
-               export CTARGET=${CATEGORY#cross-}
-       fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="4"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-       BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-       BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
        if use multitarget ; then
                ewarn "You have enabled support for non-standard target architectures"
@@ -185,6 +170,22 @@ src_configure() {
        ENABLE_LTO=0
        use lto && ENABLE_LTO=1
 
+       export CTARGET=${CTARGET:-${CHOST}}
+       if [[ ${CTARGET} == ${CHOST} ]] ; then
+               if [[ ${CATEGORY} == cross-* ]] ; then
+                       export CTARGET=${CATEGORY#cross-}
+               fi
+       fi
+
+       LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+       INCPATH=${LIBPATH}/include
+       DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+       if is_cross ; then
+               BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+       else
+               BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+       fi
+
        # CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
        # what we want)
        append-cppflags -DNDEBUG

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 58c2d4ef98a331fbf6a48c7c0d4091f362e89753..682f644fc851c3261ba7e32799e729eb24b566a4 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -33,27 +33,12 @@ DEPEND="${RDEPEND}
        || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
        libcxx? ( sys-devel/llvm )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-       if [[ ${CATEGORY} == cross-* ]] ; then
-               export CTARGET=${CATEGORY#cross-}
-       fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="5"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-       BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-       BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
        if use multitarget ; then
                ewarn "You have enabled support for non-standard target architectures"
@@ -197,6 +182,22 @@ src_configure() {
        ENABLE_LTO=0
        use lto && ENABLE_LTO=1
 
+       export CTARGET=${CTARGET:-${CHOST}}
+       if [[ ${CTARGET} == ${CHOST} ]] ; then
+               if [[ ${CATEGORY} == cross-* ]] ; then
+                       export CTARGET=${CATEGORY#cross-}
+               fi
+       fi
+
+       LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+       INCPATH=${LIBPATH}/include
+       DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+       if is_cross ; then
+               BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+       else
+               BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+       fi
+
        if [ "${CXX/*clang*/yes}" = "yes" ] ; then
                if use libcxx ; then
                        append-cxxflags -stdlib=libc++

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 99e5309ef55571dcb3ba4df0af4e0cbb27101bba..9743fd448554682980af772154611afa9d3a3a35 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -34,27 +34,12 @@ DEPEND="${RDEPEND}
        || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
        libcxx? ( sys-devel/llvm )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-       if [[ ${CATEGORY} == cross-* ]] ; then
-               export CTARGET=${CATEGORY#cross-}
-       fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="6"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-       BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-       BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
        if use multitarget ; then
                ewarn "You have enabled support for non-standard target architectures"
@@ -198,6 +183,22 @@ src_configure() {
        ENABLE_LTO=0
        use lto && ENABLE_LTO=1
 
+       export CTARGET=${CTARGET:-${CHOST}}
+       if [[ ${CTARGET} == ${CHOST} ]] ; then
+               if [[ ${CATEGORY} == cross-* ]] ; then
+                       export CTARGET=${CATEGORY#cross-}
+               fi
+       fi
+
+       LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+       INCPATH=${LIBPATH}/include
+       DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+       if is_cross ; then
+               BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+       else
+               BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+       fi
+
        if [ "${CXX/*clang*/yes}" = "yes" ] ; then
                if use libcxx ; then
                        append-cxxflags -stdlib=libc++

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 da9d3200b895a69dc588f74e2c71067034cedefa..e3022aab1b7455882795f8b7b8cb318142e07a41 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
@@ -35,27 +35,12 @@ DEPEND="${RDEPEND}
        || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
        libcxx? ( sys-devel/llvm )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-       if [[ ${CATEGORY} == cross-* ]] ; then
-               export CTARGET=${CATEGORY#cross-}
-       fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="6"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-       BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-       BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
        if use multitarget ; then
                ewarn "You have enabled support for non-standard target architectures"
@@ -191,6 +176,22 @@ src_configure() {
        ENABLE_LTO=0
        use lto && ENABLE_LTO=1
 
+       export CTARGET=${CTARGET:-${CHOST}}
+       if [[ ${CTARGET} == ${CHOST} ]] ; then
+               if [[ ${CATEGORY} == cross-* ]] ; then
+                       export CTARGET=${CATEGORY#cross-}
+               fi
+       fi
+
+       LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+       INCPATH=${LIBPATH}/include
+       DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+       if is_cross ; then
+               BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+       else
+               BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+       fi
+
        if [[ ${CXX} == *clang* ]] ; then
                if use libcxx ; then
                        append-cxxflags -stdlib=libc++

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 dfa6214b13776c13373209d087f471464e9f4199..b6ea3cdb633ef874d9256fd61f80ee53bd664748 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
@@ -39,27 +39,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-       if [[ ${CATEGORY} == cross-* ]] ; then
-               export CTARGET=${CATEGORY#cross-}
-       fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="7"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-       BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-       BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
        if use multitarget ; then
                ewarn "You have enabled support for non-standard target architectures"
@@ -198,6 +183,22 @@ src_configure() {
        ENABLE_LTO=0
        use lto && ENABLE_LTO=1
 
+       export CTARGET=${CTARGET:-${CHOST}}
+       if [[ ${CTARGET} == ${CHOST} ]] ; then
+               if [[ ${CATEGORY} == cross-* ]] ; then
+                       export CTARGET=${CATEGORY#cross-}
+               fi
+       fi
+
+       LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+       INCPATH=${LIBPATH}/include
+       DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+       if is_cross ; then
+               BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+       else
+               BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+       fi
+
        # CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
        # what we want)
        append-cppflags -DNDEBUG

diff --git a/sys-devel/binutils-apple/binutils-apple-7.0.ebuild b/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
index 0227bb294f2574726591232918ed6a17dcd0d969..91916054da8a8be6ca880d37567d2773533a066e 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
@@ -44,27 +44,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-       if [[ ${CATEGORY} == cross-* ]] ; then
-               export CTARGET=${CATEGORY#cross-}
-       fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="7"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-       BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-       BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
        if use multitarget ; then
                ewarn "You have enabled support for non-standard target architectures"
@@ -197,6 +182,22 @@ src_prepare() {
 }
 
 src_configure() {
+       export CTARGET=${CTARGET:-${CHOST}}
+       if [[ ${CTARGET} == ${CHOST} ]] ; then
+               if [[ ${CATEGORY} == cross-* ]] ; then
+                       export CTARGET=${CATEGORY#cross-}
+               fi
+       fi
+
+       LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+       INCPATH=${LIBPATH}/include
+       DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+       if is_cross ; then
+               BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+       else
+               BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+       fi
+
        # CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
        # what we want)
        append-cppflags -DNDEBUG

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 82bc7258ff6b2c909cde7a9c922c9449804bf875..66a832957ed8b6fcc536d05895cf73587515f86a 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
@@ -39,27 +39,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-       if [[ ${CATEGORY} == cross-* ]] ; then
-               export CTARGET=${CATEGORY#cross-}
-       fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="7"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-       BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-       BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
        if use multitarget ; then
                ewarn "You have enabled support for non-standard target architectures"
@@ -198,6 +183,22 @@ src_configure() {
        ENABLE_LTO=0
        use lto && ENABLE_LTO=1
 
+       export CTARGET=${CTARGET:-${CHOST}}
+       if [[ ${CTARGET} == ${CHOST} ]] ; then
+               if [[ ${CATEGORY} == cross-* ]] ; then
+                       export CTARGET=${CATEGORY#cross-}
+               fi
+       fi
+
+       LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+       INCPATH=${LIBPATH}/include
+       DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+       if is_cross ; then
+               BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+       else
+               BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+       fi
+
        # CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
        # what we want)
        append-cppflags -DNDEBUG

diff --git a/sys-devel/binutils-apple/binutils-apple-7.1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
index 3840d04f63a1cf0fae548999043ac252d7bcbe87..60ef905d77b815408a9ace026476357006fa2e86 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
@@ -44,27 +44,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-       if [[ ${CATEGORY} == cross-* ]] ; then
-               export CTARGET=${CATEGORY#cross-}
-       fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="7"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-       BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-       BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
        if use multitarget ; then
                ewarn "You have enabled support for non-standard target architectures"
@@ -201,6 +186,22 @@ src_configure() {
        # what we want)
        append-cppflags -DNDEBUG
 
+       export CTARGET=${CTARGET:-${CHOST}}
+       if [[ ${CTARGET} == ${CHOST} ]] ; then
+               if [[ ${CATEGORY} == cross-* ]] ; then
+                       export CTARGET=${CATEGORY#cross-}
+               fi
+       fi
+
+       LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+       INCPATH=${LIBPATH}/include
+       DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+       if is_cross ; then
+               BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+       else
+               BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+       fi
+
        # Block API and thus snapshots supported on >= 10.6
        [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -ge 10 ]] && \
                append-cppflags -DSUPPORT_SNAPSHOTS

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 abd7401197e78ea7be01cafc7e967b203d64f413..0cdd4846c9db797e0d7fdbea031e7628666b7076 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
@@ -40,27 +40,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-       if [[ ${CATEGORY} == cross-* ]] ; then
-               export CTARGET=${CATEGORY#cross-}
-       fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="7"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-       BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-       BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
        if use multitarget ; then
                ewarn "You have enabled support for non-standard target architectures"
@@ -199,6 +184,22 @@ src_configure() {
        ENABLE_LTO=0
        use lto && ENABLE_LTO=1
 
+       export CTARGET=${CTARGET:-${CHOST}}
+       if [[ ${CTARGET} == ${CHOST} ]] ; then
+               if [[ ${CATEGORY} == cross-* ]] ; then
+                       export CTARGET=${CATEGORY#cross-}
+               fi
+       fi
+
+       LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+       INCPATH=${LIBPATH}/include
+       DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+       if is_cross ; then
+               BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+       else
+               BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+       fi
+
        # CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
        # what we want)
        append-cppflags -DNDEBUG

diff --git a/sys-devel/binutils-apple/binutils-apple-7.2.ebuild b/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
index d064f41fdc588da5dbeb39029f3c77f6ba1e2e5d..9973a8be5f57b67cbd88e8c8ee1bf71cd3172ad5 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
@@ -44,27 +44,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-       if [[ ${CATEGORY} == cross-* ]] ; then
-               export CTARGET=${CATEGORY#cross-}
-       fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="7"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-       BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-       BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
        if use multitarget ; then
                ewarn "You have enabled support for non-standard target architectures"
@@ -201,6 +186,22 @@ src_configure() {
        # what we want)
        append-cppflags -DNDEBUG
 
+       export CTARGET=${CTARGET:-${CHOST}}
+       if [[ ${CTARGET} == ${CHOST} ]] ; then
+               if [[ ${CATEGORY} == cross-* ]] ; then
+                       export CTARGET=${CATEGORY#cross-}
+               fi
+       fi
+
+       LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+       INCPATH=${LIBPATH}/include
+       DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+       if is_cross ; then
+               BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+       else
+               BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+       fi
+
        # Block API and thus snapshots supported on >= 10.6
        [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -ge 10 ]] && \
                append-cppflags -DSUPPORT_SNAPSHOTS

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 70febd45e7fa91b239bfb44b64b995a3749028c2..55be11280a7bc8e785878a6940c20eebe393306f 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
@@ -41,27 +41,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-       if [[ ${CATEGORY} == cross-* ]] ; then
-               export CTARGET=${CATEGORY#cross-}
-       fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="7"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-       BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-       BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
        if use multitarget ; then
                ewarn "You have enabled support for non-standard target architectures"
@@ -199,6 +184,22 @@ src_configure() {
        ENABLE_LTO=0
        use lto && ENABLE_LTO=1
 
+       export CTARGET=${CTARGET:-${CHOST}}
+       if [[ ${CTARGET} == ${CHOST} ]] ; then
+               if [[ ${CATEGORY} == cross-* ]] ; then
+                       export CTARGET=${CATEGORY#cross-}
+               fi
+       fi
+
+       LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+       INCPATH=${LIBPATH}/include
+       DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+       if is_cross ; then
+               BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+       else
+               BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+       fi
+
        # CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
        # what we want)
        append-cppflags -DNDEBUG

diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.ebuild b/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
index e177c38d3da40f7c6c4d326ff073d5fba451b9f0..db2756789691863879afb7aeba4614293ec73ee6 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
@@ -41,27 +41,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-       if [[ ${CATEGORY} == cross-* ]] ; then
-               export CTARGET=${CATEGORY#cross-}
-       fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="7"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-       BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-       BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
        if use multitarget ; then
                ewarn "You have enabled support for non-standard target architectures"
@@ -199,6 +184,22 @@ src_configure() {
        ENABLE_LTO=0
        use lto && ENABLE_LTO=1
 
+       export CTARGET=${CTARGET:-${CHOST}}
+       if [[ ${CTARGET} == ${CHOST} ]] ; then
+               if [[ ${CATEGORY} == cross-* ]] ; then
+                       export CTARGET=${CATEGORY#cross-}
+               fi
+       fi
+
+       LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+       INCPATH=${LIBPATH}/include
+       DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+       if is_cross ; then
+               BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+       else
+               BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+       fi
+
        # CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
        # what we want)
        append-cppflags -DNDEBUG