gentoo resync : 17.10.2017

6 files changed, 13 insertions, 20 deletions

diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest
index 8320e01d6535..3e288b243d20 100644
--- a/dev-cpp/clucene/Manifest
+++ b/dev-cpp/clucene/Manifest
@@ -2,7 +2,7 @@ AUX clucene-2.3.3.4-contrib.patch 1697 SHA256 3d3f73685f75b4ceacf1941e50b6108941
 AUX clucene-2.3.3.4-gcc6.patch 1102 SHA256 24a61c742e18632b3df7be0811cafaaf4d049a9abca4183a9abeb202bf9e1f93 SHA512 367e97d9b5d59bca880d8ec70b37078406f581267a896ff6b35cd3ab21f983f4b21152482bb34fb813e426b4cae14a6d319ccdb08e3bf968de8ece3c28a18722 WHIRLPOOL deaa47641beb82258a924a36ad29d14c1cdceaf7baaf60d4a0e04a47cbb703004a5309a1bc102dd6cee76da478709f7e5545c0a7145ae41627db49d88b6e7650
 AUX clucene-2.3.3.4-pkgconfig.patch 871 SHA256 ae92955cecb57ec732233dc33d057f9a0677fc9e17d2461911b300037cbb65f7 SHA512 afcdf00537c8eb9c75ed569356520551ea194c8edc636f6e82bd0b1ef60e33396c1e2722b895aced2b58358950b3c5c1df2a914295074e9e99485ca6cee21c18 WHIRLPOOL 21dbf53462c053efb77cef1356d5bc33d9728ff1ca356b3cdb1b211ca0552d5d299665ecaeebf9115d25e6dda01a6baf44e4787d2124aab6f655e35175ab812d
 DIST clucene-core-2.3.3.4.tar.gz 2241498 SHA256 ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab SHA512 1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4 WHIRLPOOL d9e80807b6a1a9afb318be5e795af1edf1ba60734a33c4ee3a9be95863cb97bd13f6d7e144ddff631a5deebce890ef002f3196fe511c57a33f94db29a56c6315
-EBUILD clucene-2.3.3.4-r6.ebuild 1513 SHA256 3f09b19d132b608795a25e5481626aabde5e51a998c136a42ec43830012fb857 SHA512 a7846fec135192ac514649eaf76f8f7f21ec0a013d6cf928db9988b75a6975e93bea8d96d2dec0091cadd38cd693852f9969b97784c62e3cdb7b1960a6ddcd56 WHIRLPOOL 992eb4ab9c90f955fde7d5ba2db3251272510e5769a58f5b31476ec41cae8bd6ddd704b7c6e6ee2b570d38374f4fdcdf925679331cbe77e8c92bbce0b208b040
+EBUILD clucene-2.3.3.4-r6.ebuild 1529 SHA256 ec6221c7d3a75d48ad7aeec478731e75cb0fcf6345b3944202a26efb744fb37c SHA512 7ad4ed1947c1932bbbb15490c39f65c248fe82ab7fff3114318cb53d1f280acc7512d69e97df3372c2adc0f9c5df79b322fd8ca0d4c1c91932f42b14d2afc939 WHIRLPOOL aad2000dcb029667059cc8e91ea04389b36c0d48d3e6f6089259fc6e2d630af283395084f2924473a5f6d688b7de1f0e9223a1f19f74dc28461bc1b35cd70b12
 MISC ChangeLog 3161 SHA256 57d07bc4aafabae72d6d2f4dd5e481491666290a9569b8cffc9af29894203283 SHA512 c1f61beb62817cfa2f152b51fb184758a3c4cca1e0a2fabc9fa3fca600ff555196b9f9dc48341882737889777097e411b332b9adcd83ffa9fbb6db429c6ccb24 WHIRLPOOL f7f376bab257aeea4d3eb34dce148393d958a206a94a14914370cb8d29ab1db56c3ab0fc6cd87ecd30373eb939c646962f14f09b43f71f87a51a6d04945069ef
 MISC ChangeLog-2015 8532 SHA256 2595306dc8f9ede1c2409e96a96bf55dd75427a93504193370963cddf9488697 SHA512 8c659128662b4d2fb87178c0fe14ab475d91dfc6ee73faa0a9284bca11a17db62b0ee6a215d4c861caf9a3e20a6b1f690adbddbe6e2656abb086d956601b44c2 WHIRLPOOL c538029e7ee98ee454aa38cd93fb2af8cebf47ff4f6db290e85758d4261e009cf52d4ce0b2a3c5d9c539d5c8ab84b0f1b107391e9aea46631d4bc15ca6dc734b
 MISC metadata.xml 216 SHA256 ba32257636740d601234d784fcab55fe33b57a62412e1db415a9e391eb460353 SHA512 f08965e90195baaacd6b6eb8d904a105df499b9ec48adfc586c6f688591260bf0f12b6992313f6119e201f6362f6abd52d659d23d4b5d84c6ae67a09f8e2b183 WHIRLPOOL 929978fc4c7060b66cb8c2635512d23a867461e4d09d80129b9e597c0f20c890c03bc93026be976ef31b3a9eaab1802093e5a1541fa7efdd030354805b9c3fc8
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
index 2731d5ba4234..f636e9b11277 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
@@ -36,7 +36,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	# patch out installing bundled boost headers, we build against system one
 	sed -i \
diff --git a/dev-cpp/cpp-hocon/Manifest b/dev-cpp/cpp-hocon/Manifest
index 0bc5e562f0fc..2af30f3425e7 100644
--- a/dev-cpp/cpp-hocon/Manifest
+++ b/dev-cpp/cpp-hocon/Manifest
@@ -1,4 +1,4 @@
 DIST cpp-hocon-0.1.4.tar.gz 157988 SHA256 2274b99dc098122b6e3d2c8d23173d21893555190c5a008e5a9a7d84875c7275 SHA512 f5ee6c5e7eaa5139bb3c421fd8b7c0da337daec99dce7f426d567ced0036b7c49a396b1b9bdbaa8023cd776a5a942175082a4b30280d4211a0db51483324be42 WHIRLPOOL a9a4f677dc708d5097812ca407257c9f44168d36081d5a55d32d10862555fa89f213208b0e5c3e83900b1e8c7b313c4ba66e7684f9ba0b5c3b01f0a1ae8f1d6a
-EBUILD cpp-hocon-0.1.4.ebuild 963 SHA256 e3fca3fdc793deb39f656f98b7ccd26d33e4df801b7907e199003e6037fbb614 SHA512 6ce03b3aa2eae2a3b4d7c15dad832c23e3214ebb6ae121a117427258c64c4898dcf3071e0edb86bf00b37f91008a67bd25794392e28f062b7d562ff782216f09 WHIRLPOOL 0ea7afa7fdb779e938558d408d986f1c0c0c62a41eb454130082859c8129f6e308495699f5d045961cecd726f8df06cbdeb30ae5a9a13e260b0c46bc20b5843f
+EBUILD cpp-hocon-0.1.4.ebuild 980 SHA256 378ab500185155b55dd76b07da7d01845086b628064aa6c475d8a793a853042e SHA512 178fc7cf3cf4cfd74518d5649f90c2b05a16e8e9fac87ea2220017159f24a4ba77d08a1d063d529ef939097018f56c58ae7c84afbe5bbd04a0eeb7375d251ecd WHIRLPOOL 04ce19f712898ecc24db591b23cd01df1e53e789d97422525ed146cc477118af9f8b2c2e054f650bff5abad2d2bdb2f1dcbf3d09dcad682f88d68f5e55ee1498
 MISC ChangeLog 827 SHA256 7330edd9c9b2d6199f8cb00098fffd5f3d67cf1eb4804bcc861a9e21b0da131d SHA512 d242c7b770c7280a793d6d31d617918a0082070d1c62514e53e353a2448d6d008bd0ee028220d84cdb21335d8e198e55951ab9a3698f55794649c7a5c268dd52 WHIRLPOOL 9dd8851c89fb89f0a3972a429dfcba35f2009328866fe5915774f05b7750c51ccbf85ce98109065cdee071b4eb5b726958c4b9ad34f37fc1b5289715941c9ee8
 MISC metadata.xml 433 SHA256 03f191a3164b60625576897287d3247fb0f908bc5d82dd25c680729845d18b2a SHA512 7f890317b6cdfc71563359d575446ccf489d6ffb79ba541566fa747e4a0c1e077ec7f7c5263d96035bbfe77f6631cfb9000f715c348ed543492b7dc4cc7cd305 WHIRLPOOL fc21c75be3010e48fcdfa1bb68656b4dc8e58220b20d7bf01cda0752384c8aadf6703579b7702ec04ce3bbddb8187d2dc596e493151e641fbc8994799f11d57b
diff --git a/dev-cpp/cpp-hocon/cpp-hocon-0.1.4.ebuild b/dev-cpp/cpp-hocon/cpp-hocon-0.1.4.ebuild
index 6b8c0d67d46a..63628ed55714 100644
--- a/dev-cpp/cpp-hocon/cpp-hocon-0.1.4.ebuild
+++ b/dev-cpp/cpp-hocon/cpp-hocon-0.1.4.ebuild
@@ -22,7 +22,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
+
 	# make it support multilib
 	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
 	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
diff --git a/dev-cpp/waylandpp/Manifest b/dev-cpp/waylandpp/Manifest
index 1adab4b4d8a7..9ea75a27256d 100644
--- a/dev-cpp/waylandpp/Manifest
+++ b/dev-cpp/waylandpp/Manifest
@@ -2,5 +2,5 @@ DIST waylandpp-0.1.0.tar.gz 166427 SHA256 117df357cbd1f272737b6379e05925b38bad41
 DIST waylandpp-0.1.2.tar.gz 166624 SHA256 fabf0b512285abea77678d9e079009569e9eb3fd98c6b851d50bc5b6c781c7d8 SHA512 2304390be26134561fb69e208a6bafd0e9789e6b212ff2f46384c6ed50ae1c9eca3f06a3b4958c8e710cc1a0be61ed84c7ff292ec7011dbb0396cd2d83363f7f WHIRLPOOL 2633f41c0038c5f353ce7d9771c09d7a60ade11e9e7d0209180fb9f450437b37c3feebc955568335ce3371aae9b5083ab3425a8256157c5e7f94e0bd009ea3df
 EBUILD waylandpp-0.1.0.ebuild 1246 SHA256 1b7183e6bb860de9ca3c0d7cbd83c52cd205fde16d5c5466bbab98c24d1c9015 SHA512 cdeb50fcad7a3630338a1b830c81313ae2af699ff3b3dc7f16c2b4cd20fe25a55821afbbb56d741ba10d0352429683160fe22bb5f54f6e3c28a5d0716465cc6c WHIRLPOOL 35907aaa7db7e609c924b005878e19d595c05095822ef8a0bab94572e2a54f2a32e5a26c0607697b938a1eb1b20c3e114f3b96052a010423d6d3ece3afd54a13
 EBUILD waylandpp-0.1.2.ebuild 1276 SHA256 8edc86903c7dad272fe8c4fcfb62ac446c5d376ec6c8c1390c88924c56abca46 SHA512 d41b8ce0f9f0fcc4c5ba5a0eccea6498a0750cf441d2bfe995d38a6ecc1c8d8e94d01147b28e9c1fcb0da6c45c593c27637eece7462cdd045e8f5441678d3182 WHIRLPOOL 64ddecf9cd8a050df66bd2bdd09c5bc1b0915a4c83836ac8900c7ff426310281400189794181e3a3136305d7b8442c14c4b2224f09a5f1fa0bb63c8a1ed2093c
-EBUILD waylandpp-9999.ebuild 1128 SHA256 aeabbe11d0b124746dd0e2947b3ecc9b68149a544baa3e88c3c2b4353c15b62f SHA512 b52d2e9ad070ef662c6a6243e5badccbf1e8935d2d9d061845aa34cd373748f20de884399f8f960bd5fb2ae9013a3ca476c28a706473903a60a16094e71c61f5 WHIRLPOOL f0caffad252917597e66583cd2ce6cd97a16bb79ac1c905c11a8129319e4dfc712c80a36b4c8ed0b6d54828d91f2cd909342e150be7013196aefdd80f1e9c0d7
+EBUILD waylandpp-9999.ebuild 819 SHA256 95ff742da3778881abc9fcfd02db6bc24a722aa3b4b470038f42358bb8f4f785 SHA512 4249b09702cfcef96a581fce9ddafbefbacd7f413b0e31552cf92d0774296491da53764057f60c1dd6b9535501bc05388a0e6bc8ee3ac1dc7e7675c61b7408ae WHIRLPOOL b7e5dd03ed1c493a1a103ad1df05151a2bea688e3d4aa1e6c23ec24eee70d6f8684b683891d6da409f8612eedb5ec7edef35bd63b499212869ab247a4b6ffb73
 MISC metadata.xml 401 SHA256 6d2ad3537b9cbd1ec77967cd7a3328fb8c12360300384302262a43974b225f5a SHA512 3501904a23158eeae58c78bcc7cc3549bd877cf13f6490a8d63a0586ed080c28e27a6d302a9170020b571460dd0ca64acde471d765c8880bb2427d6c8ed76ada WHIRLPOOL 3fe818326b7246911153f2f6e8c269a3c2c890e270353e6ceba0e5f97d25da84a389d764a62e363b3cd93abb185813b723522277bf6e03ced8895df75466da01
diff --git a/dev-cpp/waylandpp/waylandpp-9999.ebuild b/dev-cpp/waylandpp/waylandpp-9999.ebuild
index 1dd04bc09c5a..73572d42b7ab 100644
--- a/dev-cpp/waylandpp/waylandpp-9999.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit scons-utils toolchain-funcs versionator
+inherit cmake-utils versionator
 
 DESCRIPTION="Wayland C++ bindings"
 HOMEPAGE="https://github.com/NilsBrause/waylandpp"
@@ -31,19 +31,11 @@ DEPEND="${RDEPEND}
 	)
 	"
 
-src_compile() {
-	CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" PREFIX="/usr" LIBDIR="$(get_libdir)" escons
-	if use doc; then
-		doxygen || die "error making docs"
-	fi
-}
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DINSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
 
-src_install() {
-	CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" PREFIX="/usr" LIBDIR="$(get_libdir)" escons install
-	# fix multilib-strict QA failures
-	if use doc; then
-		doman doc/man/man3/*.3
-		local HTML_DOCS=( doc/html )
-		einstalldocs
-	fi
+	cmake-utils_src_configure
 }