Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/fhist/, dev-util/fhist/files/
Date: Sat, 29 Dec 2018 12:35:00
Message-Id: 1546086870.f41b5f7aaa3e2cb0cca913d6d642732b49948044.zlogene@gentoo
1 commit: f41b5f7aaa3e2cb0cca913d6d642732b49948044
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 29 12:34:30 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 29 12:34:30 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f41b5f7a
7
8 dev-util/fhist: remove last rited package
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11
12 dev-util/fhist/Manifest | 3 --
13 dev-util/fhist/fhist-1.16.ebuild | 45 ---------------------------
14 dev-util/fhist/fhist-1.19.ebuild | 29 -----------------
15 dev-util/fhist/fhist-1.21.ebuild | 29 -----------------
16 dev-util/fhist/files/1.19-ldflags.patch | 43 -------------------------
17 dev-util/fhist/files/fhist-1.21-ldflags.patch | 40 ------------------------
18 dev-util/fhist/metadata.xml | 11 -------
19 7 files changed, 200 deletions(-)
20
21 diff --git a/dev-util/fhist/Manifest b/dev-util/fhist/Manifest
22 deleted file mode 100644
23 index 259b7a6d011..00000000000
24 --- a/dev-util/fhist/Manifest
25 +++ /dev/null
26 @@ -1,3 +0,0 @@
27 -DIST fhist-1.16.tar.gz 383180 BLAKE2B d80c0d72733344498fc3082ca0906b50d4de78b1a6656c2a3b72758fa5e509fd20b40ef6f25c570a93b00db58f563d2c3fd08be40e33096d6e6491e436a13219 SHA512 919fc4d424e1f878404ec2d305dbcd66a4697c88c38af54033bdb178704cf08997c816d75db93ddbfc5248f29b997c4b8aaa3fd98ee790c32582124fc332bc1d
28 -DIST fhist-1.19.tar.gz 409083 BLAKE2B 15efaf7441dbdd39bfa21dc74cef912b10cf82c24e4484c44c8469f68570025563b6303dfb003341835124df7b7cb71ff84628f6440f69ab531c53172914af25 SHA512 d93f0ce1b29e527af5de3f49d44ebc11567f53bb0b428322daa42b0a4a14ae75333ffcb9a65ba14b2a6240d57be7bdf7632e6b4eccd071d4e9b6e90c14c317a9
29 -DIST fhist-1.21.D001.tar.gz 409961 BLAKE2B 275406a8f49d70b41fe1595d907e8a5a3aad8c1802933fec06e7839e22e770975bdcdcc1e743a9c554b1060bf0c4ebd3c23d4efd240fca32ce10096a690b6ba1 SHA512 9f69ba29bdd44b4888decdcfb7db49a29a1c9611ae5cd733af2e3ec04afc498674854616335d13ca732a6485cbffafc6a4072d14a9638ead1dea4412a2070f97
30
31 diff --git a/dev-util/fhist/fhist-1.16.ebuild b/dev-util/fhist/fhist-1.16.ebuild
32 deleted file mode 100644
33 index 28569ab1366..00000000000
34 --- a/dev-util/fhist/fhist-1.16.ebuild
35 +++ /dev/null
36 @@ -1,45 +0,0 @@
37 -# Copyright 1999-2018 Gentoo Foundation
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=0
41 -
42 -DESCRIPTION="File history and comparison tools"
43 -HOMEPAGE="http://fhist.sourceforge.net/fhist.html"
44 -SRC_URI="http://fhist.sourceforge.net/${P}.tar.gz"
45 -
46 -SLOT="0"
47 -LICENSE="GPL-2"
48 -KEYWORDS="~ppc x86"
49 -IUSE="test"
50 -
51 -RDEPEND="sys-devel/gettext
52 - sys-apps/groff"
53 -DEPEND="${RDEPEND}
54 - test? ( app-arch/sharutils )
55 - sys-devel/bison"
56 -
57 -MAKEOPTS+=" -j1"
58 -
59 -src_compile() {
60 - econf
61 - emake || die "emake failed"
62 -}
63 -
64 -src_test() {
65 - emake sure || die "src_test failed"
66 -}
67 -
68 -src_install () {
69 - emake \
70 - RPM_BUILD_ROOT="${D}" \
71 - NLSDIR="${D}/usr/share/locale" \
72 - install || die "make install failed"
73 -
74 - dodoc lib/en/*.txt || die
75 - dodoc lib/en/*.ps || die
76 -
77 - # remove duplicate docs etc.
78 - rm -r "${D}"/usr/share/fhist
79 -
80 - dodoc MANIFEST README || die
81 -}
82
83 diff --git a/dev-util/fhist/fhist-1.19.ebuild b/dev-util/fhist/fhist-1.19.ebuild
84 deleted file mode 100644
85 index c23d28e436b..00000000000
86 --- a/dev-util/fhist/fhist-1.19.ebuild
87 +++ /dev/null
88 @@ -1,29 +0,0 @@
89 -# Copyright 1999-2015 Gentoo Foundation
90 -# Distributed under the terms of the GNU General Public License v2
91 -
92 -EAPI=4
93 -
94 -inherit eutils flag-o-matic
95 -
96 -DESCRIPTION="File history and comparison tools"
97 -HOMEPAGE="http://fhist.sourceforge.net/fhist.html"
98 -SRC_URI="http://fhist.sourceforge.net/${P}.tar.gz"
99 -
100 -SLOT="0"
101 -LICENSE="GPL-3"
102 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux"
103 -IUSE="test"
104 -
105 -RDEPEND="
106 - dev-libs/libexplain
107 - sys-devel/gettext
108 - sys-apps/groff"
109 -DEPEND="${RDEPEND}
110 - sys-devel/bison
111 - test? ( app-arch/sharutils )"
112 -
113 -src_prepare() {
114 - MAKEOPTS+=" -j1"
115 - epatch "${FILESDIR}"/${PV}-ldflags.patch
116 - append-cflags -fgnu89-inline
117 -}
118
119 diff --git a/dev-util/fhist/fhist-1.21.ebuild b/dev-util/fhist/fhist-1.21.ebuild
120 deleted file mode 100644
121 index 1f783dcb8d3..00000000000
122 --- a/dev-util/fhist/fhist-1.21.ebuild
123 +++ /dev/null
124 @@ -1,29 +0,0 @@
125 -# Copyright 1999-2015 Gentoo Foundation
126 -# Distributed under the terms of the GNU General Public License v2
127 -
128 -EAPI=5
129 -
130 -inherit eutils flag-o-matic
131 -
132 -DESCRIPTION="File history and comparison tools"
133 -HOMEPAGE="http://fhist.sourceforge.net/fhist.html"
134 -SRC_URI="http://fhist.sourceforge.net/${P}.D001.tar.gz"
135 -
136 -SLOT="0"
137 -LICENSE="GPL-3"
138 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux"
139 -IUSE="test"
140 -
141 -RDEPEND="
142 - dev-libs/libexplain
143 - sys-devel/gettext
144 - sys-apps/groff"
145 -DEPEND="${RDEPEND}
146 - sys-devel/bison
147 - test? ( app-arch/sharutils )"
148 -
149 -src_prepare() {
150 - MAKEOPTS+=" -j1"
151 - epatch "${FILESDIR}"/${P}-ldflags.patch
152 - append-cflags -fgnu89-inline
153 -}
154
155 diff --git a/dev-util/fhist/files/1.19-ldflags.patch b/dev-util/fhist/files/1.19-ldflags.patch
156 deleted file mode 100644
157 index c0fa0e825a9..00000000000
158 --- a/dev-util/fhist/files/1.19-ldflags.patch
159 +++ /dev/null
160 @@ -1,43 +0,0 @@
161 -diff --git a/Makefile.in b/Makefile.in
162 -index 8aa8408..2c39b28 100644
163 ---- a/Makefile.in
164 -+++ b/Makefile.in
165 -@@ -500,8 +500,9 @@ common/sub/expr.$(OBJEXT): common/sub/expr.c common/ac/stdarg.h \
166 - $(CC) $(CPPFLAGS) $(CFLAGS) -I. -c common/sub/expr.c
167 - mv expr.$(OBJEXT) common/sub/expr.$(OBJEXT)
168 -
169 --common/sub/expr_gram.yacc.c common/sub/expr_gram.yacc.h: \
170 -- common/sub/expr_gram.y
171 -+common/sub/expr_gram.yacc.c: common/sub/expr_gram.yacc.h
172 -+
173 -+common/sub/expr_gram.yacc.h: common/sub/expr_gram.y
174 - $(YACC) -d common/sub/expr_gram.y
175 - sed -e 's/[yY][yY]/sub_expr_gram_/g' y.tab.c > \
176 - common/sub/expr_gram.yacc.c
177 -@@ -961,7 +962,7 @@ common/libcommon.a: $(lib_obj)
178 - fcomp_obj = fcomp/main.$(OBJEXT)
179 -
180 - bin/fcomp$(EXEEXT): $(fcomp_obj) common/libcommon.a .bin
181 -- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fcomp_obj) \
182 -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fcomp_obj) \
183 - common/libcommon.a $(LIBS)
184 -
185 - $(bindir)/fcomp$(EXEEXT): bin/fcomp$(EXEEXT) .bindir
186 -@@ -974,7 +975,7 @@ fhist_obj = fhist/breaks.$(OBJEXT) fhist/diff.$(OBJEXT) \
187 - fhist/subroutine.$(OBJEXT) fhist/update.$(OBJEXT)
188 -
189 - bin/fhist$(EXEEXT): $(fhist_obj) common/libcommon.a .bin
190 -- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fhist_obj) \
191 -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fhist_obj) \
192 - common/libcommon.a $(LIBS)
193 -
194 - $(bindir)/fhist$(EXEEXT): bin/fhist$(EXEEXT) .bindir
195 -@@ -983,7 +984,7 @@ $(bindir)/fhist$(EXEEXT): bin/fhist$(EXEEXT) .bindir
196 - fmerge_obj = fmerge/main.$(OBJEXT) fmerge/work.$(OBJEXT)
197 -
198 - bin/fmerge$(EXEEXT): $(fmerge_obj) common/libcommon.a .bin
199 -- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fmerge_obj) \
200 -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fmerge_obj) \
201 - common/libcommon.a $(LIBS)
202 -
203 - $(bindir)/fmerge$(EXEEXT): bin/fmerge$(EXEEXT) .bindir
204
205 diff --git a/dev-util/fhist/files/fhist-1.21-ldflags.patch b/dev-util/fhist/files/fhist-1.21-ldflags.patch
206 deleted file mode 100644
207 index 00aab69d749..00000000000
208 --- a/dev-util/fhist/files/fhist-1.21-ldflags.patch
209 +++ /dev/null
210 @@ -1,40 +0,0 @@
211 - Makefile.in | 12 ++++++------
212 - 1 file changed, 6 insertions(+), 6 deletions(-)
213 -
214 -diff --git a/Makefile.in b/Makefile.in
215 -index ba4e4c2..c0e552a 100644
216 ---- a/Makefile.in
217 -+++ b/Makefile.in
218 -@@ -916,8 +916,8 @@ common/libcommon.a: $(common_obj)
219 - fcomp_obj = fcomp/main.$(OBJEXT)
220 -
221 - bin/fcomp$(EXEEXT): $(fcomp_obj) common/libcommon.a .bin
222 -- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fcomp_obj) common/libcommon.a \
223 -- $(LDFLAGS) $(LIBS)
224 -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fcomp_obj) common/libcommon.a \
225 -+ $(LIBS)
226 -
227 - $(bindir)/fcomp$(EXEEXT): bin/fcomp$(EXEEXT) .bindir
228 - $(INSTALL_PROGRAM) bin/fcomp$(EXEEXT) $@
229 -@@ -928,8 +928,8 @@ fhist_obj = fhist/breaks.$(OBJEXT) fhist/diff.$(OBJEXT) fhist/extract.$(OBJEXT)
230 - fhist/subroutine.$(OBJEXT) fhist/update.$(OBJEXT)
231 -
232 - bin/fhist$(EXEEXT): $(fhist_obj) common/libcommon.a .bin
233 -- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fhist_obj) common/libcommon.a \
234 -- $(LDFLAGS) $(LIBS)
235 -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fhist_obj) common/libcommon.a \
236 -+ $(LIBS)
237 -
238 - $(bindir)/fhist$(EXEEXT): bin/fhist$(EXEEXT) .bindir
239 - $(INSTALL_PROGRAM) bin/fhist$(EXEEXT) $@
240 -@@ -937,8 +937,8 @@ $(bindir)/fhist$(EXEEXT): bin/fhist$(EXEEXT) .bindir
241 - fmerge_obj = fmerge/main.$(OBJEXT) fmerge/work.$(OBJEXT)
242 -
243 - bin/fmerge$(EXEEXT): $(fmerge_obj) common/libcommon.a .bin
244 -- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fmerge_obj) common/libcommon.a \
245 -- $(LDFLAGS) $(LIBS)
246 -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fmerge_obj) common/libcommon.a \
247 -+ $(LIBS)
248 -
249 - $(bindir)/fmerge$(EXEEXT): bin/fmerge$(EXEEXT) .bindir
250 - $(INSTALL_PROGRAM) bin/fmerge$(EXEEXT) $@
251
252 diff --git a/dev-util/fhist/metadata.xml b/dev-util/fhist/metadata.xml
253 deleted file mode 100644
254 index 71ffe3a34b2..00000000000
255 --- a/dev-util/fhist/metadata.xml
256 +++ /dev/null
257 @@ -1,11 +0,0 @@
258 -<?xml version="1.0" encoding="UTF-8"?>
259 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
260 -<pkgmetadata>
261 - <maintainer type="project">
262 - <email>shell-tools@g.o</email>
263 - <name>Gentoo Shell Tools Project</name>
264 - </maintainer>
265 - <upstream>
266 - <remote-id type="sourceforge">fhist</remote-id>
267 - </upstream>
268 -</pkgmetadata>