Fix bug #116709

(Portage version: 2.1.2.3)

4 files changed, 27 insertions, 85 deletions

diff --git a/dev-tcltk/thread/ChangeLog b/dev-tcltk/thread/ChangeLog
index 7d72bd0b1fd0..b60235d78962 100644
--- a/dev-tcltk/thread/ChangeLog
+++ b/dev-tcltk/thread/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/thread
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/thread/ChangeLog,v 1.5 2006/12/09 14:27:50 drizzt Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/thread/ChangeLog,v 1.6 2007/04/07 10:26:01 jokey Exp $
+
+  07 Apr 2007; Markus Ullmann <jokey@gentoo.org> -thread-2.6.1.ebuild,
+  thread-2.6.2.ebuild:
+  Fix bug #116709
 
   09 Dec 2006; Timothy Redaelli <drizzt@gentoo.org> thread-2.6.2.ebuild:
   Add ~x86-fbsd keyword
diff --git a/dev-tcltk/thread/files/digest-thread-2.6.1 b/dev-tcltk/thread/files/digest-thread-2.6.1
deleted file mode 100644
index b7a0ab6f82c4..000000000000
--- a/dev-tcltk/thread/files/digest-thread-2.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ea680625659eb0a0afc354c7dadf3031 thread2.6.1.tar.gz 262963
-RMD160 8aa69c7c5a52925c0d1d545ae078770268d50327 thread2.6.1.tar.gz 262963
-SHA256 ba6d892c2f1145d25cacd54911465a8a12c933227c2cbebf029d0fab189301fc thread2.6.1.tar.gz 262963
diff --git a/dev-tcltk/thread/thread-2.6.1.ebuild b/dev-tcltk/thread/thread-2.6.1.ebuild
deleted file mode 100644
index c3b2e9c24c82..000000000000
--- a/dev-tcltk/thread/thread-2.6.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/thread/thread-2.6.1.ebuild,v 1.3 2005/11/16 11:27:05 herbs Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="the Tcl Thread extension"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="gdbm"
-
-DEPEND="gdbm? ( sys-libs/gdbm )
-	>=dev-lang/tcl-8.4"
-
-S=${WORKDIR}/${PN}${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# Search for libs in libdir not just exec_prefix/lib
-	sed -i -e 's:${exec_prefix}/lib:${libdir}:' \
-		aclocal.m4 || die "sed failed"
-	aclocal || die "aclocal failed"
-	autoconf || die "autoconf failed"
-}
-
-pkg_setup() {
-	if ! built_with_use dev-lang/tcl threads ; then
-		eerror "dev-lang/tcl was not merged with threading enabled."
-		eerror "please re-emerge dev-lang/tcl with USE=threads"
-		die "threading not enabled in dev-lang/tcl"
-	fi
-}
-
-src_compile() {
-	local myconf="--with-threads --with-tclinclude=/usr/include \
-			--with-tcl=/usr/$(get_libdir)"
-
-	if use gdbm ; then
-		myconf="${myconf} --with-gdbm"
-	fi
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc ChangeLog README
-}
diff --git a/dev-tcltk/thread/thread-2.6.2.ebuild b/dev-tcltk/thread/thread-2.6.2.ebuild
index 92c294000b6b..5cccb487aca2 100644
--- a/dev-tcltk/thread/thread-2.6.2.ebuild
+++ b/dev-tcltk/thread/thread-2.6.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/thread/thread-2.6.2.ebuild,v 1.3 2006/12/09 14:27:50 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/thread/thread-2.6.2.ebuild,v 1.4 2007/04/07 10:26:01 jokey Exp $
 
-inherit eutils multilib
+inherit autotools eutils multilib
 
 DESCRIPTION="the Tcl Thread extension"
 HOMEPAGE="http://www.tcl.tk/"
@@ -14,10 +14,18 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE="gdbm"
 
 DEPEND="gdbm? ( sys-libs/gdbm )
-	>=dev-lang/tcl-8.4"
+	dev-lang/tcl"
 
 S=${WORKDIR}/${PN}${PV}
 
+pkg_setup() {
+	if ! built_with_use dev-lang/tcl threads ; then
+		eerror "dev-lang/tcl was not merged with threading enabled."
+		eerror "please re-emerge dev-lang/tcl with USE=threads"
+		die "threading not enabled in dev-lang/tcl"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -26,34 +34,22 @@ src_unpack() {
 	sed -i -e 's:${exec_prefix}/lib:${libdir}:' \
 		aclocal.m4 || die "sed failed"
 
-	sed -i -e "s/relid'/relid/" tclconfig/tcl.m4 || die
-
-	aclocal || die "aclocal failed"
-	autoconf || die "autoconf failed"
-}
+	sed -i -e "s/relid'/relid/" tclconfig/tcl.m4
 
-pkg_setup() {
-	if ! built_with_use dev-lang/tcl threads ; then
-		eerror "dev-lang/tcl was not merged with threading enabled."
-		eerror "please re-emerge dev-lang/tcl with USE=threads"
-		die "threading not enabled in dev-lang/tcl"
-	fi
+	eaclocal
+	eautoconf
 }
 
 src_compile() {
-	local myconf="--with-threads --with-tclinclude=/usr/include \
-			--with-tcl=/usr/$(get_libdir)"
-
-	if use gdbm ; then
-		myconf="${myconf} --with-gdbm"
-	fi
-
-	econf ${myconf} || die "econf failed"
+	econf \
+		--with-threads \
+		--with-tclinclude=/usr/include \
+		--with-tcl="/usr/$(get_libdir)" \
+		$(use_with gdbm) || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
-
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc ChangeLog README
 }