| 1 |
jlec 13/12/26 14:51:23 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: tcl-8.5.15-r1.ebuild tcl-8.6.1-r1.ebuild |
| 5 |
Log: |
| 6 |
dev-lang/tcl: Add multilib support, #496008 ; thanks Michael Mair-Keimberger for the patch |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.185 dev-lang/tcl/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tcl/ChangeLog?rev=1.185&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tcl/ChangeLog?rev=1.185&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tcl/ChangeLog?r1=1.184&r2=1.185 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v |
| 20 |
retrieving revision 1.184 |
| 21 |
retrieving revision 1.185 |
| 22 |
diff -u -r1.184 -r1.185 |
| 23 |
--- ChangeLog 10 Oct 2013 13:04:51 -0000 1.184 |
| 24 |
+++ ChangeLog 26 Dec 2013 14:51:23 -0000 1.185 |
| 25 |
@@ -1,6 +1,13 @@ |
| 26 |
# ChangeLog for dev-lang/tcl |
| 27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.184 2013/10/10 13:04:51 jlec Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.185 2013/12/26 14:51:23 jlec Exp $ |
| 30 |
+ |
| 31 |
+*tcl-8.6.1-r1 (26 Dec 2013) |
| 32 |
+*tcl-8.5.15-r1 (26 Dec 2013) |
| 33 |
+ |
| 34 |
+ 26 Dec 2013; Justin Lecher <jlec@g.o> +tcl-8.5.15-r1.ebuild, |
| 35 |
+ +tcl-8.6.1-r1.ebuild: |
| 36 |
+ Add multilib support, #496008 ; thanks Michael Mair-Keimberger for the patch |
| 37 |
|
| 38 |
10 Oct 2013; Justin Lecher <jlec@g.o> -tcl-8.5.10-r1.ebuild: |
| 39 |
Drop old |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 dev-lang/tcl/tcl-8.5.15-r1.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tcl/tcl-8.5.15-r1.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tcl/tcl-8.5.15-r1.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: tcl-8.5.15-r1.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2013 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.15-r1.ebuild,v 1.1 2013/12/26 14:51:23 jlec Exp $ |
| 53 |
|
| 54 |
EAPI=5 |
| 55 |
|
| 56 |
inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator multilib-minimal |
| 57 |
|
| 58 |
MY_P="${PN}${PV/_beta/b}" |
| 59 |
|
| 60 |
DESCRIPTION="Tool Command Language" |
| 61 |
HOMEPAGE="http://www.tcl.tk/" |
| 62 |
SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" |
| 63 |
|
| 64 |
LICENSE="tcltk" |
| 65 |
SLOT="0" |
| 66 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris" |
| 67 |
IUSE="debug threads" |
| 68 |
|
| 69 |
RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]" |
| 70 |
DEPEND="${RDEPEND}" |
| 71 |
|
| 72 |
SPARENT="${WORKDIR}/${MY_P}" |
| 73 |
S="${SPARENT}"/unix |
| 74 |
|
| 75 |
pkg_setup() { |
| 76 |
if use threads ; then |
| 77 |
echo |
| 78 |
ewarn "PLEASE NOTE: You are compiling ${P} with" |
| 79 |
ewarn "threading enabled." |
| 80 |
ewarn "Threading is not supported by all applications" |
| 81 |
ewarn "that compile against tcl. You use threading at" |
| 82 |
ewarn "your own discretion." |
| 83 |
echo |
| 84 |
fi |
| 85 |
} |
| 86 |
|
| 87 |
src_prepare() { |
| 88 |
epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch |
| 89 |
|
| 90 |
# Bug 125971 |
| 91 |
epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch |
| 92 |
|
| 93 |
# Bug 354067 |
| 94 |
epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch |
| 95 |
|
| 96 |
# workaround stack check issues, bug #280934 |
| 97 |
use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1" |
| 98 |
|
| 99 |
tc-export CC |
| 100 |
|
| 101 |
eautoconf |
| 102 |
multilib_copy_sources |
| 103 |
} |
| 104 |
|
| 105 |
multilib_src_configure() { |
| 106 |
econf \ |
| 107 |
$(use_enable threads) \ |
| 108 |
$(use_enable debug symbols) |
| 109 |
} |
| 110 |
|
| 111 |
multilib_src_install() { |
| 112 |
#short version number |
| 113 |
local v1=$(get_version_component_range 1-2) |
| 114 |
local mylibdir=$(get_libdir) |
| 115 |
|
| 116 |
S= default |
| 117 |
|
| 118 |
# fix the tclConfig.sh to eliminate refs to the build directory |
| 119 |
# and drop unnecessary -L inclusion to default system libdir |
| 120 |
|
| 121 |
sed \ |
| 122 |
-e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \ |
| 123 |
-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ |
| 124 |
-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \ |
| 125 |
-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \ |
| 126 |
-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ |
| 127 |
-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \ |
| 128 |
-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \ |
| 129 |
-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die |
| 130 |
if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then |
| 131 |
sed \ |
| 132 |
-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ |
| 133 |
-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ |
| 134 |
-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die |
| 135 |
fi |
| 136 |
|
| 137 |
# install private headers |
| 138 |
insinto /usr/${mylibdir}/tcl${v1}/include/unix |
| 139 |
doins *.h |
| 140 |
insinto /usr/${mylibdir}/tcl${v1}/include/generic |
| 141 |
doins "${SPARENT}"/generic/*.h |
| 142 |
rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die |
| 143 |
|
| 144 |
# install symlink for libraries |
| 145 |
dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname) |
| 146 |
dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a |
| 147 |
|
| 148 |
is_final_abi && { |
| 149 |
dosym tclsh${v1} /usr/bin/tclsh |
| 150 |
dodoc "${SPARENT}"/{ChangeLog*,README,changes} |
| 151 |
} |
| 152 |
} |
| 153 |
|
| 154 |
pkg_postinst() { |
| 155 |
for version in ${REPLACING_VERSIONS}; do |
| 156 |
if ! version_is_at_least 8.5 ${version}; then |
| 157 |
echo |
| 158 |
ewarn "You're upgrading from <${P}, you must recompile the other" |
| 159 |
ewarn "packages on your system that link with tcl after the upgrade" |
| 160 |
ewarn "completes. To perform this action, please run revdep-rebuild" |
| 161 |
ewarn "in package app-portage/gentoolkit." |
| 162 |
ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should" |
| 163 |
ewarn "upgrade them before this recompilation, too," |
| 164 |
echo |
| 165 |
fi |
| 166 |
done |
| 167 |
} |
| 168 |
|
| 169 |
|
| 170 |
|
| 171 |
1.1 dev-lang/tcl/tcl-8.6.1-r1.ebuild |
| 172 |
|
| 173 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tcl/tcl-8.6.1-r1.ebuild?rev=1.1&view=markup |
| 174 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tcl/tcl-8.6.1-r1.ebuild?rev=1.1&content-type=text/plain |
| 175 |
|
| 176 |
Index: tcl-8.6.1-r1.ebuild |
| 177 |
=================================================================== |
| 178 |
# Copyright 1999-2013 Gentoo Foundation |
| 179 |
# Distributed under the terms of the GNU General Public License v2 |
| 180 |
# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.6.1-r1.ebuild,v 1.1 2013/12/26 14:51:23 jlec Exp $ |
| 181 |
|
| 182 |
EAPI=5 |
| 183 |
|
| 184 |
inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator multilib-minimal |
| 185 |
|
| 186 |
MY_P="${PN}${PV}" |
| 187 |
|
| 188 |
DESCRIPTION="Tool Command Language" |
| 189 |
HOMEPAGE="http://www.tcl.tk/" |
| 190 |
SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz" |
| 191 |
|
| 192 |
LICENSE="tcltk" |
| 193 |
SLOT="0/8.6" |
| 194 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris" |
| 195 |
IUSE="debug +threads" |
| 196 |
|
| 197 |
RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]" |
| 198 |
DEPEND="${RDEPEND}" |
| 199 |
|
| 200 |
SPARENT="${WORKDIR}/${MY_P}" |
| 201 |
S="${SPARENT}"/unix |
| 202 |
|
| 203 |
src_prepare() { |
| 204 |
find \ |
| 205 |
"${SPARENT}"/compat/* \ |
| 206 |
"${SPARENT}"/doc/try.n \ |
| 207 |
-delete || die |
| 208 |
|
| 209 |
epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch |
| 210 |
|
| 211 |
# Bug 125971 |
| 212 |
epatch "${FILESDIR}"/${P}-conf.patch |
| 213 |
|
| 214 |
# Bug 354067 |
| 215 |
epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch |
| 216 |
|
| 217 |
# workaround stack check issues, bug #280934 |
| 218 |
use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1" |
| 219 |
|
| 220 |
tc-export CC |
| 221 |
|
| 222 |
sed \ |
| 223 |
-e 's:-O[2s]\?::g' \ |
| 224 |
-i tcl.m4 || die |
| 225 |
|
| 226 |
eautoconf |
| 227 |
|
| 228 |
multilib_copy_sources |
| 229 |
} |
| 230 |
|
| 231 |
multilib_src_configure() { |
| 232 |
econf \ |
| 233 |
$(use_enable threads) \ |
| 234 |
$(use_enable debug symbols) |
| 235 |
} |
| 236 |
|
| 237 |
multilib_src_install() { |
| 238 |
#short version number |
| 239 |
local v1=$(get_version_component_range 1-2) |
| 240 |
local mylibdir=$(get_libdir) |
| 241 |
|
| 242 |
S= default |
| 243 |
# fix the tclConfig.sh to eliminate refs to the build directory |
| 244 |
# and drop unnecessary -L inclusion to default system libdir |
| 245 |
|
| 246 |
sed \ |
| 247 |
-e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \ |
| 248 |
-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ |
| 249 |
-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \ |
| 250 |
-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \ |
| 251 |
-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ |
| 252 |
-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \ |
| 253 |
-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \ |
| 254 |
-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die |
| 255 |
if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then |
| 256 |
sed \ |
| 257 |
-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ |
| 258 |
-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ |
| 259 |
-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die |
| 260 |
fi |
| 261 |
|
| 262 |
# install private headers |
| 263 |
insinto /usr/${mylibdir}/tcl${v1}/include/unix |
| 264 |
doins *.h |
| 265 |
insinto /usr/${mylibdir}/tcl${v1}/include/generic |
| 266 |
doins "${SPARENT}"/generic/*.h |
| 267 |
rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die |
| 268 |
|
| 269 |
# install symlink for libraries |
| 270 |
dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname) |
| 271 |
dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a |
| 272 |
|
| 273 |
is_final_abi && { |
| 274 |
dosym tclsh${v1} /usr/bin/tclsh |
| 275 |
dodoc "${SPARENT}"/{ChangeLog*,README,changes} |
| 276 |
} |
| 277 |
} |
| 278 |
|
| 279 |
pkg_postinst() { |
| 280 |
for version in ${REPLACING_VERSIONS}; do |
| 281 |
if ! version_is_at_least 8.6 ${version}; then |
| 282 |
echo |
| 283 |
ewarn "You're upgrading from <${P}, you must recompile the other" |
| 284 |
ewarn "packages on your system that link with tcl after the upgrade" |
| 285 |
ewarn "completes. To perform this action, please run revdep-rebuild" |
| 286 |
ewarn "in package app-portage/gentoolkit." |
| 287 |
ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should" |
| 288 |
ewarn "upgrade them before this recompilation, too," |
| 289 |
echo |
| 290 |
fi |
| 291 |
done |
| 292 |
} |
Archives