Fix for Python ABIs

(Portage version: 2.2_rc67/git/Linux x86_64, RepoMan options: --force)
 (Signed Manifest commit)

4 files changed, 36 insertions, 63 deletions

diff --git a/sci-misc/nltk/ChangeLog b/sci-misc/nltk/ChangeLog
index 2d727b4ce..5d10e7b48 100644
--- a/sci-misc/nltk/ChangeLog
+++ b/sci-misc/nltk/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-misc/nltk
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*nltk-0.9.5 (29 Jun 2010)
+
+  29 Jun 2010; Justin Lecher <jlec@gentoo.org> -nltk-0.9.2.ebuild,
+  -nltk-0.9.4.ebuild, +nltk-0.9.5.ebuild:
+  Python ABI fixes
+
 *nltk-0.9.4 (11 Aug 2008)
 
   11 Aug 2008; Flammie Pirinen <flammie@gentoo.org> +nltk-0.9.4.ebuild,
diff --git a/sci-misc/nltk/Manifest b/sci-misc/nltk/Manifest
index c4da0fcb9..17e9609a7 100644
--- a/sci-misc/nltk/Manifest
+++ b/sci-misc/nltk/Manifest
@@ -1,8 +1,15 @@
-DIST nltk-0.9.2.tar.gz 750901 RMD160 8c583992c9315f56b8ef7f6b0c3de36447502a63 SHA1 cb89829964dbb834bcac579dabc641d32abb7fb8 SHA256 089fd317e1263bbc88fb97d8891d2874e2f0a5fa12f24f818d8c4c44c40a76c2
-DIST nltk-0.9.4.tar.gz 985223 RMD160 ce07f2ab81b46bf49c0eeeb8d999d858d8edf688 SHA1 d042af802a20ef5b282450b94e602ce840ecb1a9 SHA256 c233903a2abf1f666742ec85ff3e02edf11862b84789e7b80130170921da2b02
-DIST nltk-data-0.9.2.zip 78534316 RMD160 c5d4bd8fcd0e0337cd2e1e7b011ee44075d7322d SHA1 0535cef468b69abe253438c32c560832e1690abf SHA256 4bdef1e55cb6f52bd88ac29e709f15e7d902fe2b0ee17e3f652e81e8c5a9aae3
-DIST nltk-data-0.9.4.zip 104997349 RMD160 c12b7f56bdf81cde013d1cd56d32f28e2c183e57 SHA1 79c8c92a351af16e05b60544b304346ee4b7feab SHA256 da3b6be06b3d3e7da7f20b127580d1e4c2027aef6aec0718be480d36e8c7a0cc
-EBUILD nltk-0.9.2.ebuild 859 RMD160 89c59d6bc704d5bc57cfe16b36ef4b23d13c0d92 SHA1 35668a551cc7afc56359669c76daa65cc661b4a3 SHA256 463fb513bb08d25b84f9070c22904e7d3eb3039156eb47f5faaadbcb596c05b2
-EBUILD nltk-0.9.4.ebuild 908 RMD160 888ef051805248cb92e1e023766a81b719e65afb SHA1 03e88b19feed3a0afd93683d2e2c8e3de8ee2ea9 SHA256 df5291b4e690488f8d916104bbfbf679983c461779a49c75a5d62efd4fc43803
-MISC ChangeLog 531 RMD160 21a372aa650b7fb4587f8658c1942b97ea1b234c SHA1 7d9e165ac2c5f0c519ba9ea929e7c686e0b5ecce SHA256 23bd6d79e3ae7151f0f55f50c7c2b4a3a3e4291698a9d74455dacaeef48c3312
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST nltk-0.9.5.tar.gz 1177059 RMD160 079ccaf078405310028d2d1e93f0d46486d313ca SHA1 2267ac50c6c2cede9286c3b502ead98045678d80 SHA256 2dc56cccff566177d7f1e86df055852ebfa821b46f94920b81e0a80c0626bd02
+DIST nltk-data-0.9.5.zip 104049679 RMD160 0a06a0750236d5d2ab7c094fb3c73e979f62e3c4 SHA1 b04f3d1466cc0c2ccda2c320760a0ec443ccaf7b SHA256 dffe745f2615d7baa6112ce03d3fdb1e3949f9cda36db146eb32093b557ee87b
+EBUILD nltk-0.9.5.ebuild 823 RMD160 6a9498c7c9435067ca189f4a61376fba9a610454 SHA1 1c1f95185c3b0b2b94420c109b6ca98693320fe2 SHA256 26e95fb0756161dff63c3500764aa56705d51a1a5c03eb0c6bff9c0e028287cd
+MISC ChangeLog 687 RMD160 14b06b3ea696de54250a446cd449c7bf2b82b213 SHA1 15e7d85718edd00908cb225cd2d40fa89b4245cb SHA256 fb332863afac7b2a2928ccd7c038ec016e35b897626348b712a49db31adb182e
 MISC metadata.xml 364 RMD160 aff2bdd66780e4c75fb9b6ae3d736b26cc955c9e SHA1 7e21481f5ba1c24eb28c17dd91a609fe176da3a6 SHA256 9660ff37111b5f36e3020fcc257a7bf52c9f3c8c1020da7be578393363197e96
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwqUEMACgkQgAnW8HDreRYH0wCgrA/qWxgA8+f4LZ8e8aYR7jU3
+3sMAn2nBc3siE38FNzx6KextV2v6La6S
+=l7GD
+-----END PGP SIGNATURE-----
diff --git a/sci-misc/nltk/nltk-0.9.2.ebuild b/sci-misc/nltk/nltk-0.9.2.ebuild
deleted file mode 100644
index a9b3decc5..000000000
--- a/sci-misc/nltk/nltk-0.9.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit distutils
-
-DESCRIPTION="Natural language processing tool collection"
-HOMEPAGE="http://nltk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://sourceforge/${PN}/${PN}-data-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="${DEPEND}
-	dev-python/numarray
-	dev-python/numpy
-	dev-python/matplotlib
-	>=app-dicts/wordnet-2.0
-	sci-misc/pywordnet"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! built_with_use dev-lang/python ; then
-		die "NLTK needs python built with USE=tk"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	# N.B.: if you install corpora in usr/share/nltk you do not need env. vars
-	cd "${WORKDIR}"
-	dodir /usr/share/nltk
-	fperms g+r data
-	insinto /usr/share/nltk/
-	doins -r data
-}
-
diff --git a/sci-misc/nltk/nltk-0.9.4.ebuild b/sci-misc/nltk/nltk-0.9.5.ebuild
index 9e1368373..f4619a54e 100644
--- a/sci-misc/nltk/nltk-0.9.4.ebuild
+++ b/sci-misc/nltk/nltk-0.9.5.ebuild
@@ -1,12 +1,21 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="3"
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_USE_WITH="tk"
+RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_MODNAME="yaml nltk_contrib nltk"
+
 inherit eutils distutils
 
 DESCRIPTION="Natural language processing tool collection"
-HOMEPAGE="http://nltk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+HOMEPAGE="http://www.nltk.org/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
 	mirror://sourceforge/${PN}/${PN}-data-${PV}.zip"
 
 LICENSE="GPL-2"
@@ -22,20 +31,11 @@ DEPEND="${DEPEND}
 	sci-misc/pywordnet"
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	if ! built_with_use dev-lang/python tk ; then
-		die "NLTK needs python built with USE=tk"
-	fi
-	export NLTK_DATA="${WORKDIR}/data/"
-}
+NLTK_DATA="${WORKDIR}/data/"
 
 src_install() {
 	distutils_src_install
-	# N.B.: if you install corpora in usr/share/nltk you do not need env. vars
-	cd "${WORKDIR}"
-	dodir /usr/share/nltk
-	fperms g+r data
-	insinto /usr/share/nltk/
-	doins -r data
+	insinto /usr/share/nltk/data
+	doins -r "${WORKDIR}"/${PN}_data/* || die
 }