gentoo resync : 09.07.2022

4 files changed, 76 insertions, 3 deletions

diff --git a/sys-libs/liburing/Manifest b/sys-libs/liburing/Manifest
index 00df5f6c24f2..389ffd4baaea 100644
--- a/sys-libs/liburing/Manifest
+++ b/sys-libs/liburing/Manifest
@@ -1,7 +1,9 @@
 AUX liburing-2.1-arm-syscall.patch 1752 BLAKE2B f2f27e9ff6f86b75808d99a0e89e2c8609f481ba3ff1f908b1f2ec670a5ab5518ea990ff4bc24506f5ce6f6d8e1083ac7e3b0aaee9d72a8fb5bc3d4577617309 SHA512 04e1c92d6b399f046c500ff3a7d78990682e60df3994431977f7a01bea0fba0fb1dea6e66340bfd79869fbc2114f4e9a9eb391ed26d81a3041accf78141fd158
 AUX liburing-2.1-gnu_source-musl-cpuset.patch 1483 BLAKE2B 4df57662e28240455795415c4de4b3047afdfcd0818d829f79c0489539d6646fa84de8ef94d15488e8d66169598bbfdd4dbbd21c90638eb5e372ecfdbb2dfe8c SHA512 a779f9077c2529c8e294ff6c22823c149d79eb84f20889583422987eec42c3e549d61041e07456a9b085284fdc5f44e8816efa837e4e8865deb6874f29f463f0
 DIST liburing-2.1.tar.bz2 120806 BLAKE2B 3a09d1504150ed1c111f064187d868fd86ec7c3dbf661f73999f7fbb9c945b528f7ab2e0cfff5d270a1a977f04deedc7c790b6df8708ef2884fbf28c1a9ffd1b SHA512 a658454869b01752b5e499c4f0b50c342a8ff63b3dd1a473a96f9fad03f22a6e4d2354b0e658a4e7e50ea27440a84ee274856b3687803583bc80cb4bc45aec71
+DIST liburing-2.2.tar.bz2 172733 BLAKE2B 19ae8a356e4fdc296bfb3ff121b777bd7c970388b31686aac5c531508e807360d58220bc27f9c62c55bd76ca687013acfceb3fa8a2162b615561f637cc50ffe1 SHA512 55b935a90c108be54393a5ab341b56e40ad8d506360fe15b3dcde5ee263356f11080f8614efdc4253f6318ea35d808ec47a9dbfc6b9f6cc2e04f7f1a75c3f621
 EBUILD liburing-2.1-r1.ebuild 1525 BLAKE2B 4315bda5edd8f067d44048764d945b3c2bde63de6fb3781681bd757e316997856c36ab465279819917a4d75ca4d962f7d9cfffd1f1b97c068cc30be9a3045053 SHA512 1d6894c92fc242ea393aa3d3b5813eec625742ff75b334d365bdcc6cb78b6c18b5a6c8abc07e7d427135af35b7e2127e687aba4cca65c9c204f76267b407f0fc
-EBUILD liburing-2.1-r2.ebuild 1731 BLAKE2B a5688f2d75d3bf97e0e38ac034ac2529ee3cd878630831f9ad2f31bcbca0be1be375a134900dd89f1f7849b447240a1f13e13e7d728a93f1e75f688d34be9823 SHA512 7171756318887381a55b6c1b7c7ac5d51148a922e1a8ebeed898489b42f7e865afd6ad0c9abffee5bf11a7fb350dc798ac2fbebc87f21c0713dfedbb4fd990ca
-EBUILD liburing-9999.ebuild 1463 BLAKE2B 8955097aac1403866ea4b1049380a3407100c3aead3a4f17c059a2f29a1d693a6c3a78be049aff4a006e45a6e54c06d06611b86a3a6c065a47bfc35eca009898 SHA512 fe22553e851b29b76b8d1294a9dc4ed85108930d6759fd11300074535f652186ad38f2569c05c0ff1b135404d2adc05ac4da4f67e2a7f533ee5b3d503d51345b
+EBUILD liburing-2.1-r2.ebuild 1724 BLAKE2B 900c92124e14b809a698f48b81536e4b6c37e6629169fcb0b668cefb51cdcba84d7555a3eff957b0bd1b9c37bb2f4005d9c2bae569b6a1b852043c77614f3d02 SHA512 385c3f5f1d2d5bc38463d758d317ce58ee57261b80e039772a3a050d4aa870dcd80f4a7d5247e6036aea777494edf40af6669438ea4ef9b1cad87144437789aa
+EBUILD liburing-2.2.ebuild 1581 BLAKE2B d67499bcdff891ee3d5883f01dd1250c5357551719cab3aa1b52ec69083acdbe2ef28c29acdab92223ace87440309c7357cc663542270a04889fc558457dc034 SHA512 1820e0094a1830a73d404c052fd22e6fdc9dbc264dcb3b351f8d672caebbb8ab42a9cb318fd33e098ba4d2f2781bd35d903527883bd1af7b581e779e5882dde0
+EBUILD liburing-9999.ebuild 1581 BLAKE2B d67499bcdff891ee3d5883f01dd1250c5357551719cab3aa1b52ec69083acdbe2ef28c29acdab92223ace87440309c7357cc663542270a04889fc558457dc034 SHA512 1820e0094a1830a73d404c052fd22e6fdc9dbc264dcb3b351f8d672caebbb8ab42a9cb318fd33e098ba4d2f2781bd35d903527883bd1af7b581e779e5882dde0
 MISC metadata.xml 326 BLAKE2B 7c133a6dbb4ab4b537c0741ec9f3cd525c0803040950ee93e4c1cbc848c7618074471cc1a18ca07d6963c06252c83b66df0811ebae4c0cf9d7782f66ca5aa14a SHA512 1aacf941a9fa57429468fdfc8f546f559c5d483988ba5c6b0f4ed0fe5913f85d218b2a9eec83bae1d11a71eed36a37e76ccedc192697fbe9763fd0b09b2dcfd7
diff --git a/sys-libs/liburing/liburing-2.1-r2.ebuild b/sys-libs/liburing/liburing-2.1-r2.ebuild
index 93c68a5c250e..2c652078fe04 100644
--- a/sys-libs/liburing/liburing-2.1-r2.ebuild
+++ b/sys-libs/liburing/liburing-2.1-r2.ebuild
@@ -12,7 +12,7 @@ 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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 fi
 LICENSE="MIT"
 SLOT="0/2" # liburing.so major version
diff --git a/sys-libs/liburing/liburing-2.2.ebuild b/sys-libs/liburing/liburing-2.2.ebuild
new file mode 100644
index 000000000000..60a614906d8e
--- /dev/null
+++ b/sys-libs/liburing/liburing-2.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+LICENSE="MIT"
+SLOT="0/2" # liburing.so major version
+
+IUSE="static-libs"
+# fsync test hangs forever
+RESTRICT="test"
+
+# At least installed headers need <linux/*>, bug #802516
+DEPEND=">=sys-kernel/linux-headers-5.1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" != *9999 ]] ; then
+		# Make sure pkgconfig files contain the correct version
+		# bug #809095 and #833895
+		sed -i "/^Version:/s@[[:digit:]\.]\+@${PV}@" ${PN}.spec || die
+	fi
+
+	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)"
+		--cxx="$(tc-getCXX)"
+	)
+	# No autotools configure! "econf" will fail.
+	TMPDIR="${T}" ./configure "${myconf[@]}" || die
+}
+
+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 c1f03b400247..60a614906d8e 100644
--- a/sys-libs/liburing/liburing-9999.ebuild
+++ b/sys-libs/liburing/liburing-9999.ebuild
@@ -21,6 +21,10 @@ IUSE="static-libs"
 # fsync test hangs forever
 RESTRICT="test"
 
+# At least installed headers need <linux/*>, bug #802516
+DEPEND=">=sys-kernel/linux-headers-5.1"
+RDEPEND="${DEPEND}"
+
 src_prepare() {
 	default