Bump to EAPI=3, add prefix keywords

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

4 files changed, 30 insertions, 17 deletions

diff --git a/app-dicts/edictionary/ChangeLog b/app-dicts/edictionary/ChangeLog
index 2c52cba09e87..b90965ba9533 100644
--- a/app-dicts/edictionary/ChangeLog
+++ b/app-dicts/edictionary/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-dicts/edictionary
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/edictionary/ChangeLog,v 1.13 2007/08/11 12:53:20 coldwind Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/edictionary/ChangeLog,v 1.14 2010/04/06 15:35:06 abcd Exp $
+
+  06 Apr 2010; Jonathan Callen <abcd@gentoo.org> edictionary-2.2.ebuild:
+  Bump to EAPI=3, add prefix keywords
 
   11 Aug 2007; Santiago M. Mola <coldwind@gentoo.org>
   -edictionary-1.2.ebuild:
diff --git a/app-dicts/edictionary/edictionary-2.2.ebuild b/app-dicts/edictionary/edictionary-2.2.ebuild
index 06105215f2a4..829df5f5cd99 100644
--- a/app-dicts/edictionary/edictionary-2.2.ebuild
+++ b/app-dicts/edictionary/edictionary-2.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/edictionary/edictionary-2.2.ebuild,v 1.5 2007/08/25 22:30:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/edictionary/edictionary-2.2.ebuild,v 1.6 2010/04/06 15:35:06 abcd Exp $
+
+EAPI="3"
 
 MY_PN="edict"
 MY_P="${MY_PN}-${PV}"
@@ -11,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sh ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=""
@@ -20,6 +22,6 @@ DEPEND="dev-lang/perl"
 S="${WORKDIR}/${MY_PN}"
 
 src_install() {
-	make prefix="${D}/usr/bin" install || die "make failed"
+	make prefix="${ED}/usr/bin" install || die "make failed"
 	dodoc README TODO || die
 }
diff --git a/app-dicts/wordnet/ChangeLog b/app-dicts/wordnet/ChangeLog
index 5d8fe4ef6a2b..b64dc9fb639e 100644
--- a/app-dicts/wordnet/ChangeLog
+++ b/app-dicts/wordnet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-dicts/wordnet
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.21 2009/10/18 01:09:34 halcy0n Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.22 2010/04/06 15:34:20 abcd Exp $
+
+  06 Apr 2010; Jonathan Callen <abcd@gentoo.org> wordnet-3.0-r3.ebuild:
+  Bump to EAPI=3, add prefix keywords
 
   18 Oct 2009; Mark Loeser <halcy0n@gentoo.org> wordnet-3.0-r2.ebuild,
   wordnet-3.0-r3.ebuild:
diff --git a/app-dicts/wordnet/wordnet-3.0-r3.ebuild b/app-dicts/wordnet/wordnet-3.0-r3.ebuild
index 8ce96d308a75..15388db28007 100644
--- a/app-dicts/wordnet/wordnet-3.0-r3.ebuild
+++ b/app-dicts/wordnet/wordnet-3.0-r3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-3.0-r3.ebuild,v 1.3 2009/10/18 01:09:34 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-3.0-r3.ebuild,v 1.4 2010/04/06 15:34:20 abcd Exp $
+
+EAPI="3"
 
 inherit flag-o-matic autotools
 
@@ -11,7 +13,7 @@ SRC_URI="ftp://ftp.cogsci.princeton.edu/pub/wordnet/${PV}/WordNet-${PV}.tar.gz
 LICENSE="Princeton"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 # In contrast to what the configure script seems to imply, Tcl/Tk is NOT optional.
@@ -22,9 +24,7 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/WordNet-${PV}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# Don't install into PREFIX/dict but PREFIX/share/wordnet/dict
 	epatch "${WORKDIR}/${P}-dict-location.patch"
 	# Fixes bug 130024, make an additional shared lib
@@ -46,15 +46,20 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	append-flags -DUNIX -I"${T}"/usr/include
 
 	PLATFORM=linux WN_ROOT="${T}/usr" \
 	WN_DICTDIR="${T}/usr/share/wordnet/dict" \
 	WN_MANDIR="${T}/usr/share/man" \
 	WN_DOCDIR="${T}/usr/share/doc/wordnet-${PV}" \
-	WNHOME="/usr/share/wordnet" \
-	econf
+	WNHOME="${EPREFIX}/usr/share/wordnet" \
+	econf \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tk="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
 	emake -e || die "emake Failed"
 }