gentoo resync : 05.04.2019

35 files changed, 241 insertions, 535 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index e7b55f81f932..18d6250cddf0 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index 4136d5c87ee5..3080ad1afc96 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -5,5 +5,5 @@ AUX etcd.logrotated 104 BLAKE2B 3126c99db171af177d6d6368e7e53f3e5e07b9ae2926ff12
 AUX etcd.service 304 BLAKE2B ecffe9889f9530bf7172638a0273736abba2b3ea5c5540b5452d26fbaec17ab9c138db86b543c3c88fd3d16ce79487eb2c31ad7bbfb0c5b9cd11eede9b99bd2d SHA512 0074f77a17afe2bb4145f12a6eb312caa3e08cfe8bf35856b79d091ad8786c4223bd91c0a865e789ee9ba180f2672b31721742bb32efd0cd383bc747eb926961
 AUX etcd.tmpfiles.d.conf 76 BLAKE2B e5aa0ca42dd579e9c2ac8c6bdfce83f87ec79ce64d10e20b61ab3df45918747f588b9246085fec925bb39b772e061628aadd030a23a59b65a2fc2243eca1a7f9 SHA512 7324b74dcfe050dd7fbc318ca3ce9b5d58bce8fa2ce2d2d771664ef981c834375f7cbfebcb630cd61dab2a3f6bf6c3733ad04f752beadf7bb6fedcc80ff682ce
 DIST etcd-3.3.12.tar.gz 3527586 BLAKE2B fdc4e3e9522c032d951045d4eda7f36743d4fbbb4ea8673bbe00bb38931cd7442910b0b54eeb6df0957439332df498389f3568ba7e8bdecfbd873fecfb3df86f SHA512 63ba6130bd93471260b8d90760455bccef2755e672a9df39224491188c69e4e3e8c1157cfb639c4002fb8a6d16950f7ff448a83e0acbc389162b742f3df6234f
-EBUILD etcd-3.3.12.ebuild 1991 BLAKE2B 856a1e4bde495fcb961a7acb5a985a12b5bfeda9c962d88a42c538d1465368c697348588a641cb673a527f26dde96965ba614209e196d4596fc58041619bbb34 SHA512 17ed0233df8464b24f304dbe1727300c1eaf9ad79382a3aebb7a1dad8e281c6965a67406e064181f8f0beb90c502d05e126962563e83b620abe6675f93513ca2
+EBUILD etcd-3.3.12.ebuild 1990 BLAKE2B 2eb11877c42e9c053df32b573f9abd6f52dd9f2da655c5cc127c7dacd872f832d9a76c3adb717cc6813ae20336c0cf8dd94378f66cf788f4b75cf689bf1cdf07 SHA512 caa9fca22332a54e8027bfdb3d7fa0e1f9f6aaede15833c9487c7c114e9805734209db94148c4cae61968d2987505f9ce8b27bbcc59411727e1a8228be5db2ee
 MISC metadata.xml 679 BLAKE2B 7374379a18107011df792be631428834334ad8e6da5cfe404f18555e8c168d3fc716a1c8d6cb5cf1d9ccd173737aecf93a165f846865dbb6ba4a76bd4669b446 SHA512 8070d8b51dd3319e8b159072db237dcc5299361c2f74fa086fc4cbc174cc6a5c8f7659310332b54b2275e2bc3d028323c4dfa5775e21693a339f54312582d2f0
diff --git a/dev-db/etcd/etcd-3.3.12.ebuild b/dev-db/etcd/etcd-3.3.12.ebuild
index de901b0d963b..e72773ec30c6 100644
--- a/dev-db/etcd/etcd-3.3.12.ebuild
+++ b/dev-db/etcd/etcd-3.3.12.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit user systemd golang-vcs-snapshot
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 EGO_PN="github.com/etcd-io/etcd"
 GIT_COMMIT="d57e8b8"
 MY_PV="${PV/_rc/-rc.}"
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index b5b66dc433df..e603e9cdfbea 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -17,11 +17,11 @@ DIST mysql-extras-20181104-2252Z.tar.bz2 328613 BLAKE2B c869dbdd8eb8ab6706b52815
 DIST mysql-extras-20190305-2052Z.tar.bz2 331304 BLAKE2B 1d2c35a961159fa5ce9ee6699fce943f5a5b5cf60b11c9bb4bcccee4943f4508a9eb6d01050c642353ac592ce1a6b421abf2a1bebc706c44c4c8a36aa698ec43 SHA512 ae63403320e010acbb92f8aec6da8ed4f267cef0bad37147d594076fd94571de7f98bfc2afbe94af5d716f58d57696fd958b1e13e20e87052f252ed4a188cd3c
 EBUILD mariadb-10.0.35-r2.ebuild 27520 BLAKE2B 09bb435fc35e43e9d5a9f0bb234d7583d8ceb55f19e46176def7d1d4370fe99aedb89e28860cc49134f693bf0f49ff4333916441742da72cf65ad7ef6353c72a SHA512 159b2c09d0da83841f77822b4501cc4302758711c9db9447e6c34ebe6185801cbacb4774060d238f7c5aee4595ccc4e0e05f062300f38e27ff86a54a2dce4a95
 EBUILD mariadb-10.0.37.ebuild 27521 BLAKE2B 2dee454767b07e9ef957a3d44d3abebb3bace6a7119b81c7662051a3db9315382d3ea1f73dd03380da695ba16d724560d2b03eea3dd09eb206abcaee1358de7a SHA512 d90e140866541db92272855beb315aea7f037304e018efa6ac090b9d838864de0b7efe24d63ffdc2bc605ce659e0a8b722e2c7650ba21d740ab7d337ddd2c9d2
-EBUILD mariadb-10.0.38.ebuild 27526 BLAKE2B a54b23cb96de54e5cde1f901d1d818245c1c1e5db84f819306a5a38240e8c5f5635bd2c81081213a20a14bf6f4175a1e24acaac4a6e1ec3613804b019e3a5d46 SHA512 0e97dc59e03cef47825e2829166064ecff46f410314e0ddacbe6552a3504318fa6ef01008ab13d437cd384418baaf5ad58b96290093f55c14319305fa5967a06
+EBUILD mariadb-10.0.38.ebuild 27522 BLAKE2B 289f91951215684d00bf45cc65492a5d327b5e1dab19f718bd80acf17546a617eb36b2ff6f63994cda84e9acf59268139e1862e1f74184644c339671ca8294c5 SHA512 320c74a1c3682fd9ae33ee24d7c6afc2208869235ebbabb035437e572facccada40500643ce3f879150e2a04d20f2f5c9042f0721ff88de6ec2d038bd7ac319a
 EBUILD mariadb-10.1.34.ebuild 29472 BLAKE2B 859741b70abf8c2347395b26b7543f36be94165141227bb7dc75f054768490bf891eea5bd2f171aa0c0f8caed7603abf1347a0087caa10e55ce920aaa9c6677b SHA512 ff30a1fcdcc72b8324dec1be29db63a1792ca58474744f0c02014b1fba28d856ac0f154235b0889aedcc95cf24c4b58fcfd681458be726609861ba6f4220ad8f
 EBUILD mariadb-10.1.37.ebuild 29474 BLAKE2B dba8dc78e78319041edbf8583ed9584f74964ee114a55a2e77702b086e878905d098dacbf01a8fa802f69c8252cfc0a763fbce7412fc69ccdb8dc78b20bd1a56 SHA512 0cc0d703727393dd5c601027c156b194ff6957e46935077fda1312da37ae6b0aa4282b51666b849ac7414ed3d4ead2640b530ffc8e6cd04bc5c9df2d3502848a
-EBUILD mariadb-10.1.38-r1.ebuild 29468 BLAKE2B 732ff5a8100367d21f32cdec167f2a144663936a06492d24219cdc1edb980990f9d66ba25af4e72f019ec9d5ec7a790903c717cce3ff9e18d3cd4447ef2102f2 SHA512 cc0026d43b7d4786d1be045c53e68bf06586134bd1d1471dc9e929799eea437a582b34716baf9e192d4b7469712c7cd720500c5727d7a12a8c3b2cc0432d6b90
-EBUILD mariadb-10.2.22-r1.ebuild 32486 BLAKE2B 0899519ad4bc284c94b9159f8d3c31a55bf4843c389ba065dc09bc5e11165f63b13d3e069603f1eb2680924d36ece47a44aa6892de6dac25eb3bf091269330f1 SHA512 8aab092eb3fc54bbe975e7971758082b01aa52c691deb572dded92ea27045e2ba7a28314df55978fd0c446d12baef27d74d9d64428ffb6cc1ff222d10ff0754c
+EBUILD mariadb-10.1.38-r1.ebuild 29464 BLAKE2B cdfd6cac112908ed089928a7d5fbe6f604cf5ded99a2f9c9085acf82c37811301400cdadaa87bf6d94b5239439485ac6e6004aaa73c564d2492e1a94b1ce4a8e SHA512 500509b8ff1afce7e32648369632dc524df8778a6b566b83cb52c4d80354a2d00b1dcb8befcce4be1b31d5b629f0914f3599c94d1dd3a202f5b274e14af25ec6
+EBUILD mariadb-10.2.22-r1.ebuild 32482 BLAKE2B db40f4e0f645c0b148073a3c034d5556c92276cdb8d01ea7ca5ee8c261086a3b17fe58d04a90cf0cc347746b30aee9ca76fa6a362c7876946c4a1513e9408ef5 SHA512 1d545c9aeb1002637909ad01ca9e4fdd737a710c644e13b17fc194b1e46ccb4773db10af1657d09780fca08c1b1304486551ddfcc2b67ccc95a8b5d8c8d2aa25
 EBUILD mariadb-10.3.13.ebuild 32156 BLAKE2B 614cef34e9b4c1048144d5ab6d550d076c008892537c73aff3554b35d86963b6f1cfbaee7a3b4f5abbda0ccff1edbac63dd2a4bd80de167080478b9d328bb47a SHA512 8a7eaf5e95e33fa6f25f95abd6664e0556a7b22affa285d48ea9b97a5bd3affbcaa39dd762e4298d117ed437fffbe311cbd54e5d6e139593fceab75627221dc9
 EBUILD mariadb-5.5.63.ebuild 27054 BLAKE2B fb6b085846137c6607ccb1b58fdaac6abe8999ad67102b3993b52340dd4c7805640379b79c0a0fe300b237438f836a8b62794c423ebc47707b414f7712214919 SHA512 d9356369a5e93dc1dd1a6c6c332ceac7306cc14b33068739d5fef621ea6f14bf2a36e0b8a9f39500ccb8fb7cf35dae013c9303ade0002459971f48d28097d3de
 MISC metadata.xml 2611 BLAKE2B d1b6b11359e92a3d9cb2c58ed35a15e3cf42ab616ed907fa36a5f777168a805ffd03d01bd13fcd30352ef6c5e8b1d80f4e882ffaf8f6445ed3fce2bcc2a92923 SHA512 80395b35839acebbb18ac8d01e8c806bd89f18d32f85fcba41f41ecfc4f1f869dc8c51c90bb21ebd3c9ac30d51d47869a4dcf3b8ce73967e337e6e396b267c97
diff --git a/dev-db/mariadb/mariadb-10.0.38.ebuild b/dev-db/mariadb/mariadb-10.0.38.ebuild
index 141158d014bd..65dccca75b21 100644
--- a/dev-db/mariadb/mariadb-10.0.38.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.38.ebuild
@@ -40,7 +40,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
index 3ad1109b657a..e474b5d01c0b 100644
--- a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
@@ -40,7 +40,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
index 1c7bc36bc7dd..38e851d55654 100644
--- a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
@@ -42,7 +42,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index c4d600c83238..70556eec260f 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -14,18 +14,12 @@ AUX mongos.confd-r3 470 BLAKE2B 9cf6f201d337430901d957a5a0811ff11ac2e81814aac212
 AUX mongos.initd-r3 422 BLAKE2B 90872d0d8cdc5e33e3eebee848f58a2db0511d48b496ba9318117b74ad9265ead53a21b7d1790729a62d61839099bee315ace8ff3646c01e096a943c2251bf88 SHA512 bf5897614d59c6b4e72529b126408a62ea37d9e9368e5ff69c8fcf2bad3ec09065cff09467f82117a892c51090018706d2f38c03cb9a974a61a49bd9efa0f144
 DIST mongodb-src-r3.4.16.tar.gz 40093657 BLAKE2B 7123444dbdd0b2ad3adfb3391e0177d33c1b6c6a4ea83027821c564faad047a736e52926bc15c58bef59c18282436e913fd3bc9963705e030da01356f83ea367 SHA512 e22eb1fe2a832fed8305200614988c5ecfd619cee44fe2263bffa151732c0e26584084e64065dbc65152be6e5c1767a538193770359bea92f3703c72239075db
 DIST mongodb-src-r3.6.10.tar.gz 40562421 BLAKE2B c4fbb9e9586350503df84b344e5c0e05176e681f50a0e96551f157c81c85b71e45c235f0788c1886aa5b6b79fa452afa1a6e8de4acfbfe4c4a0ae62379599f86 SHA512 e0833885a2b1fc14d99749304bd83931a9016039fa32826f9961653601975474f37003eb40fbe8cc5b09644ea447cdc59ccf63110b527d51d4c772cfff88804f
+DIST mongodb-src-r3.6.11.tar.gz 40581959 BLAKE2B 86244472ce8cff5180d8833a3415dd8a43fb5c76545034822989d5be90f45ed0ef1d43cb726be1e53241255491a7a516e6f90b1c1218ad10cf4ead4557311088 SHA512 e74af9f2f40ab0e2c20b135db3f0ce17825cfe5da912ff8edb2902226abb662a6cf87038ea57df73b06b4961ba71aa78fffd542153eb30c4ea2729d642b1091d
 DIST mongodb-src-r3.6.8.tar.gz 40428295 BLAKE2B cc02f73cfb49fb38ccabaad5a02610ce73fc41895ce944e48669e254bcbc70c8872a1bd7f8e04371fae4fcd9af2466fd8550367dd1d1da5cee50b86fc5023bf2 SHA512 c981f3269be3bafb59aa89d36c39a801fd7007b60db6c09b4616a559aaf8e50b34cabbdac2b59f23552c0a5112913fba468f7e2ed9a5f4daa3702dcffdf34999
-DIST mongodb-src-r3.6.9.tar.gz 40515460 BLAKE2B 5637e7b5cc4b3c7874fedacbe0b05dac1b3dde3ae1c58ecbfc8caf9526c0a8696bdfa1b9b40ffd1adfc81ef90fcb7a41de2c53ccce09da8b7879b9ab2f238eb7 SHA512 00202820570ba5cdc16951b1cb0e9b52bcb8362cee252c857b84d9107761f4061496fc3379ceae6e052f14477d702714384ad1b24eca2c4173af2506a8d1f39f
-DIST mongodb-src-r4.0.3.tar.gz 49435646 BLAKE2B 1663823d48ec6d93b30b4d68a09bab164291530fd4966fcdd07ffbaceaf25d9fc5c7480d0d794fdd374fa3a2d11f19d87556cf0c47198a13f9d8fb5ccf7f0343 SHA512 c77a01d8d16322514f42030c46a0aa9cedb90f186375222eeb31648060265006b5e929bdde6ca8e7ecd71018f7c19f5bade463d98db0f053d586ffc8adc99550
-DIST mongodb-src-r4.0.4.tar.gz 49462543 BLAKE2B a1193ebc6ed818d4e5f27bff1792b6c6c193ff063cae36f2f7adcf63a3b780658d221691c58f42e494ec514d78c81d093067ea7dce8c7158a28846434f493821 SHA512 7e434c8ac715793d7b0015116af72cde766bae953cdc38653a2746ef4a76898dec58f8ee607d9357b87fa11e5a1f0248ae739473ded2d3dcca2b2801434b07e2
-DIST mongodb-src-r4.0.5.tar.gz 49507822 BLAKE2B ca5853c632631a06300247d4d3bfee153ffdde2fcbd313ab95472e6721d92a67f464af32c745a297401132287f66b1b78e0eebe583008689d1580b99422d7e68 SHA512 4a544ad40d75583b38a6a97a0a6e4fae7d0d7a740aa1f993adac6855c5f7fae43b4cf6966e58d16ec716e8b93c770a3dc3997c2785597b5e37dfc7aafa516976
 DIST mongodb-src-r4.0.6.tar.gz 49511958 BLAKE2B c372bb858528cb825db4edf11db636ad71c63148b84838f64cefe886b37631482c1e22eb99dfc557c3f51706d1d2f61b893bfd301cdeb8772a2d85ad75f8f48c SHA512 72e04154cf221833522bb0c2cc99acc2a86d20e2dcbf1f8c6ff0a870edf7b2529a55b6821c664805c00c12a311ae374a276ef1e3ccea1ed84fb125bb8726906a
 EBUILD mongodb-3.4.16.ebuild 4086 BLAKE2B 09d968fc68f4a3c717ce1e4b2f714464c04251fa8c241c9492a26f3777fcc458d7d27810530129753756012341924773c46bea0474900dd7289edb7778283187 SHA512 6f29c0d7dcb54403fe689f168652586bc4fae81de2b0d28f284046ab33c1e3ad94fbed3815ba2fd2164eacd12e9f43bdd1943179778175d6fe3097165a2410e0
 EBUILD mongodb-3.6.10.ebuild 4230 BLAKE2B 7dcdae9c745188715aab750f024ec651f9c7af64f00d78d5dd293afca61fd1a8e0cc07bf15ae08bb6b6de8a77c19a81cb3fa1dccbe71b022b237d20462038bc7 SHA512 cb123077b262bc4b17ea31a741cf77c48dca7b24d090d0b7428487daba6112a0f21f1397d6e9e03837edf92ed591ed8c2565a2b29463cb1d4a54b3ab5aca91d5
+EBUILD mongodb-3.6.11.ebuild 4230 BLAKE2B 7dcdae9c745188715aab750f024ec651f9c7af64f00d78d5dd293afca61fd1a8e0cc07bf15ae08bb6b6de8a77c19a81cb3fa1dccbe71b022b237d20462038bc7 SHA512 cb123077b262bc4b17ea31a741cf77c48dca7b24d090d0b7428487daba6112a0f21f1397d6e9e03837edf92ed591ed8c2565a2b29463cb1d4a54b3ab5aca91d5
 EBUILD mongodb-3.6.8.ebuild 4196 BLAKE2B 5c5a72caa94102818cc03de85afc8d4c2818775814a9dd04555db4c1676dda953c8e64e3d222e35e96dfa90a26a18d9825c910f48102c6d574e8de816749523e SHA512 f6f83c1dd60eb8887457135b82194dd16c874678369a3b3a29907406b921502100e6d52d08b4dca6d9777d6d6c6453e6f134b08550304b0321138fb296e259dd
-EBUILD mongodb-3.6.9.ebuild 4187 BLAKE2B c491023d742537e146667c049040132f58811e0fa1c051d1cfd13ace7b45330f8ed03f431a18c6e79ad4c9fb4f0b909752332d70d0329275848e2ce06a83eff0 SHA512 44f1661569143ddb3138b0ba04001ae6de049f3269b2fbb3bea0f0a55cdb4ffc616042009c3887945d065f6951b1ff0274607e5cf7a2fc509ce78717bcf0bf74
-EBUILD mongodb-4.0.3.ebuild 4198 BLAKE2B 8ecf5ad9712f6c5f3257df6dbd7dba686206c5498287cd39082920a9bbdaaf75585bb205cf09c515d27331a404f2b493d222bcf22d15c6904933bf753db04d01 SHA512 1f0932d7f192b2526d48389375aacc1f73e4b388f6ad46014d47eb18583940c13c9356288db29270d199f5e8930882842128df42c98171a7abf1cc582ffcb210
-EBUILD mongodb-4.0.4.ebuild 4198 BLAKE2B b7582d2142231b062780de2503eb1f849ecfc1f033680d8a657c1b6e8f6d3c08a7c2d0855e35cf066f2600193e56c8b2b3dd327e7d3268eadd1a91765f992c6f SHA512 8fe7eeba925e8f91fceb6ec5e7147be6b808dd6df0202ec08eb2e2d416151194537a6a719d75efcee0faa23a03ac9a40e6bd472ce8509173d16d9f42c192e31b
-EBUILD mongodb-4.0.5.ebuild 4231 BLAKE2B cbcc36b52afa5d2ff4e6482c801297d88902b9a09576d1ac355d922e4c66333ebf62e2cfdeab51145bc0c1717587eceae4c817e5ce25ba22620fd85b9d14c60b SHA512 98180763eb93b00c464e3930eb6f4aca8b71a85299f3990a1e21be5f882a0eefc94c297919e072504c18c59b661aca851c347c8b06c3b96364abdff17266aab4
 EBUILD mongodb-4.0.6.ebuild 4231 BLAKE2B cbcc36b52afa5d2ff4e6482c801297d88902b9a09576d1ac355d922e4c66333ebf62e2cfdeab51145bc0c1717587eceae4c817e5ce25ba22620fd85b9d14c60b SHA512 98180763eb93b00c464e3930eb6f4aca8b71a85299f3990a1e21be5f882a0eefc94c297919e072504c18c59b661aca851c347c8b06c3b96364abdff17266aab4
 MISC metadata.xml 901 BLAKE2B f7fde58679ba05518634b82bf5fcc371897165364fe5b023a2ec161790c869de82b4a3dd769d5e1bb450f99679869b60bb1e35beb8d41c54d3448dfca580a7ae SHA512 48f133d396aa31b992bac5f947e5a262b2d07a1016c6d49fa3c86dabb85981edfa332abb867413826762d88051ff3981cc77c2ec92e992d7a231c3b542336e36
diff --git a/dev-db/mongodb/mongodb-3.6.9.ebuild b/dev-db/mongodb/mongodb-3.6.11.ebuild
index 79aed7408b8f..5806eaa2e2e1 100644
--- a/dev-db/mongodb/mongodb-3.6.9.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.11.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug kerberos libressl mms-agent ssl test +tools"
+IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
 
 RDEPEND=">=app-arch/snappy-1.1.3
 	>=dev-cpp/yaml-cpp-0.5.3:=
@@ -55,7 +55,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
 )
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 pkg_pretend() {
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
@@ -105,6 +105,7 @@ src_configure() {
 
 	use debug && scons_opts+=( --dbg=on )
 	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
 	use ssl && scons_opts+=( --ssl )
 
 	# respect mongoDB upstream's basic recommendations
diff --git a/dev-db/mongodb/mongodb-4.0.3.ebuild b/dev-db/mongodb/mongodb-4.0.3.ebuild
deleted file mode 100644
index 98aa398f9f47..000000000000
--- a/dev-db/mongodb/mongodb-4.0.3.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs eapi7-ver flag-o-matic multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug kerberos libressl mms-agent ssl test +tools"
-
-RDEPEND=">=app-arch/snappy-1.1.3
-	>=dev-cpp/yaml-cpp-0.5.3:=
-	>=dev-libs/boost-1.60:=[threads(+)]
-	>=dev-libs/libpcre-8.41[cxx]
-	dev-libs/snowball-stemmer
-	net-libs/libpcap
-	>=sys-libs/zlib-1.2.11:=
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
-	mms-agent? ( app-admin/mms-agent )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	debug? ( dev-util/valgrind )
-	test? (
-		dev-python/pymongo[${PYTHON_USEDEP}]
-	)"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
-	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
-	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		if ver_test "$REPLACING_VERSIONS" -lt 3.6; then
-			ewarn "To upgrade from a version earlier than the 3.6-series, you must"
-			ewarn "successively upgrade major releases until you have upgraded"
-			ewarn "to 3.6-series. Then upgrade to 4.0 series."
-		else
-			ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
-		fi
-	fi
-}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
-	# remove compass
-	rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
-	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
-	# --use-system-icu fails tests
-	# --use-system-tcmalloc is strongly NOT recommended:
-	scons_opts=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		--disable-warnings-as-errors
-		--use-system-boost
-		--use-system-pcre
-		--use-system-snappy
-		--use-system-stemmer
-		--use-system-yaml
-		--use-system-zlib
-	)
-
-	use debug && scons_opts+=( --dbg=on )
-	use kerberos && scons_opts+=( --use-sasl-client )
-	use ssl && scons_opts+=( --ssl )
-
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-
-	default
-}
-
-src_compile() {
-	escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
-	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-src_install() {
-	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-	newinitd "${FILESDIR}/mongos.initd-r3" mongos
-	newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
-	local x
-	for x in /var/{lib,log}/${PN}; do
-		diropts -m0750 -o mongodb -g mongodb
-		keepdir "${x}"
-	done
-}
-
-pkg_postinst() {
-	ewarn "Make sure to read the release notes and follow the upgrade process:"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-4.0.4.ebuild b/dev-db/mongodb/mongodb-4.0.4.ebuild
deleted file mode 100644
index 60ba0d3ebd75..000000000000
--- a/dev-db/mongodb/mongodb-4.0.4.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs eapi7-ver flag-o-matic multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug kerberos libressl mms-agent ssl test +tools"
-
-RDEPEND=">=app-arch/snappy-1.1.3
-	>=dev-cpp/yaml-cpp-0.5.3:=
-	>=dev-libs/boost-1.60:=[threads(+)]
-	>=dev-libs/libpcre-8.41[cxx]
-	dev-libs/snowball-stemmer
-	net-libs/libpcap
-	>=sys-libs/zlib-1.2.11:=
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
-	mms-agent? ( app-admin/mms-agent )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	debug? ( dev-util/valgrind )
-	test? (
-		dev-python/pymongo[${PYTHON_USEDEP}]
-	)"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
-	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
-	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		if ver_test "$REPLACING_VERSIONS" -lt 3.6; then
-			ewarn "To upgrade from a version earlier than the 3.6-series, you must"
-			ewarn "successively upgrade major releases until you have upgraded"
-			ewarn "to 3.6-series. Then upgrade to 4.0 series."
-		else
-			ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
-		fi
-	fi
-}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
-	# remove compass
-	rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
-	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
-	# --use-system-icu fails tests
-	# --use-system-tcmalloc is strongly NOT recommended:
-	scons_opts=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		--disable-warnings-as-errors
-		--use-system-boost
-		--use-system-pcre
-		--use-system-snappy
-		--use-system-stemmer
-		--use-system-yaml
-		--use-system-zlib
-	)
-
-	use debug && scons_opts+=( --dbg=on )
-	use kerberos && scons_opts+=( --use-sasl-client )
-	use ssl && scons_opts+=( --ssl )
-
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-
-	default
-}
-
-src_compile() {
-	escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
-	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-src_install() {
-	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-	newinitd "${FILESDIR}/mongos.initd-r3" mongos
-	newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
-	local x
-	for x in /var/{lib,log}/${PN}; do
-		diropts -m0750 -o mongodb -g mongodb
-		keepdir "${x}"
-	done
-}
-
-pkg_postinst() {
-	ewarn "Make sure to read the release notes and follow the upgrade process:"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-4.0.5.ebuild b/dev-db/mongodb/mongodb-4.0.5.ebuild
deleted file mode 100644
index bb2a9fb04dc3..000000000000
--- a/dev-db/mongodb/mongodb-4.0.5.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
-
-RDEPEND=">=app-arch/snappy-1.1.3
-	>=dev-cpp/yaml-cpp-0.5.3:=
-	>=dev-libs/boost-1.60:=[threads(+)]
-	>=dev-libs/libpcre-8.41[cxx]
-	dev-libs/snowball-stemmer
-	net-libs/libpcap
-	>=sys-libs/zlib-1.2.11:=
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
-	mms-agent? ( app-admin/mms-agent )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	debug? ( dev-util/valgrind )
-	test? (
-		dev-python/pymongo[${PYTHON_USEDEP}]
-	)"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
-	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
-	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		if ver_test "$REPLACING_VERSIONS" -lt 3.6; then
-			ewarn "To upgrade from a version earlier than the 3.6-series, you must"
-			ewarn "successively upgrade major releases until you have upgraded"
-			ewarn "to 3.6-series. Then upgrade to 4.0 series."
-		else
-			ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
-		fi
-	fi
-}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
-	# remove compass
-	rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
-	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
-	# --use-system-icu fails tests
-	# --use-system-tcmalloc is strongly NOT recommended:
-	scons_opts=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		--disable-warnings-as-errors
-		--use-system-boost
-		--use-system-pcre
-		--use-system-snappy
-		--use-system-stemmer
-		--use-system-yaml
-		--use-system-zlib
-	)
-
-	use debug && scons_opts+=( --dbg=on )
-	use kerberos && scons_opts+=( --use-sasl-client )
-	use lto && scons_opts+=( --lto=on )
-	use ssl && scons_opts+=( --ssl )
-
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-
-	default
-}
-
-src_compile() {
-	escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
-	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-src_install() {
-	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-	newinitd "${FILESDIR}/mongos.initd-r3" mongos
-	newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
-	local x
-	for x in /var/{lib,log}/${PN}; do
-		diropts -m0750 -o mongodb -g mongodb
-		keepdir "${x}"
-	done
-}
-
-pkg_postinst() {
-	ewarn "Make sure to read the release notes and follow the upgrade process:"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mysql-init-scripts/Manifest b/dev-db/mysql-init-scripts/Manifest
index 53fdcc8e2d87..a2aa2efc669a 100644
--- a/dev-db/mysql-init-scripts/Manifest
+++ b/dev-db/mysql-init-scripts/Manifest
@@ -15,5 +15,5 @@ AUX mysqld_at-v2.service 1170 BLAKE2B d02f7ee3549d273d309e8e6e5cd8c2f987c6feab42
 AUX run-s6 268 BLAKE2B ebc9c74527257e1a35a4671afe2d34d9ed9868db0e0f33eebe655b31317a4ceeb02affe471ad49007534a9ce0a9399d9f14af664488ae753e207cf97d467107b SHA512 82be247195f6d9d230b063e9bda393bab8855382c2f3e5eb4d427fc1eb7e23dbd8c90939224ff2b5e4116a5c9d3f26ebdc9b9f548cde91e7c1217f4f8500c0d3
 EBUILD mysql-init-scripts-2.2-r3.ebuild 1899 BLAKE2B c7406995ab4a0ecdb9bcd20a9384e269e4dbd55d87c21674cd7b4c31d937468448818bd9c06286b5595fe138b2fb5d6cd2faeec0276e08e0e0f24a6b8b96426a SHA512 2b2873467515d34b6afb03b06f73d8420b5228924362866ab3ba0353ff59509b4aa37db0cc3ccb5f6529a8a732b1a3a405f0b4d30bd288bf518a899884146c2a
 EBUILD mysql-init-scripts-2.2-r4.ebuild 1983 BLAKE2B d322fc4243b6ac3c4540c1f0f312d5baf8658234e3182ff52cbb2442f59d4052ccf662d337780ac0a77611e846ac03b9da116f6e294f4cede62694c1fc2e6d52 SHA512 ac578f3ea527efe1e5b233a075d83e5e1f49785c23c3d5e6557123859d81adef4a5ca51d91fb70f1320bceb4f9fbe2cada8334d831961061a9bba216ce55306f
-EBUILD mysql-init-scripts-2.3.ebuild 1988 BLAKE2B cc676a418285d581c4e1422073e4063b87f544e401f3825622befb6b971ebb68b29ac1d741ae908dbbc4816948644744d1c2f5c63266c3b0ac5c63fd0dd9c6d9 SHA512 568b832d444cfad9b6457c7e9b4add14f0bd5d29a009c78b37591a6b1a84b07b632c4756cbaeb6ca76cd33f057c766ea590b7ae1ec9aebd165f7d35daafdcf81
+EBUILD mysql-init-scripts-2.3.ebuild 1984 BLAKE2B 066aca331f1ec624981f9f3962f9e691928eed732e632f9575c4ff65568a771299c5011c9be9a21e1d73f6d6bf2de92a5575a178e685eaae2d8544cd20cb4b63 SHA512 fe861055bdd4162ce24954dbb46c7d2714dc806f1c0b99443b9b79df6346a8132b12c273e828ebed4f1b4834b21ba7d209c32fb0635250fdca52a6c6865c5bdc
 MISC metadata.xml 243 BLAKE2B f247f748a23e4cda2f518ad7e4e53b9027ff08ec62289010e6dfc8cd2ad49412430c4095e80f2156c8e6f1226bcda0163b4faae83759550f79e9998928398713 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3.ebuild
index b3283cf3ba24..f2aa90039fee 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 320c2c6f3349..96de005c1f00 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -19,8 +19,8 @@ EBUILD mysql-5.5.61.ebuild 25515 BLAKE2B 2e8a5ff36ec6003ff7e4d746157afe8af9d4625
 EBUILD mysql-5.5.62.ebuild 25693 BLAKE2B abb1400994767e1a29259fda70531e27e9160b849a6228802baa440f8a5c8244393cb155ac9985f04353c8b35516e653a563c2eb84b72a714c5ee81d016e5d27 SHA512 759b82802fdeb7840b0da3e4ef1d6e7b1f32d7bd815ba780b11e57143b52bcb7eb483c008d25670f4626968028a46f7080abff247e5d2047f6b500ac67888ad4
 EBUILD mysql-5.6.40-r2.ebuild 25714 BLAKE2B c78b1d8b2a77d095302f7e203c3ee6c0c2014770944072b87bd77f97972fcb6db52b05088adacbc821ce2e8f3dbb780bd40d850e381b866458b0d530fd11ea5d SHA512 b6301834c7813714f18f9763922d10e6faa33675705ba479c6d76e3c5673d903b0683f64a8281836bd6be396f398ed1bee14f9e6c8ddfe30b84ad1ac66a8be48
 EBUILD mysql-5.6.42.ebuild 25955 BLAKE2B de075ce30850d5f2fe17a5aaf02e5888d62634028a042105ac4bff9a90dbec7803c6b1d348e35267be6b4b12afa8f12f4a02f969c536890bf7970cb4e466907c SHA512 56aa82fe363e091a6db7b307318f14ff93ded6eba2a61142eb3e026205740b02dca8587e23accf2ff757e941b0d4b2a0e7ab386b879d7cee35976facbb7aec94
-EBUILD mysql-5.6.43.ebuild 26059 BLAKE2B 505474602b731f0eaf5eb5aae7d430185571fbf9deac9f30036b84a80871078fd96c96b510b0e0419243ea313c31e5c8cad0e5a3609e0352b02b0fd82dbcb697 SHA512 8e96c53d44b304f787dd4648bd3ad4fd268f6194a8edd918cb81003a47ae6a34a7b7331b71333323ca33d5a6ef20767ab291fe68222f2f8cce86c96cf25f3c85
+EBUILD mysql-5.6.43.ebuild 26058 BLAKE2B 900da4370bcf01f3bb6f3c54220e80beddd4243724603c839caddc644504c6255bb68fc3b99522e23df7f7b0290edd859ffcced2819dcc7bbd8ec80a26eeafd3 SHA512 9f33a0924fab366635627643e85d33a8404b27afa098eb7411a9f223b9f4d90a3a4ff2dd47261de1d235ffa5865c44808e053329e21d8728c418b7c890ea026b
 EBUILD mysql-5.7.23-r2.ebuild 30078 BLAKE2B 57bf58e862639e651335a10a8c4dfc5f7f0f76bfb0545414d697875906d917131fedd3e9d0e58f57b886d8cae55adbd2a104ee3632d49b4ba0669b93a1a68bff SHA512 dfbb88e79b717ceb615246a806123ee2d30c1632cfb40d0bb9e04a9204565a92afbb2b37245794c15985e99a60d2adc46723b97e455fb85e137079d6192b148c
 EBUILD mysql-5.7.24.ebuild 30386 BLAKE2B ecf0c03821af6a21467b53a02e6e0a0ae2f7e5d267ff4669266d34cdb9fddb7defbd8a4013dd3a1f8a103c84da4c6eddafae06fc1ebc4bf94c9769e64dbbfc1b SHA512 f8b372573d82b513ea1d82a1e00d728501c483ef949a2411c05ac93a8d2d90162d6992b58d3a101fefcbac541f9f37dcfa2263ac49231839d338af158557153f
-EBUILD mysql-5.7.25.ebuild 30461 BLAKE2B a8cc74144d566d490edd78cbff62e04281b4d6d44e0bf5b0b0c132cd528375a2a46e0d5f626a34bc1e3acd4658677f21af405cd54883471719be665e5145c531 SHA512 0a04e9d8a9297cd7c26872e7eb43cda94ac135acdc3bf73e4d4ff588a4e9544f2d097adac65be320549f883c8880fbc50f9236ea6031643192cc4f62b119b991
+EBUILD mysql-5.7.25.ebuild 30460 BLAKE2B 3b6877e0bb7238f59b5c8a0f777b9ddaf7b5af22338e26fccf8d5e3c02048561958c4ae2fd578f8c4526a38cc6fbbf4e9f0b48b457fe3f221cf970b9c95a7fb9 SHA512 915d1d30955173e87bd647b42e846d6d961b2e4a297cad9aa5623d6f3ba0873d9026e9f9c07fc3936b05dd1f6b9dd7e34ee6336c9dcd576c44fd23bc86d18432
 MISC metadata.xml 1539 BLAKE2B 0bc66c5855bd1f4353a7f0b551229d68a940478687b4f38653f973e4a5cfcb946c86bdc2d8318aa96aba43598eb476b995005f26727dfa176ced00fbe2b129a1 SHA512 bc0ce8a3de5e55d954f65eec657930af069d3550f485334f80dfa4c6d17c6298d0609d1ba4fe8b6c988f8ad007858f147c17f1354c207891ac1a062a36af50ad
diff --git a/dev-db/mysql/mysql-5.6.43.ebuild b/dev-db/mysql/mysql-5.6.43.ebuild
index ae9963a37ee5..bb890982483f 100644
--- a/dev-db/mysql/mysql-5.6.43.ebuild
+++ b/dev-db/mysql/mysql-5.6.43.ebuild
@@ -37,7 +37,7 @@ RESTRICT="libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mysql/mysql-5.7.25.ebuild b/dev-db/mysql/mysql-5.7.25.ebuild
index 331eb7b7e40e..22beb2e83650 100644
--- a/dev-db/mysql/mysql-5.7.25.ebuild
+++ b/dev-db/mysql/mysql-5.7.25.ebuild
@@ -34,7 +34,7 @@ RESTRICT="libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 78c2e2a501e8..27e2d66d6f17 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -2,5 +2,5 @@ AUX postinstall-en-3.1.txt 1160 BLAKE2B 0aa21601490830f93a784c1a3c09b90986d606d0
 DIST phpMyAdmin-4.8.3-all-languages.tar.xz 5996528 BLAKE2B cf00bab32547c5a6e8c81f529e5b074e3a7c576a7991d6823239172f91cebad7e1b10e2baee589043bf8a5d1d37470a7614a038a0054eaa18e74028bf3cecfd4 SHA512 95998eda6a2db9020671073c62458d819cbd5e54c5f56f467b109401f6b9ebd2dfbc34cc840980bf2d3a7ee3bc93683b7fe20d9bd72b537d8aa066d39089ff89
 DIST phpMyAdmin-4.8.5-all-languages.tar.xz 6026176 BLAKE2B 6fea778544d266ea9950a5764a6c31806bfcc437edbfd190780218d841e55a21cd534fceef9309d2e1d6acbd8a780cb1d120aeb47e2e35705118ceb9d5ae1266 SHA512 590efd46f4ae5a9cafd3b33f3565d74e4bfd535e3de8763e72da7bccea06fabb2f9fb90af3fe144846573507c5eefc20ee412bf6b51adfb494402302dc81aa2f
 EBUILD phpmyadmin-4.8.3-r1.ebuild 1558 BLAKE2B 841f68f731b7f0c0c21b718ce1ee7823c151ec936c3060c6e61e75181efa1bf4cdfea8619a1a93e89f9fb2c04d36cad759d6dea2d6ceaebc418be0b2270e7a15 SHA512 8eb64005bf20bb5740207fc3e217a5e68daa0c0eb28a48c518dfcccd211ebb9e5578433edc364bd13f8096e6e112afca34556b4bf5f408d813e3938e6d2aa5a4
-EBUILD phpmyadmin-4.8.5.ebuild 1564 BLAKE2B 1b62fb393cd9c248fae68ee72ec9e9172f3ffbd386c11e5ebe87cb00155bf2b38b92746f6a6a6568525e01dec80f4116a7b0c784a00f2cafa1955555ab8cd62b SHA512 0545942949e94db25359418a96ca50c640357e149b030fba0a12d9577bf6612cabb1b03371f41f9e7bfe614cd0b07e79767a259dd11070bbdd9a3e1cfc994266
+EBUILD phpmyadmin-4.8.5.ebuild 1561 BLAKE2B f4cf774da758fb863e13c70c9e31a56535b9448630c5665e036384039895c7399963ffe8ebf0220b649454841a016c89b51f1976643abff8033ab1caa44c914a SHA512 1a21c825d78cf71e618b8d7e55ab09319f93064ba0f7917ba6556622196efd7693aa8ce75faf55be3c6fb05912f84e039b25c8aef9369438223cb13270539987
 MISC metadata.xml 701 BLAKE2B aef0a047bca31221714bf27203bd720863c5cef6b7b4dd72b441761a0638bca38c03610e65b3819ca0fba6577973908d7ca40ec8baa3aac1255d19b7cfa9f0a7 SHA512 6dcb099779cd0db4928ee812c81fee762612846044e6ee3df3b661a2dce6aed01420d0bc1301c8ff9d763fb8aeaeef3290a7889b32705fc48e8c392aa8b8ca82
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.8.5.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.8.5.ebuild
index b0e6be3d92ed..53de5e6464aa 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.8.5.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.8.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 876363331d27..e9cf0f70a837 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -22,15 +22,15 @@ DIST postgresql-9.5.16.tar.bz2 17506874 BLAKE2B ce5c804315ce5d7ac95af2455322801f
 DIST postgresql-9.6.11.tar.bz2 20009048 BLAKE2B aa3e5b1e63c983226ea71737982e62eaff655af7e0f55f20ec886f5d7406b1e30e2fe5378b0dd1ef59e777f862ccc2386121653853d4c186a1b4853a9bbb1591 SHA512 a4314f92d1a661af4076d8c120533ecae76d91461043b8a6ad22dd6e5b562e0bf019bc7f3157a26d9666ba5866e254613ae5b690310168b029795dc088f8c060
 DIST postgresql-9.6.12.tar.bz2 18759442 BLAKE2B 067b307318f65616651ee4502f420a84df26e906350f07ce5ab4a769608075f0d017b6d84b0ce5045662ab379e236b66cf751f7950d026f011d0915efcdfab3e SHA512 3a7a96caf682461f1f9bffdbe2b72b1ce00cc6680145e00c139e4af8b9dc8b8679fda1626de65921d6e187fa9290efc930584b98f1fd2aba1ba3d790a741a415
 EBUILD postgresql-10.6.ebuild 13811 BLAKE2B d182148b6aa53049dc6387b9c18a98248ec6b2a66811c877c05b6c2e08bb3e10669b288fa96d4e39f6b29449cf86424176f3983df8146a4b230ee0e0d59bcf60 SHA512 043bd74949a04514b05058dc699e5876babd6b780c67760fa84a9a73d95c2c209d03c2de0b110083f7779d51815f0f093140ad052fc7ab7cf65a722858c2618f
-EBUILD postgresql-10.7.ebuild 13820 BLAKE2B bf402c47f852ddbb73682f0e27082f310875ae0247fe6e4e0308ee9bc56fa3ef166eb6ea53b681380f77c0fb395cd460640008dc09d1816680522ab1d90d5b46 SHA512 4fcc182bb8f33b61c1b524a2b5c4cbcbd4c72220a68e3f762107223d7db85877b283882ac9bdd95b219f485647afe1c5037628c365ab7e786ca189401c7eafb8
+EBUILD postgresql-10.7.ebuild 13813 BLAKE2B b8b290c94c1b3bf16f6993d4f34ab40abcf7207dd75b72e969a20103582f4aa08d77423b83c898c6935ce90aacbdaf6a651270f9aea23b5da6a7cace97969849 SHA512 aebc5828091d901940cfba2d61df3f2de3b85bd2071bba0a4afc5081e212a63f7d9387836be32de5218effeaa767f702dc3746c2836b1787baee02ef360af75a
 EBUILD postgresql-11.1.ebuild 13832 BLAKE2B c6e234f943b505d7f9343a158be2bc9f719c24a241e5533ad6687b955c5391198bda2d019097cca552f890fb459142e7d01c783dfe8c28901b3b5ff1c08f31a4 SHA512 7bb523a4766a75d9b6a82a4bc2fd062f4c601b8cfa108f51142c60e73fde828ce76ec20a95ab6a8ac20e8faec54204d4482bec18f5b109de5ac468677a483c57
-EBUILD postgresql-11.2.ebuild 13841 BLAKE2B 4f60bcd110310bb6b7c7e4391c0c782a7050c967dc6634b79350151cf5ae809228812c396f7db27101c73cd2eb4617148ed26b510a60dbb3adc5edb02f5addbf SHA512 179c0f8cadad634d43aa7b7c54bf202302f8db5d06d616c582ada568684a8163c6bf98523213175bfcf15f3d066ad12e7607f37327e8c9b5c166feee64ebe173
+EBUILD postgresql-11.2.ebuild 13834 BLAKE2B 734aeb9b40071b04ab0d0ffd22441a3f886c684e1c3cf6136da0765682e9e5d395c14abfee0b2c8e6cbcb12eb8380dd846652c5e6101609f9ed9a38e5e888b56 SHA512 dc9ec320e3d543266188f461dc5cb6d5e5585d0bc93b444bb4f9126c36a9cd678816b7d00bf305e56dc1cf76b0c5d97388be392c025fec679e350e6a9c0caaef
 EBUILD postgresql-9.3.25.ebuild 13560 BLAKE2B dad258dd261b0db61ae0dab4c94824abf347d2b7c155e49811801b81ac2b3449b377614e940c91d70240a9cb3ee34013494f6dcfce8fe24b1301b7a47160dcec SHA512 43ecdccecd395977956b26c6376f42eb79e7389c87fcca17dd27effe4cc847d5548df8b368572af9f70b80a77f62ec4a7e17c3bb78105ce854faf5343e9e38d6
 EBUILD postgresql-9.4.20.ebuild 14370 BLAKE2B a7f2e2bfa0b5ee85c11d525b6f29c3194e040495bf49ebfdbcae4dae5ea915325d98abc672b4727a985e056b0f0e9e9c85eb079164f93e94c55df0be68a04326 SHA512 5745139858d20d62c90a843060f5a57378c7590b1b26cf8a41f84603555973f581d06120b237a0fecf1a9d239a7af885761c75483addb955983528da44dd0d47
-EBUILD postgresql-9.4.21.ebuild 14379 BLAKE2B 31b1a7703f0e21acc50df8fb675843dbe511cbc0f635e36f1eaf72b80bbfb6eea815c90c5d8836284b793392bbe1ad654e98736e9135729abd1735cfa51ec12f SHA512 9d4ebf78f3aa24a603dcae5d6726d556fe89038193010e5018db84678e600185e54c8879f497d90579ee2e19ba074f91876aa004f5395a7f4a4e44ded1ec34c0
+EBUILD postgresql-9.4.21.ebuild 14371 BLAKE2B 3dac31dd388cef93f6b32b8164063030094a1b03735339077f9f58bba00dffb63f6dde2a9368e1408ba8cff31e02bf5178f0e11e27cbc8cbe5943bff95958a96 SHA512 92dff1d3dbf522d7bfa42b3913aaabd8a48025559c1474fc03987f2c4908b5f89e9570e569181ce58153e6b28d7a59a24d6a66722e800cae6b02dd6760df0b7b
 EBUILD postgresql-9.5.15.ebuild 14598 BLAKE2B 5b59320bd25c183a251ff9176e774e222a15eb68749f890c16f7657e0968d519229f3498730b26b3b2eca2e76fcb304d96616cf11287ccfdcc62894379771781 SHA512 f11b94faf2376216c5506017108a6282efa4e02106597f9502daaccd14177925aa363eab51f5aafb029ce7f3f5617778f71a26cd9a4d1b830f1176a8c68764da
-EBUILD postgresql-9.5.16.ebuild 14607 BLAKE2B 4eeaf5f4fa02d5e481b7c167a1c70458e6624591d8618e35820813433c0fa488a942dccbd093071b07feab79e323a13bc75e3b82a7c5a6c91515e99ea00bdcce SHA512 a33160a2275b0aded06211ed534e792fcf5d46f3bef76dfe95914bf88e7d071a5f195925ea9a3fc68a1717b3c579e44a28da9327806c03cfca2dacfbbf29d23a
+EBUILD postgresql-9.5.16.ebuild 14599 BLAKE2B 3ce8fdf45b659921b35fae09a747042e7a47a3e147484a30665fe42e5d73baf4be2469b553639bbf85649dec8668a8a95942ae27529cb000560f8141c3059a46 SHA512 bb416c10238222ea04127163d6fc886cfa8a644b6668cf4d0d31d800e55b02ce2b0087f0277b5378ce1f0781ef7338e62c1076971d34885f36714736a07be66b
 EBUILD postgresql-9.6.11.ebuild 14831 BLAKE2B 95bcc8d1a47a6970bf5e2d1c89a8bbd3b48e16a4c40916e1d672d32c265711c371adad565a8ea32e15083a0f0f25f39daaefe1825e25ca1ba281067069522478 SHA512 289204e2f689f7ddc001954c784b9a73e035f8dc5960f38a50f38e8af2e82427b3e678f72d9fc11fba1b3e794286441f15a84c91f6d68f4e60f035912374094c
-EBUILD postgresql-9.6.12.ebuild 14840 BLAKE2B bf04abdd313ef6ff25bbf462c4031b74eeb5f207667ac87348d9bcf9274de7ad4d2b7dcce78709da8bd66329ad20612fba9eab8e83aa42a575d23760993a8314 SHA512 d6580373dcd7a79ecc144113b51a2ed87c91b4178264bf7b5c66d644bc520908272bfc63c8ddf1ed81bf684a6d981bb5ce18dca52ca9b7b48811dbd4bc752fa8
+EBUILD postgresql-9.6.12.ebuild 14832 BLAKE2B c38553071ee12cff1b8d269a36031151110d76c37549477cfad804c792bfbb38958ce576048ee2e6f6a2d1f20d4a74b26703148cf297dbd07decd98c5ab9803d SHA512 e3fa788f75f9bd83d221b0dee90e66faf61389a8f506b07bfd7ed296d4711da68be68a0d6b9354b24a3113384d8477b7daaa84a2238664224d4914c5e6d15d83
 EBUILD postgresql-9999.ebuild 14262 BLAKE2B 43b6b2ab7b5137e8a0ca2edf28781d30f7a27afbf01ab718f4742c4ec981071797074f6dcad9995796d30bbd0b1e39d4ee7a63a404e7246a9bafbb5298a12c47 SHA512 29e5bcb9463c6cb8a43e8ba04840aacda074ddbfdcccd1dafcbd66e13d5c20a765c53f637e1c8993fe6647c286f7ef40254f3211f3341054c96bec1f327393fa
 MISC metadata.xml 715 BLAKE2B 59ad51ae06a697fe649054d9fe13040423f425b95abdcf3797e1d0d5abba8c62d54cc8c1afb0be0d0a29d1a39d379912bd931925b5df480fb0bb9b238c36e598 SHA512 03027757eaf95313a6825710b1054a9671aa8396381789397006dfe2f66cd41e85cde418e792bf7d71d7db2413905816ff39685774219c1ea5e8b8d35c5cffd0
diff --git a/dev-db/postgresql/postgresql-10.7.ebuild b/dev-db/postgresql/postgresql-10.7.ebuild
index d7f89ecea034..e57d2fce8537 100644
--- a/dev-db/postgresql/postgresql-10.7.ebuild
+++ b/dev-db/postgresql/postgresql-10.7.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT=$(get_major_version)
 
diff --git a/dev-db/postgresql/postgresql-11.2.ebuild b/dev-db/postgresql/postgresql-11.2.ebuild
index ef7584eee93a..f81184845eee 100644
--- a/dev-db/postgresql/postgresql-11.2.ebuild
+++ b/dev-db/postgresql/postgresql-11.2.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 SLOT=$(get_major_version)
 
diff --git a/dev-db/postgresql/postgresql-9.4.21.ebuild b/dev-db/postgresql/postgresql-9.4.21.ebuild
index 89dee23428be..fcd3363ee527 100644
--- a/dev-db/postgresql/postgresql-9.4.21.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.21.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.5.16.ebuild b/dev-db/postgresql/postgresql-9.5.16.ebuild
index 8b0a59867f7b..166aeefaf58e 100644
--- a/dev-db/postgresql/postgresql-9.5.16.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.16.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.6.12.ebuild b/dev-db/postgresql/postgresql-9.6.12.ebuild
index f9c788a8f2ae..bb5addb779cc 100644
--- a/dev-db/postgresql/postgresql-9.6.12.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.12.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 067bd698ab3b..141c49db91d2 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -24,5 +24,5 @@ EBUILD redis-4.0.11.ebuild 4074 BLAKE2B 609631167471b07d3caccad80d601e4d73a594a9
 EBUILD redis-4.0.12.ebuild 4071 BLAKE2B 712cefef53f55c9e60a1461a5bc843866fdf60815ecb42675b929b6b4fdd98dc270fa3544e6739ce22616f5f5a15efac7ecb4f78a910271bb15acaeacde07516 SHA512 2df15597298b24a7c2f317ce52d9efdb810a558da8f40902cda5865e43a8f59d699f0c92f025bfdfae183ac6b019eb0ad130a745ace48d8865a9642c0bacd7c1
 EBUILD redis-4.0.13.ebuild 4071 BLAKE2B ce447abe1db2a9bf75fb506cb910a0906447ddd64d251907a4a4fce753189c41c7b42938a97f716169eae19d1868440bdc4b993b937dc896124f025df0453a85 SHA512 40b346d0d67fdc1f8fa5d80b3c502230b78a59ec9a2242e87c0091bd18ae33a76904ab1ccff4a197b867a7a3bdfd6d7462db93b127f59f628aa01e1bce3b098e
 EBUILD redis-4.0.2-r1.ebuild 3807 BLAKE2B 7dbd27ad7593b53f1f7184321ba33f140072ef946859b33cf8dacf7eb98c9d7398c512ce403132bf3b9fece12e73cc0e4dd5cca1dbc220d50dea105ea87ef774 SHA512 d7744c01cbf4b6f1fec17ce7733a31f4deb3e925afbafb3a9aaa360d9598aff78b44c3bcadc54e82c809ff6ba0211e475d32f96ec4244f6081e3f5cfde1b1daa
-EBUILD redis-5.0.3.ebuild 4011 BLAKE2B b99054eb7a1cf93cfd293b4884098eb12e41564f2505ba49d179c824a7e78a236f03f31198d3073ea882c6df327f2d5668f4e043632da55b5a25ef2c865000d6 SHA512 cf61adaa5d6e003abdd5e507f9d540699fe5d3ef593a1cd63507de9e8475a44265ad2385fb8f794e11f3f0908509b8552748f5280810a5ae2bc2d84d41110a16
+EBUILD redis-5.0.3.ebuild 4559 BLAKE2B c7c725eb0117a509f8e56c8d57bbf64cc1970e6e90819f284cd3b5c982a3400d53be7dd3c3552001dffd6ef6440d8164ccb3b2a4e76613388a4b50e541e9eb2a SHA512 36ddfc7f091e48daee3b7c3ff7230a6b1137fd143a40c861597699071941262b1d7575c1141c1fa0783df0f09a42381112d77a88e6d16d10fb712b218a50ae6d
 MISC metadata.xml 440 BLAKE2B b853160a8483ff59c413a37b8fd1703283cc80c5ea9de092654dd1809bdc6ed3dc98fb6285a3f33bfea136bdf3db4065b3e22c34f7458e9e83aa63e137a13eb3 SHA512 7c125eed761e5f4c868a3fd5539d5182b9c4da6ddeb0cb82a46dc6d0cc682410eb100168ddb4b5fb214d6092395394cefef5bc8fd3dcce818542d30748f9bd17
diff --git a/dev-db/redis/redis-5.0.3.ebuild b/dev-db/redis/redis-5.0.3.ebuild
index 2b13aad0139e..c584f33c21fc 100644
--- a/dev-db/redis/redis-5.0.3.ebuild
+++ b/dev-db/redis/redis-5.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -68,9 +68,23 @@ src_prepare() {
 	cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
 
 	# Use the correct pkgconfig name for Lua
-	has_version 'dev-lang/lua:5.1' \
-		&& LUAPKGCONFIG=lua5.1 \
-		|| LUAPKGCONFIG=lua
+	if false && has_version 'dev-lang/lua:5.3'; then
+		# Lua5.3 gives:
+		#lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h"
+		LUAPKGCONFIG=lua5.3
+	elif false && has_version 'dev-lang/lua:5.2'; then
+		# Lua5.2 fails with:
+		# scripting.c:(.text+0x1f9b): undefined reference to `lua_open'
+		# Because lua_open because lua_newstate in 5.2
+		LUAPKGCONFIG=lua5.2
+	elif has_version 'dev-lang/lua:5.1'; then
+		LUAPKGCONFIG=lua5.1
+	else
+		LUAPKGCONFIG=lua
+	fi
+	# The upstream configure script handles luajit specially, and is not
+	# effected by these changes.
+	einfo "Selected LUAPKGCONFIG=${LUAPKGCONFIG}"
 	sed -i	\
 		-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
 		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
diff --git a/dev-db/sqlcl-bin/Manifest b/dev-db/sqlcl-bin/Manifest
index 23615f0a34e6..cb2c5e8dd9e8 100644
--- a/dev-db/sqlcl-bin/Manifest
+++ b/dev-db/sqlcl-bin/Manifest
@@ -1,3 +1,3 @@
 DIST sqlcl-17.4.0.354.2224-no-jre.zip 19731560 BLAKE2B 0ee78a39e5be5d2c23a583cf3f4790897d79e1b082036d30a071fa629912e31c3fc3dbb0e873f4013ba6d41c27c8e1d99aff851922202983842cbf09cf1c6b0b SHA512 d03e949755fc3c99661d3b87dc4576fd4cb0edd33fa2b05818bbb26cd6d066d221ad6bcc0fc2f1453a80351b82e5698a193730cbabbf84a55607a118c39b4243
-EBUILD sqlcl-bin-17.4.0.354.2224.ebuild 1107 BLAKE2B f6935a3f432d72fad4346f06d4f64bbf687d8602bae2876db09b2e1b88db82d4d62aafa2b1ea0d86ca7622b7de495e08af487c05191ed84e0ef8854136494e7d SHA512 adf1788e0125a26caddacd7903d583272d1c6b6746a588bc8bcc76aeb7328c30985c309c339279bfe79cd2073e635ec3afb0d55d42fe69d3158af53140def9cf
+EBUILD sqlcl-bin-17.4.0.354.2224.ebuild 1105 BLAKE2B 7adb14a713a652fefa36738c3c952f519823bbcb3e242539747859a4d7ae6c4203b5067e96fee5fe765c178f0fefd0862b9d225fc8242a22144ab438a45382a9 SHA512 5ed5f0749132e924dc50563857664e2ffdaa24c60b1f43070e7e4707d7360399d96738967b65f9078e78c85339657eaea799154ee30c95625537f8ec8d36d9fe
 MISC metadata.xml 483 BLAKE2B 1ed85dae79388f3c548163e5fafd2838e1adf9bfc9a9c793ce7f9e7e323f8e3c9e7e2f3190b3ec54a0c598d048c61b6ad67c8eefb3845cd446ea67b01e0df8a8 SHA512 e88ad9fd8c20d5be5569c64544c3f4dd72eb3243d46333c30aaa1b939eb6ce35855aa3e771008b2fff990de5b2e5bf79ca378714e3cf7dc375144b7cd8f5649c
diff --git a/dev-db/sqlcl-bin/sqlcl-bin-17.4.0.354.2224.ebuild b/dev-db/sqlcl-bin/sqlcl-bin-17.4.0.354.2224.ebuild
index 2da7c12ea1eb..94a010ed64de 100644
--- a/dev-db/sqlcl-bin/sqlcl-bin-17.4.0.354.2224.ebuild
+++ b/dev-db/sqlcl-bin/sqlcl-bin-17.4.0.354.2224.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ MY_PN="${PN/-bin}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Oracle SQLcl is the new SQL*Plus"
-HOMEPAGE="http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html"
+HOMEPAGE="https://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html"
 SRC_URI="${MY_P}-no-jre.zip"
 RESTRICT="bindist fetch mirror"
 
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 056acaea6422..844c13c31eab 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,4 +1,7 @@
 AUX sqlitebrowser-3.10.1-unbundle.patch 3313 BLAKE2B 91dda803cb2eed55a56568f4d2cc0519b33b59447fcdfee49705aa0bfce84009092b0e73ab0ae79b03fc30f20220b1ca8cebbd83b66d1f8fdd36c47669403019 SHA512 71b758dc1f412b1ed5d778e8ca5fc65eb99276acf5c81fc4812bf31251a0380b8e4fbc84a00718e5959ae7cb504cda06339e24cf070b8a2de1b0fce46cfb595f
+AUX sqlitebrowser-3.11.1-unbundle.patch 3194 BLAKE2B b2015e90e7f79409fb16d0490081634c47208956a53f4c24aeec3fa217dd165b1fec2bc51b818b82f39fae55a3ca7bb9a79dc58746781e1622707e0b051e845c SHA512 b0082e6373d54a2aee87b84f0194a91139f535da0c7d741e68458e05a6c7e6a46c1b027e8cf0dff455de0cf2c484d2be51bc829bdbedb2169c8fa44d553afd95
 DIST sqlitebrowser-3.10.1.tar.gz 1992186 BLAKE2B 105333118a404aab48abe5ecbe83b425109b60adf40d3a3b7766c7036954996539bd133da4b3e3b1e2d819223842d107710b6b24aada6bb298462e062296dabf SHA512 da9650fff6cd7984e8f438b254318b5da46209eb21a375569ec1b4dd898a41d99d61d6682f2979a56d5c39d552ed42f443215900c1cebe95350e4624415f69c4
+DIST sqlitebrowser-3.11.1.tar.gz 2523481 BLAKE2B c9a92b93795050605aa938cf5c73493b7d887b386da77b4cee206becd70779f00ab39c7a105772cdbe925ebedcfe0277b6ebe7898383db87454e19b050001253 SHA512 31f5315fd66d14fde16b58fe6522da937068c42e21f60aa15c3c04a1318ecac09f68143df108b83204cdc70ec8bac617a8ae196df9b5524690f837d7e7728916
 EBUILD sqlitebrowser-3.10.1-r1.ebuild 1209 BLAKE2B adc80a02c5628ccd6b31b9125639a51a1c3cc07b4f00ab96e02a644d1d0a5327fcdcfdbedb06233b96def7c357928d962ddb4dce0e5076551e687a851210f4f9 SHA512 3069b2174fbe27b7fe313b832d970d2d3633906e46bbdcecc588b5f79c058c28030d5343fb2f0925b6ce22a3ee92c7e28947e1e53af9dbb9d2e746694a45193c
+EBUILD sqlitebrowser-3.11.1-r1.ebuild 1363 BLAKE2B 5d773b3181600829e6746740deb37a0f9885eebc9f79a0ca6ce4e0a3f19907dc3f235f2a311b0f54e1b729159fc123e0c2a810e38de16cd7f0cc30d1d7f02209 SHA512 ffa03523d2b79218f1e82958c4624e6f36418dd1e6567264ade56600af450b9f0a290873ddb1846007ff0cdeae4e31c44a59ea760e0361ff347611e56313ea6e
 MISC metadata.xml 659 BLAKE2B bf5f352f0227c1408cd9c0720fea6b7bf35e6f843f4e1f6fb3e340d3e7e5ddc09843484da6c54254345cde615993acaeba50027f44f33e0134ac05414e80e8ca SHA512 defe9a90cbcdee9750f9a5dffb8620445efd4d855fa789bad01d80151f4e64676245c2a51670c7418d2e19faa72bf26f4322c3953d610933a5b479985acedca2
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch
new file mode 100644
index 000000000000..f86683323281
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch
@@ -0,0 +1,85 @@
+diff -Naur sqlitebrowser-3.11.1-orig/cmake/FindQScintilla.cmake sqlitebrowser-3.11.1/cmake/FindQScintilla.cmake
+--- sqlitebrowser-3.11.1-orig/cmake/FindQScintilla.cmake	2019-03-20 11:12:47.452357850 -0400
++++ sqlitebrowser-3.11.1/cmake/FindQScintilla.cmake	2019-03-20 11:17:49.611365342 -0400
+@@ -42,10 +42,12 @@
+ # either expressed or implied, of the FreeBSD Project.
+ #=============================================================================
+ 
++SET (QT_MIN_VERSION "5.6.2")
++FIND_PACKAGE( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Network Widgets )
+ 
+ find_path ( QSCINTILLA_INCLUDE_DIR
+   NAMES qsciscintilla.h
+-  HINTS ${QT_INCLUDE_DIR}
++  HINTS ${Qt5Core_INCLUDE_DIRS}
+   PATH_SUFFIXES Qsci
+ )
+ 
+@@ -80,8 +82,8 @@
+ 
+ 
+ find_library ( QSCINTILLA_LIBRARY
+-  NAMES qscintilla qscintilla2 libqscintilla2
+-  HINTS ${QT_LIBRARY_DIR}
++  NAMES qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5
++  HINTS ${Qt5Core_LIBRARIES}
+ )
+ 
+ set ( QSCINTILLA_LIBRARIES ${QSCINTILLA_LIBRARY} )
+diff -Naur sqlitebrowser-3.11.1-orig/CMakeLists.txt sqlitebrowser-3.11.1/CMakeLists.txt
+--- sqlitebrowser-3.11.1-orig/CMakeLists.txt	2019-03-20 11:12:47.452357850 -0400
++++ sqlitebrowser-3.11.1/CMakeLists.txt	2019-03-20 11:19:07.740367280 -0400
+@@ -61,26 +61,12 @@
+ endif()
+ 
+ if(NOT FORCE_INTERNAL_ANTLR)
+-    find_package(Antlr2 QUIET)
++  find_package(Antlr2 REQUIRED)
+ endif()
+ if(NOT FORCE_INTERNAL_QSCINTILLA)
+-    find_package(QScintilla QUIET)
++  find_package(QScintilla REQUIRED)
+ endif()
+ 
+-set(QHEXEDIT_DIR libs/qhexedit)
+-set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
+-
+-if(NOT ANTLR2_FOUND)
+-    set(ANTLR_DIR libs/antlr-2.7.7)
+-    add_subdirectory(${ANTLR_DIR})
+-endif()
+-if(NOT QSCINTILLA_FOUND)
+-    set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
+-    add_subdirectory(${QSCINTILLA_DIR})
+-endif()
+-add_subdirectory(${QHEXEDIT_DIR})
+-add_subdirectory(${QCUSTOMPLOT_DIR})
+-
+ find_package(Qt5 REQUIRED COMPONENTS Concurrent Gui LinguistTools Network PrintSupport Test Widgets Xml)
+ 
+ set(CMAKE_AUTOMOC ON)
+diff -Naur sqlitebrowser-3.11.1-orig/src/src.pro sqlitebrowser-3.11.1/src/src.pro
+--- sqlitebrowser-3.11.1-orig/src/src.pro	2019-03-20 11:12:47.459357850 -0400
++++ sqlitebrowser-3.11.1/src/src.pro	2019-03-20 11:22:02.891371623 -0400
+@@ -178,10 +178,6 @@
+     }
+ }
+ 
+-LIBPATH_QHEXEDIT=$$OUT_PWD/../libs/qhexedit
+-LIBPATH_ANTLR=$$OUT_PWD/../libs/antlr-2.7.7
+-LIBPATH_QCUSTOMPLOT=$$OUT_PWD/../libs/qcustomplot-source
+-LIBPATH_QSCINTILLA=$$OUT_PWD/../libs/qscintilla/Qt4Qt5
+ unix {
+     LIBS += -ldl
+ }
+@@ -222,9 +218,7 @@
+ }
+ 
+ UI_DIR = .ui
+-INCLUDEPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5 $$PWD/..
+-LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2
+-DEPENDPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5
++LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2_qt5
+ 
+ unix {
+     # Below, the user can specify where all generated file can be placed
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
new file mode 100644
index 000000000000..c763fd949dca
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop xdg
+
+DESCRIPTION="SQLite Database Browser"
+HOMEPAGE="https://sqlitebrowser.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	test? ( dev-qt/qttest:5 )
+"
+DEPEND="
+	app-editors/qhexedit2
+	dev-cpp/antlr-cpp:2
+	dev-db/sqlite:3
+	>=dev-libs/qcustomplot-2.0.0[qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtwidgets:5
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtxml:5
+
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.11.1-unbundle.patch )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	rm -r libs || die
+	sed -i 's#"src/qhexedit.h"#<qhexedit.h>#' src/EditDialog.cpp || die
+	#find libs/{antlr-2.7.7,qcustomplot-source,qscintilla} -delete || die
+
+	sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die
+
+	if ! use test; then
+		sed -e "/qt5_use_modules/ s/ Test//" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTING=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon images/sqlitebrowser.svg
+}
diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest
index fe9ab4405fc1..7c59386a9bdd 100644
--- a/dev-db/sqlitestudio/Manifest
+++ b/dev-db/sqlitestudio/Manifest
@@ -1,3 +1,4 @@
+AUX sqlitestudio-3.2.1-libressl.patch 1248 BLAKE2B 7500c5231d03a2c1e2006631b77076a0cb6af49609446544f7e3901b748e87a2be03b232ef8f93714220542fff56f48e92c2de39d8a54889d7472b142071c71f SHA512 6fafceed80e8d072d06060f15787d855bfcfb55a502a73655beca043a73c45101bf5d3168781a2579c9e6aee5d924318240c886fe982cb0c833779d57be97405
 DIST sqlitestudio-3.2.1.tar.gz 9405867 BLAKE2B 53cd8465a6140cf17c602094cceef2fdf74f513f33257b22e1a3d7adcb9c78d8eb2cdaff047920836a9d98429ba0025924ce608f2eab97319feabf063de4c9ee SHA512 9c07f0dc50bf35ad04d0cb06cfc1a306d3f0aa9446e7d737c8187c63cb7dd2c44fb4b960693f2c30a15ece3aac0878701874a9ce3cebfe0c6bf48df10814a574
-EBUILD sqlitestudio-3.2.1.ebuild 3702 BLAKE2B 0c948401a7134af8d8db54ff53689e7d13df1481ca47983c4ceecf0b7e47f69d0ce55df44da1a5dd57dad9cb6823b15287ef29ae72ba13a3eba657b92fedc2f9 SHA512 194b248204b5ffafbc05db47fe161b0177204b40030314e1e720a4163d9002ad1f64bd87d41191a413392bdd1cd833e48651158968bf4b06f9df5e48a4281120
+EBUILD sqlitestudio-3.2.1-r1.ebuild 3748 BLAKE2B ef74b59ba8bbf8d39a77e4a31d061fb2ed090b2181b3198449efd9d58c175c0e8547597a56dd94d7f3da88a299e678f8ebb2aa53396e5bfb129bb4d48dfa79ba SHA512 29fd5e1257f6ea0b0d56ddb9e44b4e6442a4ccfb67d9815b04a08605158f828bc7f9a28557f2a974fabc98fdff4782b807ed1c52a8a32ef6269a1339c076b2a2
 MISC metadata.xml 427 BLAKE2B 937831b3acf561038a945599a81766c4fd1712d889b8bb0ba2c7b8c0d2414c547e270363b6ece7fd7956b66f1eec2e12bb4b83a2adf2718c14d0271d3c0f0155 SHA512 a6948ce576abceb4df085f103e097a720ef5f959c6f4bb79cc1f1d858e43cea625d5af3c5edf47f5e61c0a537368e60abd77ed3fcf39a9526543de315ef125b2
diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.2.1-libressl.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.2.1-libressl.patch
new file mode 100644
index 000000000000..06552942e945
--- /dev/null
+++ b/dev-db/sqlitestudio/files/sqlitestudio-3.2.1-libressl.patch
@@ -0,0 +1,32 @@
+From 64542c8c5cb3ad9249fa353ff4472c405057d743 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <stefan.strogin@gmail.com>
+Date: Mon, 25 Mar 2019 18:07:13 +0200
+Subject: [PATCH] #3505 Fix compilation with LibreSSL >=2.7.0
+
+HMAC_CTX_{new,free} were provided by LibreSSL 2.7.0.
+Do not redefine them, otherwise it breaks compilation.
+
+Upstream-Status: Accepted
+[https://github.com/pawelsalawa/sqlitestudio/pull/3507]
+Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
+---
+ Plugins/DbSqliteCipher/sqlcipher.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Plugins/DbSqliteCipher/sqlcipher.c b/Plugins/DbSqliteCipher/sqlcipher.c
+index 4918cb6f..10c4e5a3 100644
+--- a/Plugins/DbSqliteCipher/sqlcipher.c
++++ b/Plugins/DbSqliteCipher/sqlcipher.c
+@@ -21638,7 +21638,8 @@ static unsigned int openssl_external_init = 0;
+ static unsigned int openssl_init_count = 0;
+ static sqlcipher_sqlite3_mutex* openssl_rand_mutex = NULL;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+ static HMAC_CTX *HMAC_CTX_new(void)
+ {
+   HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx));
+-- 
+2.21.0
+
diff --git a/dev-db/sqlitestudio/sqlitestudio-3.2.1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
index bd8f78a3763d..f1b05ce7abeb 100644
--- a/dev-db/sqlitestudio/sqlitestudio-3.2.1.ebuild
+++ b/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
 	test? ( dev-qt/qttest:5 )
 "
+PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
 
 S="${WORKDIR}"
 core_build_dir="${S}/output/build"