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_beta3.ebuild tk-8.5b.ebuild
Date: Sun, 25 Nov 2007 00:29:46
Message-Id: E1Iw5NT-0008Ro-97@stork.gentoo.org
1 matsuu 07/11/25 00:29:39
2
3 Modified: ChangeLog
4 Added: tk-8.5_beta3.ebuild
5 Removed: tk-8.5b.ebuild
6 Log:
7 Version bumped. Fixed wrong symlink wrt bug #200090.
8 (Portage version: 2.1.3.19)
9
10 Revision Changes Path
11 1.99 dev-lang/tk/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.99&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.99&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/ChangeLog?r1=1.98&r2=1.99
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v
20 retrieving revision 1.98
21 retrieving revision 1.99
22 diff -u -r1.98 -r1.99
23 --- ChangeLog 3 Nov 2007 21:29:26 -0000 1.98
24 +++ ChangeLog 25 Nov 2007 00:29:38 -0000 1.99
25 @@ -1,6 +1,12 @@
26 # ChangeLog for dev-lang/tk
27 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.98 2007/11/03 21:29:26 jokey Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.99 2007/11/25 00:29:38 matsuu Exp $
30 +
31 +*tk-8.5_beta3 (25 Nov 2007)
32 +
33 + 25 Nov 2007; <matsuu@g.o> +tk-8.5_beta3.ebuild, -tk-8.5b.ebuild:
34 + Version bumped.
35 + Fixed wrong symlink wrt bug #200090.
36
37 *tk-8.5b (03 Nov 2007)
38
39
40
41
42 1.1 dev-lang/tk/tk-8.5_beta3.ebuild
43
44 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/tk-8.5_beta3.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/tk-8.5_beta3.ebuild?rev=1.1&content-type=text/plain
46
47 Index: tk-8.5_beta3.ebuild
48 ===================================================================
49 # Copyright 1999-2007 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5_beta3.ebuild,v 1.1 2007/11/25 00:29:38 matsuu Exp $
52
53 WANT_AUTOCONF=latest
54 WANT_AUTOMAKE=latest
55
56 inherit autotools eutils multilib toolchain-funcs
57
58 MY_P="${PN}${PV/_beta/b}"
59 DESCRIPTION="Tk Widget Set"
60 HOMEPAGE="http://www.tcl.tk/"
61 SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
62
63 LICENSE="BSD"
64 SLOT="0"
65 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
66 IUSE="debug threads"
67
68 RDEPEND="x11-libs/libX11
69 ~dev-lang/tcl-${PV}"
70 DEPEND="${RDEPEND}
71 x11-libs/libXt
72 x11-proto/xproto"
73
74 S="${WORKDIR}/${MY_P}"
75
76 pkg_setup() {
77 if use threads ; then
78 ewarn ""
79 ewarn "PLEASE NOTE: You are compiling ${P} with"
80 ewarn "threading enabled."
81 ewarn "Threading is not supported by all applications"
82 ewarn "that compile against tcl. You use threading at"
83 ewarn "your own discretion."
84 ewarn ""
85 epause 5
86 fi
87 }
88
89 src_unpack() {
90 unpack ${A}
91 cd "${S}"
92 epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
93
94 # Bug 125971
95 epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
96
97 cd "${S}"/unix
98 eautoreconf
99 }
100
101 src_compile() {
102 tc-export CC
103 cd "${S}"/unix
104
105 local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
106
107 econf \
108 --with-tcl=/usr/${mylibdir} \
109 $(use_enable threads) \
110 $(use_enable debug symbols) || die
111
112 emake || die
113 }
114
115 src_install() {
116 #short version number
117 local v1
118 v1=${PV%_*}
119
120 cd "${S}"/unix
121 S= emake DESTDIR="${D}" install || die
122
123 # fix the tkConfig.sh to eliminate refs to the build directory
124 local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
125 sed -i \
126 -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
127 -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
128 -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
129 -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
130 -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
131 -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
132 "${D}"/usr/${mylibdir}/tkConfig.sh || die
133
134 # install private headers
135 insinto /usr/${mylibdir}/tk${v1}/include/unix
136 doins "${S}"/unix/*.h || die
137 insinto /usr/${mylibdir}/tk${v1}/include/generic
138 doins "${S}"/generic/*.h || die
139 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
140 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
141 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
142
143 # install symlink for libraries
144 #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
145 dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
146 dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
147
148 dosym wish${v1} /usr/bin/wish
149
150 cd "${S}"
151 dodoc ChangeLog* README changes
152 }
153
154
155
156 --
157 gentoo-commits@g.o mailing list