gentoo auto-resync : 24:06:2023 - 01:25:35

21 files changed, 2 insertions, 968 deletions

diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index bd2597209996..e737dcd91cb7 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,29 +1,7 @@
 AUX 50a2ps-gentoo.el 218 BLAKE2B 59dc77b7859a5c6536077f6322c1aa5bffbfc3c27ba3b7ead28b703021282fc1f1c3db16d169fcf08088d30de9baf52406074b91bcd58b66ace6ddc312b707c1 SHA512 d1696581767c62903ea24cc7ffec2f25c30b64a0a7aa76d22e8a1872c5ea9b1aaa0f88f7ce24b1ee57f3da57bd3eaa36f2c5fd388437ce9a935bd82912075269
-AUX a2ps-4.13-manpage-chmod.patch 437 BLAKE2B e2db9b75653ff94ef718ad43efb0b693dd7c55fe61d5c0ab5cb169d6b9b03148a5c8f57c7bb8a9fa993467bee1defd9372e3bfe9b91c627c77685a453bc66ac8 SHA512 4156ec0fac50164aa2a4498e486ac3885381b5de0011cf44a1f4da8db5f727c52be87a856b66db3efec1966670c619171bea3fe2b0de330c23095c55942a5588
-AUX a2ps-4.13c-emacs.patch 493 BLAKE2B 3c82dcd2f3d0b8258c28a6d0112e406618b91ea810cc4ba83489e8a6bd02806fd423e18d627828e0445e3243954490e939aceb912aadea2c27a50e7fe2f10f3f SHA512 936bf4e63d7be7e658d2fb9b0487e449cf0abbdd8aeca72fc76574e4685fd24e1847320e89125f6fbd1355c13e0f9dec7008f338e35ff2424f6f04ea0cfab9d1
-AUX a2ps-4.13c-fnmatch-replacement.patch 1491 BLAKE2B 1617b688fb05c3b4dd73868c6861088dba468e904af7e70ce9a8b54f45ab465dc8527038230d0aa7eb045da68b054d9310a9b45887b8fc3a198a3a550cf77573 SHA512 e7dc3fdb1815fa4d097cfd32c35ceeed6416139a0f3bc4c8ac48b6fa9efac643929709303ae5ac992c77cfa120e02a1d21cd6fcd102477183970312f06d2f3b5
-AUX a2ps-4.13c-locale-gentoo.diff 981 BLAKE2B c8551a709fef34b4ccbc92b35c91872a5ba74afad5b92dd9b3a2722976375fe729a23d8b4e2d14972fb5c2e0219cc2c0eb30a0c1199003e583c1b6ad86929514 SHA512 56800ba839e04a89088c130df9676595cbcdfa15fb1853eb85560e9d529e93d6db4b5813375ede8cf82aa8b0fd51f81f5f080e2c5d38dc1a7739a8e62e0ab997
-AUX a2ps-4.14-CVE-2001-1593.patch 1728 BLAKE2B 8b357a50c4aece3749aacc4506e142ef9e6cc9b59d5d03175236fda0bc23970a02517b28ae080cb5b858e6d00c3e706f3908340adeeeed24bc6d6c39394f3c50 SHA512 1c83de1a53ed224ad5793041210023fb706ceb901c43ca0a7f8cb392500922851a8d25887ad5983a45fa9ec0bee2f41870134340c16544f3c1e7ff93c7e48c1f
-AUX a2ps-4.14-CVE-2014-0466.patch 1489 BLAKE2B 323fe56d7185c4a0e018db50eb691db6acadfb031186427120ebf7c33dda6a0b6697ae7f9a48bc10702103b30341d97fdb36cd681e1bd6f1871189d0d328a475 SHA512 b978261dfbe63fe2b2f66123d1fa1dfb33949f7902636fa23b0b8b299d779e5a494483b052f25039db81e9156fc2aeb2d6be4d56ddf0572f7bc0361ade9111fa
-AUX a2ps-4.14-check-mempcpy.patch 578 BLAKE2B 764e89256968ecaafaecade9976a411d8e3c3967dc83e73db07da01ed968cb6618a1938ee676a835cab00b30bf188181dff1e13c4a9abe65330a6cc0bed398d7 SHA512 21cd31fbed161dcd3b8f0a24ade71be6bb282dc57aeab3bf27018de36a715e83c00a8ce7f2860190866ff699662fb224230438b7c4af917db440df410a0e4bea
-AUX a2ps-4.14-cleanup.patch 2633 BLAKE2B b2d0d48fc8041ed98cf28df2615319b6b7dd5ffa31f741901291e36265d467fc38a347ecbc598dc41db249b3ab8eb96ac7ec6e2ca8e2ef7c1e22f93d1d418326 SHA512 07afbf25203c6eacb92ab8c32fa6b913a832163a03fcd47c163cf3bdfd0cf07efd960342005fd7923108b978bc0395919c7f70e048d547b4bc5c083eed86a1f3
-AUX a2ps-4.14-configure.ac.patch 383 BLAKE2B 22dad32b9bf5d0f2e3377251f723c9d4c296fccb684dab43be53b2848a48c8dacc6cfc177ada056f6193d2ac5a4f0082b16755d5bee955dd3670d9152dbaaf3d SHA512 541e6321dc18cf559d164b85d420c01af616dfb5c908b1f2a0e3aab932c105e78f22c7741ed3d38c2fedd36a3d03d875f239a79da7cf14251e9896a1d217d9bb
-AUX a2ps-4.14-fix-stpcpy-proto.patch 417 BLAKE2B 8cb2e6e3c06df4c84c9eb82783a38a17ea093214089cafcd89f5cd4910f6100cd5133f646846e292b5a7329fa0ec6ea8bf6e9e152aff689c2bc2d7006b85a47e SHA512 2989cce0e3dd73de811373ecdf74a3cd521a3032a3a72ee1a6b97bcf2a0e385dc9a37f40c4eccf9e75aab9b5599524af9c3e0dafbf8b6bb33290e0c92710a493
-AUX a2ps-4.14-function-decl.patch 214 BLAKE2B 50443a9e70b4e14f0b46b00b92140b55ff38c4e25e2168bc418479e19391f83c7b99b49d1bc818e3f3c9a150bbae72a226589458bd6546952bc4066508a1639b SHA512 6283890124251acb7fe22ac46038f487f9cb6da74ae6243358b399da0a18d37ee573e8526d0758f61828b88eaf3bb255500b1ba14c4c8627004841cc008b6c59
-AUX a2ps-4.14-ja-cleanup.patch 3210 BLAKE2B 599c8bca7f599c3ffda2d1a071d9ca5c4d47141d1563302fcc4b6476c5718ea9b57902b045e70a1bd2c92d9b36cb7fc32ed01ebed1f92395ff4cbd65a76288b8 SHA512 1a2ce34b5b0bc79bf269fe171c64bcdef0a87bf4efa8508eee851228a1483efce9c8945a17def7abc4cdfe2f1f8611d63995d98099e290d06fb1be430350b778
-AUX a2ps-4.14-psset.patch 578 BLAKE2B 9762f2998fd4b006e6ef8fea042b96f88c556a5f8b7a487eccaa10e8be027a8c7aa93effa51ce16a976ce19ea613598757cd1b568991d58f164c39d2acfbc45f SHA512 315585a6dab71a2eaa3d9a8dc3ab1297f5866cb15759ee467935ecb53598eb66196038dc9873f98cc7cc2c9ced81f630283478ab9cd394c532f5b3ea0c10b1ad
-AUX a2ps-4.14-ptrdiff_t.patch 381 BLAKE2B c8e5afe37bf64f33b5da9e2e98186205c0c7fb90c6805910dc2aef3e9070333ade9ed60dde2a15220ce33729bc40d0089283f1f25a8932c3895af8770f944f6c SHA512 dfb46726bb3b88e5736f5d1628914ccfd40e245ba9fba0916f73ffba30c6f9f059ec797a9421cfae7093c4bd462a6130334391ec0d344146e723f9cfefd62309
-AUX a2ps-4.14-stdout.patch 536 BLAKE2B 0bb6f68778ac31cab6df9064be73ab447ee36deececcc624ab2c54e27fcb86d6d0092dc6f536c9817deb036b0c0da8797fff6b55f779ed0a35b371f5eb5c88a3 SHA512 c65436c58fa18777b92d2c81a0e5681c2dca29961b01cc113adae5b09c3108369526ff65214c7e350c3c576933476d970abb59f92b4417d46e11412bf56ffc5c
-AUX a2ps-4.14-texinfo-5.x.patch 6069 BLAKE2B b85e03014f38599810bc1e883eed2c7f4b09b6e02584709d17ce5686247bf83a2b86e21966a70a7deb912312d8b78b845cb7a375d4979063d77816733b0431a0 SHA512 73782dee455c56ee70a080fb64d6124558b2667fd6a8e1f0092c9d34fe6c069243107ec1743da140874db9cbfaed90d87cdb7b3fae942acf3f52aecf6e740b05
-AUX a2ps-4.14-texinfo-6.7-encoding.patch 1372 BLAKE2B 3eb51e4c83e60f7073c4957963dfe92931fa63eee1410e615171f1f823e21702032ae7dca9ae397851e0620df40a09c8e09bbb0ff12e2843b3c7aa511adda8ec SHA512 31d77113c5a727cc2aa72bc31a6e961cfc5d5871c40aa1f59f3edbadaa06ba55cb35bf6cf9b142276c83ac0a69fa49df9eb157d732fe44dc392f7dac7e014db4
 AUX a2ps-4.15-stdout.patch 578 BLAKE2B edab46a428d330dad3f9543e3ecc92e058f1f425e39f68350d7e9de287217fee27a237aa7747bab7bcf78c2e61b6526a4a62569b22d84c1fb40fb054165d8418 SHA512 44878e936275a8ee23f0bc34293a3eb0ceeadb13a4234e1bc93b3dee02268dbf45eb68d3b6dd2177f4c15c25f88ffa1b9e009d893a1f263da2c24b543331bfd3
-DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
-DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
-DIST a2ps-4.15.2.tar.gz 3600923 BLAKE2B 37d6dd76578301a629a4171e194cc34836b393ef293193191b2a4e3c5635c154b0d380f921e3862cad64e468108105a669c89e76ec8baa915587f8fff8af8aa9 SHA512 637bda87c7e8d59d923428398d0d67066c700e7e37d91cf3408bfe38f3367afdc651a8248984512fbe71e0d1cb07cb4a348816650748e1fbde52625e8e055a70
-DIST a2ps-4.15.3.tar.gz 3601424 BLAKE2B 6a3a94d8ee2ff6ffabd3b4784b6b69fe1ba91d66b947de57145d952312deeab0d883714b19a5aab69c9cca6818b4c00e6efc69edf0bc3ee0a7ee56ac4c65491b SHA512 41f0590c5f794af767b57bfe2eeea105b73232ea9a9fcf87380d93cb4ccaaf652c69990bcb06d1da5f398f4c7d0ab6d23d9c3f5b6a85c37f36e72dc03e7ddc2a
 DIST a2ps-4.15.4.tar.gz 3570970 BLAKE2B 96355c3e656199a6daebc7d311d85f9c124080db8d92e6fdc502bedf06c547e886fed8335f6ce01df04ee23972fb93ccf4c2614294dea63f1bf5eccd95f37a04 SHA512 aac3dfed21919682afa688b7315eeea012c5d496aad163b801021ed81d6056362d149745dcf48a99d139909c2ec796ce56bd4e63adb103d746ad89c691ea7779
-EBUILD a2ps-4.14-r8.ebuild 3086 BLAKE2B ed9f36fc3e2d32cbbe51330dd994aac86c1f0fb57769b56973f0cfc243fb71ff69d72ab5c7133ebef9e150532288ba081dd24f368013a5db64608515806baeb5 SHA512 3fc03b3bc163cff89cf38a1ba8d04e5ce8228911ec991abb86a75ebbc8c357ae427b51d128e96ab0d53c62d4c56c7d7d025b03ab7278ff7b9c37e00ff2e4b21a
-EBUILD a2ps-4.15.2.ebuild 1868 BLAKE2B e7c07e0c818de8be95a2cb12056958af806b8c9dfe0f257835d8664a3db796718c4927b2b77e32d9399c112b084214b77ebedbcb1373d0e46cc6eafe7d9c33d8 SHA512 b6507d90f2aaadb87b06f3ba556c95e32871b94795ee8b53a4fbcb4bab5619dbfc331c3b6a58f38400767c3ec77ba011175f2983201fb04a934b4c2527759bad
-EBUILD a2ps-4.15.3.ebuild 1868 BLAKE2B e7c07e0c818de8be95a2cb12056958af806b8c9dfe0f257835d8664a3db796718c4927b2b77e32d9399c112b084214b77ebedbcb1373d0e46cc6eafe7d9c33d8 SHA512 b6507d90f2aaadb87b06f3ba556c95e32871b94795ee8b53a4fbcb4bab5619dbfc331c3b6a58f38400767c3ec77ba011175f2983201fb04a934b4c2527759bad
+DIST a2ps-4.15.5.tar.gz 3571724 BLAKE2B 7c352b72c537f8519cafb7993595d902e1dfeae49207936c365b0ea3813ffff973c5f5e2bb63a4cffa3c665990d95c8a8e339c87d9eac25fa24e364b8b705bae SHA512 e9953659139a46aed46e190d5485382a9e396ae8bbbe59edb78ab3110e7839a764e3cb6ff94f5f36e6e91fcaf85f6352376e0b4a0e0141f24e098fa334b5015e
 EBUILD a2ps-4.15.4.ebuild 1862 BLAKE2B 7a0dfd2da66b22373deebdad01615501933dfedbc48a6ffab030b3766c79e8f057f8ddb4d974614b6ded23a0789eca6b32417f5c9a9fe800763d84e47bc6c7a3 SHA512 4e339abd8da23aca277b5ceb2d766fd2a389f60ffbe4fad3f5c48399841b062a520362fea281ca9736b52d1837b14a574ad940bd4e21f6a2237dc37c4ee39b44
+EBUILD a2ps-4.15.5.ebuild 1868 BLAKE2B e7c07e0c818de8be95a2cb12056958af806b8c9dfe0f257835d8664a3db796718c4927b2b77e32d9399c112b084214b77ebedbcb1373d0e46cc6eafe7d9c33d8 SHA512 b6507d90f2aaadb87b06f3ba556c95e32871b94795ee8b53a4fbcb4bab5619dbfc331c3b6a58f38400767c3ec77ba011175f2983201fb04a934b4c2527759bad
 MISC metadata.xml 442 BLAKE2B 89796eb65cfc9ab8929511f94655a9c7f6a39837f5c1cfb0f8885a29d3900512e6c3ee6b44f3ee8e23eca54112f72c7462d4fb223109fdea3d203d5ff4492252 SHA512 078d824c815b9cc0c5a0acfea6f8c5203eb3f1e94778987137181f987cbeaab0040389b0e34cda160d6a3c6f00508c39a6c30404b89dfe64782db1980c9340b7
diff --git a/app-text/a2ps/a2ps-4.14-r8.ebuild b/app-text/a2ps/a2ps-4.14-r8.ebuild
deleted file mode 100644
index 58a895dd30a3..000000000000
--- a/app-text/a2ps/a2ps-4.14-r8.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common flag-o-matic
-
-DESCRIPTION="Any to PostScript filter"
-HOMEPAGE="https://www.gnu.org/software/a2ps/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	cjk? ( mirror://gentoo/${P}-ja_nls.patch.gz )"
-S="${WORKDIR}/${PN}-${PV:0:4}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cjk emacs latex nls static-libs vanilla"
-
-RESTRICT="test"
-
-RDEPEND="app-text/ghostscript-gpl
-	app-text/libpaper:=
-	>=app-text/psutils-1.17
-	app-text/wdiff
-	>=sys-apps/coreutils-6.10-r1
-	emacs? ( >=app-editors/emacs-23.1:* )
-	latex? ( virtual/latex-base )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/gperf-2.7.2
-	app-alternatives/yacc
-	nls? ( sys-devel/gettext )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff
-	"${FILESDIR}"/${PN}-4.13c-fnmatch-replacement.patch
-	"${FILESDIR}"/${P}-psset.patch
-	"${FILESDIR}"/${PN}-4.13c-emacs.patch
-	"${FILESDIR}"/${PN}-4.13-manpage-chmod.patch
-	"${FILESDIR}"/${P}-check-mempcpy.patch
-	"${FILESDIR}"/${P}-fix-stpcpy-proto.patch
-	"${FILESDIR}"/${P}-ptrdiff_t.patch
-	"${FILESDIR}"/${P}-texinfo-5.x.patch
-	"${FILESDIR}"/${P}-CVE-2014-0466.patch
-	"${FILESDIR}"/${P}-CVE-2001-1593.patch
-	"${FILESDIR}"/${P}-texinfo-6.7-encoding.patch
-	"${FILESDIR}"/${P}-function-decl.patch
-	"${FILESDIR}"/${P}-configure.ac.patch
-)
-
-src_prepare() {
-	default
-
-	use vanilla || eapply "${FILESDIR}"/${P}-stdout.patch
-	if use cjk; then
-		eapply "${WORKDIR}"/${P}-ja_nls.patch
-		# bug #335803
-		eapply -p0 "${FILESDIR}"/${P}-ja-cleanup.patch
-	else
-		eapply "${FILESDIR}"/${P}-cleanup.patch
-	fi
-
-	# fix building with sys-devel/automake >= 1.12, bug 420503
-	rm -f {.,ogonkify}/aclocal.m4 || die
-	sed -i \
-		-e '/^AM_C_PROTOTYPES/d' \
-		-e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
-		configure.in {contrib/sample,lib,src}/Makefile.am m4/protos.m4 || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DPROTOTYPES #420503
-
-	export LANG=C LC_ALL=C
-
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		--sysconfdir="${EPREFIX}"/etc/a2ps \
-		$(use_enable nls) \
-		COM_netscape=no \
-		COM_acroread=no \
-		$(usev !latex COM_latex=no) \
-		$(usev !emacs EMACS=no)
-}
-
-src_compile() {
-	# parallel make b0rked
-	emake -j1
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		lispdir="${EPREFIX}${SITELISP}"/${PN} \
-		install
-
-	newdoc "${ED}"/usr/share/a2ps/README README.a2ps
-	newdoc "${ED}"/usr/share/a2ps/ppd/README README.a2ps.ppd
-	newdoc "${ED}"/usr/share/ogonkify/README README.ogonkify
-
-	rm -f "${ED}"/usr/share/{a2ps,a2ps/ppd,ogonkify}/README || die
-
-	find "${ED}" -name '*.la' -delete || die
-
-	use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-
-	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.15.3.ebuild b/app-text/a2ps/a2ps-4.15.3.ebuild
deleted file mode 100644
index db63721729f2..000000000000
--- a/app-text/a2ps/a2ps-4.15.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common
-
-DESCRIPTION="Any to PostScript filter"
-HOMEPAGE="https://www.gnu.org/software/a2ps/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cjk emacs latex nls static-libs vanilla"
-
-# a2ps-lpr-wrapper needs bash
-RDEPEND="
-	app-text/ghostscript-gpl
-	app-text/libpaper:=
-	>=app-text/psutils-1.17
-	app-text/wdiff
-	app-shells/bash:*
-	dev-libs/boehm-gc
-	>=sys-apps/coreutils-6.10-r1
-	emacs? ( >=app-editors/emacs-23.1:* )
-	latex? ( virtual/latex-base )
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-alternatives/yacc
-	>=dev-util/gperf-2.7.2
-	nls? ( sys-devel/gettext )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	default
-
-	use vanilla || eapply "${FILESDIR}"/${PN}-4.15-stdout.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	export LANG=C LC_ALL=C
-
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		--sysconfdir="${EPREFIX}"/etc/a2ps \
-		$(use_enable nls) \
-		COM_netscape=no \
-		COM_acroread=no \
-		$(usev !latex COM_latex=no) \
-		$(usev !emacs EMACS=no)
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		lispdir="${EPREFIX}${SITELISP}"/${PN} \
-		install
-
-	newdoc "${ED}"/usr/share/a2ps/README README.a2ps
-	newdoc "${ED}"/usr/share/a2ps/ppd/README README.a2ps.ppd
-	newdoc "${ED}"/usr/share/ogonkify/README README.ogonkify
-
-	rm -f "${ED}"/usr/share/{a2ps,a2ps/ppd,ogonkify}/README || die
-
-	find "${ED}" -name '*.la' -delete || die
-
-	use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-
-	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.15.2.ebuild b/app-text/a2ps/a2ps-4.15.5.ebuild
index db63721729f2..db63721729f2 100644
--- a/app-text/a2ps/a2ps-4.15.2.ebuild
+++ b/app-text/a2ps/a2ps-4.15.5.ebuild
diff --git a/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch b/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch
deleted file mode 100644
index 8e8454a3ea48..000000000000
--- a/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-fix chmod error
-https://bugs.gentoo.org/167670
-
---- a2ps-4.13.orig/man/Makefile.maint	2002-03-04 20:46:26.000000000 +0200
-+++ a2ps-4.13/man/Makefile.maint	2007-02-19 21:50:29.000000000 +0200
-@@ -20,7 +20,7 @@
- 	    --include=$(basename $@).x \
- 	    --include=common.x \
- 	    $(executable) > $@-t || exit 1; \
--	  chmod -w $@-t || exit 1; \
-+	  chmod a-w $@-t || exit 1; \
- 	  rm -f $@ || exit 1; \
- 	  mv $@-t $@ || exit 1; \
- 	else \
diff --git a/app-text/a2ps/files/a2ps-4.13c-emacs.patch b/app-text/a2ps/files/a2ps-4.13c-emacs.patch
deleted file mode 100644
index 97099a7393d9..000000000000
--- a/app-text/a2ps/files/a2ps-4.13c-emacs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-fix emacs printing
-https://bugs.gentoo.org/114627
-
---- a2ps-4.13/contrib/emacs/a2ps-print.el.orig	2005-12-05 08:03:48.000000000 +0100
-+++ a2ps-4.13/contrib/emacs/a2ps-print.el	2005-12-06 16:38:14.000000000 +0100
-@@ -93,6 +93,7 @@
- 			  (concat "--center-title=" name)
- 			  (concat "--footer=" (concat name " Emacs buffer"))
- 			  (concat "--pretty-print=" filetype)
-+			  (concat "-d")
- ;Uncommenting the following gives a print preview (only):
- ;			  (concat "--output=/tmp/foo.ps")
- 			  )
diff --git a/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch b/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch
deleted file mode 100644
index 92098541b694..000000000000
--- a/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-fix fnmatch replacement
-https://bugs.gentoo.org/134546
-
---- a2ps-4.13.orig/lib/fnmatch.c	2002-03-04 12:46:25 -0600
-+++ a2ps-4.13/lib/fnmatch.c	2006-05-27 11:41:15 -0500
-@@ -27,18 +27,6 @@
- #include <fnmatch.h>
- #include <ctype.h>
- 
--
--/* Comment out all this code if we are using the GNU C Library, and are not
--   actually compiling the library itself.  This code is part of the GNU C
--   Library, but also included in many other GNU distributions.  Compiling
--   and linking in this code is a waste when using the GNU C library
--   (especially if it is a shared library).  Rather than having every GNU
--   program understand `configure --with-gnu-libc' and omit the object files,
--   it is simpler to just do this in the source for each such file.  */
--
--#if defined _LIBC || !defined __GNU_LIBRARY__
--
--
- # if defined STDC_HEADERS || !defined isascii
- #  define ISASCII(c) 1
- # else
-@@ -52,10 +40,13 @@
- extern int errno;
- # endif
- 
-+/* fnmatch replacement taken from the GNU C Library for systems that 
-+   provide a broken implementation. */
-+
- /* Match STRING against the filename pattern PATTERN, returning zero if
-    it matches, nonzero if not.  */
- int
--fnmatch (const char *pattern, const char *string, int flags)
-+rpl_fnmatch (const char *pattern, const char *string, int flags)
- {
-   register const char *p = pattern, *n = string;
-   register char c;
-@@ -233,5 +224,3 @@ fnmatch (const char *pattern, const char
- 
- # undef FOLD
- }
--
--#endif	/* _LIBC or not __GNU_LIBRARY__.  */
diff --git a/app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff b/app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff
deleted file mode 100644
index 0b59956ebc05..000000000000
--- a/app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urN a2ps-4.13.ORIG/config.h.in a2ps-4.13/config.h.in
---- a2ps-4.13.ORIG/config.h.in	2003-09-27 19:33:38.000000000 +0900
-+++ a2ps-4.13/config.h.in	2003-09-27 21:25:46.000000000 +0900
-@@ -181,6 +181,9 @@
- /* Define to 1 if you have the `rename' function. */
- #undef HAVE_RENAME
- 
-+/* Define to 1 if you have the <locale.h> header file. */
-+#undef HAVE_LOCALE_H
-+
- /* Define to 1 if you have the `setlocale' function. */
- #undef HAVE_SETLOCALE
- 
-diff -urN a2ps-4.13.ORIG/configure.in a2ps-4.13/configure.in
---- a2ps-4.13.ORIG/configure.in	2003-09-27 19:33:38.000000000 +0900
-+++ a2ps-4.13/configure.in	2003-09-27 21:26:05.000000000 +0900
-@@ -71,7 +71,7 @@
- AC_HEADER_DIRENT
- AC_CHECK_HEADERS(sys/time.h sys/stat.h sys/types.h sys/ioctl.h  \
-  math.h string.h strings.h stdlib.h unistd.h stdarg.h pwd.h malloc.h \
-- memory.h errno.h fcntl.h stdbool.h fnmatch.h)
-+ memory.h errno.h fcntl.h stdbool.h fnmatch.h locale.h)
- 
- ## --------------------- ##
- ## Checks for typedefs.  ##
diff --git a/app-text/a2ps/files/a2ps-4.14-CVE-2001-1593.patch b/app-text/a2ps/files/a2ps-4.14-CVE-2001-1593.patch
deleted file mode 100644
index 06153f4858c4..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-CVE-2001-1593.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-CVE-2001-1593: Fix insecure use of /tmp
-
-
-Author(s):
-
- * Fri Jan 05 2001 Preston Brown <pbrown@redhat.com>
-
-followed the next month by a fix to that patch:
-
- * Mon Feb 12 2001 Tim Waugh <twaugh@redhat.com>
-
-(see https://bugzilla.redhat.com/show_bug.cgi?id=1060630#c5)
-
-Origin:
-
-http://pkgs.fedoraproject.org/cgit/a2ps.git/plain/a2ps-4.13-security.patch
-
---- a/lib/routines.c
-+++ b/lib/routines.c
-@@ -242,3 +242,50 @@
-   /* Don't complain if you can't unlink.  Who cares of a tmp file? */
-   unlink (filename);
- }
-+
-+/*
-+ * Securely generate a temp file, and make sure it gets
-+ * deleted upon exit.
-+ */
-+static char **	tempfiles;
-+static unsigned	ntempfiles;
-+
-+static void
-+cleanup_tempfiles()
-+{
-+	while (ntempfiles--)
-+		unlink(tempfiles[ntempfiles]);
-+}
-+
-+char *
-+safe_tempnam(const char *pfx)
-+{
-+	char	*dirname, *filename;
-+	int	fd;
-+
-+	if (!(dirname = getenv("TMPDIR")))
-+		dirname = "/tmp";
-+
-+	tempfiles = (char **) realloc(tempfiles,
-+			(ntempfiles+1) * sizeof(char *));
-+	if (tempfiles == NULL)
-+		return NULL;
-+
-+	filename = malloc(strlen(dirname) + strlen(pfx) + sizeof("/XXXXXX"));
-+	if (!filename)
-+		return NULL;
-+
-+	sprintf(filename, "%s/%sXXXXXX", dirname, pfx);
-+
-+	if ((fd = mkstemp(filename)) < 0) {
-+		free(filename);
-+		return NULL;
-+	}
-+	close(fd);
-+
-+	if (ntempfiles == 0)
-+		atexit(cleanup_tempfiles);
-+	tempfiles[ntempfiles++] = filename;
-+
-+	return filename;
-+}
---- a/lib/routines.h
-+++ b/lib/routines.h
-@@ -255,7 +255,8 @@
- /* If _STR_ is not defined, give it a tempname in _TMPDIR_ */
- #define tempname_ensure(Str)				\
- do {							\
--  (Str) = (Str) ? (Str) : tempnam (NULL, "a2_");	\
-+  (Str) = (Str) ? (Str) : safe_tempnam("a2_");	\
- } while (0)
-+char * safe_tempnam(const char *);
- 
- #endif
diff --git a/app-text/a2ps/files/a2ps-4.14-CVE-2014-0466.patch b/app-text/a2ps/files/a2ps-4.14-CVE-2014-0466.patch
deleted file mode 100644
index 56f0b2f527a2..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-CVE-2014-0466.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-CVE-2014-0466: fixps does not invoke gs with -dSAFER
-
-A malicious PostScript file could delete files with the privileges of
-the invoking user.
-
-Author: Salvatore Bonaccorso <carnil@debian.org>
-Origin: https://bugs.debian.org/742902
-
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' a2ps~/contrib/fixps.in a2ps/contrib/fixps.in
---- a2ps~/contrib/fixps.in	2014-03-30 12:24:50.000000000 +0200
-+++ a2ps/contrib/fixps.in	2014-03-30 12:40:36.763249218 +0200
-@@ -389,7 +389,7 @@
-   	eval "$command" ;;
-       gs)
-         $verbose "$program: making a full rewrite of the file ($gs)." >&2
--  	$gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
-+  	$gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
-     esac
-   )
- fi
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' a2ps~/contrib/fixps.m4 a2ps/contrib/fixps.m4
---- a2ps~/contrib/fixps.m4	2014-03-30 12:24:50.000000000 +0200
-+++ a2ps/contrib/fixps.m4	2014-03-30 12:40:36.767249254 +0200
-@@ -307,7 +307,7 @@
-   	eval "$command" ;;
-       gs)
-         $verbose "$program: making a full rewrite of the file ($gs)." >&2
--  	$gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
-+  	$gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
-     esac
-   )
- fi
diff --git a/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch b/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch
deleted file mode 100644
index 62a8ab21961f..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-add configure check for mempcpy
-https://bugs.gentoo.org/216588
-
---- a2ps-4.14-orig/configure.in	2008-04-16 08:36:03.000000000 +0200
-+++ a2ps-4.14/configure.in	2008-04-16 08:36:29.000000000 +0200
-@@ -137,7 +137,8 @@
- ad_REPLACE_FUNC_STRCASECMP
- ad_REPLACE_FUNC_STRNCASECMP
- ad_REPLACE_FUNC_RENAME
--AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero tempnam strsignal psignal setlocale)
-+AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero \
-+  tempnam strsignal psignal setlocale mempcpy)
- ad_FUNC_SYSTEMPAPERNAME
- ad_FUNC_ATEXIT
- ad_FUNC_STRFTIME
diff --git a/app-text/a2ps/files/a2ps-4.14-cleanup.patch b/app-text/a2ps/files/a2ps-4.14-cleanup.patch
deleted file mode 100644
index 25187f315384..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-cleanup.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-fix missing prototype and printf warnings
-
---- a/lib/argmatch.c
-+++ b/lib/argmatch.c
-@@ -21,6 +21,7 @@
- #include "argmatch.h"
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #ifdef STDC_HEADERS
- # include <string.h>
- #endif
---- a/lib/encoding.c
-+++ b/lib/encoding.c
-@@ -790,7 +790,7 @@ dump_encoding_setup (FILE * stream,
-   /* Create the dictionary and fill it */
-   fprintf (stream, "%% Dictionary for %s support\n",
- 	  encoding->name);
--  fprintf (stream, "/%sdict %d dict begin\n", encoding->key, nb);
-+  fprintf (stream, "/%sdict %zu dict begin\n", encoding->key, nb);
-   for (i = 0 ; i < nb ; i++)
-     fprintf (stream, "  /f%s %sEncoding /%s reencode_font\n",
- 	     font_names [i],
---- a/lib/output.c
-+++ b/lib/output.c
-@@ -84,7 +84,7 @@ new_derivation (enum derivation_type type)
- static void
- derivation_self_print (struct derivation * derivation, FILE * stream)
- {
--  fprintf (stream, "At %x: ", (int) derivation);
-+  fprintf (stream, "At %p: ", derivation);
-   switch (derivation->type)
-     {
-     case nothing:
-@@ -525,7 +525,7 @@ output_file (struct output * out, a2ps_job * job,
- 		     expand_user_string (job, FIRST_FILE (job),
- 					 (const uchar *) "Expand: requirement",
- 					 (const uchar *) token));
--	output (dest, expansion);
-+	output (dest, "%s", expansion);
- 	continue;
-       }
- 
---- a/lib/parseppd.y
-+++ b/lib/parseppd.y
-@@ -154,7 +154,7 @@ font_clause :
- void
- yyerror (const char *msg)
- {
--  error_at_line (1, 0, ppdfilename, ppdlineno, msg);
-+  error_at_line (1, 0, ppdfilename, ppdlineno, "%s", msg);
- }
- 
- /*
---- a/lib/psgen.c
-+++ b/lib/psgen.c
-@@ -232,7 +232,7 @@ output_marker (a2ps_job * job, const char * kind, uchar * marker)
-     default:
-       *buf = '\0';
-       ps_escape_char (job, cp[i], buf);
--      output (jdiv, (char *) buf);
-+      output (jdiv, "%s", buf);
-       break;
-     }
-   }
---- a/lib/quotearg.c
-+++ b/lib/quotearg.c
-@@ -60,6 +60,7 @@
- 
- #if HAVE_MBRTOWC && HAVE_WCHAR_H
- # include <wchar.h>
-+# include <wctype.h>
- #else
- # define iswprint(wc) 1
- # define mbrtowc(pwc, s, n, ps) 1
---- a/lib/title.c
-+++ b/lib/title.c
-@@ -28,6 +28,7 @@
- #endif
- 
- #include <stdio.h>
-+#include <string.h>
- 
- #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
- # if __STDC__
---- a/src/long-options.c
-+++ b/src/long-options.c
-@@ -22,6 +22,7 @@
- #endif
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <getopt.h>
- #include "closeout.h"
- #include "long-options.h"
---- a/src/parsessh.y
-+++ b/src/parsessh.y
-@@ -740,7 +740,7 @@ exception_def_opt:
- void
- yyerror (const char *msg)
- {
--  error_at_line (1, 0, sshfilename, sshlineno, msg);
-+  error_at_line (1, 0, sshfilename, sshlineno, "%s", msg);
- }
- 
- /*
diff --git a/app-text/a2ps/files/a2ps-4.14-configure.ac.patch b/app-text/a2ps/files/a2ps-4.14-configure.ac.patch
deleted file mode 100644
index 58cbe4bca478..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-configure.ac.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a2ps-4.14/man/Makefile.maint
-+++ a2ps-4.14/man/Makefile.maint
-@@ -4,7 +4,7 @@
- HELP2MAN-run = $(PERL) -w -- $(srcdir)/$(HELP2MAN)
- 
- # Depend on configure.in to get version number changes.
--$(man_MANS): $(top_srcdir)/configure.in common.x
-+$(man_MANS): $(top_srcdir)/configure.ac common.x
- 
- # Depend on the source file containing the --help text.
- # Filter out irregular cases.
diff --git a/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch b/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch
deleted file mode 100644
index ed72bbad0715..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-fix compilation error due to invalid stpcpy() prototype
-https://bugs.gentoo.org/216588
-
---- a2ps-4.14/lib/xstrrpl.c
-+++ a2ps-4.14/lib/xstrrpl.c
-@@ -22,8 +22,6 @@
- #include <assert.h>
- #include "xstrrpl.h"
- 
--extern char * stpcpy();
--
- /* Perform subsitutions in string.  Result is malloc'd
-    E.g., result = xstrrrpl ("1234", subst) gives result = "112333"
-    where subst = { {"1", "11"}, {"3", "333"}, { "4", ""}}
diff --git a/app-text/a2ps/files/a2ps-4.14-function-decl.patch b/app-text/a2ps/files/a2ps-4.14-function-decl.patch
deleted file mode 100644
index 1b330723e95b..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-function-decl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/870763
-
---- a2ps-4.14/lib/path-concat.c
-+++ a2ps-4.14/lib/path-concat.c
-@@ -26,6 +26,7 @@
- #endif
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #if HAVE_STRING_H
- # include <string.h>
- #endif
diff --git a/app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch b/app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch
deleted file mode 100644
index 16271b3ec674..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff --git lib/argmatch.c lib/argmatch.c
-index f983e9d..eadc7ea 100644
---- lib/argmatch.c
-+++ lib/argmatch.c
-@@ -21,6 +21,7 @@
- #include "argmatch.h"
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #ifdef STDC_HEADERS
- # include <string.h>
- #endif
-diff --git lib/encoding.c lib/encoding.c
-index 9bd9f2a..f554a6d 100644
---- lib/encoding.c
-+++ lib/encoding.c
-@@ -989,7 +989,7 @@ dump_encoding_setup (FILE * stream,
-   /* Create the dictionary and fill it */
-   fprintf (stream, "%% Dictionary for %s support\n",
- 	  encoding->name);
--  fprintf (stream, "/%sdict %d dict begin\n", encoding->key,
-+  fprintf (stream, "/%sdict %zu dict begin\n", encoding->key,
- 	   (encoding->composite_flag == true)? nb+nb+ns:nb+ns);
-   for (i = 0 ; i < nb ; i++)
-     fprintf (stream, "  /f%s %sEncoding /%s reencode_font\n",
-diff --git lib/output.c lib/output.c
-index b5fc37d..5f67676 100644
---- lib/output.c
-+++ lib/output.c
-@@ -84,7 +84,7 @@ new_derivation (enum derivation_type type)
- static void
- derivation_self_print (struct derivation * derivation, FILE * stream)
- {
--  fprintf (stream, "At %x: ", (int) derivation);
-+  fprintf (stream, "At %p: ", derivation);
-   switch (derivation->type)
-     {
-     case nothing:
-@@ -525,7 +525,7 @@ output_file (struct output * out, a2ps_job * job,
- 		     expand_user_string (job, FIRST_FILE (job),
- 					 (const uchar *) "Expand: requirement",
- 					 (const uchar *) token));
--	output (dest, expansion);
-+	output (dest, "%s", expansion);
- 	continue;
-       }
- 
-diff --git lib/parseppd.y lib/parseppd.y
-index a7558ba..c89d188 100644
---- lib/parseppd.y
-+++ lib/parseppd.y
-@@ -154,7 +154,7 @@ font_clause :
- void
- yyerror (const char *msg)
- {
--  error_at_line (1, 0, ppdfilename, ppdlineno, msg);
-+  error_at_line (1, 0, ppdfilename, ppdlineno, "%s", msg);
- }
- 
- /*
-diff --git lib/psgen.c lib/psgen.c
-index 9eeef74..9d7a27d 100644
---- lib/psgen.c
-+++ lib/psgen.c
-@@ -232,7 +232,7 @@ output_marker (a2ps_job * job, const char * kind, uchar * marker)
-     default:
-       *buf = '\0';
-       ps_escape_char (job, cp[i], buf);
--      output (jdiv, (char *) buf);
-+      output (jdiv, "%s", buf);
-       break;
-     }
-   }
-diff --git lib/quotearg.c lib/quotearg.c
-index 16d0b91..89db991 100644
---- lib/quotearg.c
-+++ lib/quotearg.c
-@@ -60,6 +60,7 @@
- 
- #if HAVE_MBRTOWC && HAVE_WCHAR_H
- # include <wchar.h>
-+# include <wctype.h>
- #else
- # define iswprint(wc) 1
- # define mbrtowc(pwc, s, n, ps) 1
-diff --git lib/title.c lib/title.c
-index cf4a34b..7a3e87b 100644
---- lib/title.c
-+++ lib/title.c
-@@ -28,6 +28,7 @@
- #endif
- 
- #include <stdio.h>
-+#include <string.h>
- 
- #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
- # if __STDC__
-diff --git src/long-options.c src/long-options.c
-index fb40cd9..7bd77b0 100644
---- src/long-options.c
-+++ src/long-options.c
-@@ -22,6 +22,7 @@
- #endif
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <getopt.h>
- #include "closeout.h"
- #include "long-options.h"
-diff --git src/parsessh.y src/parsessh.y
-index 21e9559..569fdb6 100644
---- src/parsessh.y
-+++ src/parsessh.y
-@@ -740,7 +740,7 @@ exception_def_opt:
- void
- yyerror (const char *msg)
- {
--  error_at_line (1, 0, sshfilename, sshlineno, msg);
-+  error_at_line (1, 0, sshfilename, sshlineno, "%s", msg);
- }
- 
- /*
diff --git a/app-text/a2ps/files/a2ps-4.14-psset.patch b/app-text/a2ps/files/a2ps-4.14-psset.patch
deleted file mode 100644
index e0793bc9eb1f..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-psset.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/122026
-
---- a2ps-4.14.orig/contrib/psset.in	2007-12-29 12:29:01.000000000 +0900
-+++ a2ps-4.14/contrib/psset.in	2009-04-12 12:17:43.000000000 +0900
-@@ -219,7 +219,7 @@
- done
- 
- pspagedevice="% Pagedevice definitions:
--countdictstack
-+ countdictstack
- % Push our own mark, since there can be several PS marks pushed depending
- % where the failure really occured.
- /psset_mark
-@@ -227,7 +227,7 @@
- } stopped
- % My cleartomark
- { /psset_mark eq { exit } if } loop
--countdictstack exch sub dup 0 gt
-+ countdictstack exch sub dup 0 gt
- {
-   { end } repeat
- }{
diff --git a/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch b/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch
deleted file mode 100644
index 7ff45cf3bc4a..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-fix compilation error due to obstack.h issue
-https://bugs.gentoo.org/269638
-
---- a2ps-4.14/lib/obstack.h	2007-12-29 09:37:59.000000000 +0800
-+++ a2ps-4.14.test/lib/obstack.h	2009-06-10 18:49:45.000000000 +0900
-@@ -138,9 +138,9 @@
- #define __need_ptrdiff_t
- #endif
- #endif
-+#endif
- 
- #include <stddef.h>
--#endif
- 
- #if defined (__STDC__) && __STDC__
- #define PTR_INT_TYPE ptrdiff_t
diff --git a/app-text/a2ps/files/a2ps-4.14-stdout.patch b/app-text/a2ps/files/a2ps-4.14-stdout.patch
deleted file mode 100644
index 5ca7649ad3e7..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-stdout.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/47691
-https://bugs.gentoo.org/47764
-https://lists.gnu.org/archive/html/bug-a2ps/2001-05/msg00000.html
---- a2ps-4.14/lib/printers.c
-+++ a2ps-4.14/lib/printers.c
-@@ -315,8 +315,8 @@
-   res->ppd = NULL;		/* Printer's ppd are not read yet */
- 
-   /* Output */
--  /* Default is to send to default printer */
--  res->flag_output_is_printer = true;
-+  /* Default is to send to stdout */
-+  res->flag_output_is_printer = false;
-   res->flag_output_name = NULL;
-   res->output_is_file = true;
-   res->output_name = NULL;
diff --git a/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch b/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch
deleted file mode 100644
index baf53cfcc122..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-fix compilation error due to texinfo 5.x
-https://bugs.gentoo.org/482748
-
---- a2ps-4.14/doc/a2ps.texi.bero	2013-03-26 10:31:31.230137555 +0100
-+++ a2ps-4.14/doc/a2ps.texi	2013-03-26 11:01:01.504006086 +0100
-@@ -44,10 +44,6 @@
- @end ifnottex
- 
- @c TeX variants
--@macro LaTeX
--La@TeX{}
--@end macro
--
- @macro PreTeX
- Pre@TeX{}
- @end macro
-@@ -417,9 +413,9 @@ Genesis
- @c Now, that's what I call humor :)
- @cindex First Page
- This document describes GNU @pack{} version @value{VERSION}.  The latest
--versions may be found on the @href{@value{WWWHOME},@pack{} home page}.
--We plan to update the @href{http://www.gnu.org/software/a2ps/, GNU
--@pack{} home page} in the near future, in which case the latter will be
-+versions may be found on the @uref{@value{WWWHOME}, home page}.
-+We plan to update the @uref{@value{WWWHOME}, GNU home page}
-+in the near future, in which case the latter will be
- a better source of information.
- 
- We tried to make this document informative and pleasant.  It tries to be
-@@ -431,8 +427,8 @@ difficult to use.  @xref{Glossary}, for
- information.
- 
- Please, send us emailcards @code{:)}. Whatever the comment is, or if you
--just like @pack{}, write to @email{Miguel.Santana@@st.com, Miguel
--Santana} and @email{akim@@freefriends.org, Akim Demaille}.  But
-+just like @pack{}, write to @email{Miguel.Santana@@st.com, Miguel Santana}
-+and @email{akim@@freefriends.org, Akim Demaille}.  But
- @emph{never} write to either of us for asking questions, or to report
- bugs.  Chances are very high never to receive an answer, as we receive
- too many messages.  @xref{a2ps Mailing Lists}, for information on the
-@@ -517,8 +513,8 @@ everybody so that mistakes get fixed as
- 
- So, if you have a problem (configuration error, compilation error,
- runtime error, documentation error or unclear), first check in the FAQ
--(@pxref{FAQ}), then on the page @href{@value{WWWHOME}/bugs.html,Known
--@pack{} Bugs} if the issue has not been addressed yet.  If it is not the
-+(@pxref{FAQ}), then on the page @uref{@value{WWWHOME}/bugs.html,Known Bugs}
-+if the issue has not been addressed yet.  If it is not the
- case, but it appears that the version of @pack{} you have is old,
- consider upgrading.
- 
-@@ -2802,8 +2798,7 @@ Thou shalt start your PostScript DSC con
- 
- The bad news is that some printers will reject this header.  Then you
- may change this header without any worry since the PostScript produced
--by @pack{} is also 100% PostScript level 1@footnote{That is to say, there
--are no PostScript printers that don't understand these files.}.
-+by @pack{} is also 100% PostScript level 1@footnote{That is to say, there are no PostScript printers that don't understand these files.}.
- 
- @defvr {Configuration Setting} OutputFirstLine: @var{magic-number}
- @cindex @samp{OutputFirstLine:}
-@@ -3971,13 +3966,13 @@ Quote @var{text} so that no special sequ
- @itemx \end@{enumerate@}
- @itemx \begin@{description@}
- @itemx \end@{description@}
--These commands are legal in @LaTeX but have no sense in @PreTeX{}.
-+These commands are legal in @LaTeX{} but have no sense in @PreTeX{}.
- Hence there are simply ignored and not printed (if immediately followed
- by an end-of-line).
- @end table
- 
- @node Differences with LaTeX
--@subsubsection Differences with @LaTeX
-+@subsubsection Differences with @LaTeX{}
- The following symbols, inherited from the style sheet @code{Symbol}, are
- not supported by @LaTeX{}:
- 
-@@ -4124,9 +4119,9 @@ beautiful, with any character you might
- prefix part of the file name, and is alpha-numerical, lower case, and
- less than 8 characters long.
- 
--Anywhere @pack{} needs to recognize a style sheet by a name, @strong{it
--uses the key} (in the @file{sheets.map} file, with the option @samp{-E},
--etc.).
-+Anywhere @pack{} needs to recognize a style sheet by a name,
-+@strong{it uses the key} (in the @file{sheets.map} file, with the
-+option @samp{-E}, etc.).
- 
- As an example, C++ is implemented in a file called @file{cxx.ssh}, in
- which the name is declared to be @samp{C++}.
-@@ -5672,7 +5667,7 @@ supporting a @samp{--help}-like option.
- @subsection Invoking @code{card}
- 
- @example
--card [@var{options}] @var{applications} [-- @var{@pack{}-options}]
-+card [@var{options}] @var{applications} [-- @var{-options}]
- @end example
- 
- @noindent
-@@ -5680,7 +5675,7 @@ card [@var{options}] @var{applications}
- @var{applications}' help message (typically by the options @samp{--help}
- or @samp{-h}), and pretty prints it thanks to @pack{} (or the content of
- the environment variable @samp{A2PS} if it is set).
--@var{@pack{}-options} are passed to @pack{}.
-+@var{-options} are passed to @pack{}.
- 
- Supported options are:
- 
-@@ -5874,12 +5869,12 @@ difference finder,wdiff,GNU wdiff}) to e
- @subsection Invoking @code{pdiff}
- 
- @example
--pdiff [@var{options}] @var{file-1} @var{file-2} [-- @var{@pack{}-options}]
-+pdiff [@var{options}] @var{file-1} @var{file-2} [-- @var{-options}]
- @end example
- 
- @noindent
- make a pretty comparison between @var{file-1} and @var{file-2}.
--@var{@pack{}-options} are passed to @pack{}.
-+@var{-options} are passed to @pack{}.
- 
- Supported options are:
- 
-@@ -6222,7 +6217,7 @@ Error related questions.
- @subsection Why Does it Print Nothing?
- 
- @quotation
--@i{@pack{} works OK, but the printer prints nothing.}
-+@i{works OK, but the printer prints nothing.}
- @end quotation
- 
- There are two ways that printing can fail: silently, or with a
-@@ -6351,7 +6346,7 @@ If it is incorrect, ask for help around
- @subsection Why Does it Say my File is Binary?
- 
- @quotation
--@i{@pack{} complains that my file is binary though it is not.}
-+@i{complains that my file is binary though it is not.}
- @end quotation
- 
- There are several reasons that can cause @pack{} to consider a file is
-@@ -6591,7 +6586,7 @@ format you want for the date: @xref{Esca
- @subsection Why Have the Options Changed?
- 
- @quotation
--@i{The options of this @pack{} are not the same as in the previous versions.}
-+@i{The options of this are not the same as in the previous versions.}
- @end quotation
- 
- True.  But the old scheme (up to version 4.6.1) prevented us from
diff --git a/app-text/a2ps/files/a2ps-4.14-texinfo-6.7-encoding.patch b/app-text/a2ps/files/a2ps-4.14-texinfo-6.7-encoding.patch
deleted file mode 100644
index df2a60f395c5..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-texinfo-6.7-encoding.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.gentoo.org/695918
-
-The patchs fixes build failure against texinfo-6.7+:
-```
-Malformed UTF-8 character: \xcb\xeb (unexpected non-continuation byte 0xeb, immediately after start byte 0xcb;
-need 2 bytes, got 1) in pattern match (m//) at /usr/share/texinfo/Texinfo/ParserNonXS.pm line 3364.
-Malformed UTF-8 character (fatal) at /usr/share/texinfo/Texinfo/ParserNonXS.pm line 3364.
-make[2]: *** [Makefile:472: a2ps.info] Error 25
-```
-
-Fixed-by: Neil Bothwick
---- a/doc/a2ps.texi~	2019-11-24 18:51:07.000000000 +0000
-+++ a/doc/a2ps.texi	2019-11-24 18:56:30.390438433 +0000
-@@ -1,5 +1,6 @@
- \input texinfo @c -*- texinfo -*-
- @c %**start of header
-+@documentencoding ISO-8859-1
- @setfilename a2ps.info
- @settitle General Purpose PostScript Generating Utility
- @c @setchapternewpage odd
-
---- a/doc/regex.texi~	2002-03-04 18:46:24.000000000 +0000
-+++ a/doc/regex.texi	2019-11-24 18:56:42.861052598 +0000
-@@ -1,5 +1,6 @@
- \input texinfo
- @c %**start of header
-+@documentencoding ISO-8859-1
- @setfilename regex.info
- @settitle Regex
- @c %**end of header
-
---- a/ogonkify/doc/ogonkify.texi~	2007-12-29 02:09:38.000000000 +0000
-+++ a/ogonkify/doc/ogonkify.texi	2019-11-24 18:57:03.173424149 +0000
-@@ -1,5 +1,6 @@
- \input texinfo   @c -*-texinfo-*-
- @c %**start of header
-+@documentencoding ISO-8859-1
- @setfilename ogonkify.info
- @settitle Ogonkify
- @setchapternewpage off