gentoo resync : 14.05.2020

4 files changed, 2 insertions, 113 deletions

diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index a658004c805e..b9968357fdd8 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,8 +1,5 @@
 DIST jsoncpp-1.9.1.tar.gz 203067 BLAKE2B 654f39b1265b344bb24d3fefb34d4d8b44f69ec819f333f00033ef90acfd5b926fdcc743badf403af797a6f58fe58d195ec0cdf4a1514629f8a1e75c20a6e2f6 SHA512 4a8352e1d32c0ba8a0aea4df1663279cb2256b334643c5b62be37dfb5951e06900ba38c010d1201511fcf7de09137d6a4b886edbb2b99160d2f62b5f4679f766
-DIST jsoncpp-1.9.2.tar.gz 211341 BLAKE2B 9081bf2b2599194c1c77476287e34aaeacc3c331147db79e3343eae28321e55dbfc8d74faf899912c257194030d39eac4fdb016a68290755badd1b68b0a69dd4 SHA512 7c7188199d62ae040d458d507ba62f0370c53f39c580760ee5485cae5c08e5ced0c9aea7c14f54dfd041999a7291e4d0f67f8ccd8b1030622c85590774688640
 DIST jsoncpp-1.9.3_pre20200412.tar.gz 212522 BLAKE2B 17b0cc2ef40ae932c6ff26c0fa77e8326099a1b6f088e53697c2a3c286d23ef63dd372f2ba721025b84670957689251c2d15083bdd24565715a78beac556ead2 SHA512 6e58870c5c478fe2bba125c50c4f77654f304051f4091cc5a98f9a3c9aefbb94d1156eb07ce004a7683675fd971ec825a0828803042d9b03783b1debf3a39e2b
 EBUILD jsoncpp-1.9.1.ebuild 1368 BLAKE2B 5ea4045f527ec2abb4d2585dcbc9257ce03d06175b1f85a0bca909c8575290316bf0ea833ec06b22cb45a70785f4dc80edaaa23debbda8b6e9668eddaf059109 SHA512 951d7df79acc8b22544cc83c9ff7fbe0b670722764eedc01024c115cf574e535ea5ef7bfeb833a0971f01ae0d1e927af7713bbee9dc4f5f0076c878075864229
-EBUILD jsoncpp-1.9.2-r1.ebuild 1373 BLAKE2B 285cfd5eb499bcc6d5f8b40e02745cbf4943a6c2d4cac4bc37876921916823b3d9724a168840c7c0852d40d8b9327d72e08bd547db6b2283a7aa482ee64ae568 SHA512 38b96a2d3a8f0c96b10ca69ab9e8f15071ceadcdda2ffce63118744b575dfa599964e61e4e789600dcb9bad719f57a339bc7f06c0ad19c990c407fae8ab9e5a9
-EBUILD jsoncpp-1.9.2-r2.ebuild 983 BLAKE2B 20049465d3efd00697c503f38bf6fcf5307a4692c782121af8b716d1c2ac4ae1f64f2dce4832f3102ee9d9bf9fc0413d48f5c345193b8696ad4af66c78a49f36 SHA512 cd7634e93310fb89cd00090cb23633aabc2ca97ecc9ed64b103fc722464905c364d2754b256052b6ed4258225d5da8097097d68d471d7f0e845fb4235abf065f
-EBUILD jsoncpp-1.9.3_pre20200412.ebuild 1127 BLAKE2B 30a5ad4f739aa1ffab163520e17c58150dbf8b6d659a4ca6f89a8fba0cd0f3462bcfc009be942a3c9342dd927260437fc53362fc6d054935b1ceb636fe70906e SHA512 0d59d146079643119a106ed7e5d7f8d4af3357a50685891cbeba94e58ce8410ae4e82624c6583a279be70879af305378921f85148cdb18ecfb5957a7ba1d7de3
+EBUILD jsoncpp-1.9.3_pre20200412.ebuild 1118 BLAKE2B 7454688bae7e11a6ee228f0d3235efcd04b74ee73900a1a18dc29fc9b4b25b767a2c7325a9869384b2bdb03202affa7ba3c1ded15cad20d36bc226dfc2aafb78 SHA512 1b63de1ff112e0bb1d7f94161f81227052602ee49be09ae2cce5bdda5819be0ab98246b44880da496b6b927cbd8fa98a3bdc8410e0983f003ab16d7a145416b1
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
deleted file mode 100644
index 9f860d0efe42..000000000000
--- a/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake-utils python-any-r1
-
-DESCRIPTION="C++ JSON reader and writer"
-HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
-SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( public-domain MIT )"
-SLOT="0/22"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	doc? (
-		app-doc/doxygen
-		${PYTHON_DEPS}
-	)
-	test? (
-		${PYTHON_DEPS}
-	)"
-RDEPEND=""
-
-pkg_setup() {
-	if use doc || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DJSONCPP_WITH_TESTS=$(usex test)
-		-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
-		-DJSONCPP_WITH_CMAKE_PACKAGE=ON
-
-		-DBUILD_SHARED_LIBS=ON
-
-		# Follow Debian, Ubuntu, Arch convention for headers location
-		# bug #452234
-		-DCMAKE_INSTALL_INCLUDEDIR=include/jsoncpp
-
-		# Disable implicit ccache use
-		-DCCACHE_FOUND=OFF
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		cp "${BUILD_DIR}"/version . || die
-		"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
-		HTML_DOCS=( dist/doxygen/jsoncpp*/. )
-	fi
-}
-
-src_test() {
-	cmake-utils_src_make jsoncpp_check
-}
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.2-r2.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.2-r2.ebuild
deleted file mode 100644
index 1d3ec5bb05e6..000000000000
--- a/dev-libs/jsoncpp/jsoncpp-1.9.2-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit meson python-any-r1
-
-DESCRIPTION="C++ JSON reader and writer"
-HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
-SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( public-domain MIT )"
-SLOT="0/22"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_configure() {
-	local emesonargs=(
-		# Follow Debian, Ubuntu, Arch convention for headers location
-		# bug #452234
-		--includedir include/jsoncpp
-	)
-	meson_src_configure
-}
-
-src_compile() {
-	meson_src_compile
-
-	if use doc; then
-		echo "${PV}" > version || die
-		"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
-		HTML_DOCS=( dist/doxygen/jsoncpp*/. )
-	fi
-}
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.3_pre20200412.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.3_pre20200412.ebuild
index 7011d73b2478..cb7119c28970 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.3_pre20200412.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.3_pre20200412.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"