Fixed fails with bash3.1, Bug 117982.

(Portage version: 2.0.53)

4 files changed, 115 insertions, 12 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 4e5c86bb8186..8044c616a06c 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/tk
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.62 2005/12/11 07:44:04 spyderous Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.63 2006/01/08 14:13:22 matsuu Exp $
+
+*tk-8.4.11-r1 (08 Jan 2006)
+
+  08 Jan 2006; MATSUU Takuto <matsuu@gentoo.org> +tk-8.4.11-r1.ebuild:
+  Fixed fails with bash3.1, Bug 117982
 
   11 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; tk-8.4.11.ebuild:
   Fix them.
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 4460e1e3bb7f..821b02002f52 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0c63e8aa28596ad261f710894e1e1539 ChangeLog 8022
 MD5 60b4e7758ce769df141b81b19c338f34 files/digest-tk-8.3.4-r1 60
 MD5 f340f38756a0efb0539b53d64511f6a9 files/digest-tk-8.4.11 65
+MD5 f340f38756a0efb0539b53d64511f6a9 files/digest-tk-8.4.11-r1 65
 MD5 f64532dbe89c04cefe0e16a9743f5f57 files/digest-tk-8.4.6 64
 MD5 f64532dbe89c04cefe0e16a9743f5f57 files/digest-tk-8.4.6-r1 64
 MD5 76d0b4599f29136b31e902d15566e8c8 files/digest-tk-8.4.9 64
@@ -15,14 +13,8 @@ MD5 f4d1359d10fdb4a572e9da8f9896c603 files/tk-8.4.9-man.patch 800
 MD5 c1c1e9dfac0e70f21ef1a73e6dc76b8f files/tk-wm-maxsize.patch 896
 MD5 37d9be6d753633a1cb6704052776ab1f metadata.xml 159
 MD5 670ac1b343b68583bd99f4adc39765eb tk-8.3.4-r1.ebuild 2413
+MD5 1db74bf92475336ef35e2f0bae80c066 tk-8.4.11-r1.ebuild 3005
 MD5 1a62fd1c184b67dc38bc87398d5c962d tk-8.4.11.ebuild 2923
 MD5 ecb6bd0ebe1e4441cccf70144b2e6104 tk-8.4.6-r1.ebuild 2762
 MD5 bccf47b736485ce7e8a457e6ce9a1a81 tk-8.4.6.ebuild 2385
 MD5 adeea912923cfc4dee0d578fb4002720 tk-8.4.9.ebuild 2851
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDuZsJ2+ySkm8kpY0RAjyEAKCq2jS0TiiyE88+UTFQSQoC+y3sfwCgvrik
-3pGH2he+B8bzFLk3P/FwPTw=
-=HKBM
------END PGP SIGNATURE-----
diff --git a/dev-lang/tk/files/digest-tk-8.4.11-r1 b/dev-lang/tk/files/digest-tk-8.4.11-r1
new file mode 100644
index 000000000000..c2846809ca39
--- /dev/null
+++ b/dev-lang/tk/files/digest-tk-8.4.11-r1
@@ -0,0 +1 @@
+MD5 408e34fe8a1cec497f98f05bbe89b348 tk8.4.11-src.tar.gz 3236334
diff --git a/dev-lang/tk/tk-8.4.11-r1.ebuild b/dev-lang/tk/tk-8.4.11-r1.ebuild
new file mode 100644
index 000000000000..671bb2537cb2
--- /dev/null
+++ b/dev-lang/tk/tk-8.4.11-r1.ebuild
@@ -0,0 +1,105 @@
+# 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.11-r1.ebuild,v 1.1 2006/01/08 14:13:22 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"
+IUSE="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}/${P}-multilib.patch
+
+	# Bug 117982
+	sed -i -e "s/relid'/relid/" "${S}"/unix/{configure,tcl.m4} || die
+}
+
+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
+}