gentoo resync : 08.06.2019

5 files changed, 109 insertions, 34 deletions

diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index f04bfff5e119..a109bc9240ce 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -5,11 +5,13 @@ AUX libaio-0.3.110-cppflags.patch 629 BLAKE2B 0fb7bee48ba36c68aad96f76254fb7efaa
 AUX libaio-0.3.110-link-stdlib.patch 731 BLAKE2B 9599f75d405de3c1fd38c15cdcac6c65e624674d0be01982d13480fa0fe4020ebfebf0d22b1614cb70d4533f93d1dd58f293aff314a414d84c94fbab499db3da SHA512 b434da8190ca145fcdd64aa788be5d8bd1b44c112e117bfb8583cce91cfdcfb52038189bd9c92d690286e6576d82e74e62b465585f6333f1a920769ddbe29c32
 AUX libaio-0.3.110-optional-werror.patch 832 BLAKE2B d732c6c15247a6b601e4296acfe9733109360dc57f4397f7ae35a207b5c98e652d9c9dd67d52bf4997a26498a58722a77dcceb01df9b0b39289f51596e39aa2d SHA512 14b73acded7f67d01e199c411f2ea090b1d0d666521233d3829ca76572d6962f5dc3560096dc10e13c342eed046fb47a6e370e57fceab457696fad6c888a5067
 AUX libaio-0.3.111-optional-werror.patch 911 BLAKE2B f6ce9b16bfe7d3fe3fde520c4e6438b534b1ea54561faf94229cbdaa2cae40ee6e6ab0e9a689f08f7e43442d1b863bdf2c42e784774cca89003feb5dbbffd63b SHA512 8315c9ca018578d4b8e81b87ce155d8ebfc586be68f24659a91f027449cd27a9660b2cf33ce47fcf240ce44f2b7f1095e8d5996ad08782d91392f6dd8fafa5a8
-AUX libaio-0.3.112-cppflags.patch 610 BLAKE2B f3b79a3b1abdb40741b15a53e3308defa5538a01744f02b13a03af686176c753fad02d6977b9213ffcde6b6fd11261a7c23476adf1a23b87bbf1a64834a4b790 SHA512 160ba75e05066eb5114d7a7e6d14b2e92e670d664c2f179b9703140cbcfa96df803166dff008b0bc0c2edfa7050d03c7d5aa4fbf5d8f4fb1beea02e3ca172942
+AUX libaio-0.3.112-cppflags.patch 350 BLAKE2B 8c2d0706f92a47dffff6465712588b525b89ff223019cf3ec759beca14ff2ef9515d4b3697ca64931c2d86969a40ad74642aa06544cc2671906e5b49d2e10352 SHA512 7386d741658af265cc4f156d4cc8518a7ec9abc15e8738cb13c2e2c3827b284cf8f8ee07c4a16dd0b7ae424cf87e9aad438389f0a832dac2e49ef945e3829374
 AUX libaio-0.3.112-install.patch 1921 BLAKE2B 5338c1deab3152fec06dfcebc3c3527fd8df77640700e9a95db831b30c4b56ffef65fa50dd8669608c7dcc63eba302e87646e63d4fefb2313369ac175836ff23 SHA512 56009ed2cde7b9f7a6e7f64c4348d3b78807e2d72a44f39c811004a14e6757e53a94739e7513ae7e3a1f2efef1ecfdf98f61f24b70a65c6f9d320ea94415a443
 DIST libaio-0.3.110.tar.gz 42270 BLAKE2B e774e5888106ffcf4db08569a8b3dc6722f4e0e8278e9f2fafe865e282c0568059e8dbb37aab7a33719ab4d80f42404bfb1d4ab03f5c066d9eb75301676f525e SHA512 664295d330d6e9adc005e2331e77582619625b479ffc2b81728ba6a682487380ee936079c4a69d35144b458bbe35c612f4ed9b32e913bd7e109b824345763eb3
 DIST libaio-0.3.111.tar.gz 44557 BLAKE2B dc2f44599218de0ca80cfc17f604eb85c9b1241ce7221f49f1a4ee8c5bd3fa135c29ac8d97f6f97550a508e27b0dc92eb709256ffd803c1feca255016a4d674d SHA512 259b89647e22ba47edd4076b8d6aa8ab89af197b64930aa5b01b69fc1969b13b4a5e91c449ccdc9b2746c9eae3160211ce1fe110d252efeca5f2c56d0ea66e2e
+DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
 EBUILD libaio-0.3.110.ebuild 2213 BLAKE2B 109c4534a9c9c2329cba96f30bdc0262020e3bbb1d39494b4f0338914080aaee990b780076bad97030fe68e7eba5f9d6585b6011f09e45ff2cd605b531bc2ea5 SHA512 80601b081b9362ce194d91a760395ccbfac4bd8e0a089c55c1715504939b742ec9e4b313dd3fb382058d0ae5a08f9ea8670938a3405655e7de7feb3c1de6ec09
 EBUILD libaio-0.3.111.ebuild 2196 BLAKE2B 0ec691fbd8a98d8fd32825d7f26a96fcc2b533ac573df1e368b99e4a995f4190aa2e004d808ede6d365fbf437d5324278e644718cd1a912eedeafd3a57205e0b SHA512 5e7386c402db309b54f0d62f582cc66e48335f76bb319e3803567db4185ccc0dcf3da918c075d923e92416e7fa0ebd803b3a324bf84b487c2e8acfed990fd544
-EBUILD libaio-9999.ebuild 2135 BLAKE2B d77e5b3cbf65b30c3ffa974fa2ea703df4f30d70fe3ee8705644c297686c35e58e807e6f840c571f3fbdfc855f573e71f4f4564f6c0f8b525d82af5cb9878fb9 SHA512 2715b824d05430b8d5f3b252b2dc9354d71869fa7c6cbc676eeec169f8a1d7c1a85f224fa4fc9321b76b3d5280fe35f67f28a5c227c9ea75d21edd1d0475eacd
-MISC metadata.xml 486 BLAKE2B 68cdbe0bbc0e629e59f580672dee5d694d8f411d81f60c249220aa60a8fee8cbac7add2910e265afce266923127fa6d0ccdf7d3adecdc2a25c752cb80028b006 SHA512 e8301c12097a02130a43f9349dea0cfa5418db8c6f76ae638e01631039caf21cd3b9f8a39255c12a58c779270239d7bf086842997e96ff7c0cfedb550fe44ab1
+EBUILD libaio-0.3.112.ebuild 2097 BLAKE2B c52be9821a9f3598509ee63e4c78c205715ea6c3cb66024f00aa0e2c3f6769a21f7f7db7ceda33a6ce9c6d63e7e9e12efa9d473c7fb3ad89e0fbd3c2d66243be SHA512 d91e7f2c6c8732806d88cc85963d9b87dab1d49fbde994b16af4b283b89bbbeb14a715a8cf9ed7c0e444ba14421c81649e9aefb3d2124c9529ee607998b65261
+EBUILD libaio-9999.ebuild 2097 BLAKE2B c52be9821a9f3598509ee63e4c78c205715ea6c3cb66024f00aa0e2c3f6769a21f7f7db7ceda33a6ce9c6d63e7e9e12efa9d473c7fb3ad89e0fbd3c2d66243be SHA512 d91e7f2c6c8732806d88cc85963d9b87dab1d49fbde994b16af4b283b89bbbeb14a715a8cf9ed7c0e444ba14421c81649e9aefb3d2124c9529ee607998b65261
+MISC metadata.xml 414 BLAKE2B 291cfb45ed8ed29e916e1873b00685eb32f2cfdca2f225176028fda48335bff8369d1084565acc79d58bcf1c69af752efc0f7d30fa775406be03ce432c56c5df SHA512 31c76d1e4bb0c87402c00bdef098bf930b273cdf6c631a704fb02f925a3cdfebcded9d33d31f10cdd8c9ae2ab9bb71dd2cd0113029df501ad83a5a92b611b7c8
diff --git a/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch b/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch
index 2f1ba4b7aec1..dddb9c216607 100644
--- a/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch
+++ b/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch
@@ -1,25 +1,16 @@
-From 1df69d571c5b764c42ba17970707cc29d2394a25 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 21 Apr 2019 13:04:24 +0200
-Subject: [PATCH 2/2] respect env CPPFLAGS
+respect env CPPFLAGS
 
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- src/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Makefile b/src/Makefile
-index 66534b9..44bbef8 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -5,6 +5,7 @@ usrlibdir=$(libdir)
+@@ -2,8 +2,9 @@ prefix=/usr
+ includedir=$(prefix)/include
+ libdir=$(prefix)/lib
  
- CFLAGS ?= -g -fomit-frame-pointer -O2
- CFLAGS += -Wall -I. -fPIC
+-CFLAGS ?= -g -fomit-frame-pointer -O2
+-CFLAGS += -Wall -I. -fPIC
++CFLAGS ?= -fomit-frame-pointer -O2
++CFLAGS += -I. -fPIC
 +CFLAGS += $(CPPFLAGS)
  SO_CFLAGS=-shared $(CFLAGS)
  L_CFLAGS=$(CFLAGS)
  LINK_FLAGS=
--- 
-2.21.0
-
diff --git a/dev-libs/libaio/libaio-0.3.112.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild
new file mode 100644
index 000000000000..b6ff5d1d4215
--- /dev/null
+++ b/dev-libs/libaio/libaio-0.3.112.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="static-libs test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
+	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=(
+		-e "/^prefix=/s:/usr:${EPREFIX}/usr:"
+		-e '/^libdir=/s:lib$:$(ABI_LIBDIR):'
+	)
+	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
+
+	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 crap to / for multipath-tools #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 ddaf4e22813e..b6ff5d1d4215 100644
--- a/dev-libs/libaio/libaio-9999.ebuild
+++ b/dev-libs/libaio/libaio-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 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
 
@@ -11,15 +11,14 @@ if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://pagure.io/libaio.git"
 else
-	SRC_URI="https://pagure.io/${PN}/archive/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="static-libs test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.112-install.patch
 	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
 	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
 )
@@ -72,7 +71,6 @@ multilib_src_test() {
 
 multilib_src_install() {
 	_emake install DESTDIR="${D}"
-
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libaio/metadata.xml b/dev-libs/libaio/metadata.xml
index 68c6fef5c3a6..5870dfd12814 100644
--- a/dev-libs/libaio/metadata.xml
+++ b/dev-libs/libaio/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>whissi@gentoo.org</email>
-    <name>Thomas Deutschmann</name>
-  </maintainer>
-  <longdescription>Library to provide user-level kernel Asynchronous I/O (AIO)
- support for Linux (needs kernel patches as of 2.6.12)</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">lse</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<longdescription>
+		Library to provide user-level kernel Asynchronous I/O (AIO)
+		support for Linux (needs kernel patches as of 2.6.12)
+	</longdescription>
 </pkgmetadata>