Fixed #125971, #164649 and #154328.

Package-Manager: portage-2.1.2.4

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index bcb56f6d12c6233e8bb99d593210b57b4f2e0d81..b7096d2ecf3e2b3cc80565f21f616188bf46b272 100644 (file)
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.73 2007/03/26 07:57:18 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.74 2007/04/27 17:54:42 matsuu Exp $
+
+  27 Apr 2007; MATSUU Takuto <matsuu@gentoo.org>
+  -files/remove-control-v.diff, tk-8.4.9.ebuild, -tk-8.4.11-r1.ebuild,
+  -tk-8.4.12.ebuild, -tk-8.4.13.ebuild, tk-8.4.14.ebuild:
+  Fixed SONAME issue, bug #125971.
+  Fixed tkConfig.sh issue, bug #164649.
+  Added tc-export CC, bug #154328.
+  Removed old versions.
 
   26 Mar 2007; Alec Warner <antarus@gentoo.org> tk-8.4.9.ebuild,
   tk-8.4.11-r1.ebuild, tk-8.4.12.ebuild, tk-8.4.13.ebuild, tk-8.4.14.ebuild:

diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 703d3a50498bee45f2ede9ab160dd8fef9945f4a..d970a7cf261bbb0b32f52e38573f57f5d5cc040b 100644 (file)
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -2,10 +2,6 @@ AUX remove-control-v-8.4.9.diff 522 RMD160 393f14c68f75795bc10e94d00a2e4d470ab50
 MD5 3003fb2cb4a185ec54b8c94ec0606313 files/remove-control-v-8.4.9.diff 522
 RMD160 393f14c68f75795bc10e94d00a2e4d470ab50e4d files/remove-control-v-8.4.9.diff 522
 SHA256 f82a147821e6eb4cda3674568450903de864c99d73cae6062b56c391e7290bba files/remove-control-v-8.4.9.diff 522
-AUX remove-control-v.diff 400 RMD160 0ecd0ac7aed9aa516e763de4cf930a1d005a878f SHA1 6b2902383558834bed9b7940ee11487111bae4af SHA256 44890be11039fec5cf4a5f52cb4e3b9e131ee85b77a7fe15279076f1a251a99b
-MD5 3e8db8239fe4e68f5107a7a1d4f2f85b files/remove-control-v.diff 400
-RMD160 0ecd0ac7aed9aa516e763de4cf930a1d005a878f files/remove-control-v.diff 400
-SHA256 44890be11039fec5cf4a5f52cb4e3b9e131ee85b77a7fe15279076f1a251a99b files/remove-control-v.diff 400
 AUX tk-8.3.5-tclm4-soname.patch 453 RMD160 75d39ffea21560a307fb897dc22210807bb62180 SHA1 00632e254141842ab11a3ecf5c6e01a50b880b9f SHA256 27f5a64334918f2b02fd5a0b86f489a879e82b13921100d60ef469ffb9e39142
 MD5 ff22a474e287dc6c1e27ec40cc9c9392 files/tk-8.3.5-tclm4-soname.patch 453
 RMD160 75d39ffea21560a307fb897dc22210807bb62180 files/tk-8.3.5-tclm4-soname.patch 453
@@ -22,48 +18,24 @@ AUX tk-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884
 MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/tk-configure-LANG.patch 1686
 RMD160 4ff8355af81705058fd411910dfae94887bcd884 files/tk-configure-LANG.patch 1686
 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea files/tk-configure-LANG.patch 1686
-DIST tk8.4.11-src.tar.gz 3236334 RMD160 71b42c0f0ae5067c23d61a2d852a53fb3c546e2f SHA1 c05dec9163e6f75787aa2825122d424fc1a1edb6 SHA256 8475bb2ff42f5f162de6825c8c700fd61bae7b629de3e0aaf95cb54a224220ba
-DIST tk8.4.12-src.tar.gz 3245547 RMD160 b50e4da0bc3914e6339fc537761d550ddcf22330 SHA1 05e8a82fc4ab9f825b8e7b8cbc917ea9ba31ed5d SHA256 b5a13231aa3c86636a62d75ae4509e53c960059017706bdc800ecaaeaf0422d6
-DIST tk8.4.13-src.tar.gz 3253070 RMD160 a64f3672dd64024df8eb4fc8d54de23a4a764199 SHA1 64d8b3e9e4a9d6408892cb5cb287b5502e56e381 SHA256 1beb64f178c644bae251c61639b461fe6c632717dc8bfb0339db68cc336f1b0f
 DIST tk8.4.14-src.tar.gz 3268223 RMD160 055ea75b91fe0e33ac9d96bd3b9099622008820e SHA1 d3a8d1240fe37408a3d39613cb1d845764b7a5b1 SHA256 01676aaff0c7d387adb3f549ea7b4222f7173c0395e773b23402637106be3b0d
 DIST tk8.4.9-src.tar.gz 3266500 RMD160 a9a2609d65094b2b6c5dabc702a6471f8d5eaa63 SHA1 3d677d4327f035ddd43992c134f47b6f927cb14a SHA256 ed6853d9ab3d1bd3246a6ae6cb79a669441be0c5131c4fc91073bdfe3f30cd15
-EBUILD tk-8.4.11-r1.ebuild 3152 RMD160 65f27d5709b4b2a903176c6e57330e48592175ba SHA1 2de06f43ef3f6751f70a2d09cf5eb0906446f552 SHA256 2b1eba3dfa11a5318d8d61f34fe8cf383e0e18baa754bc627aff4c72563cb6bb
-MD5 a4b6dcdd1aac1aacbbc3b4c7f52e7579 tk-8.4.11-r1.ebuild 3152
-RMD160 65f27d5709b4b2a903176c6e57330e48592175ba tk-8.4.11-r1.ebuild 3152
-SHA256 2b1eba3dfa11a5318d8d61f34fe8cf383e0e18baa754bc627aff4c72563cb6bb tk-8.4.11-r1.ebuild 3152
-EBUILD tk-8.4.12.ebuild 3167 RMD160 ad04c1287313b356814720f027245fce81f54533 SHA1 04e147d99b7e5ab45aae14fdddd4e44567183dd1 SHA256 690f3be892940d9821dd4ad05b15c2512bbd8df78c8750816b8643123b0ef180
-MD5 01a7cada1933c38b8b57db525e7dce43 tk-8.4.12.ebuild 3167
-RMD160 ad04c1287313b356814720f027245fce81f54533 tk-8.4.12.ebuild 3167
-SHA256 690f3be892940d9821dd4ad05b15c2512bbd8df78c8750816b8643123b0ef180 tk-8.4.12.ebuild 3167
-EBUILD tk-8.4.13.ebuild 2954 RMD160 a9e03297119de8b004bfe2cf57c9e905a605e707 SHA1 289cb3dc70b0c03636966938b4717cc20a7eb9a1 SHA256 ef02813f187d3e6c137b918a5c1cf5f7615c867adc32a125738a7673252a016a
-MD5 569043bb648376b750feb8ce769534a7 tk-8.4.13.ebuild 2954
-RMD160 a9e03297119de8b004bfe2cf57c9e905a605e707 tk-8.4.13.ebuild 2954
-SHA256 ef02813f187d3e6c137b918a5c1cf5f7615c867adc32a125738a7673252a016a tk-8.4.13.ebuild 2954
-EBUILD tk-8.4.14.ebuild 2954 RMD160 f9b8f7bdf738b1bec85c7f7b3a7a663c3ef51b6f SHA1 84613ab41ca4272e570b219e970d6c1e681bcd45 SHA256 35ca465ce8df6ea5444ddfffcc76cf28628637a8417da0cb3dd80b71d769253c
-MD5 f6f5729e2d7d6bdf073fedcb8efa9573 tk-8.4.14.ebuild 2954
-RMD160 f9b8f7bdf738b1bec85c7f7b3a7a663c3ef51b6f tk-8.4.14.ebuild 2954
-SHA256 35ca465ce8df6ea5444ddfffcc76cf28628637a8417da0cb3dd80b71d769253c tk-8.4.14.ebuild 2954
-EBUILD tk-8.4.9.ebuild 3148 RMD160 54bb446c61c542db247feff30fbe70c51b6b435a SHA1 d71ddde5bb3d5e11a1c94d6fe38c72b74ad5a650 SHA256 73ad5714c861ecc23bcf4deeb4b1f410dc0d0f21d70f96ae7afab50087fd231c
-MD5 35e832f57f58b84f299f3e7f549316b8 tk-8.4.9.ebuild 3148
-RMD160 54bb446c61c542db247feff30fbe70c51b6b435a tk-8.4.9.ebuild 3148
-SHA256 73ad5714c861ecc23bcf4deeb4b1f410dc0d0f21d70f96ae7afab50087fd231c tk-8.4.9.ebuild 3148
-MISC ChangeLog 9890 RMD160 1ea0e129b7d92a254d8a13f38f4de6e9fecd37d0 SHA1 8abb502e7e103340e7352c1bce4d99b1dfbc47bf SHA256 4705351c5f3856d006dfdb849b877ba493fbc53f51bb950cbc6999c7f9b8cc77
-MD5 c0d6245eaecd03097eab7d53d3dcab0a ChangeLog 9890
-RMD160 1ea0e129b7d92a254d8a13f38f4de6e9fecd37d0 ChangeLog 9890
-SHA256 4705351c5f3856d006dfdb849b877ba493fbc53f51bb950cbc6999c7f9b8cc77 ChangeLog 9890
+EBUILD tk-8.4.14.ebuild 3075 RMD160 774c11dd625204048691cf912ca1476f0aec8f1a SHA1 ac7145c63c14807258b82fb2ee8b26cb549373a1 SHA256 75326cff371e720277d2a87f174b239e7fc4fe2e027d84f8266a6ad84aa971fc
+MD5 50c16153ff8378895cd008f2185552ad tk-8.4.14.ebuild 3075
+RMD160 774c11dd625204048691cf912ca1476f0aec8f1a tk-8.4.14.ebuild 3075
+SHA256 75326cff371e720277d2a87f174b239e7fc4fe2e027d84f8266a6ad84aa971fc tk-8.4.14.ebuild 3075
+EBUILD tk-8.4.9.ebuild 3155 RMD160 65390ace6f5eaafcbfb2495eea3ea2b1d0637507 SHA1 8cd851791135acfda5a85f5522af04de77c5b1ac SHA256 697849a7d6c18cc8eae49eb8f37e7a652fd5a649efa568e6bfdf99aa3de293ef
+MD5 34b03e8357d2d004962bba2602f6e0de tk-8.4.9.ebuild 3155
+RMD160 65390ace6f5eaafcbfb2495eea3ea2b1d0637507 tk-8.4.9.ebuild 3155
+SHA256 697849a7d6c18cc8eae49eb8f37e7a652fd5a649efa568e6bfdf99aa3de293ef tk-8.4.9.ebuild 3155
+MISC ChangeLog 10202 RMD160 a8ec17e3b0f291a3567ac8528552b9964d7ac115 SHA1 7f38f347ffadbbf400072b8589cae77f10058798 SHA256 a61b264c0c167cc4b675733ac99d4e9616d8f1fb8ee7ea01503905af91ce591e
+MD5 a4b534cdeb05e563c91c840151efb891 ChangeLog 10202
+RMD160 a8ec17e3b0f291a3567ac8528552b9964d7ac115 ChangeLog 10202
+SHA256 a61b264c0c167cc4b675733ac99d4e9616d8f1fb8ee7ea01503905af91ce591e ChangeLog 10202
 MISC metadata.xml 159 RMD160 117cc289391c0477579de68e7347628756673eac SHA1 37f242cbf27c6e859fc63487487fdcae09d6931f SHA256 2cf13398186ae4abcd9f41c51ffb3bcdcc7da32df2c2af5c2de2e2cc8ad194ce
 MD5 37d9be6d753633a1cb6704052776ab1f metadata.xml 159
 RMD160 117cc289391c0477579de68e7347628756673eac metadata.xml 159
 SHA256 2cf13398186ae4abcd9f41c51ffb3bcdcc7da32df2c2af5c2de2e2cc8ad194ce metadata.xml 159
-MD5 e99e47094c91aa1f2bfaafc732f54526 files/digest-tk-8.4.11-r1 241
-RMD160 a8fdf7c0f58c2bd76912ffa6c67a3ae121a85468 files/digest-tk-8.4.11-r1 241
-SHA256 f64bf45c7dcefdf04265770f5433cd2186dc4d4fadc13343f9173d88308f2897 files/digest-tk-8.4.11-r1 241
-MD5 c16791229fddae7fce6128fbf50b504b files/digest-tk-8.4.12 241
-RMD160 88055f4159874fda4f2db48d046ce4f6653701f7 files/digest-tk-8.4.12 241
-SHA256 94bbd0c7075d816b9546044ef69a1f376f7199d9e95b3a5c4c30d09853bcbace files/digest-tk-8.4.12 241
-MD5 525b1ff64cdf7ead3f727e0b41964749 files/digest-tk-8.4.13 241
-RMD160 c189c6cb7074a78203e67eb27f418e87556055bc files/digest-tk-8.4.13 241
-SHA256 d95dc481e48452244403d1b8c9c031595774ea35b74b8173d6b23b222cde2d74 files/digest-tk-8.4.13 241
 MD5 6463c0f38f6fbd9705da646e3a2abf9b files/digest-tk-8.4.14 241
 RMD160 6d8cf5ab4fc61ca5280109cc8068713bacca9a51 files/digest-tk-8.4.14 241
 SHA256 ef2ded6de30832881d291216a0b146dcc2404900449823c492c9b7d49347ce34 files/digest-tk-8.4.14 241

diff --git a/dev-lang/tk/files/digest-tk-8.4.11-r1 b/dev-lang/tk/files/digest-tk-8.4.11-r1
deleted file mode 100644 (file)
index 19cbe20..0000000
--- a/dev-lang/tk/files/digest-tk-8.4.11-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 408e34fe8a1cec497f98f05bbe89b348 tk8.4.11-src.tar.gz 3236334
-RMD160 71b42c0f0ae5067c23d61a2d852a53fb3c546e2f tk8.4.11-src.tar.gz 3236334
-SHA256 8475bb2ff42f5f162de6825c8c700fd61bae7b629de3e0aaf95cb54a224220ba tk8.4.11-src.tar.gz 3236334

diff --git a/dev-lang/tk/files/digest-tk-8.4.12 b/dev-lang/tk/files/digest-tk-8.4.12
deleted file mode 100644 (file)
index da635a8..0000000
--- a/dev-lang/tk/files/digest-tk-8.4.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 316491cb82d898b434842353aed1f0d6 tk8.4.12-src.tar.gz 3245547
-RMD160 b50e4da0bc3914e6339fc537761d550ddcf22330 tk8.4.12-src.tar.gz 3245547
-SHA256 b5a13231aa3c86636a62d75ae4509e53c960059017706bdc800ecaaeaf0422d6 tk8.4.12-src.tar.gz 3245547

diff --git a/dev-lang/tk/files/digest-tk-8.4.13 b/dev-lang/tk/files/digest-tk-8.4.13
deleted file mode 100644 (file)
index 73125ed..0000000
--- a/dev-lang/tk/files/digest-tk-8.4.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0a16d4d9398e43cbb85784c85fb807a4 tk8.4.13-src.tar.gz 3253070
-RMD160 a64f3672dd64024df8eb4fc8d54de23a4a764199 tk8.4.13-src.tar.gz 3253070
-SHA256 1beb64f178c644bae251c61639b461fe6c632717dc8bfb0339db68cc336f1b0f tk8.4.13-src.tar.gz 3253070

diff --git a/dev-lang/tk/files/remove-control-v.diff b/dev-lang/tk/files/remove-control-v.diff
deleted file mode 100644 (file)
index a60fb30..0000000
--- a/dev-lang/tk/files/remove-control-v.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- library/text.tcl   Mon Nov 11 17:39:09 2002
-+++ library/text.tcl   Mon Nov 11 17:39:28 2002
-@@ -338,14 +338,6 @@
-     }
- }
- 
--if {[string compare $tcl_platform(platform) "windows"]} {
--bind Text <Control-v> {
--    if {!$tk_strictMotif} {
--      tkTextScrollPages %W 1
--    }
--}
--}
--
- bind Text <Meta-b> {
-     if {!$tk_strictMotif} {
-       tkTextSetCursor %W [tkTextPrevPos %W insert tcl_startOfPreviousWord]

diff --git a/dev-lang/tk/tk-8.4.11-r1.ebuild b/dev-lang/tk/tk-8.4.11-r1.ebuild
deleted file mode 100644 (file)
index 7338d26..0000000
--- a/dev-lang/tk/tk-8.4.11-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.11-r1.ebuild,v 1.3 2007/03/26 07:57:18 antarus Exp $
-
-inherit eutils
-
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="threads"
-
-RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
-       =dev-lang/tcl-${PV}*"
-DEPEND="${RDEPEND}
-       || (
-               ( x11-libs/libXt x11-proto/xproto )
-               virtual/x11
-       )"
-
-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}"/remove-control-v-8.4.9.diff
-       epatch "${FILESDIR}"/${PN}-8.4.9-man.patch
-       epatch "${FILESDIR}"/${P}-multilib.patch
-
-       # Bug 117982
-       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}"/tk-configure-LANG.patch
-       done
-}
-
-src_compile() {
-       cd "${S}"/unix
-
-       local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-       local local_config_use=""
-
-       if use threads ; then
-               local_config_use="--enable-threads"
-       fi
-
-       econf \
-               --with-tcl=/usr/${mylibdir} \
-               ${local_config_use} || die
-
-       emake CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-       #short version number
-       local v1
-       v1=${PV%.*}
-
-       cd "${S}"/unix
-       make DESTDIR=${D} install || die
-
-       # fix the tkConfig.sh to eliminate refs to the build directory
-       local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-       sed -i \
-               -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
-               -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
-               -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
-               -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
-               -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-               -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-               ${D}/usr/${mylibdir}/tkConfig.sh || die
-
-       # install private headers
-       dodir /usr/${mylibdir}/tk${v1}/include/unix
-       install -c -m0644 ${S}/unix/*.h ${D}/usr/${mylibdir}/tk${v1}/include/unix
-       dodir /usr/${mylibdir}/tk${v1}/include/generic
-       install -c -m0644 ${S}/generic/*.h ${D}/usr/${mylibdir}/tk${v1}/include/generic
-       rm -f ${D}/usr/${mylibdir}/tk${v1}/include/generic/tk.h
-       rm -f ${D}/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
-       rm -f ${D}/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
-
-       # install symlink for libraries
-       #dosym /usr/${mylibdir}/libtk${v1}.a /usr/${mylibdir}/libtk.a
-       dosym /usr/${mylibdir}/libtk${v1}.so /usr/${mylibdir}/libtk.so
-       dosym /usr/${mylibdir}/libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-       ln -sf wish${v1} ${D}/usr/bin/wish
-
-       cd ${S}
-       dodoc ChangeLog README changes license.terms
-}

diff --git a/dev-lang/tk/tk-8.4.12.ebuild b/dev-lang/tk/tk-8.4.12.ebuild
deleted file mode 100644 (file)
index efd821e..0000000
--- a/dev-lang/tk/tk-8.4.12.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.12.ebuild,v 1.3 2007/03/26 07:57:18 antarus Exp $
-
-inherit eutils
-
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="threads"
-
-RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
-       =dev-lang/tcl-${PV}*"
-DEPEND="${RDEPEND}
-       || (
-               ( x11-libs/libXt x11-proto/xproto )
-               virtual/x11
-       )"
-
-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}"/remove-control-v-8.4.9.diff
-       epatch "${FILESDIR}"/${PN}-8.4.9-man.patch
-       epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
-
-       # Bug 117982
-       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}"/tk-configure-LANG.patch
-       done
-}
-
-src_compile() {
-       cd "${S}"/unix
-
-       local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-       local local_config_use=""
-
-       if use threads ; then
-               local_config_use="--enable-threads"
-       fi
-
-       econf \
-               --with-tcl=/usr/${mylibdir} \
-               ${local_config_use} || die
-
-       emake CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-       #short version number
-       local v1
-       v1=${PV%.*}
-
-       cd "${S}"/unix
-       make DESTDIR=${D} install || die
-
-       # fix the tkConfig.sh to eliminate refs to the build directory
-       local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-       sed -i \
-               -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
-               -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
-               -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
-               -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
-               -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-               -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-               ${D}/usr/${mylibdir}/tkConfig.sh || die
-
-       # install private headers
-       dodir /usr/${mylibdir}/tk${v1}/include/unix
-       install -c -m0644 ${S}/unix/*.h ${D}/usr/${mylibdir}/tk${v1}/include/unix
-       dodir /usr/${mylibdir}/tk${v1}/include/generic
-       install -c -m0644 ${S}/generic/*.h ${D}/usr/${mylibdir}/tk${v1}/include/generic
-       rm -f ${D}/usr/${mylibdir}/tk${v1}/include/generic/tk.h
-       rm -f ${D}/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
-       rm -f ${D}/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
-
-       # install symlink for libraries
-       #dosym /usr/${mylibdir}/libtk${v1}.a /usr/${mylibdir}/libtk.a
-       dosym /usr/${mylibdir}/libtk${v1}.so /usr/${mylibdir}/libtk.so
-       dosym /usr/${mylibdir}/libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-       ln -sf wish${v1} ${D}/usr/bin/wish
-
-       cd ${S}
-       dodoc ChangeLog README changes license.terms
-}

diff --git a/dev-lang/tk/tk-8.4.13.ebuild b/dev-lang/tk/tk-8.4.13.ebuild
deleted file mode 100644 (file)
index 0daf4ce..0000000
--- a/dev-lang/tk/tk-8.4.13.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.13.ebuild,v 1.3 2007/03/26 07:57:18 antarus Exp $
-
-inherit eutils
-
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug threads"
-
-RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
-       ~dev-lang/tcl-${PV}"
-DEPEND="${RDEPEND}
-       || (
-               ( x11-libs/libXt x11-proto/xproto )
-               virtual/x11
-       )"
-
-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}"/remove-control-v-8.4.9.diff
-       epatch "${FILESDIR}"/${PN}-8.4.9-man.patch
-       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}"/tk-configure-LANG.patch
-       done
-}
-
-src_compile() {
-       cd "${S}"/unix
-
-       local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-
-       econf \
-               --with-tcl=/usr/${mylibdir} \
-               $(use_enable threads) \
-               $(use_enable debug symbols) || die
-
-       emake || die
-}
-
-src_install() {
-       #short version number
-       local v1
-       v1=${PV%.*}
-
-       cd "${S}"/unix
-       make DESTDIR="${D}" install || die
-
-       # fix the tkConfig.sh to eliminate refs to the build directory
-       local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-       sed -i \
-               -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
-               -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
-               -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
-               -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
-               -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-               -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-               "${D}"/usr/${mylibdir}/tkConfig.sh || die
-
-       # install private headers
-       insinto /usr/${mylibdir}/tk${v1}/include/unix
-       doins "${S}"/unix/*.h || die
-       insinto /usr/${mylibdir}/tk${v1}/include/generic
-       doins "${S}"/generic/*.h || die
-       rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
-       rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
-       rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
-
-       # install symlink for libraries
-       #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
-       dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
-       dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-       ln -sf wish${v1} "${D}"/usr/bin/wish
-
-       cd "${S}"
-       dodoc ChangeLog README changes license.terms
-}

diff --git a/dev-lang/tk/tk-8.4.14.ebuild b/dev-lang/tk/tk-8.4.14.ebuild
index 2b7fe0c6e5ca8912cad2c513102324c0899d45dd..f31b5470cf19aecc4fd548bb2641a706ccee6096 100644 (file)
--- a/dev-lang/tk/tk-8.4.14.ebuild
+++ b/dev-lang/tk/tk-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/tk/tk-8.4.14.ebuild,v 1.2 2007/03/26 07:57:18 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.14.ebuild,v 1.3 2007/04/27 17:54:42 matsuu Exp $
 
-inherit eutils
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+
+inherit autotools eutils multilib toolchain-funcs
 
 DESCRIPTION="Tk Widget Set"
 HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
@@ -52,9 +55,13 @@ src_unpack() {
                EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \
                epatch "${FILESDIR}"/tk-configure-LANG.patch
        done
+
+       cd "${S}"/unix
+       eautoreconf
 }
 
 src_compile() {
+       tc-export CC
        cd "${S}"/unix
 
        local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}

diff --git a/dev-lang/tk/tk-8.4.9.ebuild b/dev-lang/tk/tk-8.4.9.ebuild
index 843ef563675cc0c072aab81eb3fc81495e44ad8c..002a79c723ab125ec2fdfae60ef9d450e7ae0730 100644 (file)
--- a/dev-lang/tk/tk-8.4.9.ebuild
+++ b/dev-lang/tk/tk-8.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.9.ebuild,v 1.16 2007/03/26 07:57:18 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.9.ebuild,v 1.17 2007/04/27 17:54:42 matsuu Exp $
 
 inherit eutils
 
@@ -88,7 +88,7 @@ src_install() {
                -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
                -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
                -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-               ${D}/usr/lib/tkConfig.sh
+               ${D}/usr/${mylibdir}/tkConfig.sh
 
        # install private headers
        dodir /usr/${mylibdir}/tk${v1}/include/unix