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