gentoo resync : 31.05.2021

3 files changed, 4 insertions, 104 deletions

diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 253c31f6bbc0..b92ac2f30b0b 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,5 +1,3 @@
-DIST expat-2.2.10.tar.xz 425432 BLAKE2B 5d84d7dec5aae6ca7906bd2a2b8a249457111e064295b83b6c9927b5ef0dc97e7220bac1da17781e24541259ae81b60a2314cd372bfbdfc2e08fab082377df4a SHA512 a8e0c8a9cf7e6fbacdc6e709f3c99c533ab550fba52557d24259bb8b360f9697624c7500c0e9886fa57ee2b529aadd0d1835d66fe8112e15c20df75cd3eb090f
-DIST expat-2.3.0.tar.xz 433508 BLAKE2B b547cbca23f2ca11bef326225b8e2958a3539dbb14789c33fb0f2aede35bfbe12981d151624b0497ab2ad488ec06529ae2a996e514b19b39622ae7fc29f47832 SHA512 dde8a9a094b18d795a0e86ca4aa68488b352dc67019e0d669e8b910ed149628de4c2a49bc3a5b832f624319336a01f9e4debe03433a43e1c420f36356d886820
-EBUILD expat-2.2.10.ebuild 2463 BLAKE2B 2a8e49570989a3551678feb811de9b44f117bc87c485c5bb17ec5d93bfbafb4c52c35ca2020fa230b369876d1181556aaf014d665eeff0b3f8a8a9419b16fe48 SHA512 a50c4974e7dc22818b1d580114e45d00a5066c116575358c8e12614f317cb918a26aa9a8355b749c6d116f8beb3d2287f5109a4dd1a82247594d4da6eebbda4f
-EBUILD expat-2.3.0.ebuild 2471 BLAKE2B ec8e417f394f038843c9b41de497ff614eb214c7a6227249cd14d1852ecd15b25d0fe688b5d4ed16e15465629818ad8c63a0823edfbc02261441c35f1d10199c SHA512 e55f579f5e3df0f93cc1a549294e88a240516a976c08531a879b088f08f3f48346b71e9e5b730877bf3a4f305ca3c8352cc5ab9fe3d0b31e29a2fa6acc3d14c3
+DIST expat-2.4.1.tar.xz 445024 BLAKE2B 2ae66d284a03176ef7290093f59bb7ad98011dfbf3c7c3515ba4e4b99f849474def6ce6d9844c944fed22d86ac4ea1a38863646be914d9432eda7b69d890be65 SHA512 9dc760dbf701f75e55c4479d81417622f8c750d8473498458a382a4c2932a2976a059cb3589f88855188e5173ec7868d285c4601428e0ca625df7a59cf975191
+EBUILD expat-2.4.1.ebuild 2536 BLAKE2B 9972eb17fabcb88abbef831e3788c65ce24145784da964de422b04a3662a534573e2f6b9570ca0ce9ad3f545a252fcdedcf09ddc350f7f8142cb04e3f91acb8a SHA512 dff4de479c889a0f68428e9bc5d0d46a452212c1c3cc2aa57c39021a1d4a216c1abc4854ac229bf5b14384c356d405727d3b7af9e02b689cd342eb42bbfeed2f
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.3.0.ebuild b/dev-libs/expat/expat-2.3.0.ebuild
deleted file mode 100644
index 9a3178cd3f51..000000000000
--- a/dev-libs/expat/expat-2.3.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-AUTOTOOLS_AUTO_DEPEND=no
-inherit autotools multilib-minimal usr-ldscript
-
-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="elibc_FreeBSD 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
-
-	if multilib_is_native_abi ; then
-		# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
-		# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
-		use elibc_FreeBSD && gen_usr_ldscript -a expat
-	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,png}
-
-	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.2.10.ebuild b/dev-libs/expat/expat-2.4.1.ebuild
index 005072fd32af..e06e6d5503b7 100644
--- a/dev-libs/expat/expat-2.2.10.ebuild
+++ b/dev-libs/expat/expat-2.4.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 AUTOTOOLS_AUTO_DEPEND=no
+AT_NOEAUTOHEADER=yes  # because expat_config.h.in would need post-processing
 inherit autotools multilib-minimal usr-ldscript
 
 DESCRIPTION="Stream-oriented XML parser library"
@@ -87,7 +88,7 @@ multilib_src_install_all() {
 
 	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
 	docinto html
-	dodoc doc/*.{css,html,png}
+	dodoc doc/*.{css,html}
 
 	if use examples; then
 		docinto examples