gentoo auto-resync : 26:09:2022 - 09:07:40

13 files changed, 354 insertions, 294 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 1407f9b6e1c0..21a64ac4c8fa 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index f74f6a0cb3fc..3080a0091345 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,9 +1,3 @@
-DIST expat-2.4.6.tar.xz 452468 BLAKE2B 8b30acc2628e3ce67ee57a4c9bee232f89f49ee70901588f7f5a34844e459cbc447fd225a734078100e52c96a73aa1f016e4f2d51d9a079128d661d97b2213c0 SHA512 830b00dbdfb92ef5cab69d783762a78443cd7d834bccda072d103c6178327cf480bde579089b1c3be884e67ddb862178fa734bd7e1f992f6f0ca29d83e21d737
-DIST expat-2.4.7.tar.xz 454136 BLAKE2B 441616f44ce585f75a67a3ebc2264e5723df55975dbfa9a9279039d3773d9e5a4b37c70a8e26787bbc8742fbc66a077e6845b540df6fede936d98065587fe3ac SHA512 e1a16cd48fcd6c4974dc7058d2e0284e0f91565835ec93f16d3f2c79647124470e5edb9f88f1ab9df5f403883a527750a4d63b941bd26fd43c05cd6f42bdcc48
-DIST expat-2.4.8.tar.xz 454428 BLAKE2B 25da91fdcdefe81740cc8129fa52bf4ceb0bbbee11f0d750485424dbc638f5fba8c30007d0f0b0e3ff5c84fe197b9b220852976272dfe5d6cc451d114297c2d7 SHA512 d19b0d6469537aed20c54bd9cfa4089d39e4acaaddde57809de7c6aec55dc870677c02480e7f65dac5620bd5454b889370453613518f9da647c74a831a2a1b7b
 DIST expat-2.4.9.tar.xz 459284 BLAKE2B 105fef732e26b691f6c212341b7377b518d693aa67f106d0ff2f0fbccd798b7526473ed21e22b6d2b6f1ca8aa7d0eb0adc62ffdefc3c2cb81a6af5a379e64de9 SHA512 8508379b4915d84d50f3638678a90792179c98247d1cb5e6e6387d117af4dc148ac7031c1debea8b96e7b710ef436cf0dd5da91f3d22b8186a00cfafe1201169
-EBUILD expat-2.4.6.ebuild 2277 BLAKE2B 5e2039ed2e5604aafde9f4ae1b61a931c3c8e7bade01349eb804e62efc12650ae0ead3531672df8064c7dcb9a257cf00314ed7c6a591b10731a465cc9279697d SHA512 e69a6ec9a906245e8d884cb5019b68644f0e86a48fb5d30d012c588442db761b3bdb115f5ab4c7e50e36251a0edf22389ead0f36823db59a6a9d873dbc10ca82
-EBUILD expat-2.4.7.ebuild 2277 BLAKE2B 5e2039ed2e5604aafde9f4ae1b61a931c3c8e7bade01349eb804e62efc12650ae0ead3531672df8064c7dcb9a257cf00314ed7c6a591b10731a465cc9279697d SHA512 e69a6ec9a906245e8d884cb5019b68644f0e86a48fb5d30d012c588442db761b3bdb115f5ab4c7e50e36251a0edf22389ead0f36823db59a6a9d873dbc10ca82
-EBUILD expat-2.4.8.ebuild 2284 BLAKE2B 814372a31968e1f5c6109dfb456549c53e1795964e853ef1e7cfa4aac56800fc6c8a74f2decda30f8627e2f94c469fdf7d43df0a82465b6c512fe2beda1e0f4e SHA512 9794fb4ba34a5cb4ff6420fc5ba9c091e5b8314d13149e56a37a1b98cb2c91006b34b1819a0ff1f10ffad9663e169e63f6d330787087a2cf0cac1fe7d1592f6b
 EBUILD expat-2.4.9.ebuild 2284 BLAKE2B 2f75d5b3709f2891725858a1b4f0f3d357288453653c40e32fcc599caedc1e0d6e0755ce497d00a535f2ac6ebc925c7ad4b9703bb6e88c58ee6f6a45f49dbb52 SHA512 216cf850735cbd4d992b7163dd2fe921f368876af70fa9d84229bdfb81f54d61078937ad007645d6b4578f4262f6ad963a19d13546d0d28aa5ae87cfddf6ff00
 MISC metadata.xml 571 BLAKE2B ebefe11eb4a54dda87048089930a051a629fd99a6983b3c804dfd033eee4017c3b1871cbdff56c8659cdf74b19651cd7f2134721a9bab3e8a752d4a1694c6266 SHA512 8d726b1dee71528e43c8693bd4b08cf33a94f43470126aa18a51ed248b032c5e8b9d801c5b2d5f58c2fd7896b32ee9e6eb3953395e5a6004cdf00569d114ad1d
diff --git a/dev-libs/expat/expat-2.4.6.ebuild b/dev-libs/expat/expat-2.4.6.ebuild
deleted file mode 100644
index 8db61e9898d3..000000000000
--- a/dev-libs/expat/expat-2.4.6.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-AUTOTOOLS_AUTO_DEPEND=no
-AT_NOEAUTOHEADER=yes  # because expat_config.h.in would need post-processing
-inherit autotools multilib-minimal
-
-DESCRIPTION="Stream-oriented XML parser library"
-HOMEPAGE="https://libexpat.github.io/"
-SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="examples static-libs unicode"
-BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-
-	# fix interpreter to be a recent/good shell
-	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
-	if use unicode; then
-		cp -R "${S}" "${S}"w || die
-		pushd "${S}"w >/dev/null
-		find -name Makefile.am \
-			-exec sed \
-			-e 's,libexpat\.la,libexpatw.la,' \
-			-e 's,libexpat_la,libexpatw_la,' \
-			-i {} + || die
-		eautoreconf
-		popd >/dev/null
-	fi
-}
-
-multilib_src_configure() {
-	local myconf="$(use_enable static-libs static) --without-docbook"
-
-	mkdir -p "${BUILD_DIR}"w || die
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
-		popd >/dev/null
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib install DESTDIR="${D}"
-		popd >/dev/null
-
-		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
-		cp expat.pc expatw.pc
-		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	doman doc/xmlwf.1
-
-	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
-	docinto html
-	dodoc doc/*.{css,html}
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-		docompress -x usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/expat/expat-2.4.7.ebuild b/dev-libs/expat/expat-2.4.7.ebuild
deleted file mode 100644
index 8db61e9898d3..000000000000
--- a/dev-libs/expat/expat-2.4.7.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-AUTOTOOLS_AUTO_DEPEND=no
-AT_NOEAUTOHEADER=yes  # because expat_config.h.in would need post-processing
-inherit autotools multilib-minimal
-
-DESCRIPTION="Stream-oriented XML parser library"
-HOMEPAGE="https://libexpat.github.io/"
-SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="examples static-libs unicode"
-BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-
-	# fix interpreter to be a recent/good shell
-	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
-	if use unicode; then
-		cp -R "${S}" "${S}"w || die
-		pushd "${S}"w >/dev/null
-		find -name Makefile.am \
-			-exec sed \
-			-e 's,libexpat\.la,libexpatw.la,' \
-			-e 's,libexpat_la,libexpatw_la,' \
-			-i {} + || die
-		eautoreconf
-		popd >/dev/null
-	fi
-}
-
-multilib_src_configure() {
-	local myconf="$(use_enable static-libs static) --without-docbook"
-
-	mkdir -p "${BUILD_DIR}"w || die
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
-		popd >/dev/null
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib install DESTDIR="${D}"
-		popd >/dev/null
-
-		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
-		cp expat.pc expatw.pc
-		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	doman doc/xmlwf.1
-
-	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
-	docinto html
-	dodoc doc/*.{css,html}
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-		docompress -x usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/expat/expat-2.4.8.ebuild b/dev-libs/expat/expat-2.4.8.ebuild
deleted file mode 100644
index 28bf1c806325..000000000000
--- a/dev-libs/expat/expat-2.4.8.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-AUTOTOOLS_AUTO_DEPEND=no
-AT_NOEAUTOHEADER=yes  # because expat_config.h.in would need post-processing
-inherit autotools multilib-minimal
-
-DESCRIPTION="Stream-oriented XML parser library"
-HOMEPAGE="https://libexpat.github.io/"
-SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="examples static-libs unicode"
-BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-
-	# fix interpreter to be a recent/good shell
-	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
-	if use unicode; then
-		cp -R "${S}" "${S}"w || die
-		pushd "${S}"w >/dev/null
-		find -name Makefile.am \
-			-exec sed \
-			-e 's,libexpat\.la,libexpatw.la,' \
-			-e 's,libexpat_la,libexpatw_la,' \
-			-i {} + || die
-		eautoreconf
-		popd >/dev/null
-	fi
-}
-
-multilib_src_configure() {
-	local myconf="$(use_enable static-libs static) --without-docbook"
-
-	mkdir -p "${BUILD_DIR}"w || die
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
-		popd >/dev/null
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib install DESTDIR="${D}"
-		popd >/dev/null
-
-		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
-		cp expat.pc expatw.pc
-		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	doman doc/xmlwf.1
-
-	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
-	docinto html
-	dodoc doc/*.{css,html}
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-		docompress -x usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index a0a10d90fb2f..4410de433fdb 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -6,6 +6,6 @@ AUX libaio-0.3.113-respect-LDFLAGS.patch 537 BLAKE2B 6981fe9a607ddd4f9f803797f91
 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-0.3.113.ebuild 2292 BLAKE2B a70a28043d87b40b816792811b87ffacc7c58f7bfc21d0fed714839560766724c7bcfbc10f2e969da7347a413e8774077e402021f714d256f8e12080257e4bb8 SHA512 0489a3ddb8d8f1cdb98327db63858cdd02f48494ddb298e553c218d53757efe46e3acf3d26d7309ea5b79c951c582ecb7dccc4c8a170a8d65552f4ff8e531c01
+EBUILD libaio-0.3.113.ebuild 2289 BLAKE2B f12ac5a0fa3157b55a7a0adb2039506c50aca82c8d299508d82a0d24edef92182785524e5e88c3a5a04f822e3a9def3d8316b37130a8085d4575558f80eee752 SHA512 6f36d8dd7f1981c4d2dffe53866557b5b8bfd5d0953cc617f8a52e3da06769316420725aa4795ebf9200820e78b4d3e8c5a271f52aad1eed12cf49ddc17b000f
 EBUILD libaio-9999.ebuild 2248 BLAKE2B b9df5b16af67563434bc1297eb3d5b4ca767db287f57f457152e9f41d20f5f56cdb2fd0f2588667d197e0c5ecb4402774c2ecbc226ba0d9cf403933148c603db SHA512 82e56ce625dce6d15a6061897ed7d710c06692c326befc8f6b5310c4826716cfaf9a7b71d411d9dac6e6ee8033dbbc166e85f6ce60cbb3601e841208a33ef572
 MISC metadata.xml 415 BLAKE2B 5f25806b5b169a85b455a39a9ba1995ccfa3c41e17ce1b8a7f2269167ba477fa0b76abc4ba46d977e5d6bba365b63e342304837a19dd57c0ac8d83e5846a2b22 SHA512 ad7bc8b579f5037c678294b77511af2b9027ed696a814bbbda6e3f630853040092b0abe20967d52fef7f65815c807bd49a2e57f392cd1035d1133e6d48009204
diff --git a/dev-libs/libaio/libaio-0.3.113.ebuild b/dev-libs/libaio/libaio-0.3.113.ebuild
index 230e60739002..a272c2a3e11d 100644
--- a/dev-libs/libaio/libaio-0.3.113.ebuild
+++ b/dev-libs/libaio/libaio-0.3.113.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	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"
+	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"
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index 5ba0ea77d9b7..16dae6111dc4 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -1,5 +1,5 @@
 DIST libatomic_ops-7.6.12.tar.gz 506313 BLAKE2B 8f80773390479a36e06447594c8558ed337eef5b18ae0b0779722647dcde49b61b23e656acbc935714245d80e40c5cde1c164f0524a97dcc53972051d5891239 SHA512 bbf98a38a80c8fe6b7eab773967edc55b8d48be32b36ed827fb835ee3dcd96d5ec1dc97149714e015e93a0a5b9fc03595797663fdb5a0f673869ea8bfe640df5
 DIST libatomic_ops-7.6.14.tar.gz 500006 BLAKE2B 02bf8448eb61119d5eea81d6a861238f5aae4c7740536f9c17c614d199db81eb7cb6e07d6edef1a76cae88bdd2b021fa0692f2b42842692ec853b2879c559d81 SHA512 da83886b4d766da64b27672eede40bd5787523a4c308ac7bd3f03ac831ae1a141ba21e5f5ada27bfcf811b9fb04d8a519331ea2573af036f8791958668dad851
 EBUILD libatomic_ops-7.6.12.ebuild 745 BLAKE2B 74160baf7648726668b3d23585aec1c9bc1cba67c2f655d2ddc0c072e15cc79ac01636ccb34be1bad214e02a51470f3de2b2d63df7404e8f7ac64db44ea46653 SHA512 2acc19dfc4012b63059f45429781150d3095a3cf56449ade61b3bb060ec5211d942ad95c89e9f47080a45c5df7d8b7c3960a9289ad71d1943b98f53138b8542d
-EBUILD libatomic_ops-7.6.14.ebuild 760 BLAKE2B 74e8b6d5e43885266ad36206d5ac3910c1dbbf0282dad4161cb51a625b612ec64e9185955d62db677f763a9de5dfcc6d313938337839a4fdb7319e74626e54f9 SHA512 0bcea8bffc3736ce61d033f4f4f60a94d4d97f075a0ed0b647a4569e0552ac7efaf0475b248ef9143b04470c8325754ce2bf3ecc4e05c0fd9e0af29c97c8c585
+EBUILD libatomic_ops-7.6.14.ebuild 755 BLAKE2B c1c7034599546eb0eccdf9545a463efd2b6150d546c8adb23d431ef1c26d7931565ab0f4f11721ad52d2fb5c3cbdc7ab9e21f413b76e341d10be5df614449920 SHA512 4dc023407f548c371aa410fa97fcf853edca7e3962308cd4d7d3821e4633bceeabc6da657803ec10ba3fa810333f701b263b4436c28fc17b40ae7c98250f7df7
 MISC metadata.xml 476 BLAKE2B ebb64fe1d7008e89803b62789927ba37fcbafddb2758c0dbd26590335466cc3e35515e1a00cb3331db03041ca28354641b9fc3f37d29a4cc8bfb53507bb3d81c SHA512 28c2f2d8c5abcf72abd825be52584ca2c9e08674caddd28333e90ebfd3bae4f8d52100f2b887efdb0ccf6eff6314dcbf99282589db0c6dca7dd9a91dd5a0d066
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.14.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.14.ebuild
index 5a426a69beb9..ec09d872d6f9 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.14.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ivmai/libatomic_ops/releases/download/v${PV}/${P}.ta
 # See doc/LICENSING.txt
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf --enable-shared
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index e1da106e3009..7dd431679f78 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -3,5 +3,5 @@ AUX userspace-rcu-0.13.1-tests-no-benchmark.patch 441 BLAKE2B 8e5737b349d21ae4cd
 DIST userspace-rcu-0.13.1.tar.bz2 609961 BLAKE2B 96581fb3e90764870d2eb3eff6999e3c20bf206e3a0d5c910acfe693d55e0cb389fa5126a74d175f3c46655e740ecf1c1426c367eb3c28f3ef3a634848e51e83 SHA512 c86f2eb260cccb3cb6bd54ddbc0b46e60083fc99423e9403242ebed7f39a2a49c68af933ea6f373e2a9d4f9dc56f5befe030740891e28cf2fabe927a48ff8182
 DIST userspace-rcu-0.13.2.tar.bz2 611448 BLAKE2B 6d502e0035b03df262c917ba70f7442e2bd81369091b2c521fe5c32f31ed2ef7404070759f3a8910b767153e05d28e354d5e5ece2a3ba17e4a31dd7db3e1924f SHA512 e5097a7f653f51b3a47a09f79e7a153aab8fd22c0504a1127a9b33d093a9ae6a941b97c0fe175ee168e2976097aefdcdf8d5ce030afbe565c1b72f64d6f5b60a
 EBUILD userspace-rcu-0.13.1.ebuild 1106 BLAKE2B 178a7101a35c4ac47d1ec5522b59d23cf0f1a0a15f569a1b3fb6846a720f92bafc7fc6b90398b3e11f8b5f98e1a16690b707b94ec869ce32b910e4ac132a0b66 SHA512 79ff76ca5bc0dc71a9548d927e61d64afde3232fa1bc5a64391252386d183a51c3a55546b138626eb526c630f68efe0cc28ff0e266c825247ce38c7573e1a221
-EBUILD userspace-rcu-0.13.2.ebuild 1107 BLAKE2B 50dba00ffc18f44348921f74a6921aa7983e017cce4a3dc2a41c9982cb3e514531842c6c93afb113a132a66f20fe6663736ec4a49106358457e56da3c6be96a5 SHA512 57e874e57cb1758349810e6da234717b6b1d9d5af98c4cf79e64e822d91244448113cc8046a67649ad6cc395b06a41ea2d458aa36e88b4ce09698776063050aa
+EBUILD userspace-rcu-0.13.2.ebuild 1106 BLAKE2B e715d27230f38a2981f7aef2edfcef9291292e6c6eb211dfcc8eee02935f49b001f5560e6a879ff0de203cc5cc30778290a83f228dfbce3d2c5d95af0146ab6a SHA512 eb3fa88ff25378dc8d45001b923aaddb88e7c72ef5ed68edea6059bc7da11baa2f586b8f9fc74df4f44bd15e4573dc62c3605b712d7db7f3142fd0256e9f10d6
 MISC metadata.xml 341 BLAKE2B bc37ed52ea2032c387966023434b69d8b184e7800e8588398350eaa6f55c8895822370ebcf971b8ebc87d112ec3de973929455a78519b4f0f5081a4693be0d8f SHA512 a88f7a9bebe6947cc296e3f0d7b316648cba7117551ee6a9b06c51d5ecd010ebf34918939fffef4dc6156dc818cbd38b72dd394a6acff9b873e8a3fc247e3f02
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.13.2.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.13.2.ebuild
index 277df9cdd9b6..329e3a0718f5 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.13.2.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.13.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/8" # subslot = soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index d2aa90d979fc..922d94d78788 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -2,8 +2,10 @@ AUX xapian-bindings-1.4.20-slibtool.patch 4917 BLAKE2B 7c2b580e39071e78120671652
 DIST xapian-bindings-1.4.18.tar.xz 1135644 BLAKE2B 7120c42d73794f8212bf15afb4566119e44cd39c711d50aab4fcc4320419babc440d4dd732af9e739c68397e740da192fa80cd08c5d2b59e1ae13af4444ff3d6 SHA512 e965384febaa83c28fd63b82192bfa4d5d34b4eb7cfacf1ddfc1201deada4f0498df8e50a191713dc95feb8edb0b1a4e9d6983a639c564f086ee305b8a05397e
 DIST xapian-bindings-1.4.19.tar.xz 1137596 BLAKE2B 46004a3449a3137db42164a8b4c5b8684d2eaf0edfa60fe7ca41d5565d1cc16b110ca8204100c9e654baa323a4c73536f80550b17989ce3ee4a132315c31a50e SHA512 c3e353a192822be5d86d448b9d5e4c5eb15d5eb2d079560f7c457f8f7ca85d42e2b933891e784d384c188577f427ca1929c2b47732b9d637e36543e8b5b704d6
 DIST xapian-bindings-1.4.20.tar.xz 1143304 BLAKE2B 3ab6a9be536d10b0dd369c1c638acbdd7fdf855f6dc8726db9c3791a8369cd83196214771b923aa538e5dda320d2b417f5f0944181b5691cfe5d8e7ddc97dd96 SHA512 bdc876b8e1b946d27673122de6d298112c82fa41e19090a2bcbe0954905ddf66171d36e6753a1e8d46578b128edd729e2fd252311d60ff40a2aec9a4d57796ed
+DIST xapian-bindings-1.4.21.tar.xz 1151620 BLAKE2B 5596d0784110b6b73efce4b330ad7c0750a7173c94c37d80b4c75865b949b16f32957ff7ca0d67c08592b85874a5b19e57a11d32ef26976fb3cae38f542f5ba0 SHA512 86cbdc8ba73be8aa947e209106dd49d111d264f0b00b5831356e19ba3299eb8f87f2c57ab051ea54c54fb5f1b8cc6a1175ee18f89094f5c7345b820ea805ad33
 EBUILD xapian-bindings-1.4.18-r1.ebuild 7047 BLAKE2B 1d2fd7b5d833876d00d49f7f5159255e83233ca662dedb720813d10ce15e39a2bfb46cdb0836b88773d3887469c3a62648356aa8676fe3a2cf1ab8e8e45659d5 SHA512 f1c2675ad652b555cb2be48a1a327192424c5866c04b10c84c9f8ea794fff8d487fc9edfe7417c8bf141fee253f2669c635c51def709818db2f8a3b6fa5a3b45
 EBUILD xapian-bindings-1.4.19.ebuild 7121 BLAKE2B a2c0d20a764a5a192e354986961803e49c535ee2338305366d0dbf93c6f1747654c30b48d01cc1fc3a9876c572e3faa588ef941b1ecad9a938060251d89d7bca SHA512 7b8b48bac9926d5a596b775bd687cafd6fc53a153ba18bc5aac8de1730c258494f7e340c623a56e218b626889f14971f44b9e6606d9cc05dd889d14346e94e84
 EBUILD xapian-bindings-1.4.20-r1.ebuild 7206 BLAKE2B badceb446b50d5b5ecb5e934efdd35daa33bed66cbdd3f0cfd48cd3878f266051c77fe08c57ff13d7dd5d1b020d905cf39269a9201a76cd22c16b348f981901c SHA512 5a58191d7c1b8c07ae331b8b24d656709985ce6bb1187c58435b388e5e52fa91ed78427c4c046f61f76e6d157d6b9db8db209b64d57f5f0564f2208fdba85c71
 EBUILD xapian-bindings-1.4.20.ebuild 7125 BLAKE2B d11fbd87002b5e57c1d3c7ce035e0d517b4cf3750bf4a5cd23c6b97203be3754744c8780d1c90848892ce55da1f1904bb70a1bd22dfaba69531fa320bcac1365 SHA512 bcda12bd88f3a6f16e9e6032a9cd143d79e4402a66f3daea677521d5b3b0502ad59a49ae9778085055498e84c1e9c3bef51e1065ed9a8ae8d2c4c86a3798ff05
+EBUILD xapian-bindings-1.4.21.ebuild 7129 BLAKE2B 8944d678da73648ef5d629c10e01786c273a541e373a30961c2ec3e85804a05798412d0f77af8ceb50f0b4e896412805fb9851c2930c210e11bae870a90afc54 SHA512 65771b8c107e0d6048bfa268c3faacafb9ca729e79cc6f0e5e87c56a5a9fe28f096481006ac6fb47f4052efa4c0101c976f2879f115fff1afbef872f92f967d0
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.21.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.21.ebuild
new file mode 100644
index 000000000000..cd70cb26aeb5
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.21.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1,3,4} luajit )
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+USE_PHP="php7-4 php8-0"
+
+PHP_EXT_NAME="xapian"
+PHP_EXT_INI="yes"
+PHP_EXT_OPTIONAL_USE="php"
+
+USE_RUBY="ruby26 ruby27 ruby30"
+RUBY_OPTIONAL="yes"
+
+inherit java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
+
+DESCRIPTION="SWIG and JNI bindings for Xapian"
+HOMEPAGE="https://www.xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="java lua mono perl php python ruby tcl"
+REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	ruby? ( || ( $(ruby_get_use_targets) ) )"
+
+COMMONDEPEND=">=dev-libs/xapian-1.4.21
+	lua? ( ${LUA_DEPS} )
+	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php:=[-threads] )
+	python? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	ruby? ( $(ruby_implementations_depend) )
+	tcl? ( dev-lang/tcl:= )
+	mono? ( dev-lang/mono )"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.8:* )"
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.8:* )"
+
+S="${WORKDIR}/${P}"
+
+has_basic_bindings() {
+	# Update this list if new bindings are added that are not built
+	# multiple times for multiple versions like lua, php, python and ruby are
+	return $(use mono || use java || use perl || use tcl)
+}
+
+php_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_copy_sources
+}
+
+php_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_foreach_variant "$@"
+}
+
+ruby_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_copy_sources
+}
+
+ruby_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_foreach_variant "$@"
+}
+
+pkg_setup() {
+	use mono && mono-env_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if use php; then
+		local php_slot
+		for php_slot in $(php_get_slots); do
+			# Unfortunately required for php-ext-source-r3_createinifiles().
+			mkdir "${WORKDIR}/${php_slot}"
+		done
+	fi
+}
+
+src_prepare() {
+	use java && java-pkg-opt-2_src_prepare
+
+	# https://trac.xapian.org/ticket/702
+	export XAPIAN_CONFIG="/usr/bin/xapian-config"
+
+	if use lua; then
+		lua_copy_sources
+	fi
+
+	if use php; then
+		php_copy_sources
+	fi
+
+	if use python; then
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		ruby_copy_sources
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# Needed to get e.g. test failure details
+	MAKEOPTS+=" VERBOSE=1"
+
+	if has_basic_bindings ; then
+		local conf=(
+			--disable-documentation
+			$(use_with mono csharp)
+			$(use_with java)
+			$(use_with perl)
+			$(use_with tcl)
+			--without-lua
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--without-ruby
+		)
+
+		if use java; then
+			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
+		fi
+
+		if use perl; then
+			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
+			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
+		fi
+
+		econf "${conf[@]}"
+	fi
+
+	lua_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-csharp
+			--without-java
+			--without-perl
+			--without-tcl
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--without-ruby
+			--with-lua
+		)
+
+		local -x LUA_INC="$(lua_get_include_dir)"
+		local -x LUA_LIB="$(lua_get_cmod_dir)"
+
+		econf "${myconf[@]}"
+
+	}
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir lua_configure
+	fi
+
+	php_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-python
+			--without-python3
+			--without-ruby
+			--without-tcl
+		)
+		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
+			myconf+=(
+				--with-php
+				--without-php7
+			)
+			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
+			myconf+=(
+				--without-php
+				--with-php7
+			)
+			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		fi
+
+		econf "${myconf[@]}"
+	}
+
+	if use php; then
+		addpredict /usr/share/snmp/mibs/.index
+		addpredict /var/lib/net-snmp/mib_indexes
+
+		php_foreach_impl run_in_build_dir php_configure
+	fi
+
+	python_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-ruby
+			--without-tcl
+			--with-python3
+		)
+
+		# Avoid sandbox failures when compiling modules
+		addpredict "$(python_get_sitedir)"
+
+		econf "${myconf[@]}"
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+
+	ruby_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--with-ruby
+			--without-tcl
+		)
+		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
+
+		econf "${myconf[@]}"
+	}
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir ruby_configure
+	fi
+}
+
+src_compile() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir emake
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake
+	fi
+
+	if use python; then
+		unset PYTHONDONTWRITEBYTECODE
+		python_foreach_impl run_in_build_dir emake
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake
+	fi
+}
+
+src_test() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake check
+	fi
+}
+
+src_install() {
+	if has_basic_bindings ; then
+		emake DESTDIR="${D}" install
+	fi
+
+	if use java; then
+		java-pkg_dojar java/built/xapian.jar
+		# TODO: make the build system not install this...
+		java-pkg_doso java/.libs/libxapian_jni.so
+		rm -rf "${ED}/var" || die "could not remove java cruft!"
+	fi
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		php-ext-source-r3_createinifiles
+		# php-ext-source-r3_createinifiles() changes current directory.
+		cd "${S}"
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		python_foreach_impl python_optimize
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	# For some USE combinations this directory is not created
+	if [[ -d "${ED}/usr/share/doc/xapian-bindings" ]]; then
+		mv "${ED}/usr/share/doc/xapian-bindings" "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	dodoc AUTHORS HACKING NEWS TODO README
+}