5 files changed, 18 insertions, 44 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index b79dedfef7d3..a180cfa79b72 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 3f0b7370ab60..64ac4c5511f2 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,6 +1,5 @@
-DIST nlohmann_json-3.5.0.tar.gz 114796008 BLAKE2B 94caa0374be1d38230cb13b8cd9deb3da04e4b81d361ce6baf54c1bad231945a94df74683a31660dc98413dbf23ea7596c6ed1da9cda9e02add7d7c6568973e3 SHA512 e2874e10e12070e8e1b9c01f41ce24002a3859c4aca8bf46083ea08e68f44ed6725bdcdf8e592b1e50d69975d506836c62a8e10fc6da00f0844c149dd6676996
 DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B 257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280 SHA512 e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a
-EBUILD nlohmann_json-3.5.0.ebuild 642 BLAKE2B 6febe4e494834b7b050fcb4bfe2556b364dd2ef0d61bf2f83d837ec8a30bef517c80e67d1676e2b65957debf642fd2da5e8fdbeeaf16159149d8a96fef4fb165 SHA512 649bd0a762be3b89acfbcba0c49c683f5ac8a5ed4d07180033930ed7446d48a989781d2b2d5a2671bcaf7be02e5ff4e562d0186bd1c4d2b4c40a8b6a78993e99
-EBUILD nlohmann_json-3.6.1-r1.ebuild 796 BLAKE2B 8020ac7bfbc49b28003496756db87a054bd9d8cb7db8e72e9f4a43710a98253e783c978bb2b3f33f60c67d146819a839173c7de30e05ac4aaab25ba207bd89f2 SHA512 c4a5dd90a90715a2371d41db848027ee250bf8eff12fdae2700985712fe1c09e3bcf34752216094ab9919dbe0afcec0e5bb870e72f7f0af2497949ba7502fd76
-EBUILD nlohmann_json-3.6.1.ebuild 642 BLAKE2B 6febe4e494834b7b050fcb4bfe2556b364dd2ef0d61bf2f83d837ec8a30bef517c80e67d1676e2b65957debf642fd2da5e8fdbeeaf16159149d8a96fef4fb165 SHA512 649bd0a762be3b89acfbcba0c49c683f5ac8a5ed4d07180033930ed7446d48a989781d2b2d5a2671bcaf7be02e5ff4e562d0186bd1c4d2b4c40a8b6a78993e99
+DIST nlohmann_json-3.7.0.tar.gz 118868542 BLAKE2B 25191628b737ea5614de85d0fcb4425fcb2d37e6890626e6ba22949430a1c5f827ff17d1cd8245c8e98d0deda617d8268c55caff3017a6b4a2f730e524599311 SHA512 35510a0ee59d847ff9fcd4f4026ef936abb89675884fdd2db808f8349a55073206f764cd4f797deb1b6493ea0e04889505f49483e5b88798011dd5db87e7c87d
+EBUILD nlohmann_json-3.6.1-r1.ebuild 795 BLAKE2B 194e4405f85cf5af863ba508f208914cc377de742670f1c770922d2ad88bcd9db2be6717bee5645099bf15267fc868e25dba2eb68c97f9440d2577a73b8b681c SHA512 f2f49a7a3b4ba70aae958776c398c089dbc422e3d1d84341084a176fea83dc60c3aa9179f83c9e5208a2e02ac9e2936e700b1152888811a9b907804e503416c0
+EBUILD nlohmann_json-3.7.0.ebuild 826 BLAKE2B ad11525844e3218cc5f8fdfd53ae1555485a69c0a09373116cfb76c2c0a128e21eac91cb4b6df7132247ec234705d38eafe4b510120c4c1b09a3a016b5c8d826 SHA512 3da1d5e5080d2e9747ef8054a0003fb651631b6af2d7a4374c2202407833137e15434751f5e513a8dd9b67bb16b49203c813915496aaf47f65f502d44e273097
 MISC metadata.xml 337 BLAKE2B a929f6f116c9b0bdf3415325cc710b4b2afa1bb2b6a74c8df9531ad0358d8141054cee8be2be7b380574a8c59359f1c9e9bd8b7fcb607b8da251b787d75dcf43 SHA512 d6ae8564e57c1062487634fb7d4e2c0fa4c79a38d89c06c3514d3459cfd08500634a5fc8add1e126f3181b711dae74931c906b67f6aac51d6400cd2800f293df
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
index 7a0a142cd580..583d0ff52fc5 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc test"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1.ebuild
deleted file mode 100644
index fd4f1a4593e9..000000000000
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-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"
-
-DEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog.md README.md )
-
-S=${WORKDIR}/json-${PV}
-
-src_compile() {
-	meson_src_compile
-	use doc && emake -C doc
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	meson_src_install
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.5.0.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild
index fd4f1a4593e9..ed480ec910fb 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.5.0.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit meson
+inherit cmake-utils
 
 DESCRIPTION="JSON for Modern C++"
 HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
@@ -12,7 +12,8 @@ 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"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="doc? ( app-doc/doxygen )"
 
@@ -20,8 +21,17 @@ DOCS=( ChangeLog.md README.md )
 
 S=${WORKDIR}/json-${PV}
 
+src_configure() {
+	local mycmakeargs=(
+		-DJSON_BuildTests=$(usex test)
+		-DJSON_MultipleHeaders=ON
+	)
+
+	cmake-utils_src_configure
+}
+
 src_compile() {
-	meson_src_compile
+	cmake-utils_src_compile
 	use doc && emake -C doc
 }
 
@@ -30,6 +40,6 @@ src_test() {
 }
 
 src_install() {
-	meson_src_install
+	cmake-utils_src_install
 	use doc && dodoc -r doc/html
 }