port to EAPI 2

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 24 insertions, 21 deletions

diff --git a/dev-tcltk/thread/ChangeLog b/dev-tcltk/thread/ChangeLog
index 4b3d796acd06..b229dc740954 100644
--- a/dev-tcltk/thread/ChangeLog
+++ b/dev-tcltk/thread/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-tcltk/thread
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/thread/ChangeLog,v 1.15 2009/08/08 01:47:40 mescalinum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/thread/ChangeLog,v 1.16 2009/08/14 00:45:12 fauli Exp $
+
+  14 Aug 2009; Christian Faulhammer <fauli@gentoo.org> thread-2.6.2.ebuild:
+  port to EAPI 2
 
   08 Aug 2009; Federico Ferri <mescalinum@gentoo.org> thread-2.6.2.ebuild:
   fix bug 247586
diff --git a/dev-tcltk/thread/Manifest b/dev-tcltk/thread/Manifest
index 52865453fbad..e239cf348ae8 100644
--- a/dev-tcltk/thread/Manifest
+++ b/dev-tcltk/thread/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST thread2.6.2.tar.gz 267344 RMD160 320988e4cd05c8166fb079b612607cf4b5adbcf4 SHA1 60fb5a385f39900a7d21a70d9d4c9f40feb098cc SHA256 7f7b6a10102989f55b57946837e965e307b3dddfc65ac50438422ce937dcff7c
-EBUILD thread-2.6.2.ebuild 1448 RMD160 b2119ca6c56f352e22fb2634cca44220d4f3634b SHA1 d1b55fa916fa60f27cbddd6a5b5bf76ba0657156 SHA256 b0b7486f9412cacaad6738b89ae8daaf5901485dd1268b16679ba1adad5dc41c
-MISC ChangeLog 1869 RMD160 f3683e631b990a7d3dee0122bc75805b9c9e89d4 SHA1 c225b6bb4ed8421f435f01ae8c1f9eea78b8fe43 SHA256 828fc8edb689c2c5dc16b45e9c2eaf132c277725f64ae0201200bc41f03005e2
+EBUILD thread-2.6.2.ebuild 1172 RMD160 61ec9662ca5ca8b3a3fb4446ce7ff21c6efed8fd SHA1 f459e1e962194715c07a3df864602ff3acddd57c SHA256 9a82fdf8175d15c7526f24fa6d0be9d45311e965a28504ef911a1361c3bc661e
+MISC ChangeLog 1958 RMD160 bf8320433efb40a77ca3286a2265da08f84906d3 SHA1 179679eef51ecb240eb851ccca71b96df3bc02ca SHA256 dfb3ae61e4340ddf472ddd4e02c02f9d9f0cd79bf6bdc45960aec9e39b1fbe4d
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqEs54ACgkQNQqtfCuFneMmAACfey1oV7Miwn37d9VJQGiTRQLf
+k6IAoIcqoJljvIKFzpJ30moBnSMEvQsU
+=ib2K
+-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/thread/thread-2.6.2.ebuild b/dev-tcltk/thread/thread-2.6.2.ebuild
index 1bfda3aa00de..3307965d594b 100644
--- a/dev-tcltk/thread/thread-2.6.2.ebuild
+++ b/dev-tcltk/thread/thread-2.6.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 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.14 2009/08/08 01:47:40 mescalinum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/thread/thread-2.6.2.ebuild,v 1.15 2009/08/14 00:45:12 fauli Exp $
+
+EAPI=2
 
 inherit autotools eutils multilib
 
@@ -14,25 +16,14 @@ KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86
 IUSE="gdbm"
 
 DEPEND="gdbm? ( sys-libs/gdbm )
-	dev-lang/tcl"
+	dev-lang/tcl[threads]"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PN}${PV}
 
 RESTRICT="test"
 
-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}"
-
+src_prepare() {
 	# Search for libs in libdir not just exec_prefix/lib
 	sed -i -e 's:${exec_prefix}/lib:${libdir}:' \
 		aclocal.m4 || die "sed failed"
@@ -43,7 +34,7 @@ src_unpack() {
 	eautoconf
 }
 
-src_compile() {
+src_configure() {
 	local use_gdbm=""
 	if use gdbm; then use_gdbm="--with-gdbm"; fi
 	econf \
@@ -51,7 +42,6 @@ src_compile() {
 		--with-tclinclude=/usr/include \
 		--with-tcl="/usr/$(get_libdir)" \
 		${use_gdbm} || die "econf failed"
-	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/dev-tcltk/tkTheme/Manifest b/dev-tcltk/tkTheme/Manifest
index 9cc261a3dead..e14dd2409eca 100644
--- a/dev-tcltk/tkTheme/Manifest
+++ b/dev-tcltk/tkTheme/Manifest
@@ -1,7 +1,7 @@
 AUX 1.0-Makefile.in.diff 972 RMD160 3d33e4f0c9d3ea0307ae9fdeb71f4aa38bfca8ea SHA1 b7f31530855670e1f8fb2c3caf9b79abdd8d066b SHA256 892751a0e77c6f5901f222c88fdd1c944e36de3feed1c6457e880ebd9b10a589
 AUX 1.0-configure.diff 289 RMD160 2056ce9e3015a20f026105f8104fbfe83424c8d3 SHA1 63da8a66df5661c17d03080218f749c0e8eec81c SHA256 1889f9519b234308e445020233117b223646ac1c304aa2b2a1413da3a0a9eeb0
 DIST tkTheme.tgz 335061 RMD160 f54e94cc2f6b717f14534b2c605cab3d39897698 SHA1 6a9cbe876a82b26272a91fd163593feaa4831b37 SHA256 e6a2024d4a70ef69108020604de47885d21df09e558ba5cbfde7ccf67fc8a148
-EBUILD tkTheme-1.0-r1.ebuild 883 RMD160 14fd2d5c620cf34b5676a00c3dc531b8f6298419 SHA1 45dbca14116ab25529e77ef5de5ddb501476e6ff SHA256 839068ccf410dcb12f7a6e9b34951989782addae07091e6384c304e252bb0de9
+EBUILD tkTheme-1.0-r1.ebuild 924 RMD160 19f0d1a4874cee61e4ff8f1c1d584ca1d7eb4462 SHA1 358488ab665ebcb33d092b0bf941b83b1bb67493 SHA256 a63be86c5b3f0c157af6bf3731268a48b81581b2b6619bfaa770fbe1e73dd826
 EBUILD tkTheme-1.0.ebuild 817 RMD160 f4232b73c5177d78dae44e754e03e6a3a8f9a3c8 SHA1 971a491d581691f96ad6c5a04bf4314601caeebf SHA256 cb85c2a646fe15c40a7f40737697565a323b3b746b17eba106c553942799416c
-MISC ChangeLog 1532 RMD160 a5fb271679514ea7bcebbd4eb0f66f6dcb5ba858 SHA1 fa8ebcabcbf04fd1619b57100271a7d735907e92 SHA256 56774059392042265a110b407701a9c887b838a0139616b48192a4066dbbd6c3
+MISC ChangeLog 1647 RMD160 d0ddd0b8c185ee2aaefd21690ee1a8e0da04c4a5 SHA1 f3386d7662f23fc20f23589491542c74caeb0ac4 SHA256 cd1030dcd77716cdcbe65bc707d68d8e65ce5f957cbb1a78a63f5b3e4a7c3fef
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290