Use new toolchain helpers for selecting the bfd linker #467136 by Amadeusz Sławiński...

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 5b942e059faa92924ce9d721192de5025bae775e..4db6126b6f05fd3bd3d0d8ea33ce1fdc49629e54 100644 (file)
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/setools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.98 2015/03/03 19:57:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.99 2015/03/16 21:34:05 vapier Exp $
+
+  16 Mar 2015; Mike Frysinger <vapier@gentoo.org> setools-3.3.8-r5.ebuild,
+  setools-3.3.8-r7.ebuild:
+  Use new toolchain helpers for selecting the bfd linker #467136 by Amadeusz
+  Sławiński. Clean up quoting/redundant die/semicolons too.
 
   03 Mar 2015; Sven Vermeulen <swift@gentoo.org> setools-3.3.8-r7.ebuild:
   Fix bug #542032 - SWIG version check does not work

diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 8bb06252d6f88d3c18824bb1effee171631be054..3bca9e3e7f4a773d27e3dc5424778bf96364df0e 100644 (file)
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -8,24 +8,24 @@ DIST setools-3.3.8-01-fedora-patches.tar.gz 1128 SHA256 420b852d4209d07b73cec845
 DIST setools-3.3.8-03-gentoo-patches.tar.gz 6584 SHA256 8eac460b7dc2ee5e2f23148cdbf187316edd78ce0ec7ebbb6b0f68d6ad33d86a SHA512 5458dab5775b558e287f946c299753be5cb5eb6c1c2b9df0e32c7cfa758bb5316d142aa6338d3019f5f1eeb72876e4d5ed4939b0dbfe7b7e01c08a19a086bacc WHIRLPOOL e1afa6bb28f3aee2f3acdc66efd8ca02548c4f8e5707052ea455f1db558126f069d63278251630ee68bf4987157279161006975cb14d44055492228fa476cd72
 DIST setools-3.3.8-04-gentoo-patches.tar.bz2 94986 SHA256 9a8a43ac97606fde9b2610ceed65f640638929853f871ce530982bedfd919b64 SHA512 39bf00b6aaf31821c6e2e2fb4c460dd1914fba4bf8385acebedf88f1533da990f1fb925dd49d75827aebef3f394a50a1edea46a07204193b58c65a066a064e6a WHIRLPOOL 4a92e4cf6930584de931c5d0805815aacd1c1af4434ca8e73414eda33588a55ef8d7bdfe4195be642889eee480128cbe12d1c5612e07ea304021b230e0b74816
 DIST setools-3.3.8.tar.bz2 951428 SHA256 44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e341e999 SHA512 2c42ee9904174ed6c6fc129e374ec3591925094ab0ef65001b0104e365c5634bf4a79f28369608c80199d8f59fafaa5f274107c04c129c380eeef7adb0c32667 WHIRLPOOL 11c4065809909764f4364b78df1a8030d189315601b882919ccacb5fb147c1b3a061c5bbf9ced3c243d4615ab7727e9db0c89e931a884ae8b317ae3a879e5371
-EBUILD setools-3.3.8-r5.ebuild 4556 SHA256 5c050294face07b984e68334867961fb5ae595517c26ba7b46baa7bc1a98e444 SHA512 4ed547cd0d97b53dc7f798a967780ffde9cda669402dd46f12bb1862092c51c3a6be6415fe8fc03f4d48d19c2f684a0169d92002689a977eda5c3f165597725e WHIRLPOOL b95f4c9973ab5826a43e06cb460b477c6135a2775a86fbd71bfb9d3696ba33d7606afea7d93235b381e2d7b0bf1340ce42fae94fa810cf1ff550d14ae42ffe6d
-EBUILD setools-3.3.8-r7.ebuild 3960 SHA256 6f97c7d6f582f7d1f706c64da34ffed13e77633c318b879cb625d883ba548d20 SHA512 053cfb59143eeaaabc2f07f1543342eafcbaeae1e5b2c5023b61b1653edc6307568a5387c39b7dd3fab46ec773693a72b0b5cfdcd67e0caf18ec4136c57d99d9 WHIRLPOOL 9d449d1610dc67b9ccb3a94015de45ec619f980c0a149a8153cea4bb0b764d009ec8a5e8337314c763ee5f0c463b5f6fe5d0962b25d68cbcc2173bd342312739
-MISC ChangeLog 13406 SHA256 da287061ab105647a18c045c84b3171ae5d9187f32aef4a4ada78b51cb9d8570 SHA512 6e37ba075d395cbfc4e2a64d28d5591b3a6497c5891312e73bc8c496d39aed6fb88a924f077151dbc053aff761cee16156703d38db26d423a0ff49d7fe5ae44d WHIRLPOOL 8501d778fec0865e30c9cf6a50b64c7b15661d79fbf3bab75ba5a05ba24e932f2f25f366bb40eb2f3358919f160978ae755b0156e028a69bb58b7ed3bbdc90e6
+EBUILD setools-3.3.8-r5.ebuild 4345 SHA256 e16a7cc8e89e45c2760c8b5576e5955eaf44a07512269e48fb9bc4a0727b42b7 SHA512 4df946c6697454c9c6044b394a5e5d65449d572c6461d3aa06a5c20ae07cdb36ef3b2475c7eb81ea8a913663dbbda43afe2aaf67eecf64f29da9730105571191 WHIRLPOOL af5f526222a845ea59ca00e97f4f02d31e6facc52979279ae9ba36f60cf5ce7123a695c34eb9c8513f04c014df27cdb9d672f01f835f95eb8c9978cf2d8daa67
+EBUILD setools-3.3.8-r7.ebuild 3749 SHA256 730a5c2fa7f6ac3ed86f0447e85aa4cbcff100a0e1c8fed232699657b3be81fd SHA512 4fa31f0579c829fb312519d8d898984c749aee82230e10c1b318c250b56f5339be1b2605af4709570c5fe537728ab29958aa8ddff8e9748cf6b05eccb70f6b8d WHIRLPOOL 2c14b1a384ce0b29c84711873b620bbf4acd644190e8fc88ef42c611b0136e4b67cf7d562dcd2c830aa2fd115d12f13339f370d1302877fab6fbb525432ba396
+MISC ChangeLog 13649 SHA256 a085bb4def98c27a356790793b6b173449141291ec2d2b87d6484626ae3afd94 SHA512 62379f4de54e093fbacceda0080abebe10e52dbf2e1b22f88f098dc2e658883940be1ed09dfe37b22633207bbd9a8b5abd7ca620cf5c14d3d8bad536b0bfcf6d WHIRLPOOL 547d786c9d4f60451152bf1f4e45d0dbb6b3237cebb55457fdc61ab3b58532dd1853cd107208474ee8eddd530c51f8f33068fccb21db38ce721ddfaf442114f7
 MISC metadata.xml 228 SHA256 bbcb1daec06953b214112a968d7691679891d41b620789200450e8fabf533951 SHA512 23a02e7ab38822642d81150177d3ce4d24f8aef3e422ba71bc8a9a04e777a2d462f45f4de839fcf39d32207fe60799b890157f90b1aedf5c4369656dc6303851 WHIRLPOOL 7e866656536cb45b9efd876bda1455a6554c5019647ff7d600fe0efb905d4e6102ee1d3041943f411505628e9c0d8d5e14d784589538d93a5d68064c526a2aac
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU9hIzAAoJEC7dUkA7aK9HIPAP/jB3bQYz6+Hoq7JNI+zTHuUU
-rU5EZPLy2lOBCkHvyvONy3x0CeQxsQZkqp054qFArxSsM26UxfNrGeyNBjFb14an
-OGD6NY9ylDJ+M5fQeTrnwLq2t3Ca0/nOoV93XtnX+zh5fhM2iAB6LnYn87V37/XG
-U+oUssL+5RJqztPCn6e2uF7yuXwqcls6G055OgOqc2Ii41D+VBQJ5M/kU87T5yKS
-citFn/ltRlze3sPhx+eyh6jjGo6/riD3xKD//8bq7Ht8BMvdd5v3aj403XWGjjEH
-1LjVM4hI9tZeYOxUL0FwjO+pF7cc4OoZsEsh27zYZfXlbcdUN9HVJuzxI0fNKBdo
-w9yyfvhaP7fCsdp948rQAQ271FHI5SvOyjXn4wd72oLsp9iRlDFw3K8l07djjOud
-040oMTGpKms4q6HTzPHWK74lJ3XAkRGVY5NtMSfs9XksBJPslkG7pp49xBp46+Rz
-nA7LNA2CSCu2ZGoo2dtTtNiB+wnbIm4Y2bHIQHbPpUVeQIGfpWv+GiXFL9uJlw4L
-+xq17oJXUSwaQgSxJpaRVcr5vX7r1akEOCz9SjGUejn4eMoZJCnSmcsX4RK2tkYl
-quT6ZWhyr/LRl/YT/dnX9RdMP9IeZToOHJBMsKVnE1p0SMC04iYLzxole0EsdM19
-KmduMkyeLETe2ouvWnBV
-=4Mh8
+iQIcBAEBCAAGBQJVB0xOAAoJEPGu1DbS6WIADdkQAIGjjKq2UWEiS46zJuSBwca3
+KX+ixOE3ejV+d30OzKsr1R4YvxL05QdujQ1uvrFiiXzmFIQgJbz0CBWnRDuM0aA3
+irhMdQ14/qu11+sq8o4YKnzxdHZQDjDAZt560/V70reH+9qC+my2Ny5oWpngvEBN
+XdDUquamW60iWScDaGkmX2StEUJnl41NS4MqzuKJ6pyutq47f23kDb4jpacszqQu
+FCmOU2gemnroVPch+UdqapFgqyp4ngwXBGYb9UdWn84gF7Rg7RpHD8YKMkFUtRQj
+OJytSl/fgRlmypGh5xJcIberV1kgTD002XfkN8zbtue0FphANb8w1IKx0y+E20JI
+r9wR05KVsqTUQDa06+xUuOPTSO0mCaMcnFrPHKCBZBp9ZgshRyZpy9DgYFMCnaHT
+mJpV8Ke6He2bAAjagHYh2DcSxGYUo6GzuKcgGPnsBT0YaYtPFDNX3M/t47WlFF3h
+lMQiXHkqHEZT4inZdCtvaeTR56UIxjHfF2vt5SvGbNsZEBe/KGp4gcVAWj/gZK5c
+bgkvzbK4JN3DJz+XNBzsRYAOoXdatRVlUH176ZHzswBUtiNZUzQCkuN1veof5FTY
+pf57JyPaQyNc5/ghoW76vfIhHIKmKapt/+MK78KUAx1y6UbijU+81NWssV7RLZf0
+OllvJu0h+1u77xwsd2qa
+=hpe4
 -----END PGP SIGNATURE-----

diff --git a/app-admin/setools/setools-3.3.8-r5.ebuild b/app-admin/setools/setools-3.3.8-r5.ebuild
index 0bbe02b4b3e46260afa8181582afce9450a1c55d..08a399e30c35d3a805098491c9584dc9c5c8c988 100644 (file)
--- a/app-admin/setools/setools-3.3.8-r5.ebuild
+++ b/app-admin/setools/setools-3.3.8-r5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r5.ebuild,v 1.2 2014/07/30 12:04:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r5.ebuild,v 1.3 2015/03/16 21:34:05 vapier Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools java-pkg-opt-2 python-r1 eutils
+inherit autotools java-pkg-opt-2 python-r1 eutils toolchain-funcs
 
 DESCRIPTION="SELinux policy tools"
 HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
@@ -56,14 +56,9 @@ RESTRICT="test"
 PYTHON_DIRS="libapol/swig/python libpoldiff/swig/python libqpol/swig/python libseaudit/swig/python libsefs/swig/python python"
 
 pkg_setup() {
-       local myld=$(tc-getLD)
-
        if use java; then
                java-pkg-opt-2_pkg_setup
        fi
-
-       ${myld} -v | grep -q "GNU gold" && \
-       ewarn "Bug #467136 shows us that the gold linker doesn't work with setools for now."
 }
 
 src_prepare() {
@@ -107,6 +102,7 @@ src_prepare() {
 }
 
 src_configure() {
+       tc-ld-disable-gold #467136
        econf \
                --with-java-prefix=${JAVA_HOME} \
                --disable-selinux-check \
@@ -123,29 +119,29 @@ src_configure() {
 }
 
 src_compile() {
-       emake LD="$(tc-getLD).bfd" || die "Failed to build setools"
+       emake
 
        if use python; then
                building() {
                        python_export PYTHON_INCLUDEDIR
                        python_export PYTHON_SITEDIR
                        python_export PYTHON_LIBS
-                       emake LD="$(tc-getLD).bfd" \
+                       emake \
                                SWIG_PYTHON_CPPFLAGS="-I${PYTHON_INCLUDEDIR}" \
                                PYTHON_LDFLAGS="${PYTHON_LIBS}" \
                                pyexecdir="${PYTHON_SITEDIR}" \
                                pythondir="${PYTHON_SITEDIR}" \
-                               -C ${1};
+                               -C "$1"
                }
                local dir
                for dir in ${PYTHON_DIRS}; do
-                       python_foreach_impl building ${dir};
+                       python_foreach_impl building ${dir}
                done
        fi
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
+       emake DESTDIR="${D}" install
 
        if use python; then
                installation() {
@@ -153,12 +149,12 @@ src_install() {
                        emake DESTDIR="${D}" \
                                pyexecdir="${PYTHON_SITEDIR}" \
                                pythondir="${PYTHON_SITEDIR}" \
-                               -C ${1} install
+                               -C "$1" install
                }
 
                local dir
                for dir in ${PYTHON_DIRS}; do
-                       python_foreach_impl installation ${dir};
+                       python_foreach_impl installation "${dir}"
                done
        fi
 }

diff --git a/app-admin/setools/setools-3.3.8-r7.ebuild b/app-admin/setools/setools-3.3.8-r7.ebuild
index 930855176164f1ceb0fb7ffae776881e198ffd4d..50b1f37f767f8c8745708b67383635e2c70cd64c 100644 (file)
--- a/app-admin/setools/setools-3.3.8-r7.ebuild
+++ b/app-admin/setools/setools-3.3.8-r7.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r7.ebuild,v 1.3 2015/03/03 19:57:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r7.ebuild,v 1.4 2015/03/16 21:34:05 vapier Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 python3_4 )
 
-inherit autotools java-pkg-opt-2 python-r1 eutils
+inherit autotools java-pkg-opt-2 python-r1 eutils toolchain-funcs
 
 DESCRIPTION="SELinux policy tools"
 HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
@@ -56,14 +56,9 @@ RESTRICT="test"
 PYTHON_DIRS="libapol/swig/python libpoldiff/swig/python libqpol/swig/python libseaudit/swig/python libsefs/swig/python python"
 
 pkg_setup() {
-       local myld=$(tc-getLD)
-
        if use java; then
                java-pkg-opt-2_pkg_setup
        fi
-
-       ${myld} -v | grep -q "GNU gold" && \
-       ewarn "Bug #467136 shows us that the gold linker doesn't work with setools for now."
 }
 
 src_prepare() {
@@ -95,6 +90,7 @@ src_prepare() {
 }
 
 src_configure() {
+       tc-ld-disable-gold #467136
        econf \
                --with-java-prefix=${JAVA_HOME} \
                --disable-selinux-check \
@@ -111,29 +107,29 @@ src_configure() {
 }
 
 src_compile() {
-       emake LD="$(tc-getLD).bfd" || die "Failed to build setools"
+       emake
 
        if use python; then
                building() {
                        python_export PYTHON_INCLUDEDIR
                        python_export PYTHON_SITEDIR
                        python_export PYTHON_LIBS
-                       emake LD="$(tc-getLD).bfd" \
+                       emake \
                                SWIG_PYTHON_CPPFLAGS="-I${PYTHON_INCLUDEDIR}" \
                                PYTHON_LDFLAGS="${PYTHON_LIBS}" \
                                pyexecdir="${PYTHON_SITEDIR}" \
                                pythondir="${PYTHON_SITEDIR}" \
-                               -C ${1};
+                               -C "$1"
                }
                local dir
                for dir in ${PYTHON_DIRS}; do
-                       python_foreach_impl building ${dir};
+                       python_foreach_impl building ${dir}
                done
        fi
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
+       emake DESTDIR="${D}" install
 
        if use python; then
                installation() {
@@ -141,12 +137,12 @@ src_install() {
                        emake DESTDIR="${D}" \
                                pyexecdir="${PYTHON_SITEDIR}" \
                                pythondir="${PYTHON_SITEDIR}" \
-                               -C ${1} install
+                               -C "$1" install
                }
 
                local dir
                for dir in ${PYTHON_DIRS}; do
-                       python_foreach_impl installation ${dir};
+                       python_foreach_impl installation "${dir}"
                done
        fi
 }