gentoo resync : 11.02.2018

5 files changed, 5 insertions, 158 deletions

diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
index dd8786e879fa..b4d073ed041e 100644
--- a/dev-util/cloc/Manifest
+++ b/dev-util/cloc/Manifest
@@ -1,11 +1,5 @@
-AUX cloc-fix_stupid_perl_array_error_again.patch 3025 BLAKE2B 6051085f1eae967edfda98f5864c59c8a1ea7257c2366d6d839ea9576968fed329ad09ce399557a44557b9229582c364687bd4b0f45db9fb135325bf596487a0 SHA512 7831e853179a3aedf7fc3df790d958733f37b148493c77f699a6ac29313611f6e1212efcbb765780bcad30a20b51fd97379a3d904b5fe95d7972e86e5e87230c
-DIST cloc-1.64.pl 408977 BLAKE2B 7a84b7607cb517b4c5520c6ee0c4b999371f6df2a20952c1f91029ed06eb62106823473c99761255851a6d9437c64c35f0bfbf4b73a1f6093307af86c5b8438d SHA512 bed788cb77ce9ae83714fc14ca04d90d5ae73a7443e180ab815ab81b1d58737f51a8c81360eb7be756afc9d324f9dcf1174b5505b665401217231087ba9461ad
-DIST cloc-1.66.tar.gz 215719 BLAKE2B e7fd6315ff9a0bc38e5358179193a159630c1c83f86d1124e9e51db64d5e6c45c7b1dab1ae27c239fd843049e061fec8d2abfc35f42e07617952ba9dbecb7733 SHA512 2f0bb2de83c6cd8eee251dbf418002301fdfa76bfda6cfbd0d746d9ea0c9d27cf3ee91110504819c4b85e0ae6c1c496fb125c3ede0d516d452cfea6af46e9473
-DIST cloc-1.70.tar.gz 318879 BLAKE2B 0d95e349e0e9788babf16754833ce63b75ae4fd9009d734dfba935cba7c4eee2691eabd0b95824c55a39df1aab2b3ec7e694b13bbf4c4b0e3689ef1b40c8d69c SHA512 fb92101130dd8476ccafe488cf4ec06deb2f1b428649d686a0f19250c8fcf2717e7e44b73ec5493cc61f8237c31c016465f9006757d39df1b6a9f726abd93eb2
 DIST cloc-1.72.tar.gz 347245 BLAKE2B 8ce6915322c6cb4682994034525b7c1e3dfa674832c24dd3d3998f3472f83739764aa61beb80ccda51147b663d4555f060b0098fbf307b81418d58ca72b4f14b SHA512 e83567fcc2703b6de761c44d3b85e4c176eaff9f35419a202bd4c00b5cc9160d39251deb762d57b40aacf4fe6322cf79877032ed29abec2a5f00c1abb8d44021
-DIST cloc.1.pod 12468 BLAKE2B 0c9cea6e95026f343623e503ff3bb32bdcc198fb9b292f0d51e4b2b2708e9903c4dce79620043aebc1828d013eef2de1b98f84a7abaee8217348153171be6559 SHA512 50b4085704c7936de9993476195570957c9c5e864f4a2dbac114ff148a813b50ccba0c6e29d5bda4c4e5cd7c7a09e314233438ddd28f0e0585db54975e602659
-EBUILD cloc-1.64.ebuild 989 BLAKE2B 6590f782a73796b93026e55680d6f71dfa42d67f4ed4066fee9bcc23f14cda4517927d940d766e7943534d46f2d9b5f458bdaaa6951918951ba3a4a3ed02c79e SHA512 9a9de8c602cc92889073260adcad828ab60bbca3afdbc886ceb951b835b9130dfc589f517431a92849cbb8ae3e996afddc9985ff2583b3524176bec2e212f397
-EBUILD cloc-1.66.ebuild 665 BLAKE2B dc218e0fb79d1e69f7db304771b4148b18d17f01c78a3e5b22747f8c3307a7e1e538e9d1d1fe88a7a91e2b10846a9ea5070dfb5cbc671f034ecb59d70e803eb7 SHA512 352b282ade7cd8c2e7b6a18529ec167dbdf79abce5ac5f6ce2581800c5b64b77e5120bed59c58208904570a18474b92beba4770bade2b2c2e5fe6dd6a825d07e
-EBUILD cloc-1.70.ebuild 647 BLAKE2B 9c2ea765bcdd85cf5738ee20889bfc727126667899dbc2a4525cecdc71747cdcbc058673dd3a1212a20fe1520ca763e441a09a343dc6534b2a7ba73e6e6330f4 SHA512 3f9debaaeca34f8ac14b79ff41414752e982f4bf4d62a1f4b1d0875649430aa751a08eee82e974803e55950408acbe8bf5f28c49979ec1704f9eb9dee7030d7c
+DIST cloc-1.74.tar.gz 396192 BLAKE2B 632d2e4764a7bec9b6bb45edaac80da65f5ea23ec682c3246beb2add011fa5ac6860671b45981e9eec374872c691e66467bc0d4709b725fa53ec88efc7ce3a05 SHA512 456ff10c50673326e0b80d2e0b5965fba19c5c868e880108647d5182e048e62bdd734ce485386a561163d8dab81551101cbc5dcc13088400fe0a14ad500e1cbf
 EBUILD cloc-1.72.ebuild 652 BLAKE2B 0247613d5209f906c9848d8874d18662cdb103992ece7462434fa2e19a5f12a8bde97b873093eac75ef21132dfe04f5a7fd2f6c22f5893dfa1bd187c2ea85412 SHA512 804fdbb749ec15ff4e68bf4841c8888b8466fedcf88a82d8b82d8968eecde91ccc83582100a4261f9c4731fb01737e828ce3b80a707b6d9410593ea17cd03a00
+EBUILD cloc-1.74.ebuild 655 BLAKE2B b85899b7f270abe0cf86868425e038b47b91ef168d022ab2147a8ccc3b3deb87c93940cc7f0b4a7f184996b2c3651505e37a843b7193f594b780d9d8c38cf09a SHA512 23d7b861f2feecd2e9ae4dbeb7592d039787ec7fb8cb89ca22922275b1e0c46e1fa5d347a91b7d7ebfd47b1023968d593027d26d11569a39e6cbf33a6d827ea9
 MISC metadata.xml 435 BLAKE2B 5658cf3e41d5dac9b2acab8075357492429742f12fee07bedec393e3a068d9c57464d7434e044eeacff38bc7a043ecb4b3b6d42d57c0441d27a8f645c599fe0d SHA512 c747ba0f0014099be6572197e6aa9aa520cdfd6bae63fc3e0f92b723554a56180d52e1cb40422a063f56a4003d07b3cd09337b4413471668e62d51a6deace02a
diff --git a/dev-util/cloc/cloc-1.64.ebuild b/dev-util/cloc/cloc-1.64.ebuild
deleted file mode 100644
index 6d04d597b451..000000000000
--- a/dev-util/cloc/cloc-1.64.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Count Lines of Code"
-HOMEPAGE="http://cloc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.pl mirror://sourceforge/${PN}/${PN}.1.pod"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-DEPEND=">=dev-lang/perl-5.6"
-RDEPEND="${DEPEND}
-	dev-perl/Algorithm-Diff
-	dev-perl/Regexp-Common
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp"
-
-S=${WORKDIR}
-
-src_unpack() { :; }
-
-src_prepare() {
-	pod2man "${DISTDIR}"/${PN}.1.pod > ${PN}.1 || die
-
-	# hacky, but otherwise we only get a symlink in distdir...
-	cp -L "${DISTDIR}"/${P}.pl "${WORKDIR}"/
-
-	# fix stuoid perl array error...  again...
-	if has_version '>=dev-lang/perl-5.22.0' ; then
-		epatch "${FILESDIR}"/${PN}-fix_stupid_perl_array_error_again.patch
-	fi
-}
-
-src_install() {
-	doman ${PN}.1
-	newbin "${WORKDIR}"/${P}.pl ${PN}
-}
diff --git a/dev-util/cloc/cloc-1.66.ebuild b/dev-util/cloc/cloc-1.66.ebuild
deleted file mode 100644
index 34dbcf976004..000000000000
--- a/dev-util/cloc/cloc-1.66.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Count Lines of Code"
-HOMEPAGE="https://github.com/AlDanial/cloc"
-SRC_URI="https://github.com/AlDanial/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DEPEND=">=dev-lang/perl-5.6"
-RDEPEND="${DEPEND}
-	dev-perl/Algorithm-Diff
-	dev-perl/Regexp-Common
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp"
-
-src_compile() {
-	pod2man Unix/${PN}.1.pod > ${PN}.1 || die
-}
-
-src_install() {
-	doman ${PN}.1
-	dobin Unix/${PN}
-}
diff --git a/dev-util/cloc/cloc-1.70.ebuild b/dev-util/cloc/cloc-1.74.ebuild
index 3dd2d9910900..d227ea30905b 100644
--- a/dev-util/cloc/cloc-1.70.ebuild
+++ b/dev-util/cloc/cloc-1.74.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Count Lines of Code"
 HOMEPAGE="https://github.com/AlDanial/cloc"
-SRC_URI="https://github.com/AlDanial/${PN}/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/AlDanial/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
diff --git a/dev-util/cloc/files/cloc-fix_stupid_perl_array_error_again.patch b/dev-util/cloc/files/cloc-fix_stupid_perl_array_error_again.patch
deleted file mode 100644
index 9f41e07d019c..000000000000
--- a/dev-util/cloc/files/cloc-fix_stupid_perl_array_error_again.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- cloc-1.64.pl.orig	2015-08-26 18:59:16.045264847 -0700
-+++ cloc-1.64.pl	2015-08-26 19:30:23.241507263 -0700
-@@ -1280,11 +1280,6 @@
-                 !(@{$Filters_by_Language{$Lang_R} })) {
-                 $not_Filters_by_Language_Lang_LR = 1;
-             }
--        } else {
--            if (!defined(@{$Filters_by_Language{$Lang_L} }) or
--                !defined(@{$Filters_by_Language{$Lang_R} })) {
--                $not_Filters_by_Language_Lang_LR = 1;
--            }
-         }
-         if ($not_Filters_by_Language_Lang_LR) {
-             if (($Lang_L eq "(unknown)") or ($Lang_R eq "(unknown)")) {
-@@ -1618,7 +1613,7 @@
-         $Ignored{$file} = "--exclude-lang=$Language{$file}";
-         next;
-     }
--    my $Filters_by_Language_Language_file = !defined @{$Filters_by_Language{$Language{$file}} };
-+    my $Filters_by_Language_Language_file = !(@{$Filters_by_Language{$Language{$file}} });
-     if ($Filters_by_Language_Language_file) {
-         if ($Language{$file} eq "(unknown)") {
-             $Ignored{$file} = "language unknown (#1)";
-@@ -1759,7 +1754,7 @@
-                     if ($PERL_516) {
-                         next unless         @{$rhaa_Filters_by_Language->{$1}};
-                     } else {
--                        next unless defined @{$rhaa_Filters_by_Language->{$1}};
-+                        next unless (@{$rhaa_Filters_by_Language->{$1}});
-                     }
-                     # above test necessary to avoid trying to sum reports
-                     # of reports (which have no language breakdown).
-@@ -3259,7 +3254,7 @@
- } # 1}}}
- sub print_language_filters {                 # {{{1
-     my ($language,) = @_;
--    if (!defined @{$Filters_by_Language{$language}}) {
-+    if (! @{$Filters_by_Language{$language}}) {
-         warn "Unknown language: $language\n";
-         warn "Use --show-lang to list all defined languages.\n";
-         return;
-@@ -4623,7 +4618,7 @@
- 
-   open (FILE, $file);
-   while (<FILE>) {
--    if (m/^\\begin{code}/) { close FILE; return 2; }
-+    if (m/^\\begin\{code}/) { close FILE; return 2; }
-     if (m/^>\s/) { close FILE; return 1; }
-   }
- 
-@@ -4652,9 +4647,9 @@
-             if (!s/^>//) { s/.*//; }
-         } elsif ($literate == 2) {
-             if ($inlitblock) {
--                if (m/^\\end{code}/) { s/.*//; $inlitblock = 0; }
-+                if (m/^\\end\{code}/) { s/.*//; $inlitblock = 0; }
-             } elsif (!$inlitblock) {
--                if (m/^\\begin{code}/) { s/.*//; $inlitblock = 1; }
-+                if (m/^\\begin\{code}/) { s/.*//; $inlitblock = 1; }
-                 else { s/.*//; }
-             }
-         }
-@@ -6582,7 +6577,7 @@
-         my $language = $rh_Language_by_Extension->{$ext};
-         next if defined $extension_collisions{$language};
-         next if $seen_it{$language};
--        if (!defined @{$rhaa_Filters_by_Language->{$language}}) {
-+        if (! @{$rhaa_Filters_by_Language->{$language}}) {
-             $OK = 0;
-             warn "Missing language filter for $language\n";
-         }