1 |
jlec 12/03/02 17:20:55 |
2 |
|
3 |
Modified: tk-8.5.10.ebuild ChangeLog |
4 |
Log: |
5 |
Add missing dies, remove unnessecary dies, handle static-libs |
6 |
|
7 |
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 dev-lang/tk/tk-8.5.10.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.5.10.ebuild?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.5.10.ebuild?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.5.10.ebuild?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: tk-8.5.10.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.10.ebuild,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- tk-8.5.10.ebuild 4 Oct 2011 17:08:05 -0000 1.1 |
23 |
+++ tk-8.5.10.ebuild 2 Mar 2012 17:20:55 -0000 1.2 |
24 |
@@ -1,8 +1,8 @@ |
25 |
-# Copyright 1999-2011 Gentoo Foundation |
26 |
+# Copyright 1999-2012 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.10.ebuild,v 1.1 2011/10/04 17:08:05 jlec Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.10.ebuild,v 1.2 2012/03/02 17:20:55 jlec Exp $ |
30 |
|
31 |
-EAPI="3" |
32 |
+EAPI=4 |
33 |
|
34 |
inherit autotools eutils multilib toolchain-funcs prefix |
35 |
|
36 |
@@ -15,7 +15,7 @@ |
37 |
LICENSE="BSD" |
38 |
SLOT="0" |
39 |
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" |
40 |
-IUSE="debug threads truetype aqua xscreensaver" |
41 |
+IUSE="debug static-libs threads truetype aqua xscreensaver" |
42 |
|
43 |
RDEPEND=" |
44 |
!aqua? ( |
45 |
@@ -60,8 +60,7 @@ |
46 |
} |
47 |
|
48 |
src_compile() { |
49 |
- cd "${S}"/unix |
50 |
- emake || die |
51 |
+ cd "${S}"/unix && emake |
52 |
} |
53 |
|
54 |
src_install() { |
55 |
@@ -70,7 +69,7 @@ |
56 |
v1=${PV%.*} |
57 |
|
58 |
cd "${S}"/unix |
59 |
- S= emake DESTDIR="${D}" install || die |
60 |
+ S= emake DESTDIR="${D}" install |
61 |
|
62 |
# normalize $S path, bug #280766 (pkgcore) |
63 |
local nS="$(cd "${S}"; pwd)" |
64 |
@@ -93,20 +92,25 @@ |
65 |
|
66 |
# install private headers |
67 |
insinto /usr/${mylibdir}/tk${v1}/include/unix |
68 |
- doins "${S}"/unix/*.h || die |
69 |
+ doins "${S}"/unix/*.h |
70 |
insinto /usr/${mylibdir}/tk${v1}/include/generic |
71 |
- doins "${S}"/generic/*.h || die |
72 |
+ doins "${S}"/generic/*.h |
73 |
rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h |
74 |
rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h |
75 |
rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h |
76 |
|
77 |
# install symlink for libraries |
78 |
#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a |
79 |
- dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) || die |
80 |
- dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a || die |
81 |
+ dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) |
82 |
+ |
83 |
+ if use static-libs; then |
84 |
+ dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a |
85 |
+ else |
86 |
+ rm -f "${ED}"/usr/${mylibdir}/*.a || die |
87 |
+ fi |
88 |
|
89 |
- dosym wish${v1} /usr/bin/wish || die |
90 |
+ dosym wish${v1} /usr/bin/wish |
91 |
|
92 |
cd "${S}" |
93 |
- dodoc ChangeLog* README changes || die |
94 |
+ dodoc ChangeLog* README changes |
95 |
} |
96 |
|
97 |
|
98 |
|
99 |
1.157 dev-lang/tk/ChangeLog |
100 |
|
101 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.157&view=markup |
102 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.157&content-type=text/plain |
103 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?r1=1.156&r2=1.157 |
104 |
|
105 |
Index: ChangeLog |
106 |
=================================================================== |
107 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v |
108 |
retrieving revision 1.156 |
109 |
retrieving revision 1.157 |
110 |
diff -u -r1.156 -r1.157 |
111 |
--- ChangeLog 2 Mar 2012 15:31:00 -0000 1.156 |
112 |
+++ ChangeLog 2 Mar 2012 17:20:55 -0000 1.157 |
113 |
@@ -1,6 +1,9 @@ |
114 |
# ChangeLog for dev-lang/tk |
115 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
116 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.156 2012/03/02 15:31:00 jlec Exp $ |
117 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.157 2012/03/02 17:20:55 jlec Exp $ |
118 |
+ |
119 |
+ 02 Mar 2012; Justin Lecher <jlec@g.o> tk-8.5.10.ebuild: |
120 |
+ Add missing dies, remove unnessecary dies, handle static-libs |
121 |
|
122 |
*tk-8.5.11 (02 Mar 2012) |