gentoo auto-resync : 20:02:2024 - 11:40:01

3 files changed, 98 insertions, 7 deletions

diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index ded37a43b20b..d1d73a663e30 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -2,6 +2,7 @@ AUX libaio-0.3.112-cppflags.patch 350 BLAKE2B 8c2d0706f92a47dffff6465712588b525b
 AUX libaio-0.3.113-32-bit-tests.patch 794 BLAKE2B af169fe70e736bcc83bac7394a8c8ac737799a31b23abe1d5a6158f4f118dcdd90378f515279b861f2e5086258f233aa7778062e2e8025788ebbec158dd41993 SHA512 358bab7166887f19c3d64fb8911c4fc9fc0811aabda28838e11013f28f1a6911d5d4ee9b5369e998f01848f1f758cba63644b56ad3b1bd69d0d17f487898e9e1
 AUX libaio-0.3.113-respect-LDFLAGS.patch 537 BLAKE2B 6981fe9a607ddd4f9f803797f91271eaa403d05f65b3c2e778548b30cd486e15245a75a7f201c5f2a573828e20708d77f37d3834e131636228c49d4c697e6ba3 SHA512 726aa73e2d9fd15110acd024312f36293b841aa442a14b77b49cff4dc78961981ba09d406bc1105d31afdb4b96d29906ad4359c23c78a09e0e1d1b26e25ae11a
 DIST libaio-0.3.113.tar.gz 49980 BLAKE2B 2379c88670310b36942563d10f29dfcba0f49391952ffe7fe18b0c917f33ef610405fe13297d1dbb34b7ad1d3066d4a32587a7fb20babba2f264cfc2ab289e57 SHA512 65c30a102433bf8386581b03fc706d84bd341be249fbdee11a032b237a7b239e8c27413504fef15e2797b1acd67f752526637005889590ecb380e2e120ab0b71
+EBUILD libaio-0.3.113-r1.ebuild 2213 BLAKE2B c667153ecc20cfd3626d3debe37c6c2496c8ff474dba4bdf8e56c0b7b512b18b11c88003e868b14ce19f3ff75dc0a4a3dcc00c76eebbbc079c0f340f7ac3e2b9 SHA512 01e06a35572ddc227c41405a8e28de043a4d1ed3d992b2eeb3c029b7a6502115527d1ed9f41084bb9c42d84e100e31a2a03e4c2e8e4ce5a72fdac893c1971a67
 EBUILD libaio-0.3.113.ebuild 2288 BLAKE2B 3ff24b4cd6bbd9f515ef5611a789c37e90c059a13fd3c618a3627d070bf01a441b89ec218c1470e86d7b7db31097c706697b76ff75091ef83322e6e78d1ff53c SHA512 96f6aa57a82077de291b7246c1c945b6efe3c0be6bb53bef7a63f0c343cbfe24a5ea842e192d1646b799afd3e85bde4fa5cf9573225eea4f0bcd29a609513c0b
-EBUILD libaio-9999.ebuild 2248 BLAKE2B b9df5b16af67563434bc1297eb3d5b4ca767db287f57f457152e9f41d20f5f56cdb2fd0f2588667d197e0c5ecb4402774c2ecbc226ba0d9cf403933148c603db SHA512 82e56ce625dce6d15a6061897ed7d710c06692c326befc8f6b5310c4826716cfaf9a7b71d411d9dac6e6ee8033dbbc166e85f6ce60cbb3601e841208a33ef572
+EBUILD libaio-9999.ebuild 2165 BLAKE2B f384a116636d821438e78154df2207b47c9334bb8efb1d37fd884949a5b191357763c356d92dd173869d02be4d1a4e016b44134e35bce266e68e24755c60a2d5 SHA512 2d045e01f446290bdfbe2fb3fa39b11884972e21bff193d16677defddd416f1fbda399a8f18ade57084ca680803658293db79ae6c9d8950fe312f39f5bf1c5f3
 MISC metadata.xml 505 BLAKE2B dd6fdcca9f3876cd5e33eefe891b4e0fd87d8bf21417b36c0e3a0e8b248a2191143037970bb1ce9ed4cc59f3da399e8057c73db1a5b194f265c7940bcb4bdb9f SHA512 5edfc92d534ac0b1526d010cc43dc33da62db6575ebba6e0edcb3b063eec7053dc18d496f0bb02b5f6a8568197d198be309a5fce57f538dc9906b788f46d0d6f
diff --git a/dev-libs/libaio/libaio-0.3.113-r1.ebuild b/dev-libs/libaio/libaio-0.3.113-r1.ebuild
new file mode 100644
index 000000000000..f122b3a77785
--- /dev/null
+++ b/dev-libs/libaio/libaio-0.3.113-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs flag-o-matic
+
+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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+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
+	"${FILESDIR}"/${PN}-0.3.113-32-bit-tests.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() {
+	# Upstream aren't interested in fixing: bug #855698
+	filter-lto
+
+	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
+
+	# 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 db2f93f97564..9066780e1381 100644
--- a/dev-libs/libaio/libaio-9999.ebuild
+++ b/dev-libs/libaio/libaio-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit multilib-minimal toolchain-funcs flag-o-matic usr-ldscript
+inherit multilib-minimal toolchain-funcs flag-o-matic
 
 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"
@@ -14,6 +15,7 @@ else
 	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
+
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="static-libs test"
@@ -83,9 +85,6 @@ 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')
 }