gentoo resync 08.09.2018

3 files changed, 10 insertions, 35 deletions

diff --git a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.99.0.ebuild b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.103.0.ebuild
index 3088e1d4da16..a3cb53187d6a 100644
--- a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.99.0.ebuild
+++ b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.103.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DIST_AUTHOR=RJBS
-DIST_VERSION=0.099
+DIST_VERSION=0.103
 inherit perl-module
 
 DESCRIPTION="Getopt::Long with usage text"
@@ -13,23 +13,25 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
 IUSE="test minimal"
 
+CONFLICTS="!<dev-perl/MooseX-Getopt-0.660.0"
 # File::Basename -> perl
 # List::Util, Scalar::Util -> perl-Scalar-List-Utils
 # Sub::Exporter::Util -> Sub-Exporter
-RDEPEND="
+RDEPEND="${CONFLICTS}
 	virtual/perl-Carp
 	>=virtual/perl-Getopt-Long-2.330.0
 	>=dev-perl/Params-Validate-0.970.0
-	>=dev-perl/Sub-Exporter-0.972.0
 	virtual/perl-Scalar-List-Utils
+	>=dev-perl/Sub-Exporter-0.972.0
 "
 DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		!minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 )
-		dev-perl/Test-Fatal
-		>=dev-perl/Test-Warnings-0.5.0
+		>=dev-perl/CPAN-Meta-Check-0.11.0
 		virtual/perl-File-Spec
+		dev-perl/Test-Fatal
 		>=virtual/perl-Test-Simple-0.960.0
+		>=dev-perl/Test-Warnings-0.5.0
 	)
 "
diff --git a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.97.0.ebuild b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.97.0.ebuild
deleted file mode 100644
index aa803c265eb8..000000000000
--- a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.97.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RJBS
-MODULE_VERSION=0.097
-inherit perl-module
-
-DESCRIPTION="Getopt::Long with usage text"
-
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/Params-Validate-0.970.0
-	dev-perl/IO-stringy
-	dev-perl/Sub-Exporter
-	virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Test-Warnings )"
-
-SRC_TEST=do
diff --git a/dev-perl/Getopt-Long-Descriptive/Manifest b/dev-perl/Getopt-Long-Descriptive/Manifest
index 01f9f0005c24..00d8f76f0a61 100644
--- a/dev-perl/Getopt-Long-Descriptive/Manifest
+++ b/dev-perl/Getopt-Long-Descriptive/Manifest
@@ -1,7 +1,5 @@
-DIST Getopt-Long-Descriptive-0.097.tar.gz 26399 BLAKE2B d14bbb75b5ae993970eb694ce54c16ac6670ece915368a58a482922d9c2b7d622cf012d20361e4f432bbf7b6119919e622f5b820f14a6e66dc62cfe7c99e9f19 SHA512 9b1a11bce5a64b0dbae93d410593c6411790db8eac1169eb1703fdd4b0bffc0cb0ce12fd02c3de0b4fea98151bcc98af55cf46d84d658c8292291bf3baf5d28d
-DIST Getopt-Long-Descriptive-0.099.tar.gz 29651 BLAKE2B 1adf8c6c84fc8b6251d27b8082b21c886b261bd633a1a6936721a34fafe2da5510e1ead960a079db3ac9dfa7fcf8b490e53fa8fb332952cd9ec5141ef357225d SHA512 3b6fdf06eab25f53c5624e42a8024d059d1ee1c33361184a1d45fc5f0f9b521ad0749916ca7ec7d9561bc2c297adba520ff1fd5efa6706ca480697fad71290da
 DIST Getopt-Long-Descriptive-0.100.tar.gz 31366 BLAKE2B 09fac34156dfbd22f3d14f85b44c0c327e0d6e7b535d2c4b80a492a1f4ab184b85d7b14456c375ce6cf882c69c4e99e3341a6ee764fea6ea966b85068a2410cb SHA512 0efd6f707487b9b44d5c3b5c9e46c3718546e44bf1b66c198be6ebfc922e7bdb23a9c57c5a9c0985dc3769617141696750e1bd982457247b679e3bdb5f9f16c7
+DIST Getopt-Long-Descriptive-0.103.tar.gz 32683 BLAKE2B 9e457690d61e8b2330761ffd09174403d7e485c80af84d2cc61b7443762dcbe9832a15c589b729536103e80c75556f60040d5d1d3637a5eb3226bf1cc1d57ce6 SHA512 9229575bde794fa1213871fbb33a12222737d7979cf4c290200fd85c7da9e3227539809b8380a88a85675429ceb61e505bac8cc4e1408ca63ba92b4e1b33149f
 EBUILD Getopt-Long-Descriptive-0.100.0.ebuild 920 BLAKE2B 85c8cde8988ccc34dce08e18bf549956026f8e17a79bacb8699811f24b23e3acb8d8a5318119c796eba7fd61cfca51c5e3c8f3c02c131e31acd373c4929ed3a8 SHA512 249379860aa7cd2f4e60364ce1779e53fd9418ef87e4b124ede4285aba54ca6aaf47c41ccedb123e79a89065c62a54097b68213c0b47db65e7398952d4ed830e
-EBUILD Getopt-Long-Descriptive-0.97.0.ebuild 496 BLAKE2B 3366402b641d0271739f5db595546a44a7cb6ab39052b58ff17b2cf0c9368ca3a7b70bc5f411a478f6cdb056e3d3215f66dfe663aa0866347b089e09ecea7cca SHA512 9979eb9461a10fb72668276126db56bd5cb3daabe766b7cc6cade4cf532a180425bd95c6b0e1fa4019ee1670c052b3e5e1803fc6764aeb479915b44d9ce4d0a1
-EBUILD Getopt-Long-Descriptive-0.99.0.ebuild 831 BLAKE2B 0c330b00f58285f298cb4e993bcb62608452cb915c6f1f11cf2f8a1a7a88ee121ff5ff3fdf76d6336fc91d8f5b887e9f0558127949279e47c9a4995433c120e9 SHA512 121c9f03e4f8da125c3f42b3b01320c6ac4a3ed108ccda8dd674051977130b6263a05a78d87990287f4a71d7f77e613fab8f2513cece285eeff40ee6916f4e7c
+EBUILD Getopt-Long-Descriptive-0.103.0.ebuild 924 BLAKE2B 5fe47dadfa9029c95caa93f42ece82a2072f3ec62a328018cb19fc2bbf286ae9f4c47e60261be0b53393dc7cc726077dfd3afb6cd51f1b4134826beb9b7a77b0 SHA512 8bf425f2b24d7de71c8ebb3902cfb3c2aec242dfbb1c58b7d9d8c17375a5335c9d11a078893b3793c791e762fd7408b794bd8242a753f8b678b11b916b9653d5
 MISC metadata.xml 576 BLAKE2B 284499ae9040033acd83c3f9ca6f5263c1b0652146333fff6e808587149264f7114d523c116c84f1e133cb558da9095403197da0c90f917777791e869515aef1 SHA512 4a83ea267c2c7d62a81da04c2afd355b6a6d35a1fb6dd8e2fb22b23e59b269b01ce6a91e1a76ca36ae6c621bf33e0fad295c733cc7f84255416c0aa146162bcc