Drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 22 insertions, 90 deletions

diff --git a/app-dicts/wordnet/ChangeLog b/app-dicts/wordnet/ChangeLog
index 8738a6e33cfb..817d3daf7c37 100644
--- a/app-dicts/wordnet/ChangeLog
+++ b/app-dicts/wordnet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-dicts/wordnet
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.32 2015/03/28 21:32:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.33 2015/03/29 09:28:57 jlec Exp $
+
+  29 Mar 2015; Justin Lecher <jlec@gentoo.org> -wordnet-3.0-r3.ebuild:
+  Drop old
 
   28 Mar 2015; Agostino Sarubbo <ago@gentoo.org> wordnet-3.0-r4.ebuild:
   Stable for ppc, wrt bug #543798
diff --git a/app-dicts/wordnet/Manifest b/app-dicts/wordnet/Manifest
index 6baee937de12..59983be6fb47 100644
--- a/app-dicts/wordnet/Manifest
+++ b/app-dicts/wordnet/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX wordnet-3.0-dict-location.patch 1542 SHA256 8eaae12a77610e10003d26ac6e10b394bbaab2aefc56ceb843e4f65d65b125c2 SHA512 4ebcf63d0492744aa7b0e061362a5fa386e7c3b36a9451b1235e813c56259f7ef52b1e7028ebd95ba4414c67cc8c26aae11e62109e2ffa682c09c37b28596f1c WHIRLPOOL 78607a0861b9281a14c4d65eb176da47a1a2e43bb8f39ce2a8b6038fbe37ff16604b9aa0f01ae3fe3626b8f50d011c1290c8f345ed66a2e54264ccceca576ecf
 AUX wordnet-3.0-docs-path.patch 2832 SHA256 26130edeadc7c6993faa8a1471c5cac87c533d3e1c927eb5d59716f5b47a808d SHA512 10dec6da3f6853bdf0b6cbbcf47540ae2d682007d145eaab81fd5e532f8ff96067957b5225f82302114adb806f0a2d8a7bf0a8ae95a091473059c96028d7d1a1 WHIRLPOOL 6e6c3d8268a7dc3e08b3d9ee20681f9ab947cd3341868c150a2a2cc53e1d7b94b20667c0fdb1f181e8e6a6a6928b63ae749f22d788fe17ab9e44dd59fc855c5d
@@ -9,24 +9,25 @@ AUX wordnet-3.0-src_stubs_c.patch 438 SHA256 3d6e248b1211aaf48af19aa128b7f7754c3
 AUX wordnet-3.0-tcl8.6.patch 4974 SHA256 97d551b2a7766de8c9f113f94e768a52d450e07c974dbac20bf7ea8df04b35d3 SHA512 2dafc6a6cd332d387fa15b63a7c5cad222e611906582232f7bd6f2522773336e7b632775e73fcd1a8587bd95eabaf70ec1c9ea4b8a81a7c147360a836be0a90c WHIRLPOOL 5416b325ec5abac95d5b0802b8994e6e5d2db8b2b28241155402fca21e88f373785d94cd57506485fa6c890d0a0ee99d9cf2ca9f887720be0a7ae1e80e2d6a8b
 DIST WordNet-3.0.tar.gz 11537227 SHA256 b4d8b1feeb22defe686cf1c5062d723bd854997614da9547fa135e5137843531 SHA512 d39c008cec41de8f1b2aeacb4ad818f9997a13b30a992fda100b6dcc9c11c253530b00a1909b55ff7b564bafc33f7763c1ce9b0a6ae3e591695db2083e9ead7a WHIRLPOOL cfba84209b4366b1ab381957f82cc2a32039d073baf8fbd44252c829c9291be76f05b214e014157f3ec03a354aaec68a14e20103dde37d11f13b846056aa90f4
 DIST wordnet-3.0-patchset-1.tar.bz2 8076 SHA256 d8333b107f53e188981e9ec0e1e53890c8bd7155924ae140c777c3f443d8aba7 SHA512 17668d736dd6dfe83e4d5d328729cbcdfb4dbca9a9707651534169bd2ce6fc2238d5c820d63330c51c20ab9b2964b56a609f58242b05dabbcfdfc0da61c048cb WHIRLPOOL 30e3820c2679148206bc14d5acf8eb7a2bde422f13ce2e9b0a90145e510667d70b1c1ef5d3486c85eddf6492c72b2243672683164f917f8ff5910370e30bd0f8
-EBUILD wordnet-3.0-r3.ebuild 2273 SHA256 3564926c0f58ed90ecd97b356ccf49df809394c02d793f388ff69c37589add95 SHA512 ddc61e4eb6fc8e01975f301585dc0b876a713e347c644d7acccf7af4ec90cd30c7eaec4200756e73eaf0c0d4ead5024abae029437aa6ec71bb350827d7e5cdbc WHIRLPOOL 44b03086cec76483affa3de0fcdb744cd815f40ea4b05f8fe8834d91899c5ca7dddef1bf4c683524ae06711eecaf2c98d03402e50a6126b5832550f51591ac04
 EBUILD wordnet-3.0-r4.ebuild 2222 SHA256 d49f366cb8333bdb6e1e09342c010025691686dde0ab20fd47ad3b69d1b02f2f SHA512 ae6ce0e134f360a7b1b8a3342127d842a33a04b2de118fe31f1be56c457ed82b5bd799bd087ab8b807f38b3f6260aa40691c0e28f5049def87c3b3a4a46419a7 WHIRLPOOL 6030c7cebccf9b1433baaa787cdaeb55f5f6a969ba41e5a8d06a94196eefbd64e5721fbc214fa60fc1e47af8c9bbfef62b922a29f14e7a6d272ab4f2538604ab
-MISC ChangeLog 5432 SHA256 0e06239b2e280793c6d3bfcdd4389d48057250f6f9ee99f37a7c0783676c0892 SHA512 a0699de9c3835b92794d50420ab9b89e7368b7b7ed2d140ef3ee5a56a16bb0525de8626cb3ff994189aeb7165c2217b68437ceb56860cb4fe20e2b71a7fc49cc WHIRLPOOL d5cb0af93ea74dbbe93ea1269e7a4c7e00ff379e002bce1b1f447a09f12630cc68d109072983d4215217edf7e75967ed5b8edff7eacfa4a280e91477e5a0c731
+MISC ChangeLog 5516 SHA256 d0564e6cd7d312e513caf00bfa30431ec33dbb016dab833319062210ad0669ea SHA512 575e0041c514b3d7b798b6ec8ae4f0306aac885e5ab9152cd478866ea75bb594f384882699bce959d42c2a84c4eb2cc91d7095018172ec3a3531f6e496899256 WHIRLPOOL 85c8234cc798398f910edc95ed99cdd6fd8ab9804e97e6e9e48a0a347bdfc651b8ca04ac8d978d6bee080acb2caf6641f55575810fd60be447093694230e4a44
 MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVFx4BAAoJELp701BxlEWfIxcQAKo3/2yhMwVO9ASBpsRyymQc
-MXweLQGssAiHlLuJTO4SsDgD9OK1GnHhqoMDyoaJvOe9xphRjHQ3s++vM/h3vcqh
-RCHownR5MEV2qxfBOQMRmXnVMg7fK35avZpbt5ISwobDwkhn+WbpN5eqRV/iETxj
-4T6BuxH5/GHFJ+IuRfqE1nsEYIlhY63C4olNmYqa2VINH/Ocq1L6xxFqDNCrlXl6
-SKu+odPQtolglEm1u5VqLkVoYHi8OqlHSSpFMKQLP9ug+5Tsk7S/+1NtHaPgEBzC
-o7cjdIXZYPYZ9nC8a8UWQYcuHcTqnxAqcdhHjB6aHswnjpZ5cbAspPCVLUmxLGzg
-Ie+peCWKHSpSh9qs73Vudl1nc6M1elp2B+wgD0jlhAGyhpewQ7O+6K6dlYmIc7f9
-EBSnOGp/j6k6qx5QzN8Hqdhf/As7d3IgIo8S+ffdxIBYulyrU7ALs4dm9ATp8LE6
-DYg9AfGQnECcL3QJ88gzHe325ei39XvQQ4Yb/GtFrqZmZL1U8xujHnnD873Wq47r
-3v510Dd7NW9aykHzEicOsXewzYYWSp5FpeRFMlOVX9mp/6VrtMo76jWrHnB4Rm+e
-F3ONaHAiZsuh7H65XuuSCxGu4r+09+1tsPuUQ8N1/TMZ3ylbaeyEjfwDw4qgRmpy
-kM5/UG/TzghBBl/Yxhrh
-=e7Xa
+iQJ8BAEBCgBmBQJVF8XaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirMO0P/R1YlflkujOY3U7dUYulSVfg
+NA6imOTY24sojTqMby7lxNr3WwulC/wVrrOwnm+HCr+14atYBmYKfNM0ICJF9C5S
+X97YjlRPR0ZDFpnxOfx9CK52hW7qI7NwGRMMvyG935WIiGKiL+jqQ8Nk/rdM3cA7
+0kSn+KLH7/lNo/ORcg8abZb6hsZuOs/NRRYQbfQaYEcg06ESE5Fs7G7ESZ2+y+9Y
+NcpqSpI6PBiAoQ22N/uUtZXaO488Cyp5vzvHDzbkThUvX/3UyhtCrYeX7Y9OgWs5
+o8mwTi2jKBqpm5RncRADwS46byCgOX8zWf6Xzpyc20uhHEvC+22xDetnegmidjIA
+Y7NxRs1/QC/wLLBQVCQEKvyVG+3+BLYXn5yUijJ1Mn3XiSLa21JW99XdfSpsi0WH
+Iurz/INJ1qWeTcscBrsH8cY0fwbQCqnpykZw5rFOpy63WG4fWgUTFkjDmHOF4D7r
+K+8JmFwWzJFC5Z8+AEkypmf/6Ktuh1GKwV6XrguF8Y+k4xBuVfH8vsKMVw4L6dWr
+gK0ZcNTp82GNcbNk/p9q9gJgOz/DjXKtyq6htl6AD8foqEDvU9I941jggC0X6cSg
+rX1yBgoBmhaqYYwOJLL8XFGswxRkwyz9Vm4HhFFtu3J3alwWuGe72TWN27O2zqO+
+YN+th8bw0MU9FXKvIKMs
+=uPcC
 -----END PGP SIGNATURE-----
diff --git a/app-dicts/wordnet/wordnet-3.0-r3.ebuild b/app-dicts/wordnet/wordnet-3.0-r3.ebuild
deleted file mode 100644
index 7c85e88d0a2b..000000000000
--- a/app-dicts/wordnet/wordnet-3.0-r3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 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.7 2015/03/25 08:01:51 jlec Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic autotools multilib
-
-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 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-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:0
-	dev-lang/tk:0"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/WordNet-${PV}"
-
-src_prepare() {
-	# 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
-
-	epatch "${FILESDIR}"/${P}-tcl8.6.patch
-
-	# 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_configure() {
-	append-cppflags -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="${EPREFIX}/usr/share/wordnet" \
-	econf \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
-	emake -e || die "emake Failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc AUTHORS ChangeLog INSTALL README || die "dodoc failed"
-}