17 files changed, 30 insertions, 555 deletions
diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index f5141a513254..63d10bd5cecf 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/a2ps
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.114 2013/05/04 19:04:06 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.115 2015/07/23 12:48:38 mrueg Exp $
+
+  23 Jul 2015; Manuel Rüger <mrueg@gentoo.org> -a2ps-4.14-r1.ebuild,
+  -a2ps-4.14-r2.ebuild:
+  Remove old.
 
   04 May 2013; Mike Frysinger <vapier@gentoo.org> a2ps-4.14-r3.ebuild:
   Fix building with newer automake.
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 9f1e344c9310..c6e753cd03db 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 50a2ps-gentoo.el 218 SHA256 421f04aba83fc2fdf02230a86d940bae039206473cb070f2cdd78b0d0725d9e3 SHA512 d1696581767c62903ea24cc7ffec2f25c30b64a0a7aa76d22e8a1872c5ea9b1aaa0f88f7ce24b1ee57f3da57bd3eaa36f2c5fd388437ce9a935bd82912075269 WHIRLPOOL 2a807602fcc08d914fd22f3cc77b16767a1b6303ddaa9802613c0df3bdcced07c225a65ac33808af0a3b2669601ebf3eb18f8976a587b6b969c6baf0c44c5fe0
 AUX a2ps-4.13-manpage-chmod.patch 461 SHA256 032c4698c1dabb1a72978b9aefef7a8895098fb5a7e46e81d861fedfef3b11ab SHA512 f3dc2698ee989928b3179b65b01bf12d828f4428bd860f6f1a3811daaa9d6256b353c2acb5cd4bf392dd89b040f8e9c15420ab4373f3d54b8b60652aaf23f864 WHIRLPOOL d94998e5a7bbbdd6fc4ccccbb6701b25c25ff4fd90a8619c7ddca954053f44c540d3d7756a8165c62889a63015b7c96fa9b5c5b384d078b4ce9f8e83b8d8ce5f
 AUX a2ps-4.13-stdout.diff 462 SHA256 bde80a714f5de1221ec828cf0f33859561510190e97b08f4ba62ab41ad26fc74 SHA512 61be8be21b08f39b0a7509bb96f67139165421baaaa20968ec54f9df37d5b8c355f06bc76513ed10c8c7d61608ed766ed28d4498211dff285d6b381aaf2454dc WHIRLPOOL 2213de93347dae7e2350c4932f3556a5d8cc198d64c7ac245de6328ef97e2e291fc83e086428d487450aee5ba92e5f738aee65a40987e4af088bc6d207b1b0e0
@@ -16,25 +13,6 @@ AUX a2ps-4.14-psset.patch 616 SHA256 8525836efb9ba5db025b013e0262912ccabc7777330
 AUX a2ps-4.14-ptrdiff_t.patch 367 SHA256 09fa3327d064f3246103894b8abbbea2c7b0d2446080a4b5c9cd0510b9efd6d0 SHA512 b9ebff895614a20b8f9e891ce53cf0f7ec38452619f7e907deadff22840a019737dd129690f5ffec91f7f798ae03bd0c7c62f1aa751589865f589362825038c5 WHIRLPOOL 35adb3bfadb7e2601138df84757aa5111580aa70b4347661c237755bc29108739d570b0bee7c626f57bcb7278b05266bdcd4e7113ade633c96dda30014bcb221
 DIST a2ps-4.14-ja_nls.patch.gz 27576 SHA256 90b2a4caf680f04ac8c325a4bc7434edf038ef7059003179b7fa65a5bafdecdc SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f WHIRLPOOL 38a532bc7f696cf3a1addc502b6ad2d26ed4222b770b0e9fc4633fc81cad911df7e64781516a84cdc589965d12d51142c0a06980be7211b0a6d9bf279a11d55e
 DIST a2ps-4.14.tar.gz 2552507 SHA256 f3ae8d3d4564a41b6e2a21f237d2f2b104f48108591e8b83497500182a3ab3a4 SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f WHIRLPOOL f0e445b760e0fdee031c9b8204430880f8e46d0eee2b580bec0dca35564818b7a8925b5941346c008a5ef32dedc28768b43f0e58f3a0e71f289bf593e5325e8d
-EBUILD a2ps-4.14-r1.ebuild 2952 SHA256 8b1e22c9f8ff09966c620997bcd0cff5af8749c8bed5dc80c9e79f1a8a3e88ca SHA512 1fe0681eb707ef14d8cf2209747e0ad63e4c6dc0df4ddf0b836311bc5139a9c6578af850c8db56018476d5167b2b22d7ad9b21ed2dca93a56a98d2b0e3d661b0 WHIRLPOOL 01f647e1be5a56f39cfe89d777f49821e02403fd6eba2cb416cc5594f153c1f1c1d84dea45675caa51d1df456bd60056c587b87e1352c87421c30747e381ac58
-EBUILD a2ps-4.14-r2.ebuild 3097 SHA256 5e62f8c985a4ec3d52868565019d10b0d39402f130247f5d1858f1aa1d28b782 SHA512 b3f07d73755e7d6d002e2f04f8595835c389a0c159c21c6b41576d115c7a0aa16261571e2e6314f8a2e9a5d5403edcf1436bd91f8cba3131837b25bb4f807ee3 WHIRLPOOL dd63f9aafa8337af8dd9fc44f937503480d8ac7e4fb0cc0ed81381a78bbbf4c0badd5c866c72caa00966d77d3a474f3a191f57ce9764f19c7ecdbd3a7a3b6d6e
 EBUILD a2ps-4.14-r3.ebuild 3507 SHA256 cd1019517a47ed43d0e5977a2647eebad1d89840facf20e38d3959ea42dcba08 SHA512 ad7c2216ee70da14e9d4feaec742e29ab745db0ddc356aa84bf4da70508bd3789372d7458f4c6203aa51e5e42f76d5b8f23bd4294acd495ff12cf4484662efc7 WHIRLPOOL c2b1c7b138f1f4aeeb422e2be76322dbc0be01eb7f9a19b5857bd4711f065b267fe3c5e03e9ecdf56a884ae24a042a1c238f77514077e0cbade6ed2ce596cb12
-MISC ChangeLog 16572 SHA256 7fb61298ca3e0a86d104a5fc85cda821a60dbfa5c860fc907f3d15118f959b8a SHA512 ec17b5445b54b6c1a8a4c60c42339a787f6be3327945fe9dd529c24dc4e04b424d7d5f7d9e99ad6140a959092c0a124b4452115df66d9187ea80d5d9f46c9ba3 WHIRLPOOL dd7c94674f8deba514793c55371344eb15ebc1b7ea19965ba3e5f203624c02e8d99846d7a3ce65a531002919a193370e33a119ccdea58e592023ce6b7e18ad40
+MISC ChangeLog 16680 SHA256 8530f4e5cab8f395ffcdec58819b9c017a17b61f46087b11344c3bfa895f5791 SHA512 3261ea7bf1f2314b6827b17b3d25b69774c82fcab0feec067229ad97711a1dc40e5f230168dfa749a507dc1723b7d33c39ca9d5a3764faf09fa25399e7c5883f WHIRLPOOL f1e0f749712dd7e572460ad6b80ab2356264c27d3773cb55157f8fea29d3129cae3b476a06572decba83137fc35b37563adc50b2301f88359cd7bca259077b78
 MISC metadata.xml 178 SHA256 70722a9097b3b57eb4b153054cc852b0938c47120de0fdfd233cac6b209b412a SHA512 429c7973c5ea5668276031dbc75895eeb5097a61a7a0c4958fd8a7b843dcaca5a26919fb3aaebde87abfb5152f867f1a2fafba9967f20a13c11611f8962b862f WHIRLPOOL 42864f7c87f03271c3613e4cb46eb1252d761c9710e820093e4260893ea002bef0ebf87535cad0b68b06be9e8145e0b30fb08e429c0feeb620a5c7d3af2280ff
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRhVurAAoJELEHsLL7fEFWxFIQAKdAs9yX5cTFsDhDWzuoDtaP
-Otr61zZKjIwqSxfhQZyCNVWj23plUY4L+Yb62ALPuSBg1zA0cRbI0Ag0fjK/sCGV
-ZEXDdbqAQKpuqAwFEOTc+gE1SOMAhN+A5eq0PtX3GFFF8pwp8UxZrNphqwzUrPHs
-0yD3e+vKvYjUQlGQcGeJX7Jn4hXUF9gU7yeFvJnq7PVF9OR6phpOMZJvIr1miKC1
-aINAw0CXWq9AI+cKLr3m02/o2GBdGkb/3AKRXNASDVVbO5BnlnI+1bOoT9yFvKee
-ezapvKA07wVgQiPnDYJapm19GBwlHvLBbcz+TVGJ4iVM/HsGb8jneNouyk3rqMGC
-AMmk9YJsmTHrgquNAQ8QalO4vEF2a5vR48oW264ieQeQjLPUmBN+WSfHhma6qhfU
-sLtchRvWaqdV6qtOW5QvtS+4ZrnoiaHxp5X2bwcvY3SpabQcpoX027dobXEF722H
-I3+Ppic9eszWd5eR3WSmLGYUQfdnVmwNTNSJHLpB2VWnsrqiI9bLTJbPyJBmLab/
-Dfriz/tt4R9qZGzok8VONTBbQwRaXebF0r5LQbFTtUI+k2oiVUX4k6qMTsUhhgUH
-6MboD0gbMb/R5ABFG8PU4HEQndHLEXj8PSZbBPzJ8Fj4gQ/E4bRi3qI/JT9TGFk2
-soOFbTJdE4qAJ9F10nS6
-=dycn
------END PGP SIGNATURE-----
diff --git a/app-text/a2ps/a2ps-4.14-r1.ebuild b/app-text/a2ps/a2ps-4.14-r1.ebuild
deleted file mode 100644
index 2c31935ed2c1..000000000000
--- a/app-text/a2ps/a2ps-4.14-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.14-r1.ebuild,v 1.11 2012/04/25 16:19:18 jlec Exp $
-
-inherit eutils autotools elisp-common
-
-DESCRIPTION="Any to PostScript filter"
-HOMEPAGE="http://www.inf.enst.fr/~demaille/a2ps/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	linguas_ja? ( mirror://gentoo/${P}-ja_nls.patch.gz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="emacs nls latex vanilla userland_BSD userland_GNU linguas_ja"
-
-RESTRICT="test"
-
-DEPEND=">=dev-util/gperf-2.7.2
-	|| ( >=dev-util/yacc-1.9.1 sys-devel/bison )
-	app-text/ghostscript-gpl
-	>=app-text/psutils-1.17
-	emacs? ( virtual/emacs )
-	latex? ( virtual/latex-base )
-	nls? ( sys-devel/gettext )"
-RDEPEND="app-text/ghostscript-gpl
-	app-text/wdiff
-	userland_GNU? ( || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp ) )
-	userland_BSD? ( sys-freebsd/freebsd-ubin )
-	>=app-text/psutils-1.17
-	emacs? ( virtual/emacs )
-	latex? ( virtual/latex-base )
-	nls? ( virtual/libintl )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-S="${WORKDIR}/${PN}-${PV:0:4}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-4.13c-locale-gentoo.diff"
-	# this will break
-	#epatch "${FILESDIR}/${PN}-4.13c-stdarg.patch"
-	use vanilla || epatch "${FILESDIR}/${PN}-4.13-stdout.diff"
-	if use linguas_ja ; then
-		epatch "${DISTDIR}/${P}-ja_nls.patch.gz"
-		# bug #335803
-		epatch "${FILESDIR}/${P}-ja-cleanup.patch"
-	else
-		epatch "${FILESDIR}/${P}-cleanup.patch"
-	fi
-
-	# fix fnmatch replacement, bug #134546
-	epatch "${FILESDIR}/${PN}-4.13c-fnmatch-replacement.patch"
-
-	# bug #122026
-	epatch "${FILESDIR}/${P}-psset.patch"
-
-	# fix emacs printing, bug #114627
-	epatch "${FILESDIR}/a2ps-4.13c-emacs.patch"
-
-	# fix chmod error, #167670
-	epatch "${FILESDIR}/a2ps-4.13-manpage-chmod.patch"
-
-	# add configure check for mempcpy, bug 216588
-	epatch "${FILESDIR}/${P}-check-mempcpy.patch"
-
-	# fix compilation error due to invalid stpcpy() prototype, bug 216588
-	epatch "${FILESDIR}/${P}-fix-stpcpy-proto.patch"
-
-	# fix compilation error due to obstack.h issue, bug 269638
-	epatch "${FILESDIR}/${P}-ptrdiff_t.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	local myconf="COM_netscape=no COM_acroread=no"
-
-	if ! use emacs ; then
-		myconf="${myconf} EMACS=no"
-	fi
-
-	if ! use latex ; then
-		myconf="${myconf} COM_latex=no"
-	fi
-
-	export LANG=C LC_ALL=C
-
-	econf \
-		--sysconfdir=/etc/a2ps \
-		$(use_enable nls) \
-		${myconf}
-
-	# parallel make b0rked
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-text/a2ps/a2ps-4.14-r2.ebuild b/app-text/a2ps/a2ps-4.14-r2.ebuild
deleted file mode 100644
index e15ac35113be..000000000000
--- a/app-text/a2ps/a2ps-4.14-r2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.14-r2.ebuild,v 1.5 2012/01/06 02:11:56 ottxor Exp $
-
-EAPI=3
-inherit eutils autotools elisp-common
-
-DESCRIPTION="Any to PostScript filter"
-HOMEPAGE="http://www.inf.enst.fr/~demaille/a2ps/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	linguas_ja? ( mirror://gentoo/${P}-ja_nls.patch.gz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="emacs nls latex vanilla userland_BSD userland_GNU linguas_ja"
-
-RESTRICT="test"
-
-DEPEND=">=dev-util/gperf-2.7.2
-	|| ( >=dev-util/yacc-1.9.1 sys-devel/bison )
-	app-text/ghostscript-gpl
-	app-text/libpaper
-	>=app-text/psutils-1.17
-	emacs? ( virtual/emacs )
-	latex? ( virtual/latex-base )
-	nls? ( sys-devel/gettext )"
-RDEPEND="app-text/ghostscript-gpl
-	app-text/wdiff
-	app-text/libpaper
-	userland_GNU? ( || ( >=sys-apps/coreutils-6.10-r1 ) )
-	userland_BSD? ( sys-freebsd/freebsd-ubin )
-	>=app-text/psutils-1.17
-	emacs? ( virtual/emacs )
-	latex? ( virtual/latex-base )
-	nls? ( virtual/libintl )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-S="${WORKDIR}/${PN}-${PV:0:4}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.13c-locale-gentoo.diff"
-	# this will break
-	#epatch "${FILESDIR}/${PN}-4.13c-stdarg.patch"
-	use vanilla || epatch "${FILESDIR}/${PN}-4.13-stdout.diff"
-	if use linguas_ja ; then
-		epatch "${DISTDIR}/${P}-ja_nls.patch.gz"
-		# bug #335803
-		epatch "${FILESDIR}/${P}-ja-cleanup.patch"
-	else
-		epatch "${FILESDIR}/${P}-cleanup.patch"
-	fi
-
-	# fix fnmatch replacement, bug #134546
-	epatch "${FILESDIR}/${PN}-4.13c-fnmatch-replacement.patch"
-
-	# bug #122026
-	epatch "${FILESDIR}/${P}-psset.patch"
-
-	# fix emacs printing, bug #114627
-	epatch "${FILESDIR}/a2ps-4.13c-emacs.patch"
-
-	# fix chmod error, #167670
-	epatch "${FILESDIR}/a2ps-4.13-manpage-chmod.patch"
-
-	# add configure check for mempcpy, bug 216588
-	epatch "${FILESDIR}/${P}-check-mempcpy.patch"
-
-	# fix compilation error due to invalid stpcpy() prototype, bug 216588
-	epatch "${FILESDIR}/${P}-fix-stpcpy-proto.patch"
-
-	# fix compilation error due to obstack.h issue, bug 269638
-	epatch "${FILESDIR}/${P}-ptrdiff_t.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="COM_netscape=no COM_acroread=no"
-
-	if ! use emacs ; then
-		myconf="${myconf} EMACS=no"
-	fi
-
-	if ! use latex ; then
-		myconf="${myconf} COM_latex=no"
-	fi
-
-	export LANG=C LC_ALL=C
-
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/a2ps \
-		$(use_enable nls) \
-		${myconf}
-}
-
-src_compile() {
-	# parallel make b0rked
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		install || die "emake install failed"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-text/antiword/ChangeLog b/app-text/antiword/ChangeLog
index 26c680baae32..feadbefd0ae0 100644
--- a/app-text/antiword/ChangeLog
+++ b/app-text/antiword/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/antiword
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/ChangeLog,v 1.56 2015/01/09 14:17:32 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/ChangeLog,v 1.57 2015/07/23 12:50:19 mrueg Exp $
+
+  23 Jul 2015; Manuel Rüger <mrueg@gentoo.org> -antiword-0.37.ebuild:
+  Remove old.
 
   09 Jan 2015; Tobias Klausmann <klausman@gentoo.org> antiword-0.37-r1.ebuild:
   Stable on alpha, bug 531404
diff --git a/app-text/antiword/Manifest b/app-text/antiword/Manifest
index d8e0e5af8bbb..276603549e49 100644
--- a/app-text/antiword/Manifest
+++ b/app-text/antiword/Manifest
@@ -1,20 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX antiword-0.37-CVE-2014-8123.patch 528 SHA256 130ae28174bfb30d75755e0df55eab33ffc417173c493dc53405cdd47c2ce60c SHA512 412884a236abb5ee75e5c707581c7e0158614d0e168cd9a8fe02dd8dcb8c0963ae2269c9575cd9cb9f4876efb3bec6bef7934fec5c7738530012495637a2d694 WHIRLPOOL b676eb14c31dc6555cd303f42a1c30c84b1c7597ff0de4c28d69278c8d8f67791ca040b03392c73c2e6a785b5958fad60340fce35b89a76eeea3909714c17d28
 AUX antiword-0.37-prefix.patch 2252 SHA256 ea6ee5526d7c23e5ba5dcb75a1acd65c46fc426a6bd6f1f103b0d83b3f3896cd SHA512 0c61e81d8b6dba9c4c03563b0027e728c179814851d72ed96cd0868c3578aebf8158481adc82fdd9f96c6cf1b1c91a9339f5b75d28b1103fa26ace002bd8e970 WHIRLPOOL 07a4ebd2593ce267636e6f0daf7fd91bb4bb247fd8e28cb5d880f0e7f18529ae0699938f19ca180fdc2711c2e2ed0802bb687ea851bcf9734413cae810cf68a3
 DIST antiword-0.37.tar.gz 317884 SHA256 8e2c000fcbc6d641b0e6ff95e13c846da3ff31097801e86702124a206888f5ac SHA512 6cd8fb9137238417544cf8754829a2d5296055d730ea62a8a025236baa79516190317d146401ff40cde73e1ee2c3c374a2ea01b2e5d24e149310bcabb8bfdce8 WHIRLPOOL 653299ddeba3c153651a664abe12d9c9960227289cfada037574d97dbb3a1a2bf958571815ce6995e38ce7a197714b1852a39aebae108986cb74e861e948c7e3
 DIST antiword-gentoo-patches-r2.tar.bz2 1747 SHA256 62de6106d47e80a5e890bfbe4d2c85c5c78022e196857a4fca035c7c035d583d SHA512 45ed3ee1c514a9ee78bc8963e56be18426b47ea628f02934dbcec83c2d632162e458f75f998da438daae4794fcce36fd8922a172804c0fc83c6f32c9a8092ffe WHIRLPOOL e3a578c1bb082378f0db480aaab640f56f53e23fb35416a04e06803a8fdbd0193f0fbe33cce074dad00d13feada2bc97ce62dae460123047bbe80cd49994b445
 EBUILD antiword-0.37-r1.ebuild 1554 SHA256 6fd0faa33400eb70b73b9d8eafd0027769db450949a5a4f1ed2754b1af527cd6 SHA512 d62fd1dc30949489b21b828741c76ceeb06728f070b1ce1afa8bf938ffa1d8b80d948ada12aa6b3d5cd8bea33787deb5d3332ab4c54988d97a43aac72c57eef4 WHIRLPOOL e97e546486562fbd210b5966d1746d887ac423249387f53bba7a682d34c0d7ee5ae4b0c74a4bb21075591c63a0eaff5c8806ba59ca61df210b7a452f49c572cf
-EBUILD antiword-0.37.ebuild 1503 SHA256 b2a6082d773fea7235c48cec55cf93b25b78751a793232da219049bfb6bf4e3c SHA512 09a36032d2ab94632e6e454c17ec929fb980f338642d0c2c420e8294ac64876bcd4023dd6f55a731971cba93d70ad48c219f45e786339710678c74e661037b7c WHIRLPOOL 2c4a7d4756b2fbc894f4830f5a2121a675618e8bb72509e86d6cacb4c9d07d4ed460e324e1c817b5d0791803bff64a18ccef509fbac9a043c2e4dfe75e961440
-MISC ChangeLog 7556 SHA256 6e0f2ca77b1d3fbd4351c71c746189610e0ca3ab808cc79523be09629b09964b SHA512 bdc17a6eb10af238ce18883c920ed673806ea964de55a7deb2ec0a654c3b884b17bb93ae3cd559f1eeee3056868debefaf49334ebc40ad4fc77924b621eaa068 WHIRLPOOL a84e26de95ff8bb1abda95952d64f3f3a0217582169a4f5e83f8c4468110847d4dd8e498b63fc2434f66c9885ede63521b0dc30a1822d179d795d48059f81ce4
+MISC ChangeLog 7639 SHA256 72b84b5a396d6611ff98c5f592d2ffe5092f879c8eb0e86a263326b54e52de2b SHA512 5b9e92a8b4ade62db21ab76e5141483bb8028663608d4a54ccff439c254cb98b5b50ede2c0361a56ba6300cb440f9a7ff1542c909ce19df27d423e8dfc2b2c85 WHIRLPOOL f19a682a47c6fb4342409c0b2e8117184a14fb4db552bfbf497edb69f39a64ee195be4d2a80056e772350d532655483cd6a194b35cafcb1ea05a2a7df1095b6a
 MISC metadata.xml 533 SHA256 f96e86a7c3b12e1ea910486775315af4acc970f6b0929d1d16390bb4d9cc7c47 SHA512 6ee784660d29f00bc0cf00876c5abb3ba1dc577b00d71aa6ac67d4a13410980b9aad1a5399da04bd047431259d3002894fc375058c78996798ee42d7f098adde WHIRLPOOL 1be6780a69fd8cd3e5b581160c866b179d9b33ed8e9b3044795a31bc362b27ac8a124f6a98aa05f24215d4849ebfb56158690d32bb53fb6fc77dfc71699601b5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iKYEAREIAGYFAlSv4v1fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
-RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOhlDQCfZaeajv2wNaQcSrnmfmlN4/al
-SWUAn2t/2WhFdO2qWfX0X0VIT6wn8WYh
-=4z/r
------END PGP SIGNATURE-----
diff --git a/app-text/antiword/antiword-0.37.ebuild b/app-text/antiword/antiword-0.37.ebuild
deleted file mode 100644
index 93ced71cf4c1..000000000000
--- a/app-text/antiword/antiword-0.37.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/antiword-0.37.ebuild,v 1.16 2012/09/20 15:53:03 grobian Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-IUSE="kde"
-PATCHVER="r2"
-DESCRIPTION="free MS Word reader"
-HOMEPAGE="http://www.winfield.demon.nl"
-SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz
-	http://dev.gentoo.org/~grobian/distfiles/${PN}-gentoo-patches-${PATCHVER}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86 ~ppc-aix ~ia64-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-src_prepare() {
-	# Makefile is a symlink to Makefile.Linux, avoid that we patch it by
-	# accident using patch <2.7, see bug #435492
-	rm Makefile || die
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PN}-gentoo-patches-${PATCHVER}"
-
-	# Re-add convenience symlink, see above
-	ln -s Makefile.Linux Makefile
-}
-
-src_configure() { :; }
-
-src_compile() {
-	emake PREFIX="${EPREFIX}" OPT="${CFLAGS}" CC="$(tc-getCC)" LD="$(tc-getCC)" \
-		LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake -j1 PREFIX="${EPREFIX}" DESTDIR="${D}" global_install || die
-
-	use kde || rm -f "${ED}"/usr/bin/kantiword
-
-	insinto /usr/share/${PN}/examples
-	doins Docs/testdoc.doc Docs/antiword.php || die
-
-	cd Docs
-	doman antiword.1 || die
-	dodoc ChangeLog Exmh Emacs FAQ History Netscape QandA ReadMe Mozilla Mutt || die
-}
diff --git a/app-text/bibutils/ChangeLog b/app-text/bibutils/ChangeLog
index 0c2f252ad047..af96bceeb39a 100644
--- a/app-text/bibutils/ChangeLog
+++ b/app-text/bibutils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/bibutils
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibutils/ChangeLog,v 1.11 2011/05/03 17:11:01 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibutils/ChangeLog,v 1.12 2015/07/23 12:49:20 mrueg Exp $
+
+  23 Jul 2015; Manuel Rüger <mrueg@gentoo.org> -bibutils-4.11.ebuild:
+  Remove old.
 
 *bibutils-4.12 (03 May 2011)
 
@@ -57,4 +60,3 @@
   +bibutils-3.27.ebuild:
   New package: Interconverts between various bibliography formats using a
   common XML intermediate.
-
diff --git a/app-text/bibutils/Manifest b/app-text/bibutils/Manifest
index c29967200075..22adb6ef51d9 100644
--- a/app-text/bibutils/Manifest
+++ b/app-text/bibutils/Manifest
@@ -1,6 +1,4 @@
-DIST bibutils_4.11_src.tgz 514422 SHA256 7c04e2daca0ea266f5ae162b4a9fa98a83a8f854eb65d7332b37d65e5a68475b SHA512 5d667c1a19bf2fb28780a34afbe0bacde5552c78a769c172ef004891b2611ee157cdb3136c998c900d381ad32a2b5ccf620ec06c8d2b4089d332161e84de3d01 WHIRLPOOL ef46c47766d911f4c81d10fdaf4a18ecde5632804f5de3ec1b40b55f7c2cdb1e00217818ad2bc82419d37e9195c4d482ef84b5766b54d567ba4ddb66a9a2a96d
 DIST bibutils_4.12_src.tgz 447566 SHA256 2f98217a442db8d5532263893aab338535cf17053b79cc8bf82287c6af2060d5 SHA512 04329ecb685bf4d5314c6d3a2d5bb21e67112d73bcb49f5a7808a4082f32a9aecb40add4ec4b5320be35f49cd8e101dc1e35409e7c6cad8c39238d2122f91dd0 WHIRLPOOL c36fd9cba003ef7fcec7c9a004eac7c15eef663f3bebb2bad2483462677b0da893f4670e8fd6ec8a1476278c050d4a17517c4b27221a09a388dd7c4293452c8a
-EBUILD bibutils-4.11.ebuild 1118 SHA256 8b51794c80903ff1938c560681288c17e22d874fb90f10380949e29defd3b13a SHA512 1e0fea097dd5318174a26a0caf78826115f9b545c17458742b0fac72afc54cf1b6706dadef855309b01aa47d0ff6a9e95c5bd3c6acb7481729263d3dae22fb27 WHIRLPOOL fc3ca0658b8041a2132def0a392dcd92b2b406ea5fc30f18de827a83017044bb6bc328a09834bae3a60b9c5412a392445b29ccb3711a9d5b5e7dffb6c667c834
 EBUILD bibutils-4.12.ebuild 1118 SHA256 0fc21da52ee2ede0e4c98ef661a87cb9f1aa63d04af84072df1f82fd3bc1f175 SHA512 91ee39a1cd1e739b3034c541904565244b70ea35bcefc0c5b7bbf056672d9ac78fa0b2aa61856dff5b3f4c8a187644709fae9b324940a1dfa594de2effcf427f WHIRLPOOL 9d00b5806bd35c13af6d969e4deea30cf98d46e568604fd21a49f8f97d202a82aa4df278b593320955d6f7e0a4873859c3a33f15ae893be25abadebc1661d587
-MISC ChangeLog 1880 SHA256 a20d2ec7cfcd9b64b4e4f97853c0db756501fea7672cb6346569527f5395a248 SHA512 17b34b94fdb94c9b2c54c29d4c3b990745e7f8744e4e1a906c02b92c210e9f24857fd1b94a6c017cf9780411fde2af9e1ab5be82087d6365e2928329bcc38d49 WHIRLPOOL 967e729dae41a0f5b5d61f6437560bd15bf22f68bb451c469b112a2cbfd511100a375fc507e506e93fbb4915bf3f2b3524948efda9a755ff60bd23124bf83be2
+MISC ChangeLog 1966 SHA256 6574b5a147617d4be21fd5c85c6aad0efd739dfca91c3908cb9ba4d6011666e6 SHA512 f52b18c4063d8f69bb025b67aaf14a9223c4b1dfb000932ef034ec88d88af089ebf1025741eec5529adcbcfd6ef540dbb53c8ea12fd3a58abda7d82aa64a2382 WHIRLPOOL 4566cdca12dd56c0e8f90caa844cf56a90347a31faf2f63007739a2ec4b523aa9dbe8f777f3539a303df75f3f42208124b5e5336a518688a70bb05c8c7e30a50
 MISC metadata.xml 156 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 SHA512 5b6997cd90fe19a83f6bdf44de540ea3818a23fdc28fb2a7c1f55746689ebaa2d4b63eba0386da5198def1cb2a8ae1e5d5d4040c43b0fc31237b864ed1400743 WHIRLPOOL c42eafa29279646750c35aac52967303f347b02b61133918480ba236d599dac68bc0ea000d037f69a3398939678fdeecef656801d783e547f14ea76b04ef2863
diff --git a/app-text/bibutils/bibutils-4.11.ebuild b/app-text/bibutils/bibutils-4.11.ebuild
deleted file mode 100644
index 64c93a77c335..000000000000
--- a/app-text/bibutils/bibutils-4.11.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibutils/bibutils-4.11.ebuild,v 1.2 2011/05/03 17:11:01 jlec Exp $
-
-EAPI=2
-inherit toolchain-funcs
-
-MY_P="${PN}_${PV}"
-DESCRIPTION="Interconverts between various bibliography formats using a common XML intermediate"
-HOMEPAGE="http://www.scripps.edu/~cdputnam/software/bibutils/"
-SRC_URI="http://www.scripps.edu/~cdputnam/software/bibutils/${MY_P}_src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# The custom configure script sucks, so we'll just do its
-	# job ourselves
-	rm -f Makefile configure || die "Failed to purge old Makefile"
-	sed \
-		-e "s:REPLACE_CC:CC=\"$(tc-getCC) ${CFLAGS}\":g" \
-		-e "s:REPLACE_RANLIB:RANLIB=\"$(tc-getRANLIB)\":g" \
-		-e "s:REPLACE_INSTALLDIR:\"${D}/usr/bin\":g" \
-		-e 's:REPLACE_POSTFIX::g' \
-		-e 's:make:$(MAKE):g' \
-		Makefile_start > Makefile \
-		|| die "Failed to set up Makefile"
-}
-
-src_install() {
-	dodir /usr/bin
-	emake install || die
-	dodoc ChangeLog || die
-}
diff --git a/app-text/nfoview/ChangeLog b/app-text/nfoview/ChangeLog
index 2afaf010f02e..7afc2e5d5773 100644
--- a/app-text/nfoview/ChangeLog
+++ b/app-text/nfoview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/nfoview
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/nfoview/ChangeLog,v 1.25 2015/03/26 23:38:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/nfoview/ChangeLog,v 1.26 2015/07/23 12:47:46 mrueg Exp $
+
+  23 Jul 2015; Manuel Rüger <mrueg@gentoo.org> -nfoview-1.12.1.ebuild,
+  -nfoview-1.9.1.ebuild:
+  Remove old.
 
 *nfoview-1.15.1 (26 Mar 2015)
 
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
index 1ca84f6bc2b4..72628e1a1e60 100644
--- a/app-text/nfoview/Manifest
+++ b/app-text/nfoview/Manifest
@@ -1,31 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST nfoview-1.10.tar.gz 102058 SHA256 49e771c059824563aa518e163c68da0c08b04bc174521d2ecff7934a550d4b49 SHA512 6114a6944b7886a6def01cd47649109d5e16921128cd8be122cb3395831038037b45160c3f0449e31fbb2bec88ac1e2c07294a5aaceea51a4fea93b7ea4440af WHIRLPOOL 348eb59e68320591f6a6713ca3ce20e44b0c9d07d35edf791619a66c85fec811b6d12951c0690ed5b6650b5a6e8491612a1d426cdbe6121d5e5d29b8c861feb1
-DIST nfoview-1.12.1.tar.xz 89812 SHA256 155ac90898300c2f3f3664b01de4c3a0de1da1a83d6bbd2a5aaaa7d2da8c734d SHA512 3c681d92db4ae17de4b2e0152012a17ee7edc8c79730f42a179f15c335ff4ddbe96aa132690c0f70a700832a0cb108a70081ca747787852d6e44777dea526329 WHIRLPOOL bdbfb59760e01f5762fd66c8091a05fc245e669525cc6664a3a617243609b24e9d1a56f30286c3a8e8e0e442be7dac4101217108853d340aa1063c73bb321aef
 DIST nfoview-1.15.1.tar.xz 88400 SHA256 ed7643a781e9a96a904b1165dbefd0440fa029d25819233f0543925bb7067b1e SHA512 e4cf86003b03ae57b8a4e76990df77c7e9e441abd8ab0440385405b0f600a85539a152de5893ebe75797bd96ecb811086c48b1439b9f8719050eb12315f67426 WHIRLPOOL da47cc6275fec9a8d01d2bd38eabbf66188eec7c7e6cd657f3ebfbe4b51f010a3dcbd29faad7978aa504a8faa191959d8a3d36b0f54c301c84d3a2b089a4309a
-DIST nfoview-1.9.1.tar.gz 82255 SHA256 beab24b494dc7e0a28d27d4005350f066b997d09ffa4cf1fee30ac24d3c7a1f0 SHA512 1414d7ffa785b168d18e9ec7f897e320449e439352b0d8b4f4f91de3d517015dae5ba0777148d85a408fdc45f9bc0ab7298dba0a359d6dbe4d730853c6135829 WHIRLPOOL f528fbc5d5ee9d275dd1c2ad18e52ae83af540f18b6a72545f0718a55980f0c985e0a5402a031b50616d0ca7b1d8e9bde459e1e1f5277ce83aa558c7ea7becf5
 EBUILD nfoview-1.10.ebuild 1089 SHA256 7f1a05396995351143fae88d80de1a5e094aa3068d6eb7b1487337a2468dfd25 SHA512 db1d752cd11ddf7612b3f5f00a03d5b8fc51a530553c5a07cc659f151dfa3a5ddec6542b5d45506a9c51b16e28043d93f7e6bf1b926a24297626ae7dcddc21fb WHIRLPOOL dfff4ba516e7cdf6c618e7ac1dce31b907e3a7f4f2b76c02d3ccf961ea8ab03e2b2c201059a8989364e09b948ac76a9f449311a37447f3bff628ba7a1814b627
-EBUILD nfoview-1.12.1.ebuild 1094 SHA256 80037f27e0e0a2c9188f0d64ac6f61bf488636a06d986d049ff9636b8939af84 SHA512 849eb1161e7e09d951e9167a3fbc5ba3f1e4bd6730d1d875136418aca54b24ee65f33059d01b0561b325028f761ffcb3b5d2a7ee6a537a1e0599b9ff21388257 WHIRLPOOL 0a7d339d555da32bf83728d003cdd2db292f95c133b02e880ab8c259dba873fe65b3a89f84cb5fb338c33d001a7eae8fa3928c3f660003a2592bc6a499d6da0d
 EBUILD nfoview-1.15.1.ebuild 1014 SHA256 5ffe3fb4869f5583edf2d5674ab8448b639259c12074ac1a23b45a02e87d0ef8 SHA512 2fd53a9f6dd4fafa290447225203bd277f3120a9616ad219fefab98d8d88437d4ff5c2f883a4d3c92376af71198d8f068f82ed9a5144d58818d4d2af752cfcb2 WHIRLPOOL ad58775f2814ba47121a57d89d7b54fc06d4754f7070b39a8c8b11932f6792e6e6e911afead9172de5d2db38326e9a1c77316d4c9326a34586fd77e50083fe79
-EBUILD nfoview-1.9.1.ebuild 1037 SHA256 8a423d79678655c589a52a35fb2c38bad7a48e7a93fe86070053bb503be50fee SHA512 fd4023daa6b0645b759d016dc90ede79e911ce365f9d16c175b4b14ec96d31265614430ec80df5059009bf85c8de2379b80d325a605130e0d654cda47476e957 WHIRLPOOL dcdf4297ecf2d1f84f607b0c222e92d38a28f66edd24a239abd7f34b947e0fd6bbd96bb051254c14edfad06871f641a825ad20c4b2c305d0bde82b62e651631e
 EBUILD nfoview-9999.ebuild 1013 SHA256 9eae11418a26cf9283e11e417f33d3ec3ec7fa5fd0adc80b5d268a11145e4a70 SHA512 870272b8c37762675a3d9627e1bc2f1c2f41e9bd3ff3ff49b77d878b5def125d970bad966521c055bc37db65c2872b8af6aa398146f2dc49a572220521ef97b5 WHIRLPOOL 61c3089b9663efdc48eaa97d5cf73e5144f29d95f53c80c96299a80ee2221a5ffc2554ebf974f7b1fb4bc07d3e9a643cde760676f7425581b00caedd1bf55a59
-MISC ChangeLog 3555 SHA256 8bd3196b272fdc199983f9317a02096192c8116b35f639ffba4aaec8a3a22330 SHA512 f8629a5eec399d0ff572c4a79a53a97532932ecb3c6e36b775abf9ace172752c019d636181aff1ae97707bd49b4baf3aa5e2d807adeaf5b07690356c510a687a WHIRLPOOL 5fc404cdec9ff808e4cfaf48a4a22dc5f71aaafaf81779c323a1300896f095494c44791150fff952187b40b2a166572bd643c5658fbb371f25712bf5ecf9d2f1
+MISC ChangeLog 3666 SHA256 615159732717c2555eda20543a7447a7de46b73551baed9a399a03528d3f0c65 SHA512 b87d51de39149f014e31a6b7c1581949b3101c1fe49cb6a494dd7e88c45b6b89db6673a263dd0c24afe62bd8ab094d05599e2f5297d16252ac8558ff86906670 WHIRLPOOL d8b0a062bde13057dcce95a8a935d98026ba39ee0d4b243059b85ebcd4653d03b15fa38b2ba3c36f92e5fa023d1e9d0df35485c38bb383a5f36302083d0130cf
 MISC metadata.xml 200 SHA256 eb63f2affd0b8e3f5149df2f2f964910eb2127b650919a9e7892fae011e2b22b SHA512 da94c752d3f451652f15c0c459caa079e1d11f37278f86da057ed915ba167688ea62ec62c3c6406200fa951f8f495e9dd782d0e12f9e315187ba4de305f13a1d WHIRLPOOL 80bd517227281caf99e291cd59cd6e5deec972d693473727c7dcd6195450ea9dca63a151e52111c7c2456831f19113008ec60a5c1a66cc3b24f8b17c74e2c373
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJVFJiSAAoJEPGu1DbS6WIAM1AP/0vRT4R4SpD5Gbg2oENktYv6
-SxYvpHXZhEx1czEsQwH7hwkGmrSMx6/DYnmqe07qrAoFKq6dAvlqBtgWdvl/wGSy
-AwnOD58NjwYXN16M5EaSB4V2OVwXe4aSAXvZV7DnFJ4KZ2nKh+KfQgTdUFwU/duH
-oo5WZeOSePb3cjlL9i6x0uQ5gnYAr3dKiFcL7V8LPtzpFxTQp2UnV0Iq6fVrpMWj
-D/xEZZFJyfAB4QrngUn45Ch3dlxqaWdBN92bgty/csKCxKnVnqnGBjYijU0IX47z
-20EQ2/75k5lwPO8X37WiKaxxeQuy3WLL+/VY8pQGPBa5BjBkgXTWriO9Pnc0zuRG
-Bop7+uHEjeuxcSEiBI+xE1UhZbHGfLGj6P+oBMK6bjuUUApJ5wkWCQrhQEhv97Ev
-oLsodpvkrA7XnGAcyQkl+IYSWSHuT37+4Y4z1/94v2XsKmrgvEeSBRUmU3ziRHMK
-WBmhsrDOA2ZmBz3oKQsn1aTtosKcM+CFXqMmQgswSsrBP+S/cw5EaP3utvdljpD7
-VYlRo68hKNFBl6Shcxjux+2qpuXa6CVA1uH7CFcMJq3rc3IB1fiQKJ8MD0QnYPM+
-k5F2gyAm/xVyETD/IuNTfhPqEsJzVmI9+6wkKWXiuBUA2XS75lEil9p4yMmPODBL
-8eVtrKpSh5nMVGYvFJVm
-=JaUf
------END PGP SIGNATURE-----
diff --git a/app-text/nfoview/nfoview-1.12.1.ebuild b/app-text/nfoview/nfoview-1.12.1.ebuild
deleted file mode 100644
index 77098e5eb837..000000000000
--- a/app-text/nfoview/nfoview-1.12.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/nfoview/nfoview-1.12.1.ebuild,v 1.1 2013/04/21 03:22:48 vapier Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="3:3.2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.*"
-
-inherit distutils fdo-mime gnome2-utils
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://github.com/otsaloma/nfoview.git
-		http://github.com/otsaloma/nfoview.git"
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	SRC_URI="http://download.gna.org/nfoview/${PV:0:4}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="simple viewer for NFO files, which are ASCII art in the CP437 codepage"
-HOMEPAGE="http://home.gna.org/nfoview/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pygobject:3"
-RDEPEND="${DEPEND}
-	media-fonts/terminus-font"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	distutils_pkg_postrm
-}
diff --git a/app-text/nfoview/nfoview-1.9.1.ebuild b/app-text/nfoview/nfoview-1.9.1.ebuild
deleted file mode 100644
index 89f823ab6bab..000000000000
--- a/app-text/nfoview/nfoview-1.9.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/nfoview/nfoview-1.9.1.ebuild,v 1.3 2010/08/09 11:13:31 hwoarang Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils fdo-mime gnome2-utils
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://gitorious.org/nfoview/mainline.git"
-	inherit git
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	SRC_URI="http://download.gna.org/nfoview/1.9/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="simple viewer for NFO files, which are ASCII art in the CP437 codepage"
-HOMEPAGE="http://home.gna.org/nfoview/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pygtk"
-RDEPEND="${DEPEND}
-	media-fonts/terminus-font"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	distutils_pkg_postrm
-}
diff --git a/app-text/ps2eps/ChangeLog b/app-text/ps2eps/ChangeLog
index b16e52fca56d..363e58224ce4 100644
--- a/app-text/ps2eps/ChangeLog
+++ b/app-text/ps2eps/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/ps2eps
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ps2eps/ChangeLog,v 1.34 2014/01/02 15:04:45 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ps2eps/ChangeLog,v 1.35 2015/07/23 12:46:51 mrueg Exp $
+
+  23 Jul 2015; Manuel Rüger <mrueg@gentoo.org> -ps2eps-1.64.ebuild:
+  Remove old.
 
   02 Jan 2014; Tom Wijsman <TomWij@gentoo.org> ps2eps-1.64.ebuild,
   ps2eps-1.68.ebuild:
diff --git a/app-text/ps2eps/Manifest b/app-text/ps2eps/Manifest
index 28870bdcd452..23bc635ae0f9 100644
--- a/app-text/ps2eps/Manifest
+++ b/app-text/ps2eps/Manifest
@@ -1,20 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST ps2eps-1.64.tar.gz 108773 SHA256 1aee1cfd15ad8bac399f4c9579620cddefe10f2cb508d8bc0a204483e7db6ae0 SHA512 b41c70d9a2d1ff2abb2782afd5e78726715278a65cf4ae787070773b87552d5df4e2566dc2983291fc2985a9d888677deb3478bb9f8cfc23836b244b778b490f WHIRLPOOL c641a4ec46787242586b9e97e1477356eac76cd038701475518f6c351014d0adbba9461c7633af638117436280558c49864622c74c25484112762cebac5d8ab6
 DIST ps2eps-1.68.tar.gz 97304 SHA256 b08f12eed88965d1891261fb70e87c7e3a3f3172ebc31bdb7994a7ce854dd925 SHA512 7fc84da5da00d5b1169d6e337b1db232adf80d9d957e48bfdd9272946151adca3e44f712587387ef557488cd15f44210b3fbd8c545488ec0071641d9d25a9c2b WHIRLPOOL 231f22ccfff1341ca9ac713254786028b422df9e805754b4631e6d73146413ccfc7ac9306433c45c63c3ad7499065f444580da8125a15a6120dae1c9cdc536ac
-EBUILD ps2eps-1.64.ebuild 1126 SHA256 6324e5ab2ae27d174914d6a2ef43eef2e7669de517bc1ad924e2d7995e7d2d17 SHA512 c53504e3e30e202b1ab77457e995f74eb59f7fb10ebfab2b8b36fdb7a33dd1be039baf276a59e1a6759121c1cd079b406c3db6a42d21f71104615170909eb2bd WHIRLPOOL 3688e844397cd6312938c881ca3fbb4f4d6c8a479ffbf4cc125ab371ea154b7587d1f82328d115078684e924e82251412f20d1b0bf508ec508282f4144649933
 EBUILD ps2eps-1.68.ebuild 1144 SHA256 46c01938691993fcee45a400dfd79d0ff6f6520794a9075c3b4dc567693774e3 SHA512 2326be18db52a517bd3df94b063bb4ace62230e6a3a5d1fe0dd31ca26eb497d257d33a25a09853eb4e100d23a47f04eeb7d1940ef3f995c8cd6dc70270107001 WHIRLPOOL 061551aceff611850d41b0d6debf8c57bf124c33f8bbdbb303654a5a0ac2f50c8751be4079417567c06275c9b7bb593a3f6b1e815353ec6b208ed97886082222
-MISC ChangeLog 3959 SHA256 5a6acdd48c98939b3ef20bdf4ecaddff60fbadc99f4151e2dde0b74664c42d3e SHA512 6a9c1076ad4919aadafac1e3136d304e481cd821903aa76c2be50cf72ba9cc884e76b104264bb3145bf7a545cb6e4f7d6a6c49f645d186154c958b32b5d261a9 WHIRLPOOL 0888af322ab76b75076afa2c388d2083699fe8ee1fc664cbd7320e369ee270fb5d7fc3f6a903e1391166f34d6693dcea0a990be18ccfa5700dd5cf3f3b00e88d
+MISC ChangeLog 4042 SHA256 218eece233734deb82ac56a7f917142597cb737696bcc64a5bb1f6c4faec7fa3 SHA512 814a77558ad5230515a03de2c04e27d2c93fb943d157d625f4aa17e35f7a9e04704c3381caed19a845dcf917a78effb4934b7775264b0b78780c1e1c80d25bd1 WHIRLPOOL e30ab616ab924407e1336c451e0ee4a4ba43f127a4ecbca45efd913a907b175ef297d9d8674c0e0c86d8943bc5665e7ac98c46cc594528edc1f149906c083432
 MISC metadata.xml 417 SHA256 07d8e2aade68fd7bd618d9ebe1f184e2dc31388d4be8671f7f9c4ac313c2bd08 SHA512 e0a0ee65d7d0890bf44b94a3448ddc98c593639c57d9394c66631a9e6469c049576059e4c3f1d67e0b40e5176dbf7714e8147d2946e7234fa236e005f98de15b WHIRLPOOL eb5b8e3d4264c521da91a52188a7878e1d1721f071fa76c4ca630667e053cdc7ecb7947a6603aebbfbf55bca67629df17e7a34bd31e9c2ab6947bbb8e921cdfe
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQEcBAEBCAAGBQJSxX/zAAoJEJWyH81tNOV9shsIAJjgSIQ4L3vNb20AHp7eem21
-qdDqyO2D70siATVzJvLGUvyFehqnSP3Mh6A0BpkF/Kj68ONLKmpgqZEvc8LBittM
-lHzf+3c9qAdbagYfiLPlowfPQ8E8e256uC9/GexnhqthH27h8tF9uXRWJdvpX4Rd
-HuIhx71+ldJYT3BcrkE6NExCn1ttSmoJGXm2DMWQC6zVRO/XLfWVceeW/7vlYW5O
-d669l/oxXSenaLn2ZZl7h5UQtGmV1Wde0oDMjD2dmaFABYHuLhovGKZ4Sy5rdKm/
-CJQ9R5QbWyQqzE6BBa5Y1I903ryVTl7Er76sk2PbC9SN/1Xt1dy8+Szw9Cin2aM=
-=QbHA
------END PGP SIGNATURE-----
diff --git a/app-text/ps2eps/ps2eps-1.64.ebuild b/app-text/ps2eps/ps2eps-1.64.ebuild
deleted file mode 100644
index 78565990e0c1..000000000000
--- a/app-text/ps2eps/ps2eps-1.64.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ps2eps/ps2eps-1.64.ebuild,v 1.20 2014/01/02 15:04:45 tomwij Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Generate Encapsulated Postscript Format (EPS,EPSF) files from one-page Postscript documents"
-HOMEPAGE="http://www.tm.uka.de/~bless/ps2eps"
-SRC_URI="http://www.tm.uka.de/~bless/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-text/ghostscript-gpl
-	!<app-text/texlive-core-2007-r7"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	cd "${S}/src/C"
-	echo "all: bbox" > Makefile
-	emake || die "making bbox failed"
-}
-
-src_install() {
-	dobin "${S}/src/C/bbox"
-	dobin "${S}/bin/ps2eps"
-	doman "${S}/doc/man/man1/bbox.1"
-	doman "${S}/doc/man/man1/ps2eps.1"
-
-	dodoc Changes.txt README.txt
-	dohtml "${S}/doc/html/"*
-	docinto pdf
-	dodoc "${S}/doc/pdf/"*
-}