From 23dd348a3c8c549ff9e9072304bef5f531124982 Mon Sep 17 00:00:00 2001 From: Matsuu Takuto Date: Fri, 27 Apr 2007 17:34:53 +0000 Subject: [PATCH] Fixed soname issue, bug #125971. Package-Manager: portage-2.1.2.4 --- dev-lang/tcl/ChangeLog | 7 +- dev-lang/tcl/Manifest | 40 ++------- dev-lang/tcl/files/digest-tcl-8.4.11-r1 | 3 - dev-lang/tcl/files/digest-tcl-8.4.12 | 3 - dev-lang/tcl/files/digest-tcl-8.4.13 | 3 - dev-lang/tcl/tcl-8.4.11-r1.ebuild | 111 ----------------------- dev-lang/tcl/tcl-8.4.12.ebuild | 111 ----------------------- dev-lang/tcl/tcl-8.4.13.ebuild | 113 ------------------------ dev-lang/tcl/tcl-8.4.14.ebuild | 10 ++- 9 files changed, 22 insertions(+), 379 deletions(-) delete mode 100644 dev-lang/tcl/files/digest-tcl-8.4.11-r1 delete mode 100644 dev-lang/tcl/files/digest-tcl-8.4.12 delete mode 100644 dev-lang/tcl/files/digest-tcl-8.4.13 delete mode 100644 dev-lang/tcl/tcl-8.4.11-r1.ebuild delete mode 100644 dev-lang/tcl/tcl-8.4.12.ebuild delete mode 100644 dev-lang/tcl/tcl-8.4.13.ebuild diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog index a411a1c2768b..4aa94fd6d3c9 100644 --- a/dev-lang/tcl/ChangeLog +++ b/dev-lang/tcl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/tcl # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.72 2007/01/06 05:35:43 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.73 2007/04/27 17:34:53 matsuu Exp $ + + 27 Apr 2007; MATSUU Takuto -tcl-8.4.11-r1.ebuild, + -tcl-8.4.12.ebuild, -tcl-8.4.13.ebuild, tcl-8.4.14.ebuild: + Fixed soname problem, bug #125971. + Removed old versions. *tcl-8.4.14 (06 Jan 2007) diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest index 5cab9d1679bb..626faa37f2d0 100644 --- a/dev-lang/tcl/Manifest +++ b/dev-lang/tcl/Manifest @@ -14,48 +14,24 @@ AUX tcl-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd88 MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/tcl-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 files/tcl-configure-LANG.patch 1686 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea files/tcl-configure-LANG.patch 1686 -DIST tcl8.4.11-src.tar.gz 3474428 RMD160 933dda739859af170c31cef855409f861ed597cb SHA1 4580adcbdcb7d09fd9a8ae8fbe61c592a56bfa9e SHA256 8dcfa54b58a6aaf4853fc27752c25d6c2592c485952b2fad25a9bea4b52bed33 -DIST tcl8.4.12-src.tar.gz 3500222 RMD160 5a667face8be2cebced5238c481e96499a93237b SHA1 8f9808da2df0aeb2319ab10a4fc49295789fc43d SHA256 84d123318a51e14e5bbe1b8c2e5c93af299310fbc026b86f7375594cda5e00d8 -DIST tcl8.4.13-src.tar.gz 3513852 RMD160 4e0aa4e67f0a910d3323d8288b707ae9a59408a3 SHA1 4af6bec9a941d7d798df4287eebece7ded67489c SHA256 c650124caf4785bb532720cb9d2902358ee9a9d6c71852ef4cdbdd6b7c5db4fc DIST tcl8.4.14-src.tar.gz 3544609 RMD160 392a4f4617ee77cfdae10b24e9ccbe84afed0a40 SHA1 d7af7e0c7ed563e2344dda04bbe49961589244dd SHA256 2746e3c568a5837cfb7a83359ab34401886ad621965ab4571333859807ab6143 DIST tcl8.4.9-src.tar.gz 3496364 RMD160 0d02e3224fcc6d2dd41f2edfb89a824e5437fca8 SHA1 77370577ded22315fb8f60e20500920352412e58 SHA256 b4178967e94bcfae6b73abaaf575397e6aac81ffbaf144d757a3891d0bf89d96 -EBUILD tcl-8.4.11-r1.ebuild 3509 RMD160 3c58f736de31e980802417d3214d09eb50a2a7d9 SHA1 502562745e4b471c1aed996e1d15dfe9ea8e2d4a SHA256 bcbdd4e98ca2213befd948dfb8e2bc5e8f898af51976277727c114984b0beb4f -MD5 d46cf03dc43fffec5b25c1848ddd4bd2 tcl-8.4.11-r1.ebuild 3509 -RMD160 3c58f736de31e980802417d3214d09eb50a2a7d9 tcl-8.4.11-r1.ebuild 3509 -SHA256 bcbdd4e98ca2213befd948dfb8e2bc5e8f898af51976277727c114984b0beb4f tcl-8.4.11-r1.ebuild 3509 -EBUILD tcl-8.4.12.ebuild 3524 RMD160 9d00943e2e75521240e80bf2b1b9abd6942b1640 SHA1 0040d6999c38d17dd53c7882f3ce804aa8344f6f SHA256 b84dcea247525cc8ee1df179ff0d85a7b8467b8b734433136f3791f35a1fcf0b -MD5 07e511fc93a2216e2ad8f56aa04ea804 tcl-8.4.12.ebuild 3524 -RMD160 9d00943e2e75521240e80bf2b1b9abd6942b1640 tcl-8.4.12.ebuild 3524 -SHA256 b84dcea247525cc8ee1df179ff0d85a7b8467b8b734433136f3791f35a1fcf0b tcl-8.4.12.ebuild 3524 -EBUILD tcl-8.4.13.ebuild 3428 RMD160 5591ba6b09003c08e91d4ba02ffe82305b8de968 SHA1 b591743fd0b39c18b18903e7ad6aef0e2abb9a84 SHA256 cac6ff57850e9fbad99c92987a20edcbc220b23f8b0f4bb0cbcfbc9eddc9d4ae -MD5 c7b0b5ae932ac9e5335f37ddae4683d2 tcl-8.4.13.ebuild 3428 -RMD160 5591ba6b09003c08e91d4ba02ffe82305b8de968 tcl-8.4.13.ebuild 3428 -SHA256 cac6ff57850e9fbad99c92987a20edcbc220b23f8b0f4bb0cbcfbc9eddc9d4ae tcl-8.4.13.ebuild 3428 -EBUILD tcl-8.4.14.ebuild 3428 RMD160 cb87e293930e4d54111ccddb749e5b41495904b3 SHA1 ac0500d4ca30a87faced98560af0d44be1d93138 SHA256 54408c68bafbfe048f33fd00abd126ec93673068e2c1a2b351efc837467fdb98 -MD5 1e1bd78663f8162ca24f25f810a693f9 tcl-8.4.14.ebuild 3428 -RMD160 cb87e293930e4d54111ccddb749e5b41495904b3 tcl-8.4.14.ebuild 3428 -SHA256 54408c68bafbfe048f33fd00abd126ec93673068e2c1a2b351efc837467fdb98 tcl-8.4.14.ebuild 3428 +EBUILD tcl-8.4.14.ebuild 3511 RMD160 19bedfb9cdb067ec69f3e6065af7710e9c3e8214 SHA1 cc13678e1c0356b84b87467bb91ec2bcffa60041 SHA256 217446779092845e01629a637e93719619646072ccbbc8b28c841cf4020fac95 +MD5 00b3df9e6c60e8d9ab9fdb988f38271d tcl-8.4.14.ebuild 3511 +RMD160 19bedfb9cdb067ec69f3e6065af7710e9c3e8214 tcl-8.4.14.ebuild 3511 +SHA256 217446779092845e01629a637e93719619646072ccbbc8b28c841cf4020fac95 tcl-8.4.14.ebuild 3511 EBUILD tcl-8.4.9.ebuild 3511 RMD160 a741d37e1321dcb3d5c2ab2effe34ab6912a32e1 SHA1 e9bc7cfa253032e26ff5e221c52491e773c7b7d2 SHA256 0fd4205fe462892d907cb0753a90f3f10898d40888bcbb708b60bd872006d035 MD5 af3ec8733dddf50f34db16fefc41aac6 tcl-8.4.9.ebuild 3511 RMD160 a741d37e1321dcb3d5c2ab2effe34ab6912a32e1 tcl-8.4.9.ebuild 3511 SHA256 0fd4205fe462892d907cb0753a90f3f10898d40888bcbb708b60bd872006d035 tcl-8.4.9.ebuild 3511 -MISC ChangeLog 9159 RMD160 de504ff21cf3feff61f8b314ef9aa9c025722467 SHA1 a5ddf2c02ea6633ce92cb78aa21f94d528e650ef SHA256 5f252c104f50178b7f03d12833d3ccf57b765e6960f6dd27e9523634849523a9 -MD5 bcd7657812a0fa6f489adc33db9072da ChangeLog 9159 -RMD160 de504ff21cf3feff61f8b314ef9aa9c025722467 ChangeLog 9159 -SHA256 5f252c104f50178b7f03d12833d3ccf57b765e6960f6dd27e9523634849523a9 ChangeLog 9159 +MISC ChangeLog 9354 RMD160 63731395e35a1155849465d9e56059f255d1f060 SHA1 9c54b0d79789a56d006fbe27f46e47609fe4f987 SHA256 a636a9984b507923fbe6277107e85a1d892ab3b21a820864659fb079f87ec6ce +MD5 a791a63b524dff23011dba82c76a4773 ChangeLog 9354 +RMD160 63731395e35a1155849465d9e56059f255d1f060 ChangeLog 9354 +SHA256 a636a9984b507923fbe6277107e85a1d892ab3b21a820864659fb079f87ec6ce ChangeLog 9354 MISC metadata.xml 264 RMD160 6318855997b3e957f4ad5c59677534993e352c34 SHA1 19fe5fc86133d09d7fcb0b2ce44054eff4fff028 SHA256 01ce19dabf2e53a73d86e4b16f653c6cd2b6c9aca1b79ec095f353315c8b84ee MD5 72be7b18671e9312d64a3fb833dceecd metadata.xml 264 RMD160 6318855997b3e957f4ad5c59677534993e352c34 metadata.xml 264 SHA256 01ce19dabf2e53a73d86e4b16f653c6cd2b6c9aca1b79ec095f353315c8b84ee metadata.xml 264 -MD5 477255fdad59cecd45611b21e53398c2 files/digest-tcl-8.4.11-r1 244 -RMD160 10d83dc53b57b15615f9f9dd9281f01cc207d1c5 files/digest-tcl-8.4.11-r1 244 -SHA256 81d7063454e2ee16f51119e483bf0ea22bb199cc3e195211fe90fbeb1b365a66 files/digest-tcl-8.4.11-r1 244 -MD5 355fe43629da1bca38c0a5ccf75e7112 files/digest-tcl-8.4.12 244 -RMD160 418421d8c2eb9e10e6b286f5ee46f595312582c6 files/digest-tcl-8.4.12 244 -SHA256 87e360cd3acea03c1a6382dfce6b10778d32b8e0b7d015b00d9620ac55019d3b files/digest-tcl-8.4.12 244 -MD5 8253bede2d93ded9b8f428eca52f8f7f files/digest-tcl-8.4.13 244 -RMD160 9b59a2ab4c608fe0af4568f908970f6db8da5915 files/digest-tcl-8.4.13 244 -SHA256 11e2a3ad9de8782713c06141f2cdd5f1b0f5f44f33257c0524100b70eef58384 files/digest-tcl-8.4.13 244 MD5 8cd7702b2ee54c5d65920ccac7fc4c7c files/digest-tcl-8.4.14 244 RMD160 a82cea51d6dd72d1b3df274cce174de5fbe396a3 files/digest-tcl-8.4.14 244 SHA256 dae1705fd36fff139048d2be335a29ba532845639437351f6d44e6aa9f3b19a3 files/digest-tcl-8.4.14 244 diff --git a/dev-lang/tcl/files/digest-tcl-8.4.11-r1 b/dev-lang/tcl/files/digest-tcl-8.4.11-r1 deleted file mode 100644 index 59fe82ae7aa7..000000000000 --- a/dev-lang/tcl/files/digest-tcl-8.4.11-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 629dfea34e4087eb4683f834060abb63 tcl8.4.11-src.tar.gz 3474428 -RMD160 933dda739859af170c31cef855409f861ed597cb tcl8.4.11-src.tar.gz 3474428 -SHA256 8dcfa54b58a6aaf4853fc27752c25d6c2592c485952b2fad25a9bea4b52bed33 tcl8.4.11-src.tar.gz 3474428 diff --git a/dev-lang/tcl/files/digest-tcl-8.4.12 b/dev-lang/tcl/files/digest-tcl-8.4.12 deleted file mode 100644 index 9487de9ef143..000000000000 --- a/dev-lang/tcl/files/digest-tcl-8.4.12 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7480432d8730263f267952788eb4839b tcl8.4.12-src.tar.gz 3500222 -RMD160 5a667face8be2cebced5238c481e96499a93237b tcl8.4.12-src.tar.gz 3500222 -SHA256 84d123318a51e14e5bbe1b8c2e5c93af299310fbc026b86f7375594cda5e00d8 tcl8.4.12-src.tar.gz 3500222 diff --git a/dev-lang/tcl/files/digest-tcl-8.4.13 b/dev-lang/tcl/files/digest-tcl-8.4.13 deleted file mode 100644 index 2b35235c31c3..000000000000 --- a/dev-lang/tcl/files/digest-tcl-8.4.13 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c6b655ad5db095ee73227113220c0523 tcl8.4.13-src.tar.gz 3513852 -RMD160 4e0aa4e67f0a910d3323d8288b707ae9a59408a3 tcl8.4.13-src.tar.gz 3513852 -SHA256 c650124caf4785bb532720cb9d2902358ee9a9d6c71852ef4cdbdd6b7c5db4fc tcl8.4.13-src.tar.gz 3513852 diff --git a/dev-lang/tcl/tcl-8.4.11-r1.ebuild b/dev-lang/tcl/tcl-8.4.11-r1.ebuild deleted file mode 100644 index edd16485df7c..000000000000 --- a/dev-lang/tcl/tcl-8.4.11-r1.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.11-r1.ebuild,v 1.4 2006/09/04 08:51:41 vapier Exp $ - -inherit eutils multilib - -DESCRIPTION="Tool Command Language" -HOMEPAGE="http://www.tcl.tk/" -SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="threads" - -DEPEND="" -PDEPEND="threads? ( dev-tcltk/thread )" - -S=${WORKDIR}/${PN}${PV} - -pkg_setup() { - if use threads ; then - ewarn "" - ewarn "PLEASE NOTE: You are compiling ${P} with" - ewarn "threading enabled." - ewarn "Threading is not supported by all applications" - ewarn "that compile against tcl. You use threading at" - ewarn "your own discretion." - ewarn "" - epause 5 - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-multilib.patch - - # bug 117744 - sed -i -e "s/relid'/relid/" "${S}"/unix/{configure,tcl.m4} || die - - local d - for d in */configure ; do - cd "${S}"/${d%%/*} - EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \ - epatch "${FILESDIR}"/tcl-configure-LANG.patch - done -} - -src_compile() { - local local_config_use="" - - if use threads ; then - local_config_use="--enable-threads" - fi - - cd "${S}"/unix - econf ${local_config_use} || die - emake CFLAGS="${CFLAGS}" || die -} - -src_install() { - #short version number - local v1 - v1=${PV%.*} - - cd ${S}/unix - S= make DESTDIR=${D} install || die - - # fix the tclConfig.sh to eliminate refs to the build directory - [[ ${ROOT:0-1} != "/" ]] && ROOT=${ROOT}/ - local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} - sed -i \ - -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${ROOT}usr/${mylibdir}," \ - -e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${ROOT}usr/${mylibdir}/tcl${v1}/include'," \ - -e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${ROOT}usr/${mylibdir}," \ - -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${ROOT}usr/${mylibdir}," \ - -e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \ - -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \ - -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \ - ${D}/usr/${mylibdir}/tclConfig.sh || die - - # install private headers - dodir /usr/${mylibdir}/tcl${v1}/include/unix - install -c -m0644 ${S}/unix/*.h ${D}/usr/${mylibdir}/tcl${v1}/include/unix - dodir /usr/${mylibdir}/tcl${v1}/include/generic - install -c -m0644 ${S}/generic/*.h ${D}/usr/${mylibdir}/tcl${v1}/include/generic - rm -f ${D}/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h - rm -f ${D}/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h - rm -f ${D}/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h - - # install symlink for libraries - dosym /usr/${mylibdir}/libtcl${v1}.so /usr/${mylibdir}/libtcl.so - dosym /usr/${mylibdir}/libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a - - ln -sf tclsh${v1} ${D}/usr/bin/tclsh - - cd ${S} - dodoc README changes license.terms -} - -pkg_postinst() { - ewarn - ewarn "If you're upgrading from tcl-8.3, you must recompile the other" - ewarn "packages on your system that link with tcl after the upgrade" - ewarn "completes. To perform this action, please run revdep-rebuild" - ewarn "in package app-portage/gentoolkit." - ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should" - ewarn "upgrade them before this recompilation, too," - ewarn -} diff --git a/dev-lang/tcl/tcl-8.4.12.ebuild b/dev-lang/tcl/tcl-8.4.12.ebuild deleted file mode 100644 index b83926ca1fcf..000000000000 --- a/dev-lang/tcl/tcl-8.4.12.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.12.ebuild,v 1.3 2006/09/04 08:51:41 vapier Exp $ - -inherit eutils multilib - -DESCRIPTION="Tool Command Language" -HOMEPAGE="http://www.tcl.tk/" -SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="threads" - -DEPEND="" -PDEPEND="threads? ( dev-tcltk/thread )" - -S=${WORKDIR}/${PN}${PV} - -pkg_setup() { - if use threads ; then - ewarn "" - ewarn "PLEASE NOTE: You are compiling ${P} with" - ewarn "threading enabled." - ewarn "Threading is not supported by all applications" - ewarn "that compile against tcl. You use threading at" - ewarn "your own discretion." - ewarn "" - epause 5 - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch - - # bug 117744 - sed -i -e "s/relid'/relid/" "${S}"/unix/{configure,tcl.m4} || die - - local d - for d in */configure ; do - cd "${S}"/${d%%/*} - EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \ - epatch "${FILESDIR}"/tcl-configure-LANG.patch - done -} - -src_compile() { - local local_config_use="" - - if use threads ; then - local_config_use="--enable-threads" - fi - - cd "${S}"/unix - econf ${local_config_use} || die - emake CFLAGS="${CFLAGS}" || die -} - -src_install() { - #short version number - local v1 - v1=${PV%.*} - - cd ${S}/unix - S= make DESTDIR=${D} install || die - - # fix the tclConfig.sh to eliminate refs to the build directory - [[ ${ROOT:0-1} != "/" ]] && ROOT=${ROOT}/ - local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} - sed -i \ - -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${ROOT}usr/${mylibdir}," \ - -e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${ROOT}usr/${mylibdir}/tcl${v1}/include'," \ - -e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${ROOT}usr/${mylibdir}," \ - -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${ROOT}usr/${mylibdir}," \ - -e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \ - -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \ - -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \ - ${D}/usr/${mylibdir}/tclConfig.sh || die - - # install private headers - dodir /usr/${mylibdir}/tcl${v1}/include/unix - install -c -m0644 ${S}/unix/*.h ${D}/usr/${mylibdir}/tcl${v1}/include/unix - dodir /usr/${mylibdir}/tcl${v1}/include/generic - install -c -m0644 ${S}/generic/*.h ${D}/usr/${mylibdir}/tcl${v1}/include/generic - rm -f ${D}/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h - rm -f ${D}/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h - rm -f ${D}/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h - - # install symlink for libraries - dosym /usr/${mylibdir}/libtcl${v1}.so /usr/${mylibdir}/libtcl.so - dosym /usr/${mylibdir}/libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a - - ln -sf tclsh${v1} ${D}/usr/bin/tclsh - - cd ${S} - dodoc README changes license.terms -} - -pkg_postinst() { - ewarn - ewarn "If you're upgrading from tcl-8.3, you must recompile the other" - ewarn "packages on your system that link with tcl after the upgrade" - ewarn "completes. To perform this action, please run revdep-rebuild" - ewarn "in package app-portage/gentoolkit." - ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should" - ewarn "upgrade them before this recompilation, too," - ewarn -} diff --git a/dev-lang/tcl/tcl-8.4.13.ebuild b/dev-lang/tcl/tcl-8.4.13.ebuild deleted file mode 100644 index 427263b7e01f..000000000000 --- a/dev-lang/tcl/tcl-8.4.13.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.13.ebuild,v 1.5 2006/12/26 04:54:47 vapier Exp $ - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="Tool Command Language" -HOMEPAGE="http://www.tcl.tk/" -SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="debug threads" - -DEPEND="" - -S=${WORKDIR}/${PN}${PV} - -pkg_setup() { - if use threads ; then - ewarn "" - ewarn "PLEASE NOTE: You are compiling ${P} with" - ewarn "threading enabled." - ewarn "Threading is not supported by all applications" - ewarn "that compile against tcl. You use threading at" - ewarn "your own discretion." - ewarn "" - epause 5 - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch - - # Bug 125971 - epatch "${FILESDIR}"/${PN}-8.3.5-tclm4-soname.patch - - local d - for d in */configure ; do - cd "${S}"/${d%%/*} - EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \ - epatch "${FILESDIR}"/tcl-configure-LANG.patch - done -} - -src_compile() { - tc-export CC - local local_config_use="" - - if use threads ; then - local_config_use="--enable-threads" - fi - - cd "${S}"/unix - econf \ - $(use_enable threads) \ - $(use_enable debug symbols) || die - emake || die -} - -src_install() { - #short version number - local v1 - v1=${PV%.*} - - cd "${S}"/unix - S= make DESTDIR="${D}" install || die - - # fix the tclConfig.sh to eliminate refs to the build directory - [[ ${ROOT:0-1} != "/" ]] && ROOT=${ROOT}/ - local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} - sed -i \ - -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${ROOT}usr/${mylibdir}," \ - -e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${ROOT}usr/${mylibdir}/tcl${v1}/include'," \ - -e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${ROOT}usr/${mylibdir}," \ - -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${ROOT}usr/${mylibdir}," \ - -e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \ - -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \ - -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \ - "${D}"/usr/${mylibdir}/tclConfig.sh || die - - # install private headers - insinto /usr/${mylibdir}/tcl${v1}/include/unix - doins "${S}"/unix/*.h || die - insinto /usr/${mylibdir}/tcl${v1}/include/generic - doins "${S}"/generic/*.h || die - rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h - rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h - rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h - - # install symlink for libraries - dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so - dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a - - ln -sf tclsh${v1} "${D}"/usr/bin/tclsh - - cd "${S}" - dodoc README changes license.terms -} - -pkg_postinst() { - ewarn - ewarn "If you're upgrading from tcl-8.3, you must recompile the other" - ewarn "packages on your system that link with tcl after the upgrade" - ewarn "completes. To perform this action, please run revdep-rebuild" - ewarn "in package app-portage/gentoolkit." - ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should" - ewarn "upgrade them before this recompilation, too," - ewarn -} diff --git a/dev-lang/tcl/tcl-8.4.14.ebuild b/dev-lang/tcl/tcl-8.4.14.ebuild index 5dd3c44c9f07..8b8e1b4c4a9d 100644 --- a/dev-lang/tcl/tcl-8.4.14.ebuild +++ b/dev-lang/tcl/tcl-8.4.14.ebuild @@ -1,8 +1,11 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.14.ebuild,v 1.1 2007/01/06 05:35:43 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.14.ebuild,v 1.2 2007/04/27 17:34:53 matsuu Exp $ -inherit eutils multilib toolchain-funcs +WANT_AUTOCONF=latest +WANT_AUTOMAKE=latest + +inherit autotools eutils multilib toolchain-funcs DESCRIPTION="Tool Command Language" HOMEPAGE="http://www.tcl.tk/" @@ -44,6 +47,9 @@ src_unpack() { EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \ epatch "${FILESDIR}"/tcl-configure-LANG.patch done + + cd "${S}"/unix + eautoreconf } src_compile() { -- 2.26.2