gentoo resync : 12.05.2022

4 files changed, 115 insertions, 7 deletions

diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index 9eabd5c2f60b..970f2aa1c6d7 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -1,7 +1,10 @@
 AUX libaio-0.3.111-optional-werror.patch 911 BLAKE2B f6ce9b16bfe7d3fe3fde520c4e6438b534b1ea54561faf94229cbdaa2cae40ee6e6ab0e9a689f08f7e43442d1b863bdf2c42e784774cca89003feb5dbbffd63b SHA512 8315c9ca018578d4b8e81b87ce155d8ebfc586be68f24659a91f027449cd27a9660b2cf33ce47fcf240ce44f2b7f1095e8d5996ad08782d91392f6dd8fafa5a8
 AUX libaio-0.3.112-cppflags.patch 350 BLAKE2B 8c2d0706f92a47dffff6465712588b525b89ff223019cf3ec759beca14ff2ef9515d4b3697ca64931c2d86969a40ad74642aa06544cc2671906e5b49d2e10352 SHA512 7386d741658af265cc4f156d4cc8518a7ec9abc15e8738cb13c2e2c3827b284cf8f8ee07c4a16dd0b7ae424cf87e9aad438389f0a832dac2e49ef945e3829374
 AUX libaio-0.3.112-respect-LDFLAGS.patch 521 BLAKE2B f45b0147202e767385f6816192c0fe8418cd7ed61b6807d9a6d16ec7448f10f4f842c32167f6a2ef82df820c291142cedcd66b610693858aa6ca956de272d2a4 SHA512 c1d8385fc66909168e2ff39d334e9ac37a02527a892ed13a594c1b0b55103a5115d79c32aff756a9ec96117a7001703a3d141319369dc7bcb118eb752860f0ba
+AUX libaio-0.3.113-respect-LDFLAGS.patch 537 BLAKE2B 6981fe9a607ddd4f9f803797f91271eaa403d05f65b3c2e778548b30cd486e15245a75a7f201c5f2a573828e20708d77f37d3834e131636228c49d4c697e6ba3 SHA512 726aa73e2d9fd15110acd024312f36293b841aa442a14b77b49cff4dc78961981ba09d406bc1105d31afdb4b96d29906ad4359c23c78a09e0e1d1b26e25ae11a
 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
+DIST libaio-0.3.113.tar.gz 49980 BLAKE2B 2379c88670310b36942563d10f29dfcba0f49391952ffe7fe18b0c917f33ef610405fe13297d1dbb34b7ad1d3066d4a32587a7fb20babba2f264cfc2ab289e57 SHA512 65c30a102433bf8386581b03fc706d84bd341be249fbdee11a032b237a7b239e8c27413504fef15e2797b1acd67f752526637005889590ecb380e2e120ab0b71
 EBUILD libaio-0.3.112.ebuild 2184 BLAKE2B 9af25ed8c5c41bb07f93f6139ba91ae70bac4131fa5171328b527842169bf68bf6c49a2becfc2539e1fc13a16ffc2026b8e208c6f2817d060c534ba5f8b49576 SHA512 695bd6ae41e784f76c16cf1a094f9d9282e8e9918d0612628ae587a669fbbc7bcd1d7276aeb1b421712b278333b33020e3ca1ac22e8be8e06676aff2e8970b28
-EBUILD libaio-9999.ebuild 2192 BLAKE2B 3f57d85f73da3907d7ac3bd653b72364d50d0a32044479e29f3f0425ea79ff4efd174ddef50194d36eb6757a65c5904326212b030f152154944ecbdf9696a1f0 SHA512 5925f1619bd3436165a307aac20456f7bb44f6a5c99dffce99f349f01e0de47095bb51aeaebea9b2c6d740cdd12708dc3a5c1b3226bc06fc2a38541c1011fc74
+EBUILD libaio-0.3.113.ebuild 2355 BLAKE2B 1ce696094fab440ec1fdc0562a070ff4f057c6e8c014f60f71e4b0d83b889e8424eedc137fd84c1344723e7fc79beab100c5c461259bb77b794fecb71bce30d6 SHA512 263f9dd199c584dd82c4f531b85f09d0c6ce1c0863bfc3ba4658468a8c684940eb6bcc68d83d6977cda00144eaa79902b8b517bdd048a0613eac998b28c457de
+EBUILD libaio-9999.ebuild 2175 BLAKE2B 09786c3428b1e0dafc1959dbf2eec9cbea4cdbcac2384414bf0c53014d355be3c00559ac19c5310236280829008e04fb9c9d008e49bd56c5a5568eea5eea33ae SHA512 c230b35ab0f8c39eb75fc01cae8faf6f2fe5fe6459fa9c11c029cc3529cd8960fbb33d4d8a26e45206a1d17243039126c9d40d1d4f8e917736bf6a970cda3463
 MISC metadata.xml 415 BLAKE2B 5f25806b5b169a85b455a39a9ba1995ccfa3c41e17ce1b8a7f2269167ba477fa0b76abc4ba46d977e5d6bba365b63e342304837a19dd57c0ac8d83e5846a2b22 SHA512 ad7bc8b579f5037c678294b77511af2b9027ed696a814bbbda6e3f630853040092b0abe20967d52fef7f65815c807bd49a2e57f392cd1035d1133e6d48009204
diff --git a/dev-libs/libaio/files/libaio-0.3.113-respect-LDFLAGS.patch b/dev-libs/libaio/files/libaio-0.3.113-respect-LDFLAGS.patch
new file mode 100644
index 000000000000..f9ac2037ff91
--- /dev/null
+++ b/dev-libs/libaio/files/libaio-0.3.113-respect-LDFLAGS.patch
@@ -0,0 +1,12 @@
+We need to place LDFLAGS earlier to ensure e.g. as-needed works correctly.
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -56,7 +56,7 @@ libaio.a: $(libaio_objs)
+ 
+ $(libname): $(libaio_sobjs) libaio.map
+ 	$(CC) $(CFLAGS) -c struct_offsets.c
+-	$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
++	$(CC) $(SO_CFLAGS) $(LINK_FLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs)
+ 
+ install: $(all_targets)
+ 	install -D -m 644 libaio.h $(includedir)/libaio.h
diff --git a/dev-libs/libaio/libaio-0.3.113.ebuild b/dev-libs/libaio/libaio-0.3.113.ebuild
new file mode 100644
index 000000000000..c72cf7a83a27
--- /dev/null
+++ b/dev-libs/libaio/libaio-0.3.113.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs flag-o-matic usr-ldscript
+
+DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
+HOMEPAGE="https://pagure.io/libaio"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://pagure.io/libaio.git"
+else
+	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
+	# Has test failure on abi_x86_32 which needs investigating
+	# https://marc.info/?l=linux-aio&m=164996470108464&w=2
+	# https://pagure.io/libaio/issue/21
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~loong"
+fi
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
+	"${FILESDIR}"/${PN}-0.3.113-respect-LDFLAGS.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=(
+		-e "/^prefix=/s:/usr:${EPREFIX}/usr:"
+		-e '/^libdir=/s:lib$:$(ABI_LIBDIR):'
+		-e 's:-Werror ::'
+	)
+	if ! use static-libs; then
+		sed_args+=( -e '/\tinstall .*\/libaio.a/d' )
+		# Tests require the static library to be built.
+		use test || sed_args+=( -e '/^all_targets +=/s/ libaio.a//' )
+	fi
+	sed -i "${sed_args[@]}" src/Makefile harness/Makefile Makefile || die
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	if use arm ; then
+		# When building for thumb, we can't allow frame pointers.
+		# http://crbug.com/464517
+		if $(tc-getCPP) ${CFLAGS} ${CPPFLAGS} - <<<$'#ifndef __thumb__\n#error\n#endif' >&/dev/null ; then
+			append-flags -fomit-frame-pointer
+		fi
+	fi
+}
+
+_emake() {
+	CC="$(tc-getCC)" \
+	AR="$(tc-getAR)" \
+	RANLIB="$(tc-getRANLIB)" \
+	ABI_LIBDIR="$(get_libdir)" \
+	CFLAGS_WERROR= \
+	emake "$@"
+}
+
+multilib_src_compile() {
+	_emake
+}
+
+multilib_src_test() {
+	mkdir -p testdir || die
+
+	# 'make check' breaks with sandbox, 'make partcheck' works
+	_emake partcheck prefix="${S}/src" libdir="${S}/src"
+}
+
+multilib_src_install() {
+	_emake install DESTDIR="${D}"
+}
+
+multilib_src_install_all() {
+	doman man/*
+	dodoc ChangeLog TODO
+
+	# move to / for multipath-tools, bug #325355
+	gen_usr_ldscript -a aio
+
+	# This lib is a bare minimal shim on top of kernel syscalls.
+	export QA_DT_NEEDED=$(find "${ED}" -type f -name 'libaio.so.*' -printf '/%P\n')
+}
diff --git a/dev-libs/libaio/libaio-9999.ebuild b/dev-libs/libaio/libaio-9999.ebuild
index cd86a0c918f6..d649103522c5 100644
--- a/dev-libs/libaio/libaio-9999.ebuild
+++ b/dev-libs/libaio/libaio-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit multilib-minimal toolchain-funcs flag-o-matic usr-ldscript
 
 DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
 HOMEPAGE="https://pagure.io/libaio"
-if [[ "${PV}" == 9999 ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://pagure.io/libaio.git"
 else
@@ -21,8 +21,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
-	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
-	"${FILESDIR}"/${PN}-0.3.112-respect-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-0.3.113-respect-LDFLAGS.patch
 )
 
 src_prepare() {
@@ -31,13 +30,14 @@ src_prepare() {
 	local sed_args=(
 		-e "/^prefix=/s:/usr:${EPREFIX}/usr:"
 		-e '/^libdir=/s:lib$:$(ABI_LIBDIR):'
+		-e 's:-Werror ::'
 	)
 	if ! use static-libs; then
 		sed_args+=( -e '/\tinstall .*\/libaio.a/d' )
 		# Tests require the static library to be built.
 		use test || sed_args+=( -e '/^all_targets +=/s/ libaio.a//' )
 	fi
-	sed -i "${sed_args[@]}" src/Makefile Makefile || die
+	sed -i "${sed_args[@]}" src/Makefile harness/Makefile Makefile || die
 
 	multilib_copy_sources
 }
@@ -67,6 +67,7 @@ multilib_src_compile() {
 
 multilib_src_test() {
 	mkdir -p testdir || die
+
 	# 'make check' breaks with sandbox, 'make partcheck' works
 	_emake partcheck prefix="${S}/src" libdir="${S}/src"
 }
@@ -79,7 +80,7 @@ multilib_src_install_all() {
 	doman man/*
 	dodoc ChangeLog TODO
 
-	# move crap to / for multipath-tools #325355
+	# move to / for multipath-tools, bug #325355
 	gen_usr_ldscript -a aio
 
 	# This lib is a bare minimal shim on top of kernel syscalls.