gentoo resync : 04.01.2022

3 files changed, 7 insertions, 37 deletions

diff --git a/sys-libs/fts-standalone/Manifest b/sys-libs/fts-standalone/Manifest
index 9947479e8986..cbf341558540 100644
--- a/sys-libs/fts-standalone/Manifest
+++ b/sys-libs/fts-standalone/Manifest
@@ -1,5 +1,3 @@
-DIST fts-0.2.tar.gz 339498 BLAKE2B 3800196fd67d03c5e732dec1cf6aeee85d417720c3e89f650f2c7238f60d57e4e51a69eb11dc67fdb8ca19093726d0f3f8b48e60c20ceb08b9173767ab895586 SHA512 4f31182f4ebce7f663db893def0e2380b87ef1a262a021837fc6fc9965803a829217142df140c67b1cd83b292eb8862fa0a470cf795a312494674e6e94f02f79
 DIST fts-standalone-1.2.7.tar.gz 19336 BLAKE2B 045cfc32dffd18b58093dfe578a029ca15083eec98812ea2849acf37fd2c8e7272840b15b4966201421624d96ba69208a36b58d5420cef2563c107cfae98ea93 SHA512 949f73b9406b06bd8712c721b4ec89afcb37d4eaef5666cccf3712242d3a57fc0acf3ca994934e0f57c1e92f40521a9370132a21eb6d1957415a83c76bf20feb
-EBUILD fts-standalone-0.2-r1.ebuild 529 BLAKE2B 827b54285e26354155bc0ddb7baea086642d192a5245c039f344b4004d98c32204c3688bf4f3a2e6c74ef5952200cb1bc246e84b7582812c4699399cb5b943f2 SHA512 8054bb5de4170dc8890b058713dd5ca56266e629c8a2e4e83fa17bbb572fa54eabc3050cbd32ebdf293bcb7de99d0e2ff6b9f935a3c5d0138de4ceed3f021917
-EBUILD fts-standalone-1.2.7.ebuild 739 BLAKE2B d5c775ccb42a8a803389897ca19ccc474dedb017cf7af17a4fa0fe94627b30a10bf4ba560f9217b58b0d342eb10130521b07aeb67a0d40ca9424444a756516de SHA512 1546100a8a6b394685188dd00100feeff9550777304cb32442fa6a6518061a6f486e1bef3d977ea7d97b9ec4d0dacfa06441d48d2f8658758693fbfb11f4ba62
+EBUILD fts-standalone-1.2.7.ebuild 719 BLAKE2B 6dbbcf967890e181963e456de1ce0c04b73f7453fe8b9bb2bfa39b1939bfe00ad77c601a3b872d62d7daf5415eadfdf1c30aa0897f3b1f2984d92d06be5e8aaa SHA512 43afcaf37dc89a8fb8601dba3fc2dbbfdda1edf9cf21478edd90f3bfc6737eb9ce5b8672bca934e3f4ce5d649f2f065f710c13752ad3dc3bb7ff8be0ce29c986
 MISC metadata.xml 335 BLAKE2B cde77279efc1c118c1379c75520fe3a126bb9dc6ebc9a770cab1cc45a290bc7f346ce7f8211929c76f3fb3c430e861a47a6b50d785619a51b6b8bca2b3540283 SHA512 8623cc3882fb57956ee30294a315f57ed2468000668b068e0e52d37965c37ef43a58f4ce4e8c0ab715fa844ecb1ce681fa6ce9c864bc01fbe3f621ad148fc908
diff --git a/sys-libs/fts-standalone/fts-standalone-0.2-r1.ebuild b/sys-libs/fts-standalone/fts-standalone-0.2-r1.ebuild
deleted file mode 100644
index ed2a00b5d132..000000000000
--- a/sys-libs/fts-standalone/fts-standalone-0.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P=${P/-standalone/}
-
-DESCRIPTION="Standalone fts library for use with musl"
-HOMEPAGE="https://dev.gentoo.org/~blueness/fts-standalone"
-SRC_URI="https://dev.gentoo.org/~blueness/fts-standalone/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	!sys-libs/glibc
-	!sys-libs/uclibc"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	default
-	rm -rf "${D}"/usr/share/man
-}
diff --git a/sys-libs/fts-standalone/fts-standalone-1.2.7.ebuild b/sys-libs/fts-standalone/fts-standalone-1.2.7.ebuild
index d816d53c4048..93438b4f17e0 100644
--- a/sys-libs/fts-standalone/fts-standalone-1.2.7.ebuild
+++ b/sys-libs/fts-standalone/fts-standalone-1.2.7.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="Standalone fts library for use with musl"
 HOMEPAGE="https://github.com/pullmoll/musl-fts"
 SRC_URI="https://github.com/pullmoll/musl-fts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/musl-fts-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -15,10 +16,7 @@ KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
 IUSE="static-libs"
 
 DEPEND="
-	!sys-libs/glibc
-	!sys-libs/uclibc"
-
-S="${WORKDIR}/musl-fts-${PV}"
+	!sys-libs/glibc"
 
 src_prepare() {
 	default
@@ -32,6 +30,6 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
-	mv "${ED%/}"/usr/$(get_libdir)/pkgconfig/{musl-fts,fts-standalone}.pc || die
+	find "${ED}" -name '*.la' -delete || die
+	mv "${ED}"/usr/$(get_libdir)/pkgconfig/{musl-fts,fts-standalone}.pc || die
 }