From 8fcdcec5fbdd0e3a77391e4f354218014f59f358 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 5 Jan 2018 20:45:13 +0000
Subject: gentoo resync : 05.01.2018

---
 dev-db/Manifest.gz                                 | Bin 22113 -> 22106 bytes
 dev-db/etcd/Manifest                               |   4 +-
 dev-db/etcd/etcd-3.2.11.ebuild                     |  63 -----
 dev-db/etcd/etcd-3.2.13.ebuild                     |  63 +++++
 dev-db/mongodb/Manifest                            |   6 -
 .../files/mongodb-2.4-fix-v8-pythonpath.patch      |  11 -
 .../files/mongodb-2.6.10-fix-boost-1.57.patch      |  13 -
 dev-db/mongodb/files/mongodb-2.6.2-fix-scons.patch |  35 ---
 dev-db/mongodb/mongodb-2.6.12.ebuild               | 183 --------------
 dev-db/pgadmin3/Manifest                           |   2 +-
 dev-db/pgadmin3/pgadmin3-1.22.2.ebuild             |   4 +-
 dev-db/postgis/Manifest                            |  10 -
 dev-db/postgis/files/postgis-2.0-arflags.patch     |  18 --
 dev-db/postgis/files/postgis-2.1-ldflags.patch     |  26 --
 .../files/postgis-2.1.4-pkgconfig-json.patch       | 122 ---------
 dev-db/postgis/files/postgis_dbs                   |  49 ----
 dev-db/postgis/postgis-2.1.8-r1.ebuild             | 281 ---------------------
 dev-db/postgis/postgis-2.3.3.ebuild                | 116 ---------
 dev-db/postgis/postgis-2.4.0.ebuild                | 116 ---------
 dev-db/pspg/Manifest                               |   8 +-
 dev-db/pspg/pspg-0.5.ebuild                        |  16 --
 dev-db/pspg/pspg-0.7.4.ebuild                      |  16 --
 dev-db/pspg/pspg-0.7.5.ebuild                      |  16 --
 dev-db/pspg/pspg-0.9.0.ebuild                      |  16 ++
 24 files changed, 86 insertions(+), 1108 deletions(-)
 delete mode 100644 dev-db/etcd/etcd-3.2.11.ebuild
 create mode 100644 dev-db/etcd/etcd-3.2.13.ebuild
 delete mode 100644 dev-db/mongodb/files/mongodb-2.4-fix-v8-pythonpath.patch
 delete mode 100644 dev-db/mongodb/files/mongodb-2.6.10-fix-boost-1.57.patch
 delete mode 100644 dev-db/mongodb/files/mongodb-2.6.2-fix-scons.patch
 delete mode 100644 dev-db/mongodb/mongodb-2.6.12.ebuild
 delete mode 100644 dev-db/postgis/files/postgis-2.0-arflags.patch
 delete mode 100644 dev-db/postgis/files/postgis-2.1-ldflags.patch
 delete mode 100644 dev-db/postgis/files/postgis-2.1.4-pkgconfig-json.patch
 delete mode 100644 dev-db/postgis/files/postgis_dbs
 delete mode 100644 dev-db/postgis/postgis-2.1.8-r1.ebuild
 delete mode 100644 dev-db/postgis/postgis-2.3.3.ebuild
 delete mode 100644 dev-db/postgis/postgis-2.4.0.ebuild
 delete mode 100644 dev-db/pspg/pspg-0.5.ebuild
 delete mode 100644 dev-db/pspg/pspg-0.7.4.ebuild
 delete mode 100644 dev-db/pspg/pspg-0.7.5.ebuild
 create mode 100644 dev-db/pspg/pspg-0.9.0.ebuild

(limited to 'dev-db')

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 477fdac93bc0..fb106ec64d2b 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index 656ad9c82bad..c3b43a148bdf 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -5,9 +5,9 @@ AUX etcd.logrotated 104 BLAKE2B 3126c99db171af177d6d6368e7e53f3e5e07b9ae2926ff12
 AUX etcd.service 304 BLAKE2B ecffe9889f9530bf7172638a0273736abba2b3ea5c5540b5452d26fbaec17ab9c138db86b543c3c88fd3d16ce79487eb2c31ad7bbfb0c5b9cd11eede9b99bd2d SHA512 0074f77a17afe2bb4145f12a6eb312caa3e08cfe8bf35856b79d091ad8786c4223bd91c0a865e789ee9ba180f2672b31721742bb32efd0cd383bc747eb926961
 AUX etcd.tmpfiles.d.conf 76 BLAKE2B e5aa0ca42dd579e9c2ac8c6bdfce83f87ec79ce64d10e20b61ab3df45918747f588b9246085fec925bb39b772e061628aadd030a23a59b65a2fc2243eca1a7f9 SHA512 7324b74dcfe050dd7fbc318ca3ce9b5d58bce8fa2ce2d2d771664ef981c834375f7cbfebcb630cd61dab2a3f6bf6c3733ad04f752beadf7bb6fedcc80ff682ce
 DIST etcd-2.3.8.tar.gz 2206562 BLAKE2B 754930b4b5f0e90386b2b4765a9dbb6790ae509a81d3430c3f7c2c828d90318db3b01a2faea0c7075078096ce74302f2be7444245047534749f49d13a927851e SHA512 4268de32797cab23e9e47784d31d5abd6982068c53d3cc9735a06719740dba45b73f4e067cbc7aa8aef5ca7c56d8be067f1076685ac82f64012b760d8b7f2bfc
-DIST etcd-3.2.11.tar.gz 3016255 BLAKE2B b57d70ab50e9b8c7bf11920c0bf18789975af7f4f1d66b0afb17ba1d4830250972ba2e276de4d67b80bec317cf9d35eac7f63f8ca7c7c25fce2947807dcc42f8 SHA512 e0a71d43d6595c0a08a6068addcf13c98d3d8bd6873c9b5ac39b6183daea34191c1b81a2c81f5c7ec98d587c85f3b1af8cd584d7a0857668f77fb80151858fdb
 DIST etcd-3.2.12.tar.gz 3046578 BLAKE2B 7b7a071c6856a7f1b5b7ceb68a4efbac74fde6ed1211dabda7d715ea79cd4dc9c10b0f1345d70b8a21e52cb3ac6adfc37c232ea28ff88e5f401212b5a8610d73 SHA512 b672a35ba62efccffa09be6b3d2a84b99e8abcae87093539c705d82e13c0f985a9f07a3d885af7386595f12d433756176db107739749c301e7e5d096e85d018b
+DIST etcd-3.2.13.tar.gz 3047049 BLAKE2B f0ac987aef60fcc28636cfb60d5f4e00daee29a3d5167900599760090c3fa3d7932abb6224df5fb66ea5bdbc29a9ce7f7263a0e81522853ab190be94a6551ebc SHA512 4f3c5856ecf9e8a725d0ef80bb584e7b2edaf7215635a5c74fe32b175ce9f8d07ba57685586dfd79b893d04641d4169382d22f2eea442efc1112fa91c8175d45
 EBUILD etcd-2.3.8.ebuild 1379 BLAKE2B a6bff7dcfef244a2de25f4bf9168eb41552e394edf4a5e573a5b7dcea580debc3a87008b9d77d717b31b0fe27dcc08cdee76f855865455cde2fd26c16aee00e4 SHA512 ea3065641cac36b9011238603479967c1de5ab6f0ccb61dbc54b751879ff239b43065034b17045eb9467e1870878e4837af88c922f9034899da1359b69be98f3
-EBUILD etcd-3.2.11.ebuild 1474 BLAKE2B bcddd25f09f10fa85d1199f2e9c295aa3ac66721a8c660e2ca22cba8d881393fcf5bc289c7141b4fa10e94a25deedc65c37fa5b384747fc1f1a9fcdaa8aa3c19 SHA512 21daa3a43edf7cdce091e376302967ca86bf3d3d09babab7bb331b7efed065c6b2d74b7eeb74e010b2d4d84595776befb037dc78391b37e5c7bab8e67b5d7cd5
 EBUILD etcd-3.2.12.ebuild 1475 BLAKE2B 362f159043caf3e4eeb86dc6f986d20944ee0f6dcb056348e3cfb2ea91d7ac2e3cf8b7cc9f9453046e17fd1613edc6e327c0b21c77d523664a79926058b46bc0 SHA512 b7b1a31797590cde253eb3df3d891620c812456159aeaf5fb0ea332b91517b898604d7c57c3c78c9515ee2e72750794450c40e54a1852ea0a5dfda9c0d346fad
+EBUILD etcd-3.2.13.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
 MISC metadata.xml 614 BLAKE2B be58143e8f3c7adfefa4be2af02a57738eb30bad4ccc63bb7756585cc71b5d40a705d0f16d61fe263f3858e53b965e3611386dcea04bba985a0bb09eb95231f0 SHA512 92fbd483e5a757d09c07c392cc6d54a5448b6ca02177fbc48ff9f1b4f558af4755e4590e3d7192dbc3e5a32d5bf797289a7b1067e585dd295e3e890b88af9cb2
diff --git a/dev-db/etcd/etcd-3.2.11.ebuild b/dev-db/etcd/etcd-3.2.11.ebuild
deleted file mode 100644
index 9de03c3233bf..000000000000
--- a/dev-db/etcd/etcd-3.2.11.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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/coreos/etcd"
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/coreos/etcd"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc"
-DEPEND=">=dev-lang/go-1.8:="
-RDEPEND="!dev-db/etcdctl"
-
-src_prepare() {
-	default
-	sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
-		-i "${S}"/src/${EGO_PN}/build || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_compile() {
-	export GOPATH=${S}
-	pushd src/${EGO_PN} || die
-	./build || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	insinto /etc/${PN}
-	doins "${FILESDIR}/${PN}.conf"
-	dobin bin/*
-	dodoc README.md
-	use doc && dodoc -r Documentation
-	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}"
-	dodir /var/lib/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN}
-	fperms 755 /var/lib/${PN}
-	dodir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	fperms 755 /var/log/${PN}
-	popd || die
-}
-
-src_test() {
-	pushd src/${EGO_PN} || die
-	./test || die
-	popd || die
-}
diff --git a/dev-db/etcd/etcd-3.2.13.ebuild b/dev-db/etcd/etcd-3.2.13.ebuild
new file mode 100644
index 000000000000..34692b679e18
--- /dev/null
+++ b/dev-db/etcd/etcd-3.2.13.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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/coreos/etcd"
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/coreos/etcd"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc"
+DEPEND=">=dev-lang/go-1.8:="
+RDEPEND="!dev-db/etcdctl"
+
+src_prepare() {
+	default
+	sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
+		-i "${S}"/src/${EGO_PN}/build || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_compile() {
+	export GOPATH=${S}
+	pushd src/${EGO_PN} || die
+	./build || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	insinto /etc/${PN}
+	doins "${FILESDIR}/${PN}.conf"
+	dobin bin/*
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	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}"
+	dodir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+	fperms 0700 /var/lib/${PN}
+	dodir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	fperms 755 /var/log/${PN}
+	popd || die
+}
+
+src_test() {
+	pushd src/${EGO_PN} || die
+	./test || die
+	popd || die
+}
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 2b836f89aaee..fb128bb017e5 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,6 +1,3 @@
-AUX mongodb-2.4-fix-v8-pythonpath.patch 439 BLAKE2B c21bad3d269eee2c93ff2192166054e9ddcb2c415aaa1763c95e63c56d1af05bdc1b629136f23468fc6f08a4990474e00ca9dbb37a6ac236dea7bc0b1b03e9a1 SHA512 8d8a73eaf605cac50fe429c7141500bbc0e4f308c35b36b4ec48b4123f3241b6f5dc2670725bc7caba5769949b254874e9c36871142635c552a4c2d05a339d2c
-AUX mongodb-2.6.10-fix-boost-1.57.patch 482 BLAKE2B 933b6ab35e1a82238bf0f59140693368f897ef7f0a39b5a0620b089bd4c9c8ddf0489fbb646ca4987eb83fddf06c694a4f491512011fe01c6a55ba0637602c90 SHA512 23ce6b7c7b1d297ed45789e0b6486e699e2353bd4d3c7c0249b6df4efeb06695224e68f198f5a3c424e60fb20cb3f3d0b5d34f3ccc3ebcb9f964683acc5a4a5c
-AUX mongodb-2.6.2-fix-scons.patch 1448 BLAKE2B f96ea6b01ace8b8f92a4d8622c6f0f432a63ae2297630e905ed6469e2a1136c838e437a65ef920067bb996ba79c9421736d18529255f7921c5311ba4756684c9 SHA512 acda6ee27bf2b9a75bb2a1484fa8754e4dc700e5bd835e9f48b528a89e46a6236c38b68d42d58be6bd504d6287f673e6d71d07807e42c93fd0bd4d492387b8a6
 AUX mongodb-3.0.14-fix-scons.patch 1419 BLAKE2B da2aaf46a04a1fb345b8e44ca950d8e1b0de8e1699d47bf146e879f6461b8329a5900265a97710df5a8195283d21007dc9a1bd2b3ecebb113f718d0fd0ed74ba SHA512 2cf591ee25d33adf98ca6baeb086fb8677720809bc3e2b9398bba6ae84548b2aa3dfd57216e185fc6aa0aa185c9a906fe2a1b97bc81942560f02903b24f7bd25
 AUX mongodb-3.0.14-fix-std-string.patch 2341 BLAKE2B ae22f1c03e9230ee8dac8bacefcbd3dd193d8776dd2e86a761d5b0fe3bba823c3c1c8f9a0d2b91ff4aea0860c01289d7bc4b12fb91c02db72d0e4a755f40172f SHA512 1c1d46f4d058685371914ac70c8ad36fba387e9a140ddfd5650cf0411a73776d7b8ef6108a778eaeaa5ba22eba0e16b2301d257a47250a67e7e013d7bb402e47
 AUX mongodb-3.2.0-fix-scons.patch 1738 BLAKE2B 0e85c39637900a67c7a04396963624e9e53cc5d482eb177e7845e10817ce51bc0bec32f91c7ba31bc953d26f9b28f05dbf3ee2423e058c4ea49ac101ece95434 SHA512 04f95586b46960405b7b1906ea3c3c75d37d6831a458f619347ac028c77db5744131cb7bf39cdf62bf564500b1f6785e25b9a0c0526f126bf2072269385afe45
@@ -24,8 +21,6 @@ AUX mongos.confd-r2 546 BLAKE2B 45203bdec8e30bbf97af6b02a66a366946c02f6820bc2348
 AUX mongos.confd-r3 470 BLAKE2B 9cf6f201d337430901d957a5a0811ff11ac2e81814aac2120c5018e6ec4c38b5ca22d19caea593834416c63609c69a8294227fb6b30200b41dfb29799cc5c1b4 SHA512 952fb9cf5d3eeea2006b101e23142e408c98d66d1f4f868f6ea5a4df6a6331ddcbcbdfb24f4b031c1a8c42652141a3684073b96dfc0b3fbd21dc6b5bcf0e36cb
 AUX mongos.initd-r2 654 BLAKE2B e1d87021c218adf49f2efbd3dc6d8afb94bc4f71e60d91df9c1338241b950f62ecb1d4a989cd559b39c4c05ed7084618e4f1ec4e5eb253fae0b62f03fc9696d9 SHA512 751ddcfa406d6683e33b484ae441f7c8502698b651a1ace9b77bc13be48cee1c1ad657c474764f06bd8ef4bff51cdb235929c8d41b669a326a6ab7d24647a2c5
 AUX mongos.initd-r3 422 BLAKE2B 90872d0d8cdc5e33e3eebee848f58a2db0511d48b496ba9318117b74ad9265ead53a21b7d1790729a62d61839099bee315ace8ff3646c01e096a943c2251bf88 SHA512 bf5897614d59c6b4e72529b126408a62ea37d9e9368e5ff69c8fcf2bad3ec09065cff09467f82117a892c51090018706d2f38c03cb9a974a61a49bd9efa0f144
-DIST 20140409-mms-monitoring-agent.zip 40122 BLAKE2B 265121024a973ca02634bf17fc680b2369db0681e365f79690f77fd0aec976d60a374062554c3a72af75911684ce7aa8537f72a3f4d321a65815fb1f7c1c89af SHA512 5290a813c407251b5e4def813ce6fe7e09d6c3a1907fd409e326b15b07aed39f7db3a28710ecdaffe2771136c9433253c5d1857c823844a4b75dd38f1d15eefd
-DIST mongodb-src-r2.6.12.tar.gz 16462842 BLAKE2B 881b71958abab312e21b2b3d07fc84a2d9b141999df9a01ca80c7b726f5d87ed95dd964d8a9daf9f37d5c9e81067d1ac2453152654d207e7c4d31ef08bf0a712 SHA512 ceed10f2da50ca390f56cc79d39ea4db7a1ef6764e37dae61c3f3f664708be72de09443bbf94f8e58479e4f2923ff2ab9eee45652e82271b3bad591e03ef7657
 DIST mongodb-src-r3.0.14.tar.gz 28093922 BLAKE2B c36f1868aaf8d149550d9e8fcfa3598b917426f896cdb9e1d12fb047345011b06975719d24db3ffadadf6e1f6007a3e32768eaaa9da9ec8f340c7a49c9239b45 SHA512 477fab29ca0ad2a0f24b895e30dc4770af8d6a1a57f3c10a02a989b58dd22510db554da0418129d4e81958342ad169696eed4b86bf5aa73916c7cec879db1152
 DIST mongodb-src-r3.0.15.tar.gz 28096395 BLAKE2B 123194723e7f1057bc5497ce9bf51f8dd2d65495f6e2c84adde22e3b41cace9c0bce8134a7b85fa1c8e89ce953a3df780eae013d61bba44bbf9339c1e2e478af SHA512 21cec235a691dad7d1d2c625ef04a851b59223b8f2c0bdc979f2a0b8249ed46b4e62753fd595afa7b74bce13851d1f6547e54d8ffad8ba1f56e36db664f5b27e
 DIST mongodb-src-r3.2.12.tar.gz 29178424 BLAKE2B 212a2aaac62460812874bb4d924f9cedcb591699367a72ace620e9635a6511048efa3f1202a51e4b58ca8e5f8879fbe4638284c5d3899290bff6b1ca9be565a3 SHA512 0c4ddaaddf15d97957faff46dc4a3f79c545cacc8a56dbe1d063778117ba9b645323b0cb7fd054fae805d092b8372c411a82e3370244b7939bda20a65fdb951c
@@ -33,7 +28,6 @@ DIST mongodb-src-r3.2.13.tar.gz 29273616 BLAKE2B 9fb9851953ef1561340bcb33cac6a2c
 DIST mongodb-src-r3.2.16.tar.gz 29293555 BLAKE2B e2863ed0210bc66fcf2c80e28668674c254e78ee750a0eb84c45569c2224157f1db65aca5296a0ed0c32ef83ab6269de25bd69dbf1f0ef54b021bb0aecd2e46a SHA512 ba57aae430959f7df036b7e19e1b7d81956184bededd35631616c6e3dc9423dc79a50ab3265bc48b06d198a7043bca902aee2ea75954e38151ebead5b5ab2db2
 DIST mongodb-src-r3.2.17.tar.gz 29295394 BLAKE2B 3fa9d8fa0b50b72c3b2aa86980dd4d46bd053f23d044e321d6f98f5edb76c566bf00455cf745110a8c39355843664d9d1fbbdf554fc8696de73db2b270446adc SHA512 0d6a01278bc61805afd164e4a29abe150a5a96d551ed2c7c5d385b269924a7c5f065315e4f19c0ab070aa275ac03447959af45f33826457e5db0c5f98e623512
 DIST mongodb-src-r3.4.10.tar.gz 39959937 BLAKE2B f14f081525f694b939bc21f8cb6364c2a37573c0e1867322dd2062dc167b112751579c3e2d76730b3ff07b0c6bbfd36666bbea99162b7c10eef62d92eb1b0850 SHA512 6293dde40a8433477ba3b1cf77abbdb32b28ce58279cc616b488647c8ab71b5ab3eab2146058c4a74b9e00f0938f1415020e2f26ea01f2b29dd78a1a38d58c3a
-EBUILD mongodb-2.6.12.ebuild 4683 BLAKE2B ef4f70a16e0086efe2fbbb85612cf8d48f88a89196307efab26b443682cfb8271d846030de44a019e472ae25c942381eae05c7de4abf146c771e10f1a91bdb49 SHA512 e7a8aa76abf8c50c588411a0fc75b9723d1261784d30aa6a0908ffdb6addfa212a9008da68adecd8d49372c7be29050cfad3c06b219f9696ce4e0eb0ba56e5c2
 EBUILD mongodb-3.0.14.ebuild 4559 BLAKE2B e72ff73baaa3b6a5bb4bbb33f3153d2aeaa9458b6e7f48419f5fd0f9b7fe43dfbcd93bf0824555e688faa461839a8c3cb5e4d1a24219a395f1a245828d639777 SHA512 747424cae955229f6affd867961171d9ad3fe9c34553ddb94e034db76d4e389ba0c6dc47db23c291212b893b7377d1bfac52e79ae4ab1b9dfd8f4c89743e1a19
 EBUILD mongodb-3.0.15.ebuild 4561 BLAKE2B 85e994c18b57a0278059eb0e2e141842b551a96e1a030b5d84e0bb4c1524bacff7ed1a1576093b0336ed042f8bcbf01d37ba725392c077a400fdefc2705ec2ab SHA512 d5b77ede0ab5d9fa814542e831ec93d5854f0aaa55930c5e445410d347787be96294a741f30089764ea23cdab52413d1d82c6796b3d7133796d28de95726e294
 EBUILD mongodb-3.2.12.ebuild 5129 BLAKE2B 5587e9f109bc55d58d5157aed301fb61c8bc088d7bad7fc386d9e34b228f05a6fcdc79f4d2201ded1de0d178eb721600322992b6f0e4ec174cc85ac44decf81a SHA512 28de831886c3531c441658cdc7a29cea3b20f6aa9208c5658d4ad71269b6ff359954118810a9e845d567f54a54449ebc20a446f46da3d4694b5395fdf9f822dd
diff --git a/dev-db/mongodb/files/mongodb-2.4-fix-v8-pythonpath.patch b/dev-db/mongodb/files/mongodb-2.4-fix-v8-pythonpath.patch
deleted file mode 100644
index 19efad676839..000000000000
--- a/dev-db/mongodb/files/mongodb-2.4-fix-v8-pythonpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/third_party/v8/SConscript	2014-05-26 11:00:37.725508098 +0200
-+++ b/src/third_party/v8/SConscript	2014-05-26 11:01:13.265029083 +0200
-@@ -29,7 +29,7 @@
- import sys
- from os.path import join, dirname, abspath
- root_dir = dirname(File('SConscript').rfile().abspath)
--sys.path.append(join(root_dir, 'tools'))
-+sys.path.insert(0, join(root_dir, 'tools'))
- import js2c
- 
- Import("env windows linux darwin solaris freebsd debugBuild")
diff --git a/dev-db/mongodb/files/mongodb-2.6.10-fix-boost-1.57.patch b/dev-db/mongodb/files/mongodb-2.6.10-fix-boost-1.57.patch
deleted file mode 100644
index 5f289c078831..000000000000
--- a/dev-db/mongodb/files/mongodb-2.6.10-fix-boost-1.57.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up mongodb-src-r2.6.7/src/mongo/shell/linenoise_utf8.h\~ mongodb-src-r2.6.7/src/mongo/shell/linenoise_utf8.h
---- mongodb-src-r2.6.7/src/mongo/shell/linenoise_utf8.h~	2015-01-13 18:12:06.000000000 +0100
-+++ mongodb-src-r2.6.7/src/mongo/shell/linenoise_utf8.h	2015-01-28 22:22:50.538934558 +0100
-@@ -17,6 +17,7 @@
- 
- #include <boost/smart_ptr/scoped_array.hpp>
- #include <string.h>
-+#include <algorithm>
- 
- namespace linenoise_utf8 {
- 
-
-Diff finished.  Wed Jan 28 22:24:47 2015
diff --git a/dev-db/mongodb/files/mongodb-2.6.2-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.6.2-fix-scons.patch
deleted file mode 100644
index 76feba7bfe76..000000000000
--- a/dev-db/mongodb/files/mongodb-2.6.2-fix-scons.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/SConstruct	2014-06-16 19:32:46.274507258 +0200
-+++ b/SConstruct	2014-06-16 19:34:04.763586829 +0200
-@@ -813,7 +813,6 @@
-     # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
-     env.Append( CCFLAGS=["-fPIC",
-                          "-fno-strict-aliasing",
--                         "-ggdb",
-                          "-pthread",
-                          "-Wall",
-                          "-Wsign-compare",
-@@ -821,13 +820,13 @@
-                          "-Winvalid-pch"] )
-     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
-     if linux or darwin:
--        env.Append( CCFLAGS=["-pipe"] )
-         if not has_option("disable-warnings-as-errors"):
-             env.Append( CCFLAGS=["-Werror"] )
- 
-     env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
--    env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
-     env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
-+    env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
-+    env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
- 
-     # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
-     # startup.
-@@ -844,7 +843,7 @@
-     if not darwin:
-         env.Append( LINKFLAGS=["-rdynamic"] )
- 
--    env.Append( LIBS=[] )
-+    env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
- 
-     #make scons colorgcc friendly
-     for key in ('HOME', 'TERM'):
diff --git a/dev-db/mongodb/mongodb-2.6.12.ebuild b/dev-db/mongodb/mongodb-2.6.12.ebuild
deleted file mode 100644
index e17d7986b3c5..000000000000
--- a/dev-db/mongodb/mongodb-2.6.12.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SCONS_MIN_VERSION="1.2.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz
-	mms-agent? ( https://dev.gentoo.org/~ultrabug/20140409-mms-monitoring-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug kerberos mms-agent ssl static-libs"
-
-PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
-RDEPEND="
-	app-arch/snappy
-	>=dev-cpp/yaml-cpp-0.5.1
-	>=dev-libs/boost-1.50[threads(+)]
-	>=dev-libs/libpcre-8.37[cxx]
-	dev-libs/snowball-stemmer
-	dev-util/google-perftools[-minimal]
-	net-libs/libpcap
-	ssl? ( >=dev-libs/openssl-1.0.1g )"
-DEPEND="${RDEPEND}
-	sys-libs/ncurses
-	sys-libs/readline
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
-	scons_opts+=" --disable-warnings-as-errors"
-	scons_opts+=" --use-system-boost"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-	scons_opts+=" --use-system-stemmer"
-	scons_opts+=" --use-system-tcmalloc"
-	scons_opts+=" --use-system-yaml"
-	scons_opts+=" --usev8"
-
-	if use debug; then
-		scons_opts+=" --dbg=on"
-	fi
-
-	if use prefix; then
-		scons_opts+=" --cpppath=${EPREFIX}/usr/include"
-		scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
-	fi
-
-	if use kerberos; then
-		scons_opts+=" --use-sasl-client"
-	fi
-
-	if use ssl; then
-		scons_opts+=" --ssl"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.6.2-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.4-fix-v8-pythonpath.patch"
-	epatch "${FILESDIR}/${PN}-2.6.10-fix-boost-1.57.patch"
-
-	# fix yaml-cpp detection
-	sed -i -e "s/\[\"yaml\"\]/\[\"yaml-cpp\"\]/" SConstruct || die
-
-	# bug #462606
-	sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
-
-	# bug #482576
-	sed -i -e "/-Werror/d" src/third_party/v8/SConscript || die
-}
-
-src_configure() {
-	# filter some problematic flags
-	filter-flags "-march=*"
-	filter-flags -O?
-}
-
-src_compile() {
-	escons ${scons_opts} all
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
-
-	use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r2" ${PN}.conf
-	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
-	if use mms-agent; then
-		local MY_PN="mms-agent"
-		local MY_D="/opt/${MY_PN}"
-
-		insinto /etc
-		newins "${WORKDIR}/${MY_PN}/settings.py" mms-agent.conf
-		rm "${WORKDIR}/${MY_PN}/settings.py"
-
-		insinto ${MY_D}
-		doins "${WORKDIR}/${MY_PN}/"*
-		dosym /etc/mms-agent.conf ${MY_D}/settings.py
-
-		fowners -R mongodb:mongodb ${MY_D}
-		newinitd "${FILESDIR}/${MY_PN}.initd-r2" ${MY_PN}
-	fi
-}
-
-pkg_preinst() {
-	# wrt bug #461466
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib/ &>/dev/null
-	fi
-}
-
-src_test() {
-	escons ${scons_opts} test
-	"${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 2.6 ${v}; then
-			ewarn "!! IMPORTANT !!"
-			ewarn " "
-			ewarn "${PN} configuration files have changed !"
-			ewarn " "
-			ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}.conf"
-			ewarn "  http://docs.mongodb.org/manual/reference/configuration-options/"
-			ewarn " "
-			ewarn "Make sure you also follow the upgrading process :"
-			ewarn "  http://docs.mongodb.org/master/release-notes/2.6-upgrade/"
-			ewarn " "
-			if use mms-agent; then
-				ewarn "MMS Agent configuration file has been moved to :"
-				ewarn "  /etc/mms-agent.conf"
-			fi
-			break
-		else
-			if use mms-agent; then
-				elog "Edit your MMS Agent configuration file :"
-				elog "  /etc/mms-agent.conf"
-			fi
-		fi
-	done
-}
diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest
index 7614e7acf0d7..c341433170cf 100644
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@@ -5,5 +5,5 @@ DIST pgadmin3-1.22.1.tar.gz 14667770 BLAKE2B 3222b1a13ebe42e08b1e2aa9a5d893725eb
 DIST pgadmin3-1.22.2.tar.gz 14788481 BLAKE2B fd38ae523bfc554138f56a99ee5fe0aaf2446d3b77416552861d4c3d3d939e553ee160264720af3095f91d270b6c719e078ec29b998c2f4a13739ed34c4c0312 SHA512 dcfc72cc2e33dbf1c9d1ce287f9d1d46eb047c99a165372cb74ef1716098f90f2ce2a8d0cd21b511a1ac8c0569dc7b3c0593208a74641f5a8f29dc9c04e40bbd
 EBUILD pgadmin3-1.22.1-r1.ebuild 1232 BLAKE2B cead84fe90bc24b0b900f8686b907d54b8408709df3bd0fda134391bde0c22b0f154fdcde8a5d8907771cb525a92ca19f4da0b81ec849040732a27f809e1e293 SHA512 b062550f8bc6856906984eef98cdf57ec191c7008a0b70f12f10a89811b98125d3a690cb48bf419990b4f6bcc9346517e518bb8975cb10c18a9f151d890028eb
 EBUILD pgadmin3-1.22.1-r2.ebuild 918 BLAKE2B 1badd757ff29baf2b42a8f6ffc50bb4f742dbda4405674ab50947bf4b9db0d7a304ba5f37ba628b6c3c7e16929d77b1bd271227938436f6d0fb4e9690dc5c6f4 SHA512 029c492b94913695c6d1ee1ce5508e284ebe112ecb960a5dcae7eeb8a8b7e48b6ba8af8ecf00fbd80ff2a9bed8867faa04b26b05d9ee3c4b828b378edaa55739
-EBUILD pgadmin3-1.22.2.ebuild 981 BLAKE2B d16df45b1ddf9b03e0e281dc82c3e28ce424417b515f53de5afea81f5a6794618b7ee06e43d0b14bcf798c80706b53443287c6bd9d3c4bae3b7c0475720f064a SHA512 f31b44e32b66e66d3aac07031d735a40a9032f478f903823f073f384b6d27ccec95ff5d70f085a399f1c921c00f9b1a751f59d7daf46c1ce270f23706233be47
+EBUILD pgadmin3-1.22.2.ebuild 980 BLAKE2B 31e9759ca5ea056bf6055ecbf729e46daa6db759668c27b43374e0d2b379d78b7b5f51beed3de052459403445b792148c2fb08726917b65b950a8cc7697e03e0 SHA512 1a96f9f11be6f4fcde54491112f73b41ec0e9899db6981a3c51a269ef77ae96bd5e610d0cede0fb5ba0ca9d07003b0e20009c7bfb2e79788dda394d931a82078
 MISC metadata.xml 368 BLAKE2B ea267a284f54ca0becf05f4a7579a167ee591178e17e3922d1c493bdb24fcd63400f2146625108a0d42f7816c75bdd7b1c836c8c354f2058c4fad15c8a0f2a6b SHA512 435f2da400e35d133390ec90860cfe1dd135281156ae1ed6c28e32b4e9f67d93cdb5e7e9ffa183244984e689a131838e6301a50d5366216bccc2df5cd97b54ea
diff --git a/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild b/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild
index 1b47814e56f5..1b88ffbace4b 100644
--- a/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild
+++ b/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.pgadmin.org/"
 SRC_URI="mirror://postgresql/pgadmin/pgadmin3/v${PV}/src/${P}.tar.gz"
 
 LICENSE="POSTGRESQL"
-KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 SLOT="0"
 IUSE="debug +databasedesigner"
 
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index efc009c24425..1bad1a6d0947 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,16 +1,6 @@
-AUX postgis-2.0-arflags.patch 539 BLAKE2B 5e2e9c332aaaaaab6b5e80e1e4cc43b743bd49a5113ddc84733dfbcc0f6358c46a6eb2ba3114634d69fbfeab6e10286407b4a70a507a1dca9757a8eb58d7be9b SHA512 e600cf3548fa7c13f7cddec24a0f9078646155b48fb42cd1d41bff311976718ba93bcf7d8361d0494df5e3c6bdff74af5b8b4821026a49618ad3d835383f2785
-AUX postgis-2.1-ldflags.patch 1367 BLAKE2B aa604884a3f6ad9996fa0fa0ffdd912eba1036a2cb0ef44a257c5bb38aa95bfdafcd730af5961c7505562f2ce1ee32315fdb05da7ae6dc3e8fac92bab3d6be4f SHA512 7bfce943698b8ba41fea5606c1a3dc43b2cc11daeb8e81e432701c2cebf300984ff54e8c8817e245ec4195a85b8d28bcfc6b30d111bd6c05341c93e7c769ab35
-AUX postgis-2.1.4-pkgconfig-json.patch 4276 BLAKE2B 9b0d05ec5ad7b6e2d74aeb4ca0109994395d404f42be6b2cc7b7261cd0ee4bf0e865dba081db1f582314cd230c6edaf066436e0737a83a1580343c7070d494e1 SHA512 7439b2221bee6e3940485b1964edda10d320493b3dc8b86e1579824a9f0c6b5ff21a3d444077fa331096a9e0e4442df2c792d8a51c79dcf6c680404cbebf9275
 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
-AUX postgis_dbs 2096 BLAKE2B 97ff57e264e6a6ddd68ff0e87fcb1a3646c54f953cb370eef95bcc237ed550b494df2a1ea9a023c9be1d794003b71a9e10a3c9aa4fb1a8074b2f0eb4ced749f5 SHA512 5a11a3ce0153461f363d1b9a393dd10392e123c7b18b20610a5e26f2c7c6ed258a1517082a244c6ab5de40d439bc8a370848a0177c3c2ffcffc67a24fca8e66a
-DIST postgis-2.1.8.tar.gz 6811272 BLAKE2B f39debafea797fec2595b1ba2256ce3ed19875f15e57829f3480b15ec82ddfbc51702bb29513a9b1cd381696ee0b0857c34e79395a1f627f38a1e41344485ba7 SHA512 e8aeb739a1ecf95b224a3908d2af3aa38933b56c63713af30d14243653745436165b418a3368601a699b744f6fe61ce645c980319eb159395d68166a3815c5f4
-DIST postgis-2.3.3.tar.gz 11342032 BLAKE2B d50eb0b43f56c31768c40083677e54f547e183287feaab6b21d223b49bb19c3599031f186f0f783b9c9c948e7ed0bcd4a0918e65e61babad35f6c37eacc8f981 SHA512 c0ec4b4b5c470e5f88d1bb72c528269a0cf954981385580db3333502c2da74e431b5a86e3d6427c839c3d4440122be18a69261c8205aa71c8aa4b790550c5e9c
-DIST postgis-2.4.0.tar.gz 12576979 BLAKE2B 2d0312ca9202f92f55700e78881ecdd7128064393b1e7197dd658f8fcee676723c048fa2c7f199aa9d61a5638c0ad0129b6d2dc61d6324caeec3b7163f0f4edc SHA512 813e8e9feb75b58673afaec2dda3b5d8fc586a0f483c553795c8ae2b917bb67a9741e8c901787a0b914c327848323239346f1d816aa60b47d5a7065596de0067
 DIST postgis-2.4.2.tar.gz 12470881 BLAKE2B 116bb5d1c8f6066d537cac950254923a681babac456d155139dbdd2853b80499f4f9445dad985b94bffffd1d1285a6c78fee0fccb24e301d18147f3cd9230416 SHA512 e268572d5cd009754ef05f5d2eedcac7e362fa47199459c637cd4d9050d2b648d4b2b3746cde0dce5a42be2606a432b64dc905f193e12cf0869e3dd6f820b425
-EBUILD postgis-2.1.8-r1.ebuild 7355 BLAKE2B 2558aea2a69722d1d2c67713fdd839991dd8530af69d9fcc6c109dfce8a164efd57bfcfbe0423accc243a3d826152d5c9e9062789712dd8bd569c715a69361e6 SHA512 e9d76347fe6962406190a4005fa8b17e7c9d02e58c0374de25441014def93923e726c6943e0e482a3992b9c3f42a36186ba486d00a60ff64e4d4051471ac554a
-EBUILD postgis-2.3.3.ebuild 2736 BLAKE2B 73c2720eefa27ee1f4443ac028b0552d8686d78e6f493d6f1c8cb32dd68a373256151a2898d1c08dff597b7a42c09b027e7a320288bc6e42746be5523b072e90 SHA512 1f0dc5ad11cddbe1ac8c9a361180aa224cc7709e67ea94cf0e14338014221d2838055f45b3fbf91cac1e0c7f330209f026f66b1d1c10bec789caf98fa38e5a27
-EBUILD postgis-2.4.0.ebuild 2739 BLAKE2B fef6b6ce675926a548d124386eedabe6e509412ed053ad02fd56dbb39798de1e100f24153875a9a78641c21b43642cd97bb79d23cd775db9a3842598527f91a5 SHA512 e22ddc46b7c604909375b9ca4ec6eae5b986690ac3e9b2df276a0c9b900692df6d9d7287d11efd51ad97e6706bcdf940aff91d3c9116e499c9c67d20f26300b1
 EBUILD postgis-2.4.2.ebuild 3111 BLAKE2B d8b8673824c2cbc0934f5e384549abe379dae7534f406cf0fb2ddfb5ba6100176f335028a6db2be0caec341fa07781d2542dab2d0262b79239171e55955fc199 SHA512 ada96e8ae149e765da8cd9d689b563cff87332277df84ecf12b093b691ea97da4ee3994c19efcc545cecd99fe882641884363845abbb940d6c7baa45878a40c9
 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.0-arflags.patch b/dev-db/postgis/files/postgis-2.0-arflags.patch
deleted file mode 100644
index fa2e9a8da607..000000000000
--- a/dev-db/postgis/files/postgis-2.0-arflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naruw a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in
---- a/raster/rt_core/Makefile.in	2012-03-21 21:36:59.000000000 +0000
-+++ b/raster/rt_core/Makefile.in	2013-04-28 13:23:21.055728249 +0000
-@@ -8,7 +8,7 @@
- #
- #############################################################################
- 
--AR=ar rs
-+ARFLAGS=rs
- 
- CC=@CC@
- LIBLWGEOM_LDFLAGS=../../liblwgeom/.libs/liblwgeom.a
-@@ -35,4 +35,4 @@
- 	rm -f Makefile
- 
- librtcore.a: $(RT_OBJS) $(RT_HEADERS)
--	$(AR) $(RT_LIB) $(RT_OBJS)
-+	$(AR) $(ARFLAGS) $(RT_LIB) $(RT_OBJS)
diff --git a/dev-db/postgis/files/postgis-2.1-ldflags.patch b/dev-db/postgis/files/postgis-2.1-ldflags.patch
deleted file mode 100644
index de11510ea37b..000000000000
--- a/dev-db/postgis/files/postgis-2.1-ldflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naruw postgis-2.1.0rc1.orig/loader/Makefile.in postgis-2.1.0rc1/loader/Makefile.in
---- postgis-2.1.0rc1.orig/loader/Makefile.in	2013-05-06 08:30:51.000000000 +0000
-+++ postgis-2.1.0rc1/loader/Makefile.in	2013-07-14 17:19:19.313306844 +0000
-@@ -97,11 +97,11 @@
- 
- $(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM) 
- 	$(LIBTOOL) --mode=link \
--	  $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@ 
-+	  $(CC) $(CFLAGS) $^ $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@
- 
- $(SHP2PGSQL-CLI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM) 
- 	$(LIBTOOL) --mode=link \
--	  $(CC) $(CFLAGS) $^ -o $@ $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS) 
-+	  $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS)
- 
- shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h
- 	$(CC) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c
-@@ -109,7 +109,7 @@
- $(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core.o $(LIBLWGEOM) $(GTK_WIN32_RES)
- 	$(LIBTOOL) --mode=link \
- 	  $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ \
--	  $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) 
-+	  $(LDFLAGS) $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS)
- 
- installdir:
- 	@mkdir -p $(DESTDIR)$(bindir)
diff --git a/dev-db/postgis/files/postgis-2.1.4-pkgconfig-json.patch b/dev-db/postgis/files/postgis-2.1.4-pkgconfig-json.patch
deleted file mode 100644
index 13634abb6de2..000000000000
--- a/dev-db/postgis/files/postgis-2.1.4-pkgconfig-json.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a13cf13..c0a7842 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -780,61 +780,19 @@ dnl ===========================================================================
- dnl Detect if json-c installed
- dnl ===========================================================================
- 
--CHECK_JSON=yes
--HAVE_JSON=no
--HAVE_JSON_C=no
--
--AC_ARG_WITH([json],
--	[AS_HELP_STRING([--without-json], [build without json-c support])],
--	[CHECK_JSON="$withval"], [])
--
--if test "$CHECK_JSON" != "no"; then dnl {
--
--AC_ARG_WITH([jsondir],
--	[AS_HELP_STRING([--with-jsondir=PATH], [specify the json-c installation directory])],
--	[JSONDIR="$withval"], [JSONDIR=])
--
--if test ! "x$JSONDIR" = "x"; then
--	dnl Make sure that the directory exists
--	if test "x$JSONDIR" = "xyes"; then
--		AC_MSG_ERROR([you must specify a parameter to --with-jsondir, e.g. --with-jsondir=/path/to])
--	else
--		AC_MSG_RESULT([Using user-specified json-c directory: $JSONDIR])
--
--		dnl Add the include directory to JSON_CPPFLAGS
--		JSON_CPPFLAGS="-I$JSONDIR/include"
--		JSON_LDFLAGS="-L$JSONDIR/lib"
--	fi
--fi
--
--dnl Check that we can find the json/json.h header file
--CPPFLAGS_SAVE="$CPPFLAGS"
--CPPFLAGS="$JSON_CPPFLAGS"
--AC_CHECK_HEADER([json/json.h], [HAVE_JSON=yes], [
--  AC_CHECK_HEADER([json-c/json.h], [HAVE_JSON=yes; HAVE_JSON_C=yes], [])
--])      
--CPPFLAGS="$CPPFLAGS_SAVE"
--
--dnl Ensure we can link against libjson
--LIBS_SAVE="$LIBS"
--LIBS="$JSON_LDFLAGS"
--AC_CHECK_LIB([json-c], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson-c"], [
--  AC_CHECK_LIB([json], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson"], [], [])
--], [])
--LIBS="$LIBS_SAVE"
--
--if test "$HAVE_JSON" = "yes"; then
-+PKG_CHECK_MODULES([JSON], [json],
-+                  [
-+                      HAVE_JSON=yes
- 	AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
--fi
--if test "$HAVE_JSON_C" = "yes"; then
--  AC_DEFINE([HAVE_LIBJSON_C], 1, [Define to 1 if libjson resides in a json-c subdir])
--fi
--
--AC_SUBST([JSON_CPPFLAGS])
--AC_SUBST([JSON_LDFLAGS])
--AC_SUBST([HAVE_JSON])
--
--fi dnl }
-+                  ],
-+                  [
-+                      PKG_CHECK_MODULES([JSON], [json-c],
-+                      [
-+                          HAVE_JSON=yes
-+	                  AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
-+                      ],
-+                      [HAVE_JSON=no])
-+                  ])
- 
- dnl ===========================================================================
- dnl Detect GTK+2.0 for GUI
-@@ -927,7 +885,7 @@ AC_DEFINE_UNQUOTED([POSTGIS_USE_STATS], [1], [Enable use of ANALYZE statistics])
- CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $XML2_CPPFLAGS $SFCGAL_CPPFLAGS $CPPFLAGS"
- AC_MSG_RESULT([CPPFLAGS: $CPPFLAGS])
- 
--SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LDFLAGS $XML2_LDFLAGS $SFCGAL_LDFLAGS"
-+SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LIBS $XML2_LDFLAGS $SFCGAL_LDFLAGS"
- AC_SUBST([SHLIB_LINK])
- dnl AC_MSG_RESULT([SHLIB_LINK: $SHLIB_LINK])
- 
-diff --git a/liblwgeom/Makefile.in b/liblwgeom/Makefile.in
-index 3cc6256..5ccbb3b 100644
---- a/liblwgeom/Makefile.in
-+++ b/liblwgeom/Makefile.in
-@@ -11,8 +11,8 @@
- # **********************************************************************
- 
- CC = @CC@
--CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CPPFLAGS@
--LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LDFLAGS@
-+CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CFLAGS@
-+LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LIBS@
- NUMERICFLAGS = @NUMERICFLAGS@
- top_builddir = @top_builddir@
- prefix = @prefix@
-diff --git a/liblwgeom/lwin_geojson.c b/liblwgeom/lwin_geojson.c
-index 7019626..ec1d594 100644
---- a/liblwgeom/lwin_geojson.c
-+++ b/liblwgeom/lwin_geojson.c
-@@ -19,13 +19,8 @@
- 
- #include <string.h>
- 
--#ifdef HAVE_LIBJSON_C
--#include <json-c/json.h>
--#include <json-c/json_object_private.h>
--#else
--#include <json/json.h>
--#include <json/json_object_private.h>
--#endif
-+#include <json.h>
-+#include <json_object_private.h>
- 
- #ifndef JSON_C_VERSION
- // Adds support for libjson < 0.10
diff --git a/dev-db/postgis/files/postgis_dbs b/dev-db/postgis/files/postgis_dbs
deleted file mode 100644
index 8a414157f6c6..000000000000
--- a/dev-db/postgis/files/postgis_dbs
+++ /dev/null
@@ -1,49 +0,0 @@
-# This file is used by 'emerge --config dev-db/postgis' to determine which
-# databases it should install to, upgrade or create as a template.
-
-# Unlike the previous versions of the PostGIS ebuilds, it no longer creates any
-# databases except for templates. All databases you list must already exist in
-# the cluster.
-
-# The user to perform the updates as. This user must have the privileges to
-# modify all of the databases you list here. 
-pguser="postgres"
-
-# By default, no databases will have PostGIS enabled. The databases listed here
-# must already exist. The databases you list here must not already be PostGIS
-# enabled. Instead, use the upgrade lists further down.
-#databases=( "your" "databases" )
-
-# Anything you place in this list will create a database and make it a template.
-# It will be PostGIS-enabled. To add additional features, add the template names
-# to the following lists.
-#templates=( "template_postgis" )
-
-# The PostGIS enabled templates will be created using this template.
-from_template="template1"
-
-# For a complete set of EPSG coordinate system definition identifiers, you can
-# also load the spatial_ref_sys.sql definitions file and populate the
-# spatial_ref_sys table. This will permit you to perform ST_Transform()
-# operations on geometries. 
-#epsg_databases=( "enable" "epsg" "on" "these" "databases" )
-
-# Add comments to PostGIS functions to the databases in this list.
-#comment_databases=( "comments" "on" "these" "databases" )
-
-# Any databases you have that are already PostGIS enabled can be listed among
-# the following list to perform a soft upgrade. If the soft upgrade fails,
-# you'll need to do a hard upgrade.
-# http://postgis.refractions.net/documentation/manual-1.5/ch02.html#hard_upgrade
-
-# Upgrade from PostGIS 1.3 to 1.5
-#upgrade_from_1_3=( "upgrade" "these" "databases" )
-
-# Upgrade from PostGIS 1.4 to 1.5
-#upgrade_from_1_4=( "upgrade" "these" "databases" )
-
-# Perform a minor upgrade for PostGIS 1.5
-#upgrade_from_1_5=( "upgrade" "these" "databases" )
-
-# Uncomment this once you're satisfied with the settings in this file.
-#configured="true"
diff --git a/dev-db/postgis/postgis-2.1.8-r1.ebuild b/dev-db/postgis/postgis-2.1.8-r1.ebuild
deleted file mode 100644
index 9774fabdbc3e..000000000000
--- a/dev-db/postgis/postgis-2.1.8-r1.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-POSTGRES_COMPAT=( 9.{2,3,4} )
-
-inherit autotools eutils 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="doc gtk static-libs test"
-
-RDEPEND="
-		|| (
-			dev-db/postgresql:9.4[server]
-			dev-db/postgresql:9.3[server]
-			dev-db/postgresql:9.2[server]
-		)
-		dev-libs/json-c:=
-		dev-libs/libxml2:2
-		>=sci-libs/geos-3.4.2
-		>=sci-libs/proj-4.6.0
-		>=sci-libs/gdal-1.10.0:=
-		gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.5
-				dev-libs/libxslt
-				virtual/imagemagick-tools[png]
-		)
-		virtual/pkgconfig
-		test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc )"
-
-# 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"
-
-postgres_check_slot() {
-	if ! declare -p POSTGRES_COMPAT &>/dev/null; then
-		die 'POSTGRES_COMPAT not declared.'
-	fi
-
-# Don't die because we can't run postgresql-config during pretend.
-[[ "$EBUILD_PHASE" = "pretend" \
-	&& -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
-
-	local res=$(echo ${POSTGRES_COMPAT[@]} \
-		| grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
-
-	if [[ "$res" -eq "0" ]] ; then
-			eerror "PostgreSQL slot must be set to one of: "
-			eerror "    ${POSTGRES_COMPAT[@]}"
-			return 1
-	fi
-
-	return 0
-}
-
-pkg_setup() {
-	postgres_check_slot || die
-	export PGSLOT="$(postgresql-config show)"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.1-ldflags.patch" \
-		"${FILESDIR}/${PN}-2.0-arflags.patch" \
-		"${FILESDIR}/${PN}-2.1.4-pkgconfig-json.patch"
-
-	local AT_M4DIR="macros"
-	eautoreconf
-}
-
-src_configure() {
-	local myargs=""
-	use gtk && myargs+=" --with-gui"
-	econf \
-		--with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
-		${myargs}
-}
-
-src_compile() {
-	emake
-	emake -C topology
-
-	if use doc ; then
-		emake comments
-		emake cheatsheets
-		emake -C doc html
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use doc && emake DESTDIR="${D}" comments-install
-	emake -C topology DESTDIR="${D}" install
-	dobin ./utils/postgis_restore.pl
-
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	use doc && dohtml -r doc/html/*
-
-	docinto topology
-	dodoc topology/{TODO,README}
-
-	insinto /etc
-	doins "${FILESDIR}/postgis_dbs"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "To finish installing or updating PostGIS edit:"
-	elog "    ${EROOT%/}/etc/postgis_dbs"
-	elog
-	elog "Then, run:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-	source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-	source "${EROOT%/}/etc/postgis_dbs"
-	local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-	if [[ -n ${configured} ]] ; then
-		einfon "Password for PostgreSQL user '${pguser}': "
-		read -s PGPASSWORD
-		export PGPASSWORD
-		echo
-	else
-		eerror "You must edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-		eerror
-		die "Edit postgis_dbs"
-	fi
-
-	# The server we work with must be the same slot we built against.
-	local server_match
-	server_match=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-		-Aqwtc 'SELECT version()' 2> /dev/null | grep -c "PostgreSQL ${PGSLOT}")
-	if [[ $? = 0 ]] ; then
-		if [[ $server_match -ne 1 ]] ; then
-			unset PGPASSWORD
-			eerror "Server version must be ${PGSLOT}.x"
-			die "Server version isn't ${PGSLOT}.x"
-		fi
-	else
-		unset PGPASSWORD
-		eerror "Is the server running?"
-		die "Couldn't connect to server."
-	fi
-
-	local retval
-	safe_exit() {
-		unset PGPASSWORD
-		sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-		eend $retval
-		eerror "All actions could not be performed."
-		eerror "Read above to see what failed."
-		eerror "Once you fix the issue, you'll need to edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "As some things may have succeeded."
-		eerror
-		die "All actions could not be performed"
-	}
-
-	local db
-	for db in ${databases[@]} ; do
-		ebegin "Performing CREATE LANGUAGE on ${db}"
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit || eend 0
-
-		ebegin "Enabling PostGIS on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${templates[@]} ; do
-		ebegin "Creating template database '${db}'"
-		createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-			${db} "PostGIS Template"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -c \
-			"UPDATE pg_database \
-			 SET datistemplate = TRUE, datallowconn = TRUE \
-			 WHERE datname = '${db}'"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${epsg_databases[@]} ; do
-		ebegin "Adding EPSG to ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/spatial_ref_sys.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${comment_databases[@]} ; do
-		ebegin "Adding comments on ${db}"
-		local comment_file
-		for comment_file in "${postgis_path}"/*_comments.sql ; do
-			psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}"
-			retval=$?
-			[[ $retval == 0 ]] && continue || safe_exit
-		done
-		eend 0
-	done
-
-	for db in ${upgrade_from_1_3[@]} ; do
-		ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_4[@]} ; do
-		ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_5[@]} ; do
-		ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	# Clean up and make it so the user has to edit postgis_dbs again that
-	# way this script won't step on any toes due to user error.
-	unset PGPASSWORD
-	sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-	einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-	einfo
-	einfo "Currently, only one PostgreSQL slot at a time can be PostGIS enabled."
-}
diff --git a/dev-db/postgis/postgis-2.3.3.ebuild b/dev-db/postgis/postgis-2.3.3.ebuild
deleted file mode 100644
index 1655d70d7c37..000000000000
--- a/dev-db/postgis/postgis-2.3.3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-POSTGRES_COMPAT=( 9.{2..6} )
-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="doc gtk static-libs test"
-
-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
-	gtk? ( x11-libs/gtk+:2 )
-"
-
-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"
-	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.0.ebuild b/dev-db/postgis/postgis-2.4.0.ebuild
deleted file mode 100644
index 1f6443716a46..000000000000
--- a/dev-db/postgis/postgis-2.4.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-POSTGRES_COMPAT=( 9.{2..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="doc gtk static-libs test"
-
-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
-	gtk? ( x11-libs/gtk+:2 )
-"
-
-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"
-	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/pspg/Manifest b/dev-db/pspg/Manifest
index adfa18715cc9..e1f4d7dae182 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -1,9 +1,5 @@
-DIST pspg-0.5.tar.gz 845824 BLAKE2B db7b36fbc644e1ac45906ba726212233c0a61230f609584d4fc6207576c4e350b926c6d93e2b9eb563340524e1dae7de0a0c846bed379143bb6a4fcb10cdfd0b SHA512 69e45885d4c155fc0e95360d442ac0b67fb910005148537dbd758e9a22ec83fb232214bf5f292b72a79be444ce05f2eb7bc0a2effaeb8731d1442a7f7ddec5df
-DIST pspg-0.7.4.tar.gz 846366 BLAKE2B 06a2927d326ba2f12661495b3a0133cdaf2b8c4edc624e87e285ae347850d654c345585471724521f6bea1f84cbfccef5ffef8971246b786675fc350c9de432c SHA512 403abe21230f760a43317b2d6be04a8cd6873f7ebb85037c3f4c12b7726ea491c6614bbe923f52dd863d3ebfba2e203f6a40c3fd6d13945663c4ae7b3091e0db
-DIST pspg-0.7.5.tar.gz 846741 BLAKE2B bfdc8c8edbacacb20b268e0577e571e9e2479563e94c7b1b345f0c0dab9e4b7beea97660260b8c99c6ef4524d5230024e5f453233a8418a159496758a3b64064 SHA512 4dc5fe3f2dc70d2d15021e7fb1fca9b870683dee4ab0a6b97bff06fecfe35fb57426440a6d73439210eb20bbe757d1e1a33e43f7ab040c1923527456aca2bbc8
 DIST pspg-0.8.0.tar.gz 850508 BLAKE2B 2f2fb7f094f72f0b5d1c959ab73a355ea2ced155fdb64adef21eb70c4991b057e31688128f50db2d6a84ab850b57ab59d50c0dd5ba06998af11ff3a5479cc9bd SHA512 758d47e041f4c7c91ad2033fb95e6d33a27b6f896077dbcb287331496e47740c31c6ba6bf7ea01ad6c1a3c3d4c5e525b268795a16f9c819f4d489d3e98fa3092
-EBUILD pspg-0.5.ebuild 379 BLAKE2B 15673c16e78b8100002cc460dca4fd98bb40f06903eeda52a30f9718dee065e9d2eae7231dc263d7330176a8029a279068911c57b187071d3ed9887cb391dfe4 SHA512 1a6298a1cb317c198b8bf80f705bbe8fb7310ab0a17b3f8098639c4d880cbe86237aaa5b40f3a7d69f377d92f14c72944986194a7dceb4ceef410720be7fc3e3
-EBUILD pspg-0.7.4.ebuild 389 BLAKE2B 965a10bfaeb36e9e5436d3870a109a71a763310e8ba2b1f2e2027c33def5af549b7c3d4a1ea3204bd174fdedd84ce9b57739a7f0a33f0e79a1928a3552c3532a SHA512 036103ff39c94b193a5d0dc24ba9d646d658003e843383d825dbbc2eebb71a775bc5c0c20bdeefc8d193fd874a2b9277c110e2387d6de0590561e9b2186e1f47
-EBUILD pspg-0.7.5.ebuild 389 BLAKE2B 965a10bfaeb36e9e5436d3870a109a71a763310e8ba2b1f2e2027c33def5af549b7c3d4a1ea3204bd174fdedd84ce9b57739a7f0a33f0e79a1928a3552c3532a SHA512 036103ff39c94b193a5d0dc24ba9d646d658003e843383d825dbbc2eebb71a775bc5c0c20bdeefc8d193fd874a2b9277c110e2387d6de0590561e9b2186e1f47
+DIST pspg-0.9.0.tar.gz 853226 BLAKE2B 7fc73a02557991c24892f47f09a4402fea691047a41ed91e0b4d3fac8fe2fbfc02530615d1123288b641dba7b1db8ba524156351e494a37ca7072853e1f028ee SHA512 a752570ab1a7bca5d69c602a2e8bc0ec92a6ce405b7170bc1a25ed2ae29b0e69fa7833979ccbb5bd1adbaad968067928f26044eef902069edfe662812e9d3edd
 EBUILD pspg-0.8.0.ebuild 389 BLAKE2B 965a10bfaeb36e9e5436d3870a109a71a763310e8ba2b1f2e2027c33def5af549b7c3d4a1ea3204bd174fdedd84ce9b57739a7f0a33f0e79a1928a3552c3532a SHA512 036103ff39c94b193a5d0dc24ba9d646d658003e843383d825dbbc2eebb71a775bc5c0c20bdeefc8d193fd874a2b9277c110e2387d6de0590561e9b2186e1f47
+EBUILD pspg-0.9.0.ebuild 389 BLAKE2B 30ebc1a109cc694a1bcb8f612d36a51570d7df89cd5c55e6142581783e6afb958512c5de4c1bc446828c36acc3c6788da001c98ee0d60a1153ff454b693bf381 SHA512 3c62b0fbaacd4be5248cd7101cc91511f9bb321a0437b65e17848d1ab30338d1de64d674d43feb4c8c33513c8b4215545b3548994167eba20e9860955a2d3e6d
 MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pspg/pspg-0.5.ebuild b/dev-db/pspg/pspg-0.5.ebuild
deleted file mode 100644
index 18d3c571e86d..000000000000
--- a/dev-db/pspg/pspg-0.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A better pager for psql"
-HOMEPAGE="https://github.com/okbob/${PN}"
-SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:*"
-RDEPEND="${DEPEND}"
diff --git a/dev-db/pspg/pspg-0.7.4.ebuild b/dev-db/pspg/pspg-0.7.4.ebuild
deleted file mode 100644
index 9b90eedb3e06..000000000000
--- a/dev-db/pspg/pspg-0.7.4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/${PN}"
-SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:*"
-RDEPEND="${DEPEND}"
diff --git a/dev-db/pspg/pspg-0.7.5.ebuild b/dev-db/pspg/pspg-0.7.5.ebuild
deleted file mode 100644
index 9b90eedb3e06..000000000000
--- a/dev-db/pspg/pspg-0.7.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/${PN}"
-SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:*"
-RDEPEND="${DEPEND}"
diff --git a/dev-db/pspg/pspg-0.9.0.ebuild b/dev-db/pspg/pspg-0.9.0.ebuild
new file mode 100644
index 000000000000..9b1b64baa6d0
--- /dev/null
+++ b/dev-db/pspg/pspg-0.9.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A better pager for psql and mysql"
+HOMEPAGE="https://github.com/okbob/${PN}"
+SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses:*"
+RDEPEND="${DEPEND}"
-- 
cgit v1.2.3