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

Package-Manager: portage-2.1.3.3

4 files changed, 34 insertions, 26 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/Manifest b/app-dicts/wordnet/Manifest
index 94bd06c3032e..5a31559f0fb4 100644
--- a/app-dicts/wordnet/Manifest
+++ b/app-dicts/wordnet/Manifest
@@ -19,18 +19,18 @@ RMD160 ba7da541e7ac1593357137d366994c4d59b74247 files/wordnet-2.0-macos.patch 28
 SHA256 ea40115b75aa6cff62bacf4265709020d96ea04ea8d4b6575d9abd4e633ba7a7 files/wordnet-2.0-macos.patch 287
 DIST WordNet-2.0.tar.gz 12847598 RMD160 4176dd842a216c6942362ea1fef08e2e223b356f SHA1 be33dbcda5a6cb6851b331365efa012525a9d05f SHA256 081ad1b47b9489b25532fe2e546244480a03932792c218596b848d6f8d2c42bb
 DIST WordNet-2.1.tar.gz 11441476 RMD160 9d50ce11a91bf93973ce121d6e3bfc46a61346db SHA1 8a88c32c919f24813ed9a207b871a4a604e6f0af SHA256 8ed7ec24377d114c6db326a6f114d6e22afb85cc37f7f1386831b6d8f114784d
-EBUILD wordnet-2.0.ebuild 973 RMD160 8da954e711561574f775844242084492de7f3085 SHA1 6f7489dba807b48ce8625f801e54c5cee6a98e6c SHA256 249c509840c11b5318f79ccc13aed2ce0a3f26d9c580d8dec116e471ffa002bf
-MD5 6773910be9415e12e50741b874e53746 wordnet-2.0.ebuild 973
-RMD160 8da954e711561574f775844242084492de7f3085 wordnet-2.0.ebuild 973
-SHA256 249c509840c11b5318f79ccc13aed2ce0a3f26d9c580d8dec116e471ffa002bf wordnet-2.0.ebuild 973
-EBUILD wordnet-2.1.ebuild 1081 RMD160 5c0db35d4f0369dcb799abc8f08c5203fe843798 SHA1 d9a875a9f1609fe63577e8d67fd0a40683cdeb17 SHA256 1a646f6832242aada5c8261d5a84b9857fe9fff93e2abed2738e17549ed5d5cf
-MD5 9039a6ff996958579ae2e1a57c960e23 wordnet-2.1.ebuild 1081
-RMD160 5c0db35d4f0369dcb799abc8f08c5203fe843798 wordnet-2.1.ebuild 1081
-SHA256 1a646f6832242aada5c8261d5a84b9857fe9fff93e2abed2738e17549ed5d5cf wordnet-2.1.ebuild 1081
-MISC ChangeLog 1567 RMD160 7e47f6a6f3808b26d278d310f105f86515b0dffc SHA1 796b160facfdefd71495b48533f48c677a8b6de7 SHA256 77621ee2a229d2024e66e2315ef937c27026830f481e2fb9a96e14a442b3aabc
-MD5 e1c966c28cbccb0b3ab762b88874d27e ChangeLog 1567
-RMD160 7e47f6a6f3808b26d278d310f105f86515b0dffc ChangeLog 1567
-SHA256 77621ee2a229d2024e66e2315ef937c27026830f481e2fb9a96e14a442b3aabc ChangeLog 1567
+EBUILD wordnet-2.0.ebuild 974 RMD160 dddf938a62f88bbed6c9631d4fbb97b71a649aaf SHA1 7694ddee5739e79c70fa1d7fdfb58b75e22c55b4 SHA256 161e394a3f2298160f401397f3dbf5d32377438ebee090b5b66b95e15b2ac3ec
+MD5 57ae138b49bd6669dba36d98602bbb4e wordnet-2.0.ebuild 974
+RMD160 dddf938a62f88bbed6c9631d4fbb97b71a649aaf wordnet-2.0.ebuild 974
+SHA256 161e394a3f2298160f401397f3dbf5d32377438ebee090b5b66b95e15b2ac3ec wordnet-2.0.ebuild 974
+EBUILD wordnet-2.1.ebuild 1200 RMD160 f2f7998c8ea53ee338cd0cbaad5f7270db35b76c SHA1 d6b195839a9483056e4c455695ca7715e411709a SHA256 dbe297dad66f537b31d9311fa66d23c1c6bc09a38674b3d1c3079cf8e70d70ce
+MD5 1bc2fd438da99524809d229e1bb72539 wordnet-2.1.ebuild 1200
+RMD160 f2f7998c8ea53ee338cd0cbaad5f7270db35b76c wordnet-2.1.ebuild 1200
+SHA256 dbe297dad66f537b31d9311fa66d23c1c6bc09a38674b3d1c3079cf8e70d70ce wordnet-2.1.ebuild 1200
+MISC ChangeLog 1797 RMD160 787f029343abdd91c6b55b397326edb3a98a458f SHA1 e84be453f2d346a392557b8bc940f88a28c5e9fe SHA256 aca378c3241d4d1c8658ba43c4573754e52a96d40d2960e0cec6436feeface7c
+MD5 4a0a50814d828373ae04bc396af2ad51 ChangeLog 1797
+RMD160 787f029343abdd91c6b55b397326edb3a98a458f ChangeLog 1797
+SHA256 aca378c3241d4d1c8658ba43c4573754e52a96d40d2960e0cec6436feeface7c ChangeLog 1797
 MISC metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 SHA1 0d9e341c4b61e23adc1f3806989a0236b83257a0 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22
 MD5 eb03775ece62e57725480e782cd84ee8 metadata.xml 162
 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 metadata.xml 162
@@ -42,9 +42,9 @@ MD5 80fa5f94d2161e88b5c5c64f758b8707 files/digest-wordnet-2.1 241
 RMD160 34c57ecd2a68e33a9bb1fe5cac21fc723df7c918 files/digest-wordnet-2.1 241
 SHA256 47f5fde94693b31a4007cb5b213504f81f06ff39305a6a425de81acf8a5f189a files/digest-wordnet-2.1 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFFzk+nNQqtfCuFneMRAsFTAJ42PJY5101281T7OqFTXg+OhQbfrACeNafc
-7s1SREC1xMSc/H2S+AoKVu0=
-=44e9
+iD8DBQFGtONKCkvF58q80IkRAs2UAJ9CJ1Wn6ISuPyVpEl9H0pPvJzL7bQCfUP3J
+Z+H3pPIWqhvPM7p2TdXYxtM=
+=fee8
 -----END PGP SIGNATURE-----
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"
 }