gentoo resync : 31.03.2018

3 files changed, 0 insertions, 82 deletions

diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 59e371327e7f..a16e3d4477f4 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,5 +1,3 @@
-AUX jsoncpp-0.10.2-arm.patch 825 BLAKE2B 1d79b8633215825c84214379013d4f5cde03936ca9c933010422fbcb6d75932111094647aa61844dfe4d7cd2042f0445726c3fd560efdea9608ef9559fa17658 SHA512 2f30d2802c9018c93d30c84011fba2b2fadbb78c84e1b0a3a995c482f50caefb7a8fad12adc355fc4af0fce730a9557c1714f250fde130907b746288c664870c
-AUX jsoncpp-1.6.2-fix-pkgconfig.patch 2271 BLAKE2B 24fee66b70f4b21a249fb962af6bf7a7dc0bcf4bf65e767abd04e24892b63c8b44c29854d0842f2735688268b665afaaa2a75d98d1e6bd0404409dc2ba529840 SHA512 5efa120a5da7695cd9b8d4420b6247479f639bdca35c0627aaca45167c4fb46a7c04243ebdec6468217aa171a8f2333912fe062eae355668d64d6a4cdffca1a5
 DIST jsoncpp-1.8.1.tar.gz 210629 BLAKE2B 5f9a7f51b463784c5a74a78b7189800a37797f233b1d5a66d34edc0689c77a2b96b230c0ed4dfc749401087c551dd5659a6d152e09342ca92250ce9ea91a293e SHA512 4203826fca4c366b51d28ffc928399c914ffaba8be1cada64ff118b5742e6b469d3fc3e59344587d851447857b479794c5697d4fd11a9a55b32a3a7a801b745b
 DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
 EBUILD jsoncpp-1.8.1.ebuild 1353 BLAKE2B a561f153e32b1b81043fc02b64020a51235fb6557626aeceb49ddb58be7a424f8da93c2c8db7bb16a24a4d6cd86e01f8c7290f22926d983794fa2969ce4cbd1f SHA512 1479c2d2c5069ff392f158dc7f0e8320b1414d15ebb941a62a3e1359baf482e3e07093b828e38796180f5b08866e081fe3cd9f62efdca5104e9c583a1ec24a82
diff --git a/dev-libs/jsoncpp/files/jsoncpp-0.10.2-arm.patch b/dev-libs/jsoncpp/files/jsoncpp-0.10.2-arm.patch
deleted file mode 100644
index 838ef8487946..000000000000
--- a/dev-libs/jsoncpp/files/jsoncpp-0.10.2-arm.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 96412d2964775fd6fb9bf359936743dd508af8ba Mon Sep 17 00:00:00 2001
-From: Christopher Dunn <cdunn2001@gmail.com>
-Date: Wed, 10 Jun 2015 21:22:24 -0500
-Subject: [PATCH] fix #290
-
-(cherry picked from commit 2760c7902a5cc7173aabe4e1f31dcf93e79377d5)
----
- src/test_lib_json/main.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
-index 85110ad..080ba6e 100644
---- a/src/test_lib_json/main.cpp
-+++ b/src/test_lib_json/main.cpp
-@@ -296,7 +296,10 @@ JSONTEST_FIXTURE(ValueTest, null) {
-   JSONTEST_ASSERT_EQUAL(0.0, null_.asFloat());
-   JSONTEST_ASSERT_STRING_EQUAL("", null_.asString());
- 
-+#if !defined(__ARMEL__)
-+  // See line #165 of include/json/value.h
-   JSONTEST_ASSERT_EQUAL(Json::Value::null, null_);
-+#endif
- }
- 
- JSONTEST_FIXTURE(ValueTest, strings) {
diff --git a/dev-libs/jsoncpp/files/jsoncpp-1.6.2-fix-pkgconfig.patch b/dev-libs/jsoncpp/files/jsoncpp-1.6.2-fix-pkgconfig.patch
deleted file mode 100644
index 5c3420e45004..000000000000
--- a/dev-libs/jsoncpp/files/jsoncpp-1.6.2-fix-pkgconfig.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From e6f1cffdd3fb04a0ed96319e6f8df6a7cbdd1557 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 19 May 2015 17:32:31 +0200
-Subject: [PATCH] Fix custom includedir & libdir substitution in pkg-config
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Do not prepend ${prefix} to substituted includedir & libdir
-in the pkg-config file -- if the paths are overriden by user, CMake puts
-absolute paths there (even if user specifies a relative path). Instead,
-use the absolute path provided by CMake and appropriately default
-LIBRARY_INSTALL_DIR & INCLUDE_INSTALL_DIR to absolute paths with
-${CMAKE_INSTALL_PREFIX} prepended.
-
-Fixes: https://github.com/open-source-parsers/jsoncpp/issues/279
-Signed-off-by: Michał Górny <mgorny@gentoo.org>
----
- CMakeLists.txt           | 6 +++---
- pkg-config/jsoncpp.pc.in | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 30038d5..d31a6ad 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,11 +25,11 @@ SET(LIB_SUFFIX "" CACHE STRING "Optional arch-dependent suffix for the library i
- 
- SET(RUNTIME_INSTALL_DIR bin
-     CACHE PATH "Install dir for executables and dlls")
--SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX}
-+SET(ARCHIVE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
-     CACHE PATH "Install dir for static libraries")
--SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX}
-+SET(LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
-     CACHE PATH "Install dir for shared libraries")
--SET(INCLUDE_INSTALL_DIR include
-+SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include
-     CACHE PATH "Install dir for headers")
- SET(PACKAGE_INSTALL_DIR lib${LIB_SUFFIX}/cmake
-     CACHE PATH "Install dir for cmake package config files")
-diff --git a/pkg-config/jsoncpp.pc.in b/pkg-config/jsoncpp.pc.in
-index 9613181..3ca4a84 100644
---- a/pkg-config/jsoncpp.pc.in
-+++ b/pkg-config/jsoncpp.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/@LIBRARY_INSTALL_DIR@
--includedir=${prefix}/@INCLUDE_INSTALL_DIR@
-+libdir=@LIBRARY_INSTALL_DIR@
-+includedir=@INCLUDE_INSTALL_DIR@
- 
- Name: jsoncpp
- Description: A C++ library for interacting with JSON