Version bumped. Added multilib patch.

Package-Manager: portage-2.0.51.19

5 files changed, 142 insertions, 9 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 1c7ee273c2cc..6fc3f87b4735 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,13 @@
 # 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.58 2005/06/06 08:31:55 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.59 2005/07/02 14:41:39 matsuu Exp $
+
+*tk-8.4.11 (02 Jul 2005)
+
+  02 Jul 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +files/tk-8.4.11-multilib.patch, +tk-8.4.11.ebuild:
+  Version bumped.
+  Added multilib patch.
 
   06 Jun 2005; Markus Rothe <corsair@gentoo.org> tk-8.4.9.ebuild:
   Stable on ppc64
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 01f196a2f6df..6baaa45a8c28 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -1,15 +1,18 @@
-MD5 eccd0342b9da9cf5a3ef47bfb6ddc81a ChangeLog 7568
-MD5 37d9be6d753633a1cb6704052776ab1f metadata.xml 159
 MD5 670ac1b343b68583bd99f4adc39765eb tk-8.3.4-r1.ebuild 2413
-MD5 ecb6bd0ebe1e4441cccf70144b2e6104 tk-8.4.6-r1.ebuild 2762
-MD5 bccf47b736485ce7e8a457e6ce9a1a81 tk-8.4.6.ebuild 2385
 MD5 15fb44d271792ba295499f34eecb8ff1 tk-8.4.9.ebuild 2849
+MD5 bccf47b736485ce7e8a457e6ce9a1a81 tk-8.4.6.ebuild 2385
+MD5 92fb7eb2ff4adc0bd9411ec349bd2a28 ChangeLog 7739
+MD5 db71c8f05e16f05d110bca08388e542a tk-8.4.11.ebuild 2835
+MD5 37d9be6d753633a1cb6704052776ab1f metadata.xml 159
+MD5 ecb6bd0ebe1e4441cccf70144b2e6104 tk-8.4.6-r1.ebuild 2762
+MD5 7442ab63dabe7e4d5bdde18a28c118e2 files/tk-8.4.11-multilib.patch 896
+MD5 f340f38756a0efb0539b53d64511f6a9 files/digest-tk-8.4.11 65
 MD5 60b4e7758ce769df141b81b19c338f34 files/digest-tk-8.3.4-r1 60
-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
 MD5 3003fb2cb4a185ec54b8c94ec0606313 files/remove-control-v-8.4.9.diff 522
-MD5 e662e61449ea86b439ceb41463762cdc files/remove-control-v-8.4.diff 449
+MD5 c1c1e9dfac0e70f21ef1a73e6dc76b8f files/tk-wm-maxsize.patch 896
+MD5 f64532dbe89c04cefe0e16a9743f5f57 files/digest-tk-8.4.6 64
+MD5 76d0b4599f29136b31e902d15566e8c8 files/digest-tk-8.4.9 64
 MD5 3e8db8239fe4e68f5107a7a1d4f2f85b files/remove-control-v.diff 400
 MD5 f4d1359d10fdb4a572e9da8f9896c603 files/tk-8.4.9-man.patch 800
-MD5 c1c1e9dfac0e70f21ef1a73e6dc76b8f files/tk-wm-maxsize.patch 896
+MD5 e662e61449ea86b439ceb41463762cdc files/remove-control-v-8.4.diff 449
diff --git a/dev-lang/tk/files/digest-tk-8.4.11 b/dev-lang/tk/files/digest-tk-8.4.11
new file mode 100644
index 000000000000..c2846809ca39
--- /dev/null
+++ b/dev-lang/tk/files/digest-tk-8.4.11
@@ -0,0 +1 @@
+MD5 408e34fe8a1cec497f98f05bbe89b348 tk8.4.11-src.tar.gz 3236334
diff --git a/dev-lang/tk/files/tk-8.4.11-multilib.patch b/dev-lang/tk/files/tk-8.4.11-multilib.patch
new file mode 100644
index 000000000000..092b806259f2
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.4.11-multilib.patch
@@ -0,0 +1,24 @@
+diff -Naur tk8.4.11.orig/unix/configure tk8.4.11/unix/configure
+--- tk8.4.11.orig/unix/configure	2005-06-30 01:43:10.000000000 +0900
++++ tk8.4.11/unix/configure	2005-07-02 23:22:35.000000000 +0900
+@@ -5721,7 +5721,7 @@
+     TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
+ fi
+ 
+-TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
++TK_LIBRARY='$(libdir)/tk$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ TK_PKG_DIR='tk$(VERSION)$(TK_DBGX)'
+diff -Naur tk8.4.11.orig/unix/configure.in tk8.4.11/unix/configure.in
+--- tk8.4.11.orig/unix/configure.in	2005-06-30 01:43:10.000000000 +0900
++++ tk8.4.11/unix/configure.in	2005-07-02 23:22:16.000000000 +0900
+@@ -393,7 +393,7 @@
+     TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
+ fi
+ 
+-TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
++TK_LIBRARY='$(libdir)/tk$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ TK_PKG_DIR='tk$(VERSION)$(TK_DBGX)'
diff --git a/dev-lang/tk/tk-8.4.11.ebuild b/dev-lang/tk/tk-8.4.11.ebuild
new file mode 100644
index 000000000000..ee021ee9dd78
--- /dev/null
+++ b/dev-lang/tk/tk-8.4.11.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2005 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.ebuild,v 1.1 2005/07/02 14:41:39 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 ~sparc ~x86"
+IUSE="threads"
+
+RDEPEND="virtual/x11
+	=dev-lang/tcl-${PV}*"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.47-r10"
+
+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
+}
+
+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
+}