gentoo resync : 28.04.2018

4 files changed, 106 insertions, 8 deletions

diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index d9407030f1ba..63cc0854909f 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -1,4 +1,8 @@
 DIST semodule-utils-2.7.tar.gz 15447 BLAKE2B 44c28ad634ef2ab9e478edb58020547c217a01be0aa75cf3a2432be419efb626f0a5742ba1bcec50ba11c132c207a42c05836eb2749e1f80d4a8142fb9e34a9e SHA512 5c7c2a2224949f50c1119edba90d937363e22af52a38f06525e957b29f5310a3e3444d03980b2f808ce995de0f9fc0a9dca8b6167bbfde29c1a33b9bc786d3c8
+DIST semodule-utils-2.8-rc1.tar.gz 12543 BLAKE2B 99dc8fed5df4a285435aa9c27a38fe2de15d02ea037f0c53b1402940ef7c84c0b6d28237f87adc4482125fc8e7a454042fac62a3a4811de38b55665ec90d9a3d SHA512 489ee453a5c0f6bac754f8056f738c32a815fc055daa2c1fc93c63a5e8a4c5cf017e3d687a4ba432bef0a789ed972c1a90bc56487b4014b486c0bf7ca079c565
+DIST semodule-utils-2.8-rc2.tar.gz 12547 BLAKE2B 68ca9dd5afc640070f6a5b6e7a30049e7802aeb7bf5239e59ff8a9aaa9825dc04ccf131022d604f858cd8f7adefa63715dbd95ceda95ca40765556b916b282db SHA512 31844fcf4389cd20b9164c6a11fdf914e51dc27170e5e083929376840e1135c3193e00a4abdcc24f99b98b815371f63167ade9d6de483f3ae3fdf7b04f76cb2b
 EBUILD semodule-utils-2.7.ebuild 1123 BLAKE2B b94f20dedd85eabdb4cc9ea37ed8060ce68f044e3a463f1d255cdbcda0e0187686d8d3c2b6be0f0339eb034a04e2c42050eb1633ac0e9546f4436e4585a34e4d SHA512 66d018f1a8a2c16f6083972fb80d14806cd2671ab8150fd676fd164d21bfef12d43eb70b1f1e99a972f15cc19ed0c78d518788a79ca8805f9ce31dae9d10a38d
-EBUILD semodule-utils-9999.ebuild 1125 BLAKE2B 26c0fc798d8d91058d64aa5d165ea091e0c9a3fe0a0b3c0c04225b0b7d2b2fbfde874c8312665304e68a1ecd975a269fd61b1feb652b7ac58990366645a4d141 SHA512 47d27f5e250d9f48cb4ea0fb36c09a3cdf67787d48361d7836d8d6ad71ba1006f0f147c7f6d6d8f1a7a93cb3957dc0c280dad3193e63ef1ab3e934a236311183
+EBUILD semodule-utils-2.8_rc1.ebuild 999 BLAKE2B aa472a9c8c3c0d38578e26dfeaabb08147a2dedd2de3be97689c97a287d0146de69affaeb84c5b01489c9825e3b66712d741db2f949f8807141ad3128bb703bf SHA512 099d9b7c0b2b5c98b0ddfbb6b9e4191b3cb84664291e3c639b231de3b2d17718b82e8e0cd7ed7016b7255a8df60976213124cf868665c10369945b76b4dcd150
+EBUILD semodule-utils-2.8_rc2.ebuild 999 BLAKE2B 20b0b55cb4b059c56a3ecf1c3e48af61f1b0cb069fd26432d09f6e32c529eb25b5b9bdd80101ce151cd7763f27b788df112255b48f4471aa184d6b88e486367c SHA512 9420041471418f1ee38ec8c2e854010b6856d0bdb9eee79e43406a9bd882bd89062e6eb8d3e44d588d48b2ac6f71d8a50831c803726e7c5715ca1d7608b1bf19
+EBUILD semodule-utils-9999.ebuild 999 BLAKE2B 20b0b55cb4b059c56a3ecf1c3e48af61f1b0cb069fd26432d09f6e32c529eb25b5b9bdd80101ce151cd7763f27b788df112255b48f4471aa184d6b88e486367c SHA512 9420041471418f1ee38ec8c2e854010b6856d0bdb9eee79e43406a9bd882bd89062e6eb8d3e44d588d48b2ac6f71d8a50831c803726e7c5715ca1d7608b1bf19
 MISC metadata.xml 521 BLAKE2B 5785152e6b947a78aa09c12816bdee5f0c93e718d0a3cb9244b1b769dab19bb057db91c49179990d06e8cfc6bac692b5223ddf2137ea043a13ee58c41b2ade1d SHA512 e15b382ddf7059ff9c82887d636522dcc993e580e715d4a822106ed27c7fdb75b32e96c8c32a34cbdbbef4ad0f9c49bfb7c7420ea97852fa82e7740c4044a689
diff --git a/sys-apps/semodule-utils/semodule-utils-2.8_rc1.ebuild b/sys-apps/semodule-utils/semodule-utils-2.8_rc1.ebuild
new file mode 100644
index 000000000000..821f4f48c483
--- /dev/null
+++ b/sys-apps/semodule-utils/semodule-utils-2.8_rc1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+MY_RELEASEDATE="20180419"
+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)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		install
+}
diff --git a/sys-apps/semodule-utils/semodule-utils-2.8_rc2.ebuild b/sys-apps/semodule-utils/semodule-utils-2.8_rc2.ebuild
new file mode 100644
index 000000000000..d814b41b424d
--- /dev/null
+++ b/sys-apps/semodule-utils/semodule-utils-2.8_rc2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+MY_RELEASEDATE="20180426"
+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)"
+}
+
+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 67891e9cf812..d814b41b424d 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20170804"
+MY_RELEASEDATE="20180426"
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
 
@@ -40,14 +40,10 @@ src_prepare() {
 }
 
 src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)"
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
 	emake DESTDIR="${D}" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
 		install
 }