Don't clobber MAKEOPTS, bug #250144, thank SpanKY for report. Remove old.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.26-openvz.git-89451f9 i686

4 files changed, 9 insertions, 75 deletions

diff --git a/app-dicts/wordnet/ChangeLog b/app-dicts/wordnet/ChangeLog
index 7e35ff8a6e14..6b68a54fd681 100644
--- a/app-dicts/wordnet/ChangeLog
+++ b/app-dicts/wordnet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-dicts/wordnet
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.17 2008/09/17 20:31:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.18 2008/12/16 00:48:25 pva Exp $
+
+  16 Dec 2008; Peter Volkov <pva@gentoo.org> -wordnet-3.0.ebuild,
+  wordnet-3.0-r2.ebuild:
+  Don't clobber MAKEOPTS, bug #250144, thank SpanKY for report. Remove old.
 
   17 Sep 2008; Markus Meier <maekke@gentoo.org> wordnet-3.0-r2.ebuild:
   x86 stable, bug #211491
diff --git a/app-dicts/wordnet/Manifest b/app-dicts/wordnet/Manifest
index 0e4ada557e83..474c9e658b23 100644
--- a/app-dicts/wordnet/Manifest
+++ b/app-dicts/wordnet/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX wordnet-3.0-dict-location.patch 1542 RMD160 77ffb69ae4c11aa14c15cdedaa7c7a545ef0e2c8 SHA1 e73ba30129d54621ca1c45a6df975b57e693b7f7 SHA256 8eaae12a77610e10003d26ac6e10b394bbaab2aefc56ceb843e4f65d65b125c2
 AUX wordnet-3.0-docs-path.patch 2832 RMD160 491b73b758f44e75e5677bbeb4941d22fea9e939 SHA1 c919b4be1b003b1acbe5bb40f88713d792bb4e8c SHA256 26130edeadc7c6993faa8a1471c5cac87c533d3e1c927eb5d59716f5b47a808d
 AUX wordnet-3.0-shared-lib.patch 921 RMD160 983a16ff89636b5127a88538ebc1d12f5557bd1f SHA1 c52955cfb94a72648885aabe30616cd7762135b1 SHA256 bcca076ec3581a88f7a221dd419e0e69e88d896018776cde5d56019a020d9cc1
 DIST WordNet-3.0.tar.gz 11537227 RMD160 7dc7a7417753004170e6fd4a503b232c028f35ee SHA1 16986e6bf695fc752c201c080333dadd919fe3ed SHA256 b4d8b1feeb22defe686cf1c5062d723bd854997614da9547fa135e5137843531
 DIST wordnet-3.0-patchset-1.tar.bz2 8076 RMD160 09e59e73d3032f747b1e0d80dc3cc5911efcdcc8 SHA1 d692931bc4d51c27dae9adc452bf7b5f10c3368f SHA256 d8333b107f53e188981e9ec0e1e53890c8bd7155924ae140c777c3f443d8aba7
-EBUILD wordnet-3.0-r2.ebuild 1873 RMD160 6cdb19df7e9dd614fe123041dea8bcec7e1d054e SHA1 3f61ffb7dc4d426745373f6e93d04b05d9290408 SHA256 33d185623468531644a3ad69b3e0c816aca019ae8bb80e69681a8ace95fb0eb0
-EBUILD wordnet-3.0.ebuild 1721 RMD160 707b99ac3e7519ee4847f8ab814d4a1e0885b2f6 SHA1 b9a9383792e785b641928f3e635dfaf78f18784a SHA256 33ee4f72c69e2f6cecf251a3c7d898f15c7be9731329f8f5705223497d1e6df9
-MISC ChangeLog 3286 RMD160 83726c973f9cadf04ace876bb3c4b1e4368a8a83 SHA1 88f84b2889a67e757888f1c4645f1c89a2eac38f SHA256 5e3bdc73b195919ae327625a4eb5c871ef4fae0288cb07d1670e948b5a384848
+EBUILD wordnet-3.0-r2.ebuild 1858 RMD160 0e31dcc62021887af96c0d3d913c682d91ee4399 SHA1 0eaa5687c5cb8cda562b78ac2ef89aab309e597c SHA256 e65b55b241cfe391867c0ec3abe4096ba794f55cdccca2efcde85cbe6744f8df
+MISC ChangeLog 3451 RMD160 5e4ef5e224137273f54ad425609078f7cdfde87b SHA1 b902a80a1ec14ed72ffc12affe2a8e53ab607092 SHA256 5cac782fe87197854377af5cf89b44035397bac6a8ae3d2c7a85ebe1448cfd99
 MISC metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 SHA1 0d9e341c4b61e23adc1f3806989a0236b83257a0 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjRaWAACgkQkKaRLQcq0GLJqwCcDTS565CrZ0Q5IY2O56BKZcwb
-EB8An32hrmhvWuIxAeihmebKzSb2+tMz
-=19JO
------END PGP SIGNATURE-----
diff --git a/app-dicts/wordnet/wordnet-3.0-r2.ebuild b/app-dicts/wordnet/wordnet-3.0-r2.ebuild
index 9835b09fca79..7b6f2cf33b13 100644
--- a/app-dicts/wordnet/wordnet-3.0-r2.ebuild
+++ b/app-dicts/wordnet/wordnet-3.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-3.0-r2.ebuild,v 1.3 2008/09/17 20:31:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-3.0-r2.ebuild,v 1.4 2008/12/16 00:48:25 pva Exp $
 
 inherit flag-o-matic autotools
 
@@ -44,14 +44,13 @@ 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}" \
 	WNHOME="/usr/share/wordnet" \
 	econf
-	emake || die "emake Failed"
+	emake -e || die "emake Failed"
 }
 
 src_install() {
diff --git a/app-dicts/wordnet/wordnet-3.0.ebuild b/app-dicts/wordnet/wordnet-3.0.ebuild
deleted file mode 100644
index 6a17fc80aca7..000000000000
--- a/app-dicts/wordnet/wordnet-3.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-3.0.ebuild,v 1.3 2008/09/12 19:36:30 pva Exp $
-
-inherit flag-o-matic autotools
-
-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"
-LICENSE="Princeton"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="doc"
-
-# In contrast to what the configure script seems to imply, Tcl/Tk is NOT optional.
-# cf. bug 163478 for details. (Yes, it's about 2.1 but it's still the same here.)
-DEPEND="dev-lang/tcl
-		dev-lang/tk"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/WordNet-${PV}
-
-src_unpack() {
-	unpack ${A}
-	# Don't install into PREFIX/dict but PREFIX/share/wordnet/dict
-	epatch "${FILESDIR}/${P}-dict-location.patch"
-	# Fixes bug 130024, make an additional shared lib
-	epatch "${FILESDIR}/${P}-shared-lib.patch"
-	# Don't install the docs directly into PREFIX/doc but PREFIX/doc/PN
-	epatch "${FILESDIR}/${P}-docs-path.patch"
-
-	cd "${S}"
-
-	# Don't install all the extra docs (html, pdf, ps) without doc USE flag.
-	use doc || sed -i -e "s:SUBDIRS =.*:SUBDIRS = man:" doc/Makefile.am
-
-	rm -f configure
-	eautoreconf
-}
-
-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}" \
-	WNHOME="/usr/share/wordnet" \
-	econf
-	emake || die "emake Failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc AUTHORS ChangeLog INSTALL README || die "dodoc failed"
-}