gentoo resync : 16.09.2021

4 files changed, 62 insertions, 5 deletions

diff --git a/sys-libs/liburing/Manifest b/sys-libs/liburing/Manifest
index 467e1b169222..a13a6a89f379 100644
--- a/sys-libs/liburing/Manifest
+++ b/sys-libs/liburing/Manifest
@@ -2,7 +2,9 @@ AUX liburing-0.7-ucontext_h-detection.patch 1920 BLAKE2B 0a360811328eb19f0b0a377
 AUX liburing-2.0-spec_version.patch 995 BLAKE2B dda31830765cd4bb8fc0e178429b4e632c30e2c212a04ae0849fe4cad09a91b299a3c177d62de0939fbaa269e2d8895d60fa356952f1ac797bda340a5b1ae01c SHA512 4b22e6e1cc24ee427bb162fc1bf58e4509709deabad2a9ddb156abdbd1a094086520c5786f3f2a9c047bf4241518f88308d588b542fec292837bf23d79d4aacb
 DIST liburing-0.7.tar.bz2 86386 BLAKE2B a4fa00cc8e384f9909f3c628d479774beaffd5ab09c9f321ef22bfbabd273e4c8d4dbb30a3280633e89e1a79e893348e68f0aa2f3b1b4deda56759f77d9b1875 SHA512 9a23bc08e0fa59273264295859dddbe3276b2911df6d937b3c6f7647a250a3175222b5f051f3094efc98e48cacd242511327c5c5b895ebde10c8c87929ba4328
 DIST liburing-2.0.tar.bz2 109066 BLAKE2B e2be57f66d2a40650c74502bef55e646986443450b2cdf4d2b5247a3fa099178ae19e61a20e4452dc723351053b613a96743f1268004939da9fddd8f38df3fa5 SHA512 a0da3472eb876c9cfbe56abe14b4d926e4d1c362ee9c4f38eec4c4ab01edab6d76651ffe2afe5cac8589caadc02517950974332eb7990f8bcc9f4f4800b66e33
+DIST liburing-2.1.tar.bz2 120806 BLAKE2B 3a09d1504150ed1c111f064187d868fd86ec7c3dbf661f73999f7fbb9c945b528f7ab2e0cfff5d270a1a977f04deedc7c790b6df8708ef2884fbf28c1a9ffd1b SHA512 a658454869b01752b5e499c4f0b50c342a8ff63b3dd1a473a96f9fad03f22a6e4d2354b0e658a4e7e50ea27440a84ee274856b3687803583bc80cb4bc45aec71
 EBUILD liburing-0.7-r1.ebuild 1284 BLAKE2B 70202e46fdeced14f4f6b2f931191af8108225fb74e771630b633cfc0f8e90efadc6013e4ff16cce9e4e1211ff2bfca7ab6228c88bf0c9bc4ff49b61a39c7fad SHA512 c09d8936d6a0955d541e3b02e7d6f0b5a76e54db4c175a549e8b5863df79a27a299d1b0badf3a45b8fe936343f20f921c52ba72464228372c0599f2db915a16d
 EBUILD liburing-2.0-r1.ebuild 1293 BLAKE2B 5c377b39f0f8297f227b84453ac0f909075d4f5f37ef3feea19c1178d3bcf383cb2368acce1d6f52753799fe74ffa708c4aa7266200e715b10149193ecb69138 SHA512 cc9c46893838fa836cf5c3e45c669545522a3e6bf10933bd5ca94af9f7169f61081824d15aa36636c2e3cd52fd4f8fc1fc7c749b81c9e3940e05bdfcf1fd9a02
-EBUILD liburing-9999.ebuild 1226 BLAKE2B d68e0aa6bddb1a0516c1f4cb69519b6a4592fab313d4be9d5c57fd0712dcd9c701d25c3722365e29f0cb6736ef789474dd2e00eead5ccd26617a8a2f0a74125e SHA512 1fd12842da2e9cb17a7e4fb88b16ee00a97d763df56728a574c102eb228c0cfbc5c703a9fc5c22941241356cd5731728bd0d30635a1ce19d0c99f4917581dad0
-MISC metadata.xml 330 BLAKE2B 9999abbe311550c99eac0de3e7942a37bab51413090b5ca192c0deeac61e3b0d3017a0c05650a433041e1589a6518539ea6686494cd9f57d787ab7519caa78fd SHA512 fe3f892ef7bea57e0c2889ef07f25a8f4230bd54484c73c8c00685a5a05d269271513b7235bf15dcb594b2e18e5e7d638d5d37c4b4563449dc6af1afbacec1c3
+EBUILD liburing-2.1.ebuild 1235 BLAKE2B 9d64187cadaa2fe0f6f67a8640fe9d6ce3a545e3810493efbb62d1b2f27d7f293dc01ef2fda2b474be9a46d76675c328eddf25e7b484e592d3b41f149a0a65eb SHA512 7434cdcdf2b0fc93ae81d8f63ccfd237f4ad454c017903f9a0e741d37069ce3932baabd97d80913f3cc9fd10c68c30ca1d59c3f0933eaf79c05bb2abef381202
+EBUILD liburing-9999.ebuild 1235 BLAKE2B 9d64187cadaa2fe0f6f67a8640fe9d6ce3a545e3810493efbb62d1b2f27d7f293dc01ef2fda2b474be9a46d76675c328eddf25e7b484e592d3b41f149a0a65eb SHA512 7434cdcdf2b0fc93ae81d8f63ccfd237f4ad454c017903f9a0e741d37069ce3932baabd97d80913f3cc9fd10c68c30ca1d59c3f0933eaf79c05bb2abef381202
+MISC metadata.xml 331 BLAKE2B 4466b3a5d60709f68985e860c920b53fc59d3a06c1110876ffa31edc80fc69305f2221ced9b60ef44d4ab77e1209aa9f2f7cf4037a2d411f9f31885baa55a73f SHA512 977da0c23dd070b8dc35c569993e3517c7b236f8dac5cf9ce7fcc16a77550cb58ddf9c9a3139835be48e3a3c82dc86efe4be304c8784e13f82b6856c7331d96d
diff --git a/sys-libs/liburing/liburing-2.1.ebuild b/sys-libs/liburing/liburing-2.1.ebuild
new file mode 100644
index 000000000000..6d65622e2a7a
--- /dev/null
+++ b/sys-libs/liburing/liburing-2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Efficient I/O with io_uring"
+HOMEPAGE="https://github.com/axboe/liburing"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/axboe/liburing.git"
+else
+	SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+LICENSE="MIT"
+SLOT="0/2" # liburing.so major version
+
+IUSE="static-libs"
+# fsync test hangs forever
+RESTRICT="test"
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}/usr"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--libdevdir="${EPREFIX}/usr/$(get_libdir)"
+		--mandir="${EPREFIX}/usr/share/man"
+		--cc="$(tc-getCC)"
+	)
+	# No autotools configure! "econf" will fail.
+	TMPDIR="${T}" ./configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1 AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.a" -delete || die
+	fi
+}
+
+multilib_src_test() {
+	emake V=1 runtests
+}
diff --git a/sys-libs/liburing/liburing-9999.ebuild b/sys-libs/liburing/liburing-9999.ebuild
index 5730a362b7e1..6d65622e2a7a 100644
--- a/sys-libs/liburing/liburing-9999.ebuild
+++ b/sys-libs/liburing/liburing-9999.ebuild
@@ -12,10 +12,10 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/axboe/liburing.git"
 else
 	SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 LICENSE="MIT"
-SLOT="0/2.0.0" # liburing.so version
+SLOT="0/2" # liburing.so major version
 
 IUSE="static-libs"
 # fsync test hangs forever
diff --git a/sys-libs/liburing/metadata.xml b/sys-libs/liburing/metadata.xml
index e9a23bab52b3..52230348c908 100644
--- a/sys-libs/liburing/metadata.xml
+++ b/sys-libs/liburing/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>polynomial-c@gentoo.org</email>