Fixed bug 128681, 123444, 125971.

Package-Manager: portage-2.1_rc4

6 files changed, 136 insertions, 1 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 5178cfdb6831..a7a6fd6e9b9a 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.69 2006/05/30 09:24:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.70 2006/06/03 19:37:48 matsuu Exp $
+
+*tk-8.4.13 (03 Jun 2006)
+
+  03 Jun 2006; MATSUU Takuto <matsuu@gentoo.org>
+  +files/tk-8.3.5-tclm4-soname.patch, +tk-8.4.13.ebuild:
+  Version bumped, Bug 128681.
+  Added debug USE flag, Bug 123444.
+  Added soname patch, Bug 125971.
 
   30 May 2006; Diego Pettenò <flameeyes@gentoo.org> tk-8.4.12.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/dev-lang/tk/files/digest-tk-8.4.11-r1 b/dev-lang/tk/files/digest-tk-8.4.11-r1
index c2846809ca39..19cbe20516d8 100644
--- a/dev-lang/tk/files/digest-tk-8.4.11-r1
+++ b/dev-lang/tk/files/digest-tk-8.4.11-r1
@@ -1 +1,3 @@
 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.13 b/dev-lang/tk/files/digest-tk-8.4.13
new file mode 100644
index 000000000000..73125ed20ab6
--- /dev/null
+++ b/dev-lang/tk/files/digest-tk-8.4.13
@@ -0,0 +1,3 @@
+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/digest-tk-8.4.9 b/dev-lang/tk/files/digest-tk-8.4.9
index 257b232ef472..efa00f9bec4f 100644
--- a/dev-lang/tk/files/digest-tk-8.4.9
+++ b/dev-lang/tk/files/digest-tk-8.4.9
@@ -1 +1,3 @@
 MD5 1b64258abaf258e9a86f331d8de17a71 tk8.4.9-src.tar.gz 3266500
+RMD160 a9a2609d65094b2b6c5dabc702a6471f8d5eaa63 tk8.4.9-src.tar.gz 3266500
+SHA256 ed6853d9ab3d1bd3246a6ae6cb79a669441be0c5131c4fc91073bdfe3f30cd15 tk8.4.9-src.tar.gz 3266500
diff --git a/dev-lang/tk/files/tk-8.3.5-tclm4-soname.patch b/dev-lang/tk/files/tk-8.3.5-tclm4-soname.patch
new file mode 100644
index 000000000000..9cf21b89cae6
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.3.5-tclm4-soname.patch
@@ -0,0 +1,12 @@
+diff -u tk8.3.5/unix/tcl.m4~ tk8.3.5/unix/tcl.m4
+--- tk8.3.5/unix/tcl.m4~	2003-01-14 21:22:12.000000000 +0900
++++ tk8.3.5/unix/tcl.m4	2003-01-14 21:22:12.000000000 +0900
+@@ -949,7 +949,7 @@
+ 	    CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
+ 	    if test "$have_dl" = yes; then
+-		SHLIB_LD="${CC} -shared"
++		SHLIB_LD='${CC} -shared -Wl,-soname,${@}'
+ 		DL_OBJS="tclLoadDl.o"
+ 		DL_LIBS="-ldl"
+ 		LDFLAGS="-rdynamic"
diff --git a/dev-lang/tk/tk-8.4.13.ebuild b/dev-lang/tk/tk-8.4.13.ebuild
new file mode 100644
index 000000000000..a21cbcbb9274
--- /dev/null
+++ b/dev-lang/tk/tk-8.4.13.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2006 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.1 2006/06/03 19:37:48 matsuu 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}
+	>=sys-apps/portage-2.0.47-r10
+	|| (
+		( 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
+	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
+}