added some quotes; adjusted DESCRIPTION; and moved from tcltk USE flag to tk, see bug 17808

(Portage version: 2.1.2-r9)

3 files changed, 20 insertions, 14 deletions

diff --git a/app-dicts/wordnet/ChangeLog b/app-dicts/wordnet/ChangeLog
index eb4e0effd568..1c368b8cfbb9 100644
--- a/app-dicts/wordnet/ChangeLog
+++ b/app-dicts/wordnet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-dicts/wordnet
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.9 2006/02/07 22:45:19 arj Exp $
+# 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 $
+
+  10 Feb 2007; Christian Faulhammer <opfer@gentoo.org> wordnet-2.1.ebuild:
+  added some quotes; adjusted DESCRIPTION; and moved from tcltk USE flag to
+  tk, see bug 17808
 
   07 Feb 2006; Anders Rune Jensen <arj@gentoo.org> wordnet-2.1.ebuild:
   Second try at #121778. Bite my shiny metal ass cvs!
diff --git a/app-dicts/wordnet/files/digest-wordnet-2.0 b/app-dicts/wordnet/files/digest-wordnet-2.0
index c444d505f5e2..e5d5233363d3 100644
--- a/app-dicts/wordnet/files/digest-wordnet-2.0
+++ b/app-dicts/wordnet/files/digest-wordnet-2.0
@@ -1 +1,3 @@
 MD5 42faaf63f391bb1e13f59ca83490634d WordNet-2.0.tar.gz 12847598
+RMD160 4176dd842a216c6942362ea1fef08e2e223b356f WordNet-2.0.tar.gz 12847598
+SHA256 081ad1b47b9489b25532fe2e546244480a03932792c218596b848d6f8d2c42bb WordNet-2.0.tar.gz 12847598
diff --git a/app-dicts/wordnet/wordnet-2.1.ebuild b/app-dicts/wordnet/wordnet-2.1.ebuild
index 7572d265db97..a25e21d7afc3 100644
--- a/app-dicts/wordnet/wordnet-2.1.ebuild
+++ b/app-dicts/wordnet/wordnet-2.1.ebuild
@@ -1,37 +1,37 @@
-# Copyright 1999-2006 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.1.ebuild,v 1.3 2006/02/07 22:45:19 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-2.1.ebuild,v 1.4 2007/02/10 23:05:52 opfer Exp $
 
 inherit eutils
 
-DESCRIPTION="WordNet : a lexical database for the English language"
+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="tcltk? ( dev-lang/tk )"
+DEPEND="tk? ( dev-lang/tk )"
 LICENSE="Princeton"
-IUSE="tcltk"
+IUSE="tk"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
 S=${WORKDIR}/WordNet-${PV}
 
 src_unpack() {
 	unpack $A
-	epatch $FILESDIR/Wordnet-2.1-dict-location.patch
+	epatch "$FILESDIR/Wordnet-2.1-dict-location.patch"
 	cd WordNet-2.1
-	epatch $FILESDIR/Wordnet-2.1-compile-fix-new.patch
+	epatch "$FILESDIR/Wordnet-2.1-compile-fix-new.patch"
 }
 
 src_compile() {
 	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} \
+	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"
 }
 
 src_install() {
-	emake install DESTDIR=${D} || die "Install Failed"
+	emake install DESTDIR="${D}" || die "Install Failed"
 }