gentoo resync : 20.11.2017

5 files changed, 6 insertions, 6 deletions

diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index a320c53d1f3e..de87a4d024d5 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -5,9 +5,9 @@ AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 SHA256 5195bc11afe48641de38f8e5
 DIST doxygen-1.8.12.src.tar.gz 4880613 SHA256 792d4091cbdf228549ff2033dd71ff7ea5029c6b436317cc5ec866e71302df6c SHA512 12fb5f19d0de382c7510b7c517d7c781a1e6e11720c7d9ecfd81d29d5ed030984e8d55ffcc25cc52703020e880edad341136e2795a2a36a842fc275b31ae203d WHIRLPOOL 4bd12f16ce9dba73f5bf836032d8ce25d5be7e6b3cbe3c11ce7c662a8059fa30ef2f75c008fb2050fd4eb99d80ba134d068b452dfd577a651291dba5315c0726
 DIST doxygen-1.8.13.src.tar.gz 4893912 SHA256 af667887bd7a87dc0dbf9ac8d86c96b552dfb8ca9c790ed1cbffaa6131573f6b SHA512 85da5bd28ad9f33a8e50fa92796817d31e59c024127cb647cb967e4321dd51378feaacdf099d578b7e6020fd646a3c63e99c77420e49e3894fc18ca89ba3e0a2 WHIRLPOOL fb26f85c22ae2197b52bb7fb4a46ee840c3af700bedfce41d3fed84e5ac62408abcfc3e2a147a8e15c290f7bbc2e4cf3efabbe490ea1a78504680b9b299fa93f
 DIST doxywizard.png 4231 SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209 SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5 WHIRLPOOL bb0c13b382c4069ca310ff53a03b36499a2bf6e0e8c0647efc032530f429f483b5d6f2925b7e996d4f84c8f2b77eb883533f4b7abc88745a2cfa596d3dd4f3fb
-EBUILD doxygen-1.8.12.ebuild 3689 SHA256 33d1be34a1c98b1ced06c3a19151f5b195ffe887bc958afc7d1cb5d45d0ba734 SHA512 e5b429d4456f335f677fc90bac17edd5a2dc1bfc77ab05d6550877edc83ce1d802809d4526d1d5514a6a08f5637c51807f840f4d9e7fe753c4551d8d755dad61 WHIRLPOOL 7fce8e2682e07dd170f8efe32aee3ea52149f06be4fc10d323e2938c459158bebdb300c21c3a553013ce57a45483e2f704a56814ef4a6646a183e30d6f4cf651
+EBUILD doxygen-1.8.12.ebuild 3705 SHA256 ac81c0e329384f5509f174e65295fce76899ae146c8726fb15dfbff81d3fbdfd SHA512 51f076be1a73db3202b91dd3ab6a4bc52c8caa34c3097dbbbdb488277d01c70c8da842375e91f7ac7d81843434ba1d8fd727543bf299eca7c20ab0d8dfa05d52 WHIRLPOOL 541857e558533f9272970a446983fc98220de078632197d98b80a7895c4d78b8bdf7e65c4e043371ea58fa9db33906f85e9a23b668fc0a3e0ea44b65199f430e
 EBUILD doxygen-1.8.13-r1.ebuild 3735 SHA256 7c81a49ace43a5d6c94dc7653643afde9e430a38f8e2c370639798892fac0edf SHA512 de69fb9b6074006adbf3aedfe1bc68d069b6bbef374710eed59a3744b1676f34a36471059bc5d8f7bb13d90eb95f456b468eb272a4d980a1af4feba8e4120fe2 WHIRLPOOL 5b856c7c82b8aa8ccae8606dcc5b249854b32cacb3bfa03f7d9f6ca80b903ac7dcc93728be3b3067ec5c96b8de31704ec440c056fb2c5837aa016455645a2805
-EBUILD doxygen-9999.ebuild 3689 SHA256 82c462d54d28fa9f59eb89280a6040be7c733782c888058fe6ef1d8d73c82de3 SHA512 09e7682ae959d77a68fc9a30d94ccfbd74a7de812d7702738177172a0340faebba86c4a899387b487e8b5df3bc2294dae8bab26dc2155697a76723fd18095e91 WHIRLPOOL 87e62377f9abe4579e9bb763cb43c659559a4e925302fdbf1be840d6f73cc47516d7571a11d003382572d770de49d1e03bc2a4e971c7e931c25cc3512b08ffef
+EBUILD doxygen-9999.ebuild 3705 SHA256 10017c3282467556172df852de9d4b561b74daa539908b56802af8dec6235821 SHA512 6acefb6feced1386cef88b01ab6a0a963f38e8474dad552b34ba21398932afb92eb8fe179d45b7ee4669d66a507dc139b24e1a132e64691f851610eed1714654 WHIRLPOOL c77ad5b14cb21dcab8eca71e1f5118e93688b14bd99f78c85dc51d30844d4e45e891941c9fe0730fc7573d389136a1741fac555b275c4a7710eea4513dd80cd0
 MISC ChangeLog 11403 SHA256 67de1628f3cfa4d73dad618235c1014497a4f36f8f874ab598e01e2d0ce74642 SHA512 e457094ef741845e414e6c086583615497db3be413c61555aded3a3cd1fe1bfa8213011250b31f2904f813cf6e3107d53d4d44ab2f606b9822966f2113c6c161 WHIRLPOOL 5b4fb15b5491cb1e2cb759f7eb0f55fda0d6284201e42d4dc4269bd9785f21f82418ccd47ade99dfc5a71ba75b435464fd8dead91fda6bcc312c0412c4fc769b
 MISC ChangeLog-2015 47718 SHA256 04cbdd251352dbafb6bbff8482f07cd334528830404e4e8fd6fc4f6096eada79 SHA512 3bdf8ad25a5d953f2deb592f14a9ad4b992b2d612bc8a3368483cb985e9e61ce86b38c0d257f1059bff38721dfe7d95e756f3d525ba626bd1c0a51b58b942682 WHIRLPOOL bf5de29d23c92589d58bafe60813fef9babb95f14f53ad01388598294038e702d6bee94fdc63dfe12c0ec98e72cfe2b809f794978e12b5b7924cc0882bfdc776
 MISC metadata.xml 888 SHA256 c79de416847a5e8c1b354320a5fb53a0bf2366c96232e5d74c1ab7a6233e351c SHA512 08a9d876f6cf807d6c237ceb92a8a24b36a11a9b05511c780d4caed48afb4a0eef7f45ce8282a3ee53edb22ffd59d72e3403277dd0573d78c346587d3ca6da86 WHIRLPOOL 633ddd3f4b0244aea407b2a4af1df29adbaa58ea0c6f5fef90f3fb9770bbd33fe76a6bea567509f4e5df138e7ed0d0ea679689bf48adcec0a80c8b1cd6be87c7
diff --git a/app-doc/doxygen/doxygen-1.8.12.ebuild b/app-doc/doxygen/doxygen-1.8.12.ebuild
index 180085b00aa4..78d2e3148ac3 100644
--- a/app-doc/doxygen/doxygen-1.8.12.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.12.ebuild
@@ -63,7 +63,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	# Ensure we link to -liconv
 	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index cac030450f19..70af58f7ee83 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -60,7 +60,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	# Ensure we link to -liconv
 	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
diff --git a/app-doc/halibut/Manifest b/app-doc/halibut/Manifest
index efffc995d363..25c6792b10e7 100644
--- a/app-doc/halibut/Manifest
+++ b/app-doc/halibut/Manifest
@@ -3,7 +3,7 @@ DIST halibut-1.1.tar.gz 956743 SHA256 b964950d11ed09d3af28ac095da539613f6e50d650
 DIST halibut-1.2.tar.gz 991975 SHA256 1aedfb6240f27190c36a390fcac9ce732edbdbaa31c85ee675b994e2b083163f SHA512 b04cc5c52f2d7cd2bb9a36a1aa896c6a4fd11bcfc5fad3d9c74576bf2576ce237cd7ac3ceeff3bd10dfd5a229614d06d23323509d3a83ff74b4a1965e1d726fc WHIRLPOOL 1ff682b819c35e2fbee52bddff04d1653109ff7f9efb0ca07a4a39c6de729c91f22c1259c32cacd1a0b347b64af1e856629ce379595ccd6aa93bceda4526c094
 EBUILD halibut-1.0.ebuild 717 SHA256 fad9e60061b439c638f66d6f6f88de9174be5210629472bcabd633779873627e SHA512 2ea83f1557f756078593a0e240e128267f970c87cac4768c6d6f60f7f255cb7c747820a1f9716a7ef52b2f6d0d2d17a50604afd59f59c784b3a5c128d23ed0b0 WHIRLPOOL a74477841ea0609c8111382049dfa4c9bdeb509e813e84a5b831588a01b3f82dab5013fa2df841b36abf7ec74ae28ca08957fe9f5817c484bbcdcb5f27446d11
 EBUILD halibut-1.1.ebuild 730 SHA256 03a553952863b7539667ea7beb4872c5371719638b9ae20e9001bfc73daa5ee3 SHA512 2e57e22344bb84a3920f103d2af0ebece3143f17fd28c6811db6cfcb0d2199e6b8eed1d7293915d3f407522be23e96b5eb5ad39f1335329a4cb151e25a72db4f WHIRLPOOL 70c0257f25ac6bab8ff0b3b19a484571ba53494003f656b2c18dc355a9121cd838096b4999615f59a34c0e1ee062dc5b56971132e4efbeb81955219753a7c4bb
-EBUILD halibut-1.2.ebuild 900 SHA256 1bacc290cf32c5777241b9e3691e847d8944bf55bc8ffd805773cb9b64f235bd SHA512 92db9a9bfc86510d87207ef1286460940dedc6b52305fe2828f5b5849e46359b0454ee7f02bf309abd0c70ba889f7d5412d73e0b14b00e935915337fe15ebe24 WHIRLPOOL ac326eac0adfa5b4fd04ca2ba925acd6667f4b24b2166abcc5bf48d1f69c4d8a961c6b06de10dd4dd585180ddd1b0cf9e75506f7452a7ebffe5374e1448ff085
+EBUILD halibut-1.2.ebuild 899 SHA256 0616d1cbb300e6dbf5026815d63a78e50ff1bc3ff1d63e96cf66fb67eba6b004 SHA512 c1f5e6978d8a3977502361d42c57043e58765e58999b5d16a8a474a43269d7e3b051c6c3d58d64d6a2457a1d61ecf9df6913ec0becac71d5d65f336713ab1515 WHIRLPOOL c10c95576d25e142112be9a4a20e6f533e9a02f441d01953604de9b1ff9a48c510e005e847706753639bda707aa0d31e177ef24d7e92b54df8bf3530c3c589bf
 MISC ChangeLog 2219 SHA256 fb711ab355e0183a257871ce4b42a6f18b471e32067b95b3c5496c0233e54a66 SHA512 10ba38ceb4d11bcb9ef64cf85bd603a4e2e556cab438dfd2f7c1becfa64cb87d1a197340a0da81ee7aba11d43c95a48ca7e320a73ff119adceb6f47e6d58c465 WHIRLPOOL 94609144dce3e33a3c22bbff2b96a2e60d92d267acd91116ba52c9ae4a656503233a4243c9816f319c1652712d255a3f4ffd9f24f55edac7790c35ff1e4c68ef
 MISC ChangeLog-2015 1964 SHA256 eb9be5a2e9d51e4b4ecc805d101eda3f1e1c1eaad43367495937336c9cceea7e SHA512 ddd76e089e20a3cf9d708a2611dc079ffd71e8eb3372225db6675daea63d3288517583013849a7b0dae3dec4eb64032e2e125d37e0f4d7dece2659205eb4a05f WHIRLPOOL 3e408b3bd4bf78218e4952aa7d0949f1a6d2648ea1d1a43fab69bf3947e2146345887834ba49acd8d959ed57ab66bdcd9e2b1ca1a13bfe7c8ffb4a724e1f5d6f
 MISC metadata.xml 248 SHA256 4b929f10c2798c343335d4dc1d8f92c69e54c8b15a6240b748c4b8bc2cc70e9d SHA512 5a0cba98b94cc06306b0e352d40ff113de69408752b14e1ba9efdce3f564c9bd11f8f65e89fc24d2e2056056edef5b77ab1ca8aa33e7faad5d0eaef40b895c85 WHIRLPOOL 370154a5df414715176a741210d80d93fb60ea31d135c902a85f46af3b6683b0c5c6be956f28df349db79e1237bd496b34c5e05a0aa35d0c3e4b6728cc758627
diff --git a/app-doc/halibut/halibut-1.2.ebuild b/app-doc/halibut/halibut-1.2.ebuild
index 5a7b3c9d44f7..7acefbd01bc9 100644
--- a/app-doc/halibut/halibut-1.2.ebuild
+++ b/app-doc/halibut/halibut-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE=""
 
 src_compile() {