1 |
jlec 12/11/29 15:23:01 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: tk-8.5.13.ebuild |
5 |
Removed: tk-8.5.8-r1.ebuild tk-8.4.18-r1.ebuild |
6 |
tk-8.4.18.ebuild tk-8.5.11.ebuild tk-8.5.7.ebuild |
7 |
tk-8.5.9-r1.ebuild tk-8.5.7-r1.ebuild |
8 |
Log: |
9 |
dev-lang/tk: Version Bump, #444296; Cleaned old |
10 |
|
11 |
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 70EB7916) |
12 |
|
13 |
Revision Changes Path |
14 |
1.175 dev-lang/tk/ChangeLog |
15 |
|
16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.175&view=markup |
17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.175&content-type=text/plain |
18 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?r1=1.174&r2=1.175 |
19 |
|
20 |
Index: ChangeLog |
21 |
=================================================================== |
22 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v |
23 |
retrieving revision 1.174 |
24 |
retrieving revision 1.175 |
25 |
diff -u -r1.174 -r1.175 |
26 |
--- ChangeLog 4 Nov 2012 18:35:33 -0000 1.174 |
27 |
+++ ChangeLog 29 Nov 2012 15:23:01 -0000 1.175 |
28 |
@@ -1,6 +1,16 @@ |
29 |
# ChangeLog for dev-lang/tk |
30 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
31 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.174 2012/11/04 18:35:33 blueness Exp $ |
32 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.175 2012/11/29 15:23:01 jlec Exp $ |
33 |
+ |
34 |
+*tk-8.5.13 (29 Nov 2012) |
35 |
+ |
36 |
+ 29 Nov 2012; Justin Lecher <jlec@g.o> |
37 |
+ -files/remove-control-v-8.4.9.diff, files/tk-8.4.15-aqua.patch, |
38 |
+ -tk-8.4.18.ebuild, -tk-8.4.18-r1.ebuild, -tk-8.5.7.ebuild, |
39 |
+ -tk-8.5.7-r1.ebuild, -tk-8.5.8-r1.ebuild, -tk-8.5.9-r1.ebuild, |
40 |
+ +files/tk-8.5.10-conf.patch, -tk-8.5.11.ebuild, +tk-8.5.13.ebuild, |
41 |
+ -files/tk-CVE-2007-4851.patch: |
42 |
+ Version Bump, #444296; Cleaned old |
43 |
|
44 |
04 Nov 2012; Anthony G. Basile <blueness@g.o> |
45 |
+files/tk-8.5.11-fix-name-collision-uclibc.patch, tk-8.5.11-r1.ebuild, |
46 |
|
47 |
|
48 |
|
49 |
1.1 dev-lang/tk/tk-8.5.13.ebuild |
50 |
|
51 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.5.13.ebuild?rev=1.1&view=markup |
52 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.5.13.ebuild?rev=1.1&content-type=text/plain |
53 |
|
54 |
Index: tk-8.5.13.ebuild |
55 |
=================================================================== |
56 |
# Copyright 1999-2012 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.13.ebuild,v 1.1 2012/11/29 15:23:01 jlec Exp $ |
59 |
|
60 |
EAPI=4 |
61 |
|
62 |
inherit autotools eutils multilib toolchain-funcs prefix |
63 |
inherit autotools eutils multilib prefix toolchain-funcs virtualx |
64 |
|
65 |
MY_P="${PN}${PV/_beta/b}" |
66 |
|
67 |
DESCRIPTION="Tk Widget Set" |
68 |
HOMEPAGE="http://www.tcl.tk/" |
69 |
SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" |
70 |
|
71 |
LICENSE="BSD" |
72 |
SLOT="0" |
73 |
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" |
74 |
IUSE="debug threads truetype aqua xscreensaver" |
75 |
|
76 |
RDEPEND=" |
77 |
!aqua? ( |
78 |
media-libs/fontconfig |
79 |
x11-libs/libX11 |
80 |
x11-libs/libXt |
81 |
truetype? ( x11-libs/libXft ) |
82 |
xscreensaver? ( x11-libs/libXScrnSaver ) |
83 |
) |
84 |
~dev-lang/tcl-${PV}" |
85 |
DEPEND="${RDEPEND} |
86 |
!aqua? ( x11-proto/xproto )" |
87 |
|
88 |
S="${WORKDIR}/${MY_P}" |
89 |
|
90 |
src_prepare() { |
91 |
tc-export CC |
92 |
|
93 |
epatch \ |
94 |
"${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \ |
95 |
"${FILESDIR}"/${PN}-8.4.11-multilib.patch |
96 |
|
97 |
epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch |
98 |
eprefixify unix/Makefile.in |
99 |
|
100 |
# Bug 125971 |
101 |
epatch "${FILESDIR}"/${PN}-8.5.10-conf.patch |
102 |
|
103 |
# Bug 354067 : the same applies to tk, since the patch is about tcl.m4, just |
104 |
# copy the tcl patch |
105 |
epatch "${FILESDIR}"/tcl-8.5.9-gentoo-fbsd.patch |
106 |
|
107 |
# Make sure we use the right pkg-config, and link against fontconfig |
108 |
# (since the code base uses Fc* functions). |
109 |
sed \ |
110 |
-e 's/FT_New_Face/XftFontOpen/g' \ |
111 |
-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ |
112 |
-e 's:xft freetype2:xft freetype2 fontconfig:' \ |
113 |
-i unix/configure.in || die |
114 |
|
115 |
cd "${S}"/unix |
116 |
eautoreconf |
117 |
} |
118 |
|
119 |
src_configure() { |
120 |
cd "${S}"/unix |
121 |
|
122 |
local mylibdir=$(get_libdir) |
123 |
|
124 |
econf \ |
125 |
--with-tcl="${EPREFIX}/usr/${mylibdir}" \ |
126 |
$(use_enable threads) \ |
127 |
$(use_enable aqua) \ |
128 |
$(use_enable truetype xft) \ |
129 |
$(use_enable xscreensaver xss) \ |
130 |
$(use_enable debug symbols) |
131 |
} |
132 |
|
133 |
src_compile() { |
134 |
cd "${S}"/unix && emake |
135 |
} |
136 |
|
137 |
src_test() { |
138 |
cd "${S}"/unix && Xemake test |
139 |
} |
140 |
|
141 |
src_install() { |
142 |
#short version number |
143 |
local v1 |
144 |
v1=${PV%.*} |
145 |
|
146 |
cd "${S}"/unix |
147 |
S= emake DESTDIR="${D}" install |
148 |
|
149 |
# normalize $S path, bug #280766 (pkgcore) |
150 |
local nS="$(cd "${S}"; pwd)" |
151 |
|
152 |
# fix the tkConfig.sh to eliminate refs to the build directory |
153 |
local mylibdir=$(get_libdir); mylibdir=${mylibdir//\/} |
154 |
sed -i \ |
155 |
-e "s,^TK_BUILD_LIB_SPEC='-L.*/unix ,TK_BUILD_LIB_SPEC='," \ |
156 |
-e "s,^TK_SRC_DIR='.*',TK_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tk${v1}/include'," \ |
157 |
-e "s,^TK_BUILD_STUB_LIB_SPEC='-L.*/unix ,TK_BUILD_STUB_LIB_SPEC='," \ |
158 |
-e "s,^TK_BUILD_STUB_LIB_PATH='.*/unix,TK_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \ |
159 |
-e "s,^TK_LIB_FILE='libtk${v1}..TK_DBGX..so',TK_LIB_FILE=\"libtk${v1}\$\{TK_DBGX\}.so\"," \ |
160 |
-e "s,^TK_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir} ,TK_STUB_LIB_SPEC='," \ |
161 |
-e "s,^TK_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir} ,TK_LIB_SPEC='," \ |
162 |
"${ED}"/usr/${mylibdir}/tkConfig.sh || die |
163 |
if [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then |
164 |
sed -i \ |
165 |
-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \ |
166 |
-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \ |
167 |
"${ED}"/usr/${mylibdir}/tkConfig.sh || die |
168 |
fi |
169 |
|
170 |
# install private headers |
171 |
insinto /usr/${mylibdir}/tk${v1}/include/unix |
172 |
doins "${S}"/unix/*.h |
173 |
insinto /usr/${mylibdir}/tk${v1}/include/generic |
174 |
doins "${S}"/generic/*.h |
175 |
rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h |
176 |
rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h |
177 |
rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h |
178 |
|
179 |
# install symlink for libraries |
180 |
#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a |
181 |
dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) |
182 |
dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a |
183 |
|
184 |
dosym wish${v1} /usr/bin/wish |
185 |
|
186 |
cd "${S}" |
187 |
dodoc ChangeLog* README changes |
188 |
} |