sys-devel/binutils-apple: fix llvm slot-dep

Package-Manager: Portage-2.3.13, Repoman-2.3.3

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 5131c4f35b9917f5159b2cf1c37e7006a8d6e90f..021608d468274b6bc77c4ccf2815b6f5f7c7de71 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -26,10 +26,10 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lto test multitarget"
 
 RDEPEND="sys-devel/binutils-config
-       lto? ( sys-devel/llvm )"
+       lto? ( sys-devel/llvm:* )"
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )
-       || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )"
+       || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )"
 
 SLOT="4"
 

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 507c8b54be169209a653a25b0a07346bb67be2f4..4920826c0166843df575a4f12b9e902942c76d47 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -25,12 +25,12 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lto test libcxx multitarget"
 
 RDEPEND="sys-devel/binutils-config
-       lto? ( sys-devel/llvm )
+       lto? ( sys-devel/llvm:* )
        libcxx? ( sys-libs/libcxx )"
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )
-       || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
-       libcxx? ( sys-devel/llvm )"
+       || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )
+       libcxx? ( sys-devel/llvm:* )"
 
 SLOT="5"
 

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 984b31319824e328288ffca20c9b83882f0a9664..bd3202442311ffc96108f83895a57fd583dd3981 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -26,12 +26,12 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lto test libcxx multitarget"
 
 RDEPEND="sys-devel/binutils-config
-       lto? ( sys-devel/llvm )
+       lto? ( sys-devel/llvm:* )
        libcxx? ( sys-libs/libcxx )"
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )
-       || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
-       libcxx? ( sys-devel/llvm )"
+       || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )
+       libcxx? ( sys-devel/llvm:* )"
 
 SLOT="6"
 

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 371c6a2b6c6b3207ad48a6e8216adc4a782f1684..5835b8852a09b89d71f5b5ba2a9ce54cd8fa9c6e 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -27,12 +27,12 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lto test libcxx multitarget"
 
 RDEPEND="sys-devel/binutils-config
-       lto? ( sys-devel/llvm )
+       lto? ( sys-devel/llvm:* )
        libcxx? ( sys-libs/libcxx )"
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )
-       || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
-       libcxx? ( sys-devel/llvm )"
+       || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )
+       libcxx? ( sys-devel/llvm:* )"
 
 SLOT="6"
 

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 2eab5e95aabffb5a5a5a58b312e81a47724fdd54..039399257b2a5207be7b94f4574fccbde75eda80 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -33,7 +33,7 @@ IUSE="lto test multitarget"
 # -Wa,-Q but since it's default we make llvm a static runtime dependency.
 RDEPEND="sys-devel/binutils-config
        lto? ( app-arch/xar )
-       sys-devel/llvm
+       sys-devel/llvm:*
        sys-libs/libcxx"
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"

diff --git a/sys-devel/binutils-apple/binutils-apple-7.0.ebuild b/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
index c81eb3fe54e03c8b94e9efdc9e691a4c9c8bc34f..805b4d51e50ab6711459f609ff6dca0af791aa20 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -38,7 +38,7 @@ IUSE="test multitarget"
 # indirectly makes xar a static runtime dependency.
 RDEPEND="sys-devel/binutils-config
        app-arch/xar
-       sys-devel/llvm
+       sys-devel/llvm:*
        sys-libs/libcxx"
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"

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 6b57a7444fd892a88d51dbb1e118901dcc83de21..6ee67d9bd04f99fdddfb13b2baf76e93b77fb0d5 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -33,7 +33,7 @@ IUSE="lto test multitarget"
 # -Wa,-Q but since it's default we make llvm a static runtime dependency.
 RDEPEND="sys-devel/binutils-config
        lto? ( app-arch/xar )
-       sys-devel/llvm
+       sys-devel/llvm:*
        sys-libs/libcxx"
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"

diff --git a/sys-devel/binutils-apple/binutils-apple-7.1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
index 9dfebf05d008047a0ee6c588a5a2d22ea72396f5..ed6be55fb9a3268ab0ed1dc2c7000ea964e7b57e 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -38,7 +38,7 @@ IUSE="test multitarget"
 # indirectly makes xar a static runtime dependency.
 RDEPEND="sys-devel/binutils-config
        app-arch/xar
-       sys-devel/llvm
+       sys-devel/llvm:*
        sys-libs/libcxx"
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"

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 e5de0f0f7867c36dbe87e47caa68db8c03c956b4..8cae70ffc66349627aab14e4ce73e7cc981b726c 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -34,7 +34,7 @@ IUSE="lto test multitarget"
 # -Wa,-Q but since it's default we make llvm a static runtime dependency.
 RDEPEND="sys-devel/binutils-config
        lto? ( app-arch/xar )
-       sys-devel/llvm
+       sys-devel/llvm:*
        sys-libs/libcxx"
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"

diff --git a/sys-devel/binutils-apple/binutils-apple-7.2.ebuild b/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
index 0f608625bcae4be15fb4b706374ce84e39462547..4f76f80df25aaf0b4341267d5361dcb5c1aab17e 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -38,7 +38,7 @@ IUSE="test multitarget"
 # indirectly makes xar a static runtime dependency.
 RDEPEND="sys-devel/binutils-config
        app-arch/xar
-       sys-devel/llvm
+       sys-devel/llvm:*
        sys-libs/libcxx"
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"

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 e56d422a78c881cf8049e1fc5b49af4c27f0bce4..1fc16db7730acdab09d81a450974708ddc591654 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -35,7 +35,7 @@ IUSE="lto test multitarget"
 # -Wa,-Q but since it's default we make llvm a static runtime dependency.
 RDEPEND="sys-devel/binutils-config
        lto? ( app-arch/xar )
-       sys-devel/llvm
+       sys-devel/llvm:*
        sys-libs/libcxx"
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"

diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.ebuild b/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
index 26f629c41ee51d74794580f34cb5886396010a58..853dba37052f17ee54f5c23d97e06353f0d1b907 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -35,7 +35,7 @@ IUSE="lto test multitarget"
 # -Wa,-Q but since it's default we make llvm a static runtime dependency.
 RDEPEND="sys-devel/binutils-config
        lto? ( app-arch/xar )
-       sys-devel/llvm
+       sys-devel/llvm:*
        sys-libs/libcxx"
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"

diff --git a/sys-devel/binutils-apple/binutils-apple-8.1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.1.ebuild
index d5ad6ab38a98c996deb4a35a2e984969aac1858c..32405f72fca1c1acd20bb785c9881764a64d4d39 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-8.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -32,7 +32,7 @@ IUSE="lto tapi classic test"
 RDEPEND="sys-devel/binutils-config
        lto? ( app-arch/xar )
        tapi? ( sys-libs/tapi )
-       sys-devel/llvm
+       sys-devel/llvm:*
        sys-libs/libcxx"
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"

diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
index bf8351a7b24b57a26c89659b34d6eedbf6c211c8..781aff39edf2f76b0abe3b11d6f06d47cd1975e4 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -31,7 +31,7 @@ IUSE="lto tapi classic test"
 RDEPEND="sys-devel/binutils-config
        lto? ( app-arch/xar )
        tapi? ( sys-libs/tapi )
-       sys-devel/llvm
+       sys-devel/llvm:*
        sys-libs/libcxx"
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"
@@ -200,7 +200,7 @@ compile_ld64() {
                LTO_INCDIR=${LLVM_INCDIR} \
                LTO_LIBDIR=${LLVM_LIBDIR} \
                TAPI=$(use tapi && echo 1 || echo 0) \
-               TAPI_LIBDIR=${EPREFIX}/usr/lib \
+               TAPI_LIBDIR="${EPREFIX}"/usr/lib \
                || die "emake failed for ld64"
        use test && emake build_test
 }

diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1.ebuild
index 9cf67823890a36c0b2911150396ab3c7a6bcbd60..11fae8119966d0c722b722ce270a92a3dd492de5 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -32,7 +32,7 @@ IUSE="lto tapi classic test"
 RDEPEND="sys-devel/binutils-config
        lto? ( app-arch/xar )
        tapi? ( sys-libs/tapi )
-       sys-devel/llvm
+       sys-devel/llvm:*
        sys-libs/libcxx"
 DEPEND="${RDEPEND}
        test? ( >=dev-lang/perl-5.8.8 )"