Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cloc/files/, dev-util/cloc/
Date: Wed, 07 Feb 2018 00:54:50
Message-Id: 1517964861.72adc5e8f03625eb5fc8d88657d147bac48d57f9.tamiko@gentoo
1 commit: 72adc5e8f03625eb5fc8d88657d147bac48d57f9
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 7 00:10:15 2018 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 7 00:54:21 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72adc5e8
7
8 dev-util/cloc: drop old
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 dev-util/cloc/Manifest | 4 --
13 dev-util/cloc/cloc-1.64.ebuild | 44 --------------
14 dev-util/cloc/cloc-1.66.ebuild | 32 ----------
15 dev-util/cloc/cloc-1.70.ebuild | 30 ---------
16 .../cloc-fix_stupid_perl_array_error_again.patch | 71 ----------------------
17 5 files changed, 181 deletions(-)
18
19 diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
20 index 4f960a337b3..4b9c0363b2d 100644
21 --- a/dev-util/cloc/Manifest
22 +++ b/dev-util/cloc/Manifest
23 @@ -1,5 +1 @@
24 -DIST cloc-1.64.pl 408977 BLAKE2B 7a84b7607cb517b4c5520c6ee0c4b999371f6df2a20952c1f91029ed06eb62106823473c99761255851a6d9437c64c35f0bfbf4b73a1f6093307af86c5b8438d SHA512 bed788cb77ce9ae83714fc14ca04d90d5ae73a7443e180ab815ab81b1d58737f51a8c81360eb7be756afc9d324f9dcf1174b5505b665401217231087ba9461ad
25 -DIST cloc-1.66.tar.gz 215719 BLAKE2B e7fd6315ff9a0bc38e5358179193a159630c1c83f86d1124e9e51db64d5e6c45c7b1dab1ae27c239fd843049e061fec8d2abfc35f42e07617952ba9dbecb7733 SHA512 2f0bb2de83c6cd8eee251dbf418002301fdfa76bfda6cfbd0d746d9ea0c9d27cf3ee91110504819c4b85e0ae6c1c496fb125c3ede0d516d452cfea6af46e9473
26 -DIST cloc-1.70.tar.gz 318879 BLAKE2B 0d95e349e0e9788babf16754833ce63b75ae4fd9009d734dfba935cba7c4eee2691eabd0b95824c55a39df1aab2b3ec7e694b13bbf4c4b0e3689ef1b40c8d69c SHA512 fb92101130dd8476ccafe488cf4ec06deb2f1b428649d686a0f19250c8fcf2717e7e44b73ec5493cc61f8237c31c016465f9006757d39df1b6a9f726abd93eb2
27 DIST cloc-1.72.tar.gz 347245 BLAKE2B 8ce6915322c6cb4682994034525b7c1e3dfa674832c24dd3d3998f3472f83739764aa61beb80ccda51147b663d4555f060b0098fbf307b81418d58ca72b4f14b SHA512 e83567fcc2703b6de761c44d3b85e4c176eaff9f35419a202bd4c00b5cc9160d39251deb762d57b40aacf4fe6322cf79877032ed29abec2a5f00c1abb8d44021
28 -DIST cloc.1.pod 12468 BLAKE2B 0c9cea6e95026f343623e503ff3bb32bdcc198fb9b292f0d51e4b2b2708e9903c4dce79620043aebc1828d013eef2de1b98f84a7abaee8217348153171be6559 SHA512 50b4085704c7936de9993476195570957c9c5e864f4a2dbac114ff148a813b50ccba0c6e29d5bda4c4e5cd7c7a09e314233438ddd28f0e0585db54975e602659
29
30 diff --git a/dev-util/cloc/cloc-1.64.ebuild b/dev-util/cloc/cloc-1.64.ebuild
31 deleted file mode 100644
32 index 6d04d597b45..00000000000
33 --- a/dev-util/cloc/cloc-1.64.ebuild
34 +++ /dev/null
35 @@ -1,44 +0,0 @@
36 -# Copyright 1999-2016 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=5
40 -
41 -inherit eutils
42 -
43 -DESCRIPTION="Count Lines of Code"
44 -HOMEPAGE="http://cloc.sourceforge.net/"
45 -SRC_URI="mirror://sourceforge/${PN}/${P}.pl mirror://sourceforge/${PN}/${PN}.1.pod"
46 -
47 -LICENSE="GPL-2+"
48 -SLOT="0"
49 -KEYWORDS="amd64 ppc ppc64 x86"
50 -
51 -DEPEND=">=dev-lang/perl-5.6"
52 -RDEPEND="${DEPEND}
53 - dev-perl/Algorithm-Diff
54 - dev-perl/Regexp-Common
55 - virtual/perl-Digest-MD5
56 - virtual/perl-Getopt-Long
57 - virtual/perl-File-Spec
58 - virtual/perl-File-Temp"
59 -
60 -S=${WORKDIR}
61 -
62 -src_unpack() { :; }
63 -
64 -src_prepare() {
65 - pod2man "${DISTDIR}"/${PN}.1.pod > ${PN}.1 || die
66 -
67 - # hacky, but otherwise we only get a symlink in distdir...
68 - cp -L "${DISTDIR}"/${P}.pl "${WORKDIR}"/
69 -
70 - # fix stuoid perl array error... again...
71 - if has_version '>=dev-lang/perl-5.22.0' ; then
72 - epatch "${FILESDIR}"/${PN}-fix_stupid_perl_array_error_again.patch
73 - fi
74 -}
75 -
76 -src_install() {
77 - doman ${PN}.1
78 - newbin "${WORKDIR}"/${P}.pl ${PN}
79 -}
80
81 diff --git a/dev-util/cloc/cloc-1.66.ebuild b/dev-util/cloc/cloc-1.66.ebuild
82 deleted file mode 100644
83 index 34dbcf97600..00000000000
84 --- a/dev-util/cloc/cloc-1.66.ebuild
85 +++ /dev/null
86 @@ -1,32 +0,0 @@
87 -# Copyright 1999-2016 Gentoo Foundation
88 -# Distributed under the terms of the GNU General Public License v2
89 -
90 -EAPI=5
91 -
92 -inherit eutils
93 -
94 -DESCRIPTION="Count Lines of Code"
95 -HOMEPAGE="https://github.com/AlDanial/cloc"
96 -SRC_URI="https://github.com/AlDanial/${PN}/releases/download/v${PV}/${P}.tar.gz"
97 -
98 -LICENSE="GPL-2+"
99 -SLOT="0"
100 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
101 -
102 -DEPEND=">=dev-lang/perl-5.6"
103 -RDEPEND="${DEPEND}
104 - dev-perl/Algorithm-Diff
105 - dev-perl/Regexp-Common
106 - virtual/perl-Digest-MD5
107 - virtual/perl-Getopt-Long
108 - virtual/perl-File-Spec
109 - virtual/perl-File-Temp"
110 -
111 -src_compile() {
112 - pod2man Unix/${PN}.1.pod > ${PN}.1 || die
113 -}
114 -
115 -src_install() {
116 - doman ${PN}.1
117 - dobin Unix/${PN}
118 -}
119
120 diff --git a/dev-util/cloc/cloc-1.70.ebuild b/dev-util/cloc/cloc-1.70.ebuild
121 deleted file mode 100644
122 index 3dd2d991090..00000000000
123 --- a/dev-util/cloc/cloc-1.70.ebuild
124 +++ /dev/null
125 @@ -1,30 +0,0 @@
126 -# Copyright 1999-2017 Gentoo Foundation
127 -# Distributed under the terms of the GNU General Public License v2
128 -
129 -EAPI=6
130 -
131 -DESCRIPTION="Count Lines of Code"
132 -HOMEPAGE="https://github.com/AlDanial/cloc"
133 -SRC_URI="https://github.com/AlDanial/${PN}/releases/download/v${PV}/${P}.tar.gz"
134 -
135 -LICENSE="GPL-2+"
136 -SLOT="0"
137 -KEYWORDS="amd64 ppc ppc64 x86"
138 -
139 -DEPEND="dev-lang/perl"
140 -RDEPEND="${DEPEND}
141 - dev-perl/Algorithm-Diff
142 - dev-perl/Regexp-Common
143 - virtual/perl-Digest-MD5
144 - virtual/perl-Getopt-Long
145 - virtual/perl-File-Spec
146 - virtual/perl-File-Temp"
147 -
148 -src_compile() {
149 - pod2man "Unix/${PN}.1.pod" > "${PN}.1" || die
150 -}
151 -
152 -src_install() {
153 - doman "${PN}.1"
154 - dobin "Unix/${PN}"
155 -}
156
157 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
158 deleted file mode 100644
159 index 9f41e07d019..00000000000
160 --- a/dev-util/cloc/files/cloc-fix_stupid_perl_array_error_again.patch
161 +++ /dev/null
162 @@ -1,71 +0,0 @@
163 ---- cloc-1.64.pl.orig 2015-08-26 18:59:16.045264847 -0700
164 -+++ cloc-1.64.pl 2015-08-26 19:30:23.241507263 -0700
165 -@@ -1280,11 +1280,6 @@
166 - !(@{$Filters_by_Language{$Lang_R} })) {
167 - $not_Filters_by_Language_Lang_LR = 1;
168 - }
169 -- } else {
170 -- if (!defined(@{$Filters_by_Language{$Lang_L} }) or
171 -- !defined(@{$Filters_by_Language{$Lang_R} })) {
172 -- $not_Filters_by_Language_Lang_LR = 1;
173 -- }
174 - }
175 - if ($not_Filters_by_Language_Lang_LR) {
176 - if (($Lang_L eq "(unknown)") or ($Lang_R eq "(unknown)")) {
177 -@@ -1618,7 +1613,7 @@
178 - $Ignored{$file} = "--exclude-lang=$Language{$file}";
179 - next;
180 - }
181 -- my $Filters_by_Language_Language_file = !defined @{$Filters_by_Language{$Language{$file}} };
182 -+ my $Filters_by_Language_Language_file = !(@{$Filters_by_Language{$Language{$file}} });
183 - if ($Filters_by_Language_Language_file) {
184 - if ($Language{$file} eq "(unknown)") {
185 - $Ignored{$file} = "language unknown (#1)";
186 -@@ -1759,7 +1754,7 @@
187 - if ($PERL_516) {
188 - next unless @{$rhaa_Filters_by_Language->{$1}};
189 - } else {
190 -- next unless defined @{$rhaa_Filters_by_Language->{$1}};
191 -+ next unless (@{$rhaa_Filters_by_Language->{$1}});
192 - }
193 - # above test necessary to avoid trying to sum reports
194 - # of reports (which have no language breakdown).
195 -@@ -3259,7 +3254,7 @@
196 - } # 1}}}
197 - sub print_language_filters { # {{{1
198 - my ($language,) = @_;
199 -- if (!defined @{$Filters_by_Language{$language}}) {
200 -+ if (! @{$Filters_by_Language{$language}}) {
201 - warn "Unknown language: $language\n";
202 - warn "Use --show-lang to list all defined languages.\n";
203 - return;
204 -@@ -4623,7 +4618,7 @@
205 -
206 - open (FILE, $file);
207 - while (<FILE>) {
208 -- if (m/^\\begin{code}/) { close FILE; return 2; }
209 -+ if (m/^\\begin\{code}/) { close FILE; return 2; }
210 - if (m/^>\s/) { close FILE; return 1; }
211 - }
212 -
213 -@@ -4652,9 +4647,9 @@
214 - if (!s/^>//) { s/.*//; }
215 - } elsif ($literate == 2) {
216 - if ($inlitblock) {
217 -- if (m/^\\end{code}/) { s/.*//; $inlitblock = 0; }
218 -+ if (m/^\\end\{code}/) { s/.*//; $inlitblock = 0; }
219 - } elsif (!$inlitblock) {
220 -- if (m/^\\begin{code}/) { s/.*//; $inlitblock = 1; }
221 -+ if (m/^\\begin\{code}/) { s/.*//; $inlitblock = 1; }
222 - else { s/.*//; }
223 - }
224 - }
225 -@@ -6582,7 +6577,7 @@
226 - my $language = $rh_Language_by_Extension->{$ext};
227 - next if defined $extension_collisions{$language};
228 - next if $seen_it{$language};
229 -- if (!defined @{$rhaa_Filters_by_Language->{$language}}) {
230 -+ if (! @{$rhaa_Filters_by_Language->{$language}}) {
231 - $OK = 0;
232 - warn "Missing language filter for $language\n";
233 - }