gentoo auto-resync : 26:12:2022 - 02:06:21

8 files changed, 25 insertions, 149 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6887b5ff503f..ad165c63a8f4 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index c28e9c314485..500300133aeb 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -18,6 +18,5 @@ AUX a2ps-4.14-texinfo-5.x.patch 6069 BLAKE2B b85e03014f38599810bc1e883eed2c7f4b0
 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 3604 BLAKE2B 8178dcab776aa69690a0633847cde4f08fcefd7637a16c7b01875f81bb8fb8d52b8e8732e2605f4442f4d3ef83a1b0e2f8ab9a4c987790bf628de66802405dc8 SHA512 e139a1ab2efaa35411df576bf82e9d1d6b492fa325d34072a086c26a0c94a0e039603e4ef3b6a6f4d9b6b14f7de31bca303537fb86a12fb5c02e25eab51f4675
 EBUILD a2ps-4.14-r8.ebuild 3086 BLAKE2B ed9f36fc3e2d32cbbe51330dd994aac86c1f0fb57769b56973f0cfc243fb71ff69d72ab5c7133ebef9e150532288ba081dd24f368013a5db64608515806baeb5 SHA512 3fc03b3bc163cff89cf38a1ba8d04e5ce8228911ec991abb86a75ebbc8c357ae427b51d128e96ab0d53c62d4c56c7d7d025b03ab7278ff7b9c37e00ff2e4b21a
 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
deleted file mode 100644
index f8b03be1e0b0..000000000000
--- a/app-text/a2ps/a2ps-4.14-r7.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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 )"
-
-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}
-	>=dev-util/gperf-2.7.2
-	app-alternatives/yacc
-	nls? ( sys-devel/gettext )"
-
-SITEFILE=50${PN}-gentoo.el
-
-S=${WORKDIR}/${PN}-${PV:0:4}
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff
-	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 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 "${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 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
-
-	local myconf="COM_netscape=no COM_acroread=no"
-
-	use emacs || myconf="${myconf} EMACS=no"
-	use latex || myconf="${myconf} COM_latex=no"
-
-	export LANG=C LC_ALL=C
-
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		--sysconfdir="${EPREFIX}"/etc/a2ps \
-		$(use_enable nls) \
-		${myconf}
-}
-
-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
-
-	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/barcode/Manifest b/app-text/barcode/Manifest
index b36618db5f88..6117c9b76d13 100644
--- a/app-text/barcode/Manifest
+++ b/app-text/barcode/Manifest
@@ -1,5 +1,6 @@
 AUX barcode-0.99-fno-common.patch 650 BLAKE2B 27fce20565dfa526b4240c5817ab45735bba98a7445160ba5f7ff368f0befa2332e423f31732ea27a104b3f5f7db0fa8a954d465116a38fd445cd1ebc1209242 SHA512 1cacd446234f9b0d841803f3627a7b0775da22cc74fcf09ee45ee95317ed6816bc545e61555707f7c7a5cee743b33b241088182b01d6cdcd49e047f050d29c68
 AUX barcode-0.99-install-static-lib.patch 331 BLAKE2B 72b6a5a31ce3c450587ae7603f802bdd9e8c467f9095538fb819f2742703be1abe749af7faf340f908ee8e5979277f7fc65cc8230685f060253c08e31a5641f8 SHA512 2033f6edcdf98efcb17296845be76d1c2cfc3504fcee965d68536e209f949d26d6ef2326858fe673492e36a5c3aebd14eb3e0ef96355ca43d25a23f19b612d01
+AUX barcode-0.99-not-a-literal-string.patch 672 BLAKE2B 8a93d8791e875b5b0134a6ad4ee951d6ffda4dbad71a1ae67ad59d6b7dab9726fe37f2c0607e03b2be86eecd6aba4865eab7565bf20f7ae105abb6fceb5bcef8 SHA512 779a05faa1db79dede4fe38a2443a74c7f1dec0f4fdf8b62c4331cab1ac135a22d89d28f2e263ea36b942d548cb9cb57d8ab7e0943513bee4509c620308f89de
 DIST barcode-0.99.tar.xz 586028 BLAKE2B a6ef5a4f0061bd0f0cb65a791516383259f317801e9f5ea02c626735cd3ed5f00e0a92502b9b5e3dcb8ea95c313e10f5abf9c172e1094111dea7f3cfb45ec032 SHA512 1f3015ee9cb2e57e38e56fa48fa3a38fa355821801bad3132d3e87b5b88db4f167986c33dc044317cbf18bb62062af36e946daab98235ff7015a00937c8dd41e
-EBUILD barcode-0.99-r1.ebuild 753 BLAKE2B c25d230a2d70cafdaf9394f20d7901ac41a5249a0a41edd202c1079258ab06e703823fbc61112414d3f0fa5fef8b44dadfa88dd8e4d23f0c2529f3872f28c972 SHA512 3e3486d9d952dc92818a2cbb6ea420c5da299716dd97d3c134e2dacfd8f591bb84760996853e21ed41a4893196ebf44d39cd86b6bbc79df6f04236d16dc6d0c0
+EBUILD barcode-0.99-r1.ebuild 800 BLAKE2B 50a545b2f2e31c21d2b90593db37579458409d7ec32eb94e4b5dc77fe4573ed326897d7fb25375d44a058eeb65ace4b42cf6d269b13405bff7e22d587fe3a8bc SHA512 367ed264de52f10299e82b9ebeb05e52080297cc1aa161277e52e51ef7237f33d3d26a8e0884eaaf06977bf3a6875b5dd28b0af62f4ae73edb744907ea94fd41
 MISC metadata.xml 332 BLAKE2B cbd827ae4db4f4230f7ce483ada7e58d976fd4fa5a508e35725ce97dac038416fdb73969f0bdbfe313ae85ddcc8fc9e43bbd5959af3105de8b162abce1267fd3 SHA512 2268bd4b0e057e8a1bddb53e1bb1d82f69d28f62cd02f297b55fe1403c1ded3294912009464ef3b21a3831ccede5c496f24a2c60a11fbfb4586d20fe527fa34a
diff --git a/app-text/barcode/barcode-0.99-r1.ebuild b/app-text/barcode/barcode-0.99-r1.ebuild
index 7afa62168be7..e0ddd7693b65 100644
--- a/app-text/barcode/barcode-0.99-r1.ebuild
+++ b/app-text/barcode/barcode-0.99-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="barcode generator"
 HOMEPAGE="https://www.gnu.org/software/barcode/"
 SRC_URI="mirror://gnu/barcode/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
@@ -19,6 +19,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${P}-fno-common.patch
 	"${FILESDIR}"/${P}-install-static-lib.patch
+	"${FILESDIR}"/${P}-not-a-literal-string.patch
 )
 
 src_prepare() {
diff --git a/app-text/barcode/files/barcode-0.99-not-a-literal-string.patch b/app-text/barcode/files/barcode-0.99-not-a-literal-string.patch
new file mode 100644
index 000000000000..63b49d25c058
--- /dev/null
+++ b/app-text/barcode/files/barcode-0.99-not-a-literal-string.patch
@@ -0,0 +1,19 @@
+Taken from: https://lists.gnu.org/archive/html/bug-barcode/2021-09/msg00000.html
+Author: https://lists.gnu.org/archive/html/bug-barcode/2021-09/msg00000.html
+---
+ plessey.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plessey.c b/plessey.c
+index 2f59e39..3089a3c 100644
+--- a/plessey.c
++++ b/plessey.c
+@@ -149,7 +149,7 @@ int Barcode_pls_encode(struct Barcode_Item *bc)
+                         checkptr[i+j] ^= check[j];
+     }
+     for (i = 0; i < 8; i++) {
+-        sprintf(ptr, patterns[checkptr[strlen(text) * 4 + i]]);
++        sprintf(ptr, "%s", patterns[checkptr[strlen(text) * 4 + i]]);
+ 	ptr += 2;
+     }
+     fprintf(stderr, _("CRC: "));
diff --git a/app-text/ebook-tools/Manifest b/app-text/ebook-tools/Manifest
index 6787489a17ff..04f1005aacc0 100644
--- a/app-text/ebook-tools/Manifest
+++ b/app-text/ebook-tools/Manifest
@@ -2,5 +2,5 @@ AUX ebook-tools-0.2.2-crashfix.patch 1883 BLAKE2B 957cdf93efefda23074d762992c71e
 AUX ebook-tools-0.2.2-fvisibility-hidden.patch 998 BLAKE2B 3595aecd20dd3e046d76517595f337642e0723ac6fddab9a4f74a9e29b3cc415cafce3688f1fbc395e3b681a90ac88c05124b71c69882e1a3cda25c231d5258a SHA512 ae8c8608335e3d7251f4fca959a9ada267cffed6d7abbf7baf5a053490b80789cff3e9fde76ca6c034bf19760a51d6822e2ead7a4f7d15aaa11d5484c463de6f
 AUX ebook-tools-0.2.2-libzip-cmake.patch 3113 BLAKE2B e3b78d2ab278ff759afec16a57f074a722b3f5ff6aeceac9bd736843981d6de205607a0e89ffad0db4fdc14e3d250959a02b642e07b01a77c24aa494a1b37d8a SHA512 d228d9bd192e5cd46c7a991025d995b33e26049053ecd548ab35edace11e10aef6c7ca24c584680f97bb765d7e3485b5e6ea337a0255dcf1041f804213443b78
 DIST ebook-tools-0.2.2.tar.gz 46889 BLAKE2B 20b6ff048e9e31d2e00db3a02b67e21f3031d74aedfc663331b08f626b1816adecad5039e124462f97ff2ff7dc43f002eb39dd625f031ae42fe2b46338e94fcf SHA512 b4518249835ed7cc672392bf2f8b1c62bc218e41c53663bb26ab34c9e43a99b6b7ae794babdb4bd775e467bb17918703a66ee57c8cf94cb7afc4ba2a7f74816a
-EBUILD ebook-tools-0.2.2-r2.ebuild 785 BLAKE2B bfcccee1e05dc7cb163d76af02a381550c39995f2df00e8c67ccf75d32d7bc6fc7e95c5cad0533e204d5c80d4e247f84d40bf1be48f1bc35ee3574e39fc6bcad SHA512 b652be7c0484f9f36918a47663065de55e092ead7d712ecc64666668be31dc5c0dbae4575fdeb4829ee0c99cc3ef80ebc247f8f0a76c979ff0dc754db7b69254
+EBUILD ebook-tools-0.2.2-r2.ebuild 785 BLAKE2B a03c719eea1852af23fdbfee15859a48861c15f5afd99464a02931cae427ae1a43b07c4dfdac54524a5ee7ccfe00feb48d47147816312e64d0b843c232b56856 SHA512 f0d27f8c417c29edc09bb0ea9b534c539857108eb52c44e743ef9b44037e35d58d3b4b9f2a0cbfbe0b3b5d1d283cf9bf2cc7fc9704ac24cc34e92339de09a518
 MISC metadata.xml 401 BLAKE2B a643f820bbbbfbe88cc85fba52a9fdb1b117816bedd4470ad7f637424fdb52c03dfc6b5ccdd629a6d0b1db073c651b3e122cc4b367ad700c56914b2db45a4583 SHA512 ab90f5a46f1a4fc1313bd63b651cf383539a052d815a5f9796cdc1c085bac6e8d08732834c8703154af816b3400b55770229439cad144ff6cef1fb3d1f22fcb0
diff --git a/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild b/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild
index 111b67768dca..cecebdf25781 100644
--- a/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild
+++ b/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake