gentoo resync : 10.02.2019

5 files changed, 54 insertions, 35 deletions

diff --git a/app-text/fbpdf/Manifest b/app-text/fbpdf/Manifest
index fcbc779bfe4e..26ba331448e5 100644
--- a/app-text/fbpdf/Manifest
+++ b/app-text/fbpdf/Manifest
@@ -1,5 +1,4 @@
-AUX fbpdf-0_p20161202-format.patch 410 BLAKE2B c028d4291e204f333624f85d986d57550694242dd62928d5ee453ec48f873d0315fb523eb6b2e5045ec00c2e98aab987b9a5ba2af82b5b50603a142a8074caef SHA512 d450d8afe3547a0837147daee207352f257d7009c39c64867e779ac8d099e2aba5ad6fa931d8139daa4a5a8cb1022fc8faa85adc9be8833aa3b8633f05f6292a
-AUX fbpdf-0_p20161202-mupdfthird.patch 262 BLAKE2B 1a3f01039aff3860665bdc7ab903747bf241b717598bc9423355d8ac875219736037f72c821465827dd62bcc5b948794e90a038ed8eab32b389153f55377ebc4 SHA512 aa469d088373ac79998642bc6d3c6ac8eb0138d5495eb95cf6cbd7e13ea1d346a59a72ea860fe7e6b6ba669ac50cdb120432fa9011677515b021ef3121a2a657
-DIST fbpdf-0_p20161202.tar.gz 7795 BLAKE2B 725fb49278ceee0e24bfbdaaa5f93cc78c448666e44ab426739be8db27ad3010911473af6766a45a569356fd322555962d9250f0d655e69594433b29c5d80325 SHA512 c122f12485b9e0055bd5b60d66a5034d20738c6a5a1a9f384ef8cb93e4c6b1275434eea884398590db2b06a746cc0ff00df29ecdc5faecc1730a022435164107
-EBUILD fbpdf-0_p20161202.ebuild 806 BLAKE2B e6b493ca23579e50345347452d32b3651aec9954aba1a521d8567f81502809a68ae34737e5a52d0edd41e4a2e85ea433784d7300178de78a680126c4ddc1d635 SHA512 b77b4ae4fd938832d4e3fb0018e46d143593467680e183d6755a3953a769e29a5f03744eb2c08fc2cd79f5ce25be2e2fe21d29eaf224b7a6f139533165617477
+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.ebuild 889 BLAKE2B 2e892ae435016b53f1b24c36c2787ab5fed99976d78c4d9a702c9f0483e284d397385461707bc9961bf3adacc7d18ee8ead7dec892f681a3b7bd562d98ea2739 SHA512 46b45f82db26eee5d726b78810aa403873e6e3ef4bd63ae34d5c15754a5667b4f4e689fdfa3d86200b0dd75b3d0d52b35d53327065391767b28fe4e4e3afc3f4
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/app-text/fbpdf/fbpdf-0_p20161202.ebuild b/app-text/fbpdf/fbpdf-0_p20190202.ebuild
index a2fd7c2a1021..029af2a8ece1 100644
--- a/app-text/fbpdf/fbpdf-0_p20161202.ebuild
+++ b/app-text/fbpdf/fbpdf-0_p20190202.ebuild
@@ -1,15 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit toolchain-funcs
+inherit toolchain-funcs vcs-snapshot
+
+COMMIT="dfe9f0067549f759cdc04f2f62b4f89cd6e1b199"
 
 DESCRIPTION="framebuffer pdf and djvu viewer"
-HOMEPAGE="http://repo.or.cz/fbpdf.git"
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.gz"
+HOMEPAGE="https://github.com/aligrudi/fbpdf"
+
+SRC_URI="https://github.com/aligrudi/fbpdf/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="BSD ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
@@ -27,11 +30,10 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
+S=${WORKDIR}/${P}-${COMMIT}
 
 PATCHES=(
-	"${FILESDIR}"/${P}-format.patch
-	"${FILESDIR}"/${P}-mupdfthird.patch
+	"${FILESDIR}"/${P}-use-pkg-config.patch
 )
 
 src_compile() {
diff --git a/app-text/fbpdf/files/fbpdf-0_p20161202-format.patch b/app-text/fbpdf/files/fbpdf-0_p20161202-format.patch
deleted file mode 100644
index 0b48d6bff020..000000000000
--- a/app-text/fbpdf/files/fbpdf-0_p20161202-format.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/fbpdf.c b/fbpdf.c
-index 6caa08f..48d12f5 100644
---- a/fbpdf.c
-+++ b/fbpdf.c
-@@ -343,3 +343,3 @@ 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";
- 
-@@ -349,3 +349,3 @@ int main(int argc, char *argv[])
- 	if (argc < 2) {
--		printf(usage);
-+		puts(usage);
- 		return 1;
diff --git a/app-text/fbpdf/files/fbpdf-0_p20161202-mupdfthird.patch b/app-text/fbpdf/files/fbpdf-0_p20161202-mupdfthird.patch
deleted file mode 100644
index 070b7c72ea26..000000000000
--- a/app-text/fbpdf/files/fbpdf-0_p20161202-mupdfthird.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Makefile b/Makefile
-index f986689..374837f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -13,3 +13,3 @@ clean:
- fbpdf: fbpdf.o mupdf.o draw.o
--	$(CC) -o $@ $^ $(LDFLAGS) -lmupdf -lmupdfthird -lcrypto -lm
-+	$(CC) -o $@ $^ $(LDFLAGS) -lmupdf -lcrypto -lm
- 
diff --git a/app-text/fbpdf/files/fbpdf-0_p20190202-use-pkg-config.patch b/app-text/fbpdf/files/fbpdf-0_p20190202-use-pkg-config.patch
new file mode 100644
index 000000000000..1f5751af75e1
--- /dev/null
+++ b/app-text/fbpdf/files/fbpdf-0_p20190202-use-pkg-config.patch
@@ -0,0 +1,41 @@
+From 009acf3907bf36cfaa2cb09f16199cfdbe147a0c Mon Sep 17 00:00:00 2001
+From: "S. Gilles" <sgilles@math.umd.edu>
+Date: Mon, 4 Feb 2019 09:43:45 -0500
+Subject: [PATCH] use pkg-config
+
+---
+ Makefile | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -2,6 +2,7 @@ PREFIX = .
+ CC = cc
+ CFLAGS = -Wall -O2 -I$(PREFIX)/include
+ LDFLAGS = -L$(PREFIX)/lib
++PKG_CONFIG = pkg-config
+ 
+ all: fbpdf fbdjvu
+ %.o: %.c doc.h
+@@ -11,14 +12,14 @@ clean:
+ 
+ # pdf support using mupdf
+ fbpdf: fbpdf.o mupdf.o draw.o
+-	$(CC) -o $@ $^ $(LDFLAGS) -lmupdf -lmupdf-third -lmupdf-pkcs7 -lmupdf-threads -lm
++	$(CC) -o $@ $^ $(LDFLAGS) $(shell $(PKG_CONFIG) --libs mupdf) -lm
+ 
+ # djvu support
+ fbdjvu: fbpdf.o djvulibre.o draw.o
+-	$(CXX) -o $@ $^ $(LDFLAGS) -ldjvulibre -ljpeg -lm -lpthread
++	$(CXX) -o $@ $^ $(LDFLAGS) $(shell $(PKG_CONFIG) --libs ddjvuapi) -ljpeg -lm -lpthread
+ 
+ # pdf support using poppler
+ poppler.o: poppler.c
+-	$(CXX) -c $(CFLAGS) `pkg-config --cflags poppler-cpp` $<
++	$(CXX) -c $(CFLAGS) $(shell $(PKG_CONFIG) --cflags poppler-cpp) $<
+ fbpdf2: fbpdf.o poppler.o draw.o
+-	$(CXX) -o $@ $^ $(LDFLAGS) `pkg-config --libs poppler-cpp`
++	$(CXX) -o $@ $^ $(LDFLAGS) $(shell $(PKG_CONFIG) --libs poppler-cpp)
+-- 
+2.20.1
+