Drop installation of OLD tk.h headers, bug #255590, thank Nathan Brink for report.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

3 files changed, 74 insertions, 3 deletions

diff --git a/app-dicts/wordnet/ChangeLog b/app-dicts/wordnet/ChangeLog
index 6b68a54fd681..c407cedabf2a 100644
--- a/app-dicts/wordnet/ChangeLog
+++ b/app-dicts/wordnet/ChangeLog
@@ -1,6 +1,12 @@
 # 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.18 2008/12/16 00:48:25 pva Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.19 2009/03/15 11:45:29 pva Exp $
+
+*wordnet-3.0-r3 (15 Mar 2009)
+
+  15 Mar 2009; Peter Volkov <pva@gentoo.org> +wordnet-3.0-r3.ebuild:
+  Drop installation of OLD tk.h headers, bug #255590, thank Nathan Brink for
+  report.
 
   16 Dec 2008; Peter Volkov <pva@gentoo.org> -wordnet-3.0.ebuild,
   wordnet-3.0-r2.ebuild:
diff --git a/app-dicts/wordnet/Manifest b/app-dicts/wordnet/Manifest
index 474c9e658b23..47fc9531e089 100644
--- a/app-dicts/wordnet/Manifest
+++ b/app-dicts/wordnet/Manifest
@@ -4,5 +4,6 @@ AUX wordnet-3.0-shared-lib.patch 921 RMD160 983a16ff89636b5127a88538ebc1d12f5557
 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 1858 RMD160 0e31dcc62021887af96c0d3d913c682d91ee4399 SHA1 0eaa5687c5cb8cda562b78ac2ef89aab309e597c SHA256 e65b55b241cfe391867c0ec3abe4096ba794f55cdccca2efcde85cbe6744f8df
-MISC ChangeLog 3451 RMD160 5e4ef5e224137273f54ad425609078f7cdfde87b SHA1 b902a80a1ec14ed72ffc12affe2a8e53ab607092 SHA256 5cac782fe87197854377af5cf89b44035397bac6a8ae3d2c7a85ebe1448cfd99
+EBUILD wordnet-3.0-r3.ebuild 2019 RMD160 f532e660a26f05ad884a84ea8015a75b26b41d1d SHA1 3a577caf421872c4546b9024d9dbd9cb2394008f SHA256 d3883b3cb8e40490374385b5b23a955c40d34394b0acda1cc4b233d63bb56cf3
+MISC ChangeLog 3639 RMD160 6918a033fa3a9ab422df53ccbb6ee8dd98d48df1 SHA1 c8eebb6fc8cc91ab411596d3bd361fd7b78e2469 SHA256 7d53ced90c6098ca3b2795472229cfc9ef39ad0f479b857a8be68cd2f0d7a201
 MISC metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 SHA1 0d9e341c4b61e23adc1f3806989a0236b83257a0 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22
diff --git a/app-dicts/wordnet/wordnet-3.0-r3.ebuild b/app-dicts/wordnet/wordnet-3.0-r3.ebuild
new file mode 100644
index 000000000000..da56abaa0615
--- /dev/null
+++ b/app-dicts/wordnet/wordnet-3.0-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 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.1 2009/03/15 11:45:29 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
+		mirror://gentoo/${P}-patchset-1.tar.bz2"
+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}
+	cd "${S}"
+	# 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
+	epatch "${WORKDIR}/${P}-shared-lib.patch"
+	# Don't install the docs directly into PREFIX/doc but PREFIX/doc/PN
+	epatch "${WORKDIR}/${P}-docs-path.patch"
+	epatch "${WORKDIR}"/${P}-CVE-2008-3908.patch #211491
+	epatch "${WORKDIR}"/${P}-CVE-2008-2149.patch #211491
+
+	# 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
+
+	# Drop installation of OLD tk.h headers #255590
+	sed '/^SUBDIRS/d' -i include/Makefile.am
+	sed 's: include/tk/Makefile::' -i configure.ac
+	rm -rf include/tk/
+
+	rm -f configure
+	eautoreconf
+}
+
+src_compile() {
+	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
+	emake -e || die "emake Failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "install failed"
+	dodoc AUTHORS ChangeLog INSTALL README || die "dodoc failed"
+}