Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/indent/files/, dev-util/indent/
Date: Wed, 23 Dec 2020 22:57:52
Message-Id: 1608763924.c1e114f7d0e05323e44bd64864d959da63c006dc.sam@gentoo
1 commit: c1e114f7d0e05323e44bd64864d959da63c006dc
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 23 22:52:04 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 23 22:52:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e114f7
7
8 dev-util/indent: cleanup old (EAPI 5)
9
10 Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 dev-util/indent/Manifest | 2 -
14 .../files/indent-2.2.11-ac_config_headers.patch | 11 ----
15 dev-util/indent/files/indent-2.2.11-linguas.patch | 5 --
16 dev-util/indent/files/indent-2.2.11-segfault.patch | 16 ------
17 .../indent/files/indent-2.2.11-texi2html-5.patch | 40 --------------
18 dev-util/indent/indent-2.2.11-r1.ebuild | 52 ------------------
19 dev-util/indent/indent-2.2.11_p5.ebuild | 61 ----------------------
20 7 files changed, 187 deletions(-)
21
22 diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
23 index 6bbfceff8f5..f80f2d3f318 100644
24 --- a/dev-util/indent/Manifest
25 +++ b/dev-util/indent/Manifest
26 @@ -1,3 +1 @@
27 -DIST indent-2.2.11.tar.gz 778563 BLAKE2B 8fe0f245fb852613587da8355a4aa8962e09e1614faf61cf7cea62d6922054547d0739cd1373298af08e4e0cca8d5f4bfc654e03d859c0fe560d0ddb0f63a298 SHA512 f5670e5edc76b9d599ef9e8cc498e13ac15e10eb6a8d674e1612918c4b67ffb15c94d73b9590434e0cdea6ead4b8d1f5bcda1c2f3838acbdeb4d732a0bea89be
28 DIST indent-2.2.12.tar.xz 620280 BLAKE2B c3414ebe58d75b74356b5c37234639dc34998b73e45a4c28ee20ab2932c523b528d577c45c32db88f2ee4aed58d1dceeda2fe68b8975d211dc0dad4a3a20f7c7 SHA512 dbe73bd3729074825f9f5b4241a4c539ad32069df56511963417caf0351ff9ec5edd77e9580338301c8abf89ab9c0592bc7e82c14eec7450c496259d7e9045dd
29 -DIST indent_2.2.11-5.debian.tar.xz 6540 BLAKE2B c4d0805f39e1af503bcfcc49a8e9e679fb0df1021de9952af5a80c81f0c36c70e8dd6609b7e7ec5e36596f974d9c9ac31a7cad831a431cd9401758981d46a7ec SHA512 f89f04bb3b9772c5428ef6df939b5cbe92761f3a39869020dad4f98a5e48c57c34de526803141258c9d55ba6edaedf05127009530aa09b1a54cfa15c8a421a31
30
31 diff --git a/dev-util/indent/files/indent-2.2.11-ac_config_headers.patch b/dev-util/indent/files/indent-2.2.11-ac_config_headers.patch
32 deleted file mode 100644
33 index 8728a26a825..00000000000
34 --- a/dev-util/indent/files/indent-2.2.11-ac_config_headers.patch
35 +++ /dev/null
36 @@ -1,11 +0,0 @@
37 ---- a/configure.ac
38 -+++ b/configure.ac
39 -@@ -3,7 +3,7 @@
40 - AC_CONFIG_SRCDIR(src/indent.c)
41 - AC_CONFIG_AUX_DIR(config)
42 - AM_INIT_AUTOMAKE(indent, 2.2.11)
43 --AM_CONFIG_HEADER(config.h)
44 -+AC_CONFIG_HEADERS(config.h)
45 -
46 - AM_MAINTAINER_MODE
47 -
48
49 diff --git a/dev-util/indent/files/indent-2.2.11-linguas.patch b/dev-util/indent/files/indent-2.2.11-linguas.patch
50 deleted file mode 100644
51 index d540219b7cd..00000000000
52 --- a/dev-util/indent/files/indent-2.2.11-linguas.patch
53 +++ /dev/null
54 @@ -1,5 +0,0 @@
55 ---- a/po/LINGUAS
56 -+++ b/po/LINGUAS
57 -@@ -1 +1 @@
58 --ca da de eo et fi fr gl hu it ja ko nl pl pt_BR ru sk sv tr zh_TW.Big5
59 -+ca da de eo et fi fr gl hu it ja ko nl pl pt_BR ru sk sv tr zh_TW
60
61 diff --git a/dev-util/indent/files/indent-2.2.11-segfault.patch b/dev-util/indent/files/indent-2.2.11-segfault.patch
62 deleted file mode 100644
63 index e9192248095..00000000000
64 --- a/dev-util/indent/files/indent-2.2.11-segfault.patch
65 +++ /dev/null
66 @@ -1,16 +0,0 @@
67 ---- a/man/texinfo2man.c
68 -+++ b/man/texinfo2man.c
69 -@@ -287,6 +287,13 @@
70 - char buf[1024];
71 - int line_no = 0;
72 -
73 -+ if (argc != 3)
74 -+ {
75 -+ fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]);
76 -+ fprintf(stderr, " The man page will be written to stdout.\n");
77 -+ return -1;
78 -+ }
79 -+
80 - texinfoname = argv[2];
81 -
82 - in = fopen (argv[2], "r");
83
84 diff --git a/dev-util/indent/files/indent-2.2.11-texi2html-5.patch b/dev-util/indent/files/indent-2.2.11-texi2html-5.patch
85 deleted file mode 100644
86 index 5bad3da2867..00000000000
87 --- a/dev-util/indent/files/indent-2.2.11-texi2html-5.patch
88 +++ /dev/null
89 @@ -1,40 +0,0 @@
90 ---- a/doc/Makefile.am
91 -+++ b/doc/Makefile.am
92 -@@ -34,14 +34,14 @@
93 - html-split: @PACKAGE@_toc.html
94 -
95 - @PACKAGE@.html: version.texi $(@PACKAGE@_TEXINFOS)
96 -- $(TEXI2HTML) -expandinfo -number -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
97 -+ $(TEXI2HTML) -expandinfo -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
98 -
99 - @PACKAGE@_toc.html: version.texi $(@PACKAGE@_TEXINFOS)
100 - case "$(TEXI2HTML)" in \
101 - *"/missing texi2html") \
102 -- $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
103 -+ $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
104 - *) $(RM) @PACKAGE@_*.html ; \
105 -- $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
106 -+ $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
107 - esac
108 -
109 - install-html-monolithic: @PACKAGE@.html
110 ---- a/doc/Makefile.in
111 -+++ b/doc/Makefile.in
112 -@@ -663,14 +663,14 @@
113 - html-split: @PACKAGE@_toc.html
114 -
115 - @PACKAGE@.html: version.texi $(@PACKAGE@_TEXINFOS)
116 -- $(TEXI2HTML) -expandinfo -number -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
117 -+ $(TEXI2HTML) -expandinfo -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
118 -
119 - @PACKAGE@_toc.html: version.texi $(@PACKAGE@_TEXINFOS)
120 - case "$(TEXI2HTML)" in \
121 - *"/missing texi2html") \
122 -- $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
123 -+ $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
124 - *) $(RM) @PACKAGE@_*.html ; \
125 -- $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
126 -+ $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
127 - esac
128 -
129 - install-html-monolithic: @PACKAGE@.html
130
131 diff --git a/dev-util/indent/indent-2.2.11-r1.ebuild b/dev-util/indent/indent-2.2.11-r1.ebuild
132 deleted file mode 100644
133 index c9f84d2ad06..00000000000
134 --- a/dev-util/indent/indent-2.2.11-r1.ebuild
135 +++ /dev/null
136 @@ -1,52 +0,0 @@
137 -# Copyright 1999-2020 Gentoo Authors
138 -# Distributed under the terms of the GNU General Public License v2
139 -
140 -EAPI=5
141 -inherit autotools eutils
142 -
143 -DESCRIPTION="Indent program source files"
144 -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
145 -SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
146 -
147 -LICENSE="GPL-3"
148 -SLOT="0"
149 -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
150 -IUSE="nls"
151 -
152 -DEPEND="
153 - nls? ( sys-devel/gettext )
154 - app-text/texi2html
155 -"
156 -RDEPEND="
157 - nls? ( virtual/libintl )
158 -"
159 -
160 -src_prepare() {
161 - # Fix bug #94837
162 - local pofile
163 - for pofile in po/zh_TW*; do
164 - mv ${pofile} ${pofile/.Big5} || die
165 - done
166 - sed -i po/LINGUAS -e 's|zh_TW\.Big5|zh_TW|g' || die
167 -
168 - epatch \
169 - "${FILESDIR}"/${P}-segfault.patch \
170 - "${FILESDIR}"/${P}-texi2html-5.patch
171 - sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
172 -
173 - eautoreconf
174 -}
175 -
176 -src_configure() {
177 - econf $(use_enable nls)
178 -}
179 -
180 -src_test() {
181 - emake -C regression/
182 -}
183 -
184 -src_install() {
185 - # htmldir as set in configure is ignored in doc/Makefile*
186 - emake DESTDIR="${D}" htmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
187 - dodoc AUTHORS NEWS README ChangeLog ChangeLog-1990 ChangeLog-1998 ChangeLog-2001
188 -}
189
190 diff --git a/dev-util/indent/indent-2.2.11_p5.ebuild b/dev-util/indent/indent-2.2.11_p5.ebuild
191 deleted file mode 100644
192 index 4b76c2fb070..00000000000
193 --- a/dev-util/indent/indent-2.2.11_p5.ebuild
194 +++ /dev/null
195 @@ -1,61 +0,0 @@
196 -# Copyright 1999-2020 Gentoo Authors
197 -# Distributed under the terms of the GNU General Public License v2
198 -
199 -EAPI=6
200 -inherit autotools eutils
201 -
202 -DESCRIPTION="Indent program source files"
203 -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
204 -SRC_URI="
205 - https://dev.gentoo.org/~jer/${P/_p*/}.tar.gz
206 - http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV/_p*/}-${PV/*_p/}.debian.tar.xz
207 -"
208 -
209 -LICENSE="GPL-3"
210 -SLOT="0"
211 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
212 -IUSE="nls"
213 -
214 -DEPEND="
215 - nls? ( sys-devel/gettext )
216 - app-text/texi2html
217 -"
218 -RDEPEND="
219 - nls? ( virtual/libintl )
220 -"
221 -PATCHES=(
222 - "${FILESDIR}"/${P/_p*/}-segfault.patch
223 - "${FILESDIR}"/${P/_p*/}-texi2html-5.patch
224 - "${FILESDIR}"/${P/_p*/}-ac_config_headers.patch
225 - "${FILESDIR}"/${P/_p*/}-linguas.patch
226 -)
227 -S=${WORKDIR}/${P/_p*/}
228 -
229 -src_prepare() {
230 - default
231 -
232 - eapply "${WORKDIR}"/debian/patches/*.patch
233 -
234 - local pofile
235 - for pofile in po/zh_TW*; do
236 - mv ${pofile} ${pofile/.Big5} || die
237 - done
238 -
239 - eautoreconf
240 -}
241 -
242 -src_configure() {
243 - strip-linguas -i po/
244 -
245 - econf $(use_enable nls)
246 -}
247 -
248 -src_test() {
249 - emake -C regression/
250 -}
251 -
252 -src_install() {
253 - # htmldir as set in configure is ignored in doc/Makefile*
254 - emake DESTDIR="${D}" htmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
255 - dodoc AUTHORS NEWS README ChangeLog ChangeLog-1990 ChangeLog-1998 ChangeLog-2001
256 -}