gentoo resync : 10.02.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-02-10 15:40:27 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-02-10 15:40:27 +0000
commit: 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch)
tree: cee0a97398040001220ece3cd48c3d568bcddb4a /dev-db
parent: 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff)
59 files changed, 576 insertions, 1213 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index c71ffe518222..1dfc483af839 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/cpp-driver/Manifest b/dev-db/cpp-driver/Manifest
index 7e38ed7b855e..693923238494 100644
--- a/dev-db/cpp-driver/Manifest
+++ b/dev-db/cpp-driver/Manifest
@@ -1,5 +1,5 @@
-DIST cpp-driver-2.8.1.tar.gz 1526453 BLAKE2B 8ab4332f00a1da9f35be6fa8651ace54d71fbac76223c1665089096376dcfd6f5976beb83c25094f531786a4aa628aa4e288540ef7bcb8cc5221625dcd1ccf78 SHA512 1b303e874d6b24cb429ec92d6030880ad7d7b28b167a25c62060626c206f623863ecf58eab33e89b0efea4a474ca9500e1701b719ac203c76b0875c2b5d0a1c8
+DIST cpp-driver-2.11.0.tar.gz 9392387 BLAKE2B 37d6063b33cd9821faa15d0eb8cb7e87d3a57a58384cf60dd623f94c9246250ba00c3303d9e0ca586f5455d449c9749058e9ed5dcb06d736591329b252bc1ffc SHA512 c8ccb3b10895c3e8f3bcf9543dff233a45c468b1b5e9c9c848d651b13c1b3f76cd0edd20fbff8e6e093767e1a2c8d360447496f1ef4370c1776d3fad28a9b3a3
 DIST cpp-driver-2.9.0.tar.gz 9178108 BLAKE2B 22c51d050dc65303dd6b584f0a89e510905bf084ff5e45a543666675a4e0b904c11895c9a7dd3d0df2fb12c1e2e58e8530c4113706c8b2548adb0b6f9431419c SHA512 45c6d58b1d287d142c9d7d6b1e28114683648a3634f44b185208fa44da64d4c8a9d485b3956a0cf7429e96f74faa588de832de30265dfa17782ca90e8163a0c1
-EBUILD cpp-driver-2.8.1.ebuild 627 BLAKE2B 212092960beee408c49866469a4e45ec48535feba75ef2c3ed176bb281145ce24cd5b2ee340878d7557cd1e14f0fc8c6707e668597909bb92623f5f32bdd7240 SHA512 f423cd87d8fa5e1f42a94222b054bbba1ba2855369fe17aaa94a480515a5b3a200697a8a5570f41d7ac032ec985c370e025786cacee9b2e63e87100750a09e53
+EBUILD cpp-driver-2.11.0.ebuild 625 BLAKE2B 9bc4d78429917ad30302d8afe0f1539cfdd6d4706128ae030c65964c7fece049736e35d4de6d387a8fbe31224f64297a8e29c27d28f515802548aef2a793d2e5 SHA512 08c7097a41710733e8fc6ea7753a5c439dfb0b73ec1fc235ce374d87502f37a87b522ba4cdb03a58c2385fb0b3c1a20b87ae33fc25bad83e40fcee33f71d1f90
 EBUILD cpp-driver-2.9.0.ebuild 625 BLAKE2B ab741c2ba9d2039bbc1743d6315c8374e148b0e3fc37ef62b50514eb628ec5d53915363347b85e76a5cd0e50a491f770692c7445ef743a65aaced9087ff33096 SHA512 46374aa29a2a0d2bd213cec83ca1a4ebd24704d5ecebaff334d1c81d501937aab164640f8ce5dbb17c26c3d367f6eedaf50e0a5dbec9bac98bac28e177da85c5
-MISC metadata.xml 553 BLAKE2B 9cbe9ca09b891555c6f22e2a6da3fc24d938e5bfd30950c3f58e3e028f36a6784a0062c042b30c8215552191f9ccbb629693a059258a067effb97cd594e65fcb SHA512 7e02ca90a667319bd669dc10dbba7abc1018a1c4941fc213af728bd6b7afe48e5fca888f3f6d19798937f6fa5d8188cd784cd37f0ff690bc2295abab8ae408f8
+MISC metadata.xml 562 BLAKE2B f62a42056c94e60ae6bd2d6cb990f393d3270bde99714aecb00baea47d3bee506d297506f213090cc919b64708e199df50c54647a46d2fbfbaf00d48342d0d9c SHA512 5a38e54e8f0f5ee7c61b97b76cc7ed7fd6744a125a8733d72fdc7d3751db68b7639a0a1d8a970b8ac7908d1d095226aca0a409e9818c81d02d2e1eed4013e5a7
diff --git a/dev-db/cpp-driver/cpp-driver-2.8.1.ebuild b/dev-db/cpp-driver/cpp-driver-2.11.0.ebuild
index 454caab7dba4..9413734574c6 100644
--- a/dev-db/cpp-driver/cpp-driver-2.8.1.ebuild
+++ b/dev-db/cpp-driver/cpp-driver-2.11.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
 DESCRIPTION="DataStax C/C++ Driver for Cassandra"
-HOMEPAGE="http://datastax.github.io/cpp-driver/"
+HOMEPAGE="https://datastax.github.io/cpp-driver/"
 SRC_URI="https://github.com/datastax/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ssl libressl"
+IUSE="libressl ssl"
 
 RDEPEND="
 	dev-libs/libuv:=
diff --git a/dev-db/cpp-driver/metadata.xml b/dev-db/cpp-driver/metadata.xml
index 40d0b15e5721..6352cbeb9dfc 100644
--- a/dev-db/cpp-driver/metadata.xml
+++ b/dev-db/cpp-driver/metadata.xml
@@ -6,7 +6,7 @@
 	</longdescription>
 	<maintainer type="person">
 		<email>geaaru@gmail.com</email>
-		<name>Geaaru</name>
+		<name>Daniele Rondina</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/dev-db/cppdb/Manifest b/dev-db/cppdb/Manifest
index 5bf0db020ed3..e17e8c29db13 100644
--- a/dev-db/cppdb/Manifest
+++ b/dev-db/cppdb/Manifest
@@ -1,3 +1,3 @@
 DIST cppdb-0.3.1.tar.bz2 251449 BLAKE2B 13a59b50b53e276c3714c35a11dee09054d3017d4c60335028c1e41dece749e6b13e94cd6ca4ad40e8bd47c5530ff3310c5735b373ee7289afe657f31c6186de SHA512 19e60becbffef7a252eda5fdd5821b44c2eeb5d69e84cf46e89ed6af3cea315f3cfe7b2cc4f62fbe154be8abdad3363761dd0252f94671421010273eeae65678
-EBUILD cppdb-0.3.1-r2.ebuild 1286 BLAKE2B b202c12e33e2bcf11bb01b9299c58e28322457f4c28e4ab246efc94c95e56ce7c23d3e0ef4150284868f48da8c5cfd8d8a6aa9a1887b3c076747d82808057474 SHA512 3a32b2e277ddfd2f4ecb98d600c414a5e43785e321ab78a593757ed408fa62674a4360340a12a1dc570177e3d03987aef787d757eb29d899fe4af6a31261ea90
+EBUILD cppdb-0.3.1-r3.ebuild 1296 BLAKE2B 4d8515d26bf053571ebf2586e170699a3b6018954ca159beb2f4cc87fbb5cf40c0268b24a543c91b3598bc8241a5e636cb7adac677d216026aec095d0e197b85 SHA512 f4cf1cfb877568ea0cf36a8fcea786e0cfb688837c6618f5a91a383e514ff725a37e25bfd0ad00fc6777fe8c55a45f41559f2617e9e1b5f06da98002d88576bb
 MISC metadata.xml 767 BLAKE2B 6012059a499f2c722e9eaac433a605eb8473f047f1f78543da7a08d6fb816bc3e83726e53285303dd1c14a09c2955d8d03e6fff9a617e2cc2ead27d329eb5c9e SHA512 930b662cc22169de50ef67af931799380b229c09a0b9b82c1ace9fa0abe75a685a3c3793c02cb85ac3d8f18f6450ea178e1a097e42e4d84c024286da9cbc085a
diff --git a/dev-db/cppdb/cppdb-0.3.1-r2.ebuild b/dev-db/cppdb/cppdb-0.3.1-r3.ebuild
index b7b59c0c0d76..77cdabe6e5d5 100644
--- a/dev-db/cppdb/cppdb-0.3.1-r2.ebuild
+++ b/dev-db/cppdb/cppdb-0.3.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc examples mysql mysql_internal odbc odbc_internal postgres postgres_internal sqlite sqlite_internal"
 
 DEPEND="
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c:= )
 	odbc? ( dev-db/unixODBC )
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite:3 )
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index 9d79177f0d38..bf4c0cc4bb6d 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -6,6 +6,8 @@ AUX etcd.service 304 BLAKE2B ecffe9889f9530bf7172638a0273736abba2b3ea5c5540b5452
 AUX etcd.tmpfiles.d.conf 76 BLAKE2B e5aa0ca42dd579e9c2ac8c6bdfce83f87ec79ce64d10e20b61ab3df45918747f588b9246085fec925bb39b772e061628aadd030a23a59b65a2fc2243eca1a7f9 SHA512 7324b74dcfe050dd7fbc318ca3ce9b5d58bce8fa2ce2d2d771664ef981c834375f7cbfebcb630cd61dab2a3f6bf6c3733ad04f752beadf7bb6fedcc80ff682ce
 DIST etcd-3.3.10.tar.gz 3526904 BLAKE2B 8266212707f8fb280d55deba8dffb44e4d48b906c56034b174848fe6f237d5efba8c15ebea076d799db7f3ec560e2d188fdcc8fe26334ae1cbef0384fe8cf847 SHA512 848e241e816312307f74520b99aeabf7def6862093897035ace16cb230817d8e2681d7d2f1c1ac220d7c2b4c7c0a1262bbe3e4db927524f785de888566d2097c
 DIST etcd-3.3.11.tar.gz 3526863 BLAKE2B 5daf511e0d1d064a141a29de456aca0a837567052e3c742afc535405e04c90c70dd347b90960df2decadc53a38ceaf7acfad9346677cb17f892ece437cdf10e8 SHA512 4274c4988b6e7fe61dbcc88c88ed6647debd7a67c448b9101c77bebeef6400e65b9e2cc930f635c3f59105554411e1ac606c6a146ad6927a01d2e921b1a92949
+DIST etcd-3.3.12.tar.gz 3527586 BLAKE2B fdc4e3e9522c032d951045d4eda7f36743d4fbbb4ea8673bbe00bb38931cd7442910b0b54eeb6df0957439332df498389f3568ba7e8bdecfbd873fecfb3df86f SHA512 63ba6130bd93471260b8d90760455bccef2755e672a9df39224491188c69e4e3e8c1157cfb639c4002fb8a6d16950f7ff448a83e0acbc389162b742f3df6234f
 EBUILD etcd-3.3.10.ebuild 1945 BLAKE2B 784b63fd47b27837f2d8c344ca6318c8f54e47e24a034c068d24935c96f9867df36be67fbe406259524e989a8d17a0c1aa5210938e16363e34300afaed5e70b1 SHA512 a0f1d2555d205e46b82e8db5ebcaae808bf788c0c256f4355bd3792f8666f06bae7a6a9d6f3b24bfc6c88145a097ac1de2759a63f9e6a52c330aa4ebceb5269d
 EBUILD etcd-3.3.11.ebuild 1949 BLAKE2B 57a02f2ded70079e6da6520853058dfc5b069b3a6f965e6768bca48414cff077694b92ac2725f4fa0c6cde9bfe9938a16056a3cf73c7ae366863943a27a5115c SHA512 4370e03e5831a23aaa7826e8bd4ef73b384784ba79d4f904a73f4002e6bfcfa9d3164b20e451a59d6db49928e8fd1f59d1d501f1aa3b7110261def861e317aa3
+EBUILD etcd-3.3.12.ebuild 1949 BLAKE2B 6f0ad2fcb58afba2af80f01dc23c13af419d190e614d3027450195fbeb3e5c17d452c14c0e714c9774b0f4b0140d0f1992a554484a76be3e69fa3063147ba7ff SHA512 2861f5dcb65b7d13c4858751efbc8e9b51804fea1d87b8eea1170f90da58ebdde7839fe4d14c0e4aa5fc4824b0a5d584cbf773910ecbc9901a57fcc588988086
 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
new file mode 100644
index 000000000000..00de853590ff
--- /dev/null
+++ b/dev-db/etcd/etcd-3.3.12.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/etcd-io/etcd"
+GIT_COMMIT="d57e8b8"
+MY_PV="${PV/_rc/-rc.}"
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/etcd-io/etcd"
+SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc +server"
+DEPEND=">=dev-lang/go-1.10:="
+RDEPEND="!dev-db/etcdctl"
+
+src_prepare() {
+	default
+	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
+		-i "${S}"/src/${EGO_PN}/build || die
+	sed -e 's:\(for p in \)shellcheck :\1 :' \
+		-e 's:^			gofmt \\$:\\:' \
+		-e 's:^			govet \\$:\\:' \
+		-i "${S}"/src/${EGO_PN}/test || die
+	# missing ... in args forwarded to print-like function
+	sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
+		-i "${S}"/src/${EGO_PN}/raft/logger.go || die
+}
+
+pkg_setup() {
+	if use server; then
+		enewgroup ${PN}
+		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	fi
+}
+
+src_compile() {
+	export GOPATH=${S}
+	pushd src/${EGO_PN} || die
+	GO_BUILD_FLAGS=-v ./build || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/etcdctl
+	use doc && dodoc -r Documentation
+	if use server; then
+		insinto /etc/${PN}
+		doins "${FILESDIR}/${PN}.conf"
+		dobin bin/etcd
+		dodoc README.md
+		systemd_dounit "${FILESDIR}/${PN}.service"
+		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+		keepdir /var/lib/${PN}
+		fowners ${PN}:${PN} /var/lib/${PN}
+		fperms 0700 /var/lib/${PN}
+		keepdir /var/log/${PN}
+		fowners ${PN}:${PN} /var/log/${PN}
+		fperms 755 /var/log/${PN}
+	fi
+	popd || die
+}
+
+src_test() {
+	pushd src/${EGO_PN} || die
+	./test || die
+	popd || die
+}
diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest
index cceb00c73aba..2177fb608c1d 100644
--- a/dev-db/libiodbc/Manifest
+++ b/dev-db/libiodbc/Manifest
@@ -10,6 +10,6 @@ AUX libiodbc-3.52.8-gtk-parallel-make.patch 661 BLAKE2B f77c1184d648e4da54c05b3f
 AUX libiodbc-3.52.8-runtime-failures.patch 2033 BLAKE2B 943726b96d59fb560e1e42392d4d03c149ab55d4e237ad956f9b56d5f0a06abbab9e103412cb25423e9a1612ac2b74ff20a08e05d1561a3559559c80284e5298 SHA512 a6b921a85bf4076cf5af8744987cdd98ebc570043344e681def5a83e677e64ddc6457f86c135b33162f7248de6c9897b65978699582e0ad71cb9e696f6270142
 DIST libiodbc-3.52.12.zip 1248801 BLAKE2B e19b740904a332df7d7f510a6ef7414121e99bcbce0b89db94f4b7a09c0de09f39a8f8abdbec40029b79140fab6e1e1d319ad146cc7d74872a7fe69852a3f710 SHA512 240f6f7dc406fcc6688499bac8800b81380d32e8443e4f098875fabc649da1b86567b67d2259206be64cced8537d3171040d16be39845b9009cd90be62ae97db
 DIST libiodbc-3.52.8.zip 1188493 BLAKE2B 8439d0268b64d847c2bbb733fb203b3c2811f14dcd1cf2993472244e6430c2dac042f2b5056aed04049ba2cd139c83cd9c6c7ac6d4e1576dea58fc6e6aa0a5f0 SHA512 76da1e69a6e7ab1b7ba103547070c5dfe7c40fa88d82c243640d862c93c19e731d5a35d0575038491a148bb1d1cb7c5168dc30bf3f9600b31f4e014350f16551
-EBUILD libiodbc-3.52.12.ebuild 1653 BLAKE2B 2352ba5ce50f6fbcec3bd4e432a1d16be51985f75da5e68b06c22a8e39ff56de5f40ece36b3bd5c3dba548e23df6b737baad08a06a456532b626450cb75ca0aa SHA512 354b7a31036d59113b4cc4ec4791024c18bd880a51a50f99face6de8d4b0e5a3e9e78a5140d89092724c9b5e2f06e9859e039fc8c862976b0b7bb4dfd03f8901
+EBUILD libiodbc-3.52.12.ebuild 1646 BLAKE2B 232161ee58bb82901510cb90fd567d0f25dd80cd2934977c6c8f2d04f6459f8385363c5d1460bc60c5b7bd691a73e8ae83537bb178fd42fcd930255c6649d622 SHA512 a3b709aef88949fe04df0de1856ad7600f7cd04b1ce839c57dcc32b1ed266c36e1b4c48762daf2cab3607c9b4c214944daa350642a65e3e0d744101d861cd4aa
 EBUILD libiodbc-3.52.8-r2.ebuild 1711 BLAKE2B 5b4e8870a2e2a782bed3e1b05e22fbfac3489900320c4b73263c7e722b21136a3299219859d5788b2eb56685b76190c3fedbefbd1dceeb6871a3fe83d492b1cb SHA512 9ac4fa353299828cd7419ee5c5502434a3390db1a3f6c3558bda884cf091fa31cec34c69d2e2612985bd73c0ad97ee8dfa6bf6d96af59424f34148706475c8b1
 MISC metadata.xml 251 BLAKE2B de1fe040cd23515516e31a81c78089f5fb4b9240f43a659d0e6981665bec427ebfe5f68bbea534b92dd4352f42e366c2070d3ef3e7fc0d3beee880445d973bef SHA512 ec0eb5cbc30d0a7ad8c74612255d84a473c370d977f9be4c95904eb5281060bbe3c23d97fb9537e844bbaf90c2f6dd1fae891d44628bbca29fbecb0fe0cb8bbd
diff --git a/dev-db/libiodbc/libiodbc-3.52.12.ebuild b/dev-db/libiodbc/libiodbc-3.52.12.ebuild
index c7072ef25208..e7fc9a2c6ecd 100644
--- a/dev-db/libiodbc/libiodbc-3.52.12.ebuild
+++ b/dev-db/libiodbc/libiodbc-3.52.12.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="ODBC Interface for Linux"
 HOMEPAGE="http://www.iodbc.org/"
 SRC_URI="https://github.com/openlink/${MY_PN}/archive/v${PV}.zip -> ${P}.zip"
 
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 LICENSE="|| ( LGPL-2 BSD )"
 SLOT="0"
 IUSE="gtk"
diff --git a/dev-db/libzdb/Manifest b/dev-db/libzdb/Manifest
index 092d63112af8..5f6612f3230f 100644
--- a/dev-db/libzdb/Manifest
+++ b/dev-db/libzdb/Manifest
@@ -9,5 +9,6 @@ EBUILD libzdb-2.11.2.ebuild 1951 BLAKE2B 302b935d57edf84f87d99e32f1b44f2f0e4e85a
 EBUILD libzdb-2.11.3.ebuild 1951 BLAKE2B 302b935d57edf84f87d99e32f1b44f2f0e4e85a175774bfd90f8528095b885e45917079947c057f6cb6d4ab6da12d6233a047275012a9a0e5f1d4ada5e29218f SHA512 d928c77f97d1f974561ef951fcdb3774af7880e6a06705df21698012a747475fb64b3c44248bbe4086e13e6373b038896d35c5cc877e57f2bbc3693498799a25
 EBUILD libzdb-2.12.ebuild 1949 BLAKE2B 69c6a78a97234e1566c9b4caf7390ea4799252d7a1221639548e15f21445d0ba45ef63ed2607ddb220b622ae54cc3ba70df7a3108a769c78dcfc117c6e88b1ee SHA512 e463dc5edeec408ae42d282319b9cd4e49338fb7cf86a7c26de5ca808d9e4159fce8610f14fb881ae999626be373db4918e5f9162387f0663a7fc99cc6372ca3
 EBUILD libzdb-3.0.ebuild 1951 BLAKE2B 302b935d57edf84f87d99e32f1b44f2f0e4e85a175774bfd90f8528095b885e45917079947c057f6cb6d4ab6da12d6233a047275012a9a0e5f1d4ada5e29218f SHA512 d928c77f97d1f974561ef951fcdb3774af7880e6a06705df21698012a747475fb64b3c44248bbe4086e13e6373b038896d35c5cc877e57f2bbc3693498799a25
+EBUILD libzdb-3.1-r1.ebuild 2040 BLAKE2B 707a80236d9f9a0cf272f7349f1f3b86e54e688af920aa80f37179ffe887bf52ff3be27eb3e5caa2f8c43d216aa3b139702c8a77d1d603149f1258bd66e6c169 SHA512 fc8f600bdea08cc4120faf949add27cc72d5a5e2166e3ebc90d70b453718c9bda8302ff4e37a736f272d351e4a933d54f91d05e28f07fb51b052c3d95b45909f
 EBUILD libzdb-3.1.ebuild 1947 BLAKE2B 38bad6b83db476257e1996b547668fe6270a5bef50bd94f444cc9c79a71a57ef089961c9ab6fee965cf45da18c6adfb280eaeebe1a1d7e666b01b7c4b667f0f6 SHA512 8ce0096085f71c4a96699816cf916fc1916318a5185b48dd0975b4cfbd062d9ccd36250f47f4232c7ef83a9893ba11adc0d006f6ba9f18e9a4c8e2bb33f0011d
 MISC metadata.xml 252 BLAKE2B 607ece46067f5be04418014fa63f92ad521ce98dcd952feb4fcd1bcfcb16fd520bddb62e7f6e14486a7f45a2505cc258067adc1017af98ba9e69a78244bc62a5 SHA512 e7da72c861777d74f6459375f6f43e39f9e4dda779352c3e8942fcd658dcce6f995f016e34a74b331533f1815fba3faa9af024956a804f38a411990878e4bad6
diff --git a/dev-db/libzdb/libzdb-3.1-r1.ebuild b/dev-db/libzdb/libzdb-3.1-r1.ebuild
new file mode 100644
index 000000000000..838dc0b0f568
--- /dev/null
+++ b/dev-db/libzdb/libzdb-3.1-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A thread safe high level multi-database connection pool library"
+HOMEPAGE="http://www.tildeslash.com/libzdb/"
+SRC_URI="http://www.tildeslash.com/${PN}/dist/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc mysql postgres +sqlite ssl static-libs"
+REQUIRED_USE=" || ( postgres mysql sqlite )"
+
+RESTRICT=test
+
+RDEPEND="mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql )
+	sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	default
+	sed -i -e "s|&& ./pool||g" test/Makefile.in || die
+	# Fix detection of openssl 1.1
+	sed -i -e "s|SSL_library_init|SSL_CTX_new|" configure || die
+}
+
+src_configure() {
+	## TODO: check what --enable-optimized actually does
+	## TODO: find someone with oracle db to add oci8 support
+	myconf=""
+	if  [[ $(gcc-version) < 4.1 ]];then
+		myconf="${myconf} --disable-protected"
+	else
+		myconf="${myconf} --enable-protected"
+	fi
+
+	if use sqlite; then
+		myconf="${myconf} --with-sqlite=${EPREFIX}/usr/ --enable-sqliteunlock"
+	else
+		myconf="${myconf} --without-sqlite"
+	fi
+
+	if use mysql; then
+		myconf="${myconf} --with-mysql=${EPREFIX}/usr/bin/mysql_config"
+	else
+		myconf="${myconf} --without-mysql"
+	fi
+
+	if use postgres; then
+		myconf="${myconf} --with-postgresql=${EPREFIX}/usr/bin/pg_config"
+	else
+		myconf="${myconf} --without-postgresql"
+	fi
+
+	econf \
+		$(use_enable debug profiling) \
+		$(use_enable static-libs static) \
+		$(use_enable ssl openssl) \
+		--without-oci \
+		${myconf}
+}
+
+src_compile() {
+	default
+	if use doc; then
+		emake doc
+	fi
+}
+
+src_install() {
+	default
+
+	# the --disable-static flag only skips .a
+	use static-libs || rm -f "${D}"/usr/lib*/libzdb.la
+
+	dodoc AUTHORS CHANGES README
+	if use doc;then
+		docinto html
+		dodoc -r "${S}/doc/api-docs"/*
+	fi
+}
+
+src_test() {
+	emake verify
+}
diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index 87560f5920c5..8cc212d89df2 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -3,8 +3,10 @@ DIST LMDB_0.9.18.tar.gz 139156 BLAKE2B 6a8d32c6f203272a212d5e298f7d1af290c12a876
 DIST LMDB_0.9.19.tar.gz 143141 BLAKE2B 69f39e2194638989d8a17b79edd7918966d5608f4e611a7446b45e7321adf3b7d4bd69107fe00a1476d32cbd43b83f512c8498cefa3fca7eea8ba615821341fe SHA512 1d9825f09592ad92a540a1dec232cf6649f41cc67b0d59dc8958a71f4090f347c84995f32a166e2c2efecb862981f455814dd07af99bc3489e42fe3fd8bc6191
 DIST LMDB_0.9.21.tar.gz 143352 BLAKE2B de206eb03ebd0ed329127380a2aeac693280d9c1d7b61a4a36c42889169b28adab30ecfeff37487b9e36f4e953bc6587e54b7a49dfd0969f2dec99e45bd09654 SHA512 e0f998507da654ccac02aa199367e8363c37f47e06ee0984085aae60fb086e49087824915bf8896f90187f1cc96e5c9caf5e5f72fa3911415151ca1e56f0309f
 DIST LMDB_0.9.22.tar.gz 143468 BLAKE2B 125b447344cc601ad8af1c3cf0ba4d05474c8e7a4cafbca71446681a615884e82ae7fcdd4d8d6fdfa8e409a646115c3577972cdfcee8d792af0a1d82a8efbbd1 SHA512 49afca13b9683ed571c274380bb5e111236903b12d19bcb8781d6bbc00f711766b0d62de0b36536c85309cc9ff9e9d0aaa708e27bae9be6cfcaed8ba91e5545d
+DIST LMDB_0.9.23.tar.gz 143813 BLAKE2B 252acad974a7ed528fe0e52b8332845bc0b6076599bbc79ef2c3f41459acb6ccbe5f6030c6a258fe30633c4c0568fa05fa6d46dc05bab3f93ee3aab16e6faa89 SHA512 47466a96ce288d18d489acf1abf811aa973649848a4cac31f71e1f25ea781a055ebd6616d2d630214b2df2f146f12609c82d65be0196f49d6b46a6c96464e120
 EBUILD lmdb-0.9.18.ebuild 1239 BLAKE2B cf75faf2a5fe6fd306eb7a28c2372a3bcb3a4395fb26f80e4beb9e99799a7c2d86755b2fe5d7172a24fc40d00519ee4a70cdd179f51f836853950311ae8d2549 SHA512 18b2c236625e0fd311521148dfd029a74c428459ab61847105d9e27cf2a602bf107af9147d11ada60a1efd972e29ea26ea59f7d7bd9848cf2dc145a05967fff9
 EBUILD lmdb-0.9.19.ebuild 1849 BLAKE2B d9e235c2aa7ff06d2b6cdf6b6e29544a02d1aaa7ae7248afdf661c3ba4ea0ddbb0e7ed9ec7796e73b1865a430a2a8380236a3206e54a8eca054ba95ff9e1d820 SHA512 791cca180d0d429d64f197a627dd8d94c48e8502d38011be358fc901e521cdb3996653b2cc0c519b9e1e5a58815134e99e64f09d50bcc72444eb2990ac2879ad
 EBUILD lmdb-0.9.21-r1.ebuild 1960 BLAKE2B b2686f3859333a1f60b4e1053e40e7214ed3196e35b88956ada044f6655c7ae3a472e999db56d08bfeeb3d6520853b1091dc6d8a321827e67903c87e8aebbe15 SHA512 288aec449c08655fe4572451f2960cd6c489158198fc787cb5ec3bd489578995f651bd5d13c36924ef35c2497dd157ae46a78dc9b5e18b31f913753a2a8157bf
 EBUILD lmdb-0.9.22.ebuild 2322 BLAKE2B 119d9c927f512ecb24aaeaba41641e3fa7bcfe99a9a2c31f27a6152d6a7d1976ec139677ea90a26e3e76f1aa011e16a554d7ca10391ca4d919de56649916f4a8 SHA512 c7f3540619dc06ef582539730f5060c1a2e784c410b91c7fc977749c3e78829e59cf424b6c9c15700168a22f48b22ae554700961374f42f339cd352c50d8c6d9
+EBUILD lmdb-0.9.23.ebuild 2284 BLAKE2B 04a9d94b39c25ab9360c0141339329898bbcc4839a0fa13240461e2b67a9b352b08ee1c546c828be3d03668bbcf3d18fc5dd69b1e81bf2b1f2dde5e051a866f9 SHA512 37f81b1ee1edcebf9b7bb4a87c7c79a42839470bc8c8d4fc6e3ea9e771a95546eca32f60d33a12167efcee420adb46c0c783a8300a0a2f574781e78aa6097245
 MISC metadata.xml 540 BLAKE2B b064697aa562165a627cb1be8cce847c8046d10cf184a4563a632c43ebd1916ad866e843efd49ae5659e379f3695514005b9d601117719c9f48652dab48dcea8 SHA512 7ff1fddaca73c5d7b4a6a9ada9a7aad60e16c8c7063ad5cd9cf57301f504f6e0fe53bf568dec83abf522c2c099d2b3b2463619df17077ebaa3b39bd67bd738c4
diff --git a/dev-db/lmdb/lmdb-0.9.23.ebuild b/dev-db/lmdb/lmdb-0.9.23.ebuild
new file mode 100644
index 000000000000..65a2931f0dd3
--- /dev/null
+++ b/dev-db/lmdb/lmdb-0.9.23.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
+HOMEPAGE="https://symas.com/lmdb/technical/"
+SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
+
+LICENSE="OPENLDAP"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PN}-LMDB_${PV}/libraries/liblmdb"
+
+src_prepare() {
+	eapply_user
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -lt 10 ]] ; then
+		# posix_memalign isn't available before 10.6, but on OSX
+		# malloc is always aligned for any addressable type
+		sed -i -e '/(__APPLE__)/a#define HAVE_MEMALIGN 1\n#define memalign(X,Y) malloc(X)' mdb.c || die
+	fi
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local soname="-Wl,-soname,liblmdb$(get_libname 0)"
+	[[ ${CHOST} == *-darwin* ]] && \
+		soname="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/liblmdb$(get_libname 0)"
+	sed -i -e "s!^CC.*!CC = $(tc-getCC)!" \
+		-e "s!^CFLAGS.*!CFLAGS = ${CFLAGS}!" \
+		-e "s!^AR.*!AR = $(tc-getAR)!" \
+		-e "s!^SOEXT.*!SOEXT = $(get_libname)!" \
+		-e "/^prefix/s!/usr/local!${EPREFIX}/usr!" \
+		-e "/^libdir/s!lib\$!$(get_libdir)!" \
+		-e "s!shared!shared ${soname}!" \
+		"Makefile" || die
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# fdatasync lives in -lrt on Solaris 10
+		[[ ${CHOST#*-solaris2.} -le 10 ]] && append-ldflags -lrt
+	fi
+}
+
+multilib_src_compile() {
+	emake LDLIBS+=" -pthread"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	mv "${ED}"/usr/$(get_libdir)/liblmdb$(get_libname) \
+		"${ED}"/usr/$(get_libdir)/liblmdb$(get_libname 0) || die
+	dosym liblmdb$(get_libname 0) /usr/$(get_libdir)/liblmdb$(get_libname)
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins "${FILESDIR}/lmdb.pc"
+	sed -i -e "s!@PACKAGE_VERSION@!${PV}!" \
+		-e "s!@prefix@!${EPREFIX}/usr!g" \
+		-e "s!@libdir@!$(get_libdir)!" \
+		"${ED}"/usr/$(get_libdir)/pkgconfig/lmdb.pc || die
+
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/liblmdb.a || die
+	fi
+}
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index 670b38b491b9..0c4089b880fd 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -6,11 +6,9 @@ AUX mysql++-3.2.3-mariadb-10.2.patch 630 BLAKE2B ca95d9f9d62368b91ecab34a8a78a52
 AUX mysql++-3.2.4-as-needed.patch 18441 BLAKE2B e752974f029ffbf0dba21d9dff5fc3979abef49a517900345ea4ed632f854cfe5fdbe1c41760df05c5e3109ff14ee7ce7bbd30ac37c27c4d42c58e2bf84fbb45 SHA512 789e07b85d3908cc7956b29e8135653eac280de0736002566377cdf3d81ac11a13c0c7a4899343e44fb260bd49c93bb4b04a0ce3f2324f95293b74ee6de487b9
 AUX mysql++-3.2.4-only-unit-tests.patch 331 BLAKE2B d3bee079ad466aa3f2e21d831a4ee77959c8a1f2d1ea9124f17dd081a7d39a99433c9c8dba10a8638fe72f4e0ccd8cf02751c3b036c9082a1351374a19e089e4 SHA512 02bb7a370a3f7eafd9111c01e6073a71d33f53d59eb7d8e04a40415ab2fc88011a1b2c79cba455b976b03613597d49f9256cdacfb3b984767959a707bf3ba7b0
 DIST mysql++-2.3.2.tar.gz 1627115 BLAKE2B 058ed41485474e4283a7200aa57398e85162f697f017ccfde7974b85457bb827d17bfdd522ef46818d42a75751a0eeb6ade39ded73e0265ee6811eb2769df3ea SHA512 b546c8369550e541c1a0b1b0e301fdd298a771cb709ad6c6ea3450a8f8bbe7533989a82d1c19cd9bf9a261d7a1fc4c3760919d3d5e3e43b5d698b75b7abf07f7
-DIST mysql++-3.2.1.tar.gz 2256735 BLAKE2B 8d5e713926a405fa9b93af690554595d8cc79cc25af216103df241f549fd93e7fa051ef5f1a27e7c67825408b8310886bedaeb69bd80b6ea6cf1c320a94cc9d2 SHA512 936021dcf8568d3ee0c935e5c552acc6fd2b57849d1cc60e68b45b690d798d7bfbc1dedc04e21417d1b4c27017b471e4f6cb70de7f1904949b9222090a777de9
 DIST mysql++-3.2.3.tar.gz 3241023 BLAKE2B 5faa5711c7ed7c64346013bd1ca6e7dc20e5b23d33983a719c892bbd1002f3986206df6cfef54316f11aa480f18dbc0a2cf6944f9572f3a7dca24cdb73099eb9 SHA512 b6b0a9856ede9e5e08be0f5ed1689b1256f8cf31c3afbb9c9e7f68d0734380e25909ef31cd04be6b253c86b2f881df10f3793a2d3e32042375dbbab4b0700d0a
 DIST mysql++-3.2.4.tar.gz 4594696 BLAKE2B 7e0553b0e22bb3607a914fc7756ec192465af546749b0147a97558fb3d397e504f4552dcbc783f5bcc934e51fd1dac863e5479c4af3053d394a51c94cd825ee0 SHA512 69e23c211240854b59951bdb1cecc57f2f818d822a977942177e65195900dbdcc62d598c3e90c18f4a0a37e5340df7a149719c45b791de59c03d1f1259c5f4fd
 EBUILD mysql++-2.3.2-r1.ebuild 1410 BLAKE2B 6acbf4805dc44570d1d1b9df9a1c8769d3c13c9658b74cbad2052313d0538552693da45f2558be1afea78f80d6492ec36a9c02389ecbc054c60610ad521030eb SHA512 badefe7d214bd55b81965070b814b94c15fe3635d87c265225d2f9fef02360c3e09adeeb79a75c9990e89d596f111fc958c2a5fcec63624f14404192e4a26884
-EBUILD mysql++-3.2.1.ebuild 901 BLAKE2B 0e6c3feef947f749d7124284dad8ce91d14fed57d7a24730482dea19646a8b675113577138d4d81dd3e803df74f13a91fe40b1959fa145bf676b8d301a24d588 SHA512 6a2029dab230cf4c1e4c344362ef7ae8204775a1dd898da6d5bbe274c3b5ad1b1d223eb6e4b4c5915b87b7c6b401c40b3630c8aa0546d4c0192ba418f4d1cf31
 EBUILD mysql++-3.2.3.ebuild 1556 BLAKE2B 8bcedbe3e000c0132610b7347329e62d0d82adc00be4b34e5333c274140ea682e3300b471dcf08a7e661e9df801fc6820b6771e7d41d0c74968856deb9375bde SHA512 4b04105492d20515ad98db286d9746b6ab1fe0d38a49c7de870cf19ab5d6dc2579303aa36b7216caeceb58ff17668fa4149b9a762612b0ca203adafda7145898
 EBUILD mysql++-3.2.4.ebuild 1704 BLAKE2B c67e5a1e752602037503871f061f6a0430af178beab1c8fe293b19f903afbc78a62f602e8fa1af1c2812c0c938b540a99f0c25dd37ea782b9815237cfe8b4036 SHA512 7358abde75d8f9b57487955a75c7718d383b2ef0aea9094a9bce3affd8151ed94c509e884dea6b10b9d8d709fa893fcb0153e26520375410661045ed198013b2
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql++/mysql++-3.2.1.ebuild b/dev-db/mysql++/mysql++-3.2.1.ebuild
deleted file mode 100644
index 1ea7dc61f868..000000000000
--- a/dev-db/mysql++/mysql++-3.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="C++ API interface to the MySQL database"
-HOMEPAGE="http://tangentsoft.net/mysql++/"
-SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0/3"
-KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=virtual/mysql-4.0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gold.patch"
-	epatch_user
-	sed -i -e "s/mysqlclient_r/mysqlclient/" "${S}/configure" || die
-}
-
-src_configure() {
-	local myconf="--enable-thread-check --with-mysql=${EPREFIX}/usr"
-	econf ${myconf}
-}
-
-src_install() {
-	default
-	# install the docs and HTML pages
-	dodoc CREDITS* HACKERS.txt Wishlist doc/ssqls-pretty
-	dodoc -r doc/pdf/ doc/refman/ doc/userman/
-	dohtml -r doc/html/
-}
diff --git a/dev-db/mysql-super-smack/Manifest b/dev-db/mysql-super-smack/Manifest
index 5c9b8060def4..f81086391ac9 100644
--- a/dev-db/mysql-super-smack/Manifest
+++ b/dev-db/mysql-super-smack/Manifest
@@ -4,6 +4,5 @@ AUX mysql-super-smack-1.3-gen-data.patch 2265 BLAKE2B 42f85a5779968d13262ddf3b72
 AUX mysql-super-smack-1.3.amd64.patch 702 BLAKE2B e986f6c487d05c9de0ee3f3a397a2c63d21c05209efc48e8fa173975b88839baa6100150d0cdd6df42b7435cc8a411b5235cf92a586850ae3d57cb564a8b95a8 SHA512 5ac9c130534d5cea6caa70f6373850181ae81c68c1eb3cb9e7a774bdeeafdf822582fe9cb548b9eb1268a2b4edc516461b95238454abefcdd25677066d720da9
 AUX mysql-super-smack-1.3.gcc4.3.patch 241 BLAKE2B 5f7dae8deb353e6129cedc5a085b933928caf3731b3ad673a56366886ece5cd8b60fdc78657bc3b0925dd171fbeba7e6df24261524efbc6f40ef9b473a11cf9f SHA512 500d8e7ee919b5359b14d22a2e9d26c0ed8cd0936376cd5179be3a92f99c753dd4b3a6cdee417468721a60aa727e09763aff64ce055e43c7ccd52b4937aaff30
 DIST super-smack-1.3.tar.gz 155375 BLAKE2B aabcd6ab6c7da0e847c734bd57b7228a0c37f41aac789e63a8285b5a0fb43360101728ff6a2dc84b63cf9c0b5361770aa909382f9e2f50abdc2ea1e8407f835b SHA512 5343fa78bdf483c1019c9e25d1fdb15581342d49b863a536eb1cf8c38bde5641fdf135fe5a8ec87f74051fd9766b2f5e4f09f963afe2eb1cd7ea41edfa260920
-EBUILD mysql-super-smack-1.3-r3.ebuild 1506 BLAKE2B 546c700c3a9c1b07e3e9da2baeeae7b055d5c30191bc1b76f4ddc600411b8d741adb535a807d6936fad4a82e187200ea239dd7c83c066ab94a2fc8271c475505 SHA512 7cf407a3535cbe44071fc52443ed01443970c264b83dc84de646408a924a9ea7f6951a720a83bb45f65a6721096f3d4290b85aecc52c4f3eb08a1138533fadfa
-EBUILD mysql-super-smack-1.3-r4.ebuild 1659 BLAKE2B 493110efb66b46237a1c079e2ee02ce4f90b52a0f3164c9c32cc7e919688a57025f5408d78bcf47687668abdbeba6b1c513353ba6169ad64638b776e23bff8be SHA512 9d5c2d7cc5843325257087b103cda8e3d11a7e128ffdf2c5cc0d733e3858a84b59908e2eab8939a5e8914e5346340ff0b5f90589dfdc8f93efbf03361a034268
+EBUILD mysql-super-smack-1.3-r4.ebuild 1654 BLAKE2B 3650bff6eae5f0e512f9971b6b8ce99c16fdf8068aba0c83d8de264e1561c319ac7f433741fb5b08d31569ec16615d6b58c2d73685dcd814b9db3d636f26ac68 SHA512 f5b78b4d4a81d6d6b7bf75d05bdb555f4ec59ecf594cb5706f11c2ae24f8760c43d87c43c9b18e4f8bbf08de0b08f629ce81fa95567030952f356ab5306730ed
 MISC metadata.xml 318 BLAKE2B 93f00d35a0b2e5d19bc3d697fb4e3c9d68a91d8a215b97570f9ce106d2a811c7d0d7a415851660157d6767d0cdc179c8451598b58c48868076db79d71ee537cd SHA512 4c4e7510b5c21355fc41f1a4b2b11400a1367b6e6420b3ae4607a2797cbad29ab5385b5c6b1845f126598a94b070efdd6c16cccf255a15a0154c36ed383ff122
diff --git a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r3.ebuild b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r3.ebuild
deleted file mode 100644
index d7cbc48eae64..000000000000
--- a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-WANT_AUTOMAKE="1.13"
-AUTOTOOLS_AUTORECONF="YES"
-#AUTOTOOLS_IN_SOURCE_BUILD="YES"
-
-inherit eutils autotools-utils
-
-MY_PN="super-smack"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL"
-HOMEPAGE="http://vegan.net/tony/supersmack/"
-SRC_URI="http://vegan.net/tony/supersmack/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+mysql postgres"
-REQUIRED_USE="|| ( mysql postgres )"
-
-DEPEND="mysql? ( virtual/mysql )
-		postgres? ( dev-db/postgresql[server] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.destdir.patch
-	"${FILESDIR}"/${PN}-1.3.amd64.patch
-	"${FILESDIR}"/${PN}-1.3.gcc4.3.patch
-	"${FILESDIR}"/${PN}-1.3-gen-data.patch
-	"${FILESDIR}"/${PN}-1.3-automake-1.13.patch
-)
-DOCS=( CHANGES INSTALL MANUAL README TUTORIAL )
-
-src_prepare() {
-	# Clean up files so eautoreconf does not pick up any
-	# deprecated autotools macros.
-	rm acinclude.m4 aclocal.m4 acconfig.h config.status config.h || die
-	mv configure.in configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(usex mysql --with-mysql "")
-		$(usex postgres --with-pgsql "")
-		--with-datadir=/var/tmp/${MY_PN}
-		--with-smacks-dir=/usr/share/${MY_PN}
-	)
-	autotools-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "The gen-data binary is now installed as super-smack-gen-data"
-}
diff --git a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r4.ebuild b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r4.ebuild
index cece7edde03f..453fcaa21ab9 100644
--- a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r4.ebuild
+++ b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+mysql postgres"
 REQUIRED_USE="|| ( mysql postgres )"
 
diff --git a/dev-db/ocp/Manifest b/dev-db/ocp/Manifest
index 8016219761ab..973d7f819ce1 100644
--- a/dev-db/ocp/Manifest
+++ b/dev-db/ocp/Manifest
@@ -1,4 +1,6 @@
 DIST ocp-0.2.tar.gz 144968 BLAKE2B 495b2af182768a0c18b08350fb77b09964be52afd72f3ff610ed6a0a54905b116744c93c6261986ca48a0a0c56fd23fd2d15d1919f4c8a4ff8b55ebe532efa07 SHA512 0ff132a368a615c2a8e8ecb391da138ce9fd52d638de82e5a4d1c9ec3340b117c9c4d8f971ee86724664f93b4073b189407c3c19a0c22c961922145d30221c85
+DIST ocp-0.3.tar.gz 156447 BLAKE2B 0c7f8743fe4ae46c3b9d95847e39c51fd1b829af9e9a7e87f3b7a59ab146a89ccf0913bebc3b1c0ef985b0faf24152756dc73f243217e4d2dcf8013de342ed27 SHA512 1af862f21cc3572344d26b6765a93e4e9c8744e01d550a36647afbe690886717e3fb1d8264832563161d65d04c41fe183dd8b518320df959fd3aa4ebbe602d38
 EBUILD ocp-0.2.ebuild 732 BLAKE2B 4d7301cfb319b4e40650ff6c9995d7f9807bfda90e581699cea845557f56aae666a1aedfea375e2d2e24009028cb11adf59147d419bba2c1e2765b4211cb74b0 SHA512 447f0a33d07797e6dd5fbe5fc7f62ddbe853e4d038f5ba1da148c92311d38ba19289c17166c5f4a9fafacb7e22eb4ecbfafe60dfff18cfbc6ccfae29c73c287a
-EBUILD ocp-9999.ebuild 648 BLAKE2B 8484d73d462b4a676e43902796072e831834dcbbd2eb833197fdde8425d037590ec513d3cce6739451c964b22da47911a36761fa908b47a7859fd11fe98f7773 SHA512 7163ce5d60b0961e517f5cb19c344c35fb052f2a6524522bec6657d1816a8f0ea48eaf085b833e4ced42a5e2f369c0377081bebef73caae5be10d1203d1e6101
+EBUILD ocp-0.3.ebuild 678 BLAKE2B 17b27bd004c3029dbf9e7fbb407402cabf34b0e7e99b6e6b0244df1dfbdf7320ba138bdff2b353ca55e05a6bc84d1a3a5db1adbf105a0f236ca079b563217e1f SHA512 d13112e8baf2d66602219122b33d375c7816ca289e2f0c652fee7b3b30c974ae99441c979d03ba5a7733c6f3e497017eb3426d47e9fb4acfe3c1c6a164df9114
+EBUILD ocp-9999.ebuild 678 BLAKE2B 17b27bd004c3029dbf9e7fbb407402cabf34b0e7e99b6e6b0244df1dfbdf7320ba138bdff2b353ca55e05a6bc84d1a3a5db1adbf105a0f236ca079b563217e1f SHA512 d13112e8baf2d66602219122b33d375c7816ca289e2f0c652fee7b3b30c974ae99441c979d03ba5a7733c6f3e497017eb3426d47e9fb4acfe3c1c6a164df9114
 MISC metadata.xml 614 BLAKE2B 218c867c70ad619570c2c9ce97bc8fc5ea1ba9b121db0e05e0fb3046d7b4e7fcd3e467fbeb57d72715604d1c457b4aa44649a78587d29c61b9a63d19775f3b9e SHA512 33281a9bb09cfd13ecae433df9612587d56befe35f81e50d88164b0b4caf997f404c613ae456b497fc934fae9b4837846a18a2cf714c49bbc0b0b6eb920fa77d
diff --git a/dev-db/ocp/ocp-0.3.ebuild b/dev-db/ocp/ocp-0.3.ebuild
new file mode 100644
index 000000000000..5c6591bf5df3
--- /dev/null
+++ b/dev-db/ocp/ocp-0.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Oracle copy tool"
+HOMEPAGE="https://github.com/maxsatula/ocp"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/maxsatula/ocp.git"
+	EGIT_BRANCH="develop"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/maxsatula/ocp/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-db/oracle-instantclient
+	dev-libs/popt
+	sys-libs/zlib"
+DEPEND="
+	dev-db/oracle-instantclient[sdk]
+	${RDEPEND}"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == *9999 ]] ; then
+		eautoreconf
+	fi
+}
diff --git a/dev-db/ocp/ocp-9999.ebuild b/dev-db/ocp/ocp-9999.ebuild
index baab9a6071ec..5c6591bf5df3 100644
--- a/dev-db/ocp/ocp-9999.ebuild
+++ b/dev-db/ocp/ocp-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Oracle copy tool"
 HOMEPAGE="https://github.com/maxsatula/ocp"
@@ -20,10 +20,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-db/oracle-instantclient-basic
+	dev-db/oracle-instantclient
 	dev-libs/popt
 	sys-libs/zlib"
-DEPEND="${RDEPEND}"
+DEPEND="
+	dev-db/oracle-instantclient[sdk]
+	${RDEPEND}"
 
 src_prepare() {
 	default
diff --git a/dev-db/opendbx/Manifest b/dev-db/opendbx/Manifest
index 871f4e3d67f2..8caf0cab6098 100644
--- a/dev-db/opendbx/Manifest
+++ b/dev-db/opendbx/Manifest
@@ -1,7 +1,8 @@
+AUX opendbx-doxy.patch 1557 BLAKE2B 260c5578e22a751f59308d9dc3f94017951f24775c5dc52d3e4e512380244e5d7266704aae43119267c1726a08c086658c7c0e89bbcb66f671507712d9e2c9ba SHA512 f98f1b1014a44713c1cc5adf46fba8af5333c97faf765e8d1e6c0eb4772650c7524f4c8a90cffe6bbdb4c688beb6bac3eb2755105164002f3e85797adb135004
 DIST libopendbx-1.5.0.tar.gz 583894 BLAKE2B c427bf8d79df6b83d0ce940d974625bd9b54e49e502f864d244a780185b6321f84a6b779e09b603a71ca26549844001268f0357169e9a74e742b9c2668e4b3ec SHA512 7e4e9b8c62fd981276f6747f8184d7e34d743b866bfd76c8126a16371b50dc682177fd563212333d2dbebe2128d0b1527fc69029833329ba8cc0311308fa9bb5
 DIST opendbx-1.4.5.tar.gz 582915 BLAKE2B 7a11947f73ba3a3d407fecf7600589b64a6a80b82f24720ae613d1dc7044e7efe3af8fe273c0cdb043923af2cee1913766054eff3267243345b89c6977124be6 SHA512 e46289f9a7eb8b6e4084863834f8c4ca080eb3343b5f9d5837c476bab0a39e798a6364c8648f9fb53e52ab60cae57749b9f7e9bd23cb95b8ff21160f1bf4247e
 DIST opendbx-1.4.6.tar.gz 587514 BLAKE2B 0a6c983ac1ebdc3ad9390185938f32e13ba9ff2ced6d41390421e1e3a1e9eb639a85d89da7ce2dd67f05fd2fcaebb2f53146f43678e548511403d8cdc4de88da SHA512 dd6d53d29157057dbf4e273fd82c7694e8bc626d3409d6ab9c25627a0fec96418326550fa8004b5341facdc4cd8aae12516224e8bb84e2562482885780ff0e55
-EBUILD opendbx-1.4.5-r1.ebuild 1673 BLAKE2B f16733bc1218209340872d61688ca95a9c9ee2d73af3c5332a1bcb09f4bafa4ab1f423a5495c49b1c9b5d3c6abb6320213622d54cfa0add5e2dd5514fcc26d8e SHA512 995797952cf91405528206c23afbf9cd50eceda44a17c6885752c0ac66fa42c7d42b4079e24ebd2eaa8d288e604651b4a5fb896e7bc365fdd54e5b1f9dabd8b4
-EBUILD opendbx-1.4.6-r1.ebuild 1748 BLAKE2B 9cbb80ce927f4230d893698f3a4a48ce8fff14ddfa072b74fabb33e5dd64981ca7e7d867e5b87092a4beb3540d30181264c00296aa23964a62ac0481befa344b SHA512 3aeab5356de54c8eae21e5628d542e6d04ff858c11cc94da38146bbf2f06c006b86f5c83379db3623688c015d585bb8b0f10db18dcd7a2dc3e88366459e681dc
-EBUILD opendbx-1.5.0-r1.ebuild 1816 BLAKE2B 4350d0bb7f28b8a7c6534504ee13d9b8ea5b12fd3a33465321ca4fe5aa1ea0ebe285180fb8d2cbaa954106076b1c1d1a972c6ddf6c209544c5c971f98b38e329 SHA512 423100bc613fd0258f883001c39dcac9e6720437bd42729ce7a9ae062b837788cab630f6917042a01a994884c21587c557a8c410ac0c48ec8650d1e4d33ca56e
+EBUILD opendbx-1.4.5-r1.ebuild 1602 BLAKE2B c60c9934a2be4e82de7699d60d0f17a26f272621f285ac7773b2204354528b861b3649fd6d36b96e82ea57a6d87e6ec68ccf48e908eb3f7cbfb17cbcc5f067b7 SHA512 951c6404d3599c47cf81fb2f4655aa000b3991c9df0eea4ea6b81f7a2f3e21342c6417863c48971c9e924fbfbc92be1833303a520ed683a2a3cf32a5a0f988a5
+EBUILD opendbx-1.4.6-r2.ebuild 1604 BLAKE2B 1e77a1b530d45461925490e089846ade568083cde20953b0cd1b79adae6173dd0513f54e72bc30008b8f080b4c679a04ff04e02bdb22e2d8bd2528764e75dd3b SHA512 6ef51b6ae514c238b57a82f785145eb96d6430dde6c011087491328b8fb7817b722f0223cef31f6bfcf253632e7a9014345015d0ce7cb3db24f3b392c86b7a8a
+EBUILD opendbx-1.5.0-r2.ebuild 1672 BLAKE2B 306102765d9f0a879490988bba0c5d2fa69e14fc5bae6d6e27943376278bbfd49412b90e8a497b8dcc4090d047cae6559d1c690e8e19c68f236d167f8d6918c2 SHA512 0be32ee80a73b302f33cf7024b9d11d5432f6d766de2c1144f14b48b13faa02e64121b06aea35b7c3a0509f5091076fae6ff1a462aa503f158544f11439f6a80
 MISC metadata.xml 243 BLAKE2B 1d641d0445b6ef43e1ca3ca3f967b0580b0a5ba444509e092a8a51bba18564136091c2dacd69ed723e36cb851b3962176a8aca06d3b2e604cf089c4983dbb7f5 SHA512 2bbd30d145173aa1c10a47ec43bfc1f6b1aeda4b25ec40e534d08a35fc9a63ba9ba7826204cf4d561566ea0678f2d865cb7a947814f5e5e436a839d750f2db2e
diff --git a/dev-db/opendbx/files/opendbx-doxy.patch b/dev-db/opendbx/files/opendbx-doxy.patch
new file mode 100644
index 000000000000..d95712bcf704
--- /dev/null
+++ b/dev-db/opendbx/files/opendbx-doxy.patch
@@ -0,0 +1,45 @@
+--- a/doc/Doxyfile.in	2009-07-13 16:30:48.000000000 -0400
++++ b/doc/Doxyfile.in	2019-02-08 13:22:51.088064431 -0500
+@@ -46,6 +46,8 @@
+ DISTRIBUTE_GROUP_DOC   = NO
+ SUBGROUPING            = YES
+ TYPEDEF_HIDES_STRUCT   = NO
++EXTENSION_MAPPING      = no_extension=C++
++
+ #---------------------------------------------------------------------------
+ # Build related configuration options
+ #---------------------------------------------------------------------------
+@@ -75,7 +77,6 @@
+ ENABLED_SECTIONS       =
+ MAX_INITIALIZER_LINES  = 30
+ SHOW_USED_FILES        = YES
+-SHOW_DIRECTORIES       = NO
+ SHOW_FILES             = YES
+ SHOW_NAMESPACES        = YES
+ FILE_VERSION_FILTER    =
+@@ -182,7 +183,6 @@
+ HTML_HEADER            =
+ HTML_FOOTER            =
+ HTML_STYLESHEET        =
+-HTML_ALIGN_MEMBERS     = YES
+ GENERATE_HTMLHELP      = NO
+ GENERATE_DOCSET        = NO
+ DOCSET_FEEDNAME        = "Doxygen generated docs"
+@@ -235,8 +235,6 @@
+ #---------------------------------------------------------------------------
+ GENERATE_XML           = YES
+ XML_OUTPUT             = xml
+-XML_SCHEMA             =
+-XML_DTD                =
+ XML_PROGRAMLISTING     = YES
+ #---------------------------------------------------------------------------
+ # configuration options for the AutoGen Definitions output
+@@ -276,7 +274,7 @@
+ MSCGEN_PATH            =
+ HIDE_UNDOC_RELATIONS   = YES
+ HAVE_DOT               = NO
+-DOT_FONTNAME           = FreeSans
++DOT_FONTNAME           = Helvetica
+ DOT_FONTPATH           =
+ CLASS_GRAPH            = YES
+ COLLABORATION_GRAPH    = YES
diff --git a/dev-db/opendbx/opendbx-1.4.5-r1.ebuild b/dev-db/opendbx/opendbx-1.4.5-r1.ebuild
index c069c4e62341..6def19a1ee09 100644
--- a/dev-db/opendbx/opendbx-1.4.5-r1.ebuild
+++ b/dev-db/opendbx/opendbx-1.4.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-inherit flag-o-matic multilib
+inherit flag-o-matic
 
 DESCRIPTION="OpenDBX - A database abstraction layer"
 HOMEPAGE="https://www.linuxnetworks.de/doc/index.php/OpenDBX"
@@ -15,28 +15,22 @@ KEYWORDS="amd64 x86"
 IUSE="firebird +mysql oracle postgres sqlite"
 RESTRICT="firebird? ( bindist )"
 
-DEPEND="mysql? ( virtual/mysql )
+RDEPEND="mysql? ( dev-db/mysql-connector-c:0= )
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite:3 )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	firebird? ( dev-db/firebird )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND} app-doc/doxygen app-text/docbook2X"
 
-pkg_setup() {
-	if ! ( use firebird || use mysql || use oracle || use postgres || use sqlite )
-	then
-		ewarn "You should enable at least one of the following USE flags:"
-		ewarn "firebird, mysql, oracle, postgres or sqlite"
-	fi
+REQUIRED_USE="|| ( firebird mysql oracle postgres sqlite )"
+
+PATCHES=( "${FILESDIR}/${PN}-doxy.patch" )
 
+pkg_setup() {
 	if use oracle && [[ ! -d ${ORACLE_HOME} ]]
 	then
 		die "Oracle support requested, but ORACLE_HOME not set to a valid directory!"
 	fi
-
-	use mysql && append-cppflags -I/usr/include/mysql
-	use firebird && append-cppflags -I/opt/firebird/include
-	use oracle && append-ldflags -L"${ORACLE_HOME}"/lib
 }
 
 src_configure() {
@@ -48,6 +42,10 @@ src_configure() {
 	use postgres && backends="${backends} pgsql"
 	use sqlite && backends="${backends} sqlite3"
 
+	use mysql && append-cppflags -I/usr/include/mysql
+	use firebird && append-cppflags -I/opt/firebird/include
+	use oracle && append-ldflags -L"${ORACLE_HOME}"/lib
+
 	econf --with-backends="${backends}"
 }
 
diff --git a/dev-db/opendbx/opendbx-1.4.6-r1.ebuild b/dev-db/opendbx/opendbx-1.4.6-r2.ebuild
index b438b36edf6d..f3c0607e740f 100644
--- a/dev-db/opendbx/opendbx-1.4.6-r1.ebuild
+++ b/dev-db/opendbx/opendbx-1.4.6-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-inherit flag-o-matic multilib
+inherit flag-o-matic
 
 DESCRIPTION="OpenDBX - A database abstraction layer"
 HOMEPAGE="https://www.linuxnetworks.de/doc/index.php/OpenDBX"
@@ -15,28 +15,22 @@ KEYWORDS="~amd64 ~x86"
 IUSE="firebird +mysql oracle postgres sqlite"
 RESTRICT="firebird? ( bindist )"
 
-DEPEND="mysql? ( virtual/mysql )
+RDEPEND="mysql? ( dev-db/mysql-connector-c:0= )
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite:3 )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	firebird? ( dev-db/firebird )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND} app-doc/doxygen app-text/docbook2X"
 
-pkg_setup() {
-	if ! ( use firebird || use mysql || use oracle || use postgres || use sqlite )
-	then
-		ewarn "You should enable at least one of the following USE flags:"
-		ewarn "firebird, mysql, oracle, postgres or sqlite"
-	fi
+REQUIRED_USE="|| ( firebird mysql oracle postgres sqlite )"
+
+PATCHES=( "${FILESDIR}/${PN}-doxy.patch" )
 
+pkg_setup() {
 	if use oracle && [[ ! -d ${ORACLE_HOME} ]]
 	then
 		die "Oracle support requested, but ORACLE_HOME not set to a valid directory!"
 	fi
-
-	use mysql && append-cppflags -I/usr/include/mysql
-	use firebird && append-cppflags -I/opt/firebird/include
-	use oracle && append-ldflags -L"${ORACLE_HOME}"/lib
 }
 
 src_configure() {
@@ -48,16 +42,20 @@ src_configure() {
 	use postgres && backends="${backends} pgsql"
 	use sqlite && backends="${backends} sqlite3"
 
-	econf --with-backends="${backends}" || die "econf failed"
+	use mysql && append-cppflags -I/usr/include/mysql
+	use firebird && append-cppflags -I/opt/firebird/include
+	use oracle && append-ldflags -L"${ORACLE_HOME}"/lib
+
+	econf --with-backends="${backends}"
 }
 
 src_compile() {
 	# bug #322221
-	emake -j1 || die "emake failed"
+	emake -j1
 }
 
 src_install() {
-	emake -j1 install DESTDIR="${D}" || die "make install failed"
+	emake -j1 install DESTDIR="${D}"
 	dodoc AUTHORS ChangeLog README
 
 	rm -f "${D}"/usr/$(get_libdir)/opendbx/*.{a,la}
diff --git a/dev-db/opendbx/opendbx-1.5.0-r1.ebuild b/dev-db/opendbx/opendbx-1.5.0-r2.ebuild
index e377a26c8c0a..9f23d103a95d 100644
--- a/dev-db/opendbx/opendbx-1.5.0-r1.ebuild
+++ b/dev-db/opendbx/opendbx-1.5.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-inherit flag-o-matic multilib
+inherit flag-o-matic
 
 MY_PN="lib${PN}"
 MY_P="${MY_PN}-${PV}"
@@ -18,30 +18,24 @@ KEYWORDS="~x64-solaris"
 IUSE="firebird +mysql oracle postgres sqlite"
 RESTRICT="firebird? ( bindist )"
 
-DEPEND="mysql? ( virtual/mysql )
+RDEPEND="mysql? ( dev-db/mysql-connector-c:0= )
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite:3 )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	firebird? ( dev-db/firebird )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND} app-doc/doxygen app-text/docbook2X"
 
 S="${WORKDIR}"/${MY_P}
 
-pkg_setup() {
-	if ! ( use firebird || use mysql || use oracle || use postgres || use sqlite )
-	then
-		ewarn "You should enable at least one of the following USE flags:"
-		ewarn "firebird, mysql, oracle, postgres or sqlite"
-	fi
+REQUIRED_USE="|| ( firebird mysql oracle postgres sqlite )"
+
+PATCHES=( "${FILESDIR}/${PN}-doxy.patch" )
 
+pkg_setup() {
 	if use oracle && [[ ! -d ${ORACLE_HOME} ]]
 	then
 		die "Oracle support requested, but ORACLE_HOME not set to a valid directory!"
 	fi
-
-	use mysql && append-cppflags -I/usr/include/mysql
-	use firebird && append-cppflags -I/opt/firebird/include
-	use oracle && append-ldflags -L"${ORACLE_HOME}"/lib
 }
 
 src_configure() {
@@ -53,16 +47,20 @@ src_configure() {
 	use postgres && backends="${backends} pgsql"
 	use sqlite && backends="${backends} sqlite3"
 
-	econf --with-backends="${backends}" || die "econf failed"
+	use mysql && append-cppflags -I/usr/include/mysql
+	use firebird && append-cppflags -I/opt/firebird/include
+	use oracle && append-ldflags -L"${ORACLE_HOME}"/lib
+
+	econf --with-backends="${backends}"
 }
 
 src_compile() {
 	# bug #322221
-	emake -j1 || die "emake failed"
+	emake -j1
 }
 
 src_install() {
-	emake -j1 install DESTDIR="${D}" || die "make install failed"
+	emake -j1 install DESTDIR="${D}"
 	dodoc AUTHORS ChangeLog README
 
 	rm -f "${D}"/usr/$(get_libdir)/opendbx/*.{a,la}
diff --git a/dev-db/oracle-instantclient-sqlplus/Manifest b/dev-db/oracle-instantclient-sqlplus/Manifest
index fbdfa87041c2..c6c3f24b5ef8 100644
--- a/dev-db/oracle-instantclient-sqlplus/Manifest
+++ b/dev-db/oracle-instantclient-sqlplus/Manifest
@@ -2,8 +2,8 @@ DIST instantclient-sqlplus-linux-11.2.0.3.0.zip 796570 BLAKE2B 0492185103d5fb36f
 DIST instantclient-sqlplus-linux-11.2.0.4.0.zip 792608 BLAKE2B c3e8f0843700df9f95428b01520400d95076df5e19169f2a79982293e54ce6cc74321de0f34a0e7865d5d29535e38b60bcca127be06343c979a40985bf349012 SHA512 8f5ff27043a036eab038080bbdc056325cc2c197e12de34e74a8da17bf69b44e4fd4200b638881d86fdf1dc1450d8e1d033daaa56386bd2c8784d556ba0093ce
 DIST instantclient-sqlplus-linux.x64-11.2.0.3.0.zip 837574 BLAKE2B c1f123b68b60f211843af954e33922e46d05ff89ce68e8357a8839e7fce83cccc31ab3f16b87204343376657839fd582fb2c80be3148cc34f2340191ed261526 SHA512 55bbac5e8267a4de2c7f9f6750f0e38dcf7c775bccc2e1e05df7fda9e6ffa7d394776e605980d8b67176acf52ba88f2dcaa959934740a1ca6f91d10b12d14024
 DIST instantclient-sqlplus-linux.x64-11.2.0.4.0.zip 834491 BLAKE2B 487091d97c0f2ec383018c39a957c8a27b030c4c8754a6c2714237dc875b89b250b47dbd28ca228a98c6199323ddd031452e1cc90c60824fbcca536aa38bff1f SHA512 b7180b5667e604564cf379b9eb55a2fc8994b87cfb993e728b4c1bdd297cab134a55580018429bdbb2b101ebdf8a350bacc1ddf5a30e1cc419092054c79a108b
-EBUILD oracle-instantclient-sqlplus-11.2.0.3-r1.ebuild 1550 BLAKE2B 28d750f61c9f3665fb3c0083adc4c6c5adf18ed22d2d6ae2e0272b434554535ecc55c7351a75822139ae225caca1b4cb5cd0f3ec317f10af25db9f2426e63c8c SHA512 09b716cbfa86620541cd8b9840c80e73b4b0de080421367fba7cade2ffd43426b63985ec9085fb7711bd257f65dcb34396f594ce5e6c3992f276a77836469dc7
-EBUILD oracle-instantclient-sqlplus-11.2.0.3.ebuild 1483 BLAKE2B 5c7b206bb6e6d906b360d51124ef2c764a60c6e1c0e2f107ab09eadcf629f6a52c5994113c1fc75ec9f149cb1a28b92f30bb6c323bb4d3a85f61003faa14a2c6 SHA512 c64c6d2e3f059bfeb0b4dfaf974952599327ff9af7045a51a4109a2b2505df441872effe01b4c4dfbe5a01e8ee58d65fa69e84c4b6943092fd3e6b377e35bd92
-EBUILD oracle-instantclient-sqlplus-11.2.0.4.ebuild 1552 BLAKE2B d48c484eea73e4aa3348b27f0a20938e8af78df16fd6d449462b113411c3d64cdb1b20561bf39bc7c0f3c86009e63ff8526055bcf0de25df33077845fd9d13bf SHA512 dc5a6ea8f004fd66ea4e4a1cbe5c96ba9f1ccc573c208735c78eacd6b678b2b4cd3bb8c3da57f6fb0f45e3fe402cca0d4c4eaa4431e08dbeb973426134c1bfa8
+EBUILD oracle-instantclient-sqlplus-11.2.0.3-r1.ebuild 1548 BLAKE2B 1cb7586a8711f10f75e8c8bac21e0ca64ee6bf34d21afd8d3a514d9f4db677be4699dd0bf2b5d9bdccc6f73a2cef1185eb06aaad3068102d145a584999f3c3d5 SHA512 3241aced8104ab05dc50ae175166dcd1f1d439c408dc78eb359152f8e28f9634c2ffde13a9e61945526d0936365f132d7301fd3b79cef4317f6ad8e2f60a6c53
+EBUILD oracle-instantclient-sqlplus-11.2.0.3.ebuild 1481 BLAKE2B 873726887fc60e56ce892d0888a48435d6848cecd4bf13911ed3dd9f1981d74a3b28bbfa5a2c058fe263c05f38446cb6f0da29c0d782f98db80ed223ffe1ff99 SHA512 816432be2dddfd401a80087466fe5856f65910c26e769fb06bb58a9e47fe3b571fd252b77ec15f7120fcba583ce2eb32c16770bfc2f501efe60395f9645234fe
+EBUILD oracle-instantclient-sqlplus-11.2.0.4.ebuild 1550 BLAKE2B cadc194b853439546501545aa6ab3da3e65204afd7c9582d86ae1b815491290c630257f0bd74146ce6ff1bfe544ba3e698a59da9b7303f4f0e12779e9e4ef557 SHA512 f3c3acdddd951cc28e645fc3ddf0b0814021797409b7dbf69a613a44d2b1a7fee06815a7ef18523a761c14e4c4e343ef81ac7bd3622bfedddc6b467e44702e4d
 EBUILD oracle-instantclient-sqlplus-12.ebuild 449 BLAKE2B 7a1aecc9c28508795b98ec8f2fc564aef62aa686680a8feae8427ed1b4d6380beb9ab5ae27ceb045ba6e3d62e2f102a927a2217e55267631e1d0414fd8e6bdfc SHA512 d09d490d5b195a486ba5afd25fdbef0dd2e99f04cfadc17182dc52344c8620c6114a06c0cbcdba38fc59a578ac5e8468aa3fd81fbf4b4de15018c4103e7faed1
 MISC metadata.xml 344 BLAKE2B aa2fb436f1a0beb301e255d537071307f1439cdba758954f3983fcbd82fccb2d0caefb88ab646e2b56a03f3b0ac859b04a7181c3e0cc59680c5f7ff2c7daa70e SHA512 650f29483a89a65b3855aeb65fc486d38365660ed2a67e9ab18e96534c5dd453d7897b0443fd1b12dfceaee3b542840ab1648c36b07728014dfd57ac1c95e3e9
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3-r1.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3-r1.ebuild
index 2af3e70ae266..190e6ba230e7 100644
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3-r1.ebuild
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -50,8 +50,7 @@ pkg_nofetch() {
 	eerror "  and download"
 	eerror "Instant Client for ${MY_PLAT}"
 	eerror "    SQL*Plus: ${MY_A}"
-	eerror "After downloading, put it in:"
-	eerror "  ${DISTDIR}/"
+	eerror "After downloading, put it into your DISTDIR directory."
 }
 
 src_install() {
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3.ebuild
index 6df81c9c2bec..c9939d8beae3 100644
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3.ebuild
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -50,8 +50,7 @@ pkg_nofetch() {
 	eerror "  and download"
 	eerror "Instant Client for ${MY_PLAT}"
 	eerror "    SQL*Plus: ${MY_A}"
-	eerror "After downloading, put it in:"
-	eerror "  ${DISTDIR}/"
+	eerror "After downloading, put it into your DISTDIR directory."
 }
 
 src_install() {
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.4.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.4.ebuild
index 8cb35bf91e1f..c01045c3709c 100644
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.4.ebuild
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -50,8 +50,7 @@ pkg_nofetch() {
 	eerror "  and download"
 	eerror "Instant Client for ${MY_PLAT}"
 	eerror "    SQL*Plus: ${MY_A}"
-	eerror "After downloading, put it in:"
-	eerror "  ${DISTDIR}/"
+	eerror "After downloading, put it into your DISTDIR directory."
 }
 
 src_install() {
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 1bb44fc7d668..9d031880d050 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -5,17 +5,9 @@ AUX pgpool2.confd 649 BLAKE2B 1c520c4fa954c7411c1b700c03bf4e39196c599eb239cf8641
 AUX pgpool2.initd 2162 BLAKE2B b04f6b952507b8e4815c7b27f09b59ffe64f6262719c5490377fdbc5f8490cdead18fdbeb0ce8379d9cbd4bbb1aa21221d61853ff49a456a5ef6a8d78f3f5129 SHA512 05dd358d20bae60cfdefd7116b1111288b5a2be6d68a9dc40eaf6ba641524d422f2faac79bd3c629cee4f8b1ca601a9b6e303d4228e538d742ea407b6190ee53
 AUX pgpool_run_paths-3.6.5.patch 11626 BLAKE2B 5d0b7a49b3c8bf2f2d69d369894e9976037025b289b0ec0f2cf11ed9862347dc4cb166af2cbd65637de40fdae09809a9232b0638cf69339901d6f3f67e9ddcd5 SHA512 ea718378d0ea14fa48975a899df26bc8aafa1e61b0d3f264ead81031a21d68284f4af5ce065c5534d113faf36724c880ce280665e148ec623e9fea9c8f91c77c
 AUX pgpool_run_paths-9999.patch 11759 BLAKE2B 35df553f704846cc4ff8d67e5e6b54ca8ed0a5817a148c359b47cae7ff388fe2bb57600113d7f8ac9afe760ea75e3ddd410d111c2ef87aea3c3fb38671d59260 SHA512 109be0f3bcda49db14ebb86d6e9347aa0a47d582ac1a1438b07719f9fa503045cc5b65a27964c3c0b1690ef489f752a497e3b050b816569d0ce01193dc007259
-DIST pgpool-II-3.7.0.tar.gz 3269076 BLAKE2B f7a396e82022a35e5f46fb644ca4a9007db3abaf97f8249d88bca00abf5d33abe7d47f705e959f7fb910885bf49f68bd5f965aae3085d12076d3100cca2f25f8 SHA512 cf8eef3a2ec761b51f9e6a72b5211810de57ad9b40b1738067616478b6486a813782588bfc92f6f351334d9514b1394551230c486fa0ac2f6c18a0490f22bbe2
-DIST pgpool-II-3.7.1.tar.gz 3237755 BLAKE2B ec196e384c9c4c03a28081fbb74b820c7480e2a98427441572142bd80bff6d2adbbda9bc19df1c70f4699af28fcac5f09161a5938df633bb9eba52c0d9dc24ac SHA512 2a83f573ca2a720ee7beb75d8d1380747e29b2bb3c809f51bd0f8e4423d67f882ce2acb7d9ea118c55313e969aba3bf94a0d5b190eb905123d43c09df25e00ef
-DIST pgpool-II-3.7.3.tar.gz 3259752 BLAKE2B 398257b2a647039a634d52b0e23ab1584aaa67f58d6f234f03bf2e99380b346b4ff51647f876d0789c484e88fc149a2af5a5b1b8fd3aa48323aada064ea3421d SHA512 c7fea570f11dfc348b0099fde074f61a15e6979b6f16526d24d73b26d723edfdbadbcf10e90c2111aeb72599970718d3cda4abed3e99e8a711cf03b715c29624
-DIST pgpool-II-3.7.5.tar.gz 3276279 BLAKE2B d9c52684985e0a74ef115792f79a71305fbcc5f44663971e5fee41d543c7c290999091c387f5da6c73c88466880a24b21d469046de7981983d9984a606ae357e SHA512 4840047f11b5e176803c03073d1ef6ef54f9d0be3d9bd622fedc9fd0ad4f835090fbf671bfd71cda0d994af6ea9a1658b0d5e5d09ec317b345c41fb0fa4b7b70
 DIST pgpool-II-3.7.7.tar.gz 3325039 BLAKE2B 47f4d48b811af0fb6626a6ea4b46bd81d13997fa8756f533711f733eed7526ea79bbc929cf894911cc5697c37fd5fde0306eaee485f00b6c41c2701bf08c972c SHA512 9766d011f8a93ae292770b24915f6825d037d55ad3f75be131a58a9dcfb4d1a61f572f2c48f69ee0d3c6cbdfe76da15e417c26f102c646c3d9e1a2f71d205374
 DIST pgpool-II-4.0.2.tar.gz 3576212 BLAKE2B 4027b8d02f4422900e674ee49a1946521b0737e73c9cd73363cd1ad1328de294bdec219bb8df55db58c6b2da365f8094e6b2228e13f1d24f35f7fb373280bd66 SHA512 9014c34f69cdcb3064a3713ed97fa0847f5572866db709c53f703b2ff996dbb31988d6573fcd85c9bb715bb54b9c215adaf11eb2f90193371be804ec37ac955e
-EBUILD pgpool2-3.7.0.ebuild 2487 BLAKE2B 292fa47cc7cea86cef38366ded6d8a5a93b7f3c7919c28ef1adee32e6beb72e60a832d766d23bf4bfb1f0b67a40ac4758d6a7a3fba95100681cb2f0abc638d7f SHA512 9cf42db35ee9b77b3c2ca95730afddb47d91ed78de233a63c71700c76f600da7edfacaf8297204d77cf60dba7b77016b42c5659ff9624f1a6147111221974f37
-EBUILD pgpool2-3.7.1.ebuild 2489 BLAKE2B 906a0bcf441df3dd05f7cb00be416cc08ad61b9ce86807028b4a1050a8e69185bd5064315837fca230319d2c53d8bd68ddc7788a224d4d8455785d51c2302000 SHA512 58d2d255d522861fc037d651579ae24e7631d6c6253270fc85adebc65bfc9b54264c90df9710ba7b3fbae802d1c1666aeb1462d578947aff8c0e8190c0a1359e
-EBUILD pgpool2-3.7.3.ebuild 2489 BLAKE2B 906a0bcf441df3dd05f7cb00be416cc08ad61b9ce86807028b4a1050a8e69185bd5064315837fca230319d2c53d8bd68ddc7788a224d4d8455785d51c2302000 SHA512 58d2d255d522861fc037d651579ae24e7631d6c6253270fc85adebc65bfc9b54264c90df9710ba7b3fbae802d1c1666aeb1462d578947aff8c0e8190c0a1359e
-EBUILD pgpool2-3.7.5.ebuild 2637 BLAKE2B 11d6f1983309788e808af8e72d27a6b7fcfb18b71135215786046b9766509a7674ad52ef1b861ddc4d1156cba0fce62a768932e6509e8a0868984da4be4cdb85 SHA512 421c34bfc8aa2bdae0e213dfee556328b0b784af973ae8de8c6c84e2f4b433ce0afc34d16342b0d02abeabd52b828da188d53c73143b66e3b9e00d0c123fd675
-EBUILD pgpool2-3.7.7.ebuild 2638 BLAKE2B 5932c8956354b41206e01ed851bb5558ff6a1b6814136bb8b9db55385e4f76d46ec6f623f09797720e22f151a4cbf1f927fe996b402bc1887bbdcf1f20e5ceae SHA512 e885094e13c10e19058fff1bef5b1b3619d32cd4c6ebe93575f94e0fbd34770267581cb1b8fa624dcced829f5fb43d654fc3b11538435b93ef2cadd85bcc83d1
-EBUILD pgpool2-4.0.2.ebuild 2644 BLAKE2B 8404b100218fc1fd8b8ac8e2a5e7257a31bdd15e0248fe942ca0f30e82f0d91fb7e6433a6dfe37b41bce04a72856de85d0627620c1e14714efcb34cd045a53c2 SHA512 9622ad6d5ce4a86661769fcc1242830da512e2a1bcb42d34bfce3e3e7f180bc0963b6fbeb4cd9d988095a724f7eba89ae9205e176d906048a03f16d3f1e5a871
+EBUILD pgpool2-3.7.7.ebuild 2637 BLAKE2B 11d6f1983309788e808af8e72d27a6b7fcfb18b71135215786046b9766509a7674ad52ef1b861ddc4d1156cba0fce62a768932e6509e8a0868984da4be4cdb85 SHA512 421c34bfc8aa2bdae0e213dfee556328b0b784af973ae8de8c6c84e2f4b433ce0afc34d16342b0d02abeabd52b828da188d53c73143b66e3b9e00d0c123fd675
+EBUILD pgpool2-4.0.2.ebuild 2643 BLAKE2B 3a1a873d73bca65bc0aada8ffabd5bf249cb47f0931c40aa48c23718fef7560cda55c005195ca180af9f2fdfbc45f36ddcc3b2e154a9803e3393a4c03f91f6f6 SHA512 62f6f2ec58d9c8b6fe21b0f344a22f4e9b4fe7d0de0d15473ff5c004c83e68bd535c02b0ea3b4412a61e79e4d2694b7a31221208eb7cebdfd23cd8f4acd715f9
 EBUILD pgpool2-9999.ebuild 2720 BLAKE2B a63e0ba961271a6719fd7fab4a57280fd22eb93ada6d7a37a2c8d7bad381f64b4f160461adc4de760e1b1747cf9536ba56027d7a93710cff3d76251b3453a8ca SHA512 8e3c7a0e2c2562d31974dfd9a9503f1d2c20499b34f69fdd0ca26cf08f344fb115a5f65251e854e9fae9bbd6d007f5d1d9243c17b84885e359f42bad0c6ef5b9
 MISC metadata.xml 390 BLAKE2B d6a0560051449e95bb43e81589eee966a477a75d7ec8211ae96b15f2d51ce9555181b8640d9d830f2b42f8159989e9126423c6ccbbc2bf2dd8121f4920a87a16 SHA512 ce26ee116c3c7ff77a771294ed07f38d8f940dc380915c339eb4c543d86fa5bde025ba83e70af2b7bf4a1bef1e51957f151131836855e0dae2e1daed73ffae8d
diff --git a/dev-db/pgpool2/pgpool2-3.7.0.ebuild b/dev-db/pgpool2/pgpool2-3.7.0.ebuild
deleted file mode 100644
index d69e1ec43a57..000000000000
--- a/dev-db/pgpool2/pgpool2-3.7.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{3..6} 10 )
-
-inherit postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	net-libs/libnsl:0=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	postgres_new_user pgpool
-
-	postgres-multi_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/pgpool_run_paths-3.6.5.patch"
-
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	local myconf
-	use memcached && \
-		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
-	use pam && myconf+=' --with-pam'
-
-	postgres-multi_foreach econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
-		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
-		$(use_with ssl openssl) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	# Even though we're only going to do an install for the best slot
-	# available, the extension bits in src/sql need some things outside
-	# of that directory built, too.
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
-	# We only need the best stuff installed
-	postgres-multi_forbest emake DESTDIR="${D}" install
-
-	# Except for the extension and .so files that each PostgreSQL slot needs
-	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation!
-	dodoc NEWS TODO
-	doman doc/src/sgml/man{1,8}/*
-	use doc && dodoc -r doc/src/sgml/html
-
-	# Examples and extras
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
-	into "/usr/share/${PN}"
-	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
-	insinto "/usr/share/${PN}"
-	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.7.1.ebuild b/dev-db/pgpool2/pgpool2-3.7.1.ebuild
deleted file mode 100644
index abc820600124..000000000000
--- a/dev-db/pgpool2/pgpool2-3.7.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{3..6} 10 )
-
-inherit postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	net-libs/libnsl:0=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	postgres_new_user pgpool
-
-	postgres-multi_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/pgpool_run_paths-3.6.5.patch"
-
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	local myconf
-	use memcached && \
-		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
-	use pam && myconf+=' --with-pam'
-
-	postgres-multi_foreach econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
-		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
-		$(use_with ssl openssl) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	# Even though we're only going to do an install for the best slot
-	# available, the extension bits in src/sql need some things outside
-	# of that directory built, too.
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
-	# We only need the best stuff installed
-	postgres-multi_forbest emake DESTDIR="${D}" install
-
-	# Except for the extension and .so files that each PostgreSQL slot needs
-	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation!
-	dodoc NEWS TODO
-	doman doc/src/sgml/man{1,8}/*
-	use doc && dodoc -r doc/src/sgml/html
-
-	# Examples and extras
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
-	into "/usr/share/${PN}"
-	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
-	insinto "/usr/share/${PN}"
-	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.7.3.ebuild b/dev-db/pgpool2/pgpool2-3.7.3.ebuild
deleted file mode 100644
index abc820600124..000000000000
--- a/dev-db/pgpool2/pgpool2-3.7.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{3..6} 10 )
-
-inherit postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	net-libs/libnsl:0=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	postgres_new_user pgpool
-
-	postgres-multi_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/pgpool_run_paths-3.6.5.patch"
-
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	local myconf
-	use memcached && \
-		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
-	use pam && myconf+=' --with-pam'
-
-	postgres-multi_foreach econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
-		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
-		$(use_with ssl openssl) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	# Even though we're only going to do an install for the best slot
-	# available, the extension bits in src/sql need some things outside
-	# of that directory built, too.
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
-	# We only need the best stuff installed
-	postgres-multi_forbest emake DESTDIR="${D}" install
-
-	# Except for the extension and .so files that each PostgreSQL slot needs
-	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation!
-	dodoc NEWS TODO
-	doman doc/src/sgml/man{1,8}/*
-	use doc && dodoc -r doc/src/sgml/html
-
-	# Examples and extras
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
-	into "/usr/share/${PN}"
-	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
-	insinto "/usr/share/${PN}"
-	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.7.5.ebuild b/dev-db/pgpool2/pgpool2-3.7.5.ebuild
deleted file mode 100644
index f4f989f9a38f..000000000000
--- a/dev-db/pgpool2/pgpool2-3.7.5.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{3..6} 10 )
-
-inherit autotools postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-
-IUSE="doc libressl memcached pam ssl static-libs"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	net-libs/libnsl:0=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	!!dev-db/pgpool
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	postgres_new_user pgpool
-
-	postgres-multi_pkg_setup
-}
-
-src_prepare() {
-	eapply \
-		"${FILESDIR}/pgpool-configure-memcached.patch" \
-		"${FILESDIR}/pgpool-configure-pam.patch" \
-		"${FILESDIR}/pgpool-configure-pthread.patch" \
-		"${FILESDIR}/pgpool_run_paths-3.6.5.patch"
-
-	eautoreconf
-
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	postgres-multi_foreach econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
-		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
-		$(use_enable static-libs static) \
-		$(use_with memcached) \
-		$(use_with pam) \
-		$(use_with ssl openssl)
-}
-
-src_compile() {
-	# Even though we're only going to do an install for the best slot
-	# available, the extension bits in src/sql need some things outside
-	# of that directory built, too.
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
-	# We only need the best stuff installed
-	postgres-multi_forbest emake DESTDIR="${D}" install
-
-	# Except for the extension and .so files that each PostgreSQL slot needs
-	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation!
-	dodoc NEWS TODO
-	doman doc/src/sgml/man{1,8}/*
-	use doc && dodoc -r doc/src/sgml/html
-
-	# Examples and extras
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
-	into "/usr/share/${PN}"
-	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
-	insinto "/usr/share/${PN}"
-	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.7.7.ebuild b/dev-db/pgpool2/pgpool2-3.7.7.ebuild
index ddf55c788d55..f4f989f9a38f 100644
--- a/dev-db/pgpool2/pgpool2-3.7.7.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.7.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 IUSE="doc libressl memcached pam ssl static-libs"
 
diff --git a/dev-db/pgpool2/pgpool2-4.0.2.ebuild b/dev-db/pgpool2/pgpool2-4.0.2.ebuild
index ef41b7cf7e24..caa0de63f44b 100644
--- a/dev-db/pgpool2/pgpool2-4.0.2.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 IUSE="doc libressl memcached pam ssl static-libs"
 
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index b6832598443a..2fa8aea2e9ce 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,13 +1,7 @@
 AUX postgis-2.2.0-arflags.patch 535 BLAKE2B 6420573e9623d4e2115ed3616bc3b8648ae7782bf4624ee60d3827a4d61cbdac1dc62b4937f36113ed6d0856af4728f5cc1b544d502512e88dd87a7b590135ab SHA512 7f8b92a582dd11b3040832278b75e65036315ca0e438cb9b19cc5b63a7b5c5bcae8ec274a487a29abadfbbc31cdfacf6c668e46f249d4bf88c09607501cacf66
-AUX postgis-2.4.2-jsonc_0.13.patch 786 BLAKE2B c55fd81f28b9a4db965ef3f4bb3ca6fcf2cd6ba44d4f7a93c35ade90ffdcb195325ce219348aa6dc3645f6822214b4bc75263c02fc316f3dd9b4369114eb5493 SHA512 9088304bb77db2d86dd077510f94ae8b3796474a02377f1f076476c739d9506f0b7c7c6dcf6e90ad51e84bc528302a6ecda4bedc6eac42dfeba3a71c0144a399
-DIST postgis-2.4.2.tar.gz 12470881 BLAKE2B 116bb5d1c8f6066d537cac950254923a681babac456d155139dbdd2853b80499f4f9445dad985b94bffffd1d1285a6c78fee0fccb24e301d18147f3cd9230416 SHA512 e268572d5cd009754ef05f5d2eedcac7e362fa47199459c637cd4d9050d2b648d4b2b3746cde0dce5a42be2606a432b64dc905f193e12cf0869e3dd6f820b425
-DIST postgis-2.4.3.tar.gz 12601055 BLAKE2B 662b2afe145bc23c77ebda7306d07a20e39c1a598316cee58e1591e65ce1b2d2a3f727f5463ba144711faa55f7c11e4a038b6ad2a76cab760b4fdd43647f09c3 SHA512 95b2c925cb10943e7136aa3b7b08a9ad3d6ff59a3994c653bba52e4c65193d519daa49684b924f68945dd596187aa17e0c713bf0b9e29f8c5973346b279dba1b
 DIST postgis-2.4.6.tar.gz 12616474 BLAKE2B 8e33ae7e8ca5ef2a4dd90f64a8e9910118e4ef711444b196f46e4a63f98ff6044709d65a853c5c10de91308658a206965503b6a85a16438ea422becdbbd9bb40 SHA512 eec4276a58549f3cc57d6574186aebc72df0dd7dc2ab9acbaf410604b4d271dee6d5154caacd7297d20493d879434ca78050672e8197ff0fc63a36100c20c66c
 DIST postgis-2.5.1.tar.gz 16041872 BLAKE2B 589cf7168d3698737a19d817b8efb91695c2c3f63d6c3aa24189d9a37459a28ca8a7db0450aa2d557699f76cd8e3ab1eec198bd332b294d976330fdc9d8a7f60 SHA512 c6c9c8c5befd945614e92d1062df1d753ca8b7fd69b70226065c2dac77a59783b14ece4da994187079b683ee090ba5a79389ba679f22fce8c20a5afc2c8dfca0
-EBUILD postgis-2.4.2.ebuild 3111 BLAKE2B 5e73b003ce160340df936ffc7571fa4873b1e3cc6519fae8f7f452d98c2c5786c2ecedb96a544bef39f566a28db8089b7f9dfd37e97b910cf33fa83fb0307bcf SHA512 0cd08ef2930688412f1ffe4846ac88a9037f68dda0cde535c810fbbb218f2c033fec74a2f7b1539f0ff42ea40f085ea290fcdd3892fcc27a38fad25085686152
-EBUILD postgis-2.4.3.ebuild 3113 BLAKE2B 4ea7488d7c87a8d946d074d36f306db9791bca9d0d63f7ad67622defd797052fad8d4b0652ef2a3445ee1da436450e2f30683870dcf54de3255db9b61095e2b3 SHA512 a7f5e10d00f67a6f6c322ed59937ccd103e3491b9ae9ffc516240c5185b10ed808b4044e44ab276576e07a5bc34e3f9464abf242623b85e9a718733713cbeb1b
-EBUILD postgis-2.4.6.ebuild 3063 BLAKE2B a91c1bf37a17bdff668c84c9b3026a1a14e148c19ece5b41fa10b0cb87b5f6c18036fdf0b0cf2079cfd805b2a8721dc847f23ec2c77acc3cc2e5bd1440c2e381 SHA512 da2b712380e67b973bdb88a0f855048e9bc51575b466b8e0c463ddc82ccc0e5066d1de9e8873ff76335f8f734efb6ff72e7795da149a355c4d19223988ab9290
-EBUILD postgis-2.5.1-r1.ebuild 3045 BLAKE2B 69afd3e46c1e7f322768b26c9cbf21c289706d922e8723cd8e975e3902acf480da6f19d1c5d0b6d078c20c34e49813f5bf7dddd5b57beedad64ddce99cb66be9 SHA512 5f52737d439cfc1e84857b238516a04cfc25f48e5e48c18d43f27be86676fe3e5114777730860822dadd1353637f54bcdd9e9f1a1f935d74e6997f3253b9a3c6
-EBUILD postgis-2.5.1.ebuild 3064 BLAKE2B 0db79ef8795463982620e44522a0eeafbaff89ad9da666ee0be4a5f30e1fac7d45b6cf79340289f0a8ebe49ec2fffbd0157aa576f63807e1b055547c196e13ef SHA512 e8c8f804684886fac800d8c9fb3f325203f8ebe1f0852eaee6eb3be7255038d9b9bba59a04be5a32de13c65f65d054194f4919946860edda8209c01254f089a4
+EBUILD postgis-2.4.6.ebuild 3062 BLAKE2B e9e916d4e2182588458ed4492ccd8410963c1cb7bc413fb1f6efc99751a6522c7551a3c1c9493e6dfb0f783df03f75c04ed73957eab6d454df87272988e9b4e9 SHA512 e25e230804a0978c61e3447ebeddaccd00dc3d2fe1e716c283f6e88e584399997e8dcf06abab129a5b724718865827e475c813f33f8c4e10df84dae8cb465e42
+EBUILD postgis-2.5.1-r1.ebuild 3044 BLAKE2B ea7dd912c43f34cc13c596cea4f2169475c49d3318d4b5b2456889c52ef503c5300dcfc245220e9eacf8275c4443b6273c25da71f7d77831f888cc8d4f943f41 SHA512 3265db95c4debdf04068eafce9fef15466851b226752d90e6a4ebc8da0edb4f38f101cec4a59e1303700cfcabb0fe9382df25fbb68fe919bd639d61b9d9ba322
 EBUILD postgis-9999.ebuild 2647 BLAKE2B b379c0ebfd30c407817139b72264bbb70c0cae3ba281b2f2ffda38c61c851bb363266e2675437e32dd3ffc80a6c1dca4608e34833d7a729cbd6997eb2501411d SHA512 4b654b604752b9e30ea0662e89429e0deb74e1ce6cfb8beef34f8bf33ea2aeb28e07398828fc5ddc3d27a520258313cb552b7ef24069ca5b9001a4db7aaa1cec
 MISC metadata.xml 779 BLAKE2B 9dfbc86514c5f6e0c859dc41a46890e4f518f23c572786bf340112eadf21b35f5f583a3835f6ba58bef8c99a7ef8483f3a98898d372d1c0e5cc537bb9ecc2b12 SHA512 33ad2ddabf49e97af2cf188f2c0f72e1a936c228b43d8d3637230c43be0df82ec2aa20b63cb5f2385e936c215263fcd009332afe504bc5f30746a387b9b37ada
diff --git a/dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch b/dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch
deleted file mode 100644
index b980e77333d6..000000000000
--- a/dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur postgis-2.4.2.old/liblwgeom/lwin_geojson.c postgis-2.4.2/liblwgeom/lwin_geojson.c
---- postgis-2.4.2.old/liblwgeom/lwin_geojson.c	2017-12-21 22:52:40.422802160 +0100
-+++ postgis-2.4.2/liblwgeom/lwin_geojson.c	2017-12-21 22:55:36.605430945 +0100
-@@ -31,13 +31,19 @@
- 
- #if defined(HAVE_LIBJSON) || defined(HAVE_LIBJSON_C) /* --{ */
- 
-+#define JSON_C_VERSION_013 (13 << 8)
-+
- #ifdef HAVE_LIBJSON_C
- #include <json-c/json.h>
-+#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013
- #include <json-c/json_object_private.h>
-+#endif
- #else
- #include <json/json.h>
-+#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013
- #include <json/json_object_private.h>
- #endif
-+#endif
- 
- #ifndef JSON_C_VERSION
- /* Adds support for libjson < 0.10 */
diff --git a/dev-db/postgis/postgis-2.4.2.ebuild b/dev-db/postgis/postgis-2.4.2.ebuild
deleted file mode 100644
index 2dd323bc6436..000000000000
--- a/dev-db/postgis/postgis-2.4.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-POSTGRES_COMPAT=( 9.{3..6} 10 )
-POSTGRES_USEDEP="server"
-
-inherit autotools eutils postgres-multi versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net"
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="address-standardizer doc gtk static-libs mapbox test topology"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	dev-libs/json-c:=
-	dev-libs/libxml2:2
-	>=sci-libs/geos-3.5.0
-	>=sci-libs/proj-4.6.0
-	>=sci-libs/gdal-1.10.0
-	address-standardizer? ( dev-libs/libpcre )
-	gtk? ( x11-libs/gtk+:2 )
-	mapbox? ( dev-libs/protobuf )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.5
-				dev-libs/libxslt
-				|| (
-					media-gfx/imagemagick[png]
-					media-gfx/graphicsmagick[imagemagick,png]
-				)
-		)
-		virtual/pkgconfig
-		test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-MAKEOPTS+=' -j1'
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch" \
-		   "${FILESDIR}/postgis-2.4.2-jsonc_0.13.patch"
-
-	local AT_M4DIR="macros"
-	eautoreconf
-
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	local myargs=""
-
-	use gtk                  && myargs+=" --with-gui"
-
-	use address-standardizer || myargs+=" --without-address-standardizer"
-	use mapbox               || myargs+=" --without-protobuf"
-	use topology             || myargs+=" --without-topology"
-
-	postgres-multi_foreach econf ${myargs}
-}
-
-src_compile() {
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C topology
-
-	if use doc ; then
-		postgres-multi_foreach emake comments
-		postgres-multi_foreach emake cheatsheets
-		postgres-multi_forbest emake -C doc html
-	fi
-}
-
-src_install() {
-	postgres-multi_foreach emake DESTDIR="${D}" install
-	postgres-multi_foreach emake -C topology DESTDIR="${D}" install
-	postgres-multi_forbest dobin ./utils/postgis_restore.pl
-
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	docinto topology
-	dodoc topology/{TODO,README}
-
-	if use doc ; then
-		postgres-multi_foreach emake DESTDIR="${D}" comments-install
-
-		docinto html
-		postgres-multi_forbest dodoc doc/html/{postgis.html,style.css}
-
-		docinto html/images
-		postgres-multi_forbest dodoc doc/html/images/*
-	fi
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
-
-pkg_postinst() {
-	ebegin "Refreshing PostgreSQL symlinks"
-	postgresql-config update
-	eend $?
-
-	elog "To finish installing PostGIS, follow the directions detailed at:"
-	elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions"
-}
diff --git a/dev-db/postgis/postgis-2.4.3.ebuild b/dev-db/postgis/postgis-2.4.3.ebuild
deleted file mode 100644
index a24f81220e5e..000000000000
--- a/dev-db/postgis/postgis-2.4.3.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-POSTGRES_COMPAT=( 9.{3..6} 10 )
-POSTGRES_USEDEP="server"
-
-inherit autotools eutils postgres-multi versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net"
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="address-standardizer doc gtk static-libs mapbox test topology"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	dev-libs/json-c:=
-	dev-libs/libxml2:2
-	>=sci-libs/geos-3.5.0
-	>=sci-libs/proj-4.6.0
-	>=sci-libs/gdal-1.10.0
-	address-standardizer? ( dev-libs/libpcre )
-	gtk? ( x11-libs/gtk+:2 )
-	mapbox? ( dev-libs/protobuf )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.5
-				dev-libs/libxslt
-				|| (
-					media-gfx/imagemagick[png]
-					media-gfx/graphicsmagick[imagemagick,png]
-				)
-		)
-		virtual/pkgconfig
-		test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-MAKEOPTS+=' -j1'
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch" \
-		   "${FILESDIR}/postgis-2.4.2-jsonc_0.13.patch"
-
-	local AT_M4DIR="macros"
-	eautoreconf
-
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	local myargs=""
-
-	use gtk                  && myargs+=" --with-gui"
-
-	use address-standardizer || myargs+=" --without-address-standardizer"
-	use mapbox               || myargs+=" --without-protobuf"
-	use topology             || myargs+=" --without-topology"
-
-	postgres-multi_foreach econf ${myargs}
-}
-
-src_compile() {
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C topology
-
-	if use doc ; then
-		postgres-multi_foreach emake comments
-		postgres-multi_foreach emake cheatsheets
-		postgres-multi_forbest emake -C doc html
-	fi
-}
-
-src_install() {
-	postgres-multi_foreach emake DESTDIR="${D}" install
-	postgres-multi_foreach emake -C topology DESTDIR="${D}" install
-	postgres-multi_forbest dobin ./utils/postgis_restore.pl
-
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	docinto topology
-	dodoc topology/{TODO,README}
-
-	if use doc ; then
-		postgres-multi_foreach emake DESTDIR="${D}" comments-install
-
-		docinto html
-		postgres-multi_forbest dodoc doc/html/{postgis.html,style.css}
-
-		docinto html/images
-		postgres-multi_forbest dodoc doc/html/images/*
-	fi
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
-
-pkg_postinst() {
-	ebegin "Refreshing PostgreSQL symlinks"
-	postgresql-config update
-	eend $?
-
-	elog "To finish installing PostGIS, follow the directions detailed at:"
-	elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions"
-}
diff --git a/dev-db/postgis/postgis-2.4.6.ebuild b/dev-db/postgis/postgis-2.4.6.ebuild
index 4c1fdf889a99..9d8fa02e934e 100644
--- a/dev-db/postgis/postgis-2.4.6.ebuild
+++ b/dev-db/postgis/postgis-2.4.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://postgis.net"
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="address-standardizer doc gtk static-libs mapbox test topology"
 
 RDEPEND="
diff --git a/dev-db/postgis/postgis-2.5.1-r1.ebuild b/dev-db/postgis/postgis-2.5.1-r1.ebuild
index 910b9060e6fe..39283cedf713 100644
--- a/dev-db/postgis/postgis-2.5.1-r1.ebuild
+++ b/dev-db/postgis/postgis-2.5.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://postgis.net"
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="address-standardizer doc gtk static-libs mapbox test topology"
 
 RDEPEND="
diff --git a/dev-db/postgis/postgis-2.5.1.ebuild b/dev-db/postgis/postgis-2.5.1.ebuild
deleted file mode 100644
index c78f3e5ac27d..000000000000
--- a/dev-db/postgis/postgis-2.5.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-POSTGRES_COMPAT=( 9.{3..6} {10..11} )
-POSTGRES_USEDEP="server"
-
-inherit autotools eutils postgres-multi versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net"
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="address-standardizer doc gtk static-libs mapbox test topology"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	dev-libs/json-c:=
-	dev-libs/libxml2:2
-	>=sci-libs/geos-3.5.0
-	>=sci-libs/proj-4.6.0
-	>=sci-libs/gdal-1.10.0
-	address-standardizer? ( dev-libs/libpcre )
-	gtk? ( x11-libs/gtk+:2 )
-	mapbox? ( dev-libs/protobuf )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.5
-				dev-libs/libxslt
-				|| (
-					media-gfx/imagemagick[png]
-					media-gfx/graphicsmagick[imagemagick,png]
-				)
-		)
-		virtual/pkgconfig
-		test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-MAKEOPTS+=' -j1'
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch"
-
-	local AT_M4DIR="macros"
-	eautoreconf
-
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	local myargs=""
-
-	use gtk                  && myargs+=" --with-gui"
-
-	use address-standardizer || myargs+=" --without-address-standardizer"
-	use mapbox               || myargs+=" --without-protobuf"
-	use topology             || myargs+=" --without-topology"
-
-	postgres-multi_foreach econf ${myargs}
-}
-
-src_compile() {
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C topology
-
-	if use doc ; then
-		postgres-multi_foreach emake comments
-		postgres-multi_foreach emake cheatsheets
-		postgres-multi_forbest emake -C doc html
-	fi
-}
-
-src_install() {
-	postgres-multi_foreach emake DESTDIR="${D}" install
-	postgres-multi_foreach emake -C topology DESTDIR="${D}" install
-	postgres-multi_forbest dobin ./utils/postgis_restore.pl
-
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	docinto topology
-	dodoc topology/{TODO,README}
-
-	if use doc ; then
-		postgres-multi_foreach emake DESTDIR="${D}" comments-install
-
-		docinto html
-		postgres-multi_forbest dodoc doc/html/{postgis.html,style.css}
-
-		docinto html/images
-		postgres-multi_forbest dodoc doc/html/images/*
-	fi
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
-
-pkg_postinst() {
-	ebegin "Refreshing PostgreSQL symlinks"
-	postgresql-config update
-	eend $?
-
-	elog "To finish installing PostGIS, follow the directions detailed at:"
-	elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions"
-}
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index dae6fa5c92e2..9dd65654aa6c 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -17,7 +17,7 @@ DIST postgresql-9.4.20.tar.bz2 17905682 BLAKE2B cb65228f8e78dc8b6303a06480a68de5
 DIST postgresql-9.5.15.tar.bz2 18707696 BLAKE2B f1be26085953d5a15a6545aed3527b9eec6eb57c72f2e05401e43200e628b3a42ee824dd1cb0138556b97fe4922a991489dffa77329b653475874766c1d5b944 SHA512 2ea241b6751a2812c689da9bde40151ebb7cdabdd14e93d92f8bea1e3fcf5bc0d4854834999f33270329e22a09c5aeaf8d59d36ca6e8860704f81f3adcfb30d5
 DIST postgresql-9.6.11.tar.bz2 20009048 BLAKE2B aa3e5b1e63c983226ea71737982e62eaff655af7e0f55f20ec886f5d7406b1e30e2fe5378b0dd1ef59e777f862ccc2386121653853d4c186a1b4853a9bbb1591 SHA512 a4314f92d1a661af4076d8c120533ecae76d91461043b8a6ad22dd6e5b562e0bf019bc7f3157a26d9666ba5866e254613ae5b690310168b029795dc088f8c060
 EBUILD postgresql-10.6.ebuild 13811 BLAKE2B d182148b6aa53049dc6387b9c18a98248ec6b2a66811c877c05b6c2e08bb3e10669b288fa96d4e39f6b29449cf86424176f3983df8146a4b230ee0e0d59bcf60 SHA512 043bd74949a04514b05058dc699e5876babd6b780c67760fa84a9a73d95c2c209d03c2de0b110083f7779d51815f0f093140ad052fc7ab7cf65a722858c2618f
-EBUILD postgresql-11.1.ebuild 13835 BLAKE2B da93203d0a71a0a337b813025dc5eb9d1867b8df20e10edbce9ec4d8c3bb3dc4c79944a30336024ce32558076736f7497695a9fd8ad24eb65bb4aff125cafb22 SHA512 c3cc87ba82c93930296c3a02f1445ec52dc00c83ae94e76736c28e3151b0d6accfff7b71b897f8926d940f2dc04b195f61bb7ee13e62adcd9da1f01f5d2e04ee
+EBUILD postgresql-11.1.ebuild 13833 BLAKE2B c05814f541269f5c38852063e02c37360de5a0903fd5deca35511606e786dd21b73c975e01f569b39988c765d5509e0287d8f797f5d1def322f4ab8830dac51f SHA512 fd55e3fe9de7ac169af0a3f3783038462f3760caaafbfd918e4c552a875c5b3948cfc1d14b157fad69baebd42bdb2b5261ed89a36fcccf2774faa212897152e2
 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.5.15.ebuild 14598 BLAKE2B 5b59320bd25c183a251ff9176e774e222a15eb68749f890c16f7657e0968d519229f3498730b26b3b2eca2e76fcb304d96616cf11287ccfdcc62894379771781 SHA512 f11b94faf2376216c5506017108a6282efa4e02106597f9502daaccd14177925aa363eab51f5aafb029ce7f3f5617778f71a26cd9a4d1b830f1176a8c68764da
diff --git a/dev-db/postgresql/postgresql-11.1.ebuild b/dev-db/postgresql/postgresql-11.1.ebuild
index e96b1033f79d..09481404e409 100644
--- a/dev-db/postgresql/postgresql-11.1.ebuild
+++ b/dev-db/postgresql/postgresql-11.1.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/soci/Manifest b/dev-db/soci/Manifest
index d6300739bed3..ab84a424b66c 100644
--- a/dev-db/soci/Manifest
+++ b/dev-db/soci/Manifest
@@ -1,3 +1,3 @@
 DIST soci-3.2.3.zip 508929 BLAKE2B e1a83172391508506744b18ac0b18d69bec34bfbd31d9156b2cb786cdb7cdd8a99ace21d1286a2c4432ba18e18dedc4f390075a25a30fa2e45f36d802661ddb2 SHA512 dd9b7eaf535502e3230eada4d4d019963d2c9cf59b69fff5d466b4fc00976fa08f7b0199a0e4564a0395d0d30095b97aa1d613dfbaa329feb077ece3b0efacdf
-EBUILD soci-3.2.3.ebuild 1235 BLAKE2B ce606fe16c860275ac1eb0d9e165c3bd6cf57ada31fc1698b30854ff9f3dfc6ffbbf4ec523466c4d6f06dd79bbaa800aef49885679bdd55dd6b89121f4868d32 SHA512 331534dc170ae1cf0d986069bca6dea98b4e97868c155972ae2ba28f15499bcf26af9abf15549a5b39102f592cc535be969f24699f1f3cb6f39c4b465211b1cb
+EBUILD soci-3.2.3-r1.ebuild 1245 BLAKE2B 2582143b8657e4def6021b4372afca615d373347b38488e37856c698a42a1e334b0a660ca476d5cb3c21d3086c086e33a7ceb7a786a558a58d665f8b952409c0 SHA512 751da2107285e8b6aca6ffa2fb72f84e08402dc5a9cd681110bdd0144f7aa1cc078ebd21524011a1b3442633412ae8afcf2b926a91ee2fe97d79ae934df97741
 MISC metadata.xml 343 BLAKE2B 7257e5f29bfd60e7231870e28d745ea123af37110ddf907c7a4dedb4e984a330e62f02f61b59075ee7eb30a77f89e5b3edc72070a18158fa5cbf6e5bb3596908 SHA512 a3441b5c5f7127af874a08bc9e05dd95f1594167906383c44fcfb9620e52fdabdd90b23c2cbc6f082699150b1593b4600f7a9eae54c799f501b95ca9022d83c7
diff --git a/dev-db/soci/soci-3.2.3.ebuild b/dev-db/soci/soci-3.2.3-r1.ebuild
index f31882f3e189..9051f4411cb7 100644
--- a/dev-db/soci/soci-3.2.3.ebuild
+++ b/dev-db/soci/soci-3.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ IUSE="boost doc +empty firebird mysql odbc oracle postgres sqlite static-libs te
 
 RDEPEND="
 	firebird? ( dev-db/firebird )
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c:= )
 	odbc? ( dev-db/unixODBC )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	postgres? ( dev-db/postgresql:= )
diff --git a/dev-db/sqldeveloper/Manifest b/dev-db/sqldeveloper/Manifest
index a079366a11da..d4d60332a7b2 100644
--- a/dev-db/sqldeveloper/Manifest
+++ b/dev-db/sqldeveloper/Manifest
@@ -1,5 +1,5 @@
 AUX sqldeveloper 325 BLAKE2B e89acd5441362bc693296e2fef189e637944413094169c09be73bb1f514393f0239c7f4c5b186dd0e34bd1bda9730f4bb2e029b166f1db740ac34eff25097c84 SHA512 ab1d70c5b693efe5e6270d7fcd0ba7ef30852ed98fe88a1853c5b415178c51bbb754a4da6964b5e57e87c38015cc90ac2fc04b7aa121b660300434523457bad2
 AUX sqldeveloper-r1 407 BLAKE2B 26bf826e6ccf1cd45b52e7cdf6e694d88570118c0e98cab83f66f078ed79fea36fb3fa6df67dc271a74faad4307996c4968f6d316d9fc71d1a5360804f39782e SHA512 cf089f58c9de3677dbaa7b0c4bdd81e234bffac4c25f5a433c7854068ca33b5a4165d8a5d24188890d5d8c60c209adee5267a255505b978a5a7f73646fd1dfbe
 DIST sqldeveloper-4.2.0.17.089.1709-no-jre.zip 348604841 BLAKE2B 0c3adff04f148102e6460c7550f787329c7e5a69aca0b81c2de4725b9c9ea27c03bb2f588671a95371aa3612839805f2042855b443bb5635c70d0e0b2140295b SHA512 4d1e270376ae125a60146228e35fcb2cb615d593c0e9f2ca98e4deef4d8fd1ddff59cf15064d63e33e77125f49e8da9fe317ed1fd96a9b00a699bf6c5e739874
-EBUILD sqldeveloper-4.2.0.17.089.1709.ebuild 3190 BLAKE2B e4e4e81cc5c01cdeddf44055ca5ec19fec36bc7675cdb3d1ec4a53818cf219b5d51099d4b0e53ca837a71f2de36e290f286841588a5c5ec628ace9f6376b6e4d SHA512 305a91cfc7fde07dbaecff945a4bad4681d06d671a5aa3df0871dd7a91319bd43580bae1790142b891dc03ed9ed1b0b5c567effe0dd1ba1ce9914408b29cc5b6
+EBUILD sqldeveloper-4.2.0.17.089.1709.ebuild 3200 BLAKE2B 72022780aad23a4d907b1911447162bee87f5e7d9d68ac0577f3451b2db06931eb12437559752f7970fe4f9348bac470baaf2bd92445d39e6d48411c87235385 SHA512 db084a3aaadd441174b4175c70af7b08833979362ea5093ffdd16a3ebefca440511d6592322b4fc9b641abdc10c3bbf7a67b82766811983c5aaa6baa4f0cdd29
 MISC metadata.xml 261 BLAKE2B 9772344d77d5ee748886120e69eb80ebc3df85fe5a371772e32b139a0ee39fc8f2758d0f576abca035f2f5ea4124777d44b7d921e56593cbcb819eaf313fd5c6 SHA512 2a60e17b95fab939ca49a24940840277dcd64fd0fa43ad981c933f6f3af3b2eed56ff710f57f6d41fc19877e6e99d4489e8121d9a64d0447ad1348a4a744f613
diff --git a/dev-db/sqldeveloper/sqldeveloper-4.2.0.17.089.1709.ebuild b/dev-db/sqldeveloper/sqldeveloper-4.2.0.17.089.1709.ebuild
index 378497466c31..7979de3c0dd0 100644
--- a/dev-db/sqldeveloper/sqldeveloper-4.2.0.17.089.1709.ebuild
+++ b/dev-db/sqldeveloper/sqldeveloper-4.2.0.17.089.1709.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,7 +36,7 @@ pkg_nofetch() {
 	eerror "and download"
 	eerror "	Oracle SQL Developer for other platforms"
 	eerror "		${SRC_URI}"
-	eerror "and move it to ${DISTDIR}"
+	eerror "and move it to your DISTDIR directory."
 }
 
 src_prepare() {
diff --git a/dev-db/sqliteodbc/Manifest b/dev-db/sqliteodbc/Manifest
index bce0760f7fb6..e957aa540f9b 100644
--- a/dev-db/sqliteodbc/Manifest
+++ b/dev-db/sqliteodbc/Manifest
@@ -2,5 +2,5 @@ AUX sqliteodbc-0.93-respect_LDFLAGS.patch 1180 BLAKE2B b7f80800269febf41e0693faf
 DIST sqliteodbc-0.96.tar.gz 670070 BLAKE2B df33d64522fc4b2f63d169995677ce2437e283bb039e4eae8297816a053879e5c8c34867175f2b92785b7e24cd04892b990fb213bfb473fcf7a694a362ec4f65 SHA512 447798bbc018890a784abc6b75909fbf9ecd285d6ead3ed437727041ba3ff20ef3ceb1dfe4efb713717b7df2431fd52933e6bcafc2405674cf76518dd5b39435
 DIST sqliteodbc-0.99.tar.gz 696992 BLAKE2B ec5f87b7719573ce533d9bc316e840def5e07f3da65dca822068e57eb0e3f5eb8f1593119d704ad007f015cdf35d85c0cc53cdea5d0688faedccf611fc4d2fae SHA512 adf213acee4ee69c299f39582887fd2adba3856ce6d298d250e3a96744d041c720cefb7fd8acd504c41461751b46b8a729c4fbfa7e56832fb6e4c5a1c537955d
 EBUILD sqliteodbc-0.96.ebuild 800 BLAKE2B 27c9e05145d9f791e3e92f9f567ab9b3f2f2e8759d21ad11e997ce10f668e1407e01616de093b6be1330415ec6b261ee843f72b94e5531b6388fd32f404dd03a SHA512 27a9cef0023a198be47f4b4dfdfff8b9d57043d09e35031049cb3520f631f5feec01940ac7a7325e0e478a914c1a53db2298c035acd916d0f1d1d480158a6105
-EBUILD sqliteodbc-0.99.ebuild 823 BLAKE2B b591b24255a379276a094f2a2c200684a44fddc81f7f50c95e23a29c49dafb62ec6a84bb96aa72d0faa2cc7e0b280cfb41fbbf3f17180b2349cd32da20b0074a SHA512 3db5f1cee8919f6bb832c7799f7cc6a3d4b41818bd01bf7060b59bf6df62861ab72357090c9c755f6b811db94798eea93a663bcaf5fd714df1f2c582e93dc811
+EBUILD sqliteodbc-0.99.ebuild 819 BLAKE2B 8aa7093c1d84f052357d357d54c9f66e13415036be46f400c930d7a45a073cc1a80d720f63f06fec6099b7e08a4365f7e765deda28ea5bb2bc29da0c18c1efd0 SHA512 159423051d670353f763a3067fb0c1688f08192ff605a3c0395045829b1de5359add3b95bcecb68f33e0f4e0a27d245297fd0c7c0348b224c81058c9c4a5e5dc
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-db/sqliteodbc/sqliteodbc-0.99.ebuild b/dev-db/sqliteodbc/sqliteodbc-0.99.ebuild
index b82e0f692fec..b1a7239d1eac 100644
--- a/dev-db/sqliteodbc/sqliteodbc-0.99.ebuild
+++ b/dev-db/sqliteodbc/sqliteodbc-0.99.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="http://www.ch-werner.de/sqliteodbc/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ppc ~x86"
 IUSE=""
 
 DEPEND=">=dev-db/sqlite-3.6
diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest
index 81a29de9c9c2..9aeea8e02a6f 100644
--- a/dev-db/sqlitestudio/Manifest
+++ b/dev-db/sqlitestudio/Manifest
@@ -1,9 +1,6 @@
-AUX sqlitestudio-3.0.6-portable.patch 313 BLAKE2B abd43b5f413ea0a7dd5a1f72a70cb3c828f764ee8aad4ec787b7d5c6f12c42defb6b39bb542f515123be27ba6585eebf09c9cd5a663b48610db4fc5ed1222aa9 SHA512 85a6c67488196b182ea3dc4df065ab175c0da5140d892fd9cfc7c2a120a2dc91b89878f66d92d7e9f085676f0c0dfff6adbfe5742868e62b1b47332232447f07
-AUX sqlitestudio-3.0.6-qt5_5-QDataStream.patch 912 BLAKE2B d362ec9ca2171be5a137800ada97bae4fc6c184b97ca0566818f1f3e40096249d9bb44a84e97d34393b53babdcfd60aab80aa2c9e185b4e02c93c6bb84958a29 SHA512 217152e6a8cab0ef52de6f7704c1ed7db6f2b3134bd107d49c1c00405922afd0561046123dac53d91827856b6586c8946231643fe369b3775459cd247c46ceaf
-AUX sqlitestudio-3.0.7-paths.patch 735 BLAKE2B 2c3fa18d679e6a214bcb27614f02abcc200e31cbee139709700642d7cfdabeea4eb3b589eccdb9197162a4b0266013dbbbbb27c15b4f6a41c4dfcc020e5d9df3 SHA512 cbe5e66483fa8fcfde80e62f2061d59af002aa3f616e5674f49049c21d0683b3b0668c1793186dc2757c870ce71566ca38283e4f1d34bdecb903ab2eaabeebe2
 AUX sqlitestudio-3.1.1-qt-5.11.patch 737 BLAKE2B 04dcbdc017d483d4d3c9c8565afc6a2679d8f296d224287e882f666b7dfb3d71849efa1d9cb8bd0a471c2a241b851f4eb97c2f3d6a6920bee0ccb53f8b6f6218 SHA512 16697058c404a738d1fb43fe0c9e5f447334c408282b60fab1e097f831db5b83baee26f31ef4e9eeb8d22a20b3fad243e2304bdd2e6f0ed2f658e728570c82ec
-DIST sqlitestudio-3.0.7.tar.gz 2551341 BLAKE2B b499aac9d251b9682c241e37c30f52d6fce65bc317ee39022e385d2535e2e62b9213bc72941236fcb355d0f8a56924f9d28d32db9937a0af6e7a0cfb05252763 SHA512 2171fe26754aed2abe24d73e9ccc2ee1abe5e87228096bc5643c5638ad578dc323b810535f41d0206b3d7a7aa75132bfb578972c7945b962dd593543c7da3270
 DIST sqlitestudio-3.1.1.tar.gz 8610037 BLAKE2B 7f0de65a31a8c25da305cb8d73a03f4215a1134c652e6fb68424ae2153afb1e3655ae3360b2c25b863f105a53cd5fb9909d3f8aa5674f25f0e19a080b15dfa97 SHA512 421247730660e8396f692fd8df9366e6ae834633823004ef3cb7c6f3064e66f420f0517df6a8542b800f7f88dacf2fc646b4224b423ab3994c7d8a083e82e143
-EBUILD sqlitestudio-3.0.7.ebuild 3332 BLAKE2B fa184dd1694a0034c9d34827ba257da9097a0fa8b7f1d552718d328cef7ed0ea05b3e7adf7ce9887b20d6753063f196f96e228076e758615772cb1543db57e55 SHA512 d4560ef7865d0c5356ae23cecec834669e4ad17ab96e020bdd9a5d6dcd493fa038793296376538e5460c22a79df579a6ea90eeb3f1afa1d8cd2550de9d291547
+DIST sqlitestudio-3.2.1.tar.gz 9405867 BLAKE2B 53cd8465a6140cf17c602094cceef2fdf74f513f33257b22e1a3d7adcb9c78d8eb2cdaff047920836a9d98429ba0025924ce608f2eab97319feabf063de4c9ee SHA512 9c07f0dc50bf35ad04d0cb06cfc1a306d3f0aa9446e7d737c8187c63cb7dd2c44fb4b960693f2c30a15ece3aac0878701874a9ce3cebfe0c6bf48df10814a574
 EBUILD sqlitestudio-3.1.1.ebuild 3545 BLAKE2B 1a1d5d15fadf26d2c54f9c3d53d13e67dbe111ef10e195b6f5ecc2bea566527340efbeb85e34e16278bf8e65ebc30c88c0ffee818e3ce0a6d9e75508e4138a64 SHA512 b2cda1f8321266bd63a8dd4ff92420be7d99eea670c9eeaadcf425df7b9e70f90ed589fdaf3f15bc7448f5bc09218a967963bdebc6888efefc7e118e7eaa3360
+EBUILD sqlitestudio-3.2.1.ebuild 3702 BLAKE2B 0c948401a7134af8d8db54ff53689e7d13df1481ca47983c4ceecf0b7e47f69d0ce55df44da1a5dd57dad9cb6823b15287ef29ae72ba13a3eba657b92fedc2f9 SHA512 194b248204b5ffafbc05db47fe161b0177204b40030314e1e720a4163d9002ad1f64bd87d41191a413392bdd1cd833e48651158968bf4b06f9df5e48a4281120
 MISC metadata.xml 427 BLAKE2B 937831b3acf561038a945599a81766c4fd1712d889b8bb0ba2c7b8c0d2414c547e270363b6ece7fd7956b66f1eec2e12bb4b83a2adf2718c14d0271d3c0f0155 SHA512 a6948ce576abceb4df085f103e097a720ef5f959c6f4bb79cc1f1d858e43cea625d5af3c5edf47f5e61c0a537368e60abd77ed3fcf39a9526543de315ef125b2
diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-portable.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-portable.patch
deleted file mode 100644
index 558a84231b81..000000000000
--- a/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-portable.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/SQLiteStudio3/sqlitestudio/sqlitestudio.pro	2015-11-24 20:09:29.000000000 +0100
-+++ b/SQLiteStudio3/sqlitestudio/sqlitestudio.pro	2016-01-20 15:04:46.700926391 +0100
-@@ -25,7 +25,7 @@
- 
- CONFIG   += c++11
- QMAKE_CXXFLAGS += -pedantic
--linux|portable {
-+portable {
-     QMAKE_LFLAGS += -Wl,-rpath,./lib
- }
- 
diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-qt5_5-QDataStream.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-qt5_5-QDataStream.patch
deleted file mode 100644
index c42160c52f07..000000000000
--- a/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-qt5_5-QDataStream.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/SQLiteStudio3/coreSQLiteStudio/db/db.cpp	2015-05-11 23:22:41.000000000 +0200
-+++ b/SQLiteStudio3/coreSQLiteStudio/db/db.cpp	2016-01-20 02:21:00.350160645 +0100
-@@ -1,6 +1,7 @@
- #include "db.h"
- #include <QMetaEnum>
- #include <QDebug>
-+#include <QDataStream>
- 
- Db::Db()
- {
---- a/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp	2015-05-11 23:22:41.000000000 +0200
-+++ b/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp	2016-01-20 01:46:22.113263710 +0100
-@@ -11,6 +11,7 @@
- #include <QDebug>
- #include <QRegularExpression>
- #include <QDir>
-+#include <QDataStream>
- 
- #ifdef Q_OS_LINUX
- #include <sys/utsname.h>
---- a/SQLiteStudio3/sqlitestudiocli/cli_config.h	2015-05-11 23:22:40.000000000 +0200
-+++ b/SQLiteStudio3/sqlitestudiocli/cli_config.h	2016-01-20 02:45:11.393819294 +0100
-@@ -2,6 +2,7 @@
- #define CLI_CONFIG_H
- 
- #include "config_builder.h"
-+#include <QDataStream>
- 
- namespace CliResultsDisplay
- {
diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.0.7-paths.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.0.7-paths.patch
deleted file mode 100644
index 59d8c0f187aa..000000000000
--- a/dev-db/sqlitestudio/files/sqlitestudio-3.0.7-paths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Plugins/DbAndroid/DbAndroid.pro	2015-11-24 20:09:41.000000000 +0100
-+++ a/Plugins/DbAndroid/DbAndroid.pro	2016-01-20 13:39:02.436869035 +0100
-@@ -6,7 +6,7 @@
- 
- QT += widgets network
- 
--include($$PWD/../../../sqlitestudio/SQLiteStudio3/plugins.pri)
-+include($$PWD/../../SQLiteStudio3/plugins.pri)
- 
- TARGET = DbAndroid
- TEMPLATE = lib
---- a/Plugins/ScriptingTcl/ScriptingTcl.pro
-+++ b/Plugins/ScriptingTcl/ScriptingTcl.pro
-@@ -35,7 +35,7 @@ linux: {
- 
-     # Find tclConfig.sh
-     TCL_CONFIG_DIR = $$system(echo "puts [info library]" | tclsh)
--    TCL_CONFIG = $$TCL_CONFIG_DIR/tclConfig.sh
-+    TCL_CONFIG = $$TCL_CONFIG_DIR/../tclConfig.sh
-     message("Looking for $$TCL_CONFIG")
-     !exists($$TCL_CONFIG) {
- 	# Debian case
diff --git a/dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild
deleted file mode 100644
index 21747b2426f6..000000000000
--- a/dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Upstream guide: http://wiki.sqlitestudio.pl/index.php/Compiling_application_from_sources
-
-EAPI=6
-
-inherit qmake-utils fdo-mime kde5-functions
-
-DESCRIPTION="SQLiteStudio3 is a powerful cross-platform SQLite database manager"
-HOMEPAGE="http://sqlitestudio.pl"
-LICENSE="GPL-3"
-SRC_URI="${HOMEPAGE}/files/sqlitestudio3/complete/tar/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli cups tcl test"
-
-RDEPEND="
-	dev-db/sqlite:3
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep designer)
-	cups? ( $(add_qt_dep qtprintsupport) )
-	cli? ( sys-libs/readline:= )
-	tcl? ( dev-lang/tcl:= )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-	>=sys-devel/gcc-4.8:*
-	test? ( $(add_qt_dep qttest) )
-"
-
-S="${WORKDIR}"
-core_build_dir="${S}/output/build"
-core_src_dir="${S}/SQLiteStudio3"
-plugins_build_dir="${core_build_dir}/Plugins"
-plugins_src_dir="${S}/Plugins"
-
-src_prepare() {
-	PATCHES=(
-		"${FILESDIR}"/${PN}-3.0.6-qt5_5-QDataStream.patch
-		"${FILESDIR}"/${PN}-3.0.6-portable.patch
-		"${FILESDIR}"/${PN}-3.0.7-paths.patch
-	)
-	default
-
-	disable_modules() {
-		[ $# -lt 2 ] && return 0
-		local file="$1"; shift
-
-		edos2unix "${file}"
-
-		local regex=""
-		for m in "$@"; do
-			regex+="\b${m}\b( \\\\|\$)|"
-		done
-		regex="${regex:0:-1}" # last pipe
-
-		elog "Disabling modules: '$*' in '${file#${S}/}'"
-		sed -i -r -e "/${regex}/d" -- "${file}" || return 1
-	}
-
-	## Core
-	local disabled_modules=(
-		$(usex cli '' 'cli')
-	)
-	disable_modules "${core_src_dir}/SQLiteStudio3.pro" "${disabled_modules[@]}" || die
-
-	## Plugins
-	local disabled_plugins=(
-		'DbSqlite2'
-		$(usex tcl '' 'ScriptingTcl')
-		$(usex cups '' 'Printing')
-	)
-	disable_modules "${plugins_src_dir}/Plugins.pro" "${disabled_plugins[@]}" || die
-}
-
-src_configure() {
-	local qmake_args=(
-		"LIBDIR=${EROOT}usr/$(get_libdir)"
-		"BINDIR=${EROOT}usr/bin"
-		"DEFINES+=PLUGINS_DIR=${EROOT}usr/$(get_libdir)/${PN}"
-		"DEFINES+=ICONS_DIR=${EROOT}usr/share/${PN}/icons"
-		"DEFINES+=FORMS_DIR=${EROOT}usr/share/${PN}/forms"
-
-		'DEFINES+=NO_AUTO_UPDATES' # not strictly needed since 3.0.6, but nevermind
-		$(usex test 'DEFINES+=tests' '')
-	)
-
-	## Core
-	mkdir -p "${core_build_dir}" && cd "${core_build_dir}" || die
-	eqmake5 "${qmake_args[@]}" "${core_src_dir}"
-
-	## Plugins
-	mkdir -p "${plugins_build_dir}" && cd "${plugins_build_dir}" || die
-	eqmake5 "${qmake_args[@]}" "${plugins_src_dir}"
-}
-
-src_compile() {
-	cd "${core_build_dir}"		|| die && emake
-	cd "${plugins_build_dir}"	|| die && emake
-}
-
-src_install() {
-	cd "${core_build_dir}"		|| die && emake INSTALL_ROOT="${ED}" install
-	cd "${plugins_build_dir}"	|| die && emake INSTALL_ROOT="${ED}" install
-
-	dodoc "${core_src_dir}/docs/sqlitestudio3_docs.cfg"
-	doicon -s scalable "${core_src_dir}/guiSQLiteStudio/img/${PN}.svg"
-
-	make_desktop_entry_args=(
-		"${EROOT}usr/bin/${PN} %F"	# exec
-		'SQLiteStudio3'				# name
-		"${PN}"						# icon
-		'Development;Utility'		# categories
-	)
-	make_desktop_entry_extras=( 'MimeType=application/x-sqlite3;' )
-	make_desktop_entry "${make_desktop_entry_args[@]}" \
-		"$( printf '%s\n' "${make_desktop_entry_extras[@]}" )"
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
diff --git a/dev-db/sqlitestudio/sqlitestudio-3.2.1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.2.1.ebuild
new file mode 100644
index 000000000000..bd8f78a3763d
--- /dev/null
+++ b/dev-db/sqlitestudio/sqlitestudio-3.2.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="de es fr it pl pt_BR ro_RO ru sk zh_CN"
+
+inherit desktop l10n qmake-utils xdg
+
+DESCRIPTION="Powerful cross-platform SQLite database manager"
+HOMEPAGE="https://sqlitestudio.pl"
+SRC_URI="https://sqlitestudio.pl/files/sqlitestudio3/complete/tar/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cli cups tcl test"
+
+REQUIRED_USE="test? ( cli )"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	cli? ( sys-libs/readline:0= )
+	cups? ( dev-qt/qtprintsupport:5 )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	test? ( dev-qt/qttest:5 )
+"
+
+S="${WORKDIR}"
+core_build_dir="${S}/output/build"
+plugins_build_dir="${core_build_dir}/Plugins"
+
+src_prepare() {
+	xdg_src_prepare
+
+	sed -i -e 's/linux|portable/portable/' \
+		SQLiteStudio3/sqlitestudio/sqlitestudio.pro || die
+
+	disable_modules() {
+		[[ $# -lt 2 ]] && die "not enough arguments"
+
+		local pro="$1"; shift
+		local modules="${@}"
+
+		sed -r -i \
+			-e 's/('${modules// /|}')[[:space:]]*(\\?)/\2/' \
+			${pro} || die
+	}
+
+	use cli || disable_modules SQLiteStudio3/SQLiteStudio3.pro cli
+
+	local mod_lst=( DbSqlite2 )
+	use cups || mod_lst+=( Printing )
+	use tcl || mod_lst+=( ScriptingTcl )
+	disable_modules Plugins/Plugins.pro ${mod_lst[@]}
+
+	local mylrelease="$(qt5_get_bindir)"/lrelease
+	local ts_dir_lst=$(find * -type f -name "*.qm" -printf '%h\n' | sort -u)
+	local ts_pro_lst=$(find * -type f -name "*.pro" -exec grep -l 'TRANSLATIONS' {} \;)
+	local ts_qrc_lst=$(find * -type f -name "*.qrc" -exec grep -l '\.qm' {} \;)
+
+	# delete all "*.qm"
+	for ts_dir in ${ts_dir_lst[@]}; do
+		rm "${ts_dir}"/*.qm || die
+	done
+
+	prepare_locale() {
+		for ts_dir in ${ts_dir_lst[@]}; do
+			local ts=$(find "${ts_dir}" -type f -name "*${1}.ts" || continue)
+			"${mylrelease}" "${ts}" || die "preparing ${1} locale failed"
+		done
+	}
+
+	rm_locale() {
+		for ts_pro in ${ts_pro_lst[@]}; do
+			sed -i -r -e 's/[^[:space:]]*'${1}'\.ts//' \
+				${ts_pro} || die
+		done
+
+		for ts_qrc in ${ts_qrc_lst[@]}; do
+			sed -i -e '/'${1}'\.qm/d' \
+				${ts_qrc} || die
+		done
+	}
+
+	local ts_dir_main="SQLiteStudio3/sqlitestudio/translations"
+	l10n_find_plocales_changes ${ts_dir_main} "sqlitestudio_" '.ts'
+	l10n_for_each_locale_do prepare_locale
+	l10n_for_each_disabled_locale_do rm_locale
+
+	# prevent "multilib-strict check failed" with USE test
+	sed -i -e 's/\(target.*usr\/\)lib/\1'$(get_libdir)'/' \
+		SQLiteStudio3/Tests/TestUtils/TestUtils.pro || die
+}
+
+src_configure() {
+	# NOTE: QMAKE_CFLAGS_ISYSTEM option prevents
+	# build error with tcl use enabled (stdlib.h is missing)
+	local myqmakeargs=(
+		"BINDIR=${EPREFIX}/usr/bin"
+		"LIBDIR=${EPREFIX}/usr/$(get_libdir)"
+		"QMAKE_CFLAGS_ISYSTEM=\"\""
+		$(usex test 'DEFINES+=tests' '')
+	)
+
+	## Core
+	mkdir -p "${core_build_dir}" && cd "${core_build_dir}" || die
+	eqmake5 "${myqmakeargs[@]}" "${S}/SQLiteStudio3"
+
+	## Plugins
+	mkdir -p "${plugins_build_dir}" && cd "${plugins_build_dir}" || die
+	eqmake5 "${myqmakeargs[@]}" "${S}/Plugins"
+}
+
+src_compile() {
+	emake -C "${core_build_dir}"
+	emake -C "${plugins_build_dir}"
+}
+
+src_install() {
+	emake -C "${core_build_dir}" INSTALL_ROOT="${D}" install
+	emake -C "${plugins_build_dir}" INSTALL_ROOT="${D}" install
+
+	doicon -s scalable "SQLiteStudio3/guiSQLiteStudio/img/${PN}.svg"
+
+	local make_desktop_entry_args=(
+		"${PN} -- %F"
+		'SQLiteStudio3'
+		"${PN}"
+		'Development;Database;Utility'
+	)
+	make_desktop_entry "${make_desktop_entry_args[@]}" \
+		"$( printf '%s\n' "MimeType=application/x-sqlite3;" )"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-02-10 15:40:27 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-02-10 15:40:27 +0000
commit	6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch)
tree	cee0a97398040001220ece3cd48c3d568bcddb4a /dev-db
parent	1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff)