Version bumped, Bug 117122.

(Portage version: 2.0.54)

11 files changed, 23 insertions, 258 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index af69d3da6633..3b5683285b38 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,15 @@
 # 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.66 2006/02/26 19:30:21 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.67 2006/03/03 16:15:17 matsuu Exp $
+
+*tk-8.4.12 (03 Mar 2006)
+
+  03 Mar 2006; MATSUU Takuto <matsuu@gentoo.org>
+  -files/remove-control-v-8.4.diff, -files/tk-wm-maxsize.patch,
+  -tk-8.4.6.ebuild, -tk-8.4.6-r1.ebuild, -tk-8.4.11.ebuild,
+  +tk-8.4.12.ebuild:
+  Version bumped, Bug 117122.
+  Removed old versions.
 
   26 Feb 2006; Joshua Kinard <kumba@gentoo.org> tk-8.4.9.ebuild:
   Marked stable on mips.
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 7e59d1fb8ae1..6964480227cf 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -2,6 +2,7 @@ MD5 e96ccf9df0638ed64d5ede856b3e7586 ChangeLog 8567
 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 2c7f40cd2d3510fd3243146e4499cd54 files/digest-tk-8.4.12 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
@@ -16,6 +17,7 @@ MD5 37d9be6d753633a1cb6704052776ab1f metadata.xml 159
 MD5 670ac1b343b68583bd99f4adc39765eb tk-8.3.4-r1.ebuild 2413
 MD5 a29dfc6044a952b0d976bdcd546fca8f tk-8.4.11-r1.ebuild 3182
 MD5 3a38b175fbbcd3a4325d66b5d8aeaf87 tk-8.4.11.ebuild 3085
+MD5 39b70cc8a580b8ad573277fe7678d93a tk-8.4.12.ebuild 3190
 MD5 ba9899b0ace4194528167ac97b9e818d tk-8.4.6-r1.ebuild 2848
 MD5 988041e4ca6e6ecfb534d8745cab9f0b tk-8.4.6.ebuild 2471
 MD5 fb0cef9b14192ab396f10bc2825d06e0 tk-8.4.9.ebuild 3094
diff --git a/dev-lang/tk/files/digest-tk-8.4.11 b/dev-lang/tk/files/digest-tk-8.4.11
deleted file mode 100644
index c2846809ca39..000000000000
--- a/dev-lang/tk/files/digest-tk-8.4.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 408e34fe8a1cec497f98f05bbe89b348 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
new file mode 100644
index 000000000000..438a5203316c
--- /dev/null
+++ b/dev-lang/tk/files/digest-tk-8.4.12
@@ -0,0 +1 @@
+MD5 316491cb82d898b434842353aed1f0d6 tk8.4.12-src.tar.gz 3245547
diff --git a/dev-lang/tk/files/digest-tk-8.4.6 b/dev-lang/tk/files/digest-tk-8.4.6
deleted file mode 100644
index e34b77208af1..000000000000
--- a/dev-lang/tk/files/digest-tk-8.4.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 24b7774d54c1c568cabe16f3498ddccd tk8.4.6-src.tar.gz 3230760
diff --git a/dev-lang/tk/files/digest-tk-8.4.6-r1 b/dev-lang/tk/files/digest-tk-8.4.6-r1
deleted file mode 100644
index e34b77208af1..000000000000
--- a/dev-lang/tk/files/digest-tk-8.4.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 24b7774d54c1c568cabe16f3498ddccd tk8.4.6-src.tar.gz 3230760
diff --git a/dev-lang/tk/files/remove-control-v-8.4.diff b/dev-lang/tk/files/remove-control-v-8.4.diff
deleted file mode 100644
index 6aa7e2f9f9ea..000000000000
--- a/dev-lang/tk/files/remove-control-v-8.4.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- library/text.tcl	2002-09-02 19:39:20.000000000 +0200
-+++ library/text.tcl	2003-02-26 15:08:02.000000000 +0100
-@@ -347,14 +347,6 @@
-     catch { %W edit redo }
- }
- 
--if {[string compare $tcl_platform(platform) "windows"]} {
--bind Text <Control-v> {
--    if {!$tk_strictMotif} {
--	tk::TextScrollPages %W 1
--    }
--}
--}
--
- bind Text <Meta-b> {
-     if {!$tk_strictMotif} {
- 	tk::TextSetCursor %W [tk::TextPrevPos %W insert tcl_startOfPreviousWord]
diff --git a/dev-lang/tk/files/tk-wm-maxsize.patch b/dev-lang/tk/files/tk-wm-maxsize.patch
deleted file mode 100644
index 019f7b5a3136..000000000000
--- a/dev-lang/tk/files/tk-wm-maxsize.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Date: Wed Mar 24 02:43:08 PM PST 2004
-Files: unix/tkUnixWm.c
-Bug-id: 915350
-
---- unix/tkUnixWm.c.wm-maxsize.old	2004-01-31 12:27:52.000000000 -0800
-+++ unix/tkUnixWm.c	2004-03-24 14:42:00.000000000 -0800
-@@ -2279,6 +2279,13 @@
-     wmPtr->maxWidth = width;
-     wmPtr->maxHeight = height;
-     wmPtr->flags |= WM_UPDATE_SIZE_HINTS;
-+
-+    if (width <= 0 && height <= 0) {
-+	wmPtr->sizeHintsFlags &= ~PMaxSize;
-+    } else {
-+	wmPtr->sizeHintsFlags |= PMaxSize;
-+    }
-+
-     WmUpdateGeom(wmPtr, winPtr);
-     return TCL_OK;
- }
-@@ -4269,7 +4276,7 @@
-     hintsPtr->max_aspect.x = wmPtr->maxAspect.x;
-     hintsPtr->max_aspect.y = wmPtr->maxAspect.y;
-     hintsPtr->win_gravity = wmPtr->gravity;
--    hintsPtr->flags = wmPtr->sizeHintsFlags | PMinSize | PMaxSize;
-+    hintsPtr->flags = wmPtr->sizeHintsFlags | PMinSize;
- 
-     /*
-      * If the window isn't supposed to be resizable, then set the
diff --git a/dev-lang/tk/tk-8.4.11.ebuild b/dev-lang/tk/tk-8.4.12.ebuild
index 06fabaaed31e..22c994741d78 100644
--- a/dev-lang/tk/tk-8.4.11.ebuild
+++ b/dev-lang/tk/tk-8.4.12.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.5 2006/02/08 04:07:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.12.ebuild,v 1.1 2006/03/03 16:15:17 matsuu Exp $
 
 inherit eutils
 
@@ -39,10 +39,13 @@ pkg_setup() {
 
 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
+	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
@@ -53,7 +56,7 @@ src_unpack() {
 }
 
 src_compile() {
-	cd ${S}/unix
+	cd "${S}"/unix
 
 	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
 	local local_config_use=""
@@ -74,7 +77,7 @@ src_install() {
 	local v1
 	v1=${PV%.*}
 
-	cd ${S}/unix
+	cd "${S}"/unix
 	make DESTDIR=${D} install || die
 
 	# fix the tkConfig.sh to eliminate refs to the build directory
diff --git a/dev-lang/tk/tk-8.4.6-r1.ebuild b/dev-lang/tk/tk-8.4.6-r1.ebuild
deleted file mode 100644
index c30e39befee7..000000000000
--- a/dev-lang/tk/tk-8.4.6-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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.6-r1.ebuild,v 1.14 2006/01/30 07:15:01 mr_bones_ 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="|| ( 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}/library
-	epatch ${FILESDIR}/remove-control-v-8.4.diff || die
-
-	cd ${S}/unix
-	epatch ${FILESDIR}/tk-wm-maxsize.patch || die
-}
-
-src_compile() {
-	cd ${S}/unix
-
-	local local_config_use=""
-
-	if use threads
-	then
-		local_config_use="--enable-threads"
-	fi
-
-	econf \
-		--with-tcl=/usr/$(get_libdir) \
-		${local_config_use} || die
-
-	emake CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd ${S}/unix
-	make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install || die
-
-	# fix the tkConfig.sh to eliminate refs to the build directory
-	sed -i \
-		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/$(get_libdir)," \
-		-e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/$(get_libdir)/tk${v1}/include'," \
-		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/$(get_libdir)," \
-		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/$(get_libdir)," \
-		-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/$(get_libdir)'," \
-		-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/$(get_libdir)'," \
-		${D}/usr/lib/tkConfig.sh
-
-	# install private headers
-	dodir /usr/$(get_libdir)/tk${v1}/include/unix
-	install -c -m0644 ${S}/unix/*.h ${D}/usr/$(get_libdir)/tk${v1}/include/unix
-	dodir /usr/$(get_libdir)/tk${v1}/include/generic
-	install -c -m0644 ${S}/generic/*.h ${D}/usr/$(get_libdir)/tk${v1}/include/generic
-	rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tk.h
-	rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tkDecls.h
-	rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tkPlatDecls.h
-
-	# install symlink for libraries
-	#dosym /usr/$(get_libdir)/libtk${v1}.a /usr/$(get_libdir)/libtk.a
-	dosym /usr/$(get_libdir)/libtk${v1}.so /usr/$(get_libdir)/libtk.so
-	dosym /usr/$(get_libdir)/libtkstub${v1}.a /usr/$(get_libdir)/libtkstub.a
-
-	ln -sf wish${v1} ${D}/usr/bin/wish
-
-	cd ${S}
-	dodoc README changes license.terms
-}
diff --git a/dev-lang/tk/tk-8.4.6.ebuild b/dev-lang/tk/tk-8.4.6.ebuild
deleted file mode 100644
index 62ed3b0fc692..000000000000
--- a/dev-lang/tk/tk-8.4.6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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.6.ebuild,v 1.15 2006/01/30 07:15:02 mr_bones_ 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="~x86 ~ppc sparc mips alpha arm ~hppa amd64 ia64"
-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}/library
-	epatch ${FILESDIR}/remove-control-v-8.4.diff || die
-}
-
-src_compile() {
-	cd ${S}/unix
-
-	local local_config_use=""
-
-	if use threads
-	then
-		local_config_use="--enable-threads"
-	fi
-
-	econf \
-		--with-tcl=/usr/lib \
-		${local_config_use} || die
-
-	emake CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd ${S}/unix
-	make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install || die
-
-	# fix the tkConfig.sh to eliminate refs to the build directory
-	sed -i \
-		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/lib," \
-		-e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/lib/tk${v1}/include'," \
-		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/lib," \
-		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/lib," \
-		${D}/usr/lib/tkConfig.sh
-
-	# install private headers
-	dodir /usr/lib/tk${v1}/include/unix
-	install -c -m0644 ${S}/unix/*.h ${D}/usr/lib/tk${v1}/include/unix
-	dodir /usr/lib/tk${v1}/include/generic
-	install -c -m0644 ${S}/generic/*.h ${D}/usr/lib/tk${v1}/include/generic
-	rm -f ${D}/usr/lib/tk${v1}/include/generic/tk.h
-	rm -f ${D}/usr/lib/tk${v1}/include/generic/tkDecls.h
-	rm -f ${D}/usr/lib/tk${v1}/include/generic/tkPlatDecls.h
-
-	# install symlink for libraries
-	#dosym /usr/lib/libtk${v1}.a /usr/lib/libtk.a
-	dosym /usr/lib/libtk${v1}.so /usr/lib/libtk.so
-	dosym /usr/lib/libtkstub${v1}.a /usr/lib/libtkstub.a
-
-	ln -sf wish${v1} ${D}/usr/bin/wish
-
-	cd ${S}
-	dodoc README changes license.terms
-}