gentoo resync : 28.04.2018

4 files changed, 118 insertions, 9 deletions

diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index db83fe034750..5e6ab9786878 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -1,5 +1,9 @@
 AUX mcstransd.init 659 BLAKE2B ef74c438407efa47a066a18a1ba8d7cad2b13240fbf39d83887dda37a9c2c53c49a27f4ebe00451baf01be59fcd9ed4e47d095e925387fd2032e4e822672d466 SHA512 de97bb70286bd2b772ac6e98346ffcb96dcad95925ebb3bb44e6ffd4cf22b88d27aea103c89973f0fcc6334c98a9399d077e9cd52eaf7da70c5fce3da96ef3a3
 DIST mcstrans-2.7.tar.gz 41137 BLAKE2B 83f195dee4bf61c36f65b009cf40dd58459e01d75222fbd7fe15c61ae7942315373a4a0e9a1cd0a654efcf471c3c7166f76c87837085ef6a4136567d4b52fc73 SHA512 2e59f26fad3423a0c8e2ea49d619f99022c72e1aebb00e842defb4fad56f187f9ed0f069ef78d3b209ba76f5ebdcba1668f51ff881b753dada5716ee942519b3
+DIST mcstrans-2.8-rc1.tar.gz 41385 BLAKE2B 7aa05d9ec7230e5a2c0b5555368c46af31a5f92318300a07db3242ae18c7855225dd399f2874c2ba09ecbbebcdec686c20f604c2a86e104900b1eaaf50460a44 SHA512 6927d3b06012fb351d04558f26e602c084058911ca095891d49286976cc9f96446476057c09c044564eba25aca920bc99f2218182551a957d0dac6ce1a9bc2db
+DIST mcstrans-2.8-rc2.tar.gz 41387 BLAKE2B ddded091b0167ae6c465d7459a70da3e5567e1a548992c206785dc99f8c23568dfd00575ecdc5518d2825a88a8199fca42798a912a0f506a51c6919b2dca865d SHA512 3b4cb62eece6db434272a3d0c30b2b8b982793008aad6f02b73dd88822ae50e91aa422d972c92f58d3e132a1bc6f871924ba144078d26c72a2f95098cf3a20f9
 EBUILD mcstrans-2.7.ebuild 1217 BLAKE2B 3b6414b7e668a2d7ec5c7ee5bb0c5d0b859f2360ab88fc88db0c1c4a7f06f539e5b881b02035aea89cd4e75e98e7bd6a42d035d1bd3dfb0f810b1191477b454b SHA512 d26037fd0d2f2ef722a21da5ba974410a5441608e32fb35d8674ebae48dd2eb485b30af50d7f54a3d3181b8c7af838e03d744336181f8bd3b8d8b8a47a906250
-EBUILD mcstrans-9999.ebuild 1219 BLAKE2B 2078a6f09e6740bc72b447017bbba376424822b1e656b67c251c52f96a26362064e45618ce075ad0df6e7e502d7e22053bbbbf1ce418b1498f287a028f0ceb4d SHA512 12506c47944a8c532374d87be5f8a6ff7c9b7b7d71a9a22571852866533cbd1e8fa4f9392dd14a40449acce30094a1b9848fea7e1f6226ad2249c132b512483a
+EBUILD mcstrans-2.8_rc1.ebuild 1134 BLAKE2B b3b2532f024a638a7438db44a94a4da3627b769a748f5e288422a75abf88757b4812da9d4baf3a5ae84c7d68cc53cf7e9670e2942bc34359fe5bdaf85601b294 SHA512 9e94454233c349e043e4a3260b01e08de119e4b9f8d45a5bc3e8d4fe26778e75d38d41ee493e9bd44aeae65fcd0f8bb57b18245e45ae9412d58b2d85308fff4a
+EBUILD mcstrans-2.8_rc2.ebuild 1134 BLAKE2B cdafa28f1c27df99217f2a019b56a29b7f7539a6da269573026d28a3fa422b8b256831423e3f5c9010a102c52b5694cec998905ab9e88fc777b7d1993a26edb8 SHA512 3f3d0f2a3ca3d07fc54529860e2c3dee67d32f289d8d561d12e4d2257921163b1f002634458d8f73d577e7f0d417af69c5a20c0e8c3a2c97626ea3f4785d038b
+EBUILD mcstrans-9999.ebuild 1134 BLAKE2B cdafa28f1c27df99217f2a019b56a29b7f7539a6da269573026d28a3fa422b8b256831423e3f5c9010a102c52b5694cec998905ab9e88fc777b7d1993a26edb8 SHA512 3f3d0f2a3ca3d07fc54529860e2c3dee67d32f289d8d561d12e4d2257921163b1f002634458d8f73d577e7f0d417af69c5a20c0e8c3a2c97626ea3f4785d038b
 MISC metadata.xml 451 BLAKE2B bf8e87dcdd8c3dfbb33728600b986bf96e2243a9e9916db87ae4b4d69508f6397915929b24c4b7381d711a7754987402f0abd8ee8217621479d6970c91922189 SHA512 9d1f5669661c1fe232b18517a954640350c8f0c606d3ca91e429f53790532bfc9b73d7c18e575c4055d3ea7ba4a5ade632d1814700ed1d3d000fe5ebfa065744
diff --git a/sys-apps/mcstrans/mcstrans-2.8_rc1.ebuild b/sys-apps/mcstrans/mcstrans-2.8_rc1.ebuild
new file mode 100644
index 000000000000..06e7b08fbd9c
--- /dev/null
+++ b/sys-apps/mcstrans/mcstrans-2.8_rc1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+MY_RELEASEDATE="20180419"
+
+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 context translation to human readable names"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:=
+	dev-libs/libpcre:=
+	>=sys-libs/libcap-1.10-r10:="
+
+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() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rf "${D}/etc/rc.d" || die
+
+	newinitd "${FILESDIR}/mcstransd.init" mcstransd
+}
diff --git a/sys-apps/mcstrans/mcstrans-2.8_rc2.ebuild b/sys-apps/mcstrans/mcstrans-2.8_rc2.ebuild
new file mode 100644
index 000000000000..79dc30ee803c
--- /dev/null
+++ b/sys-apps/mcstrans/mcstrans-2.8_rc2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+MY_RELEASEDATE="20180426"
+
+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 context translation to human readable names"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:=
+	dev-libs/libpcre:=
+	>=sys-libs/libcap-1.10-r10:="
+
+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() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rf "${D}/etc/rc.d" || die
+
+	newinitd "${FILESDIR}/mcstransd.init" mcstransd
+}
diff --git a/sys-apps/mcstrans/mcstrans-9999.ebuild b/sys-apps/mcstrans/mcstrans-9999.ebuild
index 2f7feeef0119..79dc30ee803c 100644
--- a/sys-apps/mcstrans/mcstrans-9999.ebuild
+++ b/sys-apps/mcstrans/mcstrans-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"
 
 MY_P="${P//_/-}"
 IUSE=""
@@ -41,15 +41,12 @@ src_prepare() {
 }
 
 src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)"
+	tc-export CC
+	default
 }
 
 src_install() {
-	emake DESTDIR="${D}" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		install
+	emake DESTDIR="${D}" install
 
 	rm -rf "${D}/etc/rc.d" || die