Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/tk: ChangeLog tk-8.5.11.ebuild
Date: Fri, 02 Mar 2012 15:31:10
Message-Id: 20120302153101.435702004B@flycatcher.gentoo.org
1 jlec 12/03/02 15:31:00
2
3 Modified: ChangeLog
4 Added: tk-8.5.11.ebuild
5 Log:
6 Version Bump
7
8 (Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.156 dev-lang/tk/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.156&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.156&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?r1=1.155&r2=1.156
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v
20 retrieving revision 1.155
21 retrieving revision 1.156
22 diff -u -r1.155 -r1.156
23 --- ChangeLog 4 Oct 2011 17:08:05 -0000 1.155
24 +++ ChangeLog 2 Mar 2012 15:31:00 -0000 1.156
25 @@ -1,6 +1,12 @@
26 # ChangeLog for dev-lang/tk
27 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.155 2011/10/04 17:08:05 jlec Exp $
29 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.156 2012/03/02 15:31:00 jlec Exp $
31 +
32 +*tk-8.5.11 (02 Mar 2012)
33 +
34 + 02 Mar 2012; Justin Lecher <jlec@g.o> +tk-8.5.11.ebuild,
35 + +files/tk-8.5.11-fedora-xft.patch:
36 + Version Bump
37
38 *tk-8.5.10 (04 Oct 2011)
39
40
41
42
43 1.1 dev-lang/tk/tk-8.5.11.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild?rev=1.1&content-type=text/plain
47
48 Index: tk-8.5.11.ebuild
49 ===================================================================
50 # Copyright 1999-2012 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild,v 1.1 2012/03/02 15:31:00 jlec Exp $
53
54 EAPI="3"
55
56 inherit autotools eutils multilib toolchain-funcs prefix
57
58 MY_P="${PN}${PV/_beta/b}"
59
60 DESCRIPTION="Tk Widget Set"
61 HOMEPAGE="http://www.tcl.tk/"
62 SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
63
64 LICENSE="BSD"
65 SLOT="0"
66 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
67 IUSE="debug threads truetype aqua xscreensaver"
68
69 RDEPEND="
70 !aqua? (
71 x11-libs/libX11
72 x11-libs/libXt
73 truetype? ( x11-libs/libXft )
74 xscreensaver? ( x11-libs/libXScrnSaver ) )
75 ~dev-lang/tcl-${PV}"
76 DEPEND="${RDEPEND}
77 !aqua? ( x11-proto/xproto )"
78
79 S="${WORKDIR}/${MY_P}"
80
81 src_prepare() {
82 epatch "${FILESDIR}"/${P}-fedora-xft.patch
83 epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
84
85 epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
86 eprefixify unix/Makefile.in
87
88 # Bug 125971
89 epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
90
91 sed -i 's/FT_New_Face/XftFontOpen/g' unix/configure.in || die
92
93 cd "${S}"/unix
94 eautoreconf
95 }
96
97 src_configure() {
98 tc-export CC
99 cd "${S}"/unix
100
101 local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
102
103 econf \
104 --with-tcl="${EPREFIX}/usr/${mylibdir}" \
105 $(use_enable threads) \
106 $(use_enable aqua) \
107 $(use_enable truetype xft) \
108 $(use_enable xscreensaver xss) \
109 $(use_enable debug symbols)
110 }
111
112 src_compile() {
113 cd "${S}"/unix
114 emake || die
115 }
116
117 src_install() {
118 #short version number
119 local v1
120 v1=${PV%.*}
121
122 cd "${S}"/unix
123 S= emake DESTDIR="${D}" install || die
124
125 # normalize $S path, bug #280766 (pkgcore)
126 local nS="$(cd "${S}"; pwd)"
127
128 # fix the tkConfig.sh to eliminate refs to the build directory
129 local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
130 sed -i \
131 -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
132 -e "s,^\(TK_SRC_DIR='\)${nS}',\1${EPREFIX}/usr/${mylibdir}/tk${v1}/include'," \
133 -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
134 -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
135 "${ED}"/usr/${mylibdir}/tkConfig.sh || die
136
137 if [[ ${CHOST} != *-darwin* ]]; then
138 sed -i \
139 -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \
140 -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \
141 "${ED}"/usr/${mylibdir}/tkConfig.sh || die
142 fi
143
144 # install private headers
145 insinto /usr/${mylibdir}/tk${v1}/include/unix
146 doins "${S}"/unix/*.h || die
147 insinto /usr/${mylibdir}/tk${v1}/include/generic
148 doins "${S}"/generic/*.h || die
149 rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
150 rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
151 rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
152
153 # install symlink for libraries
154 #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
155 dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) || die
156 dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a || die
157
158 dosym wish${v1} /usr/bin/wish || die
159
160 cd "${S}"
161 dodoc ChangeLog* README changes || die
162 }