gentoo resync : 02.02.2022

4 files changed, 5 insertions, 101 deletions

diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 44e64b4f6a64..6eab1ae12078 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,7 +1,5 @@
-DIST expat-2.4.1.tar.xz 445024 BLAKE2B 2ae66d284a03176ef7290093f59bb7ad98011dfbf3c7c3515ba4e4b99f849474def6ce6d9844c944fed22d86ac4ea1a38863646be914d9432eda7b69d890be65 SHA512 9dc760dbf701f75e55c4479d81417622f8c750d8473498458a382a4c2932a2976a059cb3589f88855188e5173ec7868d285c4601428e0ca625df7a59cf975191
-DIST expat-2.4.2.tar.xz 449664 BLAKE2B 627ee86bd878b8f0edc50bdbeb26d347ec8bdd06fc369a3ee378ad133d38eb7cfe9018a5839843ba6757d727e84229c84c51d618b5de7e92197bdc7203e09b73 SHA512 c27f2b54e9babc6bd24283b62cc65546f37fa40481ac55b84d9e3ecad1b58d3c52055c71d56600b43aaf20ad142c70899a8dc424dba804b1699077c38dfe34a3
 DIST expat-2.4.3.tar.xz 451012 BLAKE2B 4c0200837ea0054a88d2a2606486482f234e4b4f6b5f16134bf2a4b7b61457b12d534c6be3f16d28f6926f896d00177ef53a947a0a6c3ad11ff024a8e76edf84 SHA512 62a7fe751f6846deec4b04fd2c2ca8ed9e139fa27cda0e3fe7f8f05107caaed70597aed17b45c49d30a60c8a0c6beae1317dd5f24240640310951aabb16dbcb7
-EBUILD expat-2.4.1.ebuild 2277 BLAKE2B 5e2039ed2e5604aafde9f4ae1b61a931c3c8e7bade01349eb804e62efc12650ae0ead3531672df8064c7dcb9a257cf00314ed7c6a591b10731a465cc9279697d SHA512 e69a6ec9a906245e8d884cb5019b68644f0e86a48fb5d30d012c588442db761b3bdb115f5ab4c7e50e36251a0edf22389ead0f36823db59a6a9d873dbc10ca82
-EBUILD expat-2.4.2.ebuild 2285 BLAKE2B dd2061f953c915e133c608b5aef2e1f63fe546a92fc02e00e936ebe2fc91d9cdd9299510c9e742b3682de6184f6cf5cfbd4cd337d42c7efd4c0c7af8b4bfed5f SHA512 a81794a0eb965a9adbd7762abcf4765abac6078f3d10874306f594c66cb1abb6b01fe346e0bd12fae249127dcf6accbbf5d9c3efc05fb2e1d66264462bf404b4
-EBUILD expat-2.4.3.ebuild 2285 BLAKE2B dd2061f953c915e133c608b5aef2e1f63fe546a92fc02e00e936ebe2fc91d9cdd9299510c9e742b3682de6184f6cf5cfbd4cd337d42c7efd4c0c7af8b4bfed5f SHA512 a81794a0eb965a9adbd7762abcf4765abac6078f3d10874306f594c66cb1abb6b01fe346e0bd12fae249127dcf6accbbf5d9c3efc05fb2e1d66264462bf404b4
+DIST expat-2.4.4.tar.xz 449448 BLAKE2B 20b2cfb27746c24e56580478c933b3ca9e9ff19aed13561bc07e8ad879daff575882b8940fdca00f8c99b146067438a4a680238728098b10e4d08303ffa00119 SHA512 c88a82f4732e27340eb9480c082bcc909b0284e16b368ee9feeb4e2dd058e8f7c42fd48feacd5272cc76cb78bd183df33eb5d0b135fdd1d3c493cb156572ab76
+EBUILD expat-2.4.3.ebuild 2277 BLAKE2B 5e2039ed2e5604aafde9f4ae1b61a931c3c8e7bade01349eb804e62efc12650ae0ead3531672df8064c7dcb9a257cf00314ed7c6a591b10731a465cc9279697d SHA512 e69a6ec9a906245e8d884cb5019b68644f0e86a48fb5d30d012c588442db761b3bdb115f5ab4c7e50e36251a0edf22389ead0f36823db59a6a9d873dbc10ca82
+EBUILD expat-2.4.4.ebuild 2278 BLAKE2B 6d9fb099b1c670541e10df0feeb1b9f10004763c4f13a2849a4deafea35a96b691acd85ab71e9da185cca797925572334aecc683f27f3ab751b9dfb9d9304617 SHA512 d52bb96a4d09c86f15d80bdbb554516a922939b6295c2efe6b0f88cbc72f02b51850aea1b202ed30693fa59f82e697ff7d727f70e085dc7f4963983f8da19a39
 MISC metadata.xml 514 BLAKE2B e38c182f42192e0f3b567423b148733b59ed885cca58d36829dfd57bad88565baca743024aa5fc701f368fcfc8886a92ae20a94f549e190a3d31e2ca5c0e28af SHA512 6248f12ed1f3e2bc10d7f11117ad18dc86ccb5ecc1fc48aac32032a062d1273e956cd22e712a1b14cc670642047f9dcaf63606dbad08895e1e3b94b0573bd74c
diff --git a/dev-libs/expat/expat-2.4.2.ebuild b/dev-libs/expat/expat-2.4.2.ebuild
deleted file mode 100644
index f397e99485c2..000000000000
--- a/dev-libs/expat/expat-2.4.2.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.3.ebuild b/dev-libs/expat/expat-2.4.3.ebuild
index f397e99485c2..8db61e9898d3 100644
--- a/dev-libs/expat/expat-2.4.3.ebuild
+++ b/dev-libs/expat/expat-2.4.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 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"
+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} )"
 
diff --git a/dev-libs/expat/expat-2.4.1.ebuild b/dev-libs/expat/expat-2.4.4.ebuild
index 8db61e9898d3..15afc9578393 100644
--- a/dev-libs/expat/expat-2.4.1.ebuild
+++ b/dev-libs/expat/expat-2.4.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 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"
+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} )"