gentoo resync : 25.04.2020

5 files changed, 2 insertions, 58 deletions

diff --git a/dev-perl/SGMLSpm/Manifest b/dev-perl/SGMLSpm/Manifest
index 7b49f2dc7b95..d1e9174668e9 100644
--- a/dev-perl/SGMLSpm/Manifest
+++ b/dev-perl/SGMLSpm/Manifest
@@ -1,7 +1,3 @@
-AUX Makefile.PL 765 BLAKE2B e45648047469153a7c723e55705317420e0cc5631639d8ed6c1b9198fb1b23efd14849e057cb902dd337d6a85d1ce7fdac64f6044c09f28508fa286fa7981a0b SHA512 6c1b89acfa3a4044db15e6bc3ce76b41457f44fbafcb6ac834ef4bbfa2234d9e792f295e3c8c21e8b01e208660fd7863c12ff00c218a8186d8bb766754976fc2
-AUX sgmlspl.patch 367 BLAKE2B 575227a13579947e2fe276965c55b215fe3df0569b3690725822fc545fda7c23e384d4abe0021b9f55c973b117aee00b14b53beb645b43dfc984a98fc7d1d63d SHA512 f9da342ed548b39bd3b7f133030fd75c4a083c9fe95924020104bca96c60f5c96e66b9bb46286a8e6436ed053f239a402ab1badae3edd19465550acdc75cf3b9
-DIST SGMLSpm-1.03ii.tar.gz 93250 BLAKE2B 88d0f36321c42891c62cc1dbb263d5f3c04377ebe80b9e5f41fa3199efe45c78b35dd4fe21e3a769b8cd5785ad4fc5954a617f1a594afb12be74486e468157da SHA512 edbac8112561912d5d7a9faee2d920bf763576ace5a9bdef5fc3f235533805643ad8db5f57d96c34ce9ecbf1796399dc531f40ab4b2796a1e130a8f288c901d4
 DIST SGMLSpm-1.1.tar.gz 114100 BLAKE2B eef93b64f7fcded73bee0e169e417853d84e2f446d569906f752a87ddd1edcb40c63dde3a50d4e4d7840e8c296d9ff20eed5c316bbd528adef16a1d85a38f0d2 SHA512 0ca3f0f3265f20661ae88ad4764fbf82f226382f79f62c01653265cc7372524dfdf30ce5abffc0344624f5e6138e483952471f8c18d59794b40035af0b7526bc
-EBUILD SGMLSpm-1.03-r7.ebuild 708 BLAKE2B e876c39b5e15450c31de54c0fae60653517e6fbc4bc7c41885173cc89ca54d7bb17c426d2e54826af9435be32441279db8ae3f51ebf4e33fef54b5dcc2cafd99 SHA512 e84bede4b85df63c163bd0fb1f9eaccc6167b0c7192ef8d682a29562638af90b22e930ba95504e460018268138e8f49cacc738a59c828ae4f49e80b7a84f45bd
-EBUILD SGMLSpm-1.1-r1.ebuild 542 BLAKE2B 7e4504e52a2377c44eaed3b6405e8721c0904c3bd435a92aa0ab48d782f18d76022403aad5d460e9604521c17baafa086f858a04064fce9e871781f07ff320c3 SHA512 4ef8fa594b3596ef895ed1c26047c94f233a6c0ad3c7ee5856ca20271972046fafb9aaa51036455f00bfaf13907d3a125303971faba72715d9ad37a8e20f98f2
+EBUILD SGMLSpm-1.1-r1.ebuild 543 BLAKE2B 73450f35d823010cf5f1bcd36f353d2c77c6bf5c16a90af2ae32a90acc4172ee1dfe49f061d4035409510f72a94f6aa624ba622a77a507d2cb0cb4b5a37dc8f6 SHA512 0b5a227f4d49e36e53f5fdb7ea9615ad87cb50cff326ad955a0178349119650204c7b95d102ff609340e37dee3e45689323cdc0240cf8ab32bbfcdc9faec2198
 MISC metadata.xml 801 BLAKE2B 89d9fae1e95fae3f561735f49d0383950669702a88dbba4847bbdc633edfb44d3025fbc79c932150bedd007764a83a8908ab65baee0971d4efc5ea1f58aeb6df SHA512 4b714f8c595c2276548599d642fd02df763044c09e1abd6097588859764701fec6ce9abd0a9798db573d71cc703293dedf462ade1b8b6d5b96faa9b8ee593756
diff --git a/dev-perl/SGMLSpm/SGMLSpm-1.03-r7.ebuild b/dev-perl/SGMLSpm/SGMLSpm-1.03-r7.ebuild
deleted file mode 100644
index a3f7b2eb0cd6..000000000000
--- a/dev-perl/SGMLSpm/SGMLSpm-1.03-r7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils perl-module
-
-MY_P="${P}ii"
-S=${WORKDIR}/${PN}
-
-DESCRIPTION="Perl library for parsing the output of nsgmls"
-HOMEPAGE="http://search.cpan.org/author/DMEGG/SGMLSpm-1.03ii/"
-SRC_URI="mirror://cpan/authors/id/D/DM/DMEGG/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-src_prepare() {
-	cp "${FILESDIR}"/Makefile.PL "${S}"/Makefile.PL || die
-	epatch "${FILESDIR}"/sgmlspl.patch
-	mv sgmlspl{.pl,} || die
-}
diff --git a/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild b/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
index 3c6702b51d4b..daec68aeca25 100644
--- a/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
+++ b/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Perl library for parsing the output of nsgmls"
 LICENSE="GPL-2+"
 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 ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-perl/Module-Build"
diff --git a/dev-perl/SGMLSpm/files/Makefile.PL b/dev-perl/SGMLSpm/files/Makefile.PL
deleted file mode 100644
index a2508c0a9afb..000000000000
--- a/dev-perl/SGMLSpm/files/Makefile.PL
+++ /dev/null
@@ -1,17 +0,0 @@
-use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-WriteMakefile(
-      'NAME'   => 'SGMLS',
-      'VERSION'        => '1.03ii',
-      'PM'     => { 'SGMLS.pm' => '$(INST_LIBDIR)/SGMLS.pm',
-                    'Output.pm' => '$(INST_LIBDIR)/SGMLS/Output.pm',
-                    'Refs.pm' => '$(INST_LIBDIR)/SGMLS/Refs.pm',
-                    'skel.pl' => '$(INST_LIBDIR)/sgmlspl-specs/skel.pl',
-                },
-      'MAN3PODS'=> { 'SGMLS.pm' => '$(INST_MAN3DIR)/SGMLS.3pm',
-                    'Output.pm' => '$(INST_MAN3DIR)/SGMLS::Output.3pm',
-                    'Refs.pm' => '$(INST_MAN3DIR)/SGMLS::Refs.3pm',
-                },
-      'EXE_FILES' => [ 'sgmlspl', ],
-);
diff --git a/dev-perl/SGMLSpm/files/sgmlspl.patch b/dev-perl/SGMLSpm/files/sgmlspl.patch
deleted file mode 100644
index 946ce319a97d..000000000000
--- a/dev-perl/SGMLSpm/files/sgmlspl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- SGMLSpm/sgmlspl.pl.old	2008-08-23 17:06:13.000000000 +0200
-+++ SGMLSpm/sgmlspl.pl	2008-08-23 17:07:13.000000000 +0200
-@@ -238,7 +238,7 @@
- package main;
- 
- $ARGV = shift;
--unless ($ARGV eq '' || do $ARGV) {
-+unless ($ARGV eq '' || do 'sgmlspl-specs/' . $ARGV || do $ARGV) {
-     if (!-e $ARGV) {
- 	die "FATAL: $ARGV does not exist.\n";
-     } elsif (!-r $ARGV) {