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

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.

diff --git a/app-arch/xz-utils/xz-utils-5.0.8.ebuild b/app-arch/xz-utils/xz-utils-5.0.8.ebuild
index d736bdbfc8b3613400b99ccd546a680fc4312d5f..f3dbb5eec711470c37951f53bad8ddb78ae1ac5c 100644 (file)
--- a/app-arch/xz-utils/xz-utils-5.0.8.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.0.8.ebuild
@@ -55,7 +55,7 @@ multilib_src_configure() {
 
 multilib_src_install() {
        default
-       multilib_is_native_abi && gen_usr_ldscript -a lzma
+       gen_usr_ldscript -a lzma
 }
 
 multilib_src_install_all() {

diff --git a/app-arch/xz-utils/xz-utils-5.2.0.ebuild b/app-arch/xz-utils/xz-utils-5.2.0.ebuild
index f73bba31ba1daaee8f1d369efc82eb8413d559c0..f50cda411d60864f70047b4ecc259d090de8773c 100644 (file)
--- a/app-arch/xz-utils/xz-utils-5.2.0.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.0.ebuild
@@ -55,7 +55,7 @@ multilib_src_configure() {
 
 multilib_src_install() {
        default
-       multilib_is_native_abi && gen_usr_ldscript -a lzma
+       gen_usr_ldscript -a lzma
 }
 
 multilib_src_install_all() {

diff --git a/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild b/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild
index 7c2bae60b2a57770b1508610cd820dfe2582176b..d50e82e1edb32ac934fa9ced51ec661cd5b29226 100644 (file)
--- a/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild
@@ -56,7 +56,7 @@ multilib_src_configure() {
 
 multilib_src_install() {
        default
-       multilib_is_native_abi && gen_usr_ldscript -a lzma
+       gen_usr_ldscript -a lzma
 }
 
 multilib_src_install_all() {

diff --git a/app-arch/xz-utils/xz-utils-5.2.2.ebuild b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
index 358098a8e7f512b706f4a31fed011e7bfe78f94f..7e69f3fdc5bd8172cb87c13e88bbe605e061970c 100644 (file)
--- a/app-arch/xz-utils/xz-utils-5.2.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
@@ -56,7 +56,7 @@ multilib_src_configure() {
 
 multilib_src_install() {
        default
-       multilib_is_native_abi && gen_usr_ldscript -a lzma
+       gen_usr_ldscript -a lzma
 }
 
 multilib_src_install_all() {

diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index da8e29b44d4d25d1722fd372c3c619ba4929c386..ac40bc4366082c95986d4e849a31d816f1356bc1 100644 (file)
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -56,7 +56,7 @@ multilib_src_configure() {
 
 multilib_src_install() {
        default
-       multilib_is_native_abi && gen_usr_ldscript -a lzma
+       gen_usr_ldscript -a lzma
 }
 
 multilib_src_install_all() {

diff --git a/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild b/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild
index b586c500c3475e430b660c8de31a93fb7ec64ad1..9d460643779e7c01243dbe9a89b5d70394426bca 100644 (file)
--- 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 775c345b417b4ba97fd72c1b73faec8df863a763..50e38d623795810ceef5b41deae0e6bbc62e2861 100644 (file)
--- 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 8e1311fac14b87ab44e4e738f508df87057aa342..633923385a2ea9b572e8cee57c8862a11aea7e4b 100644 (file)
--- 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 2d8b251a5b5db8b4fe23983cbed32d112dbd5b4f..7cff23efbfc993edc5f80b0ef1617b18473db0f5 100644 (file)
--- 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 ab2cf486566a88d2395b88fbf69072b124f37034..4b098ab42c0f4037dd020e9beb36de92a532adbe 100644 (file)
--- 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 b0b24a6ec9c4df79f2aadbb9936625feb297fdbe..fcda8d2e88124decc99cd12fbd2fa1c931c0296a 100644 (file)
--- 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 6253f87ec44875e18ef6df90e00014f695da39bc..386d87a43d9d567357632b8bc941a7e897b1743e 100644 (file)
--- 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 4318c2f23107b310119246c2da159e03610ca09e..39ddc74f99d928809849cfe01981d0c5451f4a82 100644 (file)
--- 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 616c15716c88ddcdd0879018ec3e1d99a4bc1a0c..f3cff4bce8406505b35ebcbba0f101040b0a9094 100644 (file)
--- 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 616c15716c88ddcdd0879018ec3e1d99a4bc1a0c..f3cff4bce8406505b35ebcbba0f101040b0a9094 100644 (file)
--- 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() {

diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index 59c28617aec41125e9c377c9be1ae681f84729d3..cf95d04ad66c856f195dc4b83b36a2b3d6585d8b 100644 (file)
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -722,6 +722,11 @@ gen_usr_ldscript() {
 
        tc-is-static-only && return
 
+       # We only care about stuffing / for the native ABI. #479448
+       if [[ $(type -t multilib_is_native_abi) == "function" ]] ; then
+               multilib_is_native_abi || return 0
+       fi
+
        # Eventually we'd like to get rid of this func completely #417451
        case ${CTARGET:-${CHOST}} in
        *-darwin*) ;;

diff --git a/net-libs/libtirpc/libtirpc-0.2.4-r2.ebuild b/net-libs/libtirpc/libtirpc-0.2.4-r2.ebuild
index 4b3aa4c8fc95871571d9c0d453d3b2157a019e79..05974cf656370f3fac9910e23ab813b4166ba6eb 100644 (file)
--- a/net-libs/libtirpc/libtirpc-0.2.4-r2.ebuild
+++ b/net-libs/libtirpc/libtirpc-0.2.4-r2.ebuild
@@ -43,7 +43,7 @@ multilib_src_install() {
        default
 
        # libtirpc replaces rpc support in glibc, so we need it in /
-       multilib_is_native_abi && gen_usr_ldscript -a tirpc
+       gen_usr_ldscript -a tirpc
 }
 
 multilib_src_install_all() {

diff --git a/net-libs/libtirpc/libtirpc-0.2.5.ebuild b/net-libs/libtirpc/libtirpc-0.2.5.ebuild
index 304b8d8f38d1d13d17b1b1fb989c8afe04135ec6..3af0dd70ac4b031b055412d282e2cc10b79fb9a7 100644 (file)
--- a/net-libs/libtirpc/libtirpc-0.2.5.ebuild
+++ b/net-libs/libtirpc/libtirpc-0.2.5.ebuild
@@ -47,7 +47,7 @@ multilib_src_install() {
        default
 
        # libtirpc replaces rpc support in glibc, so we need it in /
-       multilib_is_native_abi && gen_usr_ldscript -a tirpc
+       gen_usr_ldscript -a tirpc
 }
 
 multilib_src_install_all() {

diff --git a/net-libs/libtirpc/libtirpc-0.3.1.ebuild b/net-libs/libtirpc/libtirpc-0.3.1.ebuild
index dc5f6523132d3a28107dd3532bf8d4dd794bc449..978e466c990aa1b72176bf8b099ba0ab2e4dd503 100644 (file)
--- a/net-libs/libtirpc/libtirpc-0.3.1.ebuild
+++ b/net-libs/libtirpc/libtirpc-0.3.1.ebuild
@@ -43,7 +43,7 @@ multilib_src_install() {
        default
 
        # libtirpc replaces rpc support in glibc, so we need it in /
-       multilib_is_native_abi && gen_usr_ldscript -a tirpc
+       gen_usr_ldscript -a tirpc
 }
 
 multilib_src_install_all() {

diff --git a/net-libs/libtirpc/libtirpc-1.0.1.ebuild b/net-libs/libtirpc/libtirpc-1.0.1.ebuild
index 79ba2868ef71037b072853ad492f39cf122b99b1..2fd632bbad775e76be787aabc3717cf3d46332b1 100644 (file)
--- a/net-libs/libtirpc/libtirpc-1.0.1.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.0.1.ebuild
@@ -38,7 +38,7 @@ multilib_src_install() {
        default
 
        # libtirpc replaces rpc support in glibc, so we need it in /
-       multilib_is_native_abi && gen_usr_ldscript -a tirpc
+       gen_usr_ldscript -a tirpc
 }
 
 multilib_src_install_all() {

diff --git a/sys-apps/acl/acl-2.2.52-r1.ebuild b/sys-apps/acl/acl-2.2.52-r1.ebuild
index 00869bfbaa8c32c423793e149330b90d21a776cc..d1d21698df38a798a2a694e7b1927921dfb69b3b 100644 (file)
--- a/sys-apps/acl/acl-2.2.52-r1.ebuild
+++ b/sys-apps/acl/acl-2.2.52-r1.ebuild
@@ -51,7 +51,7 @@ multilib_src_install() {
        emake DIST_ROOT="${D}" install install-dev install-lib
 
        # move shared libs to /
-       multilib_is_native_abi && gen_usr_ldscript -a acl
+       gen_usr_ldscript -a acl
 }
 
 multilib_src_install_all() {

diff --git a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild b/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
index 8c8af810c53a7e419b69322f79972009b56549b3..ba4ae64383670be71c237a87ca4aa11534ff73cb 100644 (file)
--- a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
+++ b/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
@@ -40,7 +40,7 @@ multilib_src_configure() {
 
 multilib_src_install() {
        emake DESTDIR="${D}" install install-dev
-       multilib_is_native_abi && gen_usr_ldscript -a dm
+       gen_usr_ldscript -a dm
 }
 
 multilib_src_install_all() {

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
index 3792e2d297285c59ad49379113d006e25a142300..e6250c468c01b1886fc89e7611416ec67fd99ad5 100644 (file)
--- a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
@@ -74,7 +74,7 @@ multilib_src_test() {
 
 multilib_src_install() {
        default
-       multilib_is_native_abi && gen_usr_ldscript -a keyutils
+       gen_usr_ldscript -a keyutils
 }
 
 multilib_src_install_all() {

diff --git a/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild b/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild
index f78b893766e4f9175b609f58a3ba00a2447762ff..792bb37b7f334b6beb73accfdbe2e6f7394b32fa 100644 (file)
--- a/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild
@@ -83,7 +83,7 @@ python_test() {
 multilib_src_install() {
        default
        # move shared libs to /
-       multilib_is_native_abi && gen_usr_ldscript -a crack
+       gen_usr_ldscript -a crack
 
        do_python
 }

diff --git a/sys-libs/cracklib/cracklib-2.9.4.ebuild b/sys-libs/cracklib/cracklib-2.9.4.ebuild
index 519afb7cc02118e95b4e745125e92cbb33fbdae7..a826ef9b3b46d543d005c39af02d6363b4cde0b9 100644 (file)
--- a/sys-libs/cracklib/cracklib-2.9.4.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.4.ebuild
@@ -82,7 +82,7 @@ python_test() {
 multilib_src_install() {
        default
        # move shared libs to /
-       multilib_is_native_abi && gen_usr_ldscript -a crack
+       gen_usr_ldscript -a crack
 
        do_python
 }

diff --git a/sys-libs/cracklib/cracklib-2.9.5.ebuild b/sys-libs/cracklib/cracklib-2.9.5.ebuild
index 519afb7cc02118e95b4e745125e92cbb33fbdae7..a826ef9b3b46d543d005c39af02d6363b4cde0b9 100644 (file)
--- a/sys-libs/cracklib/cracklib-2.9.5.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.5.ebuild
@@ -82,7 +82,7 @@ python_test() {
 multilib_src_install() {
        default
        # move shared libs to /
-       multilib_is_native_abi && gen_usr_ldscript -a crack
+       gen_usr_ldscript -a crack
 
        do_python
 }

diff --git a/sys-libs/cracklib/cracklib-2.9.6.ebuild b/sys-libs/cracklib/cracklib-2.9.6.ebuild
index b430d4516efc3b5bb75cdd9cd8bd6eadc5fa0383..dda19c05a17506ff7a4110abcc7e1447dd0de3a7 100644 (file)
--- a/sys-libs/cracklib/cracklib-2.9.6.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.6.ebuild
@@ -82,7 +82,7 @@ python_test() {
 multilib_src_install() {
        default
        # move shared libs to /
-       multilib_is_native_abi && gen_usr_ldscript -a crack
+       gen_usr_ldscript -a crack
 
        do_python
 }

diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild
index 15bd18e7377d0616573577440774cd8436efd7dc..01d978d9e9323f001375b0bdb71a098e170faea7 100644 (file)
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild
@@ -64,7 +64,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
        emake V=1 STRIP=: DESTDIR="${D}" install || die
-       multilib_is_native_abi && gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
+       gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
        # configure doesn't have an option to disable static libs :/
        use static-libs || find "${ED}" -name '*.a' -delete
 }

diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
index 8a191ddd4790b454abab3601cd0bb64bfb827462..ee9f5a7005ef81bce397d7b8651feab321104e4d 100644 (file)
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild
+++ b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
@@ -62,7 +62,7 @@ multilib_src_install() {
                install
 
        dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so
-       multilib_is_native_abi && gen_usr_ldscript -a gpm
+       gen_usr_ldscript -a gpm
 }
 
 multilib_src_install_all() {

diff --git a/sys-libs/libcap/libcap-2.22-r2.ebuild b/sys-libs/libcap/libcap-2.22-r2.ebuild
index b5e8e317c1e8b056808b1978c340b06a6a3215c1..6fb3f81b4483e2e29f12d2f18712e3378568da04 100644 (file)
--- a/sys-libs/libcap/libcap-2.22-r2.ebuild
+++ b/sys-libs/libcap/libcap-2.22-r2.ebuild
@@ -55,7 +55,7 @@ multilib_src_install() {
        # no configure, needs explicit install line #444724#c3
        emake install DESTDIR="${ED}"
 
-       multilib_is_native_abi && gen_usr_ldscript -a cap
+       gen_usr_ldscript -a cap
 
        rm -rf "${ED}"/usr/$(get_libdir)/security
        if multilib_is_native_abi && use pam; then

diff --git a/sys-libs/libcap/libcap-2.24-r2.ebuild b/sys-libs/libcap/libcap-2.24-r2.ebuild
index 666d3b0ca076ce62c4c79963f5b244600e6c1b20..e43d2e1c2974c85607ae5801f9bbe95911fd464d 100644 (file)
--- a/sys-libs/libcap/libcap-2.24-r2.ebuild
+++ b/sys-libs/libcap/libcap-2.24-r2.ebuild
@@ -58,7 +58,7 @@ multilib_src_install() {
        # no configure, needs explicit install line #444724#c3
        emake install DESTDIR="${ED}"
 
-       multilib_is_native_abi && gen_usr_ldscript -a cap
+       gen_usr_ldscript -a cap
        use static-libs || rm "${ED}"/usr/$(get_libdir)/libcap.a
 
        rm -rf "${ED}"/usr/$(get_libdir)/security

diff --git a/sys-libs/libcap/libcap-2.25.ebuild b/sys-libs/libcap/libcap-2.25.ebuild
index cb6045994283e9e8985c668c342ac384438e6c3f..fc4a23b24203047b890cb6416cb9c49ec80674a6 100644 (file)
--- a/sys-libs/libcap/libcap-2.25.ebuild
+++ b/sys-libs/libcap/libcap-2.25.ebuild
@@ -60,7 +60,7 @@ multilib_src_install() {
        # no configure, needs explicit install line #444724#c3
        emake install DESTDIR="${ED}"
 
-       multilib_is_native_abi && gen_usr_ldscript -a cap
+       gen_usr_ldscript -a cap
        use static-libs || rm "${ED}"/usr/$(get_libdir)/libcap.a
 
        rm -rf "${ED}"/usr/$(get_libdir)/security

diff --git a/sys-libs/ncurses/ncurses-5.9-r3.ebuild b/sys-libs/ncurses/ncurses-5.9-r3.ebuild
index be2a9bd3d4337d34f57b8edbcf6134d469d267e7..0f383d51d91011bd9237a06164877a6c6df3c11d 100644 (file)
--- a/sys-libs/ncurses/ncurses-5.9-r3.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r3.ebuild
@@ -180,7 +180,7 @@ multilib_src_install() {
        fi
 
        # Move libncurses{,w} into /lib
-       multilib_is_native_abi && gen_usr_ldscript -a \
+       gen_usr_ldscript -a \
                ncurses \
                $(usex unicode 'ncursesw' '') \
                $(use tinfo && usex unicode 'tinfow' '') \

diff --git a/sys-libs/ncurses/ncurses-5.9-r4.ebuild b/sys-libs/ncurses/ncurses-5.9-r4.ebuild
index 78abd8707422f389969c51a5042658fa2e3b75b3..ea8dacf4145ebe488aec80d6109232978bbaf74e 100644 (file)
--- a/sys-libs/ncurses/ncurses-5.9-r4.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r4.ebuild
@@ -185,7 +185,7 @@ multilib_src_install() {
        fi
 
        # Move libncurses{,w} into /lib
-       multilib_is_native_abi && gen_usr_ldscript -a \
+       gen_usr_ldscript -a \
                ncurses \
                $(usex unicode 'ncursesw' '') \
                $(use tinfo && usex unicode 'tinfow' '') \

diff --git a/sys-libs/ncurses/ncurses-5.9-r5.ebuild b/sys-libs/ncurses/ncurses-5.9-r5.ebuild
index 33f97d44187d955dfb7a03fe77972ec50f34c3ad..698ed64e95b54ff470e95fcd26f8c61ef4afaf75 100644 (file)
--- a/sys-libs/ncurses/ncurses-5.9-r5.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r5.ebuild
@@ -187,7 +187,7 @@ multilib_src_install() {
        fi
 
        # Move libncurses{,w} into /lib
-       multilib_is_native_abi && gen_usr_ldscript -a \
+       gen_usr_ldscript -a \
                ncurses \
                $(usex unicode 'ncursesw' '') \
                $(use tinfo && usex unicode 'tinfow' '') \