app-admin/setools: respect libdir when cross compiling

Bug: https://bugs.gentoo.org/638286
Package-Manager: Portage-2.3.40, Repoman-2.3.9

diff --git a/app-admin/setools/setools-4.1.1.ebuild b/app-admin/setools/setools-4.1.1.ebuild
index 5142d939a86960be124c45dfa250d34a712626e4..560eee70d249c238eb0864e3c7ebde026017db93 100644 (file)
--- a/app-admin/setools/setools-4.1.1.ebuild
+++ b/app-admin/setools/setools-4.1.1.ebuild
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 
 python_prepare_all() {
        sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
-       sed -i "s@^base_lib_dirs = .*@base_lib_dirs = ['${ROOT:-/}usr/lib','${ROOT:-/}usr/lib64']@g" "${S}"/setup.py || \
+       sed -i "s@^base_lib_dirs = .*@base_lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@g" "${S}"/setup.py || \
                die "failed to set base_lib_dirs"
 
        use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch )

diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index bc6d48e45d582b10b6fe2d4a1d5bee329862243b..d0836619d13f1c39acf092ad3240491c9cdc9f76 100644 (file)
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
        EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
 else
        SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~amd64 ~x86"
+       KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
@@ -44,6 +44,8 @@ DEPEND="${RDEPEND}
 
 python_prepare_all() {
        sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
+       sed -i "s@^base_lib_dirs = .*@base_lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@g" "${S}"/setup.py || \
+               die "failed to set base_lib_dirs"
 
        use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch )
        distutils-r1_python_prepare_all