gentoo Easter resync : 12.04.2020

5 files changed, 40 insertions, 22 deletions

diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index a67079ae8a44..1c7571f4ea25 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,5 +1,5 @@
-DIST zxing-cpp-1.0.7.tar.gz 128659323 BLAKE2B 3b5d27136fe0d25ff27ed7aa8ca7d15e91a2f4c99c145143789b5795bb4af1f0a501697201307779b315af4417008123f076debb6178f51542ac3495405fed01 SHA512 e6597157099e478c2afad413e8dc3347369aef6e1a76cff331c4d71f178be97dde23e8fe89c7147eab034e2aecf1660a66e2a951f60c32d2fb67635033c1a0c8
+AUX zxing-cpp-1.0.8-pkgconfig.patch 302 BLAKE2B 9b1588b618a1ddd829c2bbc8ed9f8a19c2d69e1e7a2c7903a190d36e4672f8ff0979e8d6afd7f3ebecccf06e86421e2a7ff35120e1090620277210cacda446b9 SHA512 f43ed72a23d955d3e621e261c80ec409538b80bb2b046dcf24c37e09ecea1b4208f3d4227afbfbfeda9764f23b69cf87363a3a85a3057fef40f1a7199e1f69ac
+AUX zxing-cpp-1.0.8-version.patch 671 BLAKE2B f44f0b4a3f253f8f856d6c4b957ee8a636b0d8caaf567e6e4587005c50119db64fc7a0f1a62537af8a394f3268c4a82aca516fb3a3ba1779c63f8dec6b98cc20 SHA512 ed8fae42db39c49eaaac7a352aa6832d0b493c5a6c40a8acb36863222dce2232a545004f600b007d5f61abcfd6142f238773f30c7d476323809eebced1de202d
 DIST zxing-cpp-1.0.8.tar.gz 128506816 BLAKE2B 5f9e70c5cd123c27ee779a955cc112449094069c5be3defac57a906ea6a301e8f04886c7cb51b79007456e517db06f9f61c39228f8d8bb6a520602cac70aa7a4 SHA512 0749b3bd4d810ef024f2d8045ecf3024bba6d1816be3f5baeb3325724ac5a7359bec72b4070f8e34fbc1bc5ba2636e488b17cc8b35578b0703352d448c9d22f6
-EBUILD zxing-cpp-1.0.7.ebuild 403 BLAKE2B 1c905c23819cebaaea528d47f1ab0312eca3cb2546687cb70e20be2508c6c74134c7d83624f886f2e1d72608b9e18f178c3124df0dd3c7391768418b74197ddf SHA512 fa0153ea2effae8115c0d58c7283153b1ba7ba1ea270b29ef32ae72dd711252d99ed241a2f53fd5a91d1a29ec5771b1f83ec1819425127a20d2748b2322cbcb7
-EBUILD zxing-cpp-1.0.8.ebuild 406 BLAKE2B 50effcd76ca72b9b90b2cf5af7bd248a39f1109c550416e7bd731101ba77c7cecb64e3e0db3300b706666512c45f31938c3787b81ef3f9bc4e81c7c8082f6f6b SHA512 4704057027ad2c91eb397df50848cf46885617284ef694619d47724308a1ac488442c244249b06a27a239cfb380558d215fd221566fef1b600e76e826c2cc459
+EBUILD zxing-cpp-1.0.8-r1.ebuild 501 BLAKE2B 0eae08515984a7afa9fc1034fd7513f5a7b14198eba294f07ed87e98352a13eeee385a9d69f89245b8624e9e0f7c109db5b11170483b931b3589bb5230362051 SHA512 3ca7f943c841043d95f7bfd100f8f1f36e447265791307154f40dc2628123cb5a9115c5fb4c36c87390a1daed210808d3b831071242bc62fb85cc8501bfc2e1b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.0.8-pkgconfig.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.0.8-pkgconfig.patch
new file mode 100644
index 000000000000..d1dda4f584ef
--- /dev/null
+++ b/media-libs/zxing-cpp/files/zxing-cpp-1.0.8-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- a/zxing.pc.in	2020-04-09 11:43:22.494219440 -0400
++++ b/zxing.pc.in	2020-04-09 11:49:03.884867034 -0400
+@@ -5,6 +5,6 @@
+ 
+ Name: ZXing
+ Description: ZXing library set
+-Version: @VERSION@
++Version: @PROJECT_VERSION@
+ Libs: -L${libdir} -l@TARGET_ZXING@ 
+ Cflags: -I${includedir} -I${includedir}/ZXing
\ No newline at end of file
diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.0.8-version.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.0.8-version.patch
new file mode 100644
index 000000000000..12f379e7c7ea
--- /dev/null
+++ b/media-libs/zxing-cpp/files/zxing-cpp-1.0.8-version.patch
@@ -0,0 +1,22 @@
+From 66cc26b25633cb7f1e20f2bf7711960c321e3a7b Mon Sep 17 00:00:00 2001
+From: Huy Cuong Nguyen <huycn@users.noreply.github.com>
+Date: Thu, 19 Mar 2020 13:58:48 -0400
+Subject: [PATCH] Pump version to 1.0.8
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d851580..c996e4a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.1.3)
+ 
+ set (ZXING_VERSION_MAJOR 1)
+ set (ZXING_VERSION_MINOR 0)
+-set (ZXING_VERSION_PATCH 7)
++set (ZXING_VERSION_PATCH 8)
+ 
+ project (ZXingCpp VERSION ${ZXING_VERSION_MAJOR}.${ZXING_VERSION_MINOR}.${ZXING_VERSION_PATCH})
+ 
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.0.7.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.0.7.ebuild
deleted file mode 100644
index 8a437d07071c..000000000000
--- a/media-libs/zxing-cpp/zxing-cpp-1.0.7.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="C++ Multi-format 1D/2D barcode image processing library"
-HOMEPAGE="https://github.com/nu-book/zxing-cpp"
-SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND=""
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.0.8.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.0.8-r1.ebuild
index ecc4935d72c5..fb0c6d9f4284 100644
--- a/media-libs/zxing-cpp/zxing-cpp-1.0.8.ebuild
+++ b/media-libs/zxing-cpp/zxing-cpp-1.0.8-r1.ebuild
@@ -11,7 +11,10 @@ SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
-DEPEND=""
+PATCHES=(
+	"${FILESDIR}/${P}-pkgconfig.patch" # bug 716818
+	"${FILESDIR}/${P}-version.patch" # bug 716818
+)