gentoo resync : 17.10.2017

16 files changed, 32 insertions, 34 deletions

diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index 88d0c2acfd02..a33e4e9771be 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -4,7 +4,7 @@ AUX couchdb.conf-2 234 SHA256 056042951c9314feab924d707bf347b2ef265f10e90bec8473
 AUX couchdb.init-4 439 SHA256 ae1b5551ce432ca85a99e3a93355204936b4dff99dc0cdba5e19d44b87946f76 SHA512 a1e0a9403082e1c336454584d78d15e5d76861b3b3d0e56fcfb25ab50c0dbbdcf658e251e25f22e2a58dc72f38ec16ce82759bf9c7b5330a569ffb5fab912999 WHIRLPOOL 8ebe4af5892ea2b8ef4e00d273ce3a0612de281907327a2b3191a30822077fb0470b6a0af39cea6806d59da25d19b517db678aaead514ad9b46a22c8d2110922
 DIST apache-couchdb-1.6.1.tar.gz 12085350 SHA256 5a601b173733ce3ed31b654805c793aa907131cd70b06d03825f169aa48c8627 SHA512 70630a27dec7281fa5bdca0601796baa28fba1d7c9975d8f38b9623bbeedd62b26081118357886c7be00b7769360238b2c99695234e13cecb15a210eb986eadc WHIRLPOOL 5776fe139db54e5ec285ef9882f5164a42a499bab312d66c0edd5314dd1915827a7cf7df02cd5df85c437bf3f70096cb101748956d639e8e80ffd0bb0b79197a
 EBUILD couchdb-1.6.1-r2.ebuild 1876 SHA256 c5edae443bb4025460844b845ab3aac1b70be4b2a4c1ad294c69f2f0d64798e2 SHA512 32ca749588b62e0cdb954e6fcf8753558ea754429b6cc330c8d2503d15f829cfa5d78922981447eb665335edb90bef6bffccf2f740ff7bfb438001abea63499d WHIRLPOOL 263970ac0b11cdc953ce249fe7ea75ff6e17777da5f8ed1d42a9d9c45d13b99736fe3373c62feabfccb7f235c91d292e51e5005b90dc50a47650196a6740efa1
-EBUILD couchdb-1.6.1-r3.ebuild 1921 SHA256 09b0f5d12a73094dfd06f6d10c87cb7a40957a5411431130b916578ef05ed009 SHA512 f48dc14ef8fdacc2d904d98d7b5f9cc24d00ae77858eedcbe32d8f8fc254b8c5ee4f996d097c67914c8fcf5749ac0877ec8af25a047a80359f2dccb5a5bd5b9f WHIRLPOOL d281422ae6f548f91f1007757d9080798bad4971d8a1204984e5d5e77395c231790fe0c8e95a7cd834061b0ea4f864e51d68f93fb0c1c43a90ea8329a73dff1b
+EBUILD couchdb-1.6.1-r3.ebuild 1920 SHA256 2278b40da7545b22c5bc1316844a72f23df40d7542cb36f6a36f34db063a73f1 SHA512 741b364f8d0d4cc5d80be5169fbbb0230fcc39a9d15392459d884f248e955d9df702168997e172a42049adb6a37d834cd13c9536377dcef719ef5356044a1737 WHIRLPOOL b5f36ea8b8432a0411d848dbfb13d3baa6eca2cc48849267850b6f27a4ff69b6bc0289880a862d786d9d9db3494c9a51c231aadbd5bbae428506118c65e0ede7
 MISC ChangeLog 3689 SHA256 9695fbf0257c000cfb6b875048d6b5f7b61cd2a1d15da22017114675b293a5f3 SHA512 25cd2bbf8512952af2ffa3f6fd8fd14ec09497088eaea9b660f54e1c10752118b387e10b113218b1a36fdbedc9b7d03d18fb79814cc297484dfafad7234c6e51 WHIRLPOOL 3efe4e412eef4ca434bdf53ac0b81e8f882a7db4285b291730e4669d9bd68e267a6957ba783dc656774faa9c014e355593d0efc00554a978359ca0ddfa71028f
 MISC ChangeLog-2015 14103 SHA256 3a06cdf5f2fb5900395c9ceb77aa1e355811eb9412e6126f48dab7c07de136e3 SHA512 a90e09a5a6e33ec0f1eddec1a2b651a201b90dc797525616034330006e263f12cf1e338d456269a48a406557d649c6cc1bf3ced63545cda5055961f35adf088a WHIRLPOOL 1585d163b62ca0835f429d6d81b8d8572bc9dff8d477315649cb48aebf7364c81bec11dc4835b694d5c790e4fc50f54b39c8313c31d7f9fc7ab9bd2d69a953ac
 MISC metadata.xml 212 SHA256 061538b4837ab7b95b652299476a75942b769652dbd569225713fdf1166b1d37 SHA512 e4f4b6dbbf6bf039ff5c19bb6a209ad4e0b1286f8cf7cc0cbafcc04fcf93fb92766c8cae06ff19f980a069c7fe9a1686437ab215f84ce10e301275ae107d00bd WHIRLPOOL bb35c86572b2ad56bf93b52f6eca6bea0f5591c1a9ebd608833dea63c89d4bd36cd402a8ffc2d5fdc1d7e1d5466782d1e37dfcac14fae0bbb181029799728fa5
diff --git a/dev-db/couchdb/couchdb-1.6.1-r3.ebuild b/dev-db/couchdb/couchdb-1.6.1-r3.ebuild
index cb3841fb4555..176891afcd2d 100644
--- a/dev-db/couchdb/couchdb-1.6.1-r3.ebuild
+++ b/dev-db/couchdb/couchdb-1.6.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/couchdb/source/${PV}/apache-${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="libressl selinux test"
 
 RDEPEND=">=dev-libs/icu-4.3.1:=
diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index 2407f9958509..2e01a551609e 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -3,7 +3,7 @@ DIST freetds-0.91.tar.gz 2136329 SHA256 6a8148bd803aebceac6862b0dead1c5d9659f7e1
 DIST freetds-1.00.41.tar.gz 2904915 SHA256 f054f1ac09d933527b634e081f5b36856669b7a507601cde93eda32174681e59 SHA512 dec3197a6478fc59b7386f9a7a562df8b581bba7184210c42f26827e957b9746e6820d687a9c6cbcd7c825fc5d4f556547c0483d06c786a064d5c4859db4daa1 WHIRLPOOL de396ba6fa04c7fb580614297c62f61c77a606417e749eb1dd4ad352e7f87cea05ed1567d7dd7f97b189f83d48f711e1254a59d0f9c897050b505e31f6fe8da7
 DIST freetds-1.00.54.tar.gz 2907015 SHA256 b2dc627b87762ffb665ce318121aec3a63ddd430132aa7fbdafb02297dc8f1f0 SHA512 a2a5034705fe06ee38b085f980f6ddf086789abc9485331fdaf829e7243f7ba95a5f0c612d7e3ec9e10f28a5c8b3a3fd8e7853d66f67110bd860afce949c798c WHIRLPOOL 519cf22370ed0baab6bd24e0d9e237703157e8be9a5ff8af1ec9307d9faf3e961df8c6d623ce53998efa28fe884897bb4190f2f4f7e29642c8c465b82ea64c37
 EBUILD freetds-0.91.ebuild 1118 SHA256 a74e0519417c01b2d4fb599773125dba5bfd4f6b2708c23659edba3c13860f85 SHA512 c4623548cc786c3f114f71456011e2b9a5f225e3a032c7268dd7152bb083aac8242af24f585d9ce40baf2e1f5a616cdbf003997874ead4621af8007804d3c3e1 WHIRLPOOL ada51deda98d8ba46318d077e8eb4ba9e591df63d740745bbcc9df2aa5fcbe90547302b9dfb13ad2542640e06577010b2170c0c88ddec3e7bac5d951cca0019f
-EBUILD freetds-1.00.41.ebuild 1989 SHA256 facba6cef0d048d4602b1fd355814c2bcc664d12c909d59f5bf75cda2f45586d SHA512 cb6fa1e777c9ffb4656d9ea850b4bb3050a549890a0e4e961d30578e318e88c923cf53dd59d2ec93b806b460cfd2825452bbd456c32e6cddcfa04315afa75db2 WHIRLPOOL eb122158155142dc4890b1749e2cf5c5fd2d63c03e74af5b10a4bec94cedfa9bd09120fa1e6e40cf7313dc7380bca1224dd5a6da09470a9279caa3817ff18f78
+EBUILD freetds-1.00.41.ebuild 1988 SHA256 d5631adfc8d1590b6f5f757f19769ad23832aeba7fb1055e6cf062396da3eae5 SHA512 a48ffe06b8303885d2e795d9cfe756979652460da4912de33dde0a06b635c3466f3abebfdad17ef7aa8cc35fb5f79eeca8457f18c2999108b13367eb2a8d7e02 WHIRLPOOL a7199e7292ce589d5c1d1aaa44f1623c58979511189e0599c1b711a1a76844ed4c745a9b1432dd907179dbe466f5bcc8cfa17b6850c49aa0f4c003e873cf0182
 EBUILD freetds-1.00.54-r1.ebuild 2064 SHA256 e45ff69ab23deefc69f7929b45ff0dbe468f5fa3c3290f1462e85d1cd7528173 SHA512 48931c5f0e49cdd9f07e413339a0e647a4b48eec562cfe337a6c57243d11a99d47977d8987902a6ecafa3930a94a1102912c57359e146f155f6fcf6ee5753ce0 WHIRLPOOL 632ca8142b6dfb780d1f48d6162e48126edf1731b8e1b9ba3317f40bb595eca621afe7cba0df9c68ff98ece9513c3f10a9c86ce956b5e80c0ee990214c20ff5f
 EBUILD freetds-9999.ebuild 1603 SHA256 1fd3bf5f72212d4c2dc5ed420bbc2d6a08f7cbd08167b496818f96e9c9682885 SHA512 264144b12f57bd34d1ace56458e4ea2cda0f4f5fd9f789373d8e7b4695cdf910562441359218b0c7c8bac446c8fa5673c56a37d0cfef444fc6d11fe57f2121b9 WHIRLPOOL 49a1632ef4172d3675a1e8909dc7cbe8edcf2f52f0438b9ca36f1c77ab6762b2be645126e27bf2ac4690610572f0fa7de1fd8961c19871fa7e859cb781d58d75
 MISC ChangeLog 3598 SHA256 d291a3c0f91ed7cc8428525f9d569fe6fcfcc480d56a638197a0cd7427e8b99b SHA512 da0610072732a93d3f5e1631a143d8ae47890692379e9914cbac321307b527477185fd052eb1763f839dc26f65458ba7291485e9cf36503c0c71e9e08967e977 WHIRLPOOL 5063594adc62ada60ec780eb112ba021a5f013e0707b580bd5a49993b0c241643f31e80c7b8cb9045544ea601f882c0f14d76e0bcbc745658c0c6b703361f5dd
diff --git a/dev-db/freetds/freetds-1.00.41.ebuild b/dev-db/freetds/freetds-1.00.41.ebuild
index ede21dd57848..a68dba1cf161 100644
--- a/dev-db/freetds/freetds-1.00.41.ebuild
+++ b/dev-db/freetds/freetds-1.00.41.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.freetds.org/pub/freetds/stable/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
 IUSE="gnutls iconv kerberos libressl mssql iodbc odbc ssl"
 RESTRICT="test"
 
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index 9bd99aaac021..2efcf3f1785b 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -1,7 +1,7 @@
 AUX mydumper-mariadb-include-fix.patch 696 SHA256 b7c2998f31453360d1891e10856210e98672055ecf81b9133eda22564c90af53 SHA512 e4343f00f0f61d63ec8621d42537411158a995e624562f71d322357a7322b46aef8859252e8b8c5c51370247ff70d2cb5187ff33be56e964e54a2e392124fc7c WHIRLPOOL edca806761d639eee3f671dd400ff3d60b5ec66b46b998e7ae771cd21b3eca5bec46aa586505c7062bc8ff2aa8e4fc3ecf0e23fb4b2478878fb82c7944183457
 DIST mydumper-0.6.2.tar.gz 40165 SHA256 fa28563e8967752828954c5d81e26ef50aad9083d50a977bf5733833b23e3330 SHA512 ef9e48cc481f2674456659c061c45f3cb056180ab5576805e75d458658e94998758b894e45ddc06fb716c1d37fedefb644158f07cf6e77f4b5477663e954eb83 WHIRLPOOL 867b7efa6ca00dcfbb32f5dda2b63de038d0da3ac1a127059cbfdae9af577fef74868c38dad2bd5b5a9b4de76f7d108fcb6232b27c41d3062f413eac4cac843b
 DIST mydumper-0.9.3.tar.gz 45320 SHA256 2cd6a074bac7072905bd044ec20955c53c81b10e877ac9c644509940a8d201fb SHA512 3bc2c85dbedf234aecca3b66f445e42bb7ddff83f914d5cc231f6a5755d1c2bf300ae9bf4bdea0717b45ea5338c6c336ec44f375dbf29570ed785ffddda53898 WHIRLPOOL 09988aa314ede6e56ce82c6eade9d29770ca2cbc39d4b2f1cd3f8403f9521e1aa5a372fda7992885c1c25743cc59d4c41cdce8d86eb79b8c7725631c2919c9ae
-EBUILD mydumper-0.6.2.ebuild 923 SHA256 6c52294cdff77ad253cb1efa360ed2aaea01896d34205b3c372ac5727ed8faf6 SHA512 9416dde31e347bad594cd54ae223ba00038f392d0fe372acccc781b4dbafce89a4113c09efd3ffb4a9973f0dbdacbd631d4229f0a2a966c0aaab047cf83d8f9d WHIRLPOOL 6e43db2d36671931bdde54c2f34ee500001f0ee05545c0c6a4ea5d36faa4164f837da29ed672337ca40c03072ff3530f253b046af7639ba90e7e99ec7f8cafa6
+EBUILD mydumper-0.6.2.ebuild 949 SHA256 d5de40f9acb0ff0b489b81a763e494d4d3831f7798bde1aa1492d4ed38c9aba2 SHA512 4b5078ef47b20819915e187121d1ff42e31d910e515ab1ec70289fdc775b48ff2da50bd549cb9fbe526dd453b9d09bd5631da12206bb254613a6ed4c0f5d7818 WHIRLPOOL 5886604cbeb5eb0a11aa33365fb00cfecbcd79d60db8f39f72dc816c4f4271a42bf06481057a5f6845c710a20e529ad827e6b07a362fa8fab1f31e195a617d8c
 EBUILD mydumper-0.9.3.ebuild 1030 SHA256 452452ce20ac7136f8b77d7310197dd728dc2a9432757d4bbffdf92167deaa40 SHA512 9d0514b4d1690855c8e828ee29e767410ab19f6726f10eb381c9bed0a0c42e63fa7eed88fc278e532d951f49652d0675d839e3d14c650eb352831cd5f7eacccf WHIRLPOOL 60584b90fec8bc5bc1c3c28eaa6767862923410f17612d7ca7c2e6f9e36c8b7bef090b79ce6650bd18e4db891b23aab2bb050d21286ebdbce5331f1cc6cdeea8
 MISC ChangeLog 2725 SHA256 d1ecaf2b0c71e99c461f83588d14e73b773277a4aecf10aeda571f84b4a342f8 SHA512 c9eb636071b042ccae43a5b8af330dfed81f2547467931146ad66a360fae0c058abcab3d9a18451d8e5d323c92fe5c8db1e4325b7b76c54477df94cf290a91c6 WHIRLPOOL ef094c02e8427ec6fcaf2e10b6e10e6dd8eb2045b69831de35711398607e28eaaf5b5c0ac76af0d6040602201c799208901f8c24bb75356614f6d2fbb00d7a41
 MISC ChangeLog-2015 1534 SHA256 c65362f5aafb0d2cafc22db7177e28dce95edd3f8bf5d38711440872c3e72c0e SHA512 e269d766dbba9ce8913397f4321d30545bb06e58042619eed88d2de19d69c9f21ec1a0146cc10e9226e6b6394d5b37469754ae1d27cf33a4ddf93a15f1d6ff9b WHIRLPOOL 6640ffed60e7253d2373db39d26c6459803387b55ffa10483d8ce0c69fbb697630e5e33f77904bb5c7e6b8c8c02b317ecf8541d3c958612792e8ed14979a88f3
diff --git a/dev-db/mydumper/mydumper-0.6.2.ebuild b/dev-db/mydumper/mydumper-0.6.2.ebuild
index b28500bd888b..8e098e7167e4 100644
--- a/dev-db/mydumper/mydumper-0.6.2.ebuild
+++ b/dev-db/mydumper/mydumper-0.6.2.ebuild
@@ -22,6 +22,8 @@ DEPEND="${RDEPEND}
 DOCS=( README )
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 	# respect user cflags; do not expand ${CMAKE_C_FLAGS} (!)
 	sed -i -e 's:-Werror -O3 -g:${CMAKE_C_FLAGS}:' CMakeLists.txt
 	# fix doc install path
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index cb06ee916bf3..9c7071f67341 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -4,10 +4,10 @@ AUX openssl-cmake-detection.patch 564 SHA256 4e44d7a94ca89cced30b41207b00c47cba8
 DIST mysql-connector-c-6.1.5-src.tar.gz 3455028 SHA256 278f2b40f3980079bc7ad247cb2bf08967ce56ef79da468ae26ff2e2a560be66 SHA512 be47ed70865744ff9ecb9376972208504327514f03635e54c05e81d324bcf9ba777300a12738d8ca32b95c9c31d734dc9f6ebb7bb24fd11821560a6b0f09bb56 WHIRLPOOL bfdd17908cae63ef5b5006bdf28432bb12738044fe99960fdddab6da527ab41211a48396270a778ce500c5758c2f5d50c1fd850a92c684996612ab7c38637c61
 DIST mysql-connector-c-6.1.6-src.tar.gz 3475044 SHA256 2222433012c415871958b61bc4f3683e1ebe77e3389f698b267058c12533ea78 SHA512 2a3db4aec5b8e5357fa407d6e2b52534f7aa9c0b78c4ebe9a61e2e25dc5f7dc1f1962f6e6fd847107ce53ca369e0babe7118b947a87189495212596348cfd760 WHIRLPOOL 6a0a55a47a88606c12511f9fd155bafcf5d73b1ffa2c4877b838bca018f4a8a8f4427ac6af6e4c567eced7e1108dba4a613255f813ab481e8ea948b3a6cdff33
 DIST mysql-connector-c-6.1.9-src.tar.gz 3494748 SHA256 4e808704443365ad5b649673d03eca8fbebc0a4da9f1f96616c6bd1b1901ab2b SHA512 3127d08428e820044e25ab5ebb741a128325be6ca0fca0300cab33891693e11e57d4ded5a25918a67d23cceb8a2c6ee99879ffb50c31bc4c2e225a9dba9674dc WHIRLPOOL 7f0cb1fa7bb0f77447f4884b567e7881d8d9c1dda2e27250838fe8a51ac4ddcb8f7aa683fe11a3f7f9545f90918b15fe9e033da138c86e5bd4f360164ebaeb2e
-EBUILD mysql-connector-c-6.1.5.ebuild 1455 SHA256 43185fbcf3fcf92544003105a05ec3da9201b4da577c08c0f4a64aa308077699 SHA512 3d11b764f57ce83fbb3e3999827a10330b90d44a311693f71aea8b941685781d72a251897f1d510b4dbdab8a333dc4570c43b442df124b92b2dc87d738e75c8c WHIRLPOOL 0e3d9fbb6c283e84432118a28129fb10f3ecd72634a81cefb6b16d8f545a88d21b04b5ff60e639ffbfde2012f7f0446e0c175a22bafd8f87e93c0db07f25ec5c
-EBUILD mysql-connector-c-6.1.6-r1.ebuild 1615 SHA256 c13dfe2e7b5694fa35bad1a0fd2b4da894e0065a9f504f9d712e33a2c5e5c2e7 SHA512 85bea81c9c6876dd76ec3c5046496c25ca16e2045225e2820f25be7160d29a55dc310a67c5bdf19c45cf3ec741f2aa7c45fcc0b59bd66cfba874ffc29eb9b928 WHIRLPOOL 1c6b7eca37f4a1c3757dc97048e32bef5858aa9363d8d71f5085f885d67624584afb9b6df69b330b4a8446e3fadd9d236a7bde06bd500d408a89b0275cec4a75
-EBUILD mysql-connector-c-6.1.6-r2.ebuild 2105 SHA256 2c282188b26b8805ac9fc73d90940d303e5bb9b5b0364badff8406312969d24f SHA512 a9811b44813edada99de6283fa0b04875167273683d26b0c1c54cdb355002985481b0d333437f79866502464ebdaf72ad9eb19b505c1701d7d8a5beabb777da3 WHIRLPOOL 25e489f050688ee564d15f7e093c67fce3aa60701fecf50b051faff7fccec9c8625c5811985325ed20b98c8611edf2c858120bc959582f902ab7c8d4524a48b5
-EBUILD mysql-connector-c-6.1.9-r1.ebuild 2159 SHA256 f0fb51274550ff7fafb4e5dadb700b4708ef1e4168e58a063ccb9e288f1a6cef SHA512 734240efbf263b39c34d0b8be8b9641fe8d3915d829e0f00f5014560a0671e614bc01b6f749e436d140cc0a2abe7e7b142ff977188dcd579dcce0ae755d11ea6 WHIRLPOOL f3c77f8b6fed3dea186e6869e20c73ae0a21ca01287734ef44c037f6b0b66521a635ca8ad6318c5d6291db0caf10650c4859e94e8ceade018338a917e6639b23
+EBUILD mysql-connector-c-6.1.5.ebuild 1427 SHA256 95774f8e83c1f905668231c28d3f17124a520f945b2ab15f87d955c892ab9585 SHA512 1ee302c40a4bc611a3e7f5ec2efe597a0d427728d96f332ab7971f6d14afa9dafb8e58bf9cef1e259b49f2dbad9c068f6001618dbc49652a6482725c647f8675 WHIRLPOOL ad6c321225cfbabb8353007b0cdcd594d5c1746b59d84e83c999ff3a9fc31377b11901d6b039ce035c0279d913c1b119db0410bfcbe199347c2cfbe41a083d00
+EBUILD mysql-connector-c-6.1.6-r1.ebuild 1583 SHA256 b805fed195f90c1c472305d7606506324d4ac3d2664cfdaa5109576654d64155 SHA512 57460f5c37626fee2bdcff273ea491a1c44e2e2f690df61a10c5219be16ef7378abd876c1bf8c80400f14bf435642294e87f0921d579330a961cc5ac36c4bd88 WHIRLPOOL c4851aaac50aa73751bc9586a1ebc37ff2a5afc4d9b9913edac25ca8373349257113c6d822709b87f0ffda91215b84a131b28f5da0baeb13b2e75a729fc2475a
+EBUILD mysql-connector-c-6.1.6-r2.ebuild 2072 SHA256 dabc381c2cfeb84f67596d44491a60d8696b0f49b97e94ff790fb49ab67d8a94 SHA512 ef97936b80f928978afab284d60a3773fef8f467f115d93c28c6e9021ae8a1c87fe671f2db3761e6f1f6f3d0c1d74e68ca0067400c0717c99dd9bfc3748a1d72 WHIRLPOOL dab74fb6896ec7abd876a756c4aa5b84c895d795439823d630edf3b93293c40db52ec3ba044d4aee252b039ef2e3e60f9b96225ea89c4488d743f8d145d0a20d
+EBUILD mysql-connector-c-6.1.9-r1.ebuild 2175 SHA256 4ab36e26fae8c12580faa97ec493f37dfb22b95caba1b4dc7bf56df5e9639fde SHA512 feedc21396fe090439d990deb40678baca4f08a3741187ab8b9a15cfa1d2ae6516c811bf33c62f50ee5f9305e0cc0df3d858283e55c663d273cafb7bdc92ad4d WHIRLPOOL d854df916db53df0b4b8c5b33ac66b9e21db1716bcec9528583ba69e9b92e27671589e61d7297d397ee23f015517707e4cc3c7f1212d9c76cb6a0d8ae378642c
 EBUILD mysql-connector-c-6.1.9.ebuild 1974 SHA256 1ae8455216fde95576bf042bed21062a9d648a027bc6884ac9585bb37da76fb8 SHA512 f13c7e3bb1f8443f3ef07e40d33b3efcb040a25246bdce34331d3fe3c5a0e797f062857e6617a75847b3cf64c85b9554c7238dce205ff0612295c2ff0c4628f4 WHIRLPOOL f8a5857ce1f38fa1a1d7ad0047be903cfa1af67571598a8bbc032c21588124afa6d521d166bafa0abe768e02a0694be945b5294ebab96fa03720211ee0286bc4
 MISC ChangeLog 4210 SHA256 49bc4ddbe5d7b9861a0a47da0dff8439545aa1254e658f874eaabd682ea0a014 SHA512 2f40b4f4b12d226a535600df73b4579ef7d454c1f107d1e44b06f82437fe06b597a96e833b6811139bb717694066ac656f3533bddb7bb60044b0d9375dac816e WHIRLPOOL 8050a7b12e04c132413742de717d714b2cc145ada7a0c22379809b6b53c505da1e0d5cf8208b9074c8505bdfedea0754aa3401a857d04ae1342d8c50c3e4957b
 MISC ChangeLog-2015 601 SHA256 828e88df369701275ead137ce3a91c3d58da90f775583f5a06d3786f110d27cf SHA512 1e57ce1e1625114b48c7f4a410fea944098abe1dfca815a14e78df338dd2ccaa4ffa8e0db1225e194ecc7866262a2b9b618a79f5aa0e229fcb57d5aae4908ffa WHIRLPOOL b18260020190129b7ed3a43b70694697773b0d3e42bd0d8093accd4af678e60b856bc0eeb4da4633bd5a0709090a774397ead334c78a145d99ce1324e945403e
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild
index f865e84f6663..1813980a0934 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild
@@ -35,11 +35,7 @@ RDEPEND="${CDEPEND}
 DEPEND="${CDEPEND}"
 
 DOCS=( README Docs/ChangeLog )
-
-src_prepare() {
-	epatch "${FILESDIR}/openssl-cmake-detection.patch"
-	epatch_user
-}
+PATCHES=( "${FILESDIR}/openssl-cmake-detection.patch" )
 
 multilib_src_configure() {
 	mycmakeargs+=(
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild
index ae0938c61b5e..b7b764fde620 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild
@@ -39,12 +39,11 @@ DEPEND="${CDEPEND}"
 
 DOCS=( README Docs/ChangeLog )
 
-src_prepare() {
-	epatch "${FILESDIR}/openssl-cmake-detection.patch" \
-		"${FILESDIR}/conn-c-includes.patch" \
-		"${FILESDIR}/mysql_com.patch"
-	epatch_user
-}
+PATCHES=(
+	"${FILESDIR}/openssl-cmake-detection.patch"
+	"${FILESDIR}/conn-c-includes.patch"
+	"${FILESDIR}/mysql_com.patch"
+)
 
 multilib_src_configure() {
 	mycmakeargs+=(
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild
index 32e4df87bd45..fccb70097d1e 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild
@@ -39,13 +39,11 @@ RDEPEND="${CDEPEND}
 DEPEND="${CDEPEND}"
 
 DOCS=( README Docs/ChangeLog )
-
-src_prepare() {
-	epatch "${FILESDIR}/openssl-cmake-detection.patch" \
-		"${FILESDIR}/conn-c-includes.patch" \
-		"${FILESDIR}/mysql_com.patch"
-	epatch_user
-}
+PATCHES=(
+	"${FILESDIR}/openssl-cmake-detection.patch"
+	"${FILESDIR}/conn-c-includes.patch"
+	"${FILESDIR}/mysql_com.patch"
+)
 
 multilib_src_configure() {
 	mycmakeargs+=(
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.9-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.9-r1.ebuild
index 5222a52edcdb..7a1da326d8a4 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.9-r1.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.9-r1.ebuild
@@ -44,7 +44,7 @@ PATCHES=(
 
 src_prepare() {
 	sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die
-	default
+	cmake-utils_src_prepare
 }
 
 multilib_src_configure() {
diff --git a/dev-db/pgagent/Manifest b/dev-db/pgagent/Manifest
index d19ae028cfd9..659f549f3525 100644
--- a/dev-db/pgagent/Manifest
+++ b/dev-db/pgagent/Manifest
@@ -7,8 +7,8 @@ AUX pgagent.initd-r1 837 SHA256 0de733c1c041971f455d740c71962284cfece3545d4448ca
 AUX postgres-10-build-fix.patch 2421 SHA256 7887e667386276b798e3d95251d206b28b68889408bdddc605f1c98052b48e4c SHA512 52aaf0582d8132904d7b95fc523d597749f045f9d465401ed851ebfeeb0824d2c8668ba0525db5e15a3966b388215e885aaea5626e3102a765fb7f2a2ba0b349 WHIRLPOOL c0de7d3d1be898a05bea60fa75850500bb6ca05f5733967a0e4869b2d2c5219efe5d6cef523239c7f5d738771412afe19ea45f5e83d98172a80ef299d92555b3
 AUX save-stderr-jobstep-output.patch 2626 SHA256 7a87fd19924ba56bdc09bca1b04da193be5e44ffc4e7355867c78e7bbce7d4bd SHA512 b84b52e5a96d98067eab5e4877c54e02e3c912215067f4e1a1c9d3983a29acfd3e63fe666c6e62cf46391fb72cb02b4197d23e305cadf88da096f80d8e0c8167 WHIRLPOOL 483fbb046fff7e9fe6c981a6a8b376a30e6fadd9d7fbbdb9af26b430c71522bc425db63aa39e4406b162580c7243a3fe38497367f211e2b7e2fcb2f5cc7a94dc
 DIST pgAgent-3.4.0-Source.tar.gz 45081 SHA256 0da0ac8f453cf34ab6f708eee036bed0fd0e5fa311de283b92d2ff06600bbb3d SHA512 3b068fc6f5e51ff20604f8cec3e067d04b5b1537229da15ee442000f5fe834697a4eae86be0e9a58b8ee5da24cc985c8c9804d71cb2a50e93ec4cf9a424a4ff0 WHIRLPOOL df619ddbfd5c01cf9e17b22becf74742ea7caa783504fd5942d63992bc80913b36f1c85d7ce2d3dd31634b524617a943ed07a3eba675caddc7cd7f3fc79d8c1c
-EBUILD pgagent-3.4.0-r1.ebuild 1230 SHA256 933a43edb813649e5749d020bb009d97edbeccacf72854f783e35fceebbb1a91 SHA512 ebcf393c254a0110b85071a0ff09445b1638b94def4c6e5fcbe93719df82958537e6ebfc9dea46be1e4a3c0811853e1614d2980cb995bd8a37886ca4568e1f85 WHIRLPOOL b205d9442e8005948645187947247558e79b40756c3e57b8ef2f8bebe855aa12ade5e93838a3f5e7e772a5078af4b5ed714ae1cf05d985bbee72e3819fc2fb53
-EBUILD pgagent-3.4.0-r3.ebuild 2033 SHA256 1d0de10cbd4023b8137502e28df0328afa4047a26ce95575128d783469386164 SHA512 4e3968ce6f545a85085b8ffd326d4c87955e280ba5185eddbf87b42705c19427b4ab8ed8e1d4416e27dd0a60f00174cb301b25e3c8367eb02445a4c21ef73518 WHIRLPOOL 5a568d4a5e16b1589e9190289856b6c129d8cbb09b8a146a65322526a9c8a7197aed859e212073407bc8078f583f7777cbfbdc4a02de2b086b5408f90ad51fd3
+EBUILD pgagent-3.4.0-r1.ebuild 1256 SHA256 95b123a2b2466a16e25f5ca337643309964ccbff186f6cfa2ec6d9d6b204bb87 SHA512 eb5144d64577348695c212947bf6741069e51102d390508d17eeb9104b0300529bd32dcc520adb791474bf8b728fc81d5c36142acbe153ec00c4669dc05c4d9a WHIRLPOOL 464719cd23725d02597c8a4cd3a00bc4473dbcd56b7451a67995ba72807ca09f0631b8db942d42860fe0c387ba6c49781d0902915a577b3cf90e282156a8d521
+EBUILD pgagent-3.4.0-r3.ebuild 2050 SHA256 c992519514a4c202c86b83f6103329fb54e931f5f36d08169d7ff543d9fab561 SHA512 734a3c8d2171ed41b090d58832af5b9d99ffc08c132fc3dd25637e44f2a051a316e632e2a7f532ca8b809c54ecf5b346a99b92d793974be24b80f00153141e19 WHIRLPOOL ad2252faa64f5558f226d4341c9dae828526358728446708dcae0fce1db424b241f0e6101d1826068aa550441e1dcae300144a42e1b087a080d2208b92c5dd40
 MISC ChangeLog 3643 SHA256 67629c68ea7e97fd5ab628c9c5e2618c703274f3cc5dece12a335df10a6abf51 SHA512 8015fd3d80f62510180ee23ae4154c4ebd3188564a4ea8924bad8411233e5a6033dfe0c93e9cc89e15f0fafd99849dde4875cf1ff1682f0246b36eb14b816be6 WHIRLPOOL 576f430c79d74b831bad9b9d56e2c6fe4ae85162900c5c0e4dd6af258ecce4c8d916d78c0284dda1da73f41939cff282ff95823b13945fc9527a5459efca6e6b
 MISC ChangeLog-2015 1605 SHA256 c57b5601767ff35dc540e148bc4a5bb33b4237fd80c5ca22886da4b683120e55 SHA512 25c8294d435bb3f517a6403ce8a2fd0bb0f67f9aec0eeb3948d506e92e6fecd0e1a2d37c2a8716d7e6445206febd0416f19121bf61371bbb25c34a7ba6a7486b WHIRLPOOL f40f3e94882123f713676c5e4ff56be6235542b717ac93fa01e459b4032082004b3e73783e8fef2e5a3f52014b099f53cc449725d308e697bbe49acacd158fe1
 MISC metadata.xml 298 SHA256 9f51466b5b46a12996e91f294520ed3dd90eeef32edb1989121d553a4ac3d1dc SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89 WHIRLPOOL 870c5ed93a2a9aacc7763ce60e5d4eb9da14369c8f01818edd9a0166767909de7ec942349a1ebdb3e0c124cb3982dff300c18a5d730f09045b10b3fea0940cd9
diff --git a/dev-db/pgagent/pgagent-3.4.0-r1.ebuild b/dev-db/pgagent/pgagent-3.4.0-r1.ebuild
index 318a56619a09..aed37174e318 100644
--- a/dev-db/pgagent/pgagent-3.4.0-r1.ebuild
+++ b/dev-db/pgagent/pgagent-3.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_PN}-${PV}-Source"
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 	sed -e "s:share):share/${P}):" \
 		-i CMakeLists.txt || die "Couldn't patch CMakeLists.txt"
 	sed -i -e '/SET(WX_VERSION "2.8")/d' CMakeLists.txt || die
diff --git a/dev-db/pgagent/pgagent-3.4.0-r3.ebuild b/dev-db/pgagent/pgagent-3.4.0-r3.ebuild
index 3426a5d6bec8..e80fd88d3ce0 100644
--- a/dev-db/pgagent/pgagent-3.4.0-r3.ebuild
+++ b/dev-db/pgagent/pgagent-3.4.0-r3.ebuild
@@ -33,7 +33,8 @@ PATCHES=(
 )
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
+
 	sed -e "s:share):share/${P}):" \
 		-i CMakeLists.txt || die "failed to patch CMakeLists.txt"
 	sed -i -e '/SET(WX_VERSION "2.8")/d' CMakeLists.txt || die
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 5baa299e7a55..8c31d9419daa 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -31,7 +31,7 @@ EBUILD sqlite-3.18.0.ebuild 7632 SHA256 a07cf557d2152945d5a14150187882033e4967cb
 EBUILD sqlite-3.19.2.ebuild 7860 SHA256 1d72e9ea14610c26b10e3ca33d8cc46b8317361baa7f757e873285c607ab4d00 SHA512 e90aae9d716ed9d6e5f6ab714917ea3479b8852811be8b59f3955618221b3ed454cb0092002f5a1608a6e62521377d67329e03bd5d5119bdb6228195c9085af9 WHIRLPOOL ac2e32d396ffe7dee96918a547ce4fd8955361baf936adb5e36ae6eb2e6a9b0e28710a2e24afc64ba71795ecb5be63137f164b3cfae6ccb096a005607e241afb
 EBUILD sqlite-3.19.3.ebuild 7627 SHA256 940a4b87c1445c20736d26b44d6e8bea6fca0dcb90815c505974217d8e8c35c1 SHA512 9b689a4fd1897c8ebdb4c726c7377dbc3a53445539d93d443e208ccf007f0085b7179f8821a2eb0b15bb4591b5dd00747dc54fb0a1971bab249b905f49e2b31f WHIRLPOOL 082c44e8a88d94518733bcb2990c863bbebbb1c248f6cb553a60cdef7138c482eb505a345550b94e8285bfd375d0abea9b2059202b66b837fc3840d82cda8a24
 EBUILD sqlite-3.20.0.ebuild 7632 SHA256 9dda38d50abbbc7f1e41729b952745f5bf1a7f2cd9abd0a9ae7fc7140ca90c28 SHA512 0429db119f90a2292eb5ade11f55acee08a68be38bd37e4455e686e5431d1d04475f860fa459d4746e7404123869ebf2ec75fb956d57cad06b49037f25ab8eed WHIRLPOOL 52cb074e3428b4be0777c4cf3e50d6ff7a86ba6e14afd2e2baf31b09e3fd0725dcbfa4adb24fa733706cc647008031a366944cbb3d93e2b700990632e7ec98ea
-EBUILD sqlite-3.20.1-r1.ebuild 8090 SHA256 d953fcafbda3bf5b964b562860a9bbe4d184a2fdbe77f4d21b0f8fa119dc1be1 SHA512 15371d39911f3e4ea0d8c39f354de454564ca23d065a227634f99db18735932cb257c2e7271c2f50d78c5496bff5500b8114b755eab2c861a70afb6f5f9110b2 WHIRLPOOL a94f41a5875535aba2425ec63af32933637838b0aace1428525a531700712a56ad548308aa87065d1c184dabb266ed2a80b7118f90df24b73c3b3f1ff5beb4ac
+EBUILD sqlite-3.20.1-r1.ebuild 8089 SHA256 82c7e140aab6641a7db9a5eeb879e1eaf6558a099713d897c6afde7654d92321 SHA512 333d20e5d43e07a075e95ffc4eaa2ce6494727474ff205e52272087d8bf6b500060b0fc4c04611e27cab05082a6dc1885b217eb11bb0e89d7946db2c0133b602 WHIRLPOOL 2da3cb7436e1e1408fc880ea9c9007a25ad541ad8bb5a1458d50fcb07f297100937d205eb2615798dea31bb3b818d06cac435aa4d55faf9a95a4efaf939ddf2d
 MISC ChangeLog 13419 SHA256 729f7a8c3bcf0f8b48bf8abb50a5f7d11c9061a7717ef2d99f5e1c9ea0e0aed0 SHA512 d60a569bf7563f3c8efe9f5c75b0e71b25677125cf82251db4c169f0f67090e87944e51b23c797a22ff3d6e104ff81c3e4af43d88e1a4257ce790644fa30e23e WHIRLPOOL 1c24f28d1358c73eccdf19a03373ffb05505adf77631cec6c6189c4307ab344c9586b1ce245bb4ef40017f767eaa7dd22520a0fc071f44c7711fffd9fdc5ed03
 MISC ChangeLog-2015 77763 SHA256 c33481b0e8ff18658a72ce845ef033f46d7e2e47fd368f276485936b8249e366 SHA512 ae9ede8a42eb81bdbfd39c201aaed8a295c2eb61999d7961aed59f1d439241b57ffff0548b11317abdf2342a2e35daeb8ba98dea3fbd1904653192c3e2b3c86c WHIRLPOOL 892423e0771ee903650e396b9eb63ca76abe782ce5d3f2e1f993d0c65f3ee1b23e38a743557e09f7d11c6466ffe7c8bf7fb4a372ed58e33c1397d9c9b24f1783
 MISC metadata.xml 745 SHA256 0430582d0c0d1d5687f3e488e11f0b0c60f91fa51196df62c5ccd4a57b79912b SHA512 06ed7007e3ded9f29fadc70c583e9795a8ab5c27578159bb060b39c0cf7de6b4bca06ff0ceeab6710c50db96a44c976c52af2352ee7928211a46d5eca071b849 WHIRLPOOL 7c9f0a1ab683d8c10a5eccebdd88f1f470c72ae4b547fc0a465da4cd6c640d0b8658d9767dfd6e16bdfbb54219edc584b0c7e80ed6b4e963032b7aaeeab672d5
diff --git a/dev-db/sqlite/sqlite-3.20.1-r1.ebuild b/dev-db/sqlite/sqlite-3.20.1-r1.ebuild
index 9cfbda6afa29..0d332f038443 100644
--- a/dev-db/sqlite/sqlite-3.20.1-r1.ebuild
+++ b/dev-db/sqlite/sqlite-3.20.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2017/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )