gentoo resync : 03.11.2018

4 files changed, 73 insertions, 4 deletions

diff --git a/dev-cpp/libjson-rpc-cpp/Manifest b/dev-cpp/libjson-rpc-cpp/Manifest
index 07fe6299c6db..2710af3b17ee 100644
--- a/dev-cpp/libjson-rpc-cpp/Manifest
+++ b/dev-cpp/libjson-rpc-cpp/Manifest
@@ -1,4 +1,6 @@
 DIST libjson-rpc-cpp-1.1.0.tar.gz 179442 BLAKE2B cfbfe703d1a3d4ccaf6d4d475a7c1686c8f7afc28b025d6fd3bfebdc41cff2b944e6600e68073c1b7e7c0a2463cbf6e9724cf618c5d481bf7a4600019b529922 SHA512 bf34eedb196b1e214292976036a00e933f8a9b4325441ea2e4ae049a7c818014a68dd9d2f22d01588f5e6d1e9f465c73a133b0fd8282f8cf78a05a493f4c461b
-EBUILD libjson-rpc-cpp-1.1.0-r1.ebuild 1578 BLAKE2B e08cbcc95c27ab00ea6a5e14511483cf91859861678490582141e656cfdc151faf03bb38bf293fc8d7881e1b76147d2f0b55f72cfa8458ad3455818acfb22ffa SHA512 0c69ae65814531b2913f7ba798257b19f228e4c9cdadf30e213154054a1d1c568258de10a0fc790058a095a4a626fd4292fedcb1cb6922d7f1795f3869dc139f
-EBUILD libjson-rpc-cpp-9999.ebuild 1578 BLAKE2B c34b5d32503634598cff062700dbffff405fd379ee7b135caf4e73c3c6b1588700f76721055dcfece7a646c006d963c428e87feef68b7b70c0e27fb750e8ba4e SHA512 ced365eca73b4618e5fa5c09bbfaf1a1acf2354a8120bb5b2202d45a40ec49f574bff4ba3fcbd9137d81f910b377de85669ca6fd38936c909648ed527116d5c7
+DIST libjson-rpc-cpp-1.1.1.tar.gz 179249 BLAKE2B bd8b737f76bceaa1be73d89a1f75472d8eae6f3da57a4da5a5a9eee2a52ba06034bcb4404e6b65368f6be1967c1a8b40f71e3bfbaa58f65b0ac8dced1b3f43af SHA512 64043aee3227262da41b56f6d53e4f8f9a56d3a43b695200020b47fb7eb6e121cf086b6e121c0eccecf381be90d77910d0f4371254d147f33310af4584a7d433
+EBUILD libjson-rpc-cpp-1.1.0-r1.ebuild 1581 BLAKE2B 1014949d138562647f2ab770acc5e55f9747e30541ded868def799b0019a98f2a03a770196cce2fd43c58da7bf5057c620d810df1b55d1b4aa08661b1205614f SHA512 d9fdbb75f52eb2b0f87c850249594e33d5497173bbf440866576d67e836db7cd953c1a970c01c7baa8e55b16d1292ad04d9eb68b81b045d7167c3b059240337d
+EBUILD libjson-rpc-cpp-1.1.1.ebuild 1581 BLAKE2B 1014949d138562647f2ab770acc5e55f9747e30541ded868def799b0019a98f2a03a770196cce2fd43c58da7bf5057c620d810df1b55d1b4aa08661b1205614f SHA512 d9fdbb75f52eb2b0f87c850249594e33d5497173bbf440866576d67e836db7cd953c1a970c01c7baa8e55b16d1292ad04d9eb68b81b045d7167c3b059240337d
+EBUILD libjson-rpc-cpp-9999.ebuild 1581 BLAKE2B 78e777d3bdceadac80447b06172721c9ce9ec305506139c02e27eb8949a14bb0cb01973c65f100ab04a8dcd3402cd870d310072857a06bd3b7853f24ba79ad56 SHA512 5274fa26277ac9d0d93f597bea433a7e6bdffec0e6c332a8704c305485eaa468169998205d485bf2b65f47420f49abfadcf1c6383fc7f8f983379c8aeeb7beb0
 MISC metadata.xml 906 BLAKE2B fe2f020896cc35c9c27fe082bf7a844086445b8943690c35de3de091041473b0a211370e335908470faf1bfdf0fb64b4b6aee75dfd527683d173c3e9fc8d9cf9 SHA512 037b5942cdde13abab5f527cdb8fced709b88bbebb754497279b1d60e7c90789115ecc2f579c38111c2acf32a3baf2643b470e55deb9de36bc498e9665091a83
diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.0-r1.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.0-r1.ebuild
index 73b204623f7b..d04f0daefd39 100644
--- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.0-r1.ebuild
+++ b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.0-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	stubgen? ( dev-libs/argtable:= )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
-	test? ( dev-cpp/catch )"
+	test? ( <dev-cpp/catch-2 )"
 
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1.ebuild
new file mode 100644
index 000000000000..d04f0daefd39
--- /dev/null
+++ b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="JSON-RPC (1.0 & 2.0) framework for C++"
+HOMEPAGE="https://github.com/cinemast/libjson-rpc-cpp"
+SRC_URI="https://github.com/cinemast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +http-client +http-server redis-client redis-server +stubgen test"
+
+RDEPEND="
+	dev-libs/jsoncpp:=
+	http-client? ( net-misc/curl:= )
+	http-server? ( net-libs/libmicrohttpd:= )
+	redis-client? ( dev-libs/hiredis:= )
+	redis-server? ( dev-libs/hiredis:= )
+	stubgen? ( dev-libs/argtable:= )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( <dev-cpp/catch-2 )"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DHTTP_CLIENT=$(usex http-client)
+		-DHTTP_SERVER=$(usex http-server)
+		-DREDIS_CLIENT=$(usex redis-client)
+		-DREDIS_SERVER=$(usex redis-server)
+		# they have no deps
+		-DTCP_SOCKET_CLIENT=ON
+		-DTCP_SOCKET_SERVER=ON
+		-DUNIX_DOMAIN_SOCKET_CLIENT=ON
+		-DUNIX_DOMAIN_SOCKET_SERVER=ON
+		# they are not installed
+		-DCOMPILE_EXAMPLES=OFF
+		-DCOMPILE_STUBGEN=$(usex stubgen)
+		-DCOMPILE_TESTS=$(usex test)
+		-DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use doc && emake -C "${BUILD_DIR}" doc
+}
+
+src_test() {
+	# Tests fail randomly when run in parallel
+	local MAKEOPTS=-j1
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use doc && dodoc -r "${BUILD_DIR}"/doc/html
+}
diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild
index 55ab0c1f82f2..0e617416361e 100644
--- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild
+++ b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	stubgen? ( dev-libs/argtable:= )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
-	test? ( dev-cpp/catch )"
+	test? ( <dev-cpp/catch-2 )"
 
 RESTRICT="!test? ( test )"