1 |
jlec 15/07/28 12:35:59 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: blt-2.4z-r13.ebuild |
5 |
Log: |
6 |
Fix creation of pkgIndex.tcl, bug #485880; thanks Greg Turner for investigation and bringing up the patch |
7 |
|
8 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!) |
9 |
|
10 |
Revision Changes Path |
11 |
1.69 dev-tcltk/blt/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/ChangeLog?rev=1.69&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/ChangeLog?rev=1.69&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/ChangeLog?r1=1.68&r2=1.69 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v |
20 |
retrieving revision 1.68 |
21 |
retrieving revision 1.69 |
22 |
diff -u -r1.68 -r1.69 |
23 |
--- ChangeLog 5 Apr 2013 07:01:52 -0000 1.68 |
24 |
+++ ChangeLog 28 Jul 2015 12:35:59 -0000 1.69 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for dev-tcltk/blt |
27 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.68 2013/04/05 07:01:52 jlec Exp $ |
29 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.69 2015/07/28 12:35:59 jlec Exp $ |
31 |
+ |
32 |
+*blt-2.4z-r13 (28 Jul 2015) |
33 |
+ |
34 |
+ 28 Jul 2015; Justin Lecher <jlec@g.o> +blt-2.4z-r13.ebuild, |
35 |
+ +files/blt-2.4z-r4-fix-makefile3.patch: |
36 |
+ Fix creation of pkgIndex.tcl, bug #485880; thanks Greg Turner for |
37 |
+ investigation and bringing up the patch |
38 |
|
39 |
05 Apr 2013; Justin Lecher <jlec@g.o> blt-2.4z-r12.ebuild, |
40 |
+files/blt-2.4z-tcl8.6.patch: |
41 |
|
42 |
|
43 |
|
44 |
1.1 dev-tcltk/blt/blt-2.4z-r13.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/blt-2.4z-r13.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/blt-2.4z-r13.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: blt-2.4z-r13.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2015 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r13.ebuild,v 1.1 2015/07/28 12:35:59 jlec Exp $ |
54 |
|
55 |
EAPI=5 |
56 |
|
57 |
inherit autotools eutils flag-o-matic multilib toolchain-funcs |
58 |
|
59 |
MY_V_SUFFIX="-8.5.2" |
60 |
|
61 |
DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands" |
62 |
HOMEPAGE=" |
63 |
http://blt.sourceforge.net/ |
64 |
http://jos.decoster.googlepages.com/bltfortk8.5.2" |
65 |
SRC_URI=" |
66 |
http://dev.gentoo.org/~jlec/distfiles/${PN}${PV}${MY_V_SUFFIX}.tar.gz |
67 |
http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.tar.gz" |
68 |
|
69 |
IUSE="jpeg static-libs X" |
70 |
SLOT="0" |
71 |
LICENSE="BSD" |
72 |
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" |
73 |
|
74 |
DEPEND=" |
75 |
dev-lang/tk:0= |
76 |
jpeg? ( virtual/jpeg:0= ) |
77 |
X? ( x11-libs/libX11 )" |
78 |
RDEPEND="${DEPEND}" |
79 |
|
80 |
S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}" |
81 |
|
82 |
MAKEOPTS+=" -j1" |
83 |
|
84 |
src_prepare() { |
85 |
epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch" |
86 |
epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile3.patch" |
87 |
# From blt-2.4z-6mdk.src.rpm |
88 |
epatch "${FILESDIR}"/blt2.4z-64bit.patch |
89 |
|
90 |
epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fixpkgruntime.patch |
91 |
|
92 |
epatch "${FILESDIR}"/${P}-ldflags.patch |
93 |
|
94 |
# Set the correct libdir and drop RPATH |
95 |
sed \ |
96 |
-e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \ |
97 |
-e 's:LD_RUN_PATH=.*$:LD_RUN_PATH="":g' \ |
98 |
-e "/RANLIB/s:ranlib:$(tc-getRANLIB):g" \ |
99 |
-i configure* || die "sed configure* failed" |
100 |
sed \ |
101 |
-e "/^scriptdir =/s:lib:$(get_libdir):" \ |
102 |
-i Makefile.in demos/Makefile.in || die "sed Makefile.in failed" |
103 |
|
104 |
sed \ |
105 |
-e "/AR/s:ar:$(tc-getAR):g" \ |
106 |
-i src/Makefile.in || die |
107 |
|
108 |
epatch \ |
109 |
"${FILESDIR}"/${P}-linking.patch \ |
110 |
"${FILESDIR}"/${P}-darwin.patch \ |
111 |
"${FILESDIR}"/${P}-gbsd.patch \ |
112 |
"${FILESDIR}"/${P}-tk8.6.patch \ |
113 |
"${FILESDIR}"/${P}-tcl8.6.patch \ |
114 |
"${FILESDIR}"/${P}-aclocal.patch |
115 |
|
116 |
append-cflags -fPIC |
117 |
|
118 |
eautoreconf |
119 |
} |
120 |
|
121 |
src_configure() { |
122 |
LC_ALL=C \ |
123 |
econf \ |
124 |
--x-includes="${EPREFIX}/usr/include" \ |
125 |
--x-libraries="${EPREFIX}/usr/$(get_libdir)" \ |
126 |
--with-blt="${EPREFIX}/usr/$(get_libdir)" \ |
127 |
--with-tcl="${EPREFIX}/usr/$(get_libdir)" \ |
128 |
--with-tk="${EPREFIX}/usr/$(get_libdir)" \ |
129 |
--with-tclincls="${EPREFIX}/usr/include" \ |
130 |
--with-tkincls="${EPREFIX}/usr/include" \ |
131 |
--with-tcllibs="${EPREFIX}/usr/$(get_libdir)" \ |
132 |
--with-tklibs="${EPREFIX}/usr/$(get_libdir)" \ |
133 |
--with-cc="$(tc-getCC)" \ |
134 |
--with-cflags="${CFLAGS}" \ |
135 |
--with-gnu-ld \ |
136 |
$(use_enable jpeg) \ |
137 |
$(use_with X x) |
138 |
} |
139 |
|
140 |
src_compile() { |
141 |
emake LDFLAGS="${LDFLAGS}" |
142 |
} |
143 |
|
144 |
src_install() { |
145 |
sed \ |
146 |
-e "s:\.\./src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \ |
147 |
-e "s:\.\./bltwish:${EPREFIX}/usr/bin/bltwish:g" \ |
148 |
-e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \ |
149 |
-e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \ |
150 |
-i demos/{,scripts/}*.tcl || die |
151 |
|
152 |
dodir \ |
153 |
/usr/bin \ |
154 |
/usr/$(get_libdir)/blt2.4/demos/bitmaps \ |
155 |
/usr/share/man/mann \ |
156 |
/usr/include |
157 |
|
158 |
emake INSTALL_ROOT="${D}" install |
159 |
|
160 |
dodoc NEWS PROBLEMS README |
161 |
dohtml html/*.html |
162 |
for f in `ls "${ED}"/usr/share/man/mann` ; do |
163 |
mv "${ED}"/usr/share/man/mann/${f} "${ED}"/usr/share/man/mann/${f/.n/.nblt} || die |
164 |
done |
165 |
|
166 |
# fix for linking against shared lib with -lBLT or -lBLTlite |
167 |
dosym libBLT24$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname) |
168 |
dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname) |
169 |
|
170 |
use static-libs || \ |
171 |
find "${ED}"/usr/$(get_libdir) -name "*.a" -print0 | \ |
172 |
xargs -r -0 rm -fv |
173 |
} |