gentoo resync : 18.11.2018

14 files changed, 129 insertions, 59 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 0ce4d5e50dac..f065e087d471 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/antlr-cpp/Manifest b/dev-cpp/antlr-cpp/Manifest
index 7f0c0a13f9a9..c63d3581e5be 100644
--- a/dev-cpp/antlr-cpp/Manifest
+++ b/dev-cpp/antlr-cpp/Manifest
@@ -7,5 +7,5 @@ EBUILD antlr-cpp-2.7.7-r1.ebuild 2808 BLAKE2B 207d0ecf0e231a7eed984c5d4032d53bd6
 EBUILD antlr-cpp-2.7.7.ebuild 2776 BLAKE2B c97cc26c1ceb320716344ad9a0e457f38df3efe0ebd2bf2cf795930a6605ba1aae516015b5cebf675ff05d4dbd263de73c9b1efdad1749b4eb9b6f31fcd229db SHA512 e293605b61353aa5e1cbd6b8be82e1fbb2e19fd10fbce2f791129109c70a9ae97e94438494137fbf5fd59bc3bf51686fc56524a8f37f0cf765d11a49a763c478
 EBUILD antlr-cpp-3.5.2-r1.ebuild 452 BLAKE2B 56646e0ac63748260421e4f602ccc3bc0d49a517df7ef63744b3720e1d30e1eee910438f7edeccf7d0a947df4f155ff026f1dceccfd6202637892ba4f6ddac5d SHA512 cf7b5a9a7588437d423c571f1b14f90959e0d7a9440b3d249464a21898ec4900e066789ceef6acdb7a949a8c5e0600425d1095e0cefb410eebd05c815071b636
 EBUILD antlr-cpp-3.5.2.ebuild 512 BLAKE2B 0a684c17366afec326fb969d17ab3d48fedd4073dadb85669a8f4ffb74dc5ae3a1e7a1fca75fb722bdcdcaf85acebdc000d1cdfd858389a37589a7fb33f42dff SHA512 9335b7840649a2a155084191fd82ac83cbbec389c0682d09442ad56e8202107f72010d85eb50573eb9af3d49dd4fdac71c056764b0c33a098d6042bfb0e102b5
-EBUILD antlr-cpp-4.7.1.ebuild 383 BLAKE2B afa63d607ae46b8d19537beb3e1cf0d497177e093c0b44cb1778871e8ba17f4b95c4ad71eec74a36f879cf41cbed4dca9fc08d7e5ce4f294e3a9eca32e13771a SHA512 599f1dd5a312e16068d3a018bd54b4ce18acf94d64d2f9dd13a2a0ee5b0211ed5d09bffb722fa998e0d1ecc7de44de0e0a870346ae01738afcc860ad39d231aa
+EBUILD antlr-cpp-4.7.1.ebuild 636 BLAKE2B db982a3afe6fc6abf42d25f63eada207b7300fd87d145272c4a19d019605b98c999bdda9f46124a75cbca69106f31dae8b42573406f296ad59cd7893336df297 SHA512 ab39b61e33b4903acfee1752d7a40d67fdd328df4c8c95dc699133bc3b787a6d890477e501efbd901d77273b53ac39f332ba2d5a5249e20e5f900180964aa1b9
 MISC metadata.xml 313 BLAKE2B 3ddef83abe4413f33dae4c121c76dfdfab2336d433ef94716eced1df9f669f83883b4174d5a472b06ae8fb16c7179094469fe65258646d7dd9094b5c1673a2a3 SHA512 39988a3826d440aa378b455d18ce23230ba1870bf7b7c64123cfdd09c54b112e8586c87d421a2227370c6b4eae385af46ce3a9e4aab3c676fdfdac360fed8265
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-4.7.1.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-4.7.1.ebuild
index 173656e8e08c..4c54326473f2 100644
--- a/dev-cpp/antlr-cpp/antlr-cpp-4.7.1.ebuild
+++ b/dev-cpp/antlr-cpp/antlr-cpp-4.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,3 +15,13 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="app-arch/zip"
 
 S="${WORKDIR}"
+
+src_prepare() {
+	sed -i -e "s#DESTINATION lib#DESTINATION $(get_libdir)#" \
+		"${S}"/runtime/CMakeLists.txt || die "failed sed"
+
+	sed -i -e "s#share/doc/libantlr4#share/doc/${P}#g" \
+		"${S}"/CMakeLists.txt || die "failed sed"
+
+	cmake-utils_src_prepare
+}
diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index 892fd020a23a..ed312b4690da 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -1,3 +1,5 @@
 DIST atkmm-2.24.2.tar.xz 849784 BLAKE2B 2cd96268cf727de1ebe83428e98f1d21f8dbd1a72ef01be80ec28d169ff0ae9ac375bbbd1a530f3c47b60b49a40e317fe39645d74f6be3c017edcb9735bc0236 SHA512 427714cdf3b10e3f9bc36df09c4b05608d295f5895fb1e079b9bd84afdf7bf1cfdec6794ced7f1e35bd430b76f87792df4ee63c515071a2ea6e3e51e672cdbe2
+DIST atkmm-2.24.3.tar.xz 891868 BLAKE2B 8b7f961ac8b6728efaa6e34e65c11cb2a7e35b6f33392f4384d07cd4157f6f6b4b34513ca16676dc7fe5c906f6ab464d4ad416d1c9db0ea8803c4a0d915e342b SHA512 dc08efcd965b4ac385f73847d065d7cbf5f8e05b8644f49a6d794805a7bd6a9a03ff159c308b9062fe66d8acfc8e8e237654622c6a7cd22fde5a518388290cb6
 EBUILD atkmm-2.24.2.ebuild 852 BLAKE2B 26f9d3d5ded68cb0da224ed19cb04771bc148d29b4dc312da97bd2e5c133f90efe086bbe12626b844120a13f131a7c85478e07c90aa292b8c92667e269475ed1 SHA512 17fcb05ffaf5b624a7157b7e08c918818785a05c99a9c8cb76a5128e68d53d197c517a9f93309f17e98562536207c558bb5c72f7cc5984b202bb9dd5e98601db
+EBUILD atkmm-2.24.3.ebuild 840 BLAKE2B 572a11d5d7d93c284138650bf70c1abf597904fc22290f6d40289a962d7d53c7090a3fec36abdfa37d723163b73aab56fdfdfd92d82e8497f6a5eb27a5cb06a0 SHA512 d710bc7bf28d3ee6ee47506b0652ce1e4a7a89a8816c8bfe1bf9bb608d429b9a1b80ad1419c60a1b534f77911f76df82d50af9ca6dbfc12d55e6ef242e1d2c4f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/atkmm/atkmm-2.24.3.ebuild b/dev-cpp/atkmm/atkmm-2.24.3.ebuild
new file mode 100644
index 000000000000..fe842297e302
--- /dev/null
+++ b/dev-cpp/atkmm/atkmm-2.24.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="C++ interface for the ATK library"
+HOMEPAGE="https://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+COMMON_DEPEND="
+	>=dev-cpp/glibmm-2.46.2:2[doc?,${MULTILIB_USEDEP}]
+	>=dev-libs/atk-2.18.0[${MULTILIB_USEDEP}]
+	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}
+	!<dev-cpp/gtkmm-2.22.0
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" gnome2_src_configure \
+		$(multilib_native_use_enable doc documentation)
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 22017f5e0dfb..44e26cd65901 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -6,5 +6,5 @@ DIST glibmm-2.56.0.tar.xz 6859520 BLAKE2B 8d7f0120de211002d587e6ec0d3750dcdce60a
 EBUILD glibmm-2.50.1.ebuild 1636 BLAKE2B cedaf300eff88a5df1e9b758ba425ad29547642a5c345715a5196b8904f1f5dba0b5c85fd7d5424c2044c9832cf817758cb0086d9deb92484484c1316a4f417b SHA512 d8c11ace8919ff16e950798269d88f83bdde55377f66ba34e47947acbb856273b42bae549393055997ce02077aaf281b1238f6a2a2d4c706d24293d9b64317d3
 EBUILD glibmm-2.52.1.ebuild 1755 BLAKE2B ddf4532a95e8302604b56f15b8f32395959a0e2afeda1af2d88579fc0d8bbd610e70a601e5a1a85ecb784f274170eb0d4cddd44576130ecd689166b0e2dd4c59 SHA512 656b51cec372a71babba2ff9d2e04d3e5813cf76b78536afe038b7de508f5801adafdf968d48aed3eea59efa7577c7020f37d6e7284f69f86b5d7eef2e0edcab
 EBUILD glibmm-2.54.1.ebuild 1763 BLAKE2B eda5976b2a3f3da472d76e0b3064dca99ff53cda1ac043e1f1e67f04f964634821c83a3186ebb4c73a099df9d294bff231417c91d8c12f5efebea700d021eca9 SHA512 bfb037e02f69876e40afb61f8de05296bb67f44ee727b9df36f6307ae80a9eada3f38c7173724d9697300298d41255ea87791e02f58cad6939b9ef7e004949dc
-EBUILD glibmm-2.56.0.ebuild 1645 BLAKE2B 53475c3ebf973c09f9a59705e10fd4e54718796df76b6f9cbe4e629554343876072440abeb9f70ece5d47d6a147fb97bf773372ef33855e5b693e3969a4894cd SHA512 e66173cee221bb1c6ccad13ec56619487e2fc1064bef5a294cde7bb3d23f09455940f0768fc95e052b97ed3cf6467ff3ba7724b3d7f89abc5462d7d61c15dc4a
+EBUILD glibmm-2.56.0.ebuild 1641 BLAKE2B 97ed84fa71dd3978e5e604f626bc5d1e990af959899fd9818d29853cd4862e2ba61f8678b146774f0383c509031c5ba5cc002bf2256d38e5320263719e92e410 SHA512 c0d361b9d1cd5aeaed845d00abb0ec16b82a0f7e2d72123815d2ab15580bd5c6e229c21b4f2d601affecfd23d67e970b75d1087bff6f04a9f2c9748cec87dc50
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/glibmm-2.56.0.ebuild b/dev-cpp/glibmm/glibmm-2.56.0.ebuild
index f1bd461d832f..13cddb27d7b9 100644
--- a/dev-cpp/glibmm/glibmm-2.56.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.56.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
 
 RDEPEND="
diff --git a/dev-cpp/libjson-rpc-cpp/Manifest b/dev-cpp/libjson-rpc-cpp/Manifest
index 2710af3b17ee..9e033a932ea1 100644
--- a/dev-cpp/libjson-rpc-cpp/Manifest
+++ b/dev-cpp/libjson-rpc-cpp/Manifest
@@ -1,6 +1,7 @@
 DIST libjson-rpc-cpp-1.1.0.tar.gz 179442 BLAKE2B cfbfe703d1a3d4ccaf6d4d475a7c1686c8f7afc28b025d6fd3bfebdc41cff2b944e6600e68073c1b7e7c0a2463cbf6e9724cf618c5d481bf7a4600019b529922 SHA512 bf34eedb196b1e214292976036a00e933f8a9b4325441ea2e4ae049a7c818014a68dd9d2f22d01588f5e6d1e9f465c73a133b0fd8282f8cf78a05a493f4c461b
 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-r1.ebuild 1583 BLAKE2B ac73aac2d7b86a610eb04a2df35da91d07b709327ecea87207d79013e87f23912d9a8af4c17d9376d8cdcf049ea391f1803a58546af23e2dd8823ce49493f83c SHA512 61c15fc197f12452d617f41bcbb8ea97463746270ba7d217d7e87a7273aeaefb0c988a701deea5ecd8e2cc63476f0e0ebd13e378995c604af40d12bffb048fb7
 EBUILD libjson-rpc-cpp-1.1.1.ebuild 1581 BLAKE2B 1014949d138562647f2ab770acc5e55f9747e30541ded868def799b0019a98f2a03a770196cce2fd43c58da7bf5057c620d810df1b55d1b4aa08661b1205614f SHA512 d9fdbb75f52eb2b0f87c850249594e33d5497173bbf440866576d67e836db7cd953c1a970c01c7baa8e55b16d1292ad04d9eb68b81b045d7167c3b059240337d
-EBUILD libjson-rpc-cpp-9999.ebuild 1581 BLAKE2B 78e777d3bdceadac80447b06172721c9ce9ec305506139c02e27eb8949a14bb0cb01973c65f100ab04a8dcd3402cd870d310072857a06bd3b7853f24ba79ad56 SHA512 5274fa26277ac9d0d93f597bea433a7e6bdffec0e6c332a8704c305485eaa468169998205d485bf2b65f47420f49abfadcf1c6383fc7f8f983379c8aeeb7beb0
+EBUILD libjson-rpc-cpp-9999.ebuild 1583 BLAKE2B 67319729d6a83052ff993f33c0edab45ddb1b896c973901918c7b0fcb48f90b4788060f3e42d22148637b5e2b794d3a2a1a7c7e0c4859ca44d2036d12b3c9d35 SHA512 3e2d73ed97df33c7617f7eaca476e88776260a408ce868f3fffa41cd135affe28365a94497db04b652841f73c566a46e899822cf2b36da1018dd63b48cc939a0
 MISC metadata.xml 906 BLAKE2B fe2f020896cc35c9c27fe082bf7a844086445b8943690c35de3de091041473b0a211370e335908470faf1bfdf0fb64b4b6aee75dfd527683d173c3e9fc8d9cf9 SHA512 037b5942cdde13abab5f527cdb8fced709b88bbebb754497279b1d60e7c90789115ecc2f579c38111c2acf32a3baf2643b470e55deb9de36bc498e9665091a83
diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1-r1.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..fbf180d4cf2d
--- /dev/null
+++ b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1-r1.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/catch2"
+	)
+
+	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 0e617416361e..1daad1e754b0 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-2 )"
+	test? ( >=dev-cpp/catch-2 )"
 
 RESTRICT="!test? ( test )"
 
@@ -44,7 +44,7 @@ src_configure() {
 		-DCOMPILE_EXAMPLES=OFF
 		-DCOMPILE_STUBGEN=$(usex stubgen)
 		-DCOMPILE_TESTS=$(usex test)
-		-DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch"
+		-DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch2"
 	)
 
 	cmake-utils_src_configure
diff --git a/dev-cpp/lucene++/Manifest b/dev-cpp/lucene++/Manifest
index eae5ae3cff0f..07603aa7ff75 100644
--- a/dev-cpp/lucene++/Manifest
+++ b/dev-cpp/lucene++/Manifest
@@ -1,5 +1,4 @@
 AUX lucene++-3.0.7-boost-1.58.patch 1149 BLAKE2B 0021a7a27caabb92232adb42c7b1e8d4832902954018be4bf89e2765562e1e26cc29a67dc75be82f9d2ca7dfddd1e137fc742850d6707527da04574f2b1bbac9 SHA512 7fd0089895ab77da158a49510241fdc894bd3d30f7a6691ddc230f4d52631ec9222a04e13ef0a118f7838b4320fd313502f635c8f0827ba5bb4c6169fdd404b9
 DIST lucene++-3.0.7.tar.gz 2013570 BLAKE2B 26abb1a2fa2a24d7240505f11639c078744313541b4993ed84e4d0129fda74346e841f0c4c7552e58a15dd492af9ffd33ea66866c8e6810cd41e5d675833ce79 SHA512 92f3bba320980673cc64c983616aa38d25b44ea811237ed226741b892757fb8151e4f833aa58a18dbe7a0c9a899d94e828aa15e6d7b48a69ab730d1d772db220
 EBUILD lucene++-3.0.7-r1.ebuild 799 BLAKE2B eae86b12c362a4d4bbde91a186e31ef0163233ae5cc921055f63a635f1332197329c1e14f0670248620a970bb9fb2f8868651e4bb4d75d80f68ad5b0c2bc9737 SHA512 215aa2e43b313b79401a90611f1c5bd79315ebb64907793f11d3f759ac29f49e667c7a0c93a3dc0f91f254e1d47c453a51b5fd35a1da8114cd6dbeddcd675ef8
-EBUILD lucene++-3.0.7.ebuild 811 BLAKE2B 1d28c365548431db7973b5f743ca3375f7daed1c31f92f7f5dc25e15ef0bf1d3234234e8bb1b4c9f19b15209fe08eee2c869565c32912d3783c46b92f48a86f2 SHA512 c40875d5e138ad869cba0c72307029ff4c9945dfac6e091ab3c83dc553412761ce8c7d7f65cabceb57abd4cf10679da46905f54ee3cafe6f22b7415e3295aab2
 MISC metadata.xml 339 BLAKE2B e503e6597ab8a20f9cb8613a4a4b7be729dd84d664b03fefa4cebe16da9adbea68de1adabf0055934815a70abfbdcd8f7603c7b7ff4a75bf8fac7973790a7412 SHA512 8864d26ad6eb0c9e565932a3f9a0e28e0e86c51998136e9ff56c2ef3fe0e7eb78bcc5d3b7a5e3acdbd0a89f3cf335e2af837a1ed3f0e492db42492e5a85eac26
diff --git a/dev-cpp/lucene++/lucene++-3.0.7.ebuild b/dev-cpp/lucene++/lucene++-3.0.7.ebuild
deleted file mode 100644
index 7041d7913dce..000000000000
--- a/dev-cpp/lucene++/lucene++-3.0.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="LucenePlusPlus-rel_${PV}"
-inherit cmake-utils multilib
-
-DESCRIPTION="C++ port of Lucene library, a high-performance, full-featured text search engine"
-HOMEPAGE="https://github.com/luceneplusplus/LucenePlusPlus"
-SRC_URI="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( LGPL-3 Apache-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-IUSE="debug"
-
-DEPEND="dev-libs/boost:="
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS README.rst )
-
-PATCHES=( "${FILESDIR}/${P}-boost-1.58.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEMO=OFF
-		-DENABLE_TEST=OFF
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/muParser/Manifest b/dev-cpp/muParser/Manifest
index e4bd299f50c5..927183b73fca 100644
--- a/dev-cpp/muParser/Manifest
+++ b/dev-cpp/muParser/Manifest
@@ -1,6 +1,6 @@
 AUX muParser-1.32-parallel-build.patch 680 BLAKE2B 7699b129186f0173bfbc7f742d51175ed67eddb9898b61f7d6a3a462e1a262112a2d4af445e12501caa88d4630308bb5f273ef2a704e2948db9cdb7649ee6bb7 SHA512 a39af330803786ebb86259dd86ecfac00ca04978b0e623b418d887f6b20a6eb6cee2b37da8164aa7038b3accf388b40b6a6d4eccd2f20afdfd6051cc3505ac90
 DIST muParser-2.2.5.tar.gz 761315 BLAKE2B ddb7a226cecd164929a2f45ca0c2a5d20f37cd6bba2fca919c9e534017fa087523311bade8a7be4a5a011ecd5dec0a2496ff08354d2010341bccf2e2a8276c1d SHA512 d89380ebdc0ce91d0ea38fe43419ab6ed06c47d352b9ee20e1edcce48337b464366153493e0241c373ba2880a8b419fb9541e56cda0d14915daf9b98136ee682
-DIST muparser_v2_2_3.zip 1481359 BLAKE2B fcd9326619d28f0ea9e22cd6d85f8e620a18ad38561ceb026f024d80594d7d13a4772b3087df87d94ec3a1d3a80ce38a56f3dadc86b1011d9eafe7949d27be13 SHA512 86d140c07161757e2f0de516a4c2922ce5b135d06b01466bc15ad90833bd3e9f99b9b9c528617262597a7a5a6b09bff5ae8ced5d51c413ea611059e0bdb22e6d
-EBUILD muParser-2.2.3.ebuild 916 BLAKE2B 193a46a98d462f990330242af8eb6ab7bccaa3194e18f9704d99868c63d6486312e064446220d4feac4274a6fa9bb500bad8d79ac8c38b648729248a2a9b38af SHA512 fed6b79e67cf7a3af9f917148d69d1d6b68c9016a7e88bf9296144224a80199c3ea2f98af5b7e8780569187f5f1fd6fd04aafb136dbf146beddbbe90352dab8f
+DIST muParser-2.2.6.1.tar.gz 755653 BLAKE2B b3b6b8da57c0e8a0bda74038689d444ba8da00d6cce80030d8b35693209f0293874e4822c4941974be21fd4b7c09ba7df2c9cef861bc10b890aae4f641040faf SHA512 01bfc8cc48158c8413ae5e1da2ddbac1c9f0b9075470b1ab75853587d641dd195ebea268e1060a340098fd8015bc5f77d8e9cde5f81cffeade2f157c5f295496
 EBUILD muParser-2.2.5.ebuild 863 BLAKE2B eef6d0bc10f80248f632b7f7cfc08b6336c237a1e0f37cc229df4247850eea8fc5360a1fd2057f2452ba0113b630ec1e31ce90d2ac234ad179ea61c081d84b0d SHA512 6bbd9ff70d8cb11e75c282b52fc5fec0092a7bd57baed94cda099c2b18744101d78678f9cc9a29bd9be447e2d4fa41c03fb529292b6cc7b9b79f8009f47c9108
+EBUILD muParser-2.2.6.1.ebuild 862 BLAKE2B 0c9e1b758f3ed2ea36e4e09e88a26ad38f282223acf3b569a0a53b547821f88ab81c2a43a005eb223b4178196caf4c332461a9c676683a85325536a87bf87879 SHA512 2d786a9839d4e502ec8aaf4ff4c901939ec5e3ade8ce0755b66fd0f612cf104a3eb0bd203df77b4bed1dab205a08fdb9a18cdb238fbe1214bd3ac0b979554418
 MISC metadata.xml 624 BLAKE2B fc3684b1f97031e5d63bddbe28679529add1a931930a351cc56ae5bef8395f9a05020a00557a0b1bc421e20c09ce59b5332597043f96981405c1911407948d7a SHA512 fdf266f68b3463e7f22358efbba60055512d7f7fce7a98de6f572a0b4c191c0b0b50b29676a432fa7fd604207029314ad5e43f043831d064de8c5f232fb424a5
diff --git a/dev-cpp/muParser/muParser-2.2.3.ebuild b/dev-cpp/muParser/muParser-2.2.6.1.ebuild
index 4078fabd35aa..a5025c1f8c20 100644
--- a/dev-cpp/muParser/muParser-2.2.3.ebuild
+++ b/dev-cpp/muParser/muParser-2.2.6.1.ebuild
@@ -1,26 +1,20 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 inherit eutils
 
-MYPN=${PN/P/p}
-MYP=${MYPN}_v${PV//./_}
-
 DESCRIPTION="Library for parsing mathematical expressions"
 HOMEPAGE="http://muparser.beltoforion.de/"
-SRC_URI="mirror://sourceforge/${MYPN}/${MYP}.zip"
+SRC_URI="https://github.com/beltoforion/muparser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc test"
 
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MYP}"
+S=${WORKDIR}/muparser-${PV}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.32-parallel-build.patch
@@ -35,7 +29,7 @@ src_configure() {
 
 src_test() {
 	cat > test.sh <<- EOFTEST
-	LD_LIBRARY_PATH=${S}/lib samples/example1/example1 <<- EOF
+	LD_LIBRARY_PATH="${S}/lib" samples/example1/example1 <<- EOF
 	quit
 	EOF
 	EOFTEST
@@ -45,5 +39,4 @@ src_test() {
 src_install() {
 	default
 	dodoc Changes.txt
-	use doc && dohtml -r docs/html/*
 }