gentoo resync : 29.12.2022

5 files changed, 21 insertions, 49 deletions

diff --git a/app-admin/selint/Manifest b/app-admin/selint/Manifest
index 09d4a5092655..105a4b24d645 100644
--- a/app-admin/selint/Manifest
+++ b/app-admin/selint/Manifest
@@ -1,8 +1,6 @@
-DIST selint-1.1.0.tar.gz 283926 BLAKE2B 0908f8830ce4b569c54e8c025dd92c39af59172fee0b8061f5b8cdaf61222979a78c3726a5647af9161ce7e4a7ddd5bee64772afecd2024368afa76294b3d317 SHA512 3af358e0f42a285a0360ce2b4db9014ef1e4f0b792623007f88cf510799080975d9e44817e8911bbd32b141704a7fd11e1b4d8f91e124d0fa91c38f71a978c91
 DIST selint-1.2.0.tar.gz 306527 BLAKE2B 842d796d3beea327ac937b977123a9248f317f0ab88e8187ff5ef7b7da2efd9b6c4bccda2dc1fd4661691904f90f346df0120f9398733e62942e70bef5c3c5ab SHA512 e289cb0a25454b1fd5f5435e11f3d956e6c545bbbbe79b7a47d40681746d8eb66bb78bdb541f2629a4f23435853568a8e52d10e6f8dde8e8ddb03f4493ea7504
 DIST selint-1.2.1.tar.gz 307680 BLAKE2B 792ab2f79bc449faa6f94c13ce86f805ef36ebd11873019b36ae5f3d7450017d699d046771fc8359442d8aa24b096e1767e78054b8b2173cab6ac9bf0bb30cad SHA512 2b790cb41cab7dddb34dc9b9365641ae94c22356e3e85b5319ec23090cba633ce09e05a9b97eaba8617208057971f8fbdc8bd360b32a1f7ad0178c11c8711888
-EBUILD selint-1.1.0.ebuild 780 BLAKE2B 9aeb1bb8c97df61caf76a1e75ec8987fb7ce1ec16fb304d40df4c64933b8c68eb03a11c9cd3408441d2865214137caf000c9bd4ab396e855171f4bb0df9d9393 SHA512 f450ecc6417569dc87349c9a2aba3c5fd46dd5c347f8c1ae5db8e75bd3af9981121f50e15d51cf68e0179691879bcd75559a6f261bccd111463cff92d1bfd272
-EBUILD selint-1.2.0.ebuild 801 BLAKE2B 37af626c9fdf16b921150155fec0842ec54056431fbb83c9cb3fe440cd83807a01752a5bbc5d179e840ffa36679f6feb0f7d49a0cff92e04e80e17187557f4a8 SHA512 6d21cee26e7cd811a19251ffcd4eaf81db548e783d9ceb634aeffabd4f76497013591c91e4626871c1b574d9f4db3a61ec0a944cbb0d05908c4f8fff55a48f7b
-EBUILD selint-1.2.1.ebuild 778 BLAKE2B be310eb6bfc4e31ad385f0ec8dbb25e296819ec362011691de1d158ca99d95ab87dbd8bb8dcbd0aadbeae8dbfcad4764842c36e8269950f0e7689aca778970ca SHA512 c2e5b15b4a1fc065e348a83a6baedb7194c0da1e7630041ded223827056b0599abf3731e2b73d8e29939a511802a4149f0c8dbd59740e6f8713791d0c93684da
-EBUILD selint-9999.ebuild 778 BLAKE2B be310eb6bfc4e31ad385f0ec8dbb25e296819ec362011691de1d158ca99d95ab87dbd8bb8dcbd0aadbeae8dbfcad4764842c36e8269950f0e7689aca778970ca SHA512 c2e5b15b4a1fc065e348a83a6baedb7194c0da1e7630041ded223827056b0599abf3731e2b73d8e29939a511802a4149f0c8dbd59740e6f8713791d0c93684da
+EBUILD selint-1.2.0.ebuild 895 BLAKE2B 6942794997a637033577cfe9140f273ea629ce61fb8778b0d5719f96e16613d6d1c53036fdd3ae2b399c8b4a7ac151933a5b5a5249a3e7058d776b0ab13ee6cc SHA512 15c10b251b31394a429d8e7dab14c8fd3a55e9c80bead91be7090ed45ca892037125841c93d4844bf8854e71c0562e77c6d0dc246d34f0f71c1e4d51fb43a048
+EBUILD selint-1.2.1.ebuild 881 BLAKE2B d27abc26dbbb00230fc21e964f59f6fbd259d01901ac7a9c72e454edf05bfda7da425b320ed4595204878b5920efd487f42fe330873cab336e76a583467eda27 SHA512 eaa98fe2912d670ab4ec96699f559742b5acd889110ccd35ffc8bb58309f213665db9620e914a9bc9f0f273dcbd6817f236031e590dcc1161506177ae913a3e7
+EBUILD selint-9999.ebuild 881 BLAKE2B d27abc26dbbb00230fc21e964f59f6fbd259d01901ac7a9c72e454edf05bfda7da425b320ed4595204878b5920efd487f42fe330873cab336e76a583467eda27 SHA512 eaa98fe2912d670ab4ec96699f559742b5acd889110ccd35ffc8bb58309f213665db9620e914a9bc9f0f273dcbd6817f236031e590dcc1161506177ae913a3e7
 MISC metadata.xml 336 BLAKE2B 7451193dc145fb614c82ffbb7cf7e27cc1bdd034eb7ed1eb0a57951267fab2c9850d84052a8161ff85ffdd7292a139024ea3ea391f7dc3637802375b66f466b3 SHA512 c0a0cbfc55ab57271951f401e963bce630ea74f4deb072e219b0d0fb1fa699d25e1ea9af81d619257ee0563d4eeb74fd0e857196c88e0204e6fce5969a881429
diff --git a/app-admin/selint/selint-1.1.0.ebuild b/app-admin/selint/selint-1.1.0.ebuild
deleted file mode 100644
index dadbf3ec6cb9..000000000000
--- a/app-admin/selint/selint-1.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Policy Analysis Tools for SELinux"
-HOMEPAGE="https://github.com/TresysTechnology/selint/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/TresysTechnology/selint.git"
-else
-	SRC_URI="https://github.com/TresysTechnology/selint/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/confuse:=
-	dev-libs/uthash"
-
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
-
-src_prepare() {
-	[[ ${PV} == 9999 ]] && eautoreconf
-
-	eapply_user
-}
-
-src_configure() {
-	econf $(use_with test check)
-}
diff --git a/app-admin/selint/selint-1.2.0.ebuild b/app-admin/selint/selint-1.2.0.ebuild
index e7fc31765fae..d8f4a20dbd0a 100644
--- a/app-admin/selint/selint-1.2.0.ebuild
+++ b/app-admin/selint/selint-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# 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
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Static code analysis of refpolicy style SELinux policy"
 HOMEPAGE="https://github.com/TresysTechnology/selint/wiki"
@@ -23,7 +23,8 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/confuse:=
-	dev-libs/uthash"
+	dev-libs/uthash
+	elibc_musl? ( sys-libs/fts-standalone )"
 
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
@@ -35,5 +36,7 @@ src_prepare() {
 }
 
 src_configure() {
+	use elibc_musl && append-libs "-lfts"
+
 	econf $(use_with test check)
 }
diff --git a/app-admin/selint/selint-1.2.1.ebuild b/app-admin/selint/selint-1.2.1.ebuild
index db21da9231ac..358b8be6eee1 100644
--- a/app-admin/selint/selint-1.2.1.ebuild
+++ b/app-admin/selint/selint-1.2.1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI="8"
 
+inherit flag-o-matic
+
 DESCRIPTION="Static code analysis of refpolicy style SELinux policy"
 HOMEPAGE="https://github.com/TresysTechnology/selint/wiki"
 
@@ -21,7 +23,8 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/confuse:=
-	dev-libs/uthash"
+	dev-libs/uthash
+	elibc_musl? ( sys-libs/fts-standalone )"
 
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
@@ -33,5 +36,7 @@ src_prepare() {
 }
 
 src_configure() {
+	use elibc_musl && append-libs "-lfts"
+
 	econf $(use_with test check)
 }
diff --git a/app-admin/selint/selint-9999.ebuild b/app-admin/selint/selint-9999.ebuild
index db21da9231ac..358b8be6eee1 100644
--- a/app-admin/selint/selint-9999.ebuild
+++ b/app-admin/selint/selint-9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI="8"
 
+inherit flag-o-matic
+
 DESCRIPTION="Static code analysis of refpolicy style SELinux policy"
 HOMEPAGE="https://github.com/TresysTechnology/selint/wiki"
 
@@ -21,7 +23,8 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/confuse:=
-	dev-libs/uthash"
+	dev-libs/uthash
+	elibc_musl? ( sys-libs/fts-standalone )"
 
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
@@ -33,5 +36,7 @@ src_prepare() {
 }
 
 src_configure() {
+	use elibc_musl && append-libs "-lfts"
+
 	econf $(use_with test check)
 }