Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Matsuu Takuto (matsuu)" <matsuu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/tk: ChangeLog tk-8.5.0.ebuild tk-8.4.16.ebuild tk-8.5_alpha6.ebuild tk-8.5_beta3.ebuild tk-8.5_alpha6-r1.ebuild tk-8.4.15.ebuild
Date: Sat, 22 Dec 2007 03:58:17
Message-Id: E1J5vV1-0006Ri-1P@stork.gentoo.org
1 matsuu 07/12/22 03:58:07
2
3 Modified: ChangeLog
4 Added: tk-8.5.0.ebuild tk-8.4.16.ebuild
5 Removed: tk-8.5_alpha6.ebuild tk-8.5_beta3.ebuild
6 tk-8.5_alpha6-r1.ebuild tk-8.4.15.ebuild
7 Log:
8 Version bumped, bug #194385.
9 (Portage version: 2.1.3.19)
10
11 Revision Changes Path
12 1.100 dev-lang/tk/ChangeLog
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.100&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.100&content-type=text/plain
16 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/ChangeLog?r1=1.99&r2=1.100
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v
21 retrieving revision 1.99
22 retrieving revision 1.100
23 diff -u -r1.99 -r1.100
24 --- ChangeLog 25 Nov 2007 00:29:38 -0000 1.99
25 +++ ChangeLog 22 Dec 2007 03:58:06 -0000 1.100
26 @@ -1,6 +1,15 @@
27 # ChangeLog for dev-lang/tk
28 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.99 2007/11/25 00:29:38 matsuu Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.100 2007/12/22 03:58:06 matsuu Exp $
31 +
32 +*tk-8.5.0 (22 Dec 2007)
33 +*tk-8.4.16 (22 Dec 2007)
34 +
35 + 22 Dec 2007; MATSUU Takuto <matsuu@g.o> -tk-8.4.15.ebuild,
36 + +tk-8.4.16.ebuild, -tk-8.5_alpha6.ebuild, -tk-8.5_alpha6-r1.ebuild,
37 + -tk-8.5_beta3.ebuild, +tk-8.5.0.ebuild:
38 + Version bumped. bug #194385.
39 + Removed old versions.
40
41 *tk-8.5_beta3 (25 Nov 2007)
42
43
44
45
46 1.1 dev-lang/tk/tk-8.5.0.ebuild
47
48 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/tk-8.5.0.ebuild?rev=1.1&view=markup
49 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/tk-8.5.0.ebuild?rev=1.1&content-type=text/plain
50
51 Index: tk-8.5.0.ebuild
52 ===================================================================
53 # Copyright 1999-2007 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 # $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.0.ebuild,v 1.1 2007/12/22 03:58:06 matsuu Exp $
56
57 WANT_AUTOCONF=latest
58 WANT_AUTOMAKE=latest
59
60 inherit autotools eutils multilib toolchain-funcs
61
62 MY_P="${PN}${PV/_beta/b}"
63 DESCRIPTION="Tk Widget Set"
64 HOMEPAGE="http://www.tcl.tk/"
65 SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
66
67 LICENSE="BSD"
68 SLOT="0"
69 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
70 IUSE="debug threads"
71
72 RDEPEND="x11-libs/libX11
73 ~dev-lang/tcl-${PV}"
74 DEPEND="${RDEPEND}
75 x11-libs/libXt
76 x11-proto/xproto"
77
78 S="${WORKDIR}/${MY_P}"
79
80 pkg_setup() {
81 if use threads ; then
82 ewarn ""
83 ewarn "PLEASE NOTE: You are compiling ${P} with"
84 ewarn "threading enabled."
85 ewarn "Threading is not supported by all applications"
86 ewarn "that compile against tcl. You use threading at"
87 ewarn "your own discretion."
88 ewarn ""
89 epause 5
90 fi
91 }
92
93 src_unpack() {
94 unpack ${A}
95 cd "${S}"
96 epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
97
98 # Bug 125971
99 epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
100
101 cd "${S}"/unix
102 eautoreconf
103 }
104
105 src_compile() {
106 tc-export CC
107 cd "${S}"/unix
108
109 local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
110
111 econf \
112 --with-tcl=/usr/${mylibdir} \
113 $(use_enable threads) \
114 $(use_enable debug symbols) || die
115
116 emake || die
117 }
118
119 src_install() {
120 #short version number
121 local v1
122 v1=${PV%.*}
123
124 cd "${S}"/unix
125 S= emake DESTDIR="${D}" install || die
126
127 # fix the tkConfig.sh to eliminate refs to the build directory
128 local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
129 sed -i \
130 -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
131 -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
132 -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
133 -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
134 -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
135 -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
136 "${D}"/usr/${mylibdir}/tkConfig.sh || die
137
138 # install private headers
139 insinto /usr/${mylibdir}/tk${v1}/include/unix
140 doins "${S}"/unix/*.h || die
141 insinto /usr/${mylibdir}/tk${v1}/include/generic
142 doins "${S}"/generic/*.h || die
143 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
144 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
145 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
146
147 # install symlink for libraries
148 #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
149 dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
150 dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
151
152 dosym wish${v1} /usr/bin/wish
153
154 cd "${S}"
155 dodoc ChangeLog* README changes
156 }
157
158
159
160 1.1 dev-lang/tk/tk-8.4.16.ebuild
161
162 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/tk-8.4.16.ebuild?rev=1.1&view=markup
163 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/tk-8.4.16.ebuild?rev=1.1&content-type=text/plain
164
165 Index: tk-8.4.16.ebuild
166 ===================================================================
167 # Copyright 1999-2007 Gentoo Foundation
168 # Distributed under the terms of the GNU General Public License v2
169 # $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.16.ebuild,v 1.1 2007/12/22 03:58:06 matsuu Exp $
170
171 WANT_AUTOCONF=latest
172 WANT_AUTOMAKE=latest
173
174 inherit autotools eutils multilib toolchain-funcs
175
176 DESCRIPTION="Tk Widget Set"
177 HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
178 SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
179
180 LICENSE="BSD"
181 SLOT="0"
182 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
183 IUSE="debug threads"
184
185 RDEPEND="x11-libs/libX11
186 ~dev-lang/tcl-${PV}"
187 DEPEND="${RDEPEND}
188 x11-libs/libXt
189 x11-proto/xproto"
190
191 S=${WORKDIR}/${PN}${PV}
192
193 pkg_setup() {
194 if use threads ; then
195 ewarn ""
196 ewarn "PLEASE NOTE: You are compiling ${P} with"
197 ewarn "threading enabled."
198 ewarn "Threading is not supported by all applications"
199 ewarn "that compile against tcl. You use threading at"
200 ewarn "your own discretion."
201 ewarn ""
202 epause 5
203 fi
204 }
205
206 src_unpack() {
207 unpack ${A}
208 cd "${S}"
209 epatch "${FILESDIR}"/remove-control-v-8.4.9.diff
210 epatch "${FILESDIR}"/${PN}-8.4.9-man.patch
211 epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
212
213 # Bug 125971
214 epatch "${FILESDIR}"/${PN}-8.4.15-tclm4-soname.patch
215
216 local d
217 for d in */configure ; do
218 cd "${S}"/${d%%/*}
219 EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \
220 epatch "${FILESDIR}"/tk-configure-LANG.patch
221 done
222
223 cd "${S}"/unix
224 eautoreconf
225 }
226
227 src_compile() {
228 tc-export CC
229 cd "${S}"/unix
230
231 local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
232
233 econf \
234 --with-tcl=/usr/${mylibdir} \
235 $(use_enable threads) \
236 $(use_enable debug symbols) || die
237
238 emake || die
239 }
240
241 src_install() {
242 #short version number
243 local v1
244 v1=${PV%.*}
245
246 cd "${S}"/unix
247 make DESTDIR="${D}" install || die
248
249 # fix the tkConfig.sh to eliminate refs to the build directory
250 local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
251 sed -i \
252 -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
253 -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
254 -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
255 -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
256 -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
257 -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
258 "${D}"/usr/${mylibdir}/tkConfig.sh || die
259
260 # install private headers
261 insinto /usr/${mylibdir}/tk${v1}/include/unix
262 doins "${S}"/unix/*.h || die
263 insinto /usr/${mylibdir}/tk${v1}/include/generic
264 doins "${S}"/generic/*.h || die
265 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
266 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
267 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
268
269 # install symlink for libraries
270 #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
271 if use debug ; then
272 dosym libtk${v1}g.so /usr/${mylibdir}/libtk${v1}.so
273 dosym libtkstub${v1}g.a /usr/${mylibdir}/libtkstub${v1}.a
274 dosym ../tk${v1}g/pkgIndex.tcl /usr/${mylibdir}/tk${v1}/pkgIndex.tcl
275 fi
276 dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
277 dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
278
279 dosym wish${v1} /usr/bin/wish
280
281 cd "${S}"
282 dodoc ChangeLog README changes license.terms
283 }
284
285
286
287 --
288 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups