sys-apps/util-linux: move gen_usr_ldscript after python install again

Closes: https://bugs.gentoo.org/689116
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/sys-apps/util-linux/util-linux-2.34.ebuild b/sys-apps/util-linux/util-linux-2.34-r1.ebuild
similarity index 100%
rename from sys-apps/util-linux/util-linux-2.34.ebuild
rename to sys-apps/util-linux/util-linux-2.34-r1.ebuild
index efc59ae7357554e9b7cf8752c7547f28ac68c1a5..b15e6ad1a438cd1bbf66bda8de9e4523418a5da1 100644 (file)
--- a/sys-apps/util-linux/util-linux-2.34.ebuild
+++ b/sys-apps/util-linux/util-linux-2.34-r1.ebuild
@@ -243,14 +243,14 @@ python_install() {
 multilib_src_install() {
        emake DESTDIR="${D}" install
 
+       if multilib_is_native_abi && use python; then
+               python_foreach_impl python_install
+       fi
+
        if multilib_is_native_abi && use userland_GNU; then
                # need the libs in /
                gen_usr_ldscript -a blkid fdisk mount smartcols uuid
        fi
-
-       if multilib_is_native_abi && use python; then
-               python_foreach_impl python_install
-       fi
 }
 
 multilib_src_install_all() {

diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index efc59ae7357554e9b7cf8752c7547f28ac68c1a5..b15e6ad1a438cd1bbf66bda8de9e4523418a5da1 100644 (file)
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -243,14 +243,14 @@ python_install() {
 multilib_src_install() {
        emake DESTDIR="${D}" install
 
+       if multilib_is_native_abi && use python; then
+               python_foreach_impl python_install
+       fi
+
        if multilib_is_native_abi && use userland_GNU; then
                # need the libs in /
                gen_usr_ldscript -a blkid fdisk mount smartcols uuid
        fi
-
-       if multilib_is_native_abi && use python; then
-               python_foreach_impl python_install
-       fi
 }
 
 multilib_src_install_all() {