gentoo resync : 18.08.2019

4 files changed, 2 insertions, 108 deletions

diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index bd78e342ccfe..25c89219d13f 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -1,10 +1,6 @@
-DIST semodule-utils-2.7.tar.gz 15447 BLAKE2B 44c28ad634ef2ab9e478edb58020547c217a01be0aa75cf3a2432be419efb626f0a5742ba1bcec50ba11c132c207a42c05836eb2749e1f80d4a8142fb9e34a9e SHA512 5c7c2a2224949f50c1119edba90d937363e22af52a38f06525e957b29f5310a3e3444d03980b2f808ce995de0f9fc0a9dca8b6167bbfde29c1a33b9bc786d3c8
 DIST semodule-utils-2.8.tar.gz 12536 BLAKE2B 93a2f8fee887eba72b009071549a687fe86045344979e31493b3f17041ddf3f31c29ea3c754a31f6029847798dfe26d63b02fadc1042bc68aa414050b283d208 SHA512 13d79a22115f5448dafc5202dc3dec66b9ad826051d61d7c126defe823407959511db35713d97c7dfe9e79de96193fec91a10b98c13743e06a1213f5734f4ae7
-DIST semodule-utils-2.9-rc1.tar.gz 12548 BLAKE2B 62a4413f23ee8e30a9d60c00814425789362da4b056b03f5b27462534759d08f22c44b30a4d25c69bb5bd7447b5ed9e8cc89efb102e43c437adb4bf18f9a3540 SHA512 2e03dd8c23ad1b2f2492194ccd4a6fc39d4ee2d513778264b794011121c3b6eb896dab4a2236cf3934d1e200ad1f86ba6223bb6ac7aa81b1fd4c2a700dc7081a
 DIST semodule-utils-2.9.tar.gz 14259 BLAKE2B f72630c520504596171ac6f678b1fde2bb8482b620f0d8f6374c59b85d634ee8c407e3e4b268dae4d6cecfa2749b26f8808dd56f7c5391e7d1ba11f4a8a789e5 SHA512 688f1fcb34042b837019302debda76847691657709130b99bf937a85774a0ae69d789ee82b0633a4d2dc661dc6d0a1706a878ac681317df2abe68418bec3f952
-EBUILD semodule-utils-2.7.ebuild 1123 BLAKE2B b94f20dedd85eabdb4cc9ea37ed8060ce68f044e3a463f1d255cdbcda0e0187686d8d3c2b6be0f0339eb034a04e2c42050eb1633ac0e9546f4436e4585a34e4d SHA512 66d018f1a8a2c16f6083972fb80d14806cd2671ab8150fd676fd164d21bfef12d43eb70b1f1e99a972f15cc19ed0c78d518788a79ca8805f9ce31dae9d10a38d
 EBUILD semodule-utils-2.8.ebuild 997 BLAKE2B 90d4e8740267ebc4f9e6bc3453dbe70ebbab54fb9025665c79e46df829fe8df4a754beafab46ad13b32273fa4dd527014ad47692e4858eff85672391dcd9c02d SHA512 689ec194b0852d3eb75f0f618a1cf4db0927718d408e4040a5240b874548169d326ec17be7233f78313ad4c5c8f12e5c02428aaccef12170e8ba3efa2afefdd3
-EBUILD semodule-utils-2.9.ebuild 979 BLAKE2B 883ffc075aab31c03f87630580fc008ebf5849a0ade11e16a0c73a275da09b55d4fd146f49eb817434fca8b57e5ba2922ee3b97a4491662ec22cc57331958167 SHA512 f1e4f5909b1b0781e7573139e3f80f46694bbfefab40bc12357eadc51624e4e3b56de4a58bc5fd397567787957492e17be79af9ab7835babbef02125accc52b8
-EBUILD semodule-utils-2.9_rc1.ebuild 979 BLAKE2B cc4a3f4f9ace03e8fea8d0555fa5cd21f0c5943155235f687a908f694b83199eb911e6ee93511b219cc48a63a96e139cb0cea140ea3b066c117830637bce189c SHA512 eec40e9327cef1e4689d0a618a876be3243665904a836cef064527cf820d6f74b1c1ee52211e6f8b02714f4a1bbafd3c1b10ff49ddcc8a49b9d07696dba99768
+EBUILD semodule-utils-2.9.ebuild 977 BLAKE2B deb8b71bd36deb5b50e05578d31ede94a40c5e8c81070af3b55c83f82e17e5cd320a09ab6816a1aae945a431d3827773150c14bbe2b32743e59f544ec6dfb678 SHA512 4d817a11754753080b233110e1f24fa832427fb366ba39462959e197f724064b335e848aa47b1fcbce235627b7691b61c527e5b7e7e8410d81c0e2c84f811701
 EBUILD semodule-utils-9999.ebuild 979 BLAKE2B 883ffc075aab31c03f87630580fc008ebf5849a0ade11e16a0c73a275da09b55d4fd146f49eb817434fca8b57e5ba2922ee3b97a4491662ec22cc57331958167 SHA512 f1e4f5909b1b0781e7573139e3f80f46694bbfefab40bc12357eadc51624e4e3b56de4a58bc5fd397567787957492e17be79af9ab7835babbef02125accc52b8
 MISC metadata.xml 521 BLAKE2B 5785152e6b947a78aa09c12816bdee5f0c93e718d0a3cb9244b1b769dab19bb057db91c49179990d06e8cfc6bac692b5223ddf2137ea043a13ee58c41b2ade1d SHA512 e15b382ddf7059ff9c82887d636522dcc993e580e715d4a822106ed27c7fdb75b32e96c8c32a34cbdbbef4ad0f9c49bfb7c7420ea97852fa82e7740c4044a689
diff --git a/sys-apps/semodule-utils/semodule-utils-2.7.ebuild b/sys-apps/semodule-utils/semodule-utils-2.7.ebuild
deleted file mode 100644
index a0ef418401f7..000000000000
--- a/sys-apps/semodule-utils/semodule-utils-2.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-MY_RELEASEDATE="20170804"
-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://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${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}
-	!<sys-apps/policycoreutils-2.7_pre"
-
-src_prepare() {
-	default
-
-	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
-		install
-}
diff --git a/sys-apps/semodule-utils/semodule-utils-2.9.ebuild b/sys-apps/semodule-utils/semodule-utils-2.9.ebuild
index bf80b21dfc42..4a40ba8b6bb9 100644
--- a/sys-apps/semodule-utils/semodule-utils-2.9.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-2.9.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	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"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/semodule-utils/semodule-utils-2.9_rc1.ebuild b/sys-apps/semodule-utils/semodule-utils-2.9_rc1.ebuild
deleted file mode 100644
index 2db179e63537..000000000000
--- a/sys-apps/semodule-utils/semodule-utils-2.9_rc1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-MY_RELEASEDATE="20190125"
-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}
-	!<sys-apps/policycoreutils-2.7_pre"
-
-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
-}