gentoo resync : 16.09.2020

5 files changed, 61 insertions, 10 deletions

diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index 51999c96c7a9..434831b493d3 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -1,7 +1,9 @@
 AUX mcstransd.init 659 BLAKE2B ef74c438407efa47a066a18a1ba8d7cad2b13240fbf39d83887dda37a9c2c53c49a27f4ebe00451baf01be59fcd9ed4e47d095e925387fd2032e4e822672d466 SHA512 de97bb70286bd2b772ac6e98346ffcb96dcad95925ebb3bb44e6ffd4cf22b88d27aea103c89973f0fcc6334c98a9399d077e9cd52eaf7da70c5fce3da96ef3a3
 DIST mcstrans-2.9.tar.gz 44451 BLAKE2B e73121351a5d3a09c4754cd0fc6bcdac4b47e3f99d8bd2c40ee9b2bb510095a41721d0dae0d3edb56c36d9e9ef72ece4c69a01298c7f34fe96ccf4883372b1fd SHA512 25a37c6dd7fa23b0599d7e92da78805e1da1605c998edf00777113c8467b1703f634223dff57627337da51e565cf2d1e475698a5a2310966f1f6dcf6687671d1
 DIST mcstrans-3.0.tar.gz 44570 BLAKE2B 82358f6564e42ebfa50647892b35e4788ff9b8636eef3c776dbc6cefff7532906479b5826c1f515d2994611f62100a2622a5cce130bc7dbb4db3afc2167ec072 SHA512 02d9754daf1f85941cc8eea934931b6963d1a2133f6f313a2c7fc6a485687add434d587eeac96bfaf2b490c8e1cea34514a7689f880ebb49ca59ebf9b8956eba
+DIST mcstrans-3.1.tar.gz 44598 BLAKE2B 1755c2f56e3d40fa2ea95c349988fe5dd7b52a9f26bef0f42e42bda8f7b94993b9a47d2e333337f746cbabd9dd571118b0a8e1ffb7c22c604db58fc809bcc033 SHA512 21e9b7a8c9d98cbee61f2eb1c440a51d19ac111a5955c24d365a8784e1aa34fb47a22a108e550c8a4cde4f25ec5afc466126a68e9faedfc796bef83eada93b60
 EBUILD mcstrans-2.9.ebuild 1112 BLAKE2B 28e4b4e11895e7ddc472808e950074ecf831e96fccfb72528b6d946498b96163a0472409cbe1bb6232a84890f95595fede1866a7bf87b5357dc664b1c887f99e SHA512 50d08031a4443b91d3819ab7e49e1e8fbc2dd28bf5fa612d65e080572e732c1832ae2ff173f46b6183d7758b2ae5efe8eebd883c6a8d128170e9ebbfce5f41b0
 EBUILD mcstrans-3.0.ebuild 1112 BLAKE2B 098b5e20768fd54d2a3baaa4dedc56a58cfc36b764c0c8825206c8d10f4b885044d8c4d45abf9339218eaa8fde566a73d03c3f54c245d10aaa667ca25abc740a SHA512 b1a3d390c8f5ef1be73040ad7c4c18f38739d46d1cafd721bb56de422bbca404c686b4172300ee5ac72224c58b0e8c338a0a05b6c7be71fbffcf5ae43f50c774
-EBUILD mcstrans-9999.ebuild 1114 BLAKE2B 4f51cb48990d1dc67cf3e93c78725659f5c722152c911e6732f86fb6041fa97bfe9933e2963df9dd594dee87baf1c824e470347bbf4fb5d56b958a6769ecff81 SHA512 1d892b89f50cd6f0765ee071c6eb6e447cbdd46ad5391fd62c0fd6a848b62e4d3cadf7b441d4fdfc922a1c796017883e18bd380f4fb39046430867359ca6b534
-MISC metadata.xml 451 BLAKE2B bf8e87dcdd8c3dfbb33728600b986bf96e2243a9e9916db87ae4b4d69508f6397915929b24c4b7381d711a7754987402f0abd8ee8217621479d6970c91922189 SHA512 9d1f5669661c1fe232b18517a954640350c8f0c606d3ca91e429f53790532bfc9b73d7c18e575c4055d3ea7ba4a5ade632d1814700ed1d3d000fe5ebfa065744
+EBUILD mcstrans-3.1.ebuild 1078 BLAKE2B 1862d557c4f0cf0269328357aa068ebfae379e920e31eeffbd1341191ba0bb08e780da0367f9123d82b6260b7c92a8541b03e02a7e8962ebdf788f56573b7ed7 SHA512 575049fa3e79bb24ca551182a110832463025a56a29f69b1239fbe02e20eb36a0a467d24ccce9daa2465273391c8d5eb68b538bb9cfd3a28e6966ae8a8d59654
+EBUILD mcstrans-9999.ebuild 1078 BLAKE2B 1862d557c4f0cf0269328357aa068ebfae379e920e31eeffbd1341191ba0bb08e780da0367f9123d82b6260b7c92a8541b03e02a7e8962ebdf788f56573b7ed7 SHA512 575049fa3e79bb24ca551182a110832463025a56a29f69b1239fbe02e20eb36a0a467d24ccce9daa2465273391c8d5eb68b538bb9cfd3a28e6966ae8a8d59654
+MISC metadata.xml 334 BLAKE2B a76cd05e8b752345f7624b375455c1f25ca0417c60a16cc0f2a37d2a876ce237faa80b4c997d34de967e61f05c299a4b1fbe848799d93a5f16dcfebcfed5ebdf SHA512 3bee1c898adaf223c205ba41afe4adfc620ccdff69ea77abfd02b3e33d21a307b889945f2d674b1c88fb4f853c6ace7cca67143f7339315abc3d167f752a1cd5
diff --git a/sys-apps/mcstrans/files/mcstransd.init b/sys-apps/mcstrans/files/mcstransd.init
index 7c90e771b383..7c90e771b383 100755..100644
--- a/sys-apps/mcstrans/files/mcstransd.init
+++ b/sys-apps/mcstrans/files/mcstransd.init
diff --git a/sys-apps/mcstrans/mcstrans-3.1.ebuild b/sys-apps/mcstrans/mcstrans-3.1.ebuild
new file mode 100644
index 000000000000..c848c15f507c
--- /dev/null
+++ b/sys-apps/mcstrans/mcstrans-3.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_RELEASEDATE="20200710"
+
+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 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}"
+
+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 e68d520f4372..c848c15f507c 100644
--- a/sys-apps/mcstrans/mcstrans-9999.ebuild
+++ b/sys-apps/mcstrans/mcstrans-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"
 
 MY_P="${P//_/-}"
 IUSE=""
@@ -31,8 +31,7 @@ DEPEND=">=sys-libs/libsepol-${PV}:=
 	dev-libs/libpcre:=
 	>=sys-libs/libcap-1.10-r10:="
 
-RDEPEND="${DEPEND}
-	!<sys-apps/policycoreutils-2.7_pre"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
diff --git a/sys-apps/mcstrans/metadata.xml b/sys-apps/mcstrans/metadata.xml
index 4236a792e95c..9a9681c39bd3 100644
--- a/sys-apps/mcstrans/metadata.xml
+++ b/sys-apps/mcstrans/metadata.xml
@@ -5,9 +5,6 @@
 		<email>selinux@gentoo.org</email>
 		<name>SELinux Team</name>
 	</maintainer>
-	<longdescription>
-		MCS translation daemon translates SELinux contexts to human readable format
-	</longdescription>
 	<upstream>
 		<remote-id type="github">SELinuxProject/selinux</remote-id>
 	</upstream>