Re-added Tcl and Tk as dependencies as they're not optional in this version. cf. bug 163478 for details. Some cleaning up.

(Portage version: 2.1.3.3)

3 files changed, 18 insertions, 10 deletions

diff --git a/app-dicts/wordnet/ChangeLog b/app-dicts/wordnet/ChangeLog
index 1c368b8cfbb9..f9a04ad22211 100644
--- a/app-dicts/wordnet/ChangeLog
+++ b/app-dicts/wordnet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-dicts/wordnet
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.10 2007/02/10 23:05:52 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.11 2007/08/04 20:36:12 philantrop Exp $
+
+  04 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org> wordnet-2.0.ebuild,
+  wordnet-2.1.ebuild:
+  Re-added Tcl and Tk as dependencies as they're not optional in this version.
+  cf. bug 163478 for details. Some cleaning up.
 
   10 Feb 2007; Christian Faulhammer <opfer@gentoo.org> wordnet-2.1.ebuild:
   added some quotes; adjusted DESCRIPTION; and moved from tcltk USE flag to
diff --git a/app-dicts/wordnet/wordnet-2.0.ebuild b/app-dicts/wordnet/wordnet-2.0.ebuild
index 22b6588a0961..354c0baf2dbd 100644
--- a/app-dicts/wordnet/wordnet-2.0.ebuild
+++ b/app-dicts/wordnet/wordnet-2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-2.0.ebuild,v 1.6 2005/11/12 17:50:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-2.0.ebuild,v 1.7 2007/08/04 20:36:12 philantrop Exp $
 
-inherit eutils
+inherit flag-o-matic
 
 DESCRIPTION="WordNet : a lexical database for the English language"
 HOMEPAGE="http://www.cogsci.princeton.edu/~wn/"
@@ -22,12 +22,12 @@ src_unpack() {
 }
 
 src_compile() {
+	append-flags -DUNIX -I${T}/usr/include
 	MAKEOPTS="-e"
 	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} \
-	CFLAGS="${CFLAGS} -DUNIX -I${T}/usr/include" \
 	emake SrcWorld || die
 }
 
diff --git a/app-dicts/wordnet/wordnet-2.1.ebuild b/app-dicts/wordnet/wordnet-2.1.ebuild
index a25e21d7afc3..0bb016b30913 100644
--- a/app-dicts/wordnet/wordnet-2.1.ebuild
+++ b/app-dicts/wordnet/wordnet-2.1.ebuild
@@ -1,15 +1,18 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-2.1.ebuild,v 1.4 2007/02/10 23:05:52 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-2.1.ebuild,v 1.5 2007/08/04 20:36:12 philantrop Exp $
 
-inherit eutils
+inherit flag-o-matic
 
 DESCRIPTION="A lexical database for the English language"
 HOMEPAGE="http://wordnet.princeton.edu/"
 SRC_URI="ftp://ftp.cogsci.princeton.edu/pub/wordnet/${PV}/WordNet-${PV}.tar.gz"
-DEPEND="tk? ( dev-lang/tk )"
+# In contrast to what the configure script seems to imply, Tcl/Tk is NOT optional.
+# cf. bug 163478 for details
+DEPEND="dev-lang/tcl
+	dev-lang/tk"
 LICENSE="Princeton"
-IUSE="tk"
+IUSE=""
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
 S=${WORKDIR}/WordNet-${PV}
@@ -22,12 +25,12 @@ src_unpack() {
 }
 
 src_compile() {
+	append-flags -DUNIX -I${T}/usr/include
 	MAKEOPTS="-e"
 	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}" \
-	CFLAGS="${CFLAGS} -DUNIX -I${T}/usr/include" \
 	econf || die "Configuration Failed"
 	emake || die "Make Failed"
 }