7 files changed, 87 insertions, 36 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c01574daed5b..cd6f9c4b027e 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index e2e73b32d1bb..97148bc78968 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,6 +1,8 @@
 AUX attr-2.5.1-r2-fix-symver.patch 6909 BLAKE2B 844f6d9e87ca3cfd9413047cd8fbebc6265545d1aed3653ec2d1d8fc18ee0eb42ebca756a62c9d8a8cc2c4c7f38720a66afcbe0d052525f58e4748ba50d267b3 SHA512 874a4e770a624ce4dd86b6b03e6dd0abef737cafccf2580f5c5e6f75a66425b2e34da6ee520991693387f55000448451fdc96883c2759c9fb4c650d667df63c8
 AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8
 DIST attr-2.5.1.tar.xz 318188 BLAKE2B 876dcbd802ea79b7851640f208820ffdfb73dc46065af673037c6dd50ad2af158f9f74b34cf45728baf9d0cc5572b40c3f102aa2907245a877db0d3879e38f04 SHA512 9e5555260189bb6ef2440c76700ebb813ff70582eb63d446823874977307d13dfa3a347dfae619f8866943dfa4b24ccf67dadd7e3ea2637239fdb219be5d2932
-EBUILD attr-2.5.1-r2.ebuild 2364 BLAKE2B 3ed0d3a767e6d2848ce7ca3de5bcd38453eb6e1222182381f433c027315fdadf54699c1e8b0672bad907728d1dd86631fec143463835881d2971b899c51fa88a SHA512 f1b888a61cd3ac667e7ce18fb2c415cd0a1477998c7df347315ebf7739c2e2bee7d14fa7bb6772da876e6dd18d768c7c6cc143d29c9bb60e446a4152cf3c3dfe
-EBUILD attr-9999.ebuild 2372 BLAKE2B 424c4bb3e5e3cfbd79765392a0cd43bf093ce5a3e77a7179f03fd825c2e38720fb0da8354c9c9f15e65e78252b7f69db394c27652112621d1949d6c5f89f7291 SHA512 b2c3182929afbcde10b9726a5d6d21cb0cf48454755504a70a92df10546acf4e46462ad6211fccdb282969397b0d6ffab54a9394b4af98c91f270ea1c7aa5197
+DIST attr-2.5.2.tar.xz 334180 BLAKE2B cf26348c3a96622e4f62493ac7655e14b6580d36a5784ef4c3750178856eceabd33192fd58516be21c8aa1ad41d56c024ad440ef4bc922bed8f7a4984ea16c63 SHA512 f587ea544effb7cfed63b3027bf14baba2c2dbe3a9b6c0c45fc559f7e8cb477b3e9a4a826eae30f929409468c50d11f3e7dc6d2500f41e1af8662a7e96a30ef3
+EBUILD attr-2.5.1-r2.ebuild 2365 BLAKE2B 25f73132b6c1e92a6786474718cf399e5e1958be5b63d455e85d6e466febcab161c4787fda2e35958b55c90999a11d1378805197f5bc21895681ceaf489cebae SHA512 1f81875d8338e9df204cfc75b5c12d3e40fc3c782c2105bf8d02bc2e3b99455303bb99cff2da44bdfd1a20c3146bd1e2c13866f27c70da9b6ed620cc95d9234b
+EBUILD attr-2.5.2.ebuild 1569 BLAKE2B 030fb32e6d92e176d411ca3ffcae4f8ef7f2899efa15f26a8467495145be833fd8c75b493b385293e4d2493ea2b9c1861b17a47bf60463d243a1dc7da0370d35 SHA512 9c9e430773fc3a24abfed98bd9eb8ecdfce577a3334bb1ba41e48defc3ff2297842e2cab278d2328a43bca5480a9e852a736fdfdaa08d6344e0fc32b9301e474
+EBUILD attr-9999.ebuild 1569 BLAKE2B 030fb32e6d92e176d411ca3ffcae4f8ef7f2899efa15f26a8467495145be833fd8c75b493b385293e4d2493ea2b9c1861b17a47bf60463d243a1dc7da0370d35 SHA512 9c9e430773fc3a24abfed98bd9eb8ecdfce577a3334bb1ba41e48defc3ff2297842e2cab278d2328a43bca5480a9e852a736fdfdaa08d6344e0fc32b9301e474
 MISC metadata.xml 389 BLAKE2B e857460e11e0ea047e3cc0a9ee3f02e9271dc01d12d82fc9412348dc2fd1173fc5ed2c12a9c4de5cb7098eb2de2a78f6865ef88148179f67121a92c04eb509e9 SHA512 ae5a0d549f4226808931af6479c023d6d02a7f40c8eed053e534061458bd3e7a1921bbb24bf4a8f5f02816f66ca6e17b9774c00b3063ffaf2adba7e2a921dd00
diff --git a/sys-apps/attr/attr-2.5.1-r2.ebuild b/sys-apps/attr/attr-2.5.1-r2.ebuild
index fd70c8e82c9e..93dc3a36329f 100644
--- a/sys-apps/attr/attr-2.5.1-r2.ebuild
+++ b/sys-apps/attr/attr-2.5.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ fi
 DESCRIPTION="Extended attributes tools"
 HOMEPAGE="https://savannah.nongnu.org/projects/attr"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="debug nls static-libs"
 
diff --git a/sys-apps/attr/attr-2.5.2.ebuild b/sys-apps/attr/attr-2.5.2.ebuild
new file mode 100644
index 000000000000..0c5a2dce3464
--- /dev/null
+++ b/sys-apps/attr/attr-2.5.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal usr-ldscript
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
+	inherit autotools git-r3
+else
+	inherit libtool
+
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Extended attributes tools"
+HOMEPAGE="https://savannah.nongnu.org/projects/attr"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="debug nls static-libs"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles || die
+		eautopoint
+		eautoreconf
+	else
+		# bug #580792
+		elibtoolize
+	fi
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable nls)
+		$(use_enable debug)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi; then
+		# We install attr into /bin, so we need the shared lib with it
+		gen_usr_ldscript -a attr
+	fi
+
+	# Add a wrapper until people upgrade.
+	# TODO: figure out when this was added & when we can drop it!
+	insinto /usr/include/attr
+	newins "${FILESDIR}"/xattr-shim.h xattr.h
+}
+
+multilib_src_install_all() {
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	einstalldocs
+}
diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild
index f5ee0bed082e..0c5a2dce3464 100644
--- a/sys-apps/attr/attr-9999.ebuild
+++ b/sys-apps/attr/attr-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit toolchain-funcs multilib-minimal usr-ldscript
+inherit multilib-minimal usr-ldscript
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
@@ -11,23 +11,19 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	inherit libtool
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Extended attributes tools"
 HOMEPAGE="https://savannah.nongnu.org/projects/attr"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="debug nls static-libs"
 
 BDEPEND="nls? ( sys-devel/gettext )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.1-r2-fix-symver.patch
-)
-
 src_prepare() {
 	default
 
@@ -57,26 +53,6 @@ multilib_src_configure() {
 multilib_src_install() {
 	emake DESTDIR="${D}" install
 
-	# Sanity check until we track down why this is happening. bug #644048
-	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
-	if [[ -e ${lib} ]] ; then
-		local versions=$($(tc-getREADELF) -V "${lib}")
-		local symbols=$($(tc-getREADELF) -sW "${lib}")
-		if [[ "${versions}" != *"ATTR_1.0"* || \
-		      "${versions}" != *"ATTR_1.1"* || \
-		      "${versions}" != *"ATTR_1.2"* || \
-		      "${versions}" != *"ATTR_1.3"* || \
-		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
-			echo "# readelf -V ${lib}"
-			echo "${versions}"
-			echo "# readelf -sW ${lib}"
-			echo "${symbols}"
-			die "Symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
-		else
-			einfo "${lib} passed symbol checks"
-		fi
-	fi
-
 	if multilib_is_native_abi; then
 		# We install attr into /bin, so we need the shared lib with it
 		gen_usr_ldscript -a attr
diff --git a/sys-apps/moar/Manifest b/sys-apps/moar/Manifest
index 8fadc6eb947f..ba978263e71f 100644
--- a/sys-apps/moar/Manifest
+++ b/sys-apps/moar/Manifest
@@ -1,7 +1,7 @@
-DIST moar-1.20.0-deps.tar.xz 5100896 BLAKE2B 0be3ca9e2fa88f8d57705f0a79a21088cf1c004740c784b3b8249fde03eae0557bfba97e9e9b5266ae37364e4a686c3e8c5a5556f8ff23f8aef90845f5c891eb SHA512 ec2e5dc41fab5327b7ec25a5aed199712421121fa6f2bed0c76658784ff6260cb6cdba3e478eb3bcdee7ae177acb2be34c35ca01ad7c35f36a1b62c8ff7ad673
-DIST moar-1.20.0.tar.gz 2793794 BLAKE2B 10fa1f59a0ec20703d8a478e190188555c668fddb37128dbe4821f47acba035dfa102403d5bb9f4f19af809d2e08fac9ede1e25f1aa333949ffc332ea41c2f7c SHA512 d85eb1b8e9cc01384eca606b0ccf0f76b55dd7d8635a5c4f075dbd5784bebaa4004c379b8a5ba018643d75c088dad83599a7d2faa7c15ff9d008b0c7ade76787
 DIST moar-1.21.0-deps.tar.xz 5100896 BLAKE2B 0be3ca9e2fa88f8d57705f0a79a21088cf1c004740c784b3b8249fde03eae0557bfba97e9e9b5266ae37364e4a686c3e8c5a5556f8ff23f8aef90845f5c891eb SHA512 ec2e5dc41fab5327b7ec25a5aed199712421121fa6f2bed0c76658784ff6260cb6cdba3e478eb3bcdee7ae177acb2be34c35ca01ad7c35f36a1b62c8ff7ad673
 DIST moar-1.21.0.tar.gz 2793970 BLAKE2B 696fc70d7fa05f6e3537272730a7d844c2fd5de94fb2a154906b8102096425c384fd8c54a0f9cdd5bde44b3310119fb5f1e52d98edc10e284c13cdfc44255a6e SHA512 8c91b6f910689496ebe3a5a59325fffc99aeee6808e0c65f01eead47b902481ee02841cdd33a62c90d99d760a2f052df89695b144ed2d7c5446733be7957dcb6
-EBUILD moar-1.20.0.ebuild 974 BLAKE2B 36b4ad20b4ce6d0f9bced9610617d53ff6e34b34d1c8ed9d0158f90fd061174d1976a9a7e64d94d68aed154e3656d7c583fa6e2022bd7789afbd921b24715171 SHA512 5530e5eed6eeb83b2353593ef9d85fd9b9c405aca5c0422c670f65679d37677f71bb0f731b9691f960620e9218726aa798b2125ae53a091f7d25ebb598a22043
+DIST moar-1.22.3-deps.tar.xz 61027724 BLAKE2B ba22db246b20f4a6b28c19a3654f1b1cd68e0a92aff43ff02a592b303ff3318c3766381bd4b0abff5f479fe571b753a272213d7dc7da809a33ded36228dac100 SHA512 a1be9f66480867faa06fb451bcc6a294bb1e2e4601c97c1beac67a3f866104b196ecd2653dc9ddd48a5223d4f3067a01abbaf45fc07333d97c4f8489424ff5cf
+DIST moar-1.22.3.tar.gz 2799819 BLAKE2B 681297e9a84f6846d7ea6cd591403fd3100079fc8418ce5841a50755927239eca5abbfc0477d1a74e3af687ef1ebe372d4f708c38a64ba61b3095ac161f1cb8e SHA512 377cdf4916b036088f48abd4aa9818f002dd5ab025a54f4d91626380bb3d370daf046da6f3dc31fcc11a375d7da1a84288fb3e2e3357181a6ecc6a46af78c452
 EBUILD moar-1.21.0.ebuild 986 BLAKE2B e9f5c41907da162be3ffaea0fe77bc7aea55176d4c15ad3833fc72806c7bd24fdcb9ccf9b389d20ea037628f6c6858553465dd5f6710971d46ae0489d7acc28a SHA512 a65b9b98e31c52869882d4b0b4ad855383a2ddd444c74883d70a64be377c4d6706eed78d930ebbfc7cc61a83cad793d4f0d9d652ab96ac03d59753456f226b6a
+EBUILD moar-1.22.3.ebuild 986 BLAKE2B e9f5c41907da162be3ffaea0fe77bc7aea55176d4c15ad3833fc72806c7bd24fdcb9ccf9b389d20ea037628f6c6858553465dd5f6710971d46ae0489d7acc28a SHA512 a65b9b98e31c52869882d4b0b4ad855383a2ddd444c74883d70a64be377c4d6706eed78d930ebbfc7cc61a83cad793d4f0d9d652ab96ac03d59753456f226b6a
 MISC metadata.xml 316 BLAKE2B 19b5d071afbcad1f05744cca494156dc634f3fc35afaf4828dcf1e691e75a0f47f162b6cf548e5a333441f25327970f6a71d6acb436b60a68deeb7fb44659d45 SHA512 44155ffd972d79d47e41fe2ed38583e41eaaeb9f6b0de7e52b666930906f561e73d1f604acf602750ae1bed50e516dbbe36327b47ba2005813438e0d2db070e1
diff --git a/sys-apps/moar/moar-1.20.0.ebuild b/sys-apps/moar/moar-1.22.3.ebuild
index b5588a90db7f..7ba82f9aa27b 100644
--- a/sys-apps/moar/moar-1.20.0.ebuild
+++ b/sys-apps/moar/moar-1.22.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar
 
 LICENSE="BSD-2 BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 IUSE="test"
 RESTRICT="!test? ( test )"