gentoo resync : 22.12.2021

3 files changed, 53 insertions, 10 deletions

diff --git a/dev-perl/XML-Parser/Manifest b/dev-perl/XML-Parser/Manifest
index 5c4edf19f88a..67ea077a9bca 100644
--- a/dev-perl/XML-Parser/Manifest
+++ b/dev-perl/XML-Parser/Manifest
@@ -1,3 +1,5 @@
+DIST XML-Parser-2.44.tar.gz 237377 BLAKE2B 3d45053b98ef6944122fc4e61a8dd9bf25b3313d635c043ac065387befe2222b52c9963d1f9c5bceb45d7e288f13a6a83a39ccbed8ab2806867d379565199ecf SHA512 4790d20d89478880b18255679727e5b2fb2860bb4de67d5032c805fd44c9f90697a240a612aba51255325192253aa578b346d658b29f631a4e92ad96e7d65b61
 DIST XML-Parser-2.46.tar.gz 254763 BLAKE2B a815c8f517adb609a1690e6127660eb339649eacffb21d77664b4f9ea071fbaeb432f50bc6469cb36a6b9b4b4e037f778dd2289bed6d87f497713d1d8cab9d0e SHA512 c4609495cc5ca34952f61876a690ef76d42eee6689d1bedb8036c9eab918525ec5213f1639c7178c029ee0f8765a2ca5eb0197f6e39b8be6d5dbc3f3c1d0b389
-EBUILD XML-Parser-2.460.0.ebuild 697 BLAKE2B e342df524f9b2e67bbb97d474be65e768026cbec9a7670a823bc2b1e32d073261858c254d4452920f926b8242f6bb1cc0c8b9526b8fb7fa757dd0931e6bd51c9 SHA512 a6f6db902e42648ec30941cf7beea3874c67d2d6d0e6bd27393d238c4b7e56998ecb5b069e3ae32f175bf0daa1cf9353c772a6a789925a3f2697ace8819f862a
+EBUILD XML-Parser-2.440.0.ebuild 690 BLAKE2B d9c7932ed8564e95209cb8aa822415503ce7a222b3ea9536c33aa82e924fdcf6d3f6962dbfda9fbe658f283c78ad66b5c93527c5171d792a462b6bab31fba95f SHA512 a1a2d52cd8e46b8d7c2ccf75b65562cd6d0a47a290d545d31980c5a17117cb9cc8968408d30cb6c25ffba90eba0b4a05b6de2b1a395404af589b1f74eaa7e1f4
+EBUILD XML-Parser-2.460.0-r2.ebuild 1105 BLAKE2B 18bbe8c43c5cbdd23aa37dda35aa87a5459370ca5d98b7d0a539414f1e0e187246c9c84d0ebcc3d4c990218c400d16aa903d772dbf0d4ce08f3a44f81631ee94 SHA512 a666e78c08ef586f768a3c9c4863ff38366fcd1a63d27e1192e355929e3256cf16033c6f2806d6acd8d45375de65b9b802ba0818e8e49c223af638507515d7cc
 MISC metadata.xml 819 BLAKE2B 72b9aed2fbc5cea1b1bfff5a9299ba09eec2eceb5a02efaa8eb8d4d8fdabc4d79d69565b5898b84b814b39cf66211f7e41824000a1ea73f1c0513c3682f501f5 SHA512 9cab20a15cb4f8e4bc8c474d90eee046d970b3c48312fcfff62f5314834714c3731b5de6604a934f997800e8c02be5577614941d36ff5d2ce17a4131c3f79e1f
diff --git a/dev-perl/XML-Parser/XML-Parser-2.460.0.ebuild b/dev-perl/XML-Parser/XML-Parser-2.440.0.ebuild
index 6d9db5ee58c1..744eee96e008 100644
--- a/dev-perl/XML-Parser/XML-Parser-2.460.0.ebuild
+++ b/dev-perl/XML-Parser/XML-Parser-2.440.0.ebuild
@@ -1,24 +1,22 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=5
 
-DIST_AUTHOR=TODDR
-DIST_VERSION=2.46
+MODULE_AUTHOR=TODDR
+MODULE_VERSION=2.44
 inherit perl-module multilib
 
-DESCRIPTION="A perl module for parsing XML documents"
+DESCRIPTION="A Perl extension interface to James Clark's XML parser, expat"
 
 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"
 IUSE=""
 
-RDEPEND="
-	>=dev-libs/expat-1.95.1-r1
-	dev-perl/libwww-perl
-"
+RDEPEND=">=dev-libs/expat-1.95.1-r1"
 DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
+
+SRC_TEST=do
 
 src_configure() {
 	myconf="EXPATLIBPATH=${EPREFIX}/usr/$(get_libdir) EXPATINCPATH=${EPREFIX}/usr/include"
diff --git a/dev-perl/XML-Parser/XML-Parser-2.460.0-r2.ebuild b/dev-perl/XML-Parser/XML-Parser-2.460.0-r2.ebuild
new file mode 100644
index 000000000000..6ea85475b3fd
--- /dev/null
+++ b/dev-perl/XML-Parser/XML-Parser-2.460.0-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=TODDR
+DIST_VERSION=2.46
+inherit perl-module multilib
+
+DESCRIPTION="A perl module for parsing XML documents"
+
+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"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/expat-1.95.1-r1
+	dev-perl/libwww-perl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+	dev-perl/Devel-CheckLib"
+
+src_prepare() {
+	default
+
+	# Drop bundled CheckLib which breaks Expat detection
+	# bug #827966
+	rm inc/Devel/CheckLib.pm || die
+}
+
+src_configure() {
+	myconf="EXPATLIBPATH=${ESYSROOT}/usr/$(get_libdir) EXPATINCPATH=${ESYSROOT}/usr/include"
+	perl-module_src_configure
+}
+
+src_install() {
+	perl-module_src_install
+
+	# "special" test for bug #827966
+	einfo "Checking for Expat.so (bug #827966)"
+	find "${D}" -name Expat.so | grep Expat || die "Something went badly wrong, can't find Expat.so. Please file a bug."
+}