gentoo resync : 16.09.2020

4 files changed, 56 insertions, 12 deletions

diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index 3af184363e3f..0fd63ec0ea35 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -1,6 +1,8 @@
 DIST semodule-utils-2.9.tar.gz 14259 BLAKE2B f72630c520504596171ac6f678b1fde2bb8482b620f0d8f6374c59b85d634ee8c407e3e4b268dae4d6cecfa2749b26f8808dd56f7c5391e7d1ba11f4a8a789e5 SHA512 688f1fcb34042b837019302debda76847691657709130b99bf937a85774a0ae69d789ee82b0633a4d2dc661dc6d0a1706a878ac681317df2abe68418bec3f952
 DIST semodule-utils-3.0.tar.gz 14263 BLAKE2B 119f40b34184e2cb0719e6a34ffb026f23c172f74d8ca3812220785381fabc5c3761865ec3b211f03f5c96b9ae0081341a661c2be78198171b09c99b37bb0716 SHA512 004e8f02f7e7e6f016b2b5a1a7720a87409d77d0040f7df830cf73808c9f8e3d87b41a7cea273420909971ce8bcc6540d5a46bd25be8c032b12257b4861e1769
+DIST semodule-utils-3.1.tar.gz 14257 BLAKE2B c8c9a1ce7c9c4f53b1f4c728d16b149fdc284f4cff8b4fce0cb59b77d37d6d7e9bf2102c7177c4eaf94677af6147e42d8d0bd55c0bf3a358968d0162d5a6c65a SHA512 b92794bbfbce5834ee7f62fddb40b5506e9291e8fa7c5d669b2e281089b8f8dc40c4522ea287ac5deffdaee751442ba8e691e2ac45fdd378b60d5d6b2527d157
 EBUILD semodule-utils-2.9.ebuild 977 BLAKE2B deb8b71bd36deb5b50e05578d31ede94a40c5e8c81070af3b55c83f82e17e5cd320a09ab6816a1aae945a431d3827773150c14bbe2b32743e59f544ec6dfb678 SHA512 4d817a11754753080b233110e1f24fa832427fb366ba39462959e197f724064b335e848aa47b1fcbce235627b7691b61c527e5b7e7e8410d81c0e2c84f811701
 EBUILD semodule-utils-3.0.ebuild 977 BLAKE2B d36ef3f0bdd532b05eb8c204ff1cd8c11174b85bd0469aec8f420e9874f35b6b7bdeb482c2021f6e15bd7ad826c6483c991e7d0ac6eace075eab8f57be0281c0 SHA512 35159c6ba4ead2c0909f86cc45f8995928565dd1e36b6bc513cf73d273188c6e93689724104991c9a46c6cfebea6bee33c5776057b8ad08016297c72906f4601
-EBUILD semodule-utils-9999.ebuild 979 BLAKE2B 4d791f07229bcbd588085aabb6217a817542805a4e1a9dcf3481202cddd7fa165c8bd6572c685ff96626320af65463452fcc19e14beec7b1d64634578b4a90e6 SHA512 8ba50ac799bd408a9bc0d4e896a14bcb90aee3469695dfb108b70607e885c6a2c488b9c700f7b9d8e3866149721f61f6b8505d7a3fe913f664ac8dfcab1e8f24
-MISC metadata.xml 521 BLAKE2B 5785152e6b947a78aa09c12816bdee5f0c93e718d0a3cb9244b1b769dab19bb057db91c49179990d06e8cfc6bac692b5223ddf2137ea043a13ee58c41b2ade1d SHA512 e15b382ddf7059ff9c82887d636522dcc993e580e715d4a822106ed27c7fdb75b32e96c8c32a34cbdbbef4ad0f9c49bfb7c7420ea97852fa82e7740c4044a689
+EBUILD semodule-utils-3.1.ebuild 939 BLAKE2B bf2a3ee661d25124602ddefce76746570ebc974e6b8d7b28c78e0ba2b5144de528c7db7ad15afdcf6704ed86916535a6476aeca13d03aba498c3343b9df1e941 SHA512 20ae6289b23580918bac2b032357db24b847c771d290ada9391d66e5fc648fb57bd604b19d890edb7b6867cf840d3cb6ae34b7698d8dddf97b953c5a93df154e
+EBUILD semodule-utils-9999.ebuild 939 BLAKE2B bf2a3ee661d25124602ddefce76746570ebc974e6b8d7b28c78e0ba2b5144de528c7db7ad15afdcf6704ed86916535a6476aeca13d03aba498c3343b9df1e941 SHA512 20ae6289b23580918bac2b032357db24b847c771d290ada9391d66e5fc648fb57bd604b19d890edb7b6867cf840d3cb6ae34b7698d8dddf97b953c5a93df154e
+MISC metadata.xml 400 BLAKE2B 688a9292eb5fc938ae1aef1e62cb46f7cfb119f8d8e784e03c7d3f0d13d48b5120037195d1aac27080b6768a28fa51c209a6928ad0b84aa3802bda55d66f94be SHA512 737d2e097f9b98132e1a75d42c95aaf8ec51be2c4da9898f33b7b07ef519bb846bfc36836c33fc3ddfc716fac06c610475149b5923a684a249f4edf6cc13a147
diff --git a/sys-apps/semodule-utils/metadata.xml b/sys-apps/semodule-utils/metadata.xml
index 35a209da7acf..855cbdbdb7fa 100644
--- a/sys-apps/semodule-utils/metadata.xml
+++ b/sys-apps/semodule-utils/metadata.xml
@@ -5,9 +5,6 @@
 		<email>selinux@gentoo.org</email>
 		<name>SELinux Team</name>
 	</maintainer>
-	<longdescription>
-		semodule-utils are utilities to create and link SELinux policy module packages.
-	</longdescription>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:redhat:policycoreutils</remote-id>
 		<remote-id type="github">SELinuxProject/selinux</remote-id>
diff --git a/sys-apps/semodule-utils/semodule-utils-3.1.ebuild b/sys-apps/semodule-utils/semodule-utils-3.1.ebuild
new file mode 100644
index 000000000000..db1d166cceb3
--- /dev/null
+++ b/sys-apps/semodule-utils/semodule-utils-3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_RELEASEDATE="20200710"
+SEPOL_VER="${PV}"
+SELNX_VER="${PV}"
+
+MY_P="${P//_/-}"
+IUSE=""
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="SELinux policy module utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${SEPOL_VER}:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}
diff --git a/sys-apps/semodule-utils/semodule-utils-9999.ebuild b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
index dfe7c8bdc466..db1d166cceb3 100644
--- a/sys-apps/semodule-utils/semodule-utils-9999.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20191204"
+MY_RELEASEDATE="20200710"
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
 
@@ -30,8 +30,7 @@ SLOT="0"
 
 DEPEND=">=sys-libs/libsepol-${SEPOL_VER}:="
 
-RDEPEND="${DEPEND}
-	!<sys-apps/policycoreutils-2.7_pre"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
@@ -44,6 +43,5 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" \
-		install
+	emake DESTDIR="${D}" install
 }