Fixed #125971, #164649 and #154328.

(Portage version: 2.1.2.4)

10 files changed, 20 insertions, 360 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index bcb56f6d12c6..b7096d2ecf3e 100644
--- 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/files/digest-tk-8.4.11-r1 b/dev-lang/tk/files/digest-tk-8.4.11-r1
deleted file mode 100644
index 19cbe20516d8..000000000000
--- 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
index da635a8313f1..000000000000
--- 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
index 73125ed20ab6..000000000000
--- 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
index a60fb302c51e..000000000000
--- 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
index 7338d262c6d0..000000000000
--- 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
index efd821ed7a4a..000000000000
--- 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
index 0daf4ce240ea..000000000000
--- 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 2b7fe0c6e5ca..f31b5470cf19 100644
--- 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 843ef563675c..002a79c723ab 100644
--- 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