gentoo resync : 25.11.2020

5 files changed, 13 insertions, 59 deletions

diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index 5faf31f1aed0..9370551c35c1 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,7 +1,3 @@
-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
 DIST zxing-cpp-1.1.1.tar.gz 128925736 BLAKE2B d2d6b4b13c26ee1bf8c9f1188809207f895d9ab4bde83e7e06d85d7105c56021bb9f82f34b9f11e1c8ff5b82825de127d1bc873745fa6ef603a8d206f3eaedec SHA512 c7d97df147602e31e58eede54413814378895e9710cf266de984b22965a9a3f4c67648a0bf936a8bc8b213b45def59d1e5b34d6ce516265333dd2c0430554dc7
-EBUILD zxing-cpp-1.0.8-r1.ebuild 501 BLAKE2B 0eae08515984a7afa9fc1034fd7513f5a7b14198eba294f07ed87e98352a13eeee385a9d69f89245b8624e9e0f7c109db5b11170483b931b3589bb5230362051 SHA512 3ca7f943c841043d95f7bfd100f8f1f36e447265791307154f40dc2628123cb5a9115c5fb4c36c87390a1daed210808d3b831071242bc62fb85cc8501bfc2e1b
-EBUILD zxing-cpp-1.1.1.ebuild 402 BLAKE2B a9e4b0ddefafe3e002dacd42dd6caa470b12984661a04a78607476a31cc6cab6084214b04e24c5fa0b73f5afa29e525c4f6fb7ff2d85aa1ee991fe99e3335ca2 SHA512 e4fdf1251ca059a0dd76af092284ef4b2d00a29d36735414bb97a33b245e1d775313e923f3710d7e3fc1350fdfee7548d8da737516ade48c999d7d037765d306
+EBUILD zxing-cpp-1.1.1.ebuild 581 BLAKE2B d8f997530e0fece0dc6f2e20bd1c7237e8c7d9fbb83e022a944546142cf4c4f1b8a82f74f1387ec57db065ff0280aeb68f2b27824cc4052e2a217d1825c7fc1d SHA512 4fbb4435837c59c75bcd075cd83304a405dc578d6e06414404a9c1a5ea2bf59e00320c0674158f3f16b37d2ae13f5800f1324a944fabe9703c86e2c65bfd6336
 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
deleted file mode 100644
index d1dda4f584ef..000000000000
--- a/media-libs/zxing-cpp/files/zxing-cpp-1.0.8-pkgconfig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 12f379e7c7ea..000000000000
--- a/media-libs/zxing-cpp/files/zxing-cpp-1.0.8-version.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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.8-r1.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.0.8-r1.ebuild
deleted file mode 100644
index fb0c6d9f4284..000000000000
--- a/media-libs/zxing-cpp/zxing-cpp-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 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=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-pkgconfig.patch" # bug 716818
-	"${FILESDIR}/${P}-version.patch" # bug 716818
-)
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
index f31cea8e8ba1..a43d3881a651 100644
--- a/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
+++ b/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
@@ -11,5 +11,15 @@ 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 ~ppc64 ~x86"
-IUSE=""
+KEYWORDS="amd64 arm64 ~ppc64 x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=OFF # nothing is installed
+		-DBUILD_BLACKBOX_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}