toolchain-funcs.eclass: gen_usr_ldscript: integrate multilib_is_native_abi support #479448

Many ebuilds have started checking multilib_is_native_abi to see if they
should call gen_usr_ldscript.  Since that logic always makes sense, add
it directly to the gen_usr_ldscript function.

10 files changed, 10 insertions, 10 deletions

diff --git a/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild b/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild
index b586c500c347..9d460643779e 100644
--- a/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild
+++ b/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild
@@ -41,7 +41,7 @@ multilib_src_configure() {
 
 multilib_src_install() {
 	emake DESTDIR="${D}" install
-	multilib_is_native_abi && gen_usr_ldscript -a edit
+	gen_usr_ldscript -a edit
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libedit/libedit-20130712.3.1.ebuild b/dev-libs/libedit/libedit-20130712.3.1.ebuild
index 775c345b417b..50e38d623795 100644
--- a/dev-libs/libedit/libedit-20130712.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20130712.3.1.ebuild
@@ -41,7 +41,7 @@ multilib_src_configure() {
 
 multilib_src_install() {
 	emake DESTDIR="${D}" install
-	multilib_is_native_abi && gen_usr_ldscript -a edit
+	gen_usr_ldscript -a edit
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libpcre/libpcre-8.35.ebuild b/dev-libs/libpcre/libpcre-8.35.ebuild
index 8e1311fac14b..633923385a2e 100644
--- a/dev-libs/libpcre/libpcre-8.35.ebuild
+++ b/dev-libs/libpcre/libpcre-8.35.ebuild
@@ -79,7 +79,7 @@ multilib_src_install() {
 		DESTDIR="${D}" \
 		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
 		install
-	multilib_is_native_abi && gen_usr_ldscript -a pcre
+	gen_usr_ldscript -a pcre
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libpcre/libpcre-8.36.ebuild b/dev-libs/libpcre/libpcre-8.36.ebuild
index 2d8b251a5b5d..7cff23efbfc9 100644
--- a/dev-libs/libpcre/libpcre-8.36.ebuild
+++ b/dev-libs/libpcre/libpcre-8.36.ebuild
@@ -79,7 +79,7 @@ multilib_src_install() {
 		DESTDIR="${D}" \
 		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
 		install
-	multilib_is_native_abi && gen_usr_ldscript -a pcre
+	gen_usr_ldscript -a pcre
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libpcre/libpcre-8.37-r2.ebuild b/dev-libs/libpcre/libpcre-8.37-r2.ebuild
index ab2cf486566a..4b098ab42c0f 100644
--- a/dev-libs/libpcre/libpcre-8.37-r2.ebuild
+++ b/dev-libs/libpcre/libpcre-8.37-r2.ebuild
@@ -77,7 +77,7 @@ multilib_src_install() {
 		DESTDIR="${D}" \
 		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
 		install
-	multilib_is_native_abi && gen_usr_ldscript -a pcre
+	gen_usr_ldscript -a pcre
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libpcre/libpcre-8.38.ebuild b/dev-libs/libpcre/libpcre-8.38.ebuild
index b0b24a6ec9c4..fcda8d2e8812 100644
--- a/dev-libs/libpcre/libpcre-8.38.ebuild
+++ b/dev-libs/libpcre/libpcre-8.38.ebuild
@@ -75,7 +75,7 @@ multilib_src_install() {
 		DESTDIR="${D}" \
 		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
 		install
-	multilib_is_native_abi && gen_usr_ldscript -a pcre
+	gen_usr_ldscript -a pcre
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
index 6253f87ec448..386d87a43d9d 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
@@ -39,7 +39,7 @@ multilib_src_configure() {
 multilib_src_install() {
 	emake DESTDIR="${D}" install
 
-	multilib_is_native_abi && gen_usr_ldscript -a usb
+	gen_usr_ldscript -a usb
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
index 4318c2f23107..39ddc74f99d9 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
@@ -43,7 +43,7 @@ multilib_src_configure() {
 multilib_src_install() {
 	emake DESTDIR="${D}" install
 
-	multilib_is_native_abi && gen_usr_ldscript -a usb
+	gen_usr_ldscript -a usb
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/lzo/lzo-2.08-r1.ebuild b/dev-libs/lzo/lzo-2.08-r1.ebuild
index 616c15716c88..f3cff4bce840 100644
--- a/dev-libs/lzo/lzo-2.08-r1.ebuild
+++ b/dev-libs/lzo/lzo-2.08-r1.ebuild
@@ -32,7 +32,7 @@ multilib_src_configure() {
 
 multilib_src_install() {
 	emake DESTDIR="${D}" install
-	multilib_is_native_abi && gen_usr_ldscript -a lzo2
+	gen_usr_ldscript -a lzo2
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/lzo/lzo-2.09.ebuild b/dev-libs/lzo/lzo-2.09.ebuild
index 616c15716c88..f3cff4bce840 100644
--- a/dev-libs/lzo/lzo-2.09.ebuild
+++ b/dev-libs/lzo/lzo-2.09.ebuild
@@ -32,7 +32,7 @@ multilib_src_configure() {
 
 multilib_src_install() {
 	emake DESTDIR="${D}" install
-	multilib_is_native_abi && gen_usr_ldscript -a lzo2
+	gen_usr_ldscript -a lzo2
 }
 
 multilib_src_install_all() {