gentoo auto-resync : 20:10:2022 - 20:01:06

12 files changed, 61 insertions, 71 deletions

diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 79625809954a..70b19c4bca46 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,23 +1,23 @@
 AUX 50a2ps-gentoo.el 218 BLAKE2B 59dc77b7859a5c6536077f6322c1aa5bffbfc3c27ba3b7ead28b703021282fc1f1c3db16d169fcf08088d30de9baf52406074b91bcd58b66ace6ddc312b707c1 SHA512 d1696581767c62903ea24cc7ffec2f25c30b64a0a7aa76d22e8a1872c5ea9b1aaa0f88f7ce24b1ee57f3da57bd3eaa36f2c5fd388437ce9a935bd82912075269
-AUX a2ps-4.13-manpage-chmod.patch 461 BLAKE2B 6b680219388611371e70bbb1170128e82fc34eafa3cbed157800f24f1a32eb46308ee5592b17b2ec94aa0e292ad34f5b5f45136f985d8566dd23c88204873873 SHA512 f3dc2698ee989928b3179b65b01bf12d828f4428bd860f6f1a3811daaa9d6256b353c2acb5cd4bf392dd89b040f8e9c15420ab4373f3d54b8b60652aaf23f864
-AUX a2ps-4.13-stdout.diff 462 BLAKE2B 9e8285a2d9b72fd752bcd39fc20f2318283aa4913f2fdf30dd56920a2741fc5a99d5a0b5f38c7f3c694af3fa772597df8d84720760f1a8468bfbb36d9337ee19 SHA512 61be8be21b08f39b0a7509bb96f67139165421baaaa20968ec54f9df37d5b8c355f06bc76513ed10c8c7d61608ed766ed28d4498211dff285d6b381aaf2454dc
-AUX a2ps-4.13c-emacs.patch 442 BLAKE2B f58e56256f45ba7dc9ab407f38cfdb7dac6a5eb7b39970e3b7e680a2ac61ec743e3d57bc28daca15fda55714af339590ffecd3dc64a25d0e99f3f46869ec175b SHA512 0ef1a215ecb757e249c4d4bdf9a789419c6cd433f7e330783fef13a0158c57c5c5e6a22526d8abcca0919bdb1dc08337869fdd3f0fe192284ca087eafad322a3
-AUX a2ps-4.13c-fnmatch-replacement.patch 1500 BLAKE2B bee0366e19cb8a648ded476ca9ff0accf82bb54a122ee301c74109e418b86c4c5dc1de1fa7c4f6511faeec8924dd667ffbc46f60232eab1503a750268e3afce9 SHA512 5509ae1277ff1f1f487fb106ed6673eb67fa7d1531a35bfa087f78a0bdb4dc0bf38c69b7fab95161a19406fc1acaef09b22b8a05ef603c6d43a8d7a8c3077b56
+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 514 BLAKE2B 9dd0623d227ec4bc16006ba36b20edba387fbb466fbd79c0be8740495551d24dac8041d26c946d9287c90ffb6a9db72ed96479de630ee7728276ab99b9c829d4 SHA512 6835f5e9205cb549da52c4a3c13aad601c9e9d294f0f35ebe4d8cc6f8bd8b5f6fe77b857f8c92f552a43c02eb6de812021c078ce597c319bde176f0e91cd167b
+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 436 BLAKE2B 1044449a190930f28c5ba05dadc3b7510ab01a1330cb111aec8dc46ab95d3135085941c204f7c62cc3fdb16e7aa2761f2df8f73565ba5226a661dfc5d7f52f54 SHA512 439af060da55d93e8fa6962f7b77c292e47b1a39d987c35010edd52f0ebf360337b5bd29fd134d4d4ab8333187672e7ae97c2d0259c706e38a2cf9d719dcf7bb
+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 616 BLAKE2B 1554f3ea640b1e44cecc6b0cb6a2f593f1dc1aeec36b5f9a9d1e98c847e431a0848d35a0139ce1541cba55eedf3de619f6b5dcfd4099641112d0f4fe3c8ee251 SHA512 3118d91519c81e5e9f46a5386e9db757936231e71047ba8579b3d969a7c824bad6325b54221a61a0b171bb87669b548704a068bc71a1cd3b48d3a32416fe0c0f
-AUX a2ps-4.14-ptrdiff_t.patch 367 BLAKE2B 1a69ba36b72a08f3c853905d9d2a0f787259f4f1252ff83d4eb8ae09788aa0017a332847c9d4cb4a16096ecfe84197769ca6fca7cab239fc7da7b113e48d0d94 SHA512 b9ebff895614a20b8f9e891ce53cf0f7ec38452619f7e907deadff22840a019737dd129690f5ffec91f7f798ae03bd0c7c62f1aa751589865f589362825038c5
-AUX a2ps-4.14-texinfo-5.x.patch 5996 BLAKE2B 720a408c88c848fbe9b6ece319a8eb05a109df97dd2c25a26ed8a4ad8f49d545d111900cedc4d5eda05b4aa120b9f1f4aecd6434c6f20f1944d863b13d4952aa SHA512 1e93a21cda8547a49d09e429c8ffed23b68e7f7555fa356f615bc76eef059a0065cc71e62bb4f1a1239aaf140796195c7d264c5c884e1a89516facbdbcb955d9
+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 410 BLAKE2B 00299553c81187b62234893bfa4d06a212d6d9f0284f6f48ec3861af368c5db2720073c876f008abe6ef98dd75c59e0bd7599bc4065b3b7134ca83b84d96742b SHA512 cf904841beb832518e617317fb2a426f4d8db44e2b4d5f3c58c1aec0a5679c1914dfdccc7e2b46e7e4c1b8e30517cc4052bee383e30f9b8e0e40f3f6209df447
+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
 DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
 DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
-EBUILD a2ps-4.14-r7.ebuild 3608 BLAKE2B 4cd8a24759e611dbb1cc213ebc8587154f844300a15d134b51bc26acc3e8baf26f624fe60b75d35c40f99813a32a6b5e3bf2f2ecf09ac405a192f8748b6b0901 SHA512 98130fdec528347fca365d35df2a455b8fb2986ffb22648cda7ae09d12c6a4c7a22ef1dbe500bdacdb3e9b6751d7d92a8e5d5a7eca423dfe3d789a2eb8d58314
-EBUILD a2ps-4.14-r8.ebuild 3736 BLAKE2B c9e9f530f247b7b6ddd2f50a9a1cd019f5e79a0a566a56210809d8d287b8583a32a35bfeb7ef8a78eab04400cfc8daa8adb4891f874ecf2da4bf3e7f5f914e1d SHA512 b5e2a59e7350223ecc90d599ef8ee5078e6844f93c217c67043a7641c363de0244b2c4a1647a0f858cbc5d2ef3f368d9ae7111c233fc240921cbbbcc3d33aeb2
+EBUILD a2ps-4.14-r7.ebuild 3595 BLAKE2B ceafe4d3667ce8c7c51cd06516453bfc3847c0aaa57e30ae4544dad5d366bbf87a4ebf4eddf901119e2c68c19b0f93c1261a930a97b860d51dde04f13718afb4 SHA512 63d1f39badc98876d18495ff639f0e72a622b3708928669a15ee1e519f531e2ded974bb433bc0f10b033d2b5f2971a5451f59736b1c3ec44aa18e051f4d08e97
+EBUILD a2ps-4.14-r8.ebuild 3083 BLAKE2B 9bdcf9f436d739685aba1c494df1830def76bb73504a7878a84156dbd8f87e7129acf7b30eaaaa0d83df1e4073ad98f28a749a733fb655517df4e55bc4ad0365 SHA512 1ee57b11f6c35321180b2bdb2784f46e9a0d8d7663b03a5b5cdd0a58f2cd69ae8afaf69fb915817cf1b13f20336fc7148454011c168f506cbd6d2be0533834ae
 MISC metadata.xml 442 BLAKE2B 89796eb65cfc9ab8929511f94655a9c7f6a39837f5c1cfb0f8885a29d3900512e6c3ee6b44f3ee8e23eca54112f72c7462d4fb223109fdea3d203d5ff4492252 SHA512 078d824c815b9cc0c5a0acfea6f8c5203eb3f1e94778987137181f987cbeaab0040389b0e34cda160d6a3c6f00508c39a6c30404b89dfe64782db1980c9340b7
diff --git a/app-text/a2ps/a2ps-4.14-r7.ebuild b/app-text/a2ps/a2ps-4.14-r7.ebuild
index 5beff0baee31..786c6a6aa41d 100644
--- a/app-text/a2ps/a2ps-4.14-r7.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r7.ebuild
@@ -37,7 +37,7 @@ src_prepare() {
 	default
 
 	eapply "${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff
-	use vanilla || eapply -p0 "${FILESDIR}"/${PN}-4.13-stdout.diff
+	use vanilla || eapply "${FILESDIR}"/${P}-stdout.patch
 	if use cjk; then
 		eapply "${WORKDIR}"/${P}-ja_nls.patch
 		# bug #335803
@@ -62,7 +62,7 @@ src_prepare() {
 	eapply "${FILESDIR}"/${P}-check-mempcpy.patch
 
 	# fix compilation error due to invalid stpcpy() prototype, bug 216588
-	eapply -p0 "${FILESDIR}"/${P}-fix-stpcpy-proto.patch
+	eapply "${FILESDIR}"/${P}-fix-stpcpy-proto.patch
 
 	# fix compilation error due to obstack.h issue, bug 269638
 	eapply "${FILESDIR}"/${P}-ptrdiff_t.patch
diff --git a/app-text/a2ps/a2ps-4.14-r8.ebuild b/app-text/a2ps/a2ps-4.14-r8.ebuild
index 3424f0792726..ede532a155af 100644
--- a/app-text/a2ps/a2ps-4.14-r8.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r8.ebuild
@@ -33,11 +33,27 @@ BDEPEND=">=dev-util/gperf-2.7.2
 
 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
 
-	eapply "${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff
-	use vanilla || eapply -p0 "${FILESDIR}"/${PN}-4.13-stdout.diff
+	use vanilla || eapply "${FILESDIR}"/${P}-stdout.patch
 	if use cjk; then
 		eapply "${WORKDIR}"/${P}-ja_nls.patch
 		# bug #335803
@@ -46,45 +62,6 @@ src_prepare() {
 		eapply "${FILESDIR}"/${P}-cleanup.patch
 	fi
 
-	# fix fnmatch replacement, bug #134546
-	eapply "${FILESDIR}"/${PN}-4.13c-fnmatch-replacement.patch
-
-	# bug #122026
-	eapply "${FILESDIR}"/${P}-psset.patch
-
-	# fix emacs printing, bug #114627
-	eapply "${FILESDIR}"/a2ps-4.13c-emacs.patch
-
-	# fix chmod error, #167670
-	eapply "${FILESDIR}"/a2ps-4.13-manpage-chmod.patch
-
-	# add configure check for mempcpy, bug 216588
-	eapply "${FILESDIR}"/${P}-check-mempcpy.patch
-
-	# fix compilation error due to invalid stpcpy() prototype, bug 216588
-	eapply -p0 "${FILESDIR}"/${P}-fix-stpcpy-proto.patch
-
-	# fix compilation error due to obstack.h issue, bug 269638
-	eapply "${FILESDIR}"/${P}-ptrdiff_t.patch
-
-	# fix compilation error due to texinfo 5.x, bug 482748
-	eapply "${FILESDIR}"/${P}-texinfo-5.x.patch
-
-	# fix CVE-2014-0466, bug 506352
-	eapply "${FILESDIR}"/${P}-CVE-2014-0466.patch
-
-	# fix CVE-2001-1593, bug 507024
-	eapply "${FILESDIR}"/${P}-CVE-2001-1593.patch
-
-	# specify encoding explicitly, bug #695918
-	eapply "${FILESDIR}"/${P}-texinfo-6.7-encoding.patch
-
-	# fix function declaration, bug 870763
-	eapply "${FILESDIR}"/${P}-function-decl.patch
-
-	# update reference in man/Makefile.maint
-	eapply "${FILESDIR}"/${P}-configure.ac.patch
-
 	# fix building with sys-devel/automake >= 1.12, bug 420503
 	rm -f {.,ogonkify}/aclocal.m4 || die
 	sed -i \
diff --git a/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch b/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch
index e0c61124e9df..8e8454a3ea48 100644
--- a/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch
+++ b/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch
@@ -1,4 +1,6 @@
-diff -ur a2ps-4.13.orig/man/Makefile.maint a2ps-4.13/man/Makefile.maint
+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 @@
diff --git a/app-text/a2ps/files/a2ps-4.13c-emacs.patch b/app-text/a2ps/files/a2ps-4.13c-emacs.patch
index f1cd5d9ebdfc..97099a7393d9 100644
--- a/app-text/a2ps/files/a2ps-4.13c-emacs.patch
+++ b/app-text/a2ps/files/a2ps-4.13c-emacs.patch
@@ -1,3 +1,6 @@
+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 @@
diff --git a/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch b/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch
index c49ab78c93c0..92098541b694 100644
--- a/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch
+++ b/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch
@@ -1,4 +1,6 @@
-diff -Naurp a2ps-4.13.orig/lib/fnmatch.c a2ps-4.13/lib/fnmatch.c
+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 @@
diff --git a/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch b/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch
index 7b820cead05f..62a8ab21961f 100644
--- a/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch
+++ b/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch
@@ -1,3 +1,6 @@
+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 @@
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
index 7c3c69076ae9..ed72bbad0715 100644
--- a/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch
+++ b/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch
@@ -1,9 +1,9 @@
-=== modified file 'lib/xstrrpl.c'
---- lib/xstrrpl.c	2008-04-14 18:04:50 +0000
-+++ lib/xstrrpl.c	2008-04-14 18:20:20 +0000
-@@ -20,12 +20,10 @@
- 
- #include "system.h"
+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"
  
@@ -12,6 +12,3 @@
  /* Perform subsitutions in string.  Result is malloc'd
     E.g., result = xstrrrpl ("1234", subst) gives result = "112333"
     where subst = { {"1", "11"}, {"3", "333"}, { "4", ""}}
-    */
- char *
-
diff --git a/app-text/a2ps/files/a2ps-4.14-psset.patch b/app-text/a2ps/files/a2ps-4.14-psset.patch
index 291c3aac4fa4..e0793bc9eb1f 100644
--- a/app-text/a2ps/files/a2ps-4.14-psset.patch
+++ b/app-text/a2ps/files/a2ps-4.14-psset.patch
@@ -1,4 +1,5 @@
-diff -Naur a2ps-4.14.orig/contrib/psset.in a2ps-4.14/contrib/psset.in
+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 @@
diff --git a/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch b/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch
index 00d955a819a9..7ff45cf3bc4a 100644
--- a/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch
+++ b/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch
@@ -1,4 +1,6 @@
-diff -uNr a2ps-4.14/lib/obstack.h a2ps-4.14.test/lib/obstack.h
+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 @@
diff --git a/app-text/a2ps/files/a2ps-4.13-stdout.diff b/app-text/a2ps/files/a2ps-4.14-stdout.patch
index 1e40e618fcbd..6661b0e26f03 100644
--- a/app-text/a2ps/files/a2ps-4.13-stdout.diff
+++ b/app-text/a2ps/files/a2ps-4.14-stdout.patch
@@ -1,8 +1,8 @@
---- lib/printers.c.orig       Tue Oct 12 00:01:59 1999
-+++ lib/printers.c    Wed May  2 11:23:25 2001
+--- 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 */
-
+   res->ppd = NULL;		/* Printer's ppd are not read yet */
+ 
    /* Output */
 -  /* Default is to send to default printer */
 -  res->flag_output_is_printer = true;
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
index 44cd4bfd099d..baf53cfcc122 100644
--- a/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch
+++ b/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch
@@ -1,3 +1,6 @@
+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 @@