| 1 |
jlec 12/03/04 20:11:13 |
| 2 |
|
| 3 |
Modified: ChangeLog tcl-8.5.10.ebuild tcl-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.146 dev-lang/tcl/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tcl/ChangeLog?rev=1.146&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tcl/ChangeLog?rev=1.146&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tcl/ChangeLog?r1=1.145&r2=1.146 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v |
| 19 |
retrieving revision 1.145 |
| 20 |
retrieving revision 1.146 |
| 21 |
diff -u -r1.145 -r1.146 |
| 22 |
--- ChangeLog 2 Mar 2012 19:39:57 -0000 1.145 |
| 23 |
+++ ChangeLog 4 Mar 2012 20:11:13 -0000 1.146 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for dev-lang/tcl |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.145 2012/03/02 19:39:57 ranger Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.146 2012/03/04 20:11:13 jlec Exp $ |
| 29 |
+ |
| 30 |
+ 04 Mar 2012; Justin Lecher <jlec@g.o> tcl-8.5.10.ebuild, |
| 31 |
+ tcl-8.5.11.ebuild: |
| 32 |
+ Revert static-libs handling, #406905; push changes from 8.5.10 to .11 |
| 33 |
|
| 34 |
02 Mar 2012; Brent Baude <ranger@g.o> tcl-8.5.10.ebuild: |
| 35 |
Marking tcl-8.5.10 ppc64 for bug 406607 |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.6 dev-lang/tcl/tcl-8.5.10.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tcl/tcl-8.5.10.ebuild?rev=1.6&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tcl/tcl-8.5.10.ebuild?rev=1.6&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tcl/tcl-8.5.10.ebuild?r1=1.5&r2=1.6 |
| 44 |
|
| 45 |
Index: tcl-8.5.10.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.10.ebuild,v |
| 48 |
retrieving revision 1.5 |
| 49 |
retrieving revision 1.6 |
| 50 |
diff -u -r1.5 -r1.6 |
| 51 |
--- tcl-8.5.10.ebuild 2 Mar 2012 19:39:57 -0000 1.5 |
| 52 |
+++ tcl-8.5.10.ebuild 4 Mar 2012 20:11:13 -0000 1.6 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2012 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.10.ebuild,v 1.5 2012/03/02 19:39:57 ranger Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.10.ebuild,v 1.6 2012/03/04 20:11:13 jlec Exp $ |
| 58 |
|
| 59 |
EAPI=4 |
| 60 |
|
| 61 |
@@ -15,7 +15,7 @@ |
| 62 |
LICENSE="BSD" |
| 63 |
SLOT="0" |
| 64 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris" |
| 65 |
-IUSE="debug static-libs threads" |
| 66 |
+IUSE="debug threads" |
| 67 |
|
| 68 |
S="${WORKDIR}/${MY_P}" |
| 69 |
|
| 70 |
@@ -95,11 +95,7 @@ |
| 71 |
|
| 72 |
# install symlink for libraries |
| 73 |
dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname) |
| 74 |
- if use static-libs; then |
| 75 |
- dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a |
| 76 |
- else |
| 77 |
- rm -f "${ED}"/usr/${mylibdir}/*.a || die |
| 78 |
- fi |
| 79 |
+ dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a |
| 80 |
|
| 81 |
dosym tclsh${v1} /usr/bin/tclsh |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
|
| 86 |
1.2 dev-lang/tcl/tcl-8.5.11.ebuild |
| 87 |
|
| 88 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tcl/tcl-8.5.11.ebuild?rev=1.2&view=markup |
| 89 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tcl/tcl-8.5.11.ebuild?rev=1.2&content-type=text/plain |
| 90 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tcl/tcl-8.5.11.ebuild?r1=1.1&r2=1.2 |
| 91 |
|
| 92 |
Index: tcl-8.5.11.ebuild |
| 93 |
=================================================================== |
| 94 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.11.ebuild,v |
| 95 |
retrieving revision 1.1 |
| 96 |
retrieving revision 1.2 |
| 97 |
diff -u -r1.1 -r1.2 |
| 98 |
--- tcl-8.5.11.ebuild 2 Mar 2012 15:30:44 -0000 1.1 |
| 99 |
+++ tcl-8.5.11.ebuild 4 Mar 2012 20:11:13 -0000 1.2 |
| 100 |
@@ -1,8 +1,8 @@ |
| 101 |
# Copyright 1999-2012 Gentoo Foundation |
| 102 |
# Distributed under the terms of the GNU General Public License v2 |
| 103 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.11.ebuild,v 1.1 2012/03/02 15:30:44 jlec Exp $ |
| 104 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.11.ebuild,v 1.2 2012/03/04 20:11:13 jlec Exp $ |
| 105 |
|
| 106 |
-EAPI="3" |
| 107 |
+EAPI=4 |
| 108 |
|
| 109 |
inherit autotools eutils flag-o-matic multilib toolchain-funcs |
| 110 |
|
| 111 |
@@ -21,13 +21,13 @@ |
| 112 |
|
| 113 |
pkg_setup() { |
| 114 |
if use threads ; then |
| 115 |
- ewarn "" |
| 116 |
+ echo |
| 117 |
ewarn "PLEASE NOTE: You are compiling ${P} with" |
| 118 |
ewarn "threading enabled." |
| 119 |
ewarn "Threading is not supported by all applications" |
| 120 |
ewarn "that compile against tcl. You use threading at" |
| 121 |
ewarn "your own discretion." |
| 122 |
- ewarn "" |
| 123 |
+ echo |
| 124 |
fi |
| 125 |
} |
| 126 |
|
| 127 |
@@ -59,8 +59,7 @@ |
| 128 |
} |
| 129 |
|
| 130 |
src_compile() { |
| 131 |
- cd "${S}"/unix |
| 132 |
- emake || die |
| 133 |
+ cd "${S}"/unix && emake |
| 134 |
} |
| 135 |
|
| 136 |
src_install() { |
| 137 |
@@ -69,7 +68,7 @@ |
| 138 |
v1=${PV%.*} |
| 139 |
|
| 140 |
cd "${S}"/unix |
| 141 |
- S= emake DESTDIR="${D}" install || die |
| 142 |
+ S= emake DESTDIR="${D}" install |
| 143 |
|
| 144 |
# fix the tclConfig.sh to eliminate refs to the build directory |
| 145 |
local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} |
| 146 |
@@ -83,34 +82,34 @@ |
| 147 |
[[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] && sed -i \ |
| 148 |
-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \ |
| 149 |
-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \ |
| 150 |
- "${ED}"/usr/${mylibdir}/tclConfig.sh |
| 151 |
+ "${ED}"/usr/${mylibdir}/tclConfig.sh || die |
| 152 |
|
| 153 |
# install private headers |
| 154 |
insinto /usr/${mylibdir}/tcl${v1}/include/unix |
| 155 |
- doins "${S}"/unix/*.h || die |
| 156 |
+ doins "${S}"/unix/*.h |
| 157 |
insinto /usr/${mylibdir}/tcl${v1}/include/generic |
| 158 |
- doins "${S}"/generic/*.h || die |
| 159 |
- rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h |
| 160 |
- rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h |
| 161 |
- rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h |
| 162 |
+ doins "${S}"/generic/*.h |
| 163 |
+ rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h || die |
| 164 |
+ rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h || die |
| 165 |
+ rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h || die |
| 166 |
|
| 167 |
# install symlink for libraries |
| 168 |
dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname) || die |
| 169 |
dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a || die |
| 170 |
|
| 171 |
- dosym tclsh${v1} /usr/bin/tclsh || die |
| 172 |
+ dosym tclsh${v1} /usr/bin/tclsh |
| 173 |
|
| 174 |
cd "${S}" |
| 175 |
- dodoc ChangeLog* README changes || die |
| 176 |
+ dodoc ChangeLog* README changes |
| 177 |
} |
| 178 |
|
| 179 |
pkg_postinst() { |
| 180 |
- ewarn |
| 181 |
+ echo |
| 182 |
ewarn "If you're upgrading from <dev-lang/tcl-8.5, you must recompile the other" |
| 183 |
ewarn "packages on your system that link with tcl after the upgrade" |
| 184 |
ewarn "completes. To perform this action, please run revdep-rebuild" |
| 185 |
ewarn "in package app-portage/gentoolkit." |
| 186 |
ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should" |
| 187 |
ewarn "upgrade them before this recompilation, too," |
| 188 |
- ewarn |
| 189 |
+ echo |
| 190 |
} |
Archives