dev-tcltk/tclx: Moved to EAPI=4

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 33 insertions, 27 deletions

diff --git a/dev-tcltk/tclx/ChangeLog b/dev-tcltk/tclx/ChangeLog
index fdd429ddfe55..ab9298e3bc97 100644
--- a/dev-tcltk/tclx/ChangeLog
+++ b/dev-tcltk/tclx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/tclx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/ChangeLog,v 1.43 2012/04/30 15:00:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/ChangeLog,v 1.44 2012/06/07 17:34:48 jlec Exp $
+
+  07 Jun 2012; Justin Lecher <jlec@gentoo.org> tclx-8.4-r2.ebuild,
+  metadata.xml:
+  Moved to EAPI=4
 
   30 Apr 2012; Jeroen Roovers <jer@gentoo.org> files/tclx-8.4-ldflags.patch:
   Improve LDFLAGS patch.
diff --git a/dev-tcltk/tclx/Manifest b/dev-tcltk/tclx/Manifest
index ba393c717861..a1e010583ebd 100644
--- a/dev-tcltk/tclx/Manifest
+++ b/dev-tcltk/tclx/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX tclx-8.3-varinit.patch 386 RMD160 4a697796894cd6573573330843c6a9312aa15e0f SHA1 21862a18f92ce64c2bc61ab3c42c4138e45b33e1 SHA256 7415da5026eab39fa272bd2e0b145cc6030f3a32a95fefc72d0ec9977f364cab
 AUX tclx-8.3.5-configure.patch 448 RMD160 59315bde21bc3ce96dfeed15e1d9b19a6a619f28 SHA1 605c9c51144463ec9260a1d9fdcd2e86c47dde1e SHA256 01ef10236ee23aaf868c5cd92416ca9e7db1fda103400f63acda0073f56b3dc2
@@ -12,13 +12,14 @@ DIST tclx8.4.tar.bz2 313595 RMD160 96c10fdebfe97f4d2c59b61d1116ca0b3efddf7b SHA1
 DIST tk8.4.6-src.tar.gz 3230760 RMD160 e619afbe971730e94a2c180853ed1ac0166dcffa SHA1 a0b2f364be20c3e312d1ba582d3a1b4b4b1d4d88 SHA256 e93c2ce25059c355ec78b500f01ee1628d534e2f6e81bd95e39b8363c0711bb5
 EBUILD tclx-8.3.5.ebuild 1980 RMD160 ff3aba331bf5a66a19f4cea7ff951eee9356e845 SHA1 b43a6cd8a92666b75ba29a8f0630fad3ed197aa7 SHA256 740006de0ecf877355e6b6bc8b92ad7375fff428bef56ce71d8a3b1841dee5ce
 EBUILD tclx-8.4-r1.ebuild 958 RMD160 4bb84ee4db8968897580e53262e9500502234cc5 SHA1 183d8c919dffff2938df3a1381f49caed917d0cb SHA256 ca1d9bfcd42806e02805022c5418f959044184a3e7430468606e2ad641167b71
-EBUILD tclx-8.4-r2.ebuild 1237 RMD160 4cf1c6138f79613ed6d4ba3315e964cc7477f888 SHA1 4a7adb37ec129f4799fa4de382225e68e6692b27 SHA256 084bd2399acb4206d2e36974fbaf4822ad50f5be42a6b8d3bc053cf31219a945
-MISC ChangeLog 5941 RMD160 a61cc1abf9aef22eb3e15d70718aad078a6d6ae2 SHA1 c71d9a21a053a09c0108929b2bb42aa970c12eb9 SHA256 7456e6f8e4dc9162d7723ec06d837655818e82bff477026c21da02b3cf606b99
-MISC metadata.xml 310 RMD160 670b51616608433db64d5a9bf9f219f8e6b57d37 SHA1 2d868bc368bbd7eb9cc84c8a786307c20bb163ee SHA256 a4377ecaedab2f9a2a969d7c1fab2a7a621e70a125c5929282e7c0c09af76381
+EBUILD tclx-8.4-r2.ebuild 1171 RMD160 41d89a0bc3c84761a8c1975408c1afc1ead18fe3 SHA1 eee6075d8b1f0c41bc262503bec3030c492f5fdd SHA256 f0077335af14a1553aa71c91c3e6019ae468fbdfd8b18914809e95d2d80c86f7
+MISC ChangeLog 6044 RMD160 c149c2ba8a9e1c4cc3093c80ecf72776320981d0 SHA1 9e6a2e09a8bc2482e028693e37b2f81868f22ffc SHA256 836e3efd671ba905dd3d1a3323ac9bef2b854f5ab21aaf584d60067d7928fb9a
+MISC metadata.xml 314 RMD160 e035c664e48da4d3a1b6f463cc53fa4ee5266840 SHA1 86fd0a453570c8b5588eedc5b820fb7616722a20 SHA256 8b76ffc6d3c0a3f72c3fa0845b6937b620bcebe0dc27878a73528dd09d8243d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAk+eqS8ACgkQVWmRsqeSphOu5gCdEUW1SbrC53H3iomsapdZHxFT
-zX0An3ICd0A23neBq72tu3o9Ptr+UN3h
-=TNXz
+iEYEAREKAAYFAk/Q5j0ACgkQgAnW8HDreRb2QwCgixlTlmb/5IO7+x4/VrZH0E6i
+uqwAoKkiPnBghRuMvWXdsLgQ8hNugegL
+=boHl
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tclx/metadata.xml b/dev-tcltk/tclx/metadata.xml
index 24c40b099615..30ee235ee80b 100644
--- a/dev-tcltk/tclx/metadata.xml
+++ b/dev-tcltk/tclx/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tcltk</herd>
-<maintainer>
-  <email>tcltk@gentoo.org</email>
-  <description>TCL / TK herd</description>
-</maintainer>
-<longdescription>Extended TCL</longdescription>
+	<herd>tcltk</herd>
+	<maintainer>
+		<email>tcltk@gentoo.org</email>
+		<description>TCL / TK herd</description>
+	</maintainer>
+	<longdescription>Extended TCL</longdescription>
 </pkgmetadata>
diff --git a/dev-tcltk/tclx/tclx-8.4-r2.ebuild b/dev-tcltk/tclx/tclx-8.4-r2.ebuild
index 274564fb8219..24d4a8f23fd9 100644
--- a/dev-tcltk/tclx/tclx-8.4-r2.ebuild
+++ b/dev-tcltk/tclx/tclx-8.4-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/tclx-8.4-r2.ebuild,v 1.1 2010/04/02 09:22:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/tclx-8.4-r2.ebuild,v 1.2 2012/06/07 17:34:48 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="A set of extensions to TCL"
 HOMEPAGE="http://tclx.sourceforge.net"
@@ -15,8 +15,10 @@ IUSE="tk threads"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 
-DEPEND=">=dev-lang/tcl-8.4.6
+DEPEND="
+	>=dev-lang/tcl-8.4.6
 	tk? ( >=dev-lang/tk-8.4.6 )"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${PN}${PV}
 
@@ -24,9 +26,10 @@ S="${WORKDIR}"/${PN}${PV}
 RESTRICT="test"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-relid.patch
-	epatch "${FILESDIR}"/${P}-varinit.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
+	epatch \
+		"${FILESDIR}"/${P}-relid.patch \
+		"${FILESDIR}"/${P}-varinit.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
 }
 
 src_configure() {
@@ -34,8 +37,7 @@ src_configure() {
 		$(use_enable tk) \
 		$(use_enable threads) \
 		--enable-shared \
-		--with-tcl="${EPREFIX}/usr/lib/" \
-		|| die "econf failed"
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)/"
 
 	# adjust install_name on darwin
 	if [[ ${CHOST} == *-darwin* ]]; then
@@ -46,7 +48,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog README
+	default
 	doman doc/*.[n3]
 }