gentoo resync : 29.05.2018

6 files changed, 6 insertions, 68 deletions

diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index bb2aa3175b90..5020d88fa5b1 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,8 +1,5 @@
-AUX setools-3.3.8-no-check-file.patch 558 BLAKE2B 2f1fd260f579e39307ea84e857b6a733aef42155cfcaef42d3326318f61f07b24c559ddefa062bb5dc22de61016db03ba2aaddc21bf456f3cb696daf104aa752 SHA512 25051dcbb94ddeed623aba598235cb1caaedbb7071dd997c58575ed3cc8266c4421cf070d8f10d5ec6804167bef969fab7227a0241daf7f92e30e1bff0d89080
-AUX setools-3.3.8-policy-max.patch 1051 BLAKE2B 4311df1a6918dc4cf1e339702cc8b5c337fa440495282d5b1d9c7a151f5e0998097716dbe77c91c84bdf76f4057ad73e6026cebf665addef2117a7700d57c1e1 SHA512 9eacd76d450b6e68d85f14c4d38cb9370a7cd435610c209d83063b3ddc7bb45f8bd75b1aa8573991e021d4af4205646465b3c2b19ac89296bb7e43147eb0775b
-AUX setools-4.0.1-remove-gui.patch 1031 BLAKE2B 4eea567961c1a180b85dfecd00f174be5440d61e587fa2e8220819d91e930d344508f1cdba68e4685e65332e351831808b70d6d19f2bfec04364056cd5ef2c55 SHA512 982c0cd43bdf9473df5dd9584d199bbf1bc71bfee284a2f4e7e800c877bb62bbb6aca03ae3099e481c0538bf3f12d425ca23e19763b1b58c647e9749925283ef
 AUX setools-4.1.1-remove-gui.patch 890 BLAKE2B 70c7a7fb4b6bb31d8735d4b938ff848000c3181e590e557413011ebd5db650f79dfad270f6506128ef9971975ec2b26323b18f793bb914759449679bc34f388c SHA512 c30d7fa3624164d3ec5574b1ae36cc896fb5132ed875f232e9e84cf080e7081dadce61f6d88b55aefa45e417a081622acf7aa2d9f10406d23be7646905dfb3e6
 DIST setools-4.1.1.tar.gz 461649 BLAKE2B a753718aa6a5de889ba7a2eea921340061edf1bcb0b572a365e858949a92d2f8a92a876be2e4bc539d85fa6029511ab6afabfbe8138cdb5a73b587a9b58551bb SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04
-EBUILD setools-4.1.1.ebuild 1500 BLAKE2B 53b4c6594e89582af55e7e29894b413c44a7dad7702931175155dd5e20f77d75519617ca2e3ada157aadc35a19e54cb7c3d81d7e7e6ee490d0351f2aac552ed2 SHA512 2d0b9aa87f79464e348981673d2a5bc6ac8ab2b7853496bfd7b03c0ab67a1cda77f1cad1c0d80e86097634f38192897f075eb35ea94712e6f316667f4dfabd28
-EBUILD setools-9999.ebuild 1344 BLAKE2B 1ece52a683c8d99a436655acd639ac78f81e7ecc7a08730ea87bd8dcea8379738d9fe4ae1926ffefb8726f2d080ee40135f5c649fe8e8a4a911990dc1a7694d1 SHA512 c7507642de4d6a100982d6da702a47fc6a47ca9f106b248aac8c158be0fc77d1a9d4af8727f531e80570710f94260a68702f8a4892970b4b76a97ba9bc40fb81
+EBUILD setools-4.1.1.ebuild 1488 BLAKE2B 462d30b33838dc2c548baff9bb32ca2f978df8a62d5a6e936dfc3bab4dd2522513a90635d64244c6750587cb061380a92a4158bc8e38bddcd2065987463ce9ca SHA512 074263f51282f81cd723ad261c286d46a93a8e13be2fec152adf61a8618685ad43460751d152077d22f395ed854d3362d49c47476ff1fc8b92fe1b62d7351fe5
+EBUILD setools-9999.ebuild 1490 BLAKE2B 1ee40697229d0164b92c75242a8659dd6abef5e0462b9d8154c98f75271a42062bf04cc525a14a4a2a243623f5b5c962c31527928e134f3ba5d2ce7f9bee593c SHA512 d3dd0829d41ed81f927409c0fb1c86077004f58b5853c419b887febe562c36d6dbdc7f9c10d17c286aa6bad71c9a49043050ebb981115242cdad6be3a6200d36
 MISC metadata.xml 403 BLAKE2B 954bfb344e48933f43c746ed626da3851b9e887b9d1c68541fa97356992c2e80f0626198d2170b431d32489347bb6e5ee46d2577a5d672940892ec5d5fd87e4e SHA512 be645abfaf1149e2f2a9b7f0613b61f015df81a16bc6dde593513aa2ba7b4a9a8fba65520b53a2511ba65c022258f48bcd2aed3f85c273a35c94359e358a8fa6
diff --git a/app-admin/setools/files/setools-3.3.8-no-check-file.patch b/app-admin/setools/files/setools-3.3.8-no-check-file.patch
deleted file mode 100644
index 31848e9564b8..000000000000
--- a/app-admin/setools/files/setools-3.3.8-no-check-file.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-there's no real need to run AC_CHECK_FILE to see if a file exists.  if the
-static link fails later on, then the static lib didn't exist.  this also
-breaks cross-compiling.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -448,8 +448,6 @@
-               sepol_srcdir="")
- if test "x${sepol_srcdir}" = "x"; then
-    sepol_srcdir=${sepol_devel_libdir}
--   AC_CHECK_FILE([${sepol_srcdir}/libsepol.a],,
--      AC_MSG_ERROR([make sure libsepol-static is installed]))
- else
-    AC_MSG_CHECKING([for compatible sepol source tree])
-    sepol_version=${sepol_srcdir}/VERSION
diff --git a/app-admin/setools/files/setools-3.3.8-policy-max.patch b/app-admin/setools/files/setools-3.3.8-policy-max.patch
deleted file mode 100644
index cf6917a671d1..000000000000
--- a/app-admin/setools/files/setools-3.3.8-policy-max.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-trying to run compiled code fails when cross-compiling.
-probe the value using the preprocessor instead.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -621,21 +621,8 @@
- 	        sepol_new_errcodes="yes",
-                 sepol_new_errcodes="no")
- 
--AC_RUN_IFELSE(
--   [AC_LANG_SOURCE([
--#include <sepol/policydb/policydb.h>
--#include <stdio.h>
--#include <stdlib.h>
--int main(void) {
--    FILE *f = fopen("conftest.data", "w");
--    if (f != NULL && fprintf(f, "%d", POLICYDB_VERSION_MAX) > 0) {
--       fclose(f);
--       exit(EXIT_SUCCESS);
--    }
--    exit(EXIT_FAILURE);
--}])],
--    sepol_policy_version_max=`cat conftest.data`,
--    AC_MSG_FAILURE([could not determine maximum libsepol policy version]))
-+printf "#include <sepol/policydb/policydb.h>\nPOLICYDB_VERSION_MAX\n" > conftest.c
-+sepol_policy_version_max=`${CPP} -E -P ${CPPFLAGS} conftest.c | tail -1`
- AC_DEFINE_UNQUOTED(SEPOL_POLICY_VERSION_MAX, ${sepol_policy_version_max}, [maximum policy version supported by libsepol])
- CFLAGS="${sepol_save_CFLAGS}"
- CPPFLAGS="${sepol_save_CPPFLAGS}"
diff --git a/app-admin/setools/files/setools-4.0.1-remove-gui.patch b/app-admin/setools/files/setools-4.0.1-remove-gui.patch
deleted file mode 100644
index bb93ff269b83..000000000000
--- a/app-admin/setools/files/setools-4.0.1-remove-gui.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- setools-4.0.1/setup.py.orig	2016-05-22 19:50:02.586000000 +0200
-+++ setools-4.0.1/setup.py	2016-05-22 19:50:56.107000000 +0200
-@@ -163,11 +163,10 @@
-                 'build_lex': LexCommand,
-                 'build_ext': BuildExtCommand,
-                 'build_qhc': QtHelpCommand},
--      packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'],
--      scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
-+      packages=['setools', 'setools.diff', 'setools.policyrep'],
-+      scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
-       data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1") ),
--                  (join(sys.prefix, 'share/setools'), glob.glob("data/*.ui") +
--                                                      ["data/perm_map", "qhc/apol.qhc"] )],
-+                  (join(sys.prefix, 'share/setools'), ["data/perm_map"] ),],
-       ext_modules=ext_py_mods,
-       test_suite='tests',
-       license='GPLv2+, LGPLv2.1+',
diff --git a/app-admin/setools/setools-4.1.1.ebuild b/app-admin/setools/setools-4.1.1.ebuild
index 5142d939a869..560eee70d249 100644
--- 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 bc6d48e45d58..d0836619d13f 100644
--- 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