gentoo resync : 28.04.2021

5 files changed, 0 insertions, 277 deletions

diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 681a42ea9677..362cd0e1e421 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,11 +1,4 @@
-AUX nlohmann_json-3.7.3-gcc-10.patch 4668 BLAKE2B 6c70c34ce5df904ed641d021c8584cf69115f7b9434d5c43c283425e7eabbe40a21f06130b36ac1681302c9498ee0570ce396f82cb9258d5bef36ed7362f526f SHA512 ece8cea0e2aa217df1915df1de138db03320b15220d725bce4cf77282b5aa71952472594066c921efd6aa8a51ad0e2b1b22e83cfa89563f211d1225190a267af
-DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B 257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280 SHA512 e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a
-DIST nlohmann_json-3.7.0.tar.gz 118868542 BLAKE2B 25191628b737ea5614de85d0fcb4425fcb2d37e6890626e6ba22949430a1c5f827ff17d1cd8245c8e98d0deda617d8268c55caff3017a6b4a2f730e524599311 SHA512 35510a0ee59d847ff9fcd4f4026ef936abb89675884fdd2db808f8349a55073206f764cd4f797deb1b6493ea0e04889505f49483e5b88798011dd5db87e7c87d
-DIST nlohmann_json-3.7.3.tar.gz 119013476 BLAKE2B c10648cacdaf6f82aa2b1db49a412165eb9f3d00fd2b2232531077209c2add27dfebfb9dcd62e6923769411a471778a18a347b524e2ed3cf6f008883333ab8cd SHA512 c416b1e14f1fd695fc30a56127ca6440de4b334858ced54a6424d9d093e4665e74b7048f9ab7253ac02ac870e64a2868c78e6c2d6de80d1bd49e50a850cec865
 DIST nlohmann_json-3.9.1-testdata.tar.gz 112348454 BLAKE2B f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d SHA512 d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
 DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B 97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090 SHA512 e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642
-EBUILD nlohmann_json-3.6.1-r1.ebuild 798 BLAKE2B 65d37e21588513c043122349c2e89450565b16c534d58849c8af36a9f14695296c624664db03585f0dfa5e8ec935dabf765290155a38714a28fc749bf66c02ea SHA512 b693e518ec9a21edbba894628d31db72463f0c54a4ae7aee190c680abec3b5197937367f44d6aaf5673a31e7a86114760ae3016a9acbec4463038dd8abbbf4c7
-EBUILD nlohmann_json-3.7.0.ebuild 802 BLAKE2B a224e06c3ef1199734674a2f693c448a1c621a2426887912510d5a09fdca0e9a108adf982bf074306098b428e5eef0d4b2ac02697038bdf41ab4c0dc38e39e82 SHA512 8499faa38a4de2f8733bfaeb2484cf7a125819db48836df2a72cefc7c107d88db5574f8096243d91f4c3e4b97a5f56e53c4fe98bb471636ff3f50d6bb107215b
-EBUILD nlohmann_json-3.7.3.ebuild 858 BLAKE2B 852622cec3d775387e1a63bd1c7fdec647d5aebb7d672dd90f780e04cfd3c254f76a56363d4b955277b80aa48dd99e8e044680735fa5a3ff05b575f64e2cdc8f SHA512 4a9435489e2fb3840ef663a915004056d3faa0ea2b6bc24d9d77d74e5c7ccdf2700a1a568938a27e7bc071bb5a9068165369e8f51d20b6217151c578c146ea55
 EBUILD nlohmann_json-3.9.1.ebuild 1402 BLAKE2B a1447d98f8b3fdaedb6de761c23de5ef1a2ea3cfca21d597075bf0ba44775ca19887791b17002d6626310356aee699c8b9a007985fe0ee80c404b9809de4965a SHA512 888ded9b7006374c1230ab51036a14db437bc9650781ba3b993ed00150f3651ab8ac57e0e35666b1e71c132d8120de6c17ceb2cc44d7aa169fd46828643570d1
 MISC metadata.xml 337 BLAKE2B a929f6f116c9b0bdf3415325cc710b4b2afa1bb2b6a74c8df9531ad0358d8141054cee8be2be7b380574a8c59359f1c9e9bd8b7fcb607b8da251b787d75dcf43 SHA512 d6ae8564e57c1062487634fb7d4e2c0fa4c79a38d89c06c3514d3459cfd08500634a5fc8add1e126f3181b711dae74931c906b67f6aac51d6400cd2800f293df
diff --git a/dev-cpp/nlohmann_json/files/nlohmann_json-3.7.3-gcc-10.patch b/dev-cpp/nlohmann_json/files/nlohmann_json-3.7.3-gcc-10.patch
deleted file mode 100644
index 1cdb6d594eca..000000000000
--- a/dev-cpp/nlohmann_json/files/nlohmann_json-3.7.3-gcc-10.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From ec955f08b47ab7cb81f6e4a4c3e7b331ddf50f71 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Art=C3=B6m=20Bakri=20Al-Sarmini?= <3sz3tt+git@gmail.com>
-Date: Sun, 12 Apr 2020 22:32:39 +0300
-Subject: [PATCH 1/2] Templatize basic_json ctor from json_ref
-
----
- include/nlohmann/detail/meta/type_traits.hpp | 13 ++++++++++++
- include/nlohmann/json.hpp                    |  8 ++++----
- single_include/nlohmann/json.hpp             | 21 ++++++++++++++++----
- 3 files changed, 34 insertions(+), 8 deletions(-)
-
-diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp
-index 280f69534..dd0b3084f 100644
---- a/include/nlohmann/detail/meta/type_traits.hpp
-+++ b/include/nlohmann/detail/meta/type_traits.hpp
-@@ -41,6 +41,19 @@ template<typename> struct is_basic_json : std::false_type {};
- NLOHMANN_BASIC_JSON_TPL_DECLARATION
- struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
- 
-+//////////////////////
-+// jspn_ref helpers //
-+//////////////////////
-+
-+template <typename>
-+class json_ref;
-+
-+template<typename>
-+struct is_json_ref : std::false_type {};
-+
-+template <typename T>
-+struct is_json_ref<json_ref<T>> : std::true_type {};
-+
- //////////////////////////
- // aliases for detected //
- //////////////////////////
-diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
-index 336d69fe7..0598efc8c 100644
---- a/include/nlohmann/json.hpp
-+++ b/include/nlohmann/json.hpp
-@@ -1773,10 +1773,10 @@ class basic_json
-     // other constructors and destructor //
-     ///////////////////////////////////////
- 
--    /// @private
--    basic_json(const detail::json_ref<basic_json>& ref)
--        : basic_json(ref.moved_or_copied())
--    {}
-+    template <typename JsonRef,
-+              detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>,
-+                                  std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
-+    basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
- 
-     /*!
-     @brief copy constructor
-diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
-index 09464f3b2..8927180e6 100644
---- a/single_include/nlohmann/json.hpp
-+++ b/single_include/nlohmann/json.hpp
-@@ -2794,6 +2794,19 @@ template<typename> struct is_basic_json : std::false_type {};
- NLOHMANN_BASIC_JSON_TPL_DECLARATION
- struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
- 
-+//////////////////////
-+// jspn_ref helpers //
-+//////////////////////
-+
-+template <typename>
-+class json_ref;
-+
-+template<typename>
-+struct is_json_ref : std::false_type {};
-+
-+template <typename T>
-+struct is_json_ref<json_ref<T>> : std::true_type {};
-+
- //////////////////////////
- // aliases for detected //
- //////////////////////////
-@@ -16632,10 +16645,10 @@ class basic_json
-     // other constructors and destructor //
-     ///////////////////////////////////////
- 
--    /// @private
--    basic_json(const detail::json_ref<basic_json>& ref)
--        : basic_json(ref.moved_or_copied())
--    {}
-+    template <typename JsonRef,
-+              detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>,
-+                                  std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
-+    basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
- 
-     /*!
-     @brief copy constructor
-
-From 70be9751cd60e622ce6463f41d47c02fc2d83cbc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Art=C3=B6m=20Bakri=20Al-Sarmini?= <3sz3tt+git@gmail.com>
-Date: Sun, 12 Apr 2020 23:42:26 +0300
-Subject: [PATCH 2/2] typo fix
-
----
- include/nlohmann/detail/meta/type_traits.hpp | 2 +-
- single_include/nlohmann/json.hpp             | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp
-index dd0b3084f..13e92cb48 100644
---- a/include/nlohmann/detail/meta/type_traits.hpp
-+++ b/include/nlohmann/detail/meta/type_traits.hpp
-@@ -42,7 +42,7 @@ NLOHMANN_BASIC_JSON_TPL_DECLARATION
- struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
- 
- //////////////////////
--// jspn_ref helpers //
-+// json_ref helpers //
- //////////////////////
- 
- template <typename>
-diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
-index 8927180e6..294e7509b 100644
---- a/single_include/nlohmann/json.hpp
-+++ b/single_include/nlohmann/json.hpp
-@@ -2795,7 +2795,7 @@ NLOHMANN_BASIC_JSON_TPL_DECLARATION
- struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
- 
- //////////////////////
--// jspn_ref helpers //
-+// json_ref helpers //
- //////////////////////
- 
- template <typename>
-
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
deleted file mode 100644
index 3f251a81fd24..000000000000
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="JSON for Modern C++"
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
-SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog.md README.md )
-
-S=${WORKDIR}/json-${PV}
-
-src_configure() {
-	local mycmakeargs=(
-		-DJSON_BuildTests=$(usex test)
-		-DJSON_MultipleHeaders=ON
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && emake -C doc
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild
deleted file mode 100644
index 6c95f15b7348..000000000000
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="JSON for Modern C++"
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
-SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog.md README.md )
-
-S=${WORKDIR}/json-${PV}
-
-src_configure() {
-	local mycmakeargs=(
-		-DJSON_BuildTests=$(usex test)
-		-DJSON_MultipleHeaders=ON
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && emake -C doc
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
deleted file mode 100644
index 4a92c0804ceb..000000000000
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="JSON for Modern C++"
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
-SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog.md README.md )
-
-S=${WORKDIR}/json-${PV}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.7.3-gcc-10.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DJSON_BuildTests=$(usex test)
-		-DJSON_MultipleHeaders=ON
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && emake -C doc
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc -r doc/html
-}