gentoo resync : 16.01.2018

24 files changed, 56 insertions, 137 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index b0cca40e2146..54e8d4e42228 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index 289e68187c27..fe875f78fae1 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -5,11 +5,11 @@ 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-2.3.8.tar.gz 2206562 BLAKE2B 754930b4b5f0e90386b2b4765a9dbb6790ae509a81d3430c3f7c2c828d90318db3b01a2faea0c7075078096ce74302f2be7444245047534749f49d13a927851e SHA512 4268de32797cab23e9e47784d31d5abd6982068c53d3cc9735a06719740dba45b73f4e067cbc7aa8aef5ca7c56d8be067f1076685ac82f64012b760d8b7f2bfc
-DIST etcd-3.2.12.tar.gz 3046578 BLAKE2B 7b7a071c6856a7f1b5b7ceb68a4efbac74fde6ed1211dabda7d715ea79cd4dc9c10b0f1345d70b8a21e52cb3ac6adfc37c232ea28ff88e5f401212b5a8610d73 SHA512 b672a35ba62efccffa09be6b3d2a84b99e8abcae87093539c705d82e13c0f985a9f07a3d885af7386595f12d433756176db107739749c301e7e5d096e85d018b
 DIST etcd-3.2.13.tar.gz 3047049 BLAKE2B f0ac987aef60fcc28636cfb60d5f4e00daee29a3d5167900599760090c3fa3d7932abb6224df5fb66ea5bdbc29a9ce7f7263a0e81522853ab190be94a6551ebc SHA512 4f3c5856ecf9e8a725d0ef80bb584e7b2edaf7215635a5c74fe32b175ce9f8d07ba57685586dfd79b893d04641d4169382d22f2eea442efc1112fa91c8175d45
-DIST etcd-3.3.0_rc1.tar.gz 3357505 BLAKE2B e9008dfc5b88e7aafcb0db08e09ac40a25b3c877ec6865e6ae73162f65bc75af777ab5e3822130269b19acba1472f8c7cbde48b70d29c7a0936618c6ee13e753 SHA512 1a3fc95b1a4f5a85c956fb3a8558ae2deaa116ff2efe32ef9fdca0e503f356b1477e3f9c19be6d1a3b7b992d030abcf9b9eb251b5c37c64f78a4fbbcd406872f
+DIST etcd-3.2.14.tar.gz 3047100 BLAKE2B 5b956042542e7daeec3985f0dbd02b2766ca27287b55b0e1fd67c4296103ca9bf05b2ccc0e93640949c85e8099503b5a22d36c2f03d9904762ae1bbb59d35ac4 SHA512 f48cdb368906b36e7ce80c60933b0e9bc4415104c31f2da9346940f040febf27dbd9109e7f659a281c7038cadfb02b0dad614685a15ff46c87c600471c5de432
+DIST etcd-3.3.0_rc2.tar.gz 3358540 BLAKE2B 8df7b2bbe84c5440c1b778107e7817def6b7a14a8568e6c1d7b5eba5479cf58ad6901482937df149b658a7e06844037cad95b57196c23810b309ae638c8961c0 SHA512 4c9513fbc599b218072bf441a6a37e622554df1597e18d0b72efab3f85d8ffb2b21d915a78289a865de68bc25e4401df15f291521f3dd22d19c2ae37941c0e4b
 EBUILD etcd-2.3.8.ebuild 1379 BLAKE2B a6bff7dcfef244a2de25f4bf9168eb41552e394edf4a5e573a5b7dcea580debc3a87008b9d77d717b31b0fe27dcc08cdee76f855865455cde2fd26c16aee00e4 SHA512 ea3065641cac36b9011238603479967c1de5ab6f0ccb61dbc54b751879ff239b43065034b17045eb9467e1870878e4837af88c922f9034899da1359b69be98f3
-EBUILD etcd-3.2.12.ebuild 1475 BLAKE2B 362f159043caf3e4eeb86dc6f986d20944ee0f6dcb056348e3cfb2ea91d7ac2e3cf8b7cc9f9453046e17fd1613edc6e327c0b21c77d523664a79926058b46bc0 SHA512 b7b1a31797590cde253eb3df3d891620c812456159aeaf5fb0ea332b91517b898604d7c57c3c78c9515ee2e72750794450c40e54a1852ea0a5dfda9c0d346fad
 EBUILD etcd-3.2.13.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
-EBUILD etcd-3.3.0_rc1.ebuild 1501 BLAKE2B 6bcbc8b5feb259c84a1e46ef368e2a787fb7cf75638f157f91955f0a04aa68cf129a07d6ad3684024fd50ecedd78ab9d05f9dc44109e7c42e06b0bef4c4b5fbd SHA512 cfb2878fe80595c53de400d553eeadf2917fc8f9d4b1143de18d8d0ab0d71f602bebf74a38d81f7541911c5f1892ddbd46cf94db2f80a5371e83d76eb727d064
+EBUILD etcd-3.2.14.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
+EBUILD etcd-3.3.0_rc2.ebuild 1501 BLAKE2B 6bcbc8b5feb259c84a1e46ef368e2a787fb7cf75638f157f91955f0a04aa68cf129a07d6ad3684024fd50ecedd78ab9d05f9dc44109e7c42e06b0bef4c4b5fbd SHA512 cfb2878fe80595c53de400d553eeadf2917fc8f9d4b1143de18d8d0ab0d71f602bebf74a38d81f7541911c5f1892ddbd46cf94db2f80a5371e83d76eb727d064
 MISC metadata.xml 614 BLAKE2B be58143e8f3c7adfefa4be2af02a57738eb30bad4ccc63bb7756585cc71b5d40a705d0f16d61fe263f3858e53b965e3611386dcea04bba985a0bb09eb95231f0 SHA512 92fbd483e5a757d09c07c392cc6d54a5448b6ca02177fbc48ff9f1b4f558af4755e4590e3d7192dbc3e5a32d5bf797289a7b1067e585dd295e3e890b88af9cb2
diff --git a/dev-db/etcd/etcd-3.2.12.ebuild b/dev-db/etcd/etcd-3.2.14.ebuild
index c4f9f1d45765..34692b679e18 100644
--- a/dev-db/etcd/etcd-3.2.12.ebuild
+++ b/dev-db/etcd/etcd-3.2.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-db/etcd/etcd-3.3.0_rc1.ebuild b/dev-db/etcd/etcd-3.3.0_rc2.ebuild
index bb257b8fde56..bb257b8fde56 100644
--- a/dev-db/etcd/etcd-3.3.0_rc1.ebuild
+++ b/dev-db/etcd/etcd-3.3.0_rc2.ebuild
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 6ff6405b9f04..64c67c07e1b8 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -34,7 +34,7 @@ EBUILD mongodb-3.0.15.ebuild 4561 BLAKE2B 85e994c18b57a0278059eb0e2e141842b551a9
 EBUILD mongodb-3.2.12.ebuild 5129 BLAKE2B 5587e9f109bc55d58d5157aed301fb61c8bc088d7bad7fc386d9e34b228f05a6fcdc79f4d2201ded1de0d178eb721600322992b6f0e4ec174cc85ac44decf81a SHA512 28de831886c3531c441658cdc7a29cea3b20f6aa9208c5658d4ad71269b6ff359954118810a9e845d567f54a54449ebc20a446f46da3d4694b5395fdf9f822dd
 EBUILD mongodb-3.2.13.ebuild 5129 BLAKE2B 5587e9f109bc55d58d5157aed301fb61c8bc088d7bad7fc386d9e34b228f05a6fcdc79f4d2201ded1de0d178eb721600322992b6f0e4ec174cc85ac44decf81a SHA512 28de831886c3531c441658cdc7a29cea3b20f6aa9208c5658d4ad71269b6ff359954118810a9e845d567f54a54449ebc20a446f46da3d4694b5395fdf9f822dd
 EBUILD mongodb-3.2.16.ebuild 5180 BLAKE2B 79f825055c4491535e1e4405af86b58650443885a6ac7e65e53f6739465be60bca9abba10ccc803cecfe93b1bf2645970f9a4e97b5dec72309ed12ddd4f1f350 SHA512 9d0a8bac5e2aed1803df8d23ccf126a56194d03f715e86adb4fda36a82fd176617c5c599c1ac7fbfdbdfb8d6c7c63496e34400a9dc5ed75cd6d84ca023d58ee1
-EBUILD mongodb-3.2.17.ebuild 5339 BLAKE2B 44abb9bde7a946e9eb09002f0ea4c84e6cfb7161a8ad6624881268fe00d9e5d125a0d5a0dc0815d4f759e5d6fdc2160bbc88c9317848d15e551e2b165f5e1733 SHA512 bb163c16d8fceff96d1c199ee41e43ad91892a2442ea370c50c15484d80625057b5ac36e516deb0daa25325a74aeb37da7c19e0a97e3ce2a769c77933521622d
+EBUILD mongodb-3.2.17.ebuild 5338 BLAKE2B fd327b1c5bb85e833782839e07b3379a103f0545fb9852cb06d7f6f0b3548b921dfce227d1882a1e448a533c043718c778e9141ec5715805a24c9e2fbf199fa1 SHA512 a439c32b20a81d1c8e199c8a6928aa75479562e6b33c0d7b50797181226a093f571a1caaab102569a9a308db18a73c51558657ccd4bcb1d7e137eb22fb363c4e
 EBUILD mongodb-3.4.10.ebuild 5240 BLAKE2B 1e1897fe9f4d929a7ae9b720aad33819cee29776b5ed34c502e421b3454daedd11bb009437e5316cfb0bf5f3d2d3f563f5c34ce946ebab26030ef96e91b1602a SHA512 001ea14c326133a4d462ce4b25db9318376f86279cdcd9edf7ce6e9f8ee4ed642576e4a0a622cda55fd31360912fdc2aa3a77068503b7dc039ca05b7abd9aa89
 EBUILD mongodb-3.6.2.ebuild 4442 BLAKE2B b62187502656f26136a95ec54db456e87cb2149305c4c5f6c0e4fe4f988c847b3909855d7f536093e7d4d4eb304d5e0322a25fff54d51a378511bbb95040e749 SHA512 3da494650e9126d3287b8dc04876bc8f8b95e49cba2ea3dc7dcad7016e43bc6062f64552e223c88c274312304b98526161151d2bf0e93a8701e6706324da8b0b
 MISC metadata.xml 1112 BLAKE2B 59da7a768ae87cb8ea3a539b40c27707b8aca5bdfd6f3acfcddca4d27a354aa5ffb13b68b7d69b57553d26d3b47860e186c5c43a38122df4712d0cc98ec1f690 SHA512 39b9bd8afc1c79382130c691154eac4338810fb4069406482648d32fd2aefd5d3697c272321d300154be2e4d37ac10f1372c62687d9c41ca0d3682b0152a53c4
diff --git a/dev-db/mongodb/mongodb-3.2.17.ebuild b/dev-db/mongodb/mongodb-3.2.17.ebuild
index 979e0dfa8c93..bda8f3b4e588 100644
--- a/dev-db/mongodb/mongodb-3.2.17.ebuild
+++ b/dev-db/mongodb/mongodb-3.2.17.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug kerberos libressl mms-agent ssl test +tools"
 
 RDEPEND=">=app-arch/snappy-1.1.2
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index 60b1f09be8ba..e7a0aa7fc7ed 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,5 +1,5 @@
 DIST pgadmin4-2.0.tar.gz 24988176 BLAKE2B 96e942d5001b1d590fb1b642933c665a13bca5429d3a3e74eefe4a8090c76515cc08b656ebfea3a170b4fa6077d7086fbffdd5fddfcb517be08fd4ecc20052ab SHA512 463e95a341dec74ac0a08a647af1cbe83b514b0595b8469ab9c7b5335e24604e082b906d530aa735fef7b08c58d8a8a6df3edf5dc65402f6521165f1cbb72f67
 DIST pgadmin4-2.1.tar.gz 27842212 BLAKE2B 26c12dff8e2e5e37dd2911f6eb582a0f706d73490c8d93e83b07b7537fc201547d095d4f34181d2502bbc29b2741614adabf876b7e6ea3ef5f555eab94caa240 SHA512 02bc122ae53db595a1fd395e634fc4d0891f024a2e5e341c81b306a8c1d07bc18e5673cda440c7ba56754be4902ae4441010db0140132352e12b8986c8c0f47c
-EBUILD pgadmin4-2.0-r1.ebuild 3430 BLAKE2B fb80fbc920e092ed3b39f58f0c080f41e6a358e573112f42da9db4c728a8bbec37f00a61be0eaadd19e607aa3c5b79841db80ff689404a102a51bc3ac28b118c SHA512 10d50efb96498eb3abb76943ab2a678c9b3a39935d628906a6a07b9b9d666ab6648eed4b2c4d6ecd0b4a61664dc4cf25cdeb4abc5fc55c2915a87d40e4f0975a
+EBUILD pgadmin4-2.0-r1.ebuild 3429 BLAKE2B 18e38ce8554d4dac7e4ac486ee68b205a075c582557b3830202c94d61b894382f051d86d5cf406d6e508fc487b5b9e53dfbfcd6a89a988f7fd687b8af5660cc9 SHA512 89aece639bc0455151cf20e3adcff92ca04c56e9d0370bfd7ae4291ecf5a458c33d7e1219279162908fcd7ebe84fa1623232d5aeb12eafdf488196646e788690
 EBUILD pgadmin4-2.1.ebuild 3432 BLAKE2B 150010a6b6abbd2dae6a362883a24c1b2a13a62301489ef4a6073801de25e7c6b9792beb542306393c8fe1b598dcb2125bef88e03020de0a61688edb76a78578 SHA512 493c026a3bc156a92f5253ac96aa30891d8c644463196ab603daed5cfa9536fdb99e786dd07cfaafa31b1eb782040e6711d9e8a541211aa905e57227309843fa
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild b/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild
index 932530d0a98c..0696264af76a 100644
--- a/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pgadmin.org/"
 SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
 
 LICENSE="POSTGRESQL"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-db/pgbadger/Manifest b/dev-db/pgbadger/Manifest
index c55c2935acca..137852b1b237 100644
--- a/dev-db/pgbadger/Manifest
+++ b/dev-db/pgbadger/Manifest
@@ -1,5 +1,5 @@
 DIST pgbadger-9.1.tar.gz 742409 BLAKE2B 34b2b9e8582755edfa4a284a926032b4534b962f5e80be17b0efbf4b4c7f367cf9b588831d0f1e0e8142e7d6d5fff2d5733ee06e405b2192d7f01c91cef69df6 SHA512 e3841516dd56ea0aeae397c8264302881df3b07a86063f7813f593ba817a4f3417559b88e2b9e23fec811d3dfd716589f56092be106960e88d1800a94d3d83c3
 DIST pgbadger-9.2.tar.gz 745128 BLAKE2B 63e7d60992e903a136d4f91422a378a6adc5c0477e69ae1cae3d4c1940dc02517f0b6f16d0fa7c5fe0ea365851807dc800bfaef0e95c546d6c4eb4afe0e2d09d SHA512 c99636fc03e3e1c1cf4c8c034e58e2152ec1118954d4fd9bdfa782d7781eee308cdd7450c0bcca6f5936c173b3780c9362fccc8cf79f5b0fffc895f73a322c9e
 EBUILD pgbadger-9.1-r1.ebuild 438 BLAKE2B f8fcbb93e32dd050365b68f2abf3a6b8b32b8e5e7759e227f39c4c221c2940495c04ca9967b392f5fd473fd316a202fee2e0450760dd83b399907475ff6b8199 SHA512 5d918d0ccfa4d49096693d3dc62caf95bb9a38015afde5565aa43fb23b1961030feb4ec942a1ba957d75f42e63b2a3079aa6cbdf399eeb88393f3ae183ba729b
-EBUILD pgbadger-9.2.ebuild 438 BLAKE2B f8fcbb93e32dd050365b68f2abf3a6b8b32b8e5e7759e227f39c4c221c2940495c04ca9967b392f5fd473fd316a202fee2e0450760dd83b399907475ff6b8199 SHA512 5d918d0ccfa4d49096693d3dc62caf95bb9a38015afde5565aa43fb23b1961030feb4ec942a1ba957d75f42e63b2a3079aa6cbdf399eeb88393f3ae183ba729b
+EBUILD pgbadger-9.2.ebuild 437 BLAKE2B 51ec9c61888f6e01e9d1b4222166268162d8b8b9a6d57a9ed5e9054244a9c34edde5f0edc913a00fe164f57501c525253867df4f8c1b5cea7539f7070a231539 SHA512 9fd59dc534af5fa16a90f26b0953c5e1c606a873c800a9105dfa403e8372f11bd97840730488229a1f1d6e67ff7e27d58b247972480e15486151e988c3ca5078
 MISC metadata.xml 413 BLAKE2B 9b4f24620b42d2cf5befbaed7d52ed2e03d4619ebb547d36e207a900fe481a825a5be0a6fac073d7b278076ced053ae9a3c4b5d05597e5fb4d7ea66c1bff7988 SHA512 6bf32dc50ecd2d51d450413500b00773177109ab3ad26d74b458ec902973fa38542dbc65e65fbbe103b4be63589f61c2b9a6ab6ea5492b1954142afc5c2f8f93
diff --git a/dev-db/pgbadger/pgbadger-9.2.ebuild b/dev-db/pgbadger/pgbadger-9.2.ebuild
index 9e674e7b549b..16ecc3a80b96 100644
--- a/dev-db/pgbadger/pgbadger-9.2.ebuild
+++ b/dev-db/pgbadger/pgbadger-9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dalibo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="
diff --git a/dev-db/phppgadmin/Manifest b/dev-db/phppgadmin/Manifest
deleted file mode 100644
index 2b34c9c07258..000000000000
--- a/dev-db/phppgadmin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX postinstall-en.txt 162 BLAKE2B d08f1f1064e8f268fe92ee622d0b5a756e20d80a6376abf1bfc7e8bb88c90d7b3c1b7c3c3291d3189791cca9766feb05b9831ddcba2e84f69e295f7048d440e7 SHA512 3aa9e4b58ffd97cc9bc990e0ca8444e8be012fb56859b28705e7ed3d5ffae74bcfab19c55e415785c9f09fabcc20ea5a493ee2f03fb380a351c02fe958231bd8
-DIST phpPgAdmin-5.1.tar.bz2 583620 BLAKE2B 6c21b127db6a7d8508ce4ab2e12ed11db568aaf903955d19f6cd9548908c321ffa276b87d1cb828286fb32a9eddbfe86b9a9671937639720cbecaa2bdbc7a2b3 SHA512 3a1eebfc4e07a620ea3ec5d65e1fd1f07cb19f12db470f163430ded20542107c828cebbd5d5ae23c470fbe5aa0e2358b8c4d3ba66834009a39ac74440cc751c0
-EBUILD phppgadmin-5.1.ebuild 943 BLAKE2B e2065187f74fa39c95a60904bd771dee99e16e1d77570624b4eb7823f12319a760f6ae052076d592068b26bbdf3535e1213db8cba563419c597d78ea2d4913eb SHA512 9dc11c40cdbdc05779d9a7cbd16350925c574f5b191106854ac81636ddc4549be7a9a682a9054b7a7aced600a79fb7d4bedeeaaafa59aa325bc6fc07745acaef
-EBUILD phppgadmin-9999.ebuild 913 BLAKE2B 24125893a3dddf588cd829de21ffd1eb36eb6f0f05d2bfcfd0cb6aa6bfac786305ea432abf0a8131f7ead4d91a3c8e70308996688b59600c2fc233011ee76d1c SHA512 fc09d7d7e42e447514b57df9434326e1a0bcdd691ccb8c1958c5fdff195b0c10fdcfe5f7d65f4eb8d2b4a578f41887491200c6e1694d0012bc324df2f91760ba
-MISC metadata.xml 471 BLAKE2B bf3d67816bf702b302a122dff0f2643fb9244fba961d863c3844fe6efb2de4a13912bcf5477075b0c96ffa675d6fbcfe1169bb1fdc5c353a650121ffdcf5ef9d SHA512 c77ad7f8013618aa1775c023bb166792ddf7824b53315d4b9c36b140ea4b1985c1530dc50e38c14948ea5aee124d0823ce782d59b12da320757db249dddb535c
diff --git a/dev-db/phppgadmin/files/postinstall-en.txt b/dev-db/phppgadmin/files/postinstall-en.txt
deleted file mode 100644
index 003fe5003bbd..000000000000
--- a/dev-db/phppgadmin/files/postinstall-en.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Make sure you edit ${MY_INSTALLDIR}/conf/config.inc.php
-
-To use the reports database, you have to manually execute
-psql -f ${MY_INSTALLDIR}/sql/reports-pgsql.sql
diff --git a/dev-db/phppgadmin/metadata.xml b/dev-db/phppgadmin/metadata.xml
deleted file mode 100644
index fc6f76702327..000000000000
--- a/dev-db/phppgadmin/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>pgsql-bugs@gentoo.org</email>
-		<name>PostgreSQL and Related Package Development</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>web-apps@gentoo.org</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">phppgadmin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-db/phppgadmin/phppgadmin-5.1.ebuild b/dev-db/phppgadmin/phppgadmin-5.1.ebuild
deleted file mode 100644
index 7434f1c78238..000000000000
--- a/dev-db/phppgadmin/phppgadmin-5.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit webapp
-
-MY_P="phpPgAdmin-${PV}"
-
-DESCRIPTION="Web-based administration for Postgres database in php"
-HOMEPAGE="http://phppgadmin.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/php[postgres,session]
-		 || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	webapp_src_preinst
-
-	local doc
-	local docs="CREDITS DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS"
-	dodoc ${docs}
-	mv conf/config.inc.php-dist conf/config.inc.php
-
-	cp -r * "${D}"${MY_HTDOCSDIR}
-	for doc in ${docs} INSTALL LICENSE; do
-		rm -f "${D}"${MY_HTDOCSDIR}/${doc}
-	done
-
-	webapp_configfile ${MY_HTDOCSDIR}/conf/config.inc.php
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/dev-db/phppgadmin/phppgadmin-9999.ebuild b/dev-db/phppgadmin/phppgadmin-9999.ebuild
deleted file mode 100644
index 8e5e78b13e74..000000000000
--- a/dev-db/phppgadmin/phppgadmin-9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit webapp git-r3
-
-DESCRIPTION="Web-based administration for Postgres database in php"
-HOMEPAGE="http://phppgadmin.sourceforge.net/"
-EGIT_REPO_URI="https://github.com/xzilla/${PN}.git"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-	|| (
-		<dev-lang/php-5.3[pcre]
-		>=dev-lang/php-5.3
-	)
-	dev-lang/php[postgres,session]
-"
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local doc
-	local docs="CREDITS DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS"
-	dodoc ${docs}
-	mv conf/config.inc.php-dist conf/config.inc.php
-
-	cp -r * "${D}"${MY_HTDOCSDIR}
-	for doc in ${docs} INSTALL LICENSE; do
-		rm -f "${D}"${MY_HTDOCSDIR}/${doc}
-	done
-
-	webapp_configfile ${MY_HTDOCSDIR}/conf/config.inc.php
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/dev-db/pspg/Manifest b/dev-db/pspg/Manifest
index f9d8c6cdb5a6..0a15371bc44d 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -1,7 +1,9 @@
 DIST pspg-0.8.0.tar.gz 850508 BLAKE2B 2f2fb7f094f72f0b5d1c959ab73a355ea2ced155fdb64adef21eb70c4991b057e31688128f50db2d6a84ab850b57ab59d50c0dd5ba06998af11ff3a5479cc9bd SHA512 758d47e041f4c7c91ad2033fb95e6d33a27b6f896077dbcb287331496e47740c31c6ba6bf7ea01ad6c1a3c3d4c5e525b268795a16f9c819f4d489d3e98fa3092
 DIST pspg-0.9.0.tar.gz 853226 BLAKE2B 7fc73a02557991c24892f47f09a4402fea691047a41ed91e0b4d3fac8fe2fbfc02530615d1123288b641dba7b1db8ba524156351e494a37ca7072853e1f028ee SHA512 a752570ab1a7bca5d69c602a2e8bc0ec92a6ce405b7170bc1a25ed2ae29b0e69fa7833979ccbb5bd1adbaad968067928f26044eef902069edfe662812e9d3edd
 DIST pspg-0.9.1.tar.gz 853229 BLAKE2B 791a8d05ac549b869a3d31578277709f17a50b9aebf3ea84ffb30199ebdda8faae6828e4f5068880fc1e74d57d88086bf363b1825789d4968ed77087561a5435 SHA512 40fb07153c36e2e170ddd1fda18a9c2e663e7995367c2ac30e136f65e07d36f812bf69f886767fa71588d548d90c47c442c0503fdc775b5f61826e60672d9d54
-EBUILD pspg-0.8.0.ebuild 389 BLAKE2B 965a10bfaeb36e9e5436d3870a109a71a763310e8ba2b1f2e2027c33def5af549b7c3d4a1ea3204bd174fdedd84ce9b57739a7f0a33f0e79a1928a3552c3532a SHA512 036103ff39c94b193a5d0dc24ba9d646d658003e843383d825dbbc2eebb71a775bc5c0c20bdeefc8d193fd874a2b9277c110e2387d6de0590561e9b2186e1f47
+DIST pspg-0.9.2.tar.gz 855891 BLAKE2B 0e0a992e5885ca4b2e058d19df2d9c7eac862e1a45e8d80f31df33ab2f3c02616c67cc528af6a52225db938a0c1f27352e13c7dfd01b15bda908bbf3ee9ef128 SHA512 8ad31a5e744db96bec7cfea7d128aa4ac3b44ab51c3dd1d0661178c1d139571a955143a3ccfe6556ce2a215ec193a45224720794da5d2af1e93beb2fa713aea4
+EBUILD pspg-0.8.0.ebuild 388 BLAKE2B 17032d0dadfe6fc68d7df37ad154e6c783ee9e41f336f3a4e9800081ea5e2f8bb7dc7b31ef8958e7007e8eb3dc60d113bfabe956157e3143756424789d92e7e4 SHA512 98a5917e78c393fd1cb81c5b1fa81e91038f3307ce668102656813834e085d0321cf14ac7dd91fbf6999a344894e6b7581ad7a0b507cafa607a3dedc28a8b29d
 EBUILD pspg-0.9.0.ebuild 389 BLAKE2B 30ebc1a109cc694a1bcb8f612d36a51570d7df89cd5c55e6142581783e6afb958512c5de4c1bc446828c36acc3c6788da001c98ee0d60a1153ff454b693bf381 SHA512 3c62b0fbaacd4be5248cd7101cc91511f9bb321a0437b65e17848d1ab30338d1de64d674d43feb4c8c33513c8b4215545b3548994167eba20e9860955a2d3e6d
 EBUILD pspg-0.9.1.ebuild 389 BLAKE2B 30ebc1a109cc694a1bcb8f612d36a51570d7df89cd5c55e6142581783e6afb958512c5de4c1bc446828c36acc3c6788da001c98ee0d60a1153ff454b693bf381 SHA512 3c62b0fbaacd4be5248cd7101cc91511f9bb321a0437b65e17848d1ab30338d1de64d674d43feb4c8c33513c8b4215545b3548994167eba20e9860955a2d3e6d
+EBUILD pspg-0.9.2.ebuild 389 BLAKE2B 30ebc1a109cc694a1bcb8f612d36a51570d7df89cd5c55e6142581783e6afb958512c5de4c1bc446828c36acc3c6788da001c98ee0d60a1153ff454b693bf381 SHA512 3c62b0fbaacd4be5248cd7101cc91511f9bb321a0437b65e17848d1ab30338d1de64d674d43feb4c8c33513c8b4215545b3548994167eba20e9860955a2d3e6d
 MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pspg/pspg-0.8.0.ebuild b/dev-db/pspg/pspg-0.8.0.ebuild
index 9b90eedb3e06..41c42740c924 100644
--- a/dev-db/pspg/pspg-0.8.0.ebuild
+++ b/dev-db/pspg/pspg-0.8.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:*"
diff --git a/dev-db/pspg/pspg-0.9.2.ebuild b/dev-db/pspg/pspg-0.9.2.ebuild
new file mode 100644
index 000000000000..9b1b64baa6d0
--- /dev/null
+++ b/dev-db/pspg/pspg-0.9.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A better pager for psql and mysql"
+HOMEPAGE="https://github.com/okbob/${PN}"
+SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses:*"
+RDEPEND="${DEPEND}"
diff --git a/dev-db/psqlodbc/Manifest b/dev-db/psqlodbc/Manifest
index 1fbbf10b1e5c..11d0663435e8 100644
--- a/dev-db/psqlodbc/Manifest
+++ b/dev-db/psqlodbc/Manifest
@@ -1,5 +1,5 @@
 DIST psqlodbc-10.00.0000.tar.gz 914115 BLAKE2B 3f1753a43b4707c0cb723df756b3d9a0177452231fd950a7bec4e5fc35bcd03012f64d2e0b64c1f7cdae375d2ff9211272537c6a76e044fcb3ac277752dff9a5 SHA512 95898b0030778f2f002b0820180de7261387cd7161231a000523ab84f3aa106436a4e6598b40936ab313a5cf578657548f833f58791eba50160c40be4ef3d275
 DIST psqlodbc-10.01.0000.tar.gz 915109 BLAKE2B a09de8218dbfbacf7972fc02c02863891ed65d19b86217a646aa0176ad7a8b962da83bb5036ad11b819a583409e4d1f3ce257a0457838000bc9cc060753c67b3 SHA512 1c5b9732a9c7e7bff0fd0a04cc7f0b45db9150486a2c3a8a96d85fb55e9296a80f12ee652cfb7ff54700e7dfc10accf9e5420b7ca798df31be51f997bbda88aa
-EBUILD psqlodbc-10.00.0000.ebuild 684 BLAKE2B 041e34ef73f41f34b75bdc4dc8227b9e21b39388ccd5d3506129a7d880d90b7b595afab17756e4783749ac99863fee7416f597e3871a4600c497e5fd50de2fa5 SHA512 62e2bde253fe3718b48a8e62eabc7d634568c2047e750f98addfd6c297cde3395a460d69b97e64551aa89e8c0008bb39b10bec8f224ec38e587bb1aea4c743b8
+EBUILD psqlodbc-10.00.0000.ebuild 683 BLAKE2B b1b6cfed09a623b54cc90f9263cef4d00a5b33774b10b71244a9ea24409f63652a3dfae75ce74fb88598df448b79378a701cf955d146f0445f1d5520b3e0c4e2 SHA512 06690e24fba494ab0b113a21e4e63304e75afef392e6fe7a6396e43359ee924821fdbedd23d05ec303069ddf432fdcc58880bd9433aa5035f01c66077155ba60
 EBUILD psqlodbc-10.01.0000.ebuild 684 BLAKE2B 07f0532b350973ec74283caea9f698980e90bb3448d7611805b2847c2c44b1ac13fba5beb7fc833bf04d7f042956fbfd8ac69a147c7c3e64146ab9ffce46a282 SHA512 2ea7c9c760d05f9e4f981d7ee410bc1e668994ed4971a421a8c3059b2f8ab741c3ecbc905d08861d5f66e09d4fb0f39c6851030e72eaec36c3d631fa09d9fb95
 MISC metadata.xml 366 BLAKE2B 9ec9629e72aec8407fc260e061f7bfe22f4ed13c6a4a99ddfffbd16eeac41cc09bcbe10045f6e4cba92d7ced6a874b09b7a7614aedd7cd45afa6e03e096f869e SHA512 a6aa6cbb188fa2ed889ecb69c60b77d33c52ee69a5e9b3c20d8faf9bd9616d33f592c85bded3351fb099b6424e2f7728ee11fb1114121604ceacd9e7e0a13f7b
diff --git a/dev-db/psqlodbc/psqlodbc-10.00.0000.ebuild b/dev-db/psqlodbc/psqlodbc-10.00.0000.ebuild
index 0db49481b159..f85303f96164 100644
--- a/dev-db/psqlodbc/psqlodbc-10.00.0000.ebuild
+++ b/dev-db/psqlodbc/psqlodbc-10.00.0000.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.postgresql.org/"
 SRC_URI="mirror://postgresql/odbc/versions/src/${P}.tar.gz"
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc iodbc ssl threads"
 
 DEPEND="dev-db/postgresql:*[ssl?]
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 83574766c5ad..49916ec1b4d1 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -19,6 +19,6 @@ DIST sqlite-src-3200100.zip 10575637 BLAKE2B e45bad50d728e749c258546dd75a9d647ca
 DIST sqlite-src-3210000.zip 10577695 BLAKE2B 21f110d4cdda95864a39b9b9b65985d29e1409ed38a9bda692d33dde845c115476cd77dc3b9cd1b7359ff383dc3050cbf0437b113ea128392aef50dd3b778d46 SHA512 3a054422da80d750fd5ab297f9d2728f4e7b55fa790a72d55da8c381835571992d56b349e50d4680b04c9e2e44d6fa83009c2df3ffa045f43ff9059bb8736894
 EBUILD sqlite-3.19.3.ebuild 7627 BLAKE2B 4f3594d70cb165202bb07f9796d184999a65ba675921435b248c7c93103402601510246b0ceac250128fe50f555cfce4e77afb868d96403991d872f3ff2a8763 SHA512 9b689a4fd1897c8ebdb4c726c7377dbc3a53445539d93d443e208ccf007f0085b7179f8821a2eb0b15bb4591b5dd00747dc54fb0a1971bab249b905f49e2b31f
 EBUILD sqlite-3.20.0.ebuild 7632 BLAKE2B e3878c30f7c1ae5d80be12aa59d2a76efd7fd1b25553495b687016fe060223011a7882ac7b018fc5ab87b89746b10844ba3d92fa4677b63e3365c7046b77ba8e SHA512 0429db119f90a2292eb5ade11f55acee08a68be38bd37e4455e686e5431d1d04475f860fa459d4746e7404123869ebf2ec75fb956d57cad06b49037f25ab8eed
-EBUILD sqlite-3.20.1-r1.ebuild 8088 BLAKE2B 1adae68ebe8d19759edbc0ad114d59cd5b19f52c4afc71f4f854fa6ac06faa143c5e2dce09ce3061e3aa6f2032d008773f28d7575288db29949205e3af1f3006 SHA512 2945a24e8d8bd2d0c3c79ef21a5a1a6cb10a2319c1771ea4329edae59291acf7079dec17b10d9c1b092279f64ed44104ee0b2811e904468309f40af26814e190
+EBUILD sqlite-3.20.1-r1.ebuild 8084 BLAKE2B a3b39bdca770597dc3eb540788e832e7665bc05712d5835a749d5bb8c406a1df083a3f99dfc26192f6148a0ec6f209edbf1b7ca0105eeb343ea4391cfb86e9dd SHA512 b6bf063b4d0ffa604f82ec2f07d31279217373f356785adc2e103f3cd54b4b39cf39197d4e09107b53212d52f3f9cc6c3f95cba886216804954bdfb32b36fe50
 EBUILD sqlite-3.21.0.ebuild 8470 BLAKE2B 62d2932eca2597f08a81279f4fd49f3c602ed59a5fe898b5398edf29a00621fb72fbfbf6458dd8d2525ac2bf3435bc5cb411fe4bb21c4a1a83bf608ce93edff3 SHA512 a240c8b818c0b55b57f5ba3498f1f3938efaa6ba773cce310dc1c18d3256f48bb3cd1ad3b7ba124d5d1b245b61955e523f33ed460c496612d84c4783931762c0
 MISC metadata.xml 745 BLAKE2B 967f5a809e007354fac9d750f068aaf552aac8503f72d20c57dfd0f85dbdbf620209bbd9646cb2b79cfc5f2a40917422c4925784d54220f61132d70ddd414d53 SHA512 06ed7007e3ded9f29fadc70c583e9795a8ab5c27578159bb060b39c0cf7de6b4bca06ff0ceeab6710c50db96a44c976c52af2352ee7928211a46d5eca071b849
diff --git a/dev-db/sqlite/sqlite-3.20.1-r1.ebuild b/dev-db/sqlite/sqlite-3.20.1-r1.ebuild
index 1b773f5bbd2f..9fc8af5cc324 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}] )
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 8c18568feb6e..8ba58cd102b2 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,6 +1,7 @@
 DIST unixODBC-2.3.2.tar.gz 1849173 BLAKE2B b16f6fb122036c8307b8e140f4987544f29ab7e78fe90005db3387d0aa64e6a52c616fe97c36ef24c71fc2a78712d3346bc8b38065ce59bf3c8ce9aefe43f44a SHA512 31d705bf3dcaff6707d5680235b34e4d265a084b1de9e1b2ed3bbee1e1dfefdb4437fe3e1736b84e446d1927ec7622296d9e9b129052cb35f4b63b0bd79ccd13
 DIST unixODBC-2.3.4.tar.gz 1830660 BLAKE2B 19b3b932e66ab2fea5645d9723592d881d86203fcc93a1a34bdc9d24fbb7fa606a0389b37988606ac60da71f378327380a32d4687dba16e784c9cdf0fd9b5fdb SHA512 34799777c95539905d4bbe60ad2b83631a31a68483b6be96dba25f80fa2fff4624ba170078097c942f2206873776d179d7d02a340598c4627f8723eb6f083a26
+DIST unixODBC-2.3.5.tar.gz 1633390 BLAKE2B f7c70740471b0c6ff298f2377a3895efbf160764adc4f607dfb65de2873ea3a39a2852399feaca50fc389875e20a10b3cd0389ba9e9f02d0548312d8063f5af5 SHA512 94b5ebb887571f4fa801ae4305cd6cb4eb0d03682fac1eb0422cdd13b046b077e60bff8286c578b0b5e291cfbc0bc8695495e39c3713858d2eeb7b38459397d5
 EBUILD unixODBC-2.3.2-r1.ebuild 1639 BLAKE2B 3b3f31abe25597d857d7d55c95b704d391f8eff23b122a6f9e5b059f5c79cb73cdcee62f45dc8f89ee95c2c8fc4663adc80f0962094acc2ea445c91318c136e3 SHA512 20437b1f5e7786457fa65c301466cbb8ff0403213e9c72612d1f1f30f7716b2c4215cf88d420f05b3c7f40ccd966a39a7c191402d816a622856c05094565473c
 EBUILD unixODBC-2.3.4-r1.ebuild 1667 BLAKE2B c81176f8e0d13fbdbfd5623baf8b61e3dfa32e26652afd62a1b0831c57fb4a3238742a45ace747b3d65a265e8269840104d4b95a1c99b450e18c26971ea802e6 SHA512 287b75081ca3d83fae7014d59c5afd5aad806662a23bf4de8bf198f263dea5c7f93798e6a75947af2a3e10c832c2180fe13741136b6fcf2583a5f4e132ab509e
-EBUILD unixODBC-2.3.4.ebuild 1729 BLAKE2B f37b5a2612f2f6b229c6ca86d8a0e67a1ce4cdb120f14ef2843c849f034849f743306f6fa9ea495b6f68dcf3b7e7d95ddf3c72c359cd0173751c04ff051658d5 SHA512 a5b810d7acc4bd3a53d4d9584fc3bbc6de7c59904a5d7e3f21816d7e045ad8910fdbeb8b670bcd3d9e3cb1cc3a49be84f49dbcc389500963df1422f9ae08a071
+EBUILD unixODBC-2.3.5.ebuild 1773 BLAKE2B db134377e56f2fb30be44ffc5253bd2532825b9a73dd7a3be06ae706f339a6734a39398776f3616249146abf15eb9275f8065500cf2f14c2ca0e72a8b485ad98 SHA512 ebe2585e62f101da036faf9b1f6036e878cf06fc22112ef1b41e286fdef690edb00b5a9579003143a54b1466102421317fd47abde3b6cbfceabb383817ae18cd
 MISC metadata.xml 366 BLAKE2B 9832224237ae18987939d9c0f657c6666114a5ce41af09a3a5a423d666ec70d9c5cd4fec1d82134b68e2e96b1a3e390977a0cd95001d325465d75b2b9b311d64 SHA512 e47157f178b585272b5c11682cef0c7b7dec227ded178d3427e91632f754db869deb72a6c1b258dfc90f6760028d3045d1e703874ae24111f8deb9db629b8c29
diff --git a/dev-db/unixODBC/unixODBC-2.3.4.ebuild b/dev-db/unixODBC/unixODBC-2.3.5.ebuild
index 50a05677ae7a..eb5e0216e655 100644
--- a/dev-db/unixODBC/unixODBC-2.3.4.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit libtool multilib-minimal
+inherit libtool ltprune multilib-minimal
 
 DESCRIPTION="A complete ODBC driver manager"
 HOMEPAGE="http://www.unixodbc.org/"
@@ -10,21 +10,22 @@ SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~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"
 IUSE="+minimal odbcmanual static-libs unicode"
 
-RDEPEND="|| (
+RDEPEND="
+	|| (
 		dev-libs/libltdl:0[${MULTILIB_USEDEP}]
 		>=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
 	)
 	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
 	>=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )"
+"
 DEPEND="${RDEPEND}
-	sys-devel/flex"
+	sys-devel/flex
+"
 
-DOCS="AUTHORS ChangeLog NEWS README"
 MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
 MULTILIB_WRAPPED_HEADERS=( /usr/include/unixodbc_conf.h )
 
@@ -32,6 +33,7 @@ multilib_src_configure() {
 	# --enable-driver-conf is --enable-driverc as per configure.in
 	myeconfargs=(
 		--sysconfdir="${EPREFIX}"/etc/${PN}
+		--disable-static
 		--enable-iconv
 		--enable-shared
 		$(use_enable static-libs static)
@@ -40,15 +42,20 @@ multilib_src_configure() {
 		$(use_with unicode iconv-char-enc UTF8)
 		$(use_with unicode iconv-ucode-enc UTF16LE)
 	)
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
 	einstalldocs
 
-	use prefix && dodoc README*
-	use odbcmanual && dohtml -a css,gif,html,sql,vsd -r doc/*
+	if use odbcmanual ; then
+		# We could simply run "make install-html" if we'd not had 
+		# out-of-source builds here.
+		docinto html
+		dodoc -r doc/.
+		find "${ED%/}/usr/share/doc/${PF}/html" -name "Makefile*" -delete || die
+	fi
 
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	use prefix && dodoc README*
+	prune_libtool_files
 }