summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <abcd@gentoo.org>2010-04-06 15:34:20 +0000
committerJonathan Callen <abcd@gentoo.org>2010-04-06 15:34:20 +0000
commite685597899b6b849e1c3bbb7102c714d9b472534 (patch)
tree6b7310662e66b4a1de21175408cf4a705e3de288 /app-dicts/wordnet
parentRevert last commit - I make a mistake... (diff)
downloadgentoo-2-e685597899b6b849e1c3bbb7102c714d9b472534.tar.gz
gentoo-2-e685597899b6b849e1c3bbb7102c714d9b472534.tar.bz2
gentoo-2-e685597899b6b849e1c3bbb7102c714d9b472534.zip
Bump to EAPI=3, add prefix keywords
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'app-dicts/wordnet')
-rw-r--r--app-dicts/wordnet/ChangeLog7
-rw-r--r--app-dicts/wordnet/wordnet-3.0-r3.ebuild23
2 files changed, 19 insertions, 11 deletions
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"
}