Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/blt/files/, dev-tcltk/blt/
Date: Mon, 21 Sep 2015 12:10:53
Message-Id: 1442837446.564bfb6b36bad876736ba5b04333f4a262b22659.jlec@gentoo
1 commit: 564bfb6b36bad876736ba5b04333f4a262b22659
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 21 12:09:01 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 21 12:10:46 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564bfb6b
7
8 dev-tcltk/blt: Drop old
9
10 Package-Manager: portage-2.2.20.1
11 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
12
13 dev-tcltk/blt/blt-2.4z-r10.ebuild | 120 -------------------
14 dev-tcltk/blt/blt-2.4z-r11.ebuild | 123 --------------------
15 dev-tcltk/blt/blt-2.4z-r12.ebuild | 127 ---------------------
16 dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile.patch | 23 ----
17 4 files changed, 393 deletions(-)
18
19 diff --git a/dev-tcltk/blt/blt-2.4z-r10.ebuild b/dev-tcltk/blt/blt-2.4z-r10.ebuild
20 deleted file mode 100644
21 index e50b865..0000000
22 --- a/dev-tcltk/blt/blt-2.4z-r10.ebuild
23 +++ /dev/null
24 @@ -1,120 +0,0 @@
25 -# Copyright 1999-2013 Gentoo Foundation
26 -# Distributed under the terms of the GNU General Public License v2
27 -# $Id$
28 -
29 -EAPI="3"
30 -
31 -inherit eutils flag-o-matic multilib toolchain-funcs
32 -
33 -MY_V_SUFFIX="-8.5.2"
34 -
35 -DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands"
36 -HOMEPAGE="
37 - http://blt.sourceforge.net/
38 - http://jos.decoster.googlepages.com/bltfortk8.5.2"
39 -SRC_URI="
40 - https://dev.gentoo.org/~jlec/distfiles/${PN}${PV}${MY_V_SUFFIX}.tar.gz
41 - http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.tar.gz"
42 -
43 -IUSE="jpeg static-libs X"
44 -SLOT="0"
45 -LICENSE="BSD"
46 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
47 -
48 -DEPEND="
49 - dev-lang/tk
50 - jpeg? ( virtual/jpeg )
51 - X? ( x11-libs/libX11 )"
52 -RDEPEND="${DEPEND}"
53 -
54 -S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}"
55 -
56 -src_prepare() {
57 - epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile.patch"
58 - epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch"
59 - # From blt-2.4z-6mdk.src.rpm
60 - epatch "${FILESDIR}"/blt2.4z-64bit.patch
61 -
62 - #epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fix.patch
63 - epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fixpkgruntime.patch
64 -
65 - epatch "${FILESDIR}"/${P}-ldflags.patch
66 -
67 - # Set the correct libdir and drop RPATH
68 - sed \
69 - -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \
70 - -e 's:LD_RUN_PATH=.*$:LD_RUN_PATH="":g' \
71 - -e "/RANLIB/s:ranlib:$(tc-getRANLIB):g" \
72 - -i configure* || die "sed configure* failed"
73 - sed \
74 - -e "/^scriptdir =/s:lib:$(get_libdir):" \
75 - -i Makefile.in demos/Makefile.in || die "sed Makefile.in failed"
76 -
77 - sed \
78 - -e "/AR/s:ar:$(tc-getAR):g" \
79 - -i src/Makefile.in || die
80 -
81 - epatch "${FILESDIR}"/${P}-linking.patch
82 - epatch "${FILESDIR}"/${P}-darwin.patch
83 - epatch "${FILESDIR}"/${P}-gbsd.patch
84 -}
85 -
86 -src_configure() {
87 - # bug 167934
88 - append-flags -fPIC
89 -
90 - LC_ALL=C \
91 - econf \
92 - --x-includes="${EPREFIX}/usr/include" \
93 - --x-libraries="${EPREFIX}/usr/$(get_libdir)" \
94 - --with-blt="${EPREFIX}/usr/$(get_libdir)" \
95 - --with-tcl="${EPREFIX}/usr/$(get_libdir)" \
96 - --with-tk="${EPREFIX}/usr/$(get_libdir)" \
97 - --with-tclincls="${EPREFIX}/usr/include" \
98 - --with-tkincls="${EPREFIX}/usr/include" \
99 - --with-tcllibs="${EPREFIX}/usr/$(get_libdir)" \
100 - --with-tklibs="${EPREFIX}/usr/$(get_libdir)" \
101 - --with-cc="$(tc-getCC)" \
102 - --with-cflags="${CFLAGS}" \
103 - --with-gnu-ld \
104 - $(use_enable jpeg) \
105 - $(use_with X x)
106 -}
107 -
108 -src_compile() {
109 - # parallel borks
110 - emake -j1 LDFLAGS="${LDFLAGS}" || die "emake failed"
111 -}
112 -
113 -src_install() {
114 - sed \
115 - -e "s:\.\./src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
116 - -e "s:\.\./bltwish:${EPREFIX}/usr/bin/bltwish:g" \
117 - -e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
118 - -e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \
119 - -i demos/{,scripts/}*.tcl || die
120 -
121 - dodir /usr/bin \
122 - /usr/$(get_libdir)/blt2.4/demos/bitmaps \
123 - /usr/share/man/mann \
124 - /usr/include \
125 - || die "dodir failed"
126 - emake -j1 INSTALL_ROOT="${D}" install || die "make install failed"
127 -
128 - dodoc NEWS PROBLEMS README
129 - dohtml html/*.html
130 - for f in `ls "${ED}"/usr/share/man/mann` ; do
131 - mv "${ED}"/usr/share/man/mann/${f} "${ED}"/usr/share/man/mann/${f/.n/.nblt}
132 - done
133 -
134 - # bug 259338 - dev-tcltk/blt-2.4z-r4 provides empty pkgIndex.tcl
135 - cp "${FILESDIR}"/pkgIndex.tcl "${ED}"/usr/$(get_libdir)/blt2.4/pkgIndex.tcl
136 -
137 - # fix for linking against shared lib with -lBLT or -lBLTlite
138 - dosym libBLT24$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname) || die
139 - dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname) || die
140 -
141 - use static-libs || \
142 - find "${ED}"/usr/$(get_libdir) -name "*.a" -print0 | \
143 - xargs -r -0 rm -fv
144 -}
145
146 diff --git a/dev-tcltk/blt/blt-2.4z-r11.ebuild b/dev-tcltk/blt/blt-2.4z-r11.ebuild
147 deleted file mode 100644
148 index f37aa59..0000000
149 --- a/dev-tcltk/blt/blt-2.4z-r11.ebuild
150 +++ /dev/null
151 @@ -1,123 +0,0 @@
152 -# Copyright 1999-2013 Gentoo Foundation
153 -# Distributed under the terms of the GNU General Public License v2
154 -# $Id$
155 -
156 -EAPI=5
157 -
158 -inherit eutils flag-o-matic multilib toolchain-funcs
159 -
160 -MY_V_SUFFIX="-8.5.2"
161 -
162 -DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands"
163 -HOMEPAGE="
164 - http://blt.sourceforge.net/
165 - http://jos.decoster.googlepages.com/bltfortk8.5.2"
166 -SRC_URI="
167 - https://dev.gentoo.org/~jlec/distfiles/${PN}${PV}${MY_V_SUFFIX}.tar.gz
168 - http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.tar.gz"
169 -
170 -IUSE="jpeg static-libs X"
171 -SLOT="0"
172 -LICENSE="BSD"
173 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
174 -
175 -DEPEND="
176 - dev-lang/tk
177 - jpeg? ( virtual/jpeg )
178 - X? ( x11-libs/libX11 )"
179 -RDEPEND="${DEPEND}"
180 -
181 -S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}"
182 -
183 -MAKEOPTS+=" -j1"
184 -
185 -src_prepare() {
186 - epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile.patch"
187 - epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch"
188 - # From blt-2.4z-6mdk.src.rpm
189 - epatch "${FILESDIR}"/blt2.4z-64bit.patch
190 -
191 - #epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fix.patch
192 - epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fixpkgruntime.patch
193 -
194 - epatch "${FILESDIR}"/${P}-ldflags.patch
195 -
196 - # Set the correct libdir and drop RPATH
197 - sed \
198 - -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \
199 - -e 's:LD_RUN_PATH=.*$:LD_RUN_PATH="":g' \
200 - -e "/RANLIB/s:ranlib:$(tc-getRANLIB):g" \
201 - -i configure* || die "sed configure* failed"
202 - sed \
203 - -e "/^scriptdir =/s:lib:$(get_libdir):" \
204 - -i Makefile.in demos/Makefile.in || die "sed Makefile.in failed"
205 -
206 - sed \
207 - -e "/AR/s:ar:$(tc-getAR):g" \
208 - -i src/Makefile.in || die
209 -
210 - epatch \
211 - "${FILESDIR}"/${P}-linking.patch \
212 - "${FILESDIR}"/${P}-darwin.patch \
213 - "${FILESDIR}"/${P}-gbsd.patch \
214 - "${FILESDIR}"/${P}-tk8.6.patch
215 -
216 - append-cflags -DUSE_INTERP_RESULT -fPIC
217 -}
218 -
219 -src_configure() {
220 - LC_ALL=C \
221 - econf \
222 - --x-includes="${EPREFIX}/usr/include" \
223 - --x-libraries="${EPREFIX}/usr/$(get_libdir)" \
224 - --with-blt="${EPREFIX}/usr/$(get_libdir)" \
225 - --with-tcl="${EPREFIX}/usr/$(get_libdir)" \
226 - --with-tk="${EPREFIX}/usr/$(get_libdir)" \
227 - --with-tclincls="${EPREFIX}/usr/include" \
228 - --with-tkincls="${EPREFIX}/usr/include" \
229 - --with-tcllibs="${EPREFIX}/usr/$(get_libdir)" \
230 - --with-tklibs="${EPREFIX}/usr/$(get_libdir)" \
231 - --with-cc="$(tc-getCC)" \
232 - --with-cflags="${CFLAGS}" \
233 - --with-gnu-ld \
234 - $(use_enable jpeg) \
235 - $(use_with X x)
236 -}
237 -
238 -src_compile() {
239 - # parallel borks
240 - emake LDFLAGS="${LDFLAGS}"
241 -}
242 -
243 -src_install() {
244 - sed \
245 - -e "s:\.\./src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
246 - -e "s:\.\./bltwish:${EPREFIX}/usr/bin/bltwish:g" \
247 - -e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
248 - -e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \
249 - -i demos/{,scripts/}*.tcl || die
250 -
251 - dodir /usr/bin \
252 - /usr/$(get_libdir)/blt2.4/demos/bitmaps \
253 - /usr/share/man/mann \
254 - /usr/include
255 -
256 - emake INSTALL_ROOT="${D}" install || die "make install failed"
257 -
258 - dodoc NEWS PROBLEMS README
259 - dohtml html/*.html
260 - for f in `ls "${ED}"/usr/share/man/mann` ; do
261 - mv "${ED}"/usr/share/man/mann/${f} "${ED}"/usr/share/man/mann/${f/.n/.nblt}
262 - done
263 -
264 - # bug 259338 - dev-tcltk/blt-2.4z-r4 provides empty pkgIndex.tcl
265 - cp "${FILESDIR}"/pkgIndex.tcl "${ED}"/usr/$(get_libdir)/blt2.4/pkgIndex.tcl
266 -
267 - # fix for linking against shared lib with -lBLT or -lBLTlite
268 - dosym libBLT24$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname)
269 - dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname)
270 -
271 - use static-libs || \
272 - find "${ED}"/usr/$(get_libdir) -name "*.a" -print0 | \
273 - xargs -r -0 rm -fv
274 -}
275
276 diff --git a/dev-tcltk/blt/blt-2.4z-r12.ebuild b/dev-tcltk/blt/blt-2.4z-r12.ebuild
277 deleted file mode 100644
278 index 9f2026e..0000000
279 --- a/dev-tcltk/blt/blt-2.4z-r12.ebuild
280 +++ /dev/null
281 @@ -1,127 +0,0 @@
282 -# Copyright 1999-2013 Gentoo Foundation
283 -# Distributed under the terms of the GNU General Public License v2
284 -# $Id$
285 -
286 -EAPI=5
287 -
288 -inherit autotools eutils flag-o-matic multilib toolchain-funcs
289 -
290 -MY_V_SUFFIX="-8.5.2"
291 -
292 -DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands"
293 -HOMEPAGE="
294 - http://blt.sourceforge.net/
295 - http://jos.decoster.googlepages.com/bltfortk8.5.2"
296 -SRC_URI="
297 - https://dev.gentoo.org/~jlec/distfiles/${PN}${PV}${MY_V_SUFFIX}.tar.gz
298 - http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.tar.gz"
299 -
300 -IUSE="jpeg static-libs X"
301 -SLOT="0"
302 -LICENSE="BSD"
303 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
304 -
305 -DEPEND="
306 - dev-lang/tk
307 - jpeg? ( virtual/jpeg )
308 - X? ( x11-libs/libX11 )"
309 -RDEPEND="${DEPEND}"
310 -
311 -S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}"
312 -
313 -MAKEOPTS+=" -j1"
314 -
315 -src_prepare() {
316 - epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile.patch"
317 - epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch"
318 - # From blt-2.4z-6mdk.src.rpm
319 - epatch "${FILESDIR}"/blt2.4z-64bit.patch
320 -
321 - #epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fix.patch
322 - epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fixpkgruntime.patch
323 -
324 - epatch "${FILESDIR}"/${P}-ldflags.patch
325 -
326 - # Set the correct libdir and drop RPATH
327 - sed \
328 - -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \
329 - -e 's:LD_RUN_PATH=.*$:LD_RUN_PATH="":g' \
330 - -e "/RANLIB/s:ranlib:$(tc-getRANLIB):g" \
331 - -i configure* || die "sed configure* failed"
332 - sed \
333 - -e "/^scriptdir =/s:lib:$(get_libdir):" \
334 - -i Makefile.in demos/Makefile.in || die "sed Makefile.in failed"
335 -
336 - sed \
337 - -e "/AR/s:ar:$(tc-getAR):g" \
338 - -i src/Makefile.in || die
339 -
340 - epatch \
341 - "${FILESDIR}"/${P}-linking.patch \
342 - "${FILESDIR}"/${P}-darwin.patch \
343 - "${FILESDIR}"/${P}-gbsd.patch \
344 - "${FILESDIR}"/${P}-tk8.6.patch \
345 - "${FILESDIR}"/${P}-tcl8.6.patch \
346 - "${FILESDIR}"/${P}-aclocal.patch
347 -
348 - append-cflags -fPIC
349 -
350 - eautoreconf
351 -}
352 -
353 -src_configure() {
354 - LC_ALL=C \
355 - econf \
356 - --x-includes="${EPREFIX}/usr/include" \
357 - --x-libraries="${EPREFIX}/usr/$(get_libdir)" \
358 - --with-blt="${EPREFIX}/usr/$(get_libdir)" \
359 - --with-tcl="${EPREFIX}/usr/$(get_libdir)" \
360 - --with-tk="${EPREFIX}/usr/$(get_libdir)" \
361 - --with-tclincls="${EPREFIX}/usr/include" \
362 - --with-tkincls="${EPREFIX}/usr/include" \
363 - --with-tcllibs="${EPREFIX}/usr/$(get_libdir)" \
364 - --with-tklibs="${EPREFIX}/usr/$(get_libdir)" \
365 - --with-cc="$(tc-getCC)" \
366 - --with-cflags="${CFLAGS}" \
367 - --with-gnu-ld \
368 - $(use_enable jpeg) \
369 - $(use_with X x)
370 -}
371 -
372 -src_compile() {
373 - # parallel borks
374 - emake LDFLAGS="${LDFLAGS}"
375 -}
376 -
377 -src_install() {
378 - sed \
379 - -e "s:\.\./src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
380 - -e "s:\.\./bltwish:${EPREFIX}/usr/bin/bltwish:g" \
381 - -e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
382 - -e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \
383 - -i demos/{,scripts/}*.tcl || die
384 -
385 - dodir /usr/bin \
386 - /usr/$(get_libdir)/blt2.4/demos/bitmaps \
387 - /usr/share/man/mann \
388 - /usr/include
389 -
390 - emake INSTALL_ROOT="${D}" install || die "make install failed"
391 -
392 - dodoc NEWS PROBLEMS README
393 - dohtml html/*.html
394 - for f in `ls "${ED}"/usr/share/man/mann` ; do
395 - mv "${ED}"/usr/share/man/mann/${f} "${ED}"/usr/share/man/mann/${f/.n/.nblt}
396 - done
397 -
398 - # bug 259338 - dev-tcltk/blt-2.4z-r4 provides empty pkgIndex.tcl
399 - cp "${FILESDIR}"/pkgIndex.tcl "${ED}"/usr/$(get_libdir)/blt2.4/pkgIndex.tcl
400 -
401 - # fix for linking against shared lib with -lBLT or -lBLTlite
402 - dosym libBLT24$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname)
403 - dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname)
404 -
405 - use static-libs || \
406 - find "${ED}"/usr/$(get_libdir) -name "*.a" -print0 | \
407 - xargs -r -0 rm -fv
408 -}
409
410 diff --git a/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile.patch b/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile.patch
411 deleted file mode 100644
412 index 8404f26..0000000
413 --- a/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile.patch
414 +++ /dev/null
415 @@ -1,23 +0,0 @@
416 -Source: mescalinum
417 -Upstream: N/A
418 -Reason: fix broken $DESTDIR support in library/Makefile
419 ---- library/Makefile.in.orig 2008-10-26 14:30:28.000000000 +0100
420 -+++ library/Makefile.in 2008-10-26 14:31:40.000000000 +0100
421 -@@ -45,7 +45,7 @@ all: pkgIndex
422 -
423 - pkgIndex:
424 - rm -f pkgIndex.tcl
425 -- sed -e 's/%VERSION%/$(version)/' $(srcdir)/pkgIndex.tcl.in | \
426 -+ sed -e 's/%VERSION%/$(version)/' $(INSTALL_ROOT)$(srcdir)/pkgIndex.tcl.in | \
427 - sed -e 's/%LIB_PREFIX%/$(lib_prefix)/' | \
428 - sed -e 's;%LIB_DIR%;$(libdir);' > pkgIndex.tcl
429 -
430 -@@ -58,7 +58,7 @@ install: mkdirs pkgIndex
431 - for i in $(miscFiles) ; do \
432 - $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \
433 - done
434 -- $(INSTALL_DATA) pkgIndex.tcl $(scriptdir)
435 -+ $(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(scriptdir)
436 -
437 - mkdirs:
438 - @for i in $(instdirs) ; do \