gentoo resync : 28.04.2021

4 files changed, 3 insertions, 66 deletions

diff --git a/dev-perl/XML-SAX/Manifest b/dev-perl/XML-SAX/Manifest
index 7d692aa05124..766444351094 100644
--- a/dev-perl/XML-SAX/Manifest
+++ b/dev-perl/XML-SAX/Manifest
@@ -1,7 +1,4 @@
 AUX XML-SAX-1.00-noautoini.patch 1603 BLAKE2B bfc4ecb4383c6058b95d69bd89ce823e424b183ef25c2bc53bc470c6fe0bd5aa98609b39827862dcbf36cb64f153729c3c195afe81d0b56fb53fb915cf6481e1 SHA512 0155db02c6ee4c14a3957fa8e508a2402aae425d2b6fcee4d464092aa59896ed589df2a6d2398ddda107070fac3b3dd4a5c6623227c3660784f5d9c9235aed04
-AUX encodings.patch 356 BLAKE2B b8d3dc9e53789d1f9e4030808251a40a8eeab67fe8f9291b1b401fd9a292fd268c630c9d6cf38701f14c4959347ecfcea1db24ba786dfeb6c04d6a83b690eca4 SHA512 55bae257ce1fc3099f17785b0eca050601d905ce27b36409c8d59ed4df2db531f64e5efdc7d2087dd0af05eb81b6b1747c3681b228a034ec71b91656a6f5df80
-DIST XML-SAX-0.99.tar.gz 46703 BLAKE2B e31da35dceab72c9b2c1efc35e49e00c4693ed10991f59e4f5b228b4c4ddff912744c2a9bd867afe37bfd8f3c105a9c3674f0b6221f519fc00e64e246eb8671e SHA512 f0c55efee4e3010deb474377394f9635bd8adc50108b562aeef54a2eef312cf87fb240d0495b5a5bd0c4cd5251db1bc74ba6cb549614708b1627f330959735e1
 DIST XML-SAX-1.00.tar.gz 46808 BLAKE2B c81b42050c98d749f5c8e133733c6acc2576dd31d156c98370030c387baccfcbfafcce644152edab114062039ca1075ced38f079ab9c4876470a79549dc8caa1 SHA512 95553c9693d8a310747b4b86d4e80a58d4056b18cfc334f6979c98d0e9034a34253bfb17daecfc5bb28b1bd65e6baf52136f5135a969fadba86aa4148ea9bc1d
-EBUILD XML-SAX-0.990.0-r1.ebuild 1243 BLAKE2B a1c0d2cdd46233d67d38f1d44626017c1778b2c38cc4891341c110a5729bc8b0cba401205fe74bfdaab06756ded59e55c72427defe128cc3816bf365e7535e77 SHA512 21a2ee65f61a65417e88099635a1d68e5be875a0c5f3f692bd8c3e22f2c65d348d76b267949ebb8a6090eab1354b4b341bd982c5e3c6adfea43f9802d7fb5a62
-EBUILD XML-SAX-1.0.0.ebuild 1220 BLAKE2B 76581993f79a4956ee549553f9eafb145a40f19fc202b34841eaa4bf2d4f6b01759e8b25dda25a9388ba49e29b1af2d676d493c4478fdb239dbbcb479ab6770f SHA512 94279737217c6ff06557ba6176380c418038b52745e13ec533dead9d7f9e48eeadfd557af36202fcb98c1d7f2115ef822f532c0fd3bc205970f6a8b9e604c3ad
+EBUILD XML-SAX-1.0.0.ebuild 1214 BLAKE2B 9f4f17ac2f3c1307055aa60728bed247fe0c845e76a7d776381b3134a845c1848e19f59385b03a03e9a5a1c514b47897edfe814e8a138f2552b1cfdcecab79d8 SHA512 0ba2268f6096b7fea827531ae1dea5b65e82efb9114f43e9432d4a30021e3301205c5b113a96ef10afbfe8c751610ae6938fc6fe3005929589f4340b9e7a51fc
 MISC metadata.xml 1139 BLAKE2B 1060540815d2564a8df4bf4189cb0cc10c70fd0cc580472d8ca24c6cff19de77248c6624c7fae2b9e71e63fa7ff94bebe00b5cb37b9a4ae36e3a20dba9b62eac SHA512 6941bfef1a5a149b3ebf86869245b678dc9dbd03f3dcac6beb33350f8e82250a2d5c0d11d64f7d5ce8526ecdbb4e336c3c6a8b7768e5d2c2829199452ae9d32f
diff --git a/dev-perl/XML-SAX/XML-SAX-0.990.0-r1.ebuild b/dev-perl/XML-SAX/XML-SAX-0.990.0-r1.ebuild
deleted file mode 100644
index 4c4a0b1517b6..000000000000
--- a/dev-perl/XML-SAX/XML-SAX-0.990.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=GRANTM
-MODULE_VERSION=0.99
-inherit perl-module eutils
-
-DESCRIPTION="Perl module for using and building Perl SAX2 XML parsers, filters, and drivers"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	dev-perl/XML-SAX-Base
-	>=dev-perl/XML-NamespaceSupport-1.40.0
-	>=dev-libs/libxml2-2.4.1
-"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
-
-src_prepare() {
-	sed -i \
-		-e 's/if (\$write_ini_ok)/if (0 \&\& $write_ini_ok)/' \
-		Makefile.PL || die
-	epatch "${FILESDIR}"/encodings.patch
-}
-
-pkg_postinst() {
-	pkg_update_parser add XML::SAX::PurePerl
-}
-
-pkg_update_parser() {
-	# pkg_update_parser [add|remove] $parser_module
-	local action=$1
-	local parser_module=$2
-
-	if [[ "$ROOT" = "/" ]] ; then
-		einfo "Update Parser: $1 $2"
-		perl -MXML::SAX -e "XML::SAX->${action}_parser(q(${parser_module}))->save_parsers()" \
-			|| ewarn "Update Parser: $1 $2 failed"
-	else
-		elog "To $1 $2 run:"
-		elog "perl -MXML::SAX -e 'XML::SAX->${action}_parser(q(${parser_module}))->save_parsers()'"
-	fi
-}
diff --git a/dev-perl/XML-SAX/XML-SAX-1.0.0.ebuild b/dev-perl/XML-SAX/XML-SAX-1.0.0.ebuild
index 3881e2b83762..bee190f6056d 100644
--- a/dev-perl/XML-SAX/XML-SAX-1.0.0.ebuild
+++ b/dev-perl/XML-SAX/XML-SAX-1.0.0.ebuild
@@ -5,12 +5,12 @@ EAPI=6
 
 DIST_AUTHOR=GRANTM
 DIST_VERSION=1.00
-inherit perl-module eutils
+inherit perl-module
 
 DESCRIPTION="Perl module for using and building Perl SAX2 XML parsers, filters, and drivers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/XML-SAX/files/encodings.patch b/dev-perl/XML-SAX/files/encodings.patch
deleted file mode 100644
index 0608024d0be8..000000000000
--- a/dev-perl/XML-SAX/files/encodings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- SAX/PurePerl/EncodingDetect.pm.orig	2006-05-08 12:08:40.000000000 -0400
-+++ SAX/PurePerl/EncodingDetect.pm	2006-05-08 12:14:23.000000000 -0400
-@@ -93,7 +93,7 @@ sub encoding_detect {
-         return;
-     }
-     
--    warn("Unable to recognise encoding of this document");
-+    #warn("Unable to recognise encoding of this document");
-     return;
- }
-