gentoo resync : 16.04.2022

4 files changed, 24 insertions, 73 deletions

diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index 545895b197a5..4ab4433e00d4 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -1,9 +1,7 @@
 AUX mcstransd.init 656 BLAKE2B 782add77ee81b582151c35003c303b5e67b4ffc4e6f4af97ec51f20541863111de4298b7d6eb0911ded757cadc1ba4deefd500d8a6e335693191e2e65286a585 SHA512 8de0df316d8c926bd99515b4c6eb5bc9d51df3925d3dbad49fe0229193e82f008b09a7343c0d1c2cdc9dd35ad8fd7c82e29ba2bd6a7ab6cf882afe78985e9579
-DIST mcstrans-3.1.tar.gz 44598 BLAKE2B 1755c2f56e3d40fa2ea95c349988fe5dd7b52a9f26bef0f42e42bda8f7b94993b9a47d2e333337f746cbabd9dd571118b0a8e1ffb7c22c604db58fc809bcc033 SHA512 21e9b7a8c9d98cbee61f2eb1c440a51d19ac111a5955c24d365a8784e1aa34fb47a22a108e550c8a4cde4f25ec5afc466126a68e9faedfc796bef83eada93b60
-DIST mcstrans-3.2.tar.gz 44596 BLAKE2B 6738acbcb7c25ec67b8d14cd166c601c7790d28332de8eb4caec32e43390b199aeea51750856aee7c4a2bcfc003af3ac01b00a4247578230d42de3956a88ebb2 SHA512 edc7d4c255056d823c67d69d0c0bb49e8da8cf1b69d94b65e1c2cb5f4944dcc0bd26ed795d76cbe310d9c98b98ca69a49eb7e39ed4cd7df3f6ed8bd1b68da6b1
 DIST mcstrans-3.3.tar.gz 44621 BLAKE2B 624780c219d0b8f369def5ab334caf9d2ae847f9cfb4359ce38e240bcb72b7cfeef45d08cd6e7330cc90394f6c32bd622d2133e675036f98992145b1530ab1e2 SHA512 2157a0361bb5a2bc8e149373b2dd7d9b042f8c4c0aa845ae6967a23d9b875d2dcd6176d99d7f8f15e17eb5877fea60814e19aabfe76950d25b75c9c25df811c2
-EBUILD mcstrans-3.1.ebuild 1076 BLAKE2B 95420d079ff83b4a3e4aa7655932d1ded963f53e01e4cefad6b49613f882458c3ac9ec4a9f0771f314e32d341cad58e5684aa56b669e191b0a353c217c2a3a2c SHA512 4c41ad6cb454f39743f3d822298743abb5cba0846a030e2666e7beae9fb245ec8acc60b32762c1ce66131f188cb0dfbe69f1fc933dabcc62d8ae9d2dc5884e78
-EBUILD mcstrans-3.2.ebuild 990 BLAKE2B 5727f7797e09a3d4fd2783fb0386389b9c5d4cb436f3d920ada8d94bc45a4f2645787d7564f95abe39128ddd31763fa67584b2d66156c8eb41525f78d082c8c0 SHA512 c4a5958839c8aab262a8424b2228fa7b503a6cd1d39986de47cad689b241a279f05c7db7551632e767090d8ab36fc065b8400d7ef6a22047d93039a59bc77abf
+DIST mcstrans-3.4-rc1.tar.gz 45128 BLAKE2B 90ef74de6db72005b17254a23673edca30c8441155947b0cd11e5a45b376a58f608eca38fc91184e33dd593551de48010bde1962849ad7d6427d310c4e2609e4 SHA512 7889b6b4a22d2b3b900b28fddfb09d32bcc8d4dfacb3ac75253aa812b35578907272b758c4050d52560cdb751cefca5f4bd46c8c2402b47f8833c63134b8e780
 EBUILD mcstrans-3.3.ebuild 988 BLAKE2B d4fe2829c039c8871d19cee9a9d50e26bc8b9961ebc2b8d4a77c950b30d573eec52842e9bdef80c43f9734530be2311d8d76190ffb5439bd5fa39133d0a484ed SHA512 d40639217b41c04f1e43c826b7304ad67b9c375d3ec6f3ba5019e52f36f689a5a97dd370ec73d652d82b8599f932f7cffdef76498f09451fe7e722d95aeb2d5a
-EBUILD mcstrans-9999.ebuild 992 BLAKE2B e334940d81f7b75e79fc4556cc4e578dab2479bb54bb0b72452fde69808097df9e45106e864459363fef8db1d9e17f0539295d7c52c27758a199cf1bdec4224f SHA512 1ab31b01289d8b89fa6a7ab877c2f86971855b9edf26b623b3b213f1c501f1e070388bc2cc6f90308e7fdc146220e65b8fa4d525f8e7c69439d25f892dbb51ed
+EBUILD mcstrans-3.4_rc1.ebuild 1064 BLAKE2B 8014d2426569f5fa9beb45607b2a85154b66866667ca4c8c793bb928d785e6bd786e125f0af4debc1f97375aac5622a2beef9563d2f6fa00aa553701f8ce58dc SHA512 3f668c23c439999a669bb082253457d8c94f61d8f85800f63b4b352d92d38c871c84dda3ae4f29f1d18c65d052e9e695855ab69cf6a04d3cfc9fb78790293785
+EBUILD mcstrans-9999.ebuild 1064 BLAKE2B 8014d2426569f5fa9beb45607b2a85154b66866667ca4c8c793bb928d785e6bd786e125f0af4debc1f97375aac5622a2beef9563d2f6fa00aa553701f8ce58dc SHA512 3f668c23c439999a669bb082253457d8c94f61d8f85800f63b4b352d92d38c871c84dda3ae4f29f1d18c65d052e9e695855ab69cf6a04d3cfc9fb78790293785
 MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664
diff --git a/sys-apps/mcstrans/mcstrans-3.1.ebuild b/sys-apps/mcstrans/mcstrans-3.1.ebuild
deleted file mode 100644
index 5510582a2b53..000000000000
--- a/sys-apps/mcstrans/mcstrans-3.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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-3.2.ebuild b/sys-apps/mcstrans/mcstrans-3.4_rc1.ebuild
index 06962f8dcdb1..75563498db4f 100644
--- a/sys-apps/mcstrans/mcstrans-3.2.ebuild
+++ b/sys-apps/mcstrans/mcstrans-3.4_rc1.ebuild
@@ -1,30 +1,33 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 inherit toolchain-funcs
 
-IUSE=""
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux context translation to human readable names"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
 
 if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
 	S="${WORKDIR}/${P}/${PN}"
 else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${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"
+IUSE=""
 
 DEPEND=">=sys-libs/libsepol-${PV}:=
 	>=sys-libs/libselinux-${PV}:=
-	dev-libs/libpcre:=
+	dev-libs/libpcre2:=
 	>=sys-libs/libcap-1.10-r10:="
 
 RDEPEND="${DEPEND}"
diff --git a/sys-apps/mcstrans/mcstrans-9999.ebuild b/sys-apps/mcstrans/mcstrans-9999.ebuild
index 631d654a0a38..75563498db4f 100644
--- a/sys-apps/mcstrans/mcstrans-9999.ebuild
+++ b/sys-apps/mcstrans/mcstrans-9999.ebuild
@@ -1,30 +1,33 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 inherit toolchain-funcs
 
-IUSE=""
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux context translation to human readable names"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
 
 if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
 	S="${WORKDIR}/${P}/${PN}"
 else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${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"
+IUSE=""
 
 DEPEND=">=sys-libs/libsepol-${PV}:=
 	>=sys-libs/libselinux-${PV}:=
-	dev-libs/libpcre:=
+	dev-libs/libpcre2:=
 	>=sys-libs/libcap-1.10-r10:="
 
 RDEPEND="${DEPEND}"