gentoo resync : 16.09.2020

4 files changed, 2 insertions, 39 deletions

diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index 8f4662562128..e8aa6a6d911f 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,9 +1,7 @@
 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
-AUX zxing-cpp-1.1.0-pkgconfig-libs.patch 632 BLAKE2B 27367f7dad02ec2189b3dc61caf455753eda158aef4db62b040199e489a3b721856997032b4ab4c253278656bde883c0133d73a6eb918177e309266cf9d19aa2 SHA512 07f73599203ab2c025279ac1efaeb7edf305a4ddbf6d3a25a92a2b2c4f462d6d16206f9c550f5882b874d36560c02057384dd56ec408cbb05c86f0fb8e6ee1ef
-AUX zxing-cpp-1.1.0-pkgconfig-version.patch 293 BLAKE2B 272ee10ff2db01e76a13da2b7f6a05cd1005f54dc8892939af2134e2670510f9b2f927ab95b9b592e493e62b8dcfc89077e5c24c4515864d71ae45f4d093eebd SHA512 2205f78792ad5d7b4a3d5de4fc38281eb882de052d83c91bac81e5c3a047628ab50e2311038cb8fde70f54dacdb768f5fcedfc3316fe8645992fd2fc50cdce0d
 DIST zxing-cpp-1.0.8.tar.gz 128506816 BLAKE2B 5f9e70c5cd123c27ee779a955cc112449094069c5be3defac57a906ea6a301e8f04886c7cb51b79007456e517db06f9f61c39228f8d8bb6a520602cac70aa7a4 SHA512 0749b3bd4d810ef024f2d8045ecf3024bba6d1816be3f5baeb3325724ac5a7359bec72b4070f8e34fbc1bc5ba2636e488b17cc8b35578b0703352d448c9d22f6
-DIST zxing-cpp-1.1.0.tar.gz 128856890 BLAKE2B 4ef93efc9e5d81c222b008b2dc7991cdb2dd38c297970b7bcaa7095323581445c32890bd20c9a3ad02013b41d0de5aaab6038b8aff892236c327bb27f922dc84 SHA512 8ae6d0c2bd21de0af99c1baa470afcdd8b0375eb1d4166bb20ad67632c39ef63e1ea07b8a691cf0bc076c87d73a8d8b0ca05007c65a09bc79697aa294dc1f44f
+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.0.ebuild 519 BLAKE2B c13098e538dabcf6ad635d5b2d54f876ce4ce34dc8c1f1dcad7aaf3ea3396cba63c6ef4f36809588a34c5c492ca902345ab110c38af4255f4e57f65d744599cc SHA512 9f9e093e002b02cd31e5093386205ca865daf5487ec14b41480eb6107afe8de247e422bdad18025d309a25724d4f7f18261be58cc0f0812577ec584f081a4bd9
+EBUILD zxing-cpp-1.1.1.ebuild 395 BLAKE2B b872f7eea798f63e985ecfe3df68c8db3b77300fbb6f8a02b6a5d30e11cd9183802f53376fcbbdfcffd8778a13aa411d5bd8fcdfd88e96d889defc23201b2a46 SHA512 8c56ccdea9a0314871e75de22979d8e70bcb223998aa6b86703e6626ea1cdcf337b0e7374ea5529a787b61211126547355d3640ed0781bceb373f4b16336a2bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-libs.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-libs.patch
deleted file mode 100644
index 48d6e814ad04..000000000000
--- a/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-libs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 877b6db1613ddae58e570801920f089c0f64b97f Mon Sep 17 00:00:00 2001
-From: Axel Waggershauser <awagger@gmail.com>
-Date: Mon, 3 Aug 2020 08:48:58 +0200
-Subject: [PATCH] Fix regression in pkgconfig file generation
-
----
- zxing.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/zxing.pc.in b/zxing.pc.in
-index b62fd15..3f429f4 100644
---- a/zxing.pc.in
-+++ b/zxing.pc.in
-@@ -6,5 +6,5 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
- Name: ZXing
- Description: ZXing library set
- Version: @VERSION@
--Libs: -L${libdir} -l@TARGET_ZXING@ 
-+Libs: -L${libdir} -lZXing
- Cflags: -I${includedir} -I${includedir}/ZXing
diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-version.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-version.patch
deleted file mode 100644
index c448d00a3094..000000000000
--- a/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-version.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} -lZXing
- Cflags: -I${includedir} -I${includedir}/ZXing
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.1.0.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
index 3441bcd60098..d8082c31f1d8 100644
--- a/media-libs/zxing-cpp/zxing-cpp-1.1.0.ebuild
+++ b/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
@@ -13,8 +13,3 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-pkgconfig-libs.patch" # git master
-	"${FILESDIR}/${P}-pkgconfig-version.patch" # bug 716818
-)