gentoo resync : 03.11.2018

8 files changed, 73 insertions, 208 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 14aa3210e088..0ce4d5e50dac 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 2ca925028dfb..cd017d27bf48 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -2,11 +2,7 @@ AUX eigen-3.2.7-adaolc-backport.patch 1192 BLAKE2B 92be1ae6f4310a8b6b7ffce4f2471
 AUX eigen-3.2.7-pastix-5.2-backport.patch 1893 BLAKE2B 4b192d74f12f579afd8ea1574a8219daa0a4b266981470f10285d3b9f2520b2e6d0117f343ef42ac5a73a4ef11db74d177ea8f3294d64b8bab1c620e49664402 SHA512 8d5a05dc707c08161895fc566b94b38d8e190869178f1e89a616062e81f2c1e8b4b05461b3e962671f5338b14bec474ff539da054f22af74c53187e0194aeee1
 AUX eigen-3.3.5-fix-prototype.patch 706 BLAKE2B 18111be2400aabbf475b5c6d6640165a18cb12428eeb715baad3bb8c88a2c2f04f525af27c2c8c16b94fec290d46749533e06508ea7e90c5312babf85a005c80 SHA512 0aed176f7b6622b5b0b7160a314dbca97043e0f0dc5f81ccb2416f5ca92843fc2734352404c40ae8951c56a0d036179ac53ed01b92ebd19bc45adeea243ffb9c
 DIST eigen-3.2.8.tar.bz2 1161201 BLAKE2B 35bace5138f601e73d56412e87bf591ef2f96778050b0a2a4fc8f1e75f02498fb4eb80bf79988dd4bd6b985945a122d44581ccedd925f398f7d282790da06385 SHA512 53c27ba530c985dfef52188e03273eeef33abbc67e3f150cacd3371c8b9ddbd399228730595821c4c56c061d109cf509266c1dab2b8a7c730902cbd6fb18c100
-DIST eigen-3.3.3.tar.bz2 1642001 BLAKE2B 51d870a6bf04865c39642205ac8e12fd638e1d383fb33b064835ce4b5a4d4b056507c1a4fc65d9e665bf659ffd742179415caccac27c203c9388ca267e29e802 SHA512 bb5a8b761371e516f0a344a7c9f6e369e21c2907c8548227933ca6010fc607a66c8d6ff7c41b1aec3dea7d482ce8c2a09e38ae5c7a2c5b16bdd8007e7a81ecc3
-DIST eigen-3.3.4.tar.bz2 1657543 BLAKE2B 62ae6e42972fcfe71bfcda359d35674207440813edc856f209f37321c7f8d39498c6c6fb33d80cc14129113c1dff849212f034ab925b6656e99ed192f4af2fbb SHA512 d67a3fd8f7ce811af65fc1d43ec347dadf9c643a49135f7e455fc303773bad09e80a125282c7dfca7a1993b79e1f66576ac92418119fbb0fa50c1a581b957c0d
 DIST eigen-3.3.5.tar.bz2 1663467 BLAKE2B 7f4b6339f8cea815004057361734e53129b5bde45c9c310eab87f0aa20da90e46dd67359e669f8b36477339df7bd7c8bd8eb18baaf0f1a779372ec3623c50aca SHA512 740ed41862c1e422a751b205513754e9c7bd04cc8ad4e3b08e2ccd1c1d30dea43a90896bc8eecd0cb4253b4adf803a814ddd48d6166fb5a53f507cf3e6940a38
 EBUILD eigen-3.2.8-r2.ebuild 2578 BLAKE2B 106cce3438812d9d0800e4d9096d57532557ecdddd33b1f812d992a7d89bf107bd71128a18f9a9649408690f4bc61cc88037f5f623e7477a4a987cb500d70bd9 SHA512 4b7876b48f2bfbe54db5b764d1ec1e7ad371c46beabb4befac3bd980572a081f86f9c07ad985c11a8aa5d7f4b01afee172abe6e2f09d017ce9d6a7b8ce4fbe8d
-EBUILD eigen-3.3.3.ebuild 2174 BLAKE2B 1da2f5fae41e0d1840f17fe4f4874e6a0cc880d3301e50ec58bc1c1c191322ba51f011374d78dfb5177f1c5723b0720bf310a832c1d732f51e828906d21dcf2d SHA512 05847d3373073e3d7d89d90678dfdb9c9f80590285634f6f3dd2ba9c73004275e7413b69d9205d9c92c6e62a902d3fa0f43fdbd56c4a3fc51b8b170f539e57c4
-EBUILD eigen-3.3.4.ebuild 2174 BLAKE2B 1da2f5fae41e0d1840f17fe4f4874e6a0cc880d3301e50ec58bc1c1c191322ba51f011374d78dfb5177f1c5723b0720bf310a832c1d732f51e828906d21dcf2d SHA512 05847d3373073e3d7d89d90678dfdb9c9f80590285634f6f3dd2ba9c73004275e7413b69d9205d9c92c6e62a902d3fa0f43fdbd56c4a3fc51b8b170f539e57c4
 EBUILD eigen-3.3.5-r1.ebuild 2238 BLAKE2B e0777ad78a4a7bd919cca9bfc55a7d0170870e7471b625a81d816c44edc2594634d9f35775d4b74b7d8e518e1da7c74dd9460f851a511fa0a0f2832a9ce2afb6 SHA512 63274b3971cd5186c009023f06f1aeba9e711796cd57c5ffee12fbd76196c06348016f4ea801d7af791cc580cd55a05cbb8ecfeb7be5ab718851a1bbd2e8fe1e
 MISC metadata.xml 945 BLAKE2B 1e9f416b0c69bc66b08934efc902a21f557bcf5b910439dee978b46a11b0b6767681d6bb298402b050b3e994b56ad9163b91c2d526f8fd04eeb5b9ac3c74f451 SHA512 c5401b0251bf5668117951522b019e6fcce6b5ed41ec933a6edec7869ed5505040d8f75fea7c4c17eeb691f331412bc3d2a7103b7f706cd582496feb6e7a3e57
diff --git a/dev-cpp/eigen/eigen-3.3.3.ebuild b/dev-cpp/eigen/eigen-3.3.3.ebuild
deleted file mode 100644
index 610de4a257b0..000000000000
--- a/dev-cpp/eigen/eigen-3.3.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED="test"
-
-inherit cmake-utils cuda fortran-2
-
-DESCRIPTION="C++ template library for linear algebra"
-HOMEPAGE="http://eigen.tuxfamily.org/"
-SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="MPL-2.0"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="altivec c++11 cuda debug doc neon openmp test" #zvector vsx
-RESTRICT="!test? ( test )"
-
-RDEPEND="!dev-cpp/eigen:0"
-DEPEND="
-	doc? ( app-doc/doxygen[dot,latex] )
-	test? (
-		dev-libs/gmp:0
-		dev-libs/mpfr:0
-		media-libs/freeglut
-		media-libs/glew
-		sci-libs/adolc[sparse]
-		sci-libs/cholmod
-		sci-libs/fftw:3.0
-		sci-libs/pastix
-		sci-libs/umfpack
-		sci-libs/scotch
-		sci-libs/spqr
-		sci-libs/superlu
-		virtual/opengl
-		virtual/pkgconfig
-		cuda? ( dev-util/nvidia-cuda-toolkit )
-	)
-"
-# Missing:
-# METIS-5
-# GOOGLEHASH
-
-src_unpack() {
-	default
-	mv ${PN}* ${P} || die
-}
-
-src_prepare() {
-	sed -e 's:-g2::g' \
-		-i cmake/EigenConfigureTesting.cmake || die
-
-	sed -e "/add_subdirectory(demos/d" \
-		-i CMakeLists.txt || die
-
-	if ! use test; then
-		sed -e "/add_subdirectory(test/d" \
-			-i CMakeLists.txt || die
-
-		sed -e "/add_subdirectory(blas/d" \
-			-e "/add_subdirectory(lapack/d" \
-			-i CMakeLists.txt || die
-	fi
-	sed -e "/Unknown build type/d" \
-		-i CMakeLists.txt || die
-
-	use cuda && cuda_src_prepare
-
-	cmake-utils_src_prepare
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doc
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DEIGEN_TEST_NOQT=ON
-		-DEIGEN_TEST_ALTIVEC="$(usex altivec)"
-		-DEIGEN_TEST_CXX11="$(usex c++11)"
-		-DEIGEN_TEST_CUDA="$(usex cuda)"
-		-DEIGEN_TEST_OPENMP="$(usex openmp)"
-		-DEIGEN_TEST_NEON64="$(usex neon)"
-	)
-	cmake-utils_src_configure
-	cmake-utils_src_compile blas
-	cmake-utils_src_compile buildtests
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc -r "${BUILD_DIR}"/doc/html
-
-	# Debian installs it and some projects started using it.
-	insinto /usr/share/cmake/Modules/
-	doins "${S}/cmake/FindEigen3.cmake"
-}
diff --git a/dev-cpp/eigen/eigen-3.3.4.ebuild b/dev-cpp/eigen/eigen-3.3.4.ebuild
deleted file mode 100644
index 610de4a257b0..000000000000
--- a/dev-cpp/eigen/eigen-3.3.4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED="test"
-
-inherit cmake-utils cuda fortran-2
-
-DESCRIPTION="C++ template library for linear algebra"
-HOMEPAGE="http://eigen.tuxfamily.org/"
-SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="MPL-2.0"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="altivec c++11 cuda debug doc neon openmp test" #zvector vsx
-RESTRICT="!test? ( test )"
-
-RDEPEND="!dev-cpp/eigen:0"
-DEPEND="
-	doc? ( app-doc/doxygen[dot,latex] )
-	test? (
-		dev-libs/gmp:0
-		dev-libs/mpfr:0
-		media-libs/freeglut
-		media-libs/glew
-		sci-libs/adolc[sparse]
-		sci-libs/cholmod
-		sci-libs/fftw:3.0
-		sci-libs/pastix
-		sci-libs/umfpack
-		sci-libs/scotch
-		sci-libs/spqr
-		sci-libs/superlu
-		virtual/opengl
-		virtual/pkgconfig
-		cuda? ( dev-util/nvidia-cuda-toolkit )
-	)
-"
-# Missing:
-# METIS-5
-# GOOGLEHASH
-
-src_unpack() {
-	default
-	mv ${PN}* ${P} || die
-}
-
-src_prepare() {
-	sed -e 's:-g2::g' \
-		-i cmake/EigenConfigureTesting.cmake || die
-
-	sed -e "/add_subdirectory(demos/d" \
-		-i CMakeLists.txt || die
-
-	if ! use test; then
-		sed -e "/add_subdirectory(test/d" \
-			-i CMakeLists.txt || die
-
-		sed -e "/add_subdirectory(blas/d" \
-			-e "/add_subdirectory(lapack/d" \
-			-i CMakeLists.txt || die
-	fi
-	sed -e "/Unknown build type/d" \
-		-i CMakeLists.txt || die
-
-	use cuda && cuda_src_prepare
-
-	cmake-utils_src_prepare
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doc
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DEIGEN_TEST_NOQT=ON
-		-DEIGEN_TEST_ALTIVEC="$(usex altivec)"
-		-DEIGEN_TEST_CXX11="$(usex c++11)"
-		-DEIGEN_TEST_CUDA="$(usex cuda)"
-		-DEIGEN_TEST_OPENMP="$(usex openmp)"
-		-DEIGEN_TEST_NEON64="$(usex neon)"
-	)
-	cmake-utils_src_configure
-	cmake-utils_src_compile blas
-	cmake-utils_src_compile buildtests
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc -r "${BUILD_DIR}"/doc/html
-
-	# Debian installs it and some projects started using it.
-	insinto /usr/share/cmake/Modules/
-	doins "${S}/cmake/FindEigen3.cmake"
-}
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 )"