commit:     61019ed248a31c0a67d4d87e376e4aa889df930e
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  2 07:36:07 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jul  2 07:37:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61019ed2

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 <AT> gentoo.org>

 .../{util-linux-2.34.ebuild => util-linux-2.34-r1.ebuild}         | 8 ++++----
 sys-apps/util-linux/util-linux-9999.ebuild                        | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

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 efc59ae7357..b15e6ad1a43 100644
--- 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 efc59ae7357..b15e6ad1a43 100644
--- 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() {

Reply via email to