10 files changed, 172 insertions, 7 deletions
diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index 721a229b853e..11090d663a43 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -6,7 +6,7 @@ DIST apache-couchdb-1.6.1.tar.gz 12085350 SHA256 5a601b173733ce3ed31b654805c793a
 DIST apache-couchdb-1.7.1.tar.gz 9963069 SHA256 91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad SHA512 cd7417ef4b1eaeb1fe4251b559d904238fd25881c542f1498e6e9f1c4a55a79e34e06e711f90ce39e5e65fcac8be9c611943b8ed57d4a7465859b5811ac0a21f WHIRLPOOL b4cbed19cbb9f5025215638b11c4990c26d831504f46009bba436bd66b3f4ae93588b65d3f3984486e5c20b451a5bd148f16a71a02b01f454d64f859c53a425b
 EBUILD couchdb-1.6.1-r2.ebuild 1876 SHA256 c5edae443bb4025460844b845ab3aac1b70be4b2a4c1ad294c69f2f0d64798e2 SHA512 32ca749588b62e0cdb954e6fcf8753558ea754429b6cc330c8d2503d15f829cfa5d78922981447eb665335edb90bef6bffccf2f740ff7bfb438001abea63499d WHIRLPOOL 263970ac0b11cdc953ce249fe7ea75ff6e17777da5f8ed1d42a9d9c45d13b99736fe3373c62feabfccb7f235c91d292e51e5005b90dc50a47650196a6740efa1
 EBUILD couchdb-1.6.1-r3.ebuild 1920 SHA256 2278b40da7545b22c5bc1316844a72f23df40d7542cb36f6a36f34db063a73f1 SHA512 741b364f8d0d4cc5d80be5169fbbb0230fcc39a9d15392459d884f248e955d9df702168997e172a42049adb6a37d834cd13c9536377dcef719ef5356044a1737 WHIRLPOOL b5f36ea8b8432a0411d848dbfb13d3baa6eca2cc48849267850b6f27a4ff69b6bc0289880a862d786d9d9db3494c9a51c231aadbd5bbae428506118c65e0ede7
-EBUILD couchdb-1.7.1.ebuild 1835 SHA256 9ab8a41457baed9407cf4164bedc30efc43ab76b760edb4b5f494609dede1b72 SHA512 b5a9cbd431cf364ccce0cb6dc4ffcf91b9786fd9f0ab27357ee18760dc71373dae9776eb63df8a1b78c2a714769c9bc7098cb1b2a0d83aa4c609876974b6da45 WHIRLPOOL a595f56bbae24b021cdc88a59a448ef7513d1a8897417664f76fb26e344ce1033807849dc42b76eb037a30bd960c53ca81bd2a700a3db124c5e0cabae5faa666
+EBUILD couchdb-1.7.1.ebuild 1833 SHA256 3baa8ceb321b161b550770cebb7fe2b6f99ee72dd95da8e3f15b857be8e0f798 SHA512 6865840a88f05df7932986aa3849c87ce306c711f84feaf358ebf35214efea83aec66e9ebe2a403a03ce19a7b2a89c5126208741d3b817596a58e8d21f8d85d9 WHIRLPOOL 5643ad35360c6ba217a5a7639f4f70680f559d0dd792e188488896367c3de339ac9f26d090bdf388671efd0a8d3f733c340a2a003875d62d2004b71eac165781
 MISC ChangeLog 3689 SHA256 9695fbf0257c000cfb6b875048d6b5f7b61cd2a1d15da22017114675b293a5f3 SHA512 25cd2bbf8512952af2ffa3f6fd8fd14ec09497088eaea9b660f54e1c10752118b387e10b113218b1a36fdbedc9b7d03d18fb79814cc297484dfafad7234c6e51 WHIRLPOOL 3efe4e412eef4ca434bdf53ac0b81e8f882a7db4285b291730e4669d9bd68e267a6957ba783dc656774faa9c014e355593d0efc00554a978359ca0ddfa71028f
 MISC ChangeLog-2015 14103 SHA256 3a06cdf5f2fb5900395c9ceb77aa1e355811eb9412e6126f48dab7c07de136e3 SHA512 a90e09a5a6e33ec0f1eddec1a2b651a201b90dc797525616034330006e263f12cf1e338d456269a48a406557d649c6cc1bf3ced63545cda5055961f35adf088a WHIRLPOOL 1585d163b62ca0835f429d6d81b8d8572bc9dff8d477315649cb48aebf7364c81bec11dc4835b694d5c790e4fc50f54b39c8313c31d7f9fc7ab9bd2d69a953ac
 MISC metadata.xml 212 SHA256 061538b4837ab7b95b652299476a75942b769652dbd569225713fdf1166b1d37 SHA512 e4f4b6dbbf6bf039ff5c19bb6a209ad4e0b1286f8cf7cc0cbafcc04fcf93fb92766c8cae06ff19f980a069c7fe9a1686437ab215f84ce10e301275ae107d00bd WHIRLPOOL bb35c86572b2ad56bf93b52f6eca6bea0f5591c1a9ebd608833dea63c89d4bd36cd402a8ffc2d5fdc1d7e1d5466782d1e37dfcac14fae0bbb181029799728fa5
diff --git a/dev-db/couchdb/couchdb-1.7.1.ebuild b/dev-db/couchdb/couchdb-1.7.1.ebuild
index 5010dcaad8ea..3d797e33d490 100644
--- a/dev-db/couchdb/couchdb-1.7.1.ebuild
+++ b/dev-db/couchdb/couchdb-1.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/couchdb/source/${PV}/apache-${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="libressl selinux test"
 
 RDEPEND=">=dev-libs/icu-4.3.1:=
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 5bb5809282e1..8971d608fcb5 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -9,7 +9,7 @@ DIST mariadb-10.0.32.tar.gz 63567828 SHA256 f7a8d9ba88b01d426f5d69e5044e505e444a
 DIST mariadb-10.0.33.tar.gz 69211872 SHA256 e3e3d583c51761aee2fcd0e51bfa7d592c1299cf5eb977e61ea9dc72932e8870 SHA512 9369399553ab336ba1ab20393b69fe5ba49e88ff86d9a448034a9d521e8d85216eb1093e040dd893fc2fb15344da3d57995074bd489be66a3b1457abab097104 WHIRLPOOL 9ef2a9f521b83643a6460a338e6972143af087d4b243cba89ccb92fbd35b738d028092ce697b13c3d4e591391e03035c95ecba0bd55227960c8644b0e4a57bb9
 DIST mariadb-10.1.24.tar.gz 61780687 SHA256 b3df99ae5b1ec8cf6cede4cbc4ae3f54ce66464549cba6d56d9ff4d24e4d551e SHA512 0b8d81b53f6866a81f33559ce57ebf956fec3ba25da0bd58c8bee3b2ecc00a6c370340000209d18463f84501d3ba35994b51ef99224616c37cd38d2fc87b73e9 WHIRLPOOL 91261a05e3d8b0cad925c382e0cf9a40fcfd3d35ae320c4a9860db110cb5655d1e1f992f9dea8987e50a07dd4a66aa42c9a3470a7acb3d0d706bcef7bc890122
 DIST mariadb-10.1.26.tar.gz 61887132 SHA256 ba88b1cb9967dea2909938a34ba89373b162b0d83e5c98a0f1c94540156bf73d SHA512 a7505c579728b58eb6a92bdee1f5dfea5c10c8389cb7a31eb99fe2c6bc416593925cf9708d3dec91ede12eb4e232098a0833af2185bdd60bc593c89d255f3c0b WHIRLPOOL 8fe0c23f70b441a1f8d32d1fedcd033443641288ef1a20c49fbedfe6f5da95cb82125faa68f676fd68c441d4bf096101f364e1b3976f54229f5d9d0d10edbe21
-DIST mariadb-10.1.28.tar.gz 67559689 SHA256 292dc8fff420c4bdaf3a2c3381ec3c99292965db2b09de0d7fec414c00032bbd SHA512 ca10d28f6b966719c7488c2b4ba928b65cbe9dc32ccf2a28d29c4d0c2d46ea1c59c3e339230017b317132dcd216925a71769dfba80a7d6321079c74ac41926d8 WHIRLPOOL d8ff24346a9e8ada4a9ec0ea8fd7657ff4972d43347afb7a9d7725293437ba70e0035c365738084b1e4828344861f000bd963260176524da2188c2c3a1389f67
+DIST mariadb-10.1.29.tar.gz 67885370 SHA256 73bbd5602f52ab5aa4d83f465134871b6c87bda25371d098f6da5a3d98517ed4 SHA512 c169dfa2878f9fa9e0e9d12ca79fcbfa644e9b51bb0b78b8dd51d6c5679f3184d139fa96a1ddb25f3ae5d1c0489708c2c624f96a24020f77bf7e5247fac45ecd WHIRLPOOL dc8818f6a176166a52c4ff7268e917843f4a7f96f36d5df33e81fb0d84bb15cb39383ad5012304ba31d03f7302cbb41769357aca0d67e1703248e70e1ba28b45
 DIST mariadb-10.2.10.tar.gz 72388999 SHA256 5c7b83c4d2f7501ef9f187d8c97688a24fd3e53dc43bb388f8e1cead61a92fc2 SHA512 39c198009f8b19f4a08226ef9842b50e24636580b67c1c92d59c61cce3aa1edbd466e253c281dfcdfc58ab573ae9a59aaacb0ce3e8b82222043ddd849fc3e239 WHIRLPOOL b64e99254764556d6de947e254a45c5c2743d9e825ee109354b3101641048b3509dd26471abdb6f7b90f3a208ac7d2d13ad70cbb966e05ac49b26ef2ecb12e6e
 DIST mariadb-5.5.58.tar.gz 45784323 SHA256 26fdf8784a51e5d6f7624c0f4528433a6188065dd1bf92ef69e27db6b0a41002 SHA512 c5c8b52c613a1a3f30de2cd1d8e390f8110b0891af78ee2a24ef2c4b7b8c5f2e140970ca89865e8277e7486dbfd0ad01c1fdbf8791c67a9793392247d68fec63 WHIRLPOOL b507f3aaaced5da716de1a131dc4e69ace6f2ccd2ac58614d3d722b46b0b271ab0a452aef03b78d499b961f39a057ece5169f5af6fcce2e840aecd77ebf9295e
 DIST mysql-extras-20160721-1526Z.tar.bz2 301788 SHA256 45198f8adb4a61fdd89a5d3c7966ce2fe9241381510e1f7b93e793502a32dfcb SHA512 c7450039780e4e2684c932ba7c291c1de25dd1a64e4c6e88aa13b790768b4100955f36ae4a3bf983569ea23b43be02da6dad3d5985c1163ec9e8aa91f0efd85d WHIRLPOOL becdf0d4d7b8b5a269246d2fcf1bc09c4313046468b264f07394ae9f1de2f736ad3fff8cad35e544df7a3623688050e6fb9635dfea3876ea082d19cf9fe88927
@@ -22,7 +22,7 @@ EBUILD mariadb-10.0.32-r1.ebuild 6767 SHA256 9ea0af871fe806b30a877415da0b0881cd2
 EBUILD mariadb-10.0.33.ebuild 6736 SHA256 b4594c937a2c57000c63d257a2d0db6c7a3442c53fd1adc752b1ab85cce3486f SHA512 ae4e50015f489199a71764345b0fc6c4abb1f8e31965cf4b590bffb5da08fcfd23c1b2ae945f7435da447e2a4f2de111293de7c474b2d74caf5cd3cbaf855b10 WHIRLPOOL a93bb0c6c1996cc81d0d0d41a359b6258211006c883544c6a1b03cea59cd41630e69609d341d34a02d58f12a45b60dffc0b5b7685b603a9474f3d6bd926d331e
 EBUILD mariadb-10.1.24-r1.ebuild 7187 SHA256 fb9a9a37ea87839b5df675be187df0756853d995e56af9f46e4d938f1f3bb778 SHA512 f88e2f171b9785ab6c834511ca71d9939eb36020a32cfdba5fb91f81253df8a35b891db321c0f796dfec03c7fa39226d1696607518efbaa446531590de97a75a WHIRLPOOL 95a507b48de0251948e1511c285d50b7fdbc490395ce3618a2e4517fd3223d62e17787837570f5f4ba5b78d3b7f773889826ef0966ae7b92ed7da9d6639a0f21
 EBUILD mariadb-10.1.26-r1.ebuild 7255 SHA256 3dfe3f3c0effdb9a13b4e89398169a58773c056da51a12ac9c79e28ed0cc2b02 SHA512 171bd1cf59c77e98505f9f2217a5522611977fcd1c13d67dbe551892da3569b45298a032e33d5aed8cc2caa95f326c6f011291f678436a7fb3069133792693c7 WHIRLPOOL 3bc062878d0be9c3211299ab3e2c2d90d970f2cb2cf311dfe3fa799545bc09fd32f6da3532883dc5a6a4adfb42e23459b302d43bb01ebb1d776f5811f5102156
-EBUILD mariadb-10.1.28.ebuild 7320 SHA256 b45d0316aed437a96b46648109783fd9a8d3252d92acadf89e8a763843327e49 SHA512 4868269e57a2951e6f51dafb51fea044902e390aedaf2d1229b85c61fda12f39cf0b01935dcd4ae111b5323b647c9f639cc4fbfe03d20f50b56085babcb275e9 WHIRLPOOL cbaf38b55fcc2d3f2b0ba00fbde07b513077952b33d3679f99a1b48eb5e15638f274753bc1b536570350890d0faa5ccaa3e45934984699d95c3c9fb8fb56f45f
+EBUILD mariadb-10.1.29.ebuild 7323 SHA256 177ee146ee42debedc0f3ad02037f02bc135d5310d4d2c853175298070d2947e SHA512 885b101d4f070322eef14d020c88fa88dba95bb6e9439e4a73a2558c0d047dcb81f207820e333477b9f6ea76f5a567f62e65f3ccc11f93332b13de4a6b48c608 WHIRLPOOL d47457c817b9e83b8c85276c08559e400bc115190c96a9d2893baaefc3f4ea6b9a430151aa93a99a4a4e02107d98e0da6da6bd570ebdd536ccdb623a4297caa0
 EBUILD mariadb-10.2.10.ebuild 32355 SHA256 b9e37664dc6efb4e70f996b277237efa926f564642942c93b08675a885bc31bb SHA512 56116f8a65f22c89b491cdd4e72c6fb118dbf7efae56c9827d1520055e555abef57e9b88957c3460e1e7ff76b44f2955a0092acda08e183a9ed867c08053ea44 WHIRLPOOL 9d72a6474950fbf3248d0c2e89aa8b9e249b5118f88d6bc291e9fcf8cb4277e1298c72ec7a86e97136d15434031651cc152369bccd0cdaff26e9eb92a5cf41c2
 EBUILD mariadb-5.5.58.ebuild 4241 SHA256 ebb8013626eb0a5a222b3bac6ef12606545e67338903c5872249589ae8d79aa8 SHA512 3de822605e73ca9094f6635ee232b133371823e3f3330d6ecad973c0e9176d2280a5fd5ae6032a4f6e3f914c8a937f912e2aeb91a5802342ced02aee6db11944 WHIRLPOOL 3d68d32e9d157c909659ddb17550c517e5407366c2e867a7d7ecc14594d329e551d42221e2a918155e0a1d6cbe7819a121f8ac3a417110156010ed1716ef230f
 MISC ChangeLog 24701 SHA256 3ff49394f0611c2c667536a084ba1816152d1770039e716db13ff905ed3382da SHA512 c7dce735d23de6f8c71f27d0047e5079bf6587ba386935800613cb36c0e3653f59e5021d73a4efaf56c74ba4a4f6ce4bbe21e10b214ed4618e0b2528bf13f65d WHIRLPOOL de0cbab6250b12fb8f55acc5978e3d135723ff727805e2c898a921ad7adae798702a16df7077159c195ea9854cada6840f1ef03d7f4934a183d5b0f081dd57b9
diff --git a/dev-db/mariadb/mariadb-10.1.28.ebuild b/dev-db/mariadb/mariadb-10.1.29.ebuild
index 0464ff44aa76..7ecbe1782193 100644
--- a/dev-db/mariadb/mariadb-10.1.28.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.29.ebuild
@@ -56,7 +56,7 @@ COMMON_DEPEND="
 		systemd? ( sys-apps/systemd:= )
 		tokudb? ( app-arch/snappy )
 	)
-	>=dev-libs/libpcre-8.35:3=
+	>=dev-libs/libpcre-8.41-r1:3=
 "
 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
 	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index f3fa1ec6f35c..61453d361fbb 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -6,10 +6,12 @@ AUX postgis_dbs 2096 SHA256 dafde4a1d1d95e18facb3287baddab3c1c116933498c310438c9
 DIST postgis-2.1.8.tar.gz 6811272 SHA256 7c2380b895fe7bda34c2e70deab3fcf4c12b13ab40d7501cdaa6fa36f1a6c662 SHA512 e8aeb739a1ecf95b224a3908d2af3aa38933b56c63713af30d14243653745436165b418a3368601a699b744f6fe61ce645c980319eb159395d68166a3815c5f4 WHIRLPOOL b6675fecbb922379bd50c351abe1553fdbda53543fce56451c688e25a3fa2e9d0813d8f3a349b623b85fcb4016fc4710f6746a224ba7673ec0d2106c7635d3d1
 DIST postgis-2.3.3.tar.gz 11342032 SHA256 723d43a1c8ca4cf06359ec0b7fd5521b355db4e37128a26fb8c661b1fe2fc930 SHA512 c0ec4b4b5c470e5f88d1bb72c528269a0cf954981385580db3333502c2da74e431b5a86e3d6427c839c3d4440122be18a69261c8205aa71c8aa4b790550c5e9c WHIRLPOOL 427d4637e0073ad549cd2e74d117b2dc2b0b0e5fff98f9a0bbee3514c00b3688dd56acd7bb3f1742eda61238cf8c5ab81cea6ead7ea5880261b753a86e0f847e
 DIST postgis-2.4.0.tar.gz 12576979 SHA256 02baa90f04da41e04b6c18eedfda53110c45ae943d4e65050f6d202f7de07d29 SHA512 813e8e9feb75b58673afaec2dda3b5d8fc586a0f483c553795c8ae2b917bb67a9741e8c901787a0b914c327848323239346f1d816aa60b47d5a7065596de0067 WHIRLPOOL 75403b5d1babdc1d714d29a6c1f86dfcd1503997536d6a35333b6e19c72de44aa131cba3c6a9a4f2ced59a280eb0eaee41696fa8440c2028f8555d6a2c4dcd3b
+DIST postgis-2.4.2.tar.gz 12470881 SHA256 23625bc99ed440d53a20225721095a3f5c653b62421c4d597c8038f0d7a321d9 SHA512 e268572d5cd009754ef05f5d2eedcac7e362fa47199459c637cd4d9050d2b648d4b2b3746cde0dce5a42be2606a432b64dc905f193e12cf0869e3dd6f820b425 WHIRLPOOL 5a87b34733dce189d6a30a4ca88599467ff0987c214b258d9d873975de2f746a26281a983d8f98f9d3758da121d0adc2384c8dc1d3d247130213020cecf887f1
 EBUILD postgis-2.1.8-r1.ebuild 7353 SHA256 e99d42f70adee30cea1d6ef8c2f87185cd07ac314ec407cc053dbbb82f52c480 SHA512 f7341c7ec07f6fefa9b904aa915bef8ac309cd17595f246e26efdc0d932476bee7cc6264c8bdd98b02b0637c2cd24ce31a2aa7799ccf8f4f9d19b6192584a856 WHIRLPOOL 0904d54d41c094dd0cf3de73230bc33d0ff12562ac074dc7c362cb8dc1d57baa309ba30c74571fed4556e633b6bcbec21c196c7fa364e2f3610e651f98a3278a
 EBUILD postgis-2.3.3.ebuild 2734 SHA256 0ede97176d14f51bfce0a63646327d759e7214cc50116ed469d0fa58fbc84330 SHA512 04b648cf53497cfb0f5fcdd7a3c033a01f62180f60d82d427d9a163a09484be8c09a63e188237abab37e5028fa36ac2075094d19e96211d50238bb8b95e1234f WHIRLPOOL 634cdce7b397b582194f4b8e050fa2b3e0dad71b855b4b167fa2e8d2811f8b08a8031738718f1785d7ac26c64ec2a84ffe5ec8e90a0f49cc19de06e99a0973a6
 EBUILD postgis-2.4.0.ebuild 2737 SHA256 fb130b6a3f58c723dd74f6fdcc7a554573d763c05dbfb3e8da9fde5310d3b925 SHA512 2bd729a3fb41cac6e283f045741de3fdfb5789849b025cdb76ff9ace385309a2838c6e001a110e853d0f98992d411265634af0526c7f7891ffe4a7269fb35cf6 WHIRLPOOL f00170fcfc1dc542dd852646a8fa1d066e8207238c34ae76c922dbf8b0887ef9905659c6948b1b8f9bf2e1ca86560e45282501b266266ef55463232a3703cd40
+EBUILD postgis-2.4.2.ebuild 3059 SHA256 b1bd0928c57638aaf8be3ef3615d1b4083c6dc3a6c7008a421fd9ba118a4d5a1 SHA512 342528e62312b31f92a6bd042b14275ca931259990af38eda13215fe491ea6c30a43ae79158406b84e8349b694794971b9e9ac69bfc1a8a8e87ad1f843f28fd9 WHIRLPOOL 752d5c7084b9b22f18d6a6e073c752ee4b36425b02ef401100aa4ff2dac6d7b0d7cc78f52bcecc9cf4da6437abd354573e1c322119057f8a6c42c1a9a37e2507
 EBUILD postgis-9999.ebuild 2645 SHA256 5086db52abc3f8a51401593892239a77b00dc0ae835c424250ed5632c2ae31a7 SHA512 fc23662b423b3a07d6bd79c36d83677f3bc09975b93259a20b8d46d19eb95542456df9785e21c40d44c6c833cddc08cb34c1b9c214323d2b1661b33262c49e10 WHIRLPOOL ea7254ee0405d04b15169371d371f91b065210b1e2de1283598be5115cb4d06253632783e3ea7118ac95d31ec2cbb7292466feb7bf9cc21d7616ea7ac24313ba
 MISC ChangeLog 6529 SHA256 27002d9667de8a361e347cc66c2fc804054e53b1834548a3229526d472d5c36c SHA512 e5011139d4d58675b1513bb128e07c589bfa65a8d6ac9e2d43366f50d8a8cd38f6b08d39b1b6adeff3af0579c22403a5b1643f4f290be3c8a8a08fbf33c00570 WHIRLPOOL 93ed801a763374b3a6afe680e8711fedd7a9e0a149ffb7dc8352664b1f1cc7284886415f879aa1ac2f5b12aec3591e032e1814559c0414fb5f13654c96cddbd6
 MISC ChangeLog-2015 15421 SHA256 0f3e682af97970b63f483d38082d202cad0ce391e805f545590a37fc9fc2c3b3 SHA512 71d3a8f9f00ecdb484fead44508a1f15674b546d60533addf7f91c94d028800b098f52b1172ec028b6c85470154a4b364f10c9e1c8e0e6d0d8139d1aac8b9c6a WHIRLPOOL 651c4e132f36162267fe3473136aecfb8f6266a22d2715989697ff8319c933b058fb3a9fdbcefc6abc9451e5b3da72d94c05c51e31dc90bf6a09dd9e166330d6
-MISC metadata.xml 506 SHA256 ef5bf9003c7834db20fcd1278ec11d36d5e7230c09f25cac7ae4e9b59f70ae74 SHA512 5cbe7ca8eb33c99d029f9491189b1cbe76506b7ff375eba688e9975edc89c2f0518eb65e703c4fcc48600949718b932408fb87217cc3eda2074d9da1577c2803 WHIRLPOOL 255644f4eb56f3964a15388fcdef709483a1e44d1332b9980f58b8cfe9d973a5782363da188fae64811fa0efbb2294d2b232b16c394b304ed1cb66ed3086188c
+MISC metadata.xml 779 SHA256 2eaaadf2dfbcea5aaea662bedc25f05bffe9a088eecd44e6cf2d12ecc1fde7ac SHA512 33ad2ddabf49e97af2cf188f2c0f72e1a936c228b43d8d3637230c43be0df82ec2aa20b63cb5f2385e936c215263fcd009332afe504bc5f30746a387b9b37ada WHIRLPOOL 0c54b89c1018f250ab0cdb8424282fab172769673ee7c246f698d5131a57c5c7b144f0e1e5d6fb581867e8b66bb554d25915126e7ca4b633b2ff1e0427c562c1
diff --git a/dev-db/postgis/metadata.xml b/dev-db/postgis/metadata.xml
index 41af88acdf31..079d84079f20 100644
--- a/dev-db/postgis/metadata.xml
+++ b/dev-db/postgis/metadata.xml
@@ -10,6 +10,17 @@
 		<name>Gentoo Geosciences Project</name>
 	</maintainer>
 	<use>
-		<flag name="gtk">Build shp2pgsql-gui a graphical interface to shp2pgsql</flag>
+		<flag name="address-standardizer">
+			Normalize US and CA postal addresses
+		</flag>
+		<flag name="gtk">
+			Build graphical interface for shp2pgsql (shp2pgsql-gui)
+		</flag>
+		<flag name="mapbox">
+			Add capability to transform geometry into Mapbox Vector Tile
+		</flag>
+		<flag name="topology">
+			Build topology spatial types and functions
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-db/postgis/postgis-2.4.2.ebuild b/dev-db/postgis/postgis-2.4.2.ebuild
new file mode 100644
index 000000000000..eb28a8841e0e
--- /dev/null
+++ b/dev-db/postgis/postgis-2.4.2.ebuild
@@ -0,0 +1,125 @@
+# 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="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/pspg/Manifest b/dev-db/pspg/Manifest
new file mode 100644
index 000000000000..16ec665357c1
--- /dev/null
+++ b/dev-db/pspg/Manifest
@@ -0,0 +1,3 @@
+DIST pspg-0.5.tar.gz 845824 SHA256 754d1e380d072517e9bc2c3c38785e2f19a9f927f061de9a646fd1094baa204e SHA512 69e45885d4c155fc0e95360d442ac0b67fb910005148537dbd758e9a22ec83fb232214bf5f292b72a79be444ce05f2eb7bc0a2effaeb8731d1442a7f7ddec5df WHIRLPOOL fe647cda821855a55b91be0a38f5859a65b5217bc6df2f0973f137029a7d24a3730e40f705cf865b5f7386fcbba7a82ae41fdd4ff5975cdd83a3d3e41de78a89
+EBUILD pspg-0.5.ebuild 374 SHA256 2895d43532407b006df79a611aa21a045cac9712182a61ef688a5688ca2e7b0f SHA512 40e3d416869ddd040792c576f371ad7cac6c3a90dc4c0f98f1c85fdc3fe335a2b867bac28595457f1122b95bc987b241377ef1ecd9096f27b7dcc0be291a3349 WHIRLPOOL 6f7cd76de0ad86673271e7c251052797417ed9afe0da8f102a02f90f8f5b84910cb435a16b245f36a9d7caba2301d2c68b95dbd1c11a4942360d08d00a7cf5fe
+MISC metadata.xml 298 SHA256 9f51466b5b46a12996e91f294520ed3dd90eeef32edb1989121d553a4ac3d1dc SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89 WHIRLPOOL 870c5ed93a2a9aacc7763ce60e5d4eb9da14369c8f01818edd9a0166767909de7ec942349a1ebdb3e0c124cb3982dff300c18a5d730f09045b10b3fea0940cd9
diff --git a/dev-db/pspg/metadata.xml b/dev-db/pspg/metadata.xml
new file mode 100644
index 000000000000..eb41154c968f
--- /dev/null
+++ b/dev-db/pspg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="project">
+        <email>pgsql-bugs@gentoo.org</email>
+        <name>PostgreSQL and Related Package Development</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/dev-db/pspg/pspg-0.5.ebuild b/dev-db/pspg/pspg-0.5.ebuild
new file mode 100644
index 000000000000..92c104bcb6dd
--- /dev/null
+++ b/dev-db/pspg/pspg-0.5.ebuild
@@ -0,0 +1,16 @@
+# 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"
+IUSE=""
+
+DEPEND="sys-libs/ncurses:*"
+RDEPEND="${DEPEND}"