gentoo resync : 25.11.2020

3 files changed, 4 insertions, 44 deletions

diff --git a/app-text/fbpdf/Manifest b/app-text/fbpdf/Manifest
index ef7cc46bc34d..6fe9698085c2 100644
--- a/app-text/fbpdf/Manifest
+++ b/app-text/fbpdf/Manifest
@@ -1,5 +1,4 @@
-AUX fbpdf-0_p20190202-printf.patch 1166 BLAKE2B 41972cfeea7bbc8d1e1840a21882c82050b2f91fff75056067fd00e6ed4a67929f35674cb3e09e5345ce2690cbb92a1676a4ef273f804d866cad5385cc48cc43 SHA512 e91f8158d0a8237010dda66eee289046348b8b657b859e4de1ae22c91424c47775df94f5d58151c930453389e71b4237c07b942c4391afe288e980d19833f183
 AUX fbpdf-0_p20190202-use-pkg-config.patch 1258 BLAKE2B 7542773b6ecf8fed73abcca526d41cfbc7629da44bd3e50649951680469ac7a5f1392a75b4849a8626fe740436bf1bdea9a0131f9e60558f37bb7cdbb1ed89e7 SHA512 6086ff1948ba000c8330aa5fe510b84d74a91254a75ac07c326730c371a4ab47cd2f936ceb888bed4c1520b9fec61a823fb1656533374586cd4fe2466b3160bc
-DIST fbpdf-0_p20190202-dfe9f0067549f759cdc04f2f62b4f89cd6e1b199.tar.gz 7874 BLAKE2B 873da768b0152559536c73b7ed575c3457efe184934a38d0a9600412ac3a8616297194ab045be1d7eddb470d8d73ead4c655797fd7ba1efe6f2be9a19a5318b4 SHA512 f216a0993573e4e491845638b72ff019910f8a333ed618158e81bcb3f68619596f0354b0039c38c7619dd65c040aa599ed8923ac974717b86fb431e5c6954f3b
-EBUILD fbpdf-0_p20190202-r1.ebuild 868 BLAKE2B 577a0505265a3e7f1643722d64436197cc108618861ec4a7970e889c6ca5c51d6484f6bbf0ce404667c59cb87db604523a359c97f8cd8dcc84ea82a17aa27db2 SHA512 482c65a5c6ec5d6c070fe757cfe44c7f05413c3ea66ebef52b6e0d1813323bdf910a14be494f9439fbbbdca60e196ad54a084bf913526942a35bb2c255604654
+DIST fbpdf-0_p20200614-27c9e28e9199a2491d0ee0a885760bedb1d4547b.tar.gz 8432 BLAKE2B 0004f8558b86c349744a37099ef86963d368ee9dedeefca861761f88adc3c94a3db9f46c9e1a6f6026357512a8320b956cd7c48108aa6c6657b84193fd5d4b49 SHA512 e037cd536e3a26b6d2364eb52803de67606bac418db8691c7530a889c95dd1f8661985021237ce7fea95f56ab5a308caf8d470c6c036b51b17211f9c200aba51
+EBUILD fbpdf-0_p20200614.ebuild 848 BLAKE2B 949f4773cc367a87c78f498d90ef810629b4a2cc342bf8b9008db51d76eab9d75a1ac168b0f0c207b2edcdc4c0a4c6dbe0a460b6b2b7e5908609d1e75ae582fe SHA512 c565fd79821adc8c19435d7fc65c779b673a851899d45eb00016dc776e1ddbf4854a97b570aaf9577e717053430b562f648f74bdd483eee30215e530ec28ecce
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/app-text/fbpdf/fbpdf-0_p20190202-r1.ebuild b/app-text/fbpdf/fbpdf-0_p20200614.ebuild
index 79bea0cffbde..964e63527de6 100644
--- a/app-text/fbpdf/fbpdf-0_p20190202-r1.ebuild
+++ b/app-text/fbpdf/fbpdf-0_p20200614.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit toolchain-funcs vcs-snapshot
 
-COMMIT="dfe9f0067549f759cdc04f2f62b4f89cd6e1b199"
+COMMIT="27c9e28e9199a2491d0ee0a885760bedb1d4547b"
 
 DESCRIPTION="framebuffer pdf and djvu viewer"
 HOMEPAGE="https://github.com/aligrudi/fbpdf"
@@ -29,8 +29,7 @@ BDEPEND="virtual/pkgconfig"
 S=${WORKDIR}/${P}-${COMMIT}
 
 PATCHES=(
-	"${FILESDIR}"/${P}-use-pkg-config.patch
-	"${FILESDIR}"/${P}-printf.patch
+	"${FILESDIR}"/${PN}-0_p20190202-use-pkg-config.patch
 )
 
 src_compile() {
diff --git a/app-text/fbpdf/files/fbpdf-0_p20190202-printf.patch b/app-text/fbpdf/files/fbpdf-0_p20190202-printf.patch
deleted file mode 100644
index 31f9fbe2c8ab..000000000000
--- a/app-text/fbpdf/files/fbpdf-0_p20190202-printf.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/714736
-
-From e89e36c01d09ca6aec03732e922e749257cac3f4 Mon Sep 17 00:00:00 2001
-From: Dmitry Bogatov <KAction@disroot.org>
-Date: Sun, 9 Feb 2020 00:47:09 -0500
-Subject: [PATCH] Avoid passing non-constant format string to printf
-
-gcc complains loudly on any code that uses anything but string literal
-as format string to printf. Right now format string is "const char *"
-and does not contain %-sequences, but should '%' appear in "usage"
-string in future, bad things would happen.
-
-Since formatting functionality of "printf" is not used anyway, replacing
-it with "puts" makes code both safer and easier to understand.
----
- fbpdf.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fbpdf.c b/fbpdf.c
-index a58797f..65b654b 100644
---- a/fbpdf.c
-+++ b/fbpdf.c
-@@ -351,13 +351,13 @@ static void mainloop(void)
- }
- 
- static char *usage =
--	"usage: fbpdf [-r rotation] [-z zoom x10] [-p page] filename\n";
-+	"usage: fbpdf [-r rotation] [-z zoom x10] [-p page] filename";
- 
- int main(int argc, char *argv[])
- {
- 	int i = 1;
- 	if (argc < 2) {
--		printf(usage);
-+		puts(usage);
- 		return 1;
- 	}
- 	strcpy(filename, argv[argc - 1]);