gentoo resync : 10.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
commit: 71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree: 9f1f0dee23e13658e52f49437befe78427148c51 /dev-db
parent: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)
84 files changed, 1187 insertions, 563 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 859adee9b898..553dfae518cb 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/libdbi-drivers/Manifest b/dev-db/libdbi-drivers/Manifest
index c88922184712..b2a49c711671 100644
--- a/dev-db/libdbi-drivers/Manifest
+++ b/dev-db/libdbi-drivers/Manifest
@@ -1,5 +1,5 @@
 AUX libdbi-drivers-0.9.0-doc-build-fix.patch 694 BLAKE2B 95207e6fbd947c01a1c3a99806f09e3f932b6d7b6fe1b55ffeb98ce73a54b7f984ffe9811c834e53e961500ae688b0548599b3f9b47a5d1e083eedf5c7ed650d SHA512 0ff58a08909327db91ebd0dfad7ac88ebb17156bbb7afc8bfc8a3711fee37708a7ad715ed50b5085cdd15d3cdb5c06de3a0779694104fb6332a1e9c2f51f5b0e
 DIST libdbi-drivers-0.9.0.tar.gz 1829864 BLAKE2B 2071c0cc21b1b4eeda926d5ce36f6dde03ede206dac91780aabafcb7c5b399f4b9580910e5ede08c9f0bf026f4af2088d1d0e8c1835b86273a7739b2946ed3c3 SHA512 f4d3aaa71014697c53012a10bf9f0af398bcf5ee5872af165f8f43a682d2fb3045a9172ffea0e068dcbfcad52494878c037d8d90fadfaf176936e42f7f1e85c1
-EBUILD libdbi-drivers-0.9.0-r1.ebuild 2182 BLAKE2B 47d5e10c412a8006b23c3b27ad50b4ac13f4e80862a2561c0bb104dbb7fccd9cecc84e53fb8132406eab4b9b7e6a5a08f1ce21e56efef940e1b6dbb1ce0b51af SHA512 4d6351dd711c3a0348e379bfd49e2e9baf55b73051c1475c1650629ed23054e0c02af0c19275d96afe1c19ae23e94744be12f6e4c77f00994f43154a3b8b0ccd
+EBUILD libdbi-drivers-0.9.0-r1.ebuild 2181 BLAKE2B e0a30c4b23001570b9ff6f294d889297bce9956b2646ba55f169e449e182eb35801f90132f6e1cb57230424caf793a0f26d84a1815759d893cf7c44af0d5f6ee SHA512 8a8fbc0d80555532a8e29fb442ce051848cc87a144dab95852faf3149a6b608c30fca0ae88228ea44b5f68c9686cb8018a0aaaf29ca515df7f3a484862331dec
 EBUILD libdbi-drivers-0.9.0.ebuild 2121 BLAKE2B 38856712429751608302a225183962938b6c40b759df3fe0f893abf3ca13e35f1a9b07ce829d6b6977304e23b4f1d5181b53bfdf545b2def79f9dec8d937b182 SHA512 fce5743329a2f046933f875e54074c97b849d10ef230fa273bd1f948670bf5731dc970983464fa959014044066f621b4a232275119f96c9e8a65f877efd60328
 MISC metadata.xml 302 BLAKE2B 50e613a8be312f9b8e234ef4a810a318f51f70e71f37a01f1932f2e70fecc543956e84690de88a14dac252101865ac0ef454966bc1bf54e5f574d2d6fddecf3e SHA512 d0d6c905c747105c3b5c2bde24ea7f8c63225779fe41f106b3de3d3082cbc01b0749546c3477db1e9f14db44e1b2921316f4cddb256ef8dddec3b4176a051c70
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
index 1f95474051ca..52b9ba3a8c8e 100644
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
 LICENSE="LGPL-2.1"
 
 IUSE="doc firebird mysql oci8 postgres +sqlite static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 SLOT=0
 REQUIRED_USE="|| ( mysql postgres sqlite firebird oci8 )"
 RESTRICT="firebird? ( bindist )"
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index b26cf0fc4cf8..0c7e0b634624 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -4,7 +4,7 @@ AUX mariadb-connector-c-3.0.8-fix-pkconfig-file.patch 630 BLAKE2B 4d087835c14334
 AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3d0095a823917704d52a5f16c349ce7017b93b1bebfec01287929470a89a2e4aec2f9f7cd5135368e43f2a2e89257c0d7042b878e1806ede8aa SHA512 fe621abedaf81d1fa367c52f69ccce1765757db8d9f412aa40b440d7e51d4de3785a90150e76893f7066b1ba656eb1bad020465e58adae13f08245b839bde4de
 DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e
 DIST mariadb-connector-c-3.1.6-src.tar.gz 742858 BLAKE2B 416cc33cf7a01fee9649f6c35e0a7e16b889a1fad10f2b204e259a2672535d1ad7f9ade9723989a4ce00cf8a2c4660f40357516bfdc4547118a54637911f9b60 SHA512 44309e706cb49451a0d1a91f907ab7cfa1fb1bf95d26cf3bbce1caa367c2fa8ad377a691361e297dd2fcbc444c10115f18aec66dd6d69c458f282ace3025a3e8
-EBUILD mariadb-connector-c-3.0.6-r1.ebuild 2842 BLAKE2B 207d08aff8494af4fd67c5fc9b8292348bc3c198655e3ae66c8e2f3fa7d27af3d177e177279ceb333d800fb9a8c5b8343edb9722282e892be42b73d79660e80a SHA512 83bcb560d6f10ecc2b24004b7dd71c6a5b5c9385b3787b44362d7cf0c3194bb4bcb0c25eacce5f400aa22091a3fd31acf7695d663c0446ed07e16f9e0f7480a2
+EBUILD mariadb-connector-c-3.0.6-r1.ebuild 2840 BLAKE2B a27ab2663f80bf02010600084e7a25f00fcedf648712ed9e5dc3f179711d59b39ed7b6901e50ddd29742ade84d9885f14fbd7fe4dc48190b8cd558f0d44f26a8 SHA512 50bfcd66419154803d4c8ab75c90ff2cfc9bfb1fac11d9c79d9e2a2e8caf5c6b95c1280319a01017904e37671fd4cbb46d3bc344ce3d2708dae55f6f05144dc1
 EBUILD mariadb-connector-c-3.1.6.ebuild 2344 BLAKE2B da4880e8fee8dede76cce177181f1290874f3a72078b9d7a3cd9ce3ad6d3abf7d72b418e81f57bdeb321e0e39d5a052b0195be70c92d066a53d8c4f0768842d0 SHA512 0b747b13ba14a5b1943ada402afbed3b19c490fb1b07fcd2a9c1791b1c97566186d9a46c9ac35113685b1a32b287e9373339f932c0e794ad86a19aa497de879a
 EBUILD mariadb-connector-c-9999.ebuild 2344 BLAKE2B 503e29dbd45777f693139c7febc843733c68b1c3c6151e7f69afd5b09fbe1767be464f912c2d7a8a082320a951952dca213ec1241b9fb7b2a2a3b2818bffbed9 SHA512 47a5d77dfb14bf5ffdad3bf849a3bb0df995a4c7db5b94704231ad70ff6e7529c5713e830e8c11c76d1cec0303496815d449390b84d91ca9687e312939883166
 MISC metadata.xml 324 BLAKE2B fab5394015cd337683f65a257556ed0f15e35826bb0a6ce75a7033cd5931455ff2bed527064d698e9b3165f2cfcaff8a4bdfcad0b830482ae2e4389a79d529fb SHA512 1fe9e5d5d9f8e817ce49117fbcc6a6d706a090752606647496f2b7a25de51bfb641a408ff0cdaf626d83eb5c314d2e28c3f29532307d942cb41498edf4b44aa6
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
index c4997d7b9543..11f78ab3576b 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
@@ -71,7 +71,7 @@ multilib_src_configure() {
 		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
 		-DWITH_CURL=$(usex curl ON OFF)
 		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
-		-DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DINSTALL_LIBDIR="$(get_libdir)"
 		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index bb041611f590..bc5f8668a5a3 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -19,16 +19,16 @@ DIST mysql-extras-20180809-1700Z.tar.bz2 322999 BLAKE2B 8b5feb32085dc35b2f68dae9
 DIST mysql-extras-20190305-2052Z.tar.bz2 331304 BLAKE2B 1d2c35a961159fa5ce9ee6699fce943f5a5b5cf60b11c9bb4bcccee4943f4508a9eb6d01050c642353ac592ce1a6b421abf2a1bebc706c44c4c8a36aa698ec43 SHA512 ae63403320e010acbb92f8aec6da8ed4f267cef0bad37147d594076fd94571de7f98bfc2afbe94af5d716f58d57696fd958b1e13e20e87052f252ed4a188cd3c
 DIST mysql-extras-20190731-2258Z.tar.bz2 332111 BLAKE2B cc144c9af852bfdd4149b96bdc22f8afb2d0aa92f95ebd272a244f0fb7743dc03f9244871d5c195260bac5d9ed20583093257ee2c95a5a4d0a4dae488d781adf SHA512 d4428a1128cd5aef62c463b659992b110090b1602cdcb6b8d922d570c6b946fde325bfcf5a9a955a8dcc61f3ccd3d612d8517ebf63e316f98ca9ff2cd8a807aa
 DIST mysql-extras-20200203-1749Z.tar.bz2 344999 BLAKE2B 46441f3c210c87b8ce1df89e9480d0bd5be216b0a1380c3ca330294e787bf2fb2b7078438f032dd0381363e756312d7634350a0b02c00b3145d4787a9ad65cad SHA512 210d240efef4d7bb64d356cae240039d9bd65e2bd4af47e01131ab5bf48779f4c0519e50d212d50db998e6b9bf9d73f1a03b0bbf4f7d6dc6f978660c8ac8a21f
-EBUILD mariadb-10.1.38-r1.ebuild 29479 BLAKE2B 7f89c988240a3450ab95234155b18430b271e6af0656711bb0514cf21635d3fc541a05189455345a55bcc071f30ea1a401826d945d177eab043db0ad7db5d5b4 SHA512 4bee8f11cde366979a57898986540ff8736f2e81770e2c1b33af91414c51a13b19af297c2831c6680c3f36f33eb0b2276d637ef5858d8803fee09d520b46094d
-EBUILD mariadb-10.1.43.ebuild 29882 BLAKE2B e67075c31a1585036ff4d82ddc7ce00119ee9a46170144acd59e1106c0c1cd05cb1e38b9e7eee77dcfaf320ccf3615845e1751cca242d7376d1c535a587d7c72 SHA512 8072069e496ea9300352264d71c998bcd926bfabca50607afd1b3bc47be265e31fd137737b6e85b7d2d4c2dc8d41d1f054ca846d94fe548eb1dda5a06f3b5b82
-EBUILD mariadb-10.1.44.ebuild 30055 BLAKE2B 78c0c30940f69b4d38b9975c68a80c856a3e4a03169276ce53457c2aa7ccc76872718d6b09e31302ec22b0e3107da51d7b69b828709fd38af92ca5b1e19c2bf5 SHA512 7d3697d4708496c673f289986470487074e26c4776199af68cc818bedfe1e327bc25b6db5e197a27d6dc16573d58de5a69db6bdf2b4ba142b12f3fad7d4c8a25
-EBUILD mariadb-10.2.22-r1.ebuild 32530 BLAKE2B 2a6a9aa24f06052d8dda82a1c1dfdc836122e5e9e248c621bc69b80732beaaee86aff666e2bcdf1eb7cf7f15628f11c785d84d99980c4d0459c792d0e8d9e2c4 SHA512 62cac25905993280f8b8d24e80751261513bb129401d01ebd51cda9fe196109473bbbe760a126d0949d7466279b1eff3892ab394c031cd7ab4a8ccc3ae3a3667
-EBUILD mariadb-10.2.29.ebuild 33103 BLAKE2B fdf29163bd6297d9627a3d767e33ab8c43e9df5a88a3bc6d9ecf1e45523ed55014f6febb304cee3dfb17d0ed195f6f9f457dc1eaf5da91779220569c6a95b246 SHA512 ab764d0c158718ceb3081b8c21bc9b370171bf6382fae8f5286ee9ed1df738163a96f8ae746a3eeab52ab52bf6e3e4477f27ae3c9f32b5c618377292dc9ac913
-EBUILD mariadb-10.2.31.ebuild 33168 BLAKE2B b14bc65948b416c35ea83c46098438a035103ff9543d7a3a57b93515b24277a2c98968c963c85ed4915fdcb067100b428ddaeee8a8ca8e675810050b13fd8b50 SHA512 a16e16e16b5a81f328babfc2e388e536bbbef84e9a951422cb7ce6d686ba6a60c8593bd1bbe314259f271dc4e6a0463a91fb5334b3a8faa97f5ed95369e567a3
-EBUILD mariadb-10.3.20.ebuild 32731 BLAKE2B 2e8437c3af728e5a3dc02a825f025231bc4a6f3ae5b72066afdcf033fdaa807847b86167ecdf9719213061e2937c97300f72989e45f9adbcb74ef597939c25c0 SHA512 0e84837c35c84eaef8d0afb6630c8caff7d036671ab9871ccc2b30aa3ffe2a24f8a363f5f9364755bb69c1290f2995366164a249fb4c61f902d2e41aa2571612
-EBUILD mariadb-10.3.22.ebuild 32792 BLAKE2B cb2943720dded3ae11d6f78788773de117bea20bb6c4e7ee3419be87d49b294938458955f5164a371cd4968c38775f08af9d2db6b756b36920ccdceb5af5ebed SHA512 90f229b5d6144582dadf3f86d797833dd7c543e8b0e044e79f791a26ddd40889124f1803066683b92b0359b9b9cf17b761e663519853abd849f0ecf238894628
-EBUILD mariadb-10.4.10.ebuild 33383 BLAKE2B 43b890bcb0b23b7d40faecd424a968248524453ccc486dcba474a1b5959503a51252ff3dab70c5dfb6238f20b9cdcb281dbea9d728d1cd31d7a3cb3c5c419ea3 SHA512 acfdec61923f7cd5e837e52c6854ee7104278ea2157df5993de38811dda81f3db0644dd7002995367981ca4142e35fe9fed0e58d83ffb71f4528477976d93a63
-EBUILD mariadb-10.4.12.ebuild 33408 BLAKE2B 4d20837d26495e50d278d5f614b186dbf4746e50b2485cfa8d60768040fcc2df03cdd95f10cb8b1790ae8b0e10e3f721c10bae68f490807a293d13380a4e83ee SHA512 bfb4bcd43bece2a18b5535efe2e5d459cebe9d7785c277e1ffeafe7130a2767cc76f3e1071f3bc09f76c046adb19836f0c769be3eb85a8948071e7c3b30e4698
-EBUILD mariadb-5.5.66.ebuild 27262 BLAKE2B 323891d4180b27a079bf96952c36880d8531eb273ce4a8ba2d16d2b3f85a85514a29381d849b89dfe97a534b3eb600ec5a85e006dfaccb3cd76a51c9a35c2f92 SHA512 e52d96c624a69a98b362f9c5d498eb62cd6b635660871deb62b2426638513319714a2e7992f60b3535872cc342f7307b053d79901df16e5573d33786100e9d3d
-EBUILD mariadb-5.5.67.ebuild 27262 BLAKE2B 6f15df960825f8f6c79abcea0e93a2b0e9162bacf086d4e3fd49b550ab092963059205075483f58de97f15a7004e54c2fc81324abde14e869a23df0c22dafc6d SHA512 145c8f2a90134e397f6ee7ac74ccf4bebd84d7d25f65407f8b45428e8f770c00aad8a392997d58c0e8291168884b03b40d7a6ad03114182eb140d03d5a3712e4
+EBUILD mariadb-10.1.38-r1.ebuild 29425 BLAKE2B adca2a4ddace1c70d950dc10a8ddf1e4ab8e51aaad24f0e2ac6886801f0748472d8964301be8a0046a7debdbab9d689ab9d2717e179c651bf3f68ca6c85018b4 SHA512 cb66388307e9385515bc64cd8150a94ddf9fbdf0156a06bac5a16d8eb4b1aaa99595f356443fde8aa31925bbd5f70fad07e26b0da4d73a063d9e9a92e1673557
+EBUILD mariadb-10.1.43.ebuild 29828 BLAKE2B 4af76e5d7bd95e0dde67a8dd5350f3555a7f0d1d33d2cdf673f0e02be40783410828ccf747ec8f941e844b9b564eca7fbe1052a82b625898cf7428af0b6dcde4 SHA512 d74ae31259d7abeed6fd6ee46d6909bc4f4a27aec747d1d1c0dd984bba1be26b3d8e9b2124b98b0870f077102810571bb7b678c40bcec24d7e8e001c919f24df
+EBUILD mariadb-10.1.44.ebuild 30001 BLAKE2B b38e6e8b73e9ea82bafb8b330a2dc037cf133f09aea91cc81cd0ff6e734e9fe0a1e3a29fdba46857e3fc672ce84dd0da650894fa0f3d466f534e148053381328 SHA512 4b1643a02f04d15f59a8d01a296e4ab2258b3c48e8664e13b84fcf83eb4c53d0395122f1a17debeded783211c000af9b9f5ea63f07ffd7520a151213c7e212de
+EBUILD mariadb-10.2.22-r1.ebuild 32488 BLAKE2B 700e423468afc5d55f448f02b87cf85331a8cf7aecb816a780a03ad5f4ffef5f7124495c44dfcb753c566a8eb0c62828e44b838a2a8ec7ad5f90e5572b9d04b4 SHA512 9103b4bbcae28a9810b71f99263584b3924ebfc9e6b734b0e549f739839123e9808b629addd25357bb8422639f7797d228ff50440b152fc57275ef1f066ee022
+EBUILD mariadb-10.2.29.ebuild 33061 BLAKE2B 86efbf55d679547e49266dbcf8970204ea61d2ccda4fd8b7f6a43ee2200b0a2726ece5d5447aff2a512374ba673e928e77a0aac6f02a12085df34f7e65e2674e SHA512 b783d1588016be85f07e05c53c8e3df53e272dc623f4413a38eade664d2e866607835861bd7ce4fc68e8e2af528e9bd296b14125a526dc04b314fa29d6509170
+EBUILD mariadb-10.2.31.ebuild 33126 BLAKE2B 94dd1581fd1056f183163ee71303ca0efb575923d4cd70fa22e27de462884b189fd5b07218af1512a4158279d93eca68042fcf5bd5e478fee6a52cb695c56f49 SHA512 aa3aaa76a1d7ae8b9d0f6c8b28b825945fc316972c7f7f20f8e76b1ca7b3f5404fb9a08409b19a847377f41e0d568935bd1b7484c9a59dd9ac6bc77b26ecc843
+EBUILD mariadb-10.3.20.ebuild 32689 BLAKE2B cf0e23e1523fc695950a24b357af396a06e9895ddd28a18137b91ea7ff8adf9bc4569d9b485d5c664e100a08e5336b98d254eb5c322430d1caf3e6fb1133d6ee SHA512 c8093db3250d10b53326499d4a86f5117b5250210d3582d82bc815485ddf730ad58a511e6f31c5245478951a0919738ed15a4afabbdbe219169a6fc537d6089e
+EBUILD mariadb-10.3.22.ebuild 32750 BLAKE2B f1b37c53cd989850da3054e391b19d4db3b9620b0be4e05757fba7904536d6e4b7c084a096d3e36ad97d152a4f6368eb2658a4eca15a00a9b53512b2e2f8e8cd SHA512 81bcf52fe9dc2261ca7345b26c5b271bc6a142954027dca90d30d226965e1f2bc511e051208c379f5364145f61dd88a8ba5d83b285c5e73db3dbee9aa8174fc4
+EBUILD mariadb-10.4.10.ebuild 33341 BLAKE2B d9466512cd2e2a93b458f32e4d1eb23723f1b21a124df13da9d4c4230248502bfb01fdd0f80a5d72a99491ddbc6471e39192b5a86e9ac4259e15d99ad47b97d3 SHA512 811ae5618a55a0c05ac27c9994df49369638f86983c4e2a9aa37a23a921183fa2d9560ef4380272bb716b82aca67113eb2055776d72ec07ea1ca51d65aac25e1
+EBUILD mariadb-10.4.12.ebuild 33366 BLAKE2B 4159e530ac2dcf92030cc6b287e9d7a486a60d4a572e47577ca0a41ca5eee2fbb550c7951c0622a4e67e60dd1f8885f0e60de7d5194b43fa2f3173e1fb5b5d76 SHA512 d30e7c00fd7aaca444bf61beec449082a172f68970d17bb76a853c188975ac9b060dfa835607deede2e3c0bc93cba63c6f8c9902d4032b95a915c6d3792d70ca
+EBUILD mariadb-5.5.66.ebuild 27208 BLAKE2B 9cc3e203340f55ec1c0208b9be44431f8b4da6849bdb888e17839d83813476666a4886332f4ce0aae278428ac3671908534a1d585abf5afe6869429f4fbcc7a5 SHA512 96e8b41aa12da84c78c92aa724b92833749e80b678e5a56b6f32d6e5534643daacf6bf40085a8dd8cc338b4b2dc11842e5eeb5868394af47f5cfb7d2ac6b67a3
+EBUILD mariadb-5.5.67.ebuild 27208 BLAKE2B 1af7c586d794029c64b9bfc8ab94f9510f2ced4b43f02dbc16a0903d5f81a4d9804243012fc2e17d05ad506c7e2fd60013d2600d9363d4f779ab3812555d970f SHA512 4beaf095836c4812f5c6e36dfcd943d93a19a9aed9a3b553ecc180fa3c3f54867c69fc02a8ce4ce57b199da76fe40ef604d20558afd85fa85a62be5bf9197296
 MISC metadata.xml 2611 BLAKE2B d1b6b11359e92a3d9cb2c58ed35a15e3cf42ab616ed907fa36a5f777168a805ffd03d01bd13fcd30352ef6c5e8b1d80f4e882ffaf8f6445ed3fce2bcc2a92923 SHA512 80395b35839acebbb18ac8d01e8c806bd89f18d32f85fcba41f41ecfc4f1f869dc8c51c90bb21ebd3c9ac30d51d47869a4dcf3b8ce73967e337e6e396b267c97
diff --git a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
index bd01fadd2b56..07de6ddfdd2c 100644
--- a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
@@ -288,8 +288,7 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -301,15 +300,15 @@ src_configure(){
 		-DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '')
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
 		-DINSTALL_SCRIPTDIR=share/mariadb/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		-DWITH_ZLIB=system
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
 		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
diff --git a/dev-db/mariadb/mariadb-10.1.43.ebuild b/dev-db/mariadb/mariadb-10.1.43.ebuild
index efd07a576537..d131c0c4cb07 100644
--- a/dev-db/mariadb/mariadb-10.1.43.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.43.ebuild
@@ -293,8 +293,7 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -306,15 +305,15 @@ src_configure(){
 		-DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '')
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
 		-DINSTALL_SCRIPTDIR=share/mariadb/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		-DWITH_ZLIB=system
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
 		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
diff --git a/dev-db/mariadb/mariadb-10.1.44.ebuild b/dev-db/mariadb/mariadb-10.1.44.ebuild
index 4e0e9491bb2a..b68568b59247 100644
--- a/dev-db/mariadb/mariadb-10.1.44.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.44.ebuild
@@ -297,8 +297,7 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -310,15 +309,15 @@ src_configure(){
 		-DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '')
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
 		-DINSTALL_SCRIPTDIR=share/mariadb/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		-DWITH_ZLIB=system
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
 		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
diff --git a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
index ce87ebab1b39..79d8b88b16d4 100644
--- a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
@@ -326,7 +326,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.2.29.ebuild b/dev-db/mariadb/mariadb-10.2.29.ebuild
index 7b99a2969bbd..fc259fc3c054 100644
--- a/dev-db/mariadb/mariadb-10.2.29.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.29.ebuild
@@ -335,7 +335,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.2.31.ebuild b/dev-db/mariadb/mariadb-10.2.31.ebuild
index b95e1279e5c7..8e713f24f7cd 100644
--- a/dev-db/mariadb/mariadb-10.2.31.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.31.ebuild
@@ -336,7 +336,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.3.20.ebuild b/dev-db/mariadb/mariadb-10.3.20.ebuild
index 7fb13269e69d..cc2498f533dd 100644
--- a/dev-db/mariadb/mariadb-10.3.20.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.20.ebuild
@@ -325,7 +325,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.3.22.ebuild b/dev-db/mariadb/mariadb-10.3.22.ebuild
index cf26f76d0451..f65deda16f81 100644
--- a/dev-db/mariadb/mariadb-10.3.22.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.22.ebuild
@@ -326,7 +326,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.4.10.ebuild b/dev-db/mariadb/mariadb-10.4.10.ebuild
index c479a1ae70d5..c5d00cd5a4e2 100644
--- a/dev-db/mariadb/mariadb-10.4.10.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.10.ebuild
@@ -335,7 +335,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.4.12.ebuild b/dev-db/mariadb/mariadb-10.4.12.ebuild
index 13396dc69603..10c241797c7d 100644
--- a/dev-db/mariadb/mariadb-10.4.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.12.ebuild
@@ -336,7 +336,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-5.5.66.ebuild b/dev-db/mariadb/mariadb-5.5.66.ebuild
index 2cd8c6360ff0..17ef7180271b 100644
--- a/dev-db/mariadb/mariadb-5.5.66.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.66.ebuild
@@ -254,8 +254,7 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -266,15 +265,15 @@ src_configure(){
 		-DINSTALL_MYSQLSHAREDIR=share/mariadb
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
 		-DINSTALL_SCRIPTDIR=share/mariadb/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		-DWITH_ZLIB=system
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		# The build forces this to be defined when cross-compiling.  We pass it
 		# all the time for simplicity and to make sure it is actually correct.
 		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
diff --git a/dev-db/mariadb/mariadb-5.5.67.ebuild b/dev-db/mariadb/mariadb-5.5.67.ebuild
index 414400eba524..fbd7f924edf8 100644
--- a/dev-db/mariadb/mariadb-5.5.67.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.67.ebuild
@@ -254,8 +254,7 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -266,15 +265,15 @@ src_configure(){
 		-DINSTALL_MYSQLSHAREDIR=share/mariadb
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
 		-DINSTALL_SCRIPTDIR=share/mariadb/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		-DWITH_ZLIB=system
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		# The build forces this to be defined when cross-compiling.  We pass it
 		# all the time for simplicity and to make sure it is actually correct.
 		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 58bc1af5dd09..d683128cfc07 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -14,17 +14,23 @@ AUX mongos.initd-r3 422 BLAKE2B 90872d0d8cdc5e33e3eebee848f58a2db0511d48b496ba93
 DIST mongodb-src-r3.6.13.tar.gz 40853787 BLAKE2B de9621de4f570d569df5cfe026ea5da24641c97f1ac9f3e58a0706b1d0bd74757390a075c95c6d3acd12f3c5c7bcbeb9302ac997248c54a5b7910b582debdc82 SHA512 eb84fb22ff871b5ec620d6fc29a6a66072211656e914630ad0f53e4fcad55aa40a76a0e68e68bdbe8ef061bea09ce6ad6aea5d8d865ea8a8fdca0ed829555fcd
 DIST mongodb-src-r3.6.14.tar.gz 40895581 BLAKE2B 3cfe2aedd11a67a01ddee9eba36d99bad5fe8c7891e953cbdae9200427638e1acc1555c8d39df0217a48a95428838d573c90381698361f954d9aab860449cfcd SHA512 2bdc0ee86625724f64b7af2962b19b13cefb21d58d45c7b22fe2e01bd021f2427236c279c89785ede7c6986742127160b032294fbb652c55ce42f8d941a18cfe
 DIST mongodb-src-r3.6.16.tar.gz 40927975 BLAKE2B bcd129d43eea24da3afe69c887bcd22116e0eb7e1f3f274fb8f51260625d17607b0d1eb31fb23a4f97c88e2c86b3d7a880cb05b0e77385d115cf9486d66f1249 SHA512 eb00f3a612942ad5f947583e92fca5b877b40d75132fa5a97989d81dd55925f5a112400eec8a43b2043bb0236b3228a670a888c41a374b0a60e8a3c26076b1e8
+DIST mongodb-src-r3.6.17.tar.gz 40932592 BLAKE2B 94bbb943fd929318a2b32344cb4574243ad234d1cd14ffef864d7fd2d60841866fd5a1966eae8f14266a9648deb62b7b55386d41338b515d5e6849e980143d42 SHA512 b4d9e9bfc7ff886532641058c99da29420d1aa472cb4cf2b254e0fd0af5ecc72ac8bf28dcd55ab738b799b00132ffacddd154dea37ccfbf459c7cc603c2582e0
 DIST mongodb-src-r4.0.12.tar.gz 49937644 BLAKE2B 81044a6d68be6420d30fb2d7386ff29871a696cad94ce5977c1aba60c2ce80e18ccb86492c1947a359ef124332ea82ac3cb0fb73a68f51904a008fdf911aa055 SHA512 802eaf57d56c5e8e217344f10104a201acb6f5abef0065fc1bb8e6ceef13fe489b7ae46ed0d55b5bad50fe3579860b1c1471d224b51b0f15f968278cb5f6a47a
 DIST mongodb-src-r4.0.13.tar.gz 50006727 BLAKE2B bf47bd32cf50c24084091a1baa811690c50586352307deb80876bb1bad539e90de77f85fc591960d6ae871e0a6f22d5d2f05bb340218784b642e3529d0c64bb6 SHA512 2a74ac8648cde6d9b5aa33da195b22eca926ef5ff85d4140e0a1ba978e3d13d410f4d7d7e102e35f994ef3b848333a4ef4bacfec9e2ac1b1288cbee885875ef7
 DIST mongodb-src-r4.0.14.tar.gz 50088053 BLAKE2B af7dc930dd7a469c06cf26201e3329967a664585b9964732c57ed283f323d4dc7fde3ea62ad4f1e8ca763360aeb614c2f77f98867031083d83808acd19e97539 SHA512 3d5d73a816a00887a8851e2e79919b2646f6cc34fd9b8acb255a52e2e71407a4728a80a81112bdbe0a92ba9f71e856ac7a2229741273e8485806cda2cb018d8d
+DIST mongodb-src-r4.0.16.tar.gz 50091501 BLAKE2B a383f9fef8e5b2ceda9646dfc4f4f46bc3bee66be45e94a846b1a7ce859826273812d4ce11aa96d1766071bf5fb422771bf2176350145deae99e64e59c164e38 SHA512 90458dea29a4c9a3078e1f13ffd2163911bf5a5f42884553ad9b3c2a2fafea2f73e506640c78f55f27bc16551582ad22244437356b89786fef383ce4b24bb617
 DIST mongodb-src-r4.2.1.tar.gz 60922510 BLAKE2B b06141cf0a8d256fc24e64c7115093009f42a97c74d270997ad4a70fb040199db05c5083cf1639283cc253264fbeb975d7efe3a41227d75146d7aa2e2fb9fa12 SHA512 6057f68ebeb2d5f74e70639fcc08aecfb112d386e3d016e18dfb2413319abf46249a0f5ffcfb74be9264a2ef34f45dd96f9774d86b1ec7e7213276f1c84f3106
 DIST mongodb-src-r4.2.2.tar.gz 60991680 BLAKE2B afd31a60929ebfe9c02abee92fd4814c178b03e4e88e10069003fd3e1813481e9cc967e8b4d15b87b0fe703df7fa42a70f60db33cf84ecbf1decfd6657e28ba1 SHA512 30f1e20fbe45ca136869f3fd7e54f1cd65d1544c0693b9945a0036a50257cfc12915a17bf79267500496b5acf3cfa24f406114ea7180b7abee89cd62de5eec80
+DIST mongodb-src-r4.2.3.tar.gz 61565615 BLAKE2B 695310a497e57f1c735f175f5b321c93cda376ec734bb08d4cabbd562a865b327f529560220be9c22f571cc70af333a77f0116f04c7f7e3a40f275ab53ab1bf9 SHA512 60e9091cfab4a189a937dfa7ce232eb6ead2ca192c916579f4fb5da2040aa340ae9de0ea8c7a4ccb0edcfdbdf6e666144657f171c3f23c0a62bccf27cd351c69
 EBUILD mongodb-3.6.13.ebuild 4257 BLAKE2B 0643b2cca9c231b3b8093e1cc4d0e4b7ff2bd6504251f8c7dd706bd15f59548bb4f8462e5547b3e97da5aed385f0179807cef36060211bcf069feec4b251425e SHA512 edbc5d01e606bd324ea505e02d8216b68250bab78dc26b932203df625621d9f27847b8fefc5e0bf7256be67ccde8fe0a56d28ed59b5e0d79e3b68d454b454cf4
 EBUILD mongodb-3.6.14.ebuild 4243 BLAKE2B 8cb508eb72021f1c96104f55df266505b9b77087ca130645c991e1594427f41d2b20b9843fe8c8de7f9469b5d31a46556b546723bc6d653ed897b43255543fb8 SHA512 72997ea27f0cfae8761150a6416465868b27544bd341e01adf76f53f1d3f79139196581c0034740aef49aa9172bcb582f4b390fb1413e2f5a42b9c91aea07f2d
 EBUILD mongodb-3.6.16.ebuild 4243 BLAKE2B 8cb508eb72021f1c96104f55df266505b9b77087ca130645c991e1594427f41d2b20b9843fe8c8de7f9469b5d31a46556b546723bc6d653ed897b43255543fb8 SHA512 72997ea27f0cfae8761150a6416465868b27544bd341e01adf76f53f1d3f79139196581c0034740aef49aa9172bcb582f4b390fb1413e2f5a42b9c91aea07f2d
+EBUILD mongodb-3.6.17.ebuild 4243 BLAKE2B ab016ce9ee393d09e0e8067cd32c013745318342a9963cde20e7bb7dfcf171c120b06a2364446dd0e696bb5e73c268c3f1e1b97c31da0274173ef38049aef39a SHA512 29349128d64b2809c14b8cfc187a23828be4889096fc724f265284134ca124e43a2a05186396b1388168f721441706890722386b5d8464d7216d6535cbbd7966
 EBUILD mongodb-4.0.12.ebuild 4318 BLAKE2B be6dcb75ecb3654b980db1b893746ab6a33e537a9dac06b42e8f2defbd75aaab3b7d32b63f67cb97b886f79c74363199651377580c7b76160e2ecba993ab78fa SHA512 bf45a240826725c47dbd8475c01d24da966c44027cadb73b28b2fa536f45d9dfb714a50393b09040dc928f0c676b42a89d3ebace2d63e0a78443d434eb43b235
 EBUILD mongodb-4.0.13.ebuild 4244 BLAKE2B e045a5c70486076096254161c8633d9a144bee7088991b85d3b26d5264fd553f70b0b14df841b618159ec3074a845866756de4a9bd69acbe829e8889b83d5d36 SHA512 820958bad65597051874f2519b52a15f4fe52f3921074137d1642cc9f310e6508588c7b6c2e34eb1e56cf463a93fd4c36d2c3bf9dbdf68dddb7399029a8db1ca
 EBUILD mongodb-4.0.14.ebuild 4244 BLAKE2B e045a5c70486076096254161c8633d9a144bee7088991b85d3b26d5264fd553f70b0b14df841b618159ec3074a845866756de4a9bd69acbe829e8889b83d5d36 SHA512 820958bad65597051874f2519b52a15f4fe52f3921074137d1642cc9f310e6508588c7b6c2e34eb1e56cf463a93fd4c36d2c3bf9dbdf68dddb7399029a8db1ca
+EBUILD mongodb-4.0.16.ebuild 4244 BLAKE2B b85189caf3152d8ebe79f7e9dfa54f653c1e77b07345e3d55834578e8365d5092bb99cb2391c8681498afa4f68ea2f32e6e70bcb72a9a9339144e46e5265daee SHA512 bb312c91bb4e8931d97f3af5096850812de183c9997e8fa5e9f3d0e6f7c926b4c9eaf49edac686fbb7ee8e6d321cc46cdf015efd85861504b1f099d2725b2eb0
 EBUILD mongodb-4.2.1.ebuild 4296 BLAKE2B fa701c16589de132c1cc81be3e81306cbea049a8523aba4f0bb1da0a84ecc00160e69e00682bb76647a0c295482a3943eb98d3b6cf640d40c003ebbe1e38562d SHA512 7e809ea122ed95f7bfa02dba005ee28aced39238affe936061797575a62f96cc46d3d5b2ef54429978d96e2d29914776beddde0d59f937dca9484c33a3334cf2
 EBUILD mongodb-4.2.2.ebuild 4296 BLAKE2B fa701c16589de132c1cc81be3e81306cbea049a8523aba4f0bb1da0a84ecc00160e69e00682bb76647a0c295482a3943eb98d3b6cf640d40c003ebbe1e38562d SHA512 7e809ea122ed95f7bfa02dba005ee28aced39238affe936061797575a62f96cc46d3d5b2ef54429978d96e2d29914776beddde0d59f937dca9484c33a3334cf2
+EBUILD mongodb-4.2.3.ebuild 4296 BLAKE2B fa701c16589de132c1cc81be3e81306cbea049a8523aba4f0bb1da0a84ecc00160e69e00682bb76647a0c295482a3943eb98d3b6cf640d40c003ebbe1e38562d SHA512 7e809ea122ed95f7bfa02dba005ee28aced39238affe936061797575a62f96cc46d3d5b2ef54429978d96e2d29914776beddde0d59f937dca9484c33a3334cf2
 MISC metadata.xml 901 BLAKE2B f7fde58679ba05518634b82bf5fcc371897165364fe5b023a2ec161790c869de82b4a3dd769d5e1bb450f99679869b60bb1e35beb8d41c54d3448dfca580a7ae SHA512 48f133d396aa31b992bac5f947e5a262b2d07a1016c6d49fa3c86dabb85981edfa332abb867413826762d88051ff3981cc77c2ec92e992d7a231c3b542336e36
diff --git a/dev-db/mongodb/mongodb-3.6.17.ebuild b/dev-db/mongodb/mongodb-3.6.17.ebuild
new file mode 100644
index 000000000000..8b60f64d9f55
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.6.17.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+	acct-user/mongodb
+	>=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3:=
+	>=dev-libs/boost-1.60:=[threads(+)]
+	>=dev-libs/libpcre-8.41[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.8:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/cheetah[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		virtual/python-typing[${PYTHON_USEDEP}]
+	')
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )
+	test? (
+		$(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
+	"${FILESDIR}/${PN}-4.0.12-boost-1.71-cxxabi-include.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 3.4; then
+			ewarn "To upgrade from a version earlier than the 3.4-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 3.4-series. Then upgrade to 3.6 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 3.4 before upgrading."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.0.16.ebuild b/dev-db/mongodb/mongodb-4.0.16.ebuild
new file mode 100644
index 000000000000..7542115d20f4
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.0.16.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+	acct-user/mongodb
+	>=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3:=
+	>=dev-libs/boost-1.60:=[threads(+)]
+	>=dev-libs/libpcre-8.41[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.11:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/cheetah[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		virtual/python-typing[${PYTHON_USEDEP}]
+	')
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )
+	test? (
+		$(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+	"${FILESDIR}/${PN}-4.0.12-boost-1.71-cxxabi-include.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 3.6; then
+			ewarn "To upgrade from a version earlier than the 3.6-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 3.6-series. Then upgrade to 4.0 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.2.3.ebuild b/dev-db/mongodb/mongodb-4.2.3.ebuild
new file mode 100644
index 000000000000..d566c1d609b2
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.2.3.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+	acct-user/mongodb
+	>=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.6.2:=
+	>=dev-libs/boost-1.70:=[threads(+)]
+	>=dev-libs/libpcre-8.42[cxx]
+	app-arch/zstd
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.11:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		virtual/python-typing[${PYTHON_USEDEP}]
+	')
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )
+	test? (
+		$(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
+	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 4.0; then
+			ewarn "To upgrade from a version earlier than the 4.0-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 4.0-series. Then upgrade to 4.2 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+		--use-system-zstd
+	)
+
+	use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index b514b1dc57ba..925b57230c8b 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -11,6 +11,6 @@ DIST mysql++-3.2.4.tar.gz 4594696 BLAKE2B 7e0553b0e22bb3607a914fc7756ec192465af5
 DIST mysql++-3.2.5.tar.gz 4748218 BLAKE2B ffceddb360cf6f0f38b7647f68e52ad9b659642c598c2aab7736813bf61d07316900d843749c2f9f4c753bd2087711ca712cc430f12b3a475c63ae3e5b11aff7 SHA512 5fa042a350322fa74afa28dc5e53f15cad32517001ab817493bf0d13a64e6559712f5e61184ef38a97bc8fe69f8732aaf436bc5d1663e4873f8baebee2e00892
 EBUILD mysql++-2.3.2-r1.ebuild 1410 BLAKE2B 6acbf4805dc44570d1d1b9df9a1c8769d3c13c9658b74cbad2052313d0538552693da45f2558be1afea78f80d6492ec36a9c02389ecbc054c60610ad521030eb SHA512 badefe7d214bd55b81965070b814b94c15fe3635d87c265225d2f9fef02360c3e09adeeb79a75c9990e89d596f111fc958c2a5fcec63624f14404192e4a26884
 EBUILD mysql++-3.2.3-r1.ebuild 1559 BLAKE2B cfab2b4e0b80cac21ab3d3ab6db56e44cd1f13469595bcbc10f49386ccf1f5c816cb03514ee361a929201e0ffd8f1926469c1547a59e617327570fa380aa3e74 SHA512 7d0463c7ff3d0a0e9ec7d827c3f4d111269e782a55f1a28336b2b1f2a11f599f3b39bc01b03b54ebbb7a812176edf0cd0e4dc964f55112bb1852b8d1f11a4427
-EBUILD mysql++-3.2.4.ebuild 1704 BLAKE2B c67e5a1e752602037503871f061f6a0430af178beab1c8fe293b19f903afbc78a62f602e8fa1af1c2812c0c938b540a99f0c25dd37ea782b9815237cfe8b4036 SHA512 7358abde75d8f9b57487955a75c7718d383b2ef0aea9094a9bce3affd8151ed94c509e884dea6b10b9d8d709fa893fcb0153e26520375410661045ed198013b2
+EBUILD mysql++-3.2.4.ebuild 1702 BLAKE2B 994cdea880947ffc1295e68a43ca96c028b2d0749493aa528f9459421db18535dd57a8edad11b404d0ace8dc80bec0593f58e1c71eb85f6186da1027caeffa1b SHA512 2093a0835d95f934ff7f27725e3a292c6affef51173b7db36c8239c71f2e3b06cef2ed3990761777f79668f5200762acd504215ae8b93c0ef0a06d9398e6f434
 EBUILD mysql++-3.2.5.ebuild 1704 BLAKE2B dc150bed9777bbc18f38799121ed83f1cbf5c4c5be814a3e2b85664d5079adefafe2f3d502c4f9349a823db20723d95d039ef4b2e431e41299112be2ec06e1fe SHA512 2f784310eb4a015c67dd0c0566847c27f95dddd25e160edffcb28253a9cc545ed35e44fecac7242359c78ab05d0237242e8b548db0064fb0d63780e561304d48
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql++/mysql++-3.2.4.ebuild b/dev-db/mysql++/mysql++-3.2.4.ebuild
index 24978aa9f91f..ba9a947c7f13 100644
--- a/dev-db/mysql++/mysql++-3.2.4.ebuild
+++ b/dev-db/mysql++/mysql++-3.2.4.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--enable-thread-check
-		--with-mysql="${EPREFIX%/}/usr"
+		--with-mysql="${EPREFIX}/usr"
 		--with-mysql-lib="${EPREFIX}$(mysql_config --variable=pkglibdir)"
 		--with-mysql-include="${EPREFIX}$(mysql_config --variable=pkgincludedir)"
 	)
diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 92b607f16c9a..7459a8119f6e 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -5,7 +5,7 @@ DIST mysql-cluster-gpl-7.2.34.tar.gz 25114728 BLAKE2B b9337cf8ae6742c58f92ae64b8
 DIST mysql-cluster-gpl-7.3.22.tar.gz 41356026 BLAKE2B 055a3f8590f0e2e53f8620244bd2ca7d619ab5549de7b33c4d41d2fabd260d98eaabdc0169488a6d018bcafc4458433e21b65025827998a31e9abc1deb5101ae SHA512 ccb9f3429e6ccb2dbb53d98f54abeae3c3128e65dc69c41918324630fef665f48d3c3af2d60bf1cce4e28c492e525c6bbc32cc8a39a9ea47988184adeafd5bd3
 DIST mysql-cluster-gpl-7.4.21.tar.gz 41718490 BLAKE2B 4578e477b345c85ccf12e4ea79893dda9b33bf35722ff8c6d706f150d8506d07b5e49a8e69e37cb3c8ff449832c80f72430924559b4a6d209d11d31cc2a67ca4 SHA512 48f475806608c0f6e0c45cc9c3b3851678153e17cf5c74114b2ca7a75eee455798c8decb857738eecb3fe664930e378e1d399509a954a7073802285eb87801b5
 DIST mysql-extras-20190121-0015Z.tar.bz2 330807 BLAKE2B d5beae3d5a493e01d57130f835cd0d7dcbf53af389f9b933446ab43b86f96c85b5858a7a56ffe882ee63371ab96f0226e04f710dfb119ddd91b5c5685d0999bc SHA512 2f092b8e1e2f836d19e4663d383be876d498bca0ee005a690f48ba1797e9e5b648c4a15c36885faa286ce12a49386bf2898940e19eb1d288e7ee084968821a05
-EBUILD mysql-cluster-7.2.34.ebuild 25616 BLAKE2B 732a89a04e9593931a5fd06afcb7ebea0df0e12f141a6d362ef8fb80e4f3b48e97ee9ed78cf016641a6f157e19cafd38e06df8d743f03a7135156dc46e612ddb SHA512 4a4361affe734122a4fcd03d6da77b522d35b86e8e13d089d9da8b45afbd68e6bdcd059d635ab9faa8294373e50d3f6a83324604824cd1474735fbd627ec9e7f
-EBUILD mysql-cluster-7.3.22.ebuild 26072 BLAKE2B 0f0c2fa6f640ec7ca2a634995c9bb3caab7dd3e7407f92fbb6b5b7bb6e772dc7c898a514c76674341d5d8a3d3c6e26e5f324438c4088973e01b742d65f1bb05c SHA512 3f5ade7b0ac957e8757326048c3bf037214cc761820a541a522a01ad3221c4b9b7cd13ae1457d7f8b75a20a7a1a3a018856bce1c773d7a5dbf0841573cdcad64
-EBUILD mysql-cluster-7.4.21.ebuild 26072 BLAKE2B 8b336a01500b5d6351824501581a25f69e6804938d3c4579b10801020ffe08f5253abdb57c27dc44fd983cb694516aa84876c88e9a639e04657efdb7b3f529a3 SHA512 49fb7e1e1f6eed702a17a02291ec5ff145a77ff569f2d39e0cc2bc2487d2910f1bc011488bf95cf28c5083937751d785a9c28da0ec7fd80167a6549f2424da3a
+EBUILD mysql-cluster-7.2.34.ebuild 25564 BLAKE2B 0e11e3ab3f2bda40b55445079ac8b430d8f5f48dc5e84880ab1097dca820fbb28cc5cf20fc75726e4253eedaa1d9935397f52059cce40bf912201ca06d7200ca SHA512 f26eb24e569bbe3d46b5a2d9ad344bc207bbba172b2d8ce1e37be7c49686bd0e0fb63f5a8a3a9af4ed4375bf92fb66638c2480e30369d7de8c586d6d318c0512
+EBUILD mysql-cluster-7.3.22.ebuild 26020 BLAKE2B d0686fcc55147a4ff04e5aa2149b18345860418e3996eb14d18703cc85017ee8fa1e5fc25e5b9d7d2ceaf28494b885d09b23c1ea234517e344d17094fb785b0a SHA512 c7c2a43abc71e0a1e21a9b98fe05a1c6ccafc1da2d94416bc1a72fb48508537d858e8729b41714478aaad40b65fee57a3cc75bb12a18b918531a1b17aa514923
+EBUILD mysql-cluster-7.4.21.ebuild 26020 BLAKE2B ccae39190741e28ba5695459b21583ccc5db5962800198e3ceb55324b411f0c8505c27b4920dbd4456d98f29dfa4a2ab641da34497795d341a5017ac4db2b910 SHA512 2fc854ae7ac5e0066c0a9fb297c94664ff89722a641f901f3bfa0558c237f9f22c7963dc4c84ec34c0e916663f1fe7eb9b8c5ce1e8a5e29a4c0995b9fdc396c7
 MISC metadata.xml 1248 BLAKE2B 02eec2cf13c1d1ec71d92a3a6e15a65966e3a6de1595f5027159e8eb6c6c67a38994fe7c051746ff9f820138c51f21afd46214c0a686e9e107668b3eaba9950d SHA512 ce4c1b021cf1d5381c4523b9c047ce3a580ea807cfa81557d398ef5bf92bb0d30d1145d0fde299f1dbab8837b09731eea1767a864964ec9d66393096e61661f5
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
index 8ecb148dc58a..048d9b67f192 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
@@ -238,8 +238,7 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -250,14 +249,14 @@ src_configure(){
 		-DINSTALL_MYSQLSHAREDIR=share/mysql
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
 		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		-DWITH_ZLIB=system
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		# The build forces this to be defined when cross-compiling.  We pass it
 		# all the time for simplicity and to make sure it is actually correct.
 		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
index 8a33824b92a4..9456b1c4a778 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
@@ -239,8 +239,7 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -251,16 +250,16 @@ src_configure(){
 		-DINSTALL_MYSQLSHAREDIR=share/mysql
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
 		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		-DWITH_EDITLINE=bundled
 		-DWITH_ZLIB=system
 		-DWITH_LIBWRAP=OFF
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		# The build forces this to be defined when cross-compiling.  We pass it
 		# all the time for simplicity and to make sure it is actually correct.
 		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
index 8d0360acf3a8..a4c51a22cc00 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
@@ -239,8 +239,7 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -251,16 +250,16 @@ src_configure(){
 		-DINSTALL_MYSQLSHAREDIR=share/mysql
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
 		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		-DWITH_EDITLINE=bundled
 		-DWITH_ZLIB=system
 		-DWITH_LIBWRAP=OFF
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		# The build forces this to be defined when cross-compiling.  We pass it
 		# all the time for simplicity and to make sure it is actually correct.
 		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 982b1c37c488..09336b742cc1 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -4,6 +4,6 @@ AUX mysql-connector-c++-8.0.19-fix-build.patch 9695 BLAKE2B c3334f74160a9b1148a5
 AUX mysql-connector-c++-8.0.19-fix-libressl-support.patch 3358 BLAKE2B 795c9f313d2495c3fee01066c7116fa3272a162b7401359657256d1adfb24d236049bbad6016e763de2a62ec9b6ccc93546eccffc457ae0bafca29b2c7e21b5d SHA512 d7b4b1424a6fd237ad0e7bd5648b156f770e352ec8fb3edfa6dfb767ebbe73e8ebc186b327e8543aa7bc12b7bc6081fae225a6ff0e153e25bb76900142adaa31
 DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 386a4753ca3f03999a49a89507da1b1172b3db89797c38403fee4eea86e7108a5e4f91f24a17de86d585c2a3d9e5742a117fa84d9b14aad649f938a597f3dae9 SHA512 d7e132dbc2efda4a77f8ae00c24006a1ade1d0a50f22d89ece453505e6d206427ee7988df29c0d6ef8b396ad6b8d326b6d263a1d4fa08ef5db0966fb4f1479f4
 DIST mysql-connector-c++-8.0.19-src.tar.gz 3137484 BLAKE2B 82a2900b0daa00bcfd72d562818ada25fe15901991a896a46ecdd9304e03066c4e7a3804287540559df1c74dbd1b3983b450ab783ee8cb7f0d7ec152f3cdc6b0 SHA512 5987ae31cda3a5db18ceded201ccbe66263b8ab7665ceacf70af6bb6b99130377b40514b96644b0768fd809b36ee02580520923c11c1edecccc75da15d7bb0bd
-EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1642 BLAKE2B 6e6fa755a9c7f51fc9ddd4310664b7f1a9dfa1e348ea033006195ae9ef7d1f6cbbfa82c13394ea3355fb15bca3d05baa5bee43a287b7c63d9fcbe5240d0a59ab SHA512 0a0d2ec5bd5231f708baa1d605c8d24118d2bf3ca8583d5f22e3b9cbdcbd55c6a2fc3f5aa53bc3e4858884d5f7ad4d70221dbe57d2dc60df68cc3c27fceb16d4
+EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1636 BLAKE2B 31a82b0cd687e0559da57986af4ae883fb0c8ce9baa1d8fc8476b3a38db7b7008f9308ea522be00ee1c62fcab2a6fd22a7ce45e3b0e15557e2f735bc15f57bf0 SHA512 f17187b56153ab5d7385ddc2f7670ad17fd5f9eb09b6b6872c7505f207d6adba1abb8f10c0401b458841f3d44375809e6745f31774067796088f5d3103c9c650
 EBUILD mysql-connector-c++-8.0.19.ebuild 1070 BLAKE2B 1a42cb615fb70dccb3be62cbb4430770220534fe8bad1a69d828ec1342e0fb5c003034130320d0e7838416b1a1fb12063b3f0953a8af45c95698a968bbf5a45a SHA512 81ed1cc863ee4f5a8b30fffbceb2821f9fd59379c7ac6b382392526670649f3fe858fa54191fb7304db6a4611632752c09fecb5f4c5b5f58df3145836a5a4cbc
 MISC metadata.xml 378 BLAKE2B 43fdbbc8d3b6ef99e51da96ddfefbdeaa70ef5fcb2fc6067305f75f75b7ee2fd21b79ca76704d8752bf59ae057b28efb187b063770964246f93fea629b58b467 SHA512 c6e545fb60d306792421ea26a937aaa6aea53d2a4100c9cafe78cf695c9dd0620cf3e770d43ff42749ae42bbe3a35212407ea84edee9af2dcb0255c2b763ddfc
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
index 6a139eae88f6..121c4bdf49dc 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
@@ -49,10 +49,10 @@ src_install() {
 
 	# static lib has wrong name so we need to rename it
 	if use static-libs; then
-		mv "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
-			"${ED%/}"/usr/$(get_libdir)/libmysqlcppconn.a || die
+		mv "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
+			"${ED}"/usr/$(get_libdir)/libmysqlcppconn.a || die
 	else
-		rm -f "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a
+		rm -f "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a
 	fi
 
 	# examples
diff --git a/dev-db/mysql-init-scripts/Manifest b/dev-db/mysql-init-scripts/Manifest
index 420817ae15e0..145f5f4f830a 100644
--- a/dev-db/mysql-init-scripts/Manifest
+++ b/dev-db/mysql-init-scripts/Manifest
@@ -9,5 +9,5 @@ AUX mysqld-v2.service 1208 BLAKE2B 9dad4cfa0a102fe7705f4d1db042d0c65d66e669b51b8
 AUX mysqld-wait-ready 1758 BLAKE2B 2a6ccc105cedc78e4e8acf77fd13f8083af80b3488572079bd063fac263382cd37a85cf40c02ffa8a9a047f146402dc2f7bfef91d47487003b64c84cdc8196c9 SHA512 ad4a850d045149df156c8236ae114e94887626e3ca803dea9bcc3909349043b51357a71ac17d694e0217f7856e076a0736267fc1ea3dedbef8a319fc9014c01b
 AUX mysqld_at-v2.service 1170 BLAKE2B d02f7ee3549d273d309e8e6e5cd8c2f987c6feab42bb330367c14df6932a887f7740ca6c28ecd15aba8bf2f89c33854345d773134630a5e8cd5ce8b99a8b6667 SHA512 a91eb574925afc0096e668799f9806b1cfa4c808ffab26dab5df1934db0dd8059a5e7913b0fdc3374f41e14cc72a6450890c9d746d3ff2de873af91199a71ee0
 AUX run-s6 268 BLAKE2B ebc9c74527257e1a35a4671afe2d34d9ed9868db0e0f33eebe655b31317a4ceeb02affe471ad49007534a9ce0a9399d9f14af664488ae753e207cf97d467107b SHA512 82be247195f6d9d230b063e9bda393bab8855382c2f3e5eb4d427fc1eb7e23dbd8c90939224ff2b5e4116a5c9d3f26ebdc9b9f548cde91e7c1217f4f8500c0d3
-EBUILD mysql-init-scripts-2.3-r3.ebuild 2019 BLAKE2B 60ff505f08c1e4d879d2be6bbbdd0a39e40f95abe31dfb62003f257e67e13f64353bd9dfe035be9b36acf25fc3ed38aba110a6b48bbdf7fd01dd2fcc6892665a SHA512 1ad68422926669d21e49837d3f5fc672b556d557b21b54195e51ba08d85d7aa0ff29178bf4553f92187e7bbc6c0b4c3322d38cfe805e4ec6ee6513be10c268ee
+EBUILD mysql-init-scripts-2.3-r3.ebuild 2036 BLAKE2B a8742ff8cd9e1fe24f8153975780113263ba4724ee0b74b2d5d7827353e3e96982fbb606bf268d6146c5271f3f6b1f636623c4bcaac74873c274dccb08c657ac SHA512 8a11c944767a9cf38b3797fc0bf35afc402e31ed31001447cfca3bebf6b7d03d81b0ea3bd6304e51e6b0c2b006597881d897d703d6ae549e2c95b280a5a449c4
 MISC metadata.xml 243 BLAKE2B f247f748a23e4cda2f518ad7e4e53b9027ff08ec62289010e6dfc8cd2ad49412430c4095e80f2156c8e6f1226bcda0163b4faae83759550f79e9998928398713 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
index 8b7d7538783f..921ba7471c28 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit systemd s6 tmpfiles
 
 DESCRIPTION="Gentoo MySQL init scripts."
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 8842bea9da86..fbf7aeef3819 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -13,10 +13,10 @@ DIST mysql-boost-8.0.19.tar.gz 264147972 BLAKE2B 61a5ccbef1a7a675c85e4e6bda8e528
 DIST mysql-extras-20190817-0024Z.tar.bz2 337793 BLAKE2B dfd51a708654aff5bdbbaf2acad7ef966869a8e3adcba544ee15f217d2ba942827445841e73981bccc6c1f145b6225bfa7245114219f0cf52f0dfb85494a6830 SHA512 c2ff81be1c55636f0a2700033af030149f312f0383217054a4b8c65aef174626299fcb4539eaae967ea7d096a5bb09f5b5122dce344b44b0a135d886ba0fdf28
 DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8
 DIST mysql-extras-20200125-1945Z.tar.bz2 344906 BLAKE2B 0e87875efbc221ded43d6f080dc7dce4277b676b538950120c94b962e51d054093286486e5d83ea3e38e1b2d0b12cf81873df50e1cebbe4cff33b54297e6a17a SHA512 5fcc5d372998db2b8aef32661ff71290791c20c1195a6210ca79c0fda12008906e665f9dc878d3df5a38a95e23ff05b910daa861002c17a1b6de71ef0520bee1
-EBUILD mysql-5.6.44-r1.ebuild 27147 BLAKE2B 1958b4796fb68f0bdc248d03e41a7f4320c7229657a725edeeba91b93dbb65a74ec3dd8f8ac3218c1b9566fd6c293cf0ef2f321722c4bafdaafd053da9c89594 SHA512 6939dca83cac2fa84c3208e025e2b5e750d3fc0d210781d60d62bce34d7648af59488aae0e996188fa13577fc65c85f7a7cbb408ced14dd23c0686a2784a08ef
-EBUILD mysql-5.6.45-r2.ebuild 27096 BLAKE2B 4185eba92b1d3455b2c9d718249a55e0a95b45f02f25ae5d65a9c3e01ad5de9bfe66793e63a2f577e3e7a9e295f40d7576070b356f6e2efcf493599f8569817e SHA512 faed98d09a85757cf2cede77fc21d83e059fcee33cfffd739f2dabe34ec905101840244f45c4bdf97f945abd79202c78b40f3b1dcc2f9edf10173741a3ea5b13
-EBUILD mysql-5.7.26-r1.ebuild 31734 BLAKE2B 1d81acf0b23e8dbffa2e5b5cfc9479f675480e775f4570df5c0fea294379138da799878dbcf3bf398badd727e6c33bd7a3387cb7d38bc643b25097194097beb0 SHA512 3189ed15cf77754993dba1065b4733584058952fdfa13da156563f7ff83ddb3146b121d4c51e30e099d50ca1715abc1ba3796e8a161f2804a284a72a3144b3af
-EBUILD mysql-5.7.27-r1.ebuild 31759 BLAKE2B 865bf492634cb00a3a373497501beeda472b477219960f012dcd74d5951e218904390039c17e5ff999a562cc12cb6bd58f0e2b0aa6efdb2e29f203171f04cecc SHA512 c0c7393a70d3be0129cba16694437f3017e97aa5f6cf8db63eb460d62ba06f5d3af8edbcb472d009f560e29ab837038dce4306bf2c2eb94f9ce026cae2204678
-EBUILD mysql-5.7.29.ebuild 31633 BLAKE2B b60edf3458739179f3358eaefac56bfebbcf3d0bdd67e08d3000cb02c7ddaf9cbfab37999a847cd0573ee263672455bed7375e621a0172de5c0892932940ff76 SHA512 418244b50c115ce9c79a97cb0f24a4c5f6c6747567cb3dce56b962b788aeea2a84e6cd762882b3031577396b9a417f791a1a8df9eef93ce10d5ec816679707d1
-EBUILD mysql-8.0.19-r1.ebuild 36980 BLAKE2B ad9bc499272c92b1bf0b5f536d383dc7d7b6d5fa5c247787f3d9940bec6957912147fc7d75361eb296d116590b295d81b8bfd8fb37ff248586ecb48c0e9bff84 SHA512 0c73b7dff7ef5897c9dfb047963c098aca70291ef21761de431f4a04aa9dcdae9f3996e476f84ec5824965d8c6e9b0d56da24b82930fff813f246e1e684299bb
+EBUILD mysql-5.6.44-r1.ebuild 27091 BLAKE2B 8e41f627e2860164e5c96f2b0dca2d2e21300cf4a5464f3701a464e97fa6b9535190ecb5d35450a3adf28c940b797fc5cc6515af1eb86cb90d67146eedf57e21 SHA512 196a798c4647766f359172ea88cdd0718ae4b115a454582d6cf4ed6be7b7bf67c041b0f86eae464385b1a569b7303146dd7fea87793c2dfbe67f18d1d4458cca
+EBUILD mysql-5.6.45-r2.ebuild 27040 BLAKE2B 602a12fdfcf8ae230f6781fd5a20c4f8bda9933c832680d95bbe77a4d96c337182e61f1fe963f56a2570b07dcea0998ab247563de14797865684d74a4b8ddd8c SHA512 b80fadd487a534e0879f27bd9fbc6651353fec68336821cd8422e0414d65a70daf30b1abe34e6d35d2fef779be0450280ff792b28c126a9d428bba43c436170b
+EBUILD mysql-5.7.26-r1.ebuild 31666 BLAKE2B 2bffe4ac85238c098429596553ef116b969f3b8934770c20ccd1638c9f428caf440fd2fd88c8b82c25c69ee6242307e508a26a26b6d074f518aef979044f896a SHA512 fdde5c1fa36c847958f419d3783422430f3e36adebcedfbc5ec8b9f46b60bc2094b91c811b50eb3abf738dcd2a3ec346d32179855b34641094966eea8ead7e9b
+EBUILD mysql-5.7.27-r1.ebuild 31691 BLAKE2B 5d91ac350a3135e4f340842c2990fc39e4394b8acecf93f1eb8809149dec50762cb16ed5e78a1aa994d96c4665ebd1b8e1009afd2febd7e7fc073ec38b10c7db SHA512 2af8a8ff0c29ad3d35146c4173b5a6ac1e1795f2b9e1e94a80798ae1e45d893747f15a5168d1bf50bb1b6a73e6a05e544c9d426e5f916c5eafb9259442484804
+EBUILD mysql-5.7.29.ebuild 31565 BLAKE2B 424e1b3d5d47195bbc21afad81a9b25436287394ab0ea5faa8e86f418d2cecceba3743e5c2833f0611337d354d2b91be1045051a6bafb0574e59a4aab2b6e539 SHA512 deb4319a396d26f85e4d113c95d5f9271ac7dd5a9782f29c04041a737d75a7d02537931a0a34787d81a35829d25190fb18972a09fc9e09b19d4e3fb50fcce46a
+EBUILD mysql-8.0.19-r1.ebuild 36938 BLAKE2B a91fb3a911767ee4bb0b13f8ec02449ac6f12225ced0709b53e87aca4a1e7ab3414bdbaa8d45e5705e83a3fcee78ec08e23d677412e0693ad40047cc9a253235 SHA512 cfee404ec3c4f6153eb923f81d8e9fe031d7982aacf5d0450b30cd075a0237dc4c8782c61f42bce095e8d10951a3d678c8459c91646ae110231b0172a7717cfa
 MISC metadata.xml 1470 BLAKE2B 09754bc9a1cf5584588c4f69700919fd72a860175ae1c045ce90a644a1360d5abccedd5b2649e16fcd189e82df659ceb96fd71ab2aeccdac6256af4f80e46a0d SHA512 d96f6a133611f50b80116221e2586eff899210255efac58d9f6ef7ccd0ee0854a3322b4d4d1db15b3b2e410525f5d73e43f52a833f3ce358f6708b88b3cf00c7
diff --git a/dev-db/mysql/mysql-5.6.44-r1.ebuild b/dev-db/mysql/mysql-5.6.44-r1.ebuild
index 65e334429702..0238c0f2d4b7 100644
--- a/dev-db/mysql/mysql-5.6.44-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.44-r1.ebuild
@@ -245,7 +245,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
@@ -536,10 +535,10 @@ src_test() {
 }
 
 mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
 
 	if [[ -z "${MY_DATADIR}" ]] ; then
 		MY_DATADIR=""
@@ -602,7 +601,7 @@ pkg_config() {
 	local old_MY_DATADIR="${MY_DATADIR}"
 	local old_HOME="${HOME}"
 	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX%/}/root
+	export HOME=${EPREFIX}/root
 
 	# Make sure the vars are correctly initialized
 	mysql_init_vars
@@ -763,13 +762,13 @@ pkg_config() {
 	if [[ -r "${help_tables}" ]] ; then
 		cat "${help_tables}" >> "${sqltmp}"
 	fi
-	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
 	einfo "Command: ${cmd[*]}"
 	su -s /bin/sh -c "${cmd[*]}" mysql \
 		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
 	if [ $? -ne 0 ]; then
 		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
 	fi
 	popd &>/dev/null || die
 	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
diff --git a/dev-db/mysql/mysql-5.6.45-r2.ebuild b/dev-db/mysql/mysql-5.6.45-r2.ebuild
index 1ea042478213..6f1c6b5e8485 100644
--- a/dev-db/mysql/mysql-5.6.45-r2.ebuild
+++ b/dev-db/mysql/mysql-5.6.45-r2.ebuild
@@ -254,7 +254,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
@@ -545,10 +544,10 @@ src_test() {
 }
 
 mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
 
 	if [[ -z "${MY_DATADIR}" ]] ; then
 		MY_DATADIR=""
@@ -611,7 +610,7 @@ pkg_config() {
 	local old_MY_DATADIR="${MY_DATADIR}"
 	local old_HOME="${HOME}"
 	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX%/}/root
+	export HOME=${EPREFIX}/root
 
 	# Make sure the vars are correctly initialized
 	mysql_init_vars
@@ -772,13 +771,13 @@ pkg_config() {
 	if [[ -r "${help_tables}" ]] ; then
 		cat "${help_tables}" >> "${sqltmp}"
 	fi
-	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
 	einfo "Command: ${cmd[*]}"
 	su -s /bin/sh -c "${cmd[*]}" mysql \
 		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
 	if [ $? -ne 0 ]; then
 		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
 	fi
 	popd &>/dev/null || die
 	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
diff --git a/dev-db/mysql/mysql-5.7.26-r1.ebuild b/dev-db/mysql/mysql-5.7.26-r1.ebuild
index 7cf6286849df..8825edb4d07a 100644
--- a/dev-db/mysql/mysql-5.7.26-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.26-r1.ebuild
@@ -125,10 +125,10 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 
 mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
 
 	if [[ -z "${MY_DATADIR}" ]] ; then
 		MY_DATADIR=""
@@ -333,9 +333,8 @@ multilib_src_configure() {
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -346,9 +345,9 @@ multilib_src_configure() {
 		-DINSTALL_MYSQLSHAREDIR=share/mysql
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
 		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		### TODO: make this system but issues with UTF-8 prevent it
@@ -356,7 +355,7 @@ multilib_src_configure() {
 		-DWITH_ZLIB=system
 		-DWITH_LIBWRAP=0
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
 		# The build forces this to be defined when cross-compiling. We pass it
@@ -774,7 +773,7 @@ pkg_config() {
 	local old_MY_DATADIR="${MY_DATADIR}"
 	local old_HOME="${HOME}"
 	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX%/}/root
+	export HOME=${EPREFIX}/root
 
 	# Make sure the vars are correctly initialized
 	mysql_init_vars
@@ -930,13 +929,13 @@ pkg_config() {
 	# --initialize-insecure will not set root password
 	# --initialize would set a random one in the log which we don't need as we set it ourselves
 	local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
-	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
 	einfo "Command: ${cmd[*]}"
 	su -s /bin/sh -c "${cmd[*]}" mysql \
 		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
 	if [[ $? -ne 0 ]] ; then
 		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
 	fi
 	popd &>/dev/null || die
 	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
diff --git a/dev-db/mysql/mysql-5.7.27-r1.ebuild b/dev-db/mysql/mysql-5.7.27-r1.ebuild
index 5a103007c82a..0bfc4b1cbcf7 100644
--- a/dev-db/mysql/mysql-5.7.27-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.27-r1.ebuild
@@ -133,10 +133,10 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 
 mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
 
 	if [[ -z "${MY_DATADIR}" ]] ; then
 		MY_DATADIR=""
@@ -344,9 +344,8 @@ multilib_src_configure() {
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -357,9 +356,9 @@ multilib_src_configure() {
 		-DINSTALL_MYSQLSHAREDIR=share/mysql
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
 		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		### TODO: make this system but issues with UTF-8 prevent it
@@ -367,7 +366,7 @@ multilib_src_configure() {
 		-DWITH_ZLIB=system
 		-DWITH_LIBWRAP=0
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
 		# The build forces this to be defined when cross-compiling. We pass it
@@ -785,7 +784,7 @@ pkg_config() {
 	local old_MY_DATADIR="${MY_DATADIR}"
 	local old_HOME="${HOME}"
 	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX%/}/root
+	export HOME=${EPREFIX}/root
 
 	# Make sure the vars are correctly initialized
 	mysql_init_vars
@@ -941,13 +940,13 @@ pkg_config() {
 	# --initialize-insecure will not set root password
 	# --initialize would set a random one in the log which we don't need as we set it ourselves
 	local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
-	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
 	einfo "Command: ${cmd[*]}"
 	su -s /bin/sh -c "${cmd[*]}" mysql \
 		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
 	if [[ $? -ne 0 ]] ; then
 		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
 	fi
 	popd &>/dev/null || die
 	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
diff --git a/dev-db/mysql/mysql-5.7.29.ebuild b/dev-db/mysql/mysql-5.7.29.ebuild
index d87e28c839bd..79346f5415bb 100644
--- a/dev-db/mysql/mysql-5.7.29.ebuild
+++ b/dev-db/mysql/mysql-5.7.29.ebuild
@@ -131,10 +131,10 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 
 mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
 
 	if [[ -z "${MY_DATADIR}" ]] ; then
 		MY_DATADIR=""
@@ -342,9 +342,8 @@ multilib_src_configure() {
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -355,9 +354,9 @@ multilib_src_configure() {
 		-DINSTALL_MYSQLSHAREDIR=share/mysql
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
 		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		### TODO: make this system but issues with UTF-8 prevent it
@@ -365,7 +364,7 @@ multilib_src_configure() {
 		-DWITH_ZLIB=system
 		-DWITH_LIBWRAP=0
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
 		# The build forces this to be defined when cross-compiling. We pass it
@@ -783,7 +782,7 @@ pkg_config() {
 	local old_MY_DATADIR="${MY_DATADIR}"
 	local old_HOME="${HOME}"
 	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX%/}/root
+	export HOME=${EPREFIX}/root
 
 	# Make sure the vars are correctly initialized
 	mysql_init_vars
@@ -939,13 +938,13 @@ pkg_config() {
 	# --initialize-insecure will not set root password
 	# --initialize would set a random one in the log which we don't need as we set it ourselves
 	local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
-	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
 	einfo "Command: ${cmd[*]}"
 	su -s /bin/sh -c "${cmd[*]}" mysql \
 		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
 	if [[ $? -ne 0 ]] ; then
 		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
 	fi
 	popd &>/dev/null || die
 	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
diff --git a/dev-db/mysql/mysql-8.0.19-r1.ebuild b/dev-db/mysql/mysql-8.0.19-r1.ebuild
index 5fced0177f01..a4a825347945 100644
--- a/dev-db/mysql/mysql-8.0.19-r1.ebuild
+++ b/dev-db/mysql/mysql-8.0.19-r1.ebuild
@@ -222,7 +222,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 79d83988df97..b33ac0479f33 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -9,6 +9,6 @@ DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d898281
 DIST mysql-extras-20200125-1945Z.tar.bz2 344906 BLAKE2B 0e87875efbc221ded43d6f080dc7dce4277b676b538950120c94b962e51d054093286486e5d83ea3e38e1b2d0b12cf81873df50e1cebbe4cff33b54297e6a17a SHA512 5fcc5d372998db2b8aef32661ff71290791c20c1195a6210ca79c0fda12008906e665f9dc878d3df5a38a95e23ff05b910daa861002c17a1b6de71ef0520bee1
 DIST percona-server-5.7.27-30.tar.gz 84672298 BLAKE2B 8431d231f602b704195868110e8eb73adb3db7c761906c15eff182e54634ef091a3ffa0d4f3498a93dbfbf65cd5cdd12102871abaaaa0f32378ba3068d083b2b SHA512 d62c66de3128df87dce52292ad1671e01fe2c923e668ef0faf9cb663c11c9cd0b976345aea1de6ea2bc458d0e1066b42c022849e422121d96cea082ed12c8f4b
 DIST percona-server-8.0.18-9.tar.gz 256867152 BLAKE2B 34c7b7b320f973313ecd95e658999a17748fc70ff46b1dc58144df02c17b7870cf33d68a555ee8aaaecb66c5b1003e6023154f7100a6f413514e89d495330dd2 SHA512 ce537a160b48e7c3dc35b15a293c39142a5b633111b5c9c5f9c1150476f0faa5e9cf81b34c9ca85286463455e3ae3fce7a200d253d880e3b67b3c71eefdbdcd4
-EBUILD percona-server-5.7.27.30.ebuild 37290 BLAKE2B 539507ea5fbdd1e1f3a43128bce1c4a565344ba238de6e68e89cce2750c159eb65e9d1d82f6198ebe891a685fa4345ff03be38647a54d3582ae6ff95d6ad65ff SHA512 340ec101d272cfe788c2fa19579f889923c2ab34997e4482b5ba827ebe7ab824655c3c14ce90ebe40385a55f74cba46414a76eeda09a9aac53759ebe8a48c820
-EBUILD percona-server-8.0.18.9.ebuild 37762 BLAKE2B 4baf5d6a80191612e022fd212c1f68e372fe6f0c999ebadcfae409c4c7701464b6085272f66c80e164b8a2b6fbd6204aeec58212d3d4244303f70f230d2f89e1 SHA512 540219318da07c64ee7a0c5161e440b0551a88db237d1f303c12fd15482222f804cb3e9db4bffdadeadbdf5c362f8bead222c69fca69ad30177f8b6627e29162
+EBUILD percona-server-5.7.27.30.ebuild 37222 BLAKE2B ad6aacc9103e672a83866e8c6e887dd58b78764b35e6ef5fa88b260ffb78c222fa2472ea0358dc8e00887961b48240509417886162c25cfa70937f6a3fbe7128 SHA512 ff57bf4b3e7e51cddfa81aded9470aafb1b03db93316c8267674786e54eb66e2d582d8b9f1f2ca3bb3a57d6b8c10fe5d62b33b08507a341e1221e5e48769ac50
+EBUILD percona-server-8.0.18.9.ebuild 37720 BLAKE2B 91c64bcfcbba4867d97a040fa9a5246122ab1efe82955e51fa2e8f9d560441496810346dc7f7f82370a71e98d2d57df28f735ec5a915dc21ab50c2af0637e87a SHA512 f1536a2efa8b484d2bba0955dd32dacfe99aceae981b1f846a63abed1218703812240bdc848174b69b93953482f8e70bbcfb98d4517dfb3669ec55084adc571a
 MISC metadata.xml 1476 BLAKE2B 45302733bbb03e6e999d60db72bed7382f664d9b46772904a35a1a8bfceccc89008e739fcead55bfb6a056523f0ff84fd22c638de859236f47a01eb8ac6c45eb SHA512 e53b29f9d78e895a26f228b7719a023dbd5957d1e10f384376b75b539a211425be143c229378af2ade5314f6b414d891bafc7e1fffde9bb88b59ff24de31a2c2
diff --git a/dev-db/percona-server/percona-server-5.7.27.30.ebuild b/dev-db/percona-server/percona-server-5.7.27.30.ebuild
index 5c4af55fc2eb..e936725d18de 100644
--- a/dev-db/percona-server/percona-server-5.7.27.30.ebuild
+++ b/dev-db/percona-server/percona-server-5.7.27.30.ebuild
@@ -161,10 +161,10 @@ python_check_deps() {
 }
 
 mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
 
 	if [[ -z "${MY_DATADIR}" ]] ; then
 		MY_DATADIR=""
@@ -395,9 +395,8 @@ multilib_src_configure() {
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -408,9 +407,9 @@ multilib_src_configure() {
 		-DINSTALL_MYSQLSHAREDIR=share/mysql
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
 		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		### TODO: make this system but issues with UTF-8 prevent it
@@ -418,7 +417,7 @@ multilib_src_configure() {
 		-DWITH_ZLIB=system
 		-DWITH_LIBWRAP=0
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
 		# The build forces this to be defined when cross-compiling. We pass it
@@ -917,7 +916,7 @@ pkg_config() {
 	local old_MY_DATADIR="${MY_DATADIR}"
 	local old_HOME="${HOME}"
 	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX%/}/root
+	export HOME=${EPREFIX}/root
 
 	# Make sure the vars are correctly initialized
 	mysql_init_vars
@@ -1073,13 +1072,13 @@ pkg_config() {
 	# --initialize-insecure will not set root password
 	# --initialize would set a random one in the log which we don't need as we set it ourselves
 	local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
-	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
 	einfo "Command: ${cmd[*]}"
 	su -s /bin/sh -c "${cmd[*]}" mysql \
 		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
 	if [[ $? -ne 0 ]] ; then
 		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
 	fi
 	popd &>/dev/null || die
 	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
diff --git a/dev-db/percona-server/percona-server-8.0.18.9.ebuild b/dev-db/percona-server/percona-server-8.0.18.9.ebuild
index a3c7cca82238..93fbfaacf7f7 100644
--- a/dev-db/percona-server/percona-server-8.0.18.9.ebuild
+++ b/dev-db/percona-server/percona-server-8.0.18.9.ebuild
@@ -233,7 +233,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index e9898d7b5904..276d7233190c 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,3 +1,7 @@
+AUX pgadmin4-4.17-python-3.8.patch 595 BLAKE2B 695b133a61d2a54939a3bd8fa3c8fe3ea52ca0b00de141e936602dd06e64db736a182dd015bc31aef17dca0f3ad5746833270b551285fde416ebac30c1705577 SHA512 c5500b8f2d071663073d727c7c69ac72e3566c789de999f198cd43c71c155eb273bc2ad7eab8d69f1911dfbd5cf741989c70ad179b61c67c9a93bdb6591c8972
+AUX pgadmin4.desktop 298 BLAKE2B 9048ee03c9f8e05807f2907fd7dcfda9d76bb3cd3b2567676cf6bc9acebdf8d2b4de1626f9fe57c4940422766fa7e6fa9111a5bc9c252e34f72af2850813b158 SHA512 a083c525cf49543751dcf4f98a9e2607ce06c35a573c5a97d4088b21b41dc260ea0fcbb139ce153f0e1deb6bd8e6e75e69a6fe08ff2f4aa563d7398bd52553b2
 DIST pgadmin4-4.13.tar.gz 25077107 BLAKE2B afbf0b6fba2f4cbbc1f47ac6c7867b7f131e5698de265a9dda53b79968f237ac591c5ff4da94dde0b74479cac1158ec825f42b14fc01aee13982043822c04443 SHA512 7eca41047e41f7bdce2dfe992260e8c2ab40f985dd232eb240ea9c0024f551f011653717aa0d5e4ccdccd4ef4936102cde1f97a32852d8382dcc222fadce7707
-EBUILD pgadmin4-4.13.ebuild 2820 BLAKE2B 12812b1f5dd2b1d4677cf67d4664093f1f3088ab435ef5b5d38c63bbdd00709862fb3784f1261e8195b8148e3adaeb6935d29d745cbf5f320ad2691128a3696d SHA512 6970e94afc1d98c3993810084db448e1b21627f90b55f291454c635f37b6aee0c82cd992cd681f19770ef4cb9134d57bc81425c3f784e06936f3a7ca53327cf7
+DIST pgadmin4-4.17.tar.gz 28007097 BLAKE2B d296f2b9372c23067db899fa82e1b8e732837b01a6172dd2d70520f815aafde161715eea9d9d53e7507a6a715dbfdaabf001a10d143c1aa0505237b2b138e334 SHA512 f9e292ba7ff1e5edaa8738188eb01744d69d0eb134700feb0623806425c998e7f298f74cd498a09f2d9a073a9a349c82f7a3f617e1da3c8dd757cc982d941c9f
+EBUILD pgadmin4-4.13-r1.ebuild 3065 BLAKE2B 8d4cb29606b3f434f825eb0a72414d3fddc4cc0b8e0f0a8b99b895ac871176a062ecae0cd483f12baa2257f61493f4df26ebdc55a6e36daee758c8ad19524fa8 SHA512 289a99a97bdfd6209c9e73c4a59121a3803f3756844ce97b41d777373a43cc2ff805ae6db299869c2373cf57d8d558522ec1504b6132d946610e9a0d65dfdfff
+EBUILD pgadmin4-4.17-r1.ebuild 3316 BLAKE2B 1866620faf43c9e668f3aec4fb126e923f8bebdd55bb5f82cbcaac6021ddd7d37302bc61bdde27e93ccbafbaab0cfd8338bcb0b5a35045d08086a43ce3d3132c SHA512 96385cc09e2b4567c36ac4f41b1465e8e9664609a78728d73d1d1b3aae3026f6cd48ecc268ee90258f4ee397f8f35c701fb48d0d21e36367cedbdd7384095407
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/files/pgadmin4-4.17-python-3.8.patch b/dev-db/pgadmin4/files/pgadmin4-4.17-python-3.8.patch
new file mode 100644
index 000000000000..fbf2f7be4a9b
--- /dev/null
+++ b/dev-db/pgadmin4/files/pgadmin4-4.17-python-3.8.patch
@@ -0,0 +1,12 @@
+diff -uprb pgadmin4-4.13.orig/runtime/pgAdmin4.pro pgadmin4-4.13/runtime/pgAdmin4.pro
+--- a/runtime/pgAdmin4.pro	2019-10-16 10:07:59.000000000 +0300
++++ b/runtime/pgAdmin4.pro	2019-11-05 18:33:18.524516120 +0200
+@@ -75,7 +75,7 @@ else {
+ 
+     QMAKE_CXXFLAGS += $$system($$PYTHON_CONFIG --includes)
+     QMAKE_LFLAGS += $$system($$PYTHON_CONFIG --ldflags)
+-    LIBS += $$system($$PYTHON_CONFIG --libs)
++    LIBS += $$system(PYTHON_LIBS=`$$PYTHON_CONFIG --libs --embed` || PYTHON_LIBS=`$$PYTHON_CONFIG --libs`; echo $PYTHON_LIBS)
+ 
+     contains( LIBS, -lpython2.* ) {
+        DEFINES += PYTHON2
diff --git a/dev-db/pgadmin4/files/pgadmin4.desktop b/dev-db/pgadmin4/files/pgadmin4.desktop
new file mode 100644
index 000000000000..e1697a620d5f
--- /dev/null
+++ b/dev-db/pgadmin4/files/pgadmin4.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=pgAdmin 4
+Exec=/usr/bin/pgAdmin4
+Icon=pgadmin4
+Type=Application
+Categories=Development;Database;
+MimeType=text/html
+DocPath=/usr/share/pgadmin4/docs/en_US/_build/html/index.html
+Comment=PostgreSQL Tools
+Keywords=database;db;sql;query;administration;development;
diff --git a/dev-db/pgadmin4/pgadmin4-4.13.ebuild b/dev-db/pgadmin4/pgadmin4-4.13-r1.ebuild
index 18587bb501f0..f044276c737a 100644
--- a/dev-db/pgadmin4/pgadmin4-4.13.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-4.13-r1.ebuild
@@ -29,35 +29,41 @@ COMMON_DEPEND="${PYTHON_DEPS}
 "
 
 DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 "
 
 RDEPEND="${COMMON_DEPEND}
-	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-htmlmin-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-migrate-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-security-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.5.1[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.8[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2018.9[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.18[${PYTHON_USEDEP}]
-	>=dev-python/sshtunnel-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-2.2.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=app-text/htmlmin-0.1.12[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-htmlmin-1.5.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-security-3.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-wtf-0.14.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/passlib-1.7.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-5.5.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-sqlparse-0.2.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pytz-2018.9[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.18[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sshtunnel-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
+	')
 "
 
 S="${WORKDIR}"/${P}/runtime
diff --git a/dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild b/dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild
new file mode 100644
index 000000000000..1a5bd03bedb6
--- /dev/null
+++ b/dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+inherit desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="GUI administration and development platform for PostgreSQL"
+HOMEPAGE="https://www.pgadmin.org/"
+SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+# libsodium dep added because of 689678
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/libsodium[-minimal]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtwidgets:5
+"
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	virtual/imagemagick-tools[png]
+"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		>=app-text/htmlmin-0.1.12[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-htmlmin-1.5.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-security-3.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-wtf-0.14.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/passlib-1.7.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-5.5.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-sqlparse-0.2.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pytz-2018.9[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.18[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sshtunnel-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+PATCHES=( "${FILESDIR}"/${P}-python-3.8.patch )
+
+S="${WORKDIR}"/${P}/runtime
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	default
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_compile() {
+	default
+	use doc && emake -C "${WORKDIR}"/${P} docs
+}
+
+src_install() {
+	dobin pgAdmin4
+
+	cd "${WORKDIR}"/${P} || die
+
+	local APP_DIR=/usr/share/${PN}/web
+	insinto "${APP_DIR}"
+	doins -r web/.
+	newins - config_local.py <<-EOF
+		SERVER_MODE = False
+		UPGRADE_CHECK_ENABLED = False
+	EOF
+	python_optimize "${D}${APP_DIR}"
+
+	insinto /etc/xdg/pgadmin
+	newins - pgadmin4.conf <<-EOF
+		[General]
+		ApplicationPath=${APP_DIR}
+		PythonPath=$(python_get_sitedir)
+	EOF
+
+	if use doc; then
+		rm -r docs/en_US/_build/html/_sources || die
+		insinto /usr/share/${PN}/docs/en_US/_build
+		doins -r docs/en_US/_build/html
+	fi
+
+	local s
+	for s in 16 32 48 64 72 96 128 192 256; do
+		convert runtime/pgAdmin4.png -resize ${s}x${s} ${PN}_${s}.png || die
+		newicon -s ${s} ${PN}_${s}.png ${PN}.png
+	done
+	domenu "${FILESDIR}"/${PN}.desktop
+}
diff --git a/dev-db/pgmodeler/Manifest b/dev-db/pgmodeler/Manifest
index c494c3b3c976..8ac70416f0f9 100644
--- a/dev-db/pgmodeler/Manifest
+++ b/dev-db/pgmodeler/Manifest
@@ -1,3 +1,3 @@
 DIST pgmodeler-0.9.1.tar.gz 3569027 BLAKE2B 4d91d430554f739b585ed155aa2d87dc648ea5d2d6a1c22ddd9ae829afb63654fe052091de5dea51b0fee20ef2ccaf5b77587f036c4072bbc623bffba9a67b27 SHA512 bb6f093e00f0e41a9dd2a9b7e3723459af759e79835b73ab67b01c23ae6b29f1453b5cf61e987c6f1a2a3908e700d048f0a7dcbed3ac1636493d6b6e657917ba
-EBUILD pgmodeler-0.9.1.ebuild 1249 BLAKE2B 0db1aabfc00714d7285c8a7cad01a5366bd6773c24a24b3e86b2ca51499ed3a04431c0ee12a7c59f74479927bf6017ddf2a89f23d66971ed6f3cc2c458b5777d SHA512 d2f5d6125b44a148f6f73472063d8745c51a19c3aec05e90c8514cf9178e938122fe277e33b0772e4627490162d34fc4beaa3f96df2dab33e893064f941dbd04
+EBUILD pgmodeler-0.9.1.ebuild 1241 BLAKE2B 007b3b60600706d4468e893b690832e30719794d16235d54fd6962259905e73847b9abfb013ea49b94eddf84a77a6c96957ad98d60b44f54bb69a0cf0a8f9e3a SHA512 615a3590933d1796848b9b362800df011bce689c2d00ddff1047ed5101dd57978bd4be61bca7765780a079a0d0a5913097a86e062ddad94e5872f541f49b9762
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild b/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild
index 0c8fc05f6763..7db68b875d7d 100644
--- a/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild
+++ b/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild
@@ -34,10 +34,10 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_configure() {
 	eqmake5 \
-		PREFIX="${EPREFIX%/}/usr" \
-		PLUGINSDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/plugins" \
-		PRIVATEBINDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/bin" \
-		PRIVATELIBDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}" \
+		PREFIX="${EPREFIX}/usr" \
+		PLUGINSDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins" \
+		PRIVATEBINDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/bin" \
+		PRIVATELIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" \
 		NO_UPDATE_CHECK=1 \
 		-r ${PN}.pro
 }
diff --git a/dev-db/pgxnclient/Manifest b/dev-db/pgxnclient/Manifest
index 7ce06c1a1107..00acb9dde1d3 100644
--- a/dev-db/pgxnclient/Manifest
+++ b/dev-db/pgxnclient/Manifest
@@ -1,5 +1,5 @@
 DIST pgxnclient-1.2.1.tar.gz 87275 BLAKE2B 794ee6201988ba523cdcb4ee5a6287625cb3dd8a30ad750266d7adb739792b7f8e852d5d01f746fb6b05b54c98d677854dceacc57e41b05efba094efabc6a129 SHA512 3fa864b1ebb5dedaf75515b5efe4c453f02acff558f7b82d2648da62e58c93e050049a7688171a69593784d9963bb62f4ad3674d526284554dbeb4f4a4ea1dbf
 DIST pgxnclient-1.2.tar.gz 86436 BLAKE2B 796191d31000ff75360e0990bb20ca88af0fb1b908aac9ca7a6b7309b5420c56d045a67c775e8d5dda166f37ad956314f65bd2032c114cac7414bef9ad1a0d8e SHA512 d677f8d5346caf4de5d7e0d4e4031b8bdd932e343af7fc33e8895ebe51b1e9e6a11d7300d9e98ddc10242854f7d39c0a4196f41938e42f0b0e5158454e386deb
-EBUILD pgxnclient-1.2-r1.ebuild 787 BLAKE2B 2eb540090cf46a1c14d41fb178b8da3bc58dec943521a90238d777db1bb3d1bf1a0c6a7031540c50f34e55571c82565c39b2161f55bdb4d2d1133b10c3582acd SHA512 203fb6df4c23c8e940118a1ac45a596b940a2f095dd396bd178ae0c9fde1d7d97e83194cb40cb92fddb971b118bb87981ebcb5074cfa3ef41652e61444857fc7
-EBUILD pgxnclient-1.2.1.ebuild 793 BLAKE2B 0f2fde64d8e72e57cc4c5aa5659aa00ce342354ff506e85112c447e72c55f83b50763ee4546fa4c9289e377fa47595acc406f36846bb8796dec79f54cf2237a9 SHA512 fd2705a2fdd435d04cf233775a2dc282e99edf5b7030e6ebf4166d7e6d5542c5a540fabac363bc910d644cafb9cb996f9f8b2ebf9fc320cef9f84e30e636e6d5
+EBUILD pgxnclient-1.2-r1.ebuild 792 BLAKE2B bd151a94340ff5908d582dc59de25e55771af3ede241546a5747b2ebdddcaf1ba16b20208381fd5d2626e86124f902b107f396d75a3c5ed1fe3f69c24ea641f7 SHA512 7946c8e1a0c28a94d469b912349addb2af2a760784eacaa068c78d01976a1bb2ecf1afea8d25cb9bd106c358ddbd76ed8a5643020799261bd42d4b111c00a913
+EBUILD pgxnclient-1.2.1.ebuild 798 BLAKE2B 553c3c2267e268b33b28eb8af4a7d033546526d935423f556aafd5e382752c45e61bcc6215474b6201d9ad127e2088e66fb5dbca5dbdf3c5f83c98895cef329f SHA512 6a006b13765ce47bbd3430cbf8eba507a3fd093d2b29fc49ac6f31bd51d240ab89e4dc614b7e4e242a6d6aa45f26c0ad5d7e887725f5750e6d6332f7f2a8bb66
 MISC metadata.xml 477 BLAKE2B 69bcece85da5b9490a5aec5f94264a420d5babb983d602188b4bcad58f35da663216bb52e694009562e518b716a12b05734a2ee81a1219d93641268630a68e3b SHA512 63a1019650d2bfec1f0dab904cabd0de847f5d7cb5ad62dd04ca93a6cf7c25ef2a727a8dc0700a00958b841f7ffaa2c99f608b4cb1872a31a1dc920d0834d22d
diff --git a/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
index 679315dda916..c41008704bf5 100644
--- a/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="PostgreSQL Extension Network Client"
-HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/${PN}"
+HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
index e15a725fbf91..91d190c091db 100644
--- a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="PostgreSQL Extension Network Client"
-HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/${PN}"
+HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 77836224d25a..86449ce23f48 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -30,28 +30,28 @@ DIST postgresql-9.6.13.tar.bz2 18767279 BLAKE2B c1ec780a7f938f878425cbd6556145e6
 DIST postgresql-9.6.14.tar.bz2 18787744 BLAKE2B be5a0d90fe1cd5ea682d8446e512271175f705bc49514215535d7aa4b631669846c0bd6167f985028c07dc5d6d394a1ea809028c5a5e15a5f010e85c2bede8cf SHA512 dccc183a6992ef4ece4ef5c638339708ab484e571ecd66ed993c9071cd55f250b4277fd3367f9a5ee545aa83e29dc5f7a239200e200e3314d5acc847f35e790c
 DIST postgresql-9.6.15.tar.bz2 18799121 BLAKE2B 5dee0fac7592cecf4412deaef54cedbd86eb6081fc268b6ef8a5f01c31af930747749fb54a77d766e1d6ef705bab5d550a7bace25c86d201f25ed69163d920fc SHA512 cc35a059bf59ea3487c17a8432b791ca2a19afaa24b07403a8d33904b3a97ebe601e3036ca8ec766c54cb87a7def7d4618a425a4446e6832391185d7c71117db
 DIST postgresql-9.6.16.tar.bz2 18806372 BLAKE2B f5d7287264b05ab6bd157adf05d78597c7e7281ef40d4616ad66f2434a686c68845ad21883bcc97f6ea299a785109e1541d6c75e40ba383d80e9703331d9c624 SHA512 7083d670883b203946f68bcf1216dd1cbd904220b4c95e25855f9a8904334fd7e87509c905f589398ad7b165869b75288c2e4f49b14263ce4891347ecd4485b4
-EBUILD postgresql-10.10.ebuild 13924 BLAKE2B c05398c0bcee12d28254fd57f91f974b8389b6739bcd4fd994ad35e18455936df9a2eec6cd9860c5bf4d9e3bb3251f4662bbf460675ca360c03a7193a96fc336 SHA512 74f6f8303318b25bfaf09cafbae0af3049cdac6eb939ec4df71b4a4892ed6df032a6afb8e0c84d4630cc2321b1d1db2c5873ad41833d6eabb5b77ea96e48dc49
-EBUILD postgresql-10.11.ebuild 13915 BLAKE2B 9704037528284f71a781c738b44450cb43c029bb221fde59d40f8af12de292af8b1b1f4f892441c72cc79d70431936f621881181a7cbe6a5ae22bdf665b73f11 SHA512 5a55e48c83ef25ba6ec28c49ddd84e832a0b6b13aa87d9e8e6f1c58c340dbc83996849d3212dc7c0fb2f2a9329ecd7665010468a23d4c31d7da82c9aed2d418b
-EBUILD postgresql-10.9.ebuild 13917 BLAKE2B e2f8eb187f60c615ced48b6dae373039038d295ab103b0e5b4c4a0ddea5e96dcd33e1cefce1cff8d56ce22aead49023acc638e2183d7944aac134c41bd7f1723 SHA512 f268ae2a323b057cb6ad6c452e6dccd29f0e0db12227f1c693086c9e997c53b797cbd19b3545c1311c69d1c7ca5e6a8d76e19a684de3080866bac69281b9c8de
-EBUILD postgresql-11.4.ebuild 14043 BLAKE2B 040e7698304d9631e5c145eda79fb0da214135f80e5772763eff3bb1788f52cf1fdebf6ad8ab159348f444ef04c103834d424b2a0e184afd0af8fec93856eb1a SHA512 48e8050627b2254d6b15d8b821f7d65d970a40cc3077dac5401ce84ff1a6a58e98e434dd089464a0eba4b9b092f8833b981bcfd2fb2edc286bcc826b4fbff859
-EBUILD postgresql-11.5.ebuild 14051 BLAKE2B b3d6ec9b2a2df2a476f8da9459858692fff30073f9446ddfaf1eb042e5f1232dbb80d9269979710befc14bf7fbd8875a7d3d18df97961c29b71c1ae06757aa4e SHA512 329c41cf4eea20098dabcf87766a4236b5f8c3ef79791ad57904260fd319ce2418b3570dbfa704225260787ea13947008fb19debd2794358c8ae0acb72f906ae
-EBUILD postgresql-11.6.ebuild 14042 BLAKE2B 0de4003f360a51abe9cb7a45556b175ed789d4c197b550db679af6e9b94d3594434ad3eb52d2a91aff246a65503cbd1aed8dbc0cad1572afe5c707a3b3eba647 SHA512 fcaf02917b631e4c57a6308aef4d69376084d0d0da9f47af00e1090803a293979f47332b98b6e80fdc45a5f5f3b044e0c3db2e70555b8476d412ed390a86e84c
-EBUILD postgresql-12.0.ebuild 14027 BLAKE2B 215f30d3678b0db757958f2b1e910e3e22adb014f87a4cd80a547eef64286b9f4fece889eb498a62ab5eb77e2eb7154433c2d829ba486a30e3bc3212c6a6b8a1 SHA512 745399c3520dac4f7fa6c5573eb49491a2ece6c3c35fe811dd505f295184777553a6c26d87de09cb5bd28b67872e771ad3dbb8f3f00ab9fb11368fc90262db3e
-EBUILD postgresql-12.1.ebuild 14014 BLAKE2B 73cb7067a786e67b2e6a2614558c69f793af7404812008ba62c2861d504c96de9d259dec322a8596e68384c2abd5216e47e94643178d94ce57667d32dc60e7f7 SHA512 458cb55ad2d41f63cbe42b21d80c42487e6bf38e2eb520b903789a91c9b07dad069e69213bcd8d057a7f7a991760ddff97832ee4c59faf37d256af9271701889
-EBUILD postgresql-9.4.22-r1.ebuild 14520 BLAKE2B 3ef01b265009894618634f67a3e0946fb4f14eaab29949e79dc40929f0ed90a7c66230371891f908f2ffd37dd0e670f65d0b3244583f53a33e4782127e9b7b56 SHA512 cff90abead1a9e4a56d781817890ee5e2f1cace64315378b30e619147f4aa08b3f436b8a9c7efb1b9fbf75664f3932f49c5456a5196af6e8ce30f584cd8590e0
-EBUILD postgresql-9.4.22.ebuild 14355 BLAKE2B 71f3f741b70b80ae3b19eb946b9c36c49423905c8051d40db1099fcda879c7db533be8dc8870b6f42c0ca0cbce347ad9f76d12cd07464e519b7d7a99efb93518 SHA512 9a75a3f4469e645b132d0b4127dbc5943e614b3e7e7d8777884951f3771ace77e1d252e0c381fa82df3fe9ac0a276563cb1f52c1dd9919ab2f0bd4e0b31822a8
-EBUILD postgresql-9.4.23.ebuild 14512 BLAKE2B 44eefc4ba623cda5b8a909b9a070190d5eecca848887496bc25c265c8cc3e33b6e0f57d2c03d75b5e0fc8c14f4618bb5ddcc964c8c7ce4843c1f261240d960f6 SHA512 0ede36acd4be218d282d90bded383d210034663bcdd1add15aa4f096156cf3b709a9e1b4969114272e733ecb86a981581dde801f73cb343e673a70e0c79da48e
-EBUILD postgresql-9.4.24.ebuild 14520 BLAKE2B 3ef01b265009894618634f67a3e0946fb4f14eaab29949e79dc40929f0ed90a7c66230371891f908f2ffd37dd0e670f65d0b3244583f53a33e4782127e9b7b56 SHA512 cff90abead1a9e4a56d781817890ee5e2f1cace64315378b30e619147f4aa08b3f436b8a9c7efb1b9fbf75664f3932f49c5456a5196af6e8ce30f584cd8590e0
-EBUILD postgresql-9.4.25.ebuild 14518 BLAKE2B 6e2850eee89718200d36d979784edf407c8b5559352d151f19d6203d4ff9e0ffc15abb9dd26d52d7df9ab9caed0e1319f82acaac3db91551b8d61412a7e47e1c SHA512 5021bc9aba3c31e3c65d77451fb63b32985820c31480d3c766ebb0c655fefb19f2f606f044465255a4b3d93ebd72049f42ecb3672c5dc1c58aa266a2986dea64
-EBUILD postgresql-9.5.17-r1.ebuild 14748 BLAKE2B 25d75bfb24afb94979f096d74d51df3654d3ece778a96491fe6f4ea12616931785fb18e062a607a1ce00ff4c4b04b011c91c2981461480e14520ad234d6aeba7 SHA512 362ead5a78680dcba685e95210384d74b665c2ecf0a748247795871f70ba6c0803a4f45122d969f2e84cc1195c5718da13edb45e136b89d029061d9bdc1d683e
-EBUILD postgresql-9.5.17.ebuild 14583 BLAKE2B 12ccc584c5ebcf5d3400207b11d515d56723c81add3ec64988d071be9a5b566e45e88636910b02596b72d9e70cd619ecb3917b69e7edb0f78d923b0cd99ba86d SHA512 c060e2081932ca08a8bd4604e56a9cb19900e43875d9ac206ef1ce128d957bc359c87cc353d06553a7ff15c3091d4205b2dc9315ebe976bb4303568f551a8cc9
-EBUILD postgresql-9.5.18.ebuild 14740 BLAKE2B 82894c37d569774b34a33cf1a5167efa5374e5f1d8da429fd722b14073efb6ea62ece568352575cdd8fe46b67ef50263a22560b0190775a79f796ff9939e6b96 SHA512 4412773f738c7f40b169396fe18628c642fa1276e3984f8c6e7aab599ba8648da5ec51658dd299e4fa4705db0735d92d3d180e4f42d13865ceca2683059ee688
-EBUILD postgresql-9.5.19.ebuild 14748 BLAKE2B 25d75bfb24afb94979f096d74d51df3654d3ece778a96491fe6f4ea12616931785fb18e062a607a1ce00ff4c4b04b011c91c2981461480e14520ad234d6aeba7 SHA512 362ead5a78680dcba685e95210384d74b665c2ecf0a748247795871f70ba6c0803a4f45122d969f2e84cc1195c5718da13edb45e136b89d029061d9bdc1d683e
-EBUILD postgresql-9.5.20.ebuild 14739 BLAKE2B 4d3887db7564037f2ed6b16b673c56295974ca0bd77b310e860f716a93507eeba0211139ef4a61922c8fb53ec16ee485540c9f654fa1ac08df75c5bc49e08f43 SHA512 e30d2c4edc1188fe8d0f7e79be99e93be9263acc481dc87055de08130a7a2a636dcb0d36d2e59f7cecf6ac5404dd7b98e8c6608ce74729cc97e6c6c41471c44a
-EBUILD postgresql-9.6.13-r1.ebuild 14981 BLAKE2B 2b879aec0d072a99c35f736e842fc3a6f20cbbc0fa26b61bbae55ec708e941067994f94a014998a3b6e93487fc62b8a48e8859f39447222b381b394cc0a3fd5c SHA512 339ab99b3d1c127ae07ca424c8831328930c37a0d230a7013fe0c0a7cca3ed8921ee57ccf836a41e78c23882ce5b2197d476e1a9d80e90652973f1a7e5c12083
-EBUILD postgresql-9.6.13.ebuild 14816 BLAKE2B 9e24011b34bb3e28eb714c3811f5b5e9560394355d0bd10d35eb9bd6a49bc17d654cd6aa00034ea8c456e4b7103309f5bf52e28afac7c530e18a24b6de96039a SHA512 251553a1222ee2b54a92124a971f9ea299a9add28bc50fb5859295500112a75cb02e03e3efd91c89a38faa8f771271e041411811c51e4879e2f90a6e5604e4a3
-EBUILD postgresql-9.6.14.ebuild 14973 BLAKE2B 050dd9a09b489eb3b67c09da4689a0259c273eb05f03b6f0e20bcc6cad476f5688316fd6b386ef0acf210f8c9a80e574fdeefb50571a4d6822b8ca17d7f905c1 SHA512 02d17343df57c275bc494d02249ef3a76d3f615ceeb669c5c29f4253babf4db4cd4137ca0cb028af0ac55d0179d9fadacd72c36634a1f8f2b90e21b9ce6d840b
-EBUILD postgresql-9.6.15.ebuild 14981 BLAKE2B 2b879aec0d072a99c35f736e842fc3a6f20cbbc0fa26b61bbae55ec708e941067994f94a014998a3b6e93487fc62b8a48e8859f39447222b381b394cc0a3fd5c SHA512 339ab99b3d1c127ae07ca424c8831328930c37a0d230a7013fe0c0a7cca3ed8921ee57ccf836a41e78c23882ce5b2197d476e1a9d80e90652973f1a7e5c12083
-EBUILD postgresql-9.6.16.ebuild 14972 BLAKE2B 17ff2cab4da79f331eb256327b99dd02e50401b41ebbafafd3b2dd752ba46094b3882f64e4536b2f0f0a3283795c145354d09dfc473e09c3d0083baddc25a59e SHA512 ef7d4bdb645807a720238cea456cf728fa64938c9e3f9acb576c3d466b0f097dcd9c30a207042799615a78cbd0c2c3371d476e50e7b6bd01db0fc8fb0a15f443
-EBUILD postgresql-9999.ebuild 14484 BLAKE2B 42ab96a78dc30d063a9b36550dd0de6b1fbf0aaf8864ef75701697def08e83d80432b22a014928a81667a210064bffc969d3c31285e69536ed8de543ac50ac9e SHA512 c0efac8ba0e11011710ca62ae45f8fe3fba0e736d9539977db32b2c0b536802b5dd38c4f6f857ec6564973fc52c837f5b3489ef1c7d21e89d1d70988bbd75f0d
+EBUILD postgresql-10.10.ebuild 13886 BLAKE2B 96a235ac92e99df82d36b6031eb6df93db33695294c78fe6d1b4335ca4d6b10447eeeef3abf448fc64841747174204002d16e6de455e43a44d5005da2e8cbad3 SHA512 5f53c4a1022d7599282468cbd840d5ceb24eb1d7ec8694df66d591e391ac6410648543ef3993dd698d146542d6feee5b5f8b320750fea96b864195c2843e0c80
+EBUILD postgresql-10.11.ebuild 13877 BLAKE2B 65eb77560e018ed2dc5bdb9c1e02aadddca62fb526d0ba9daa189373b3fcaf331cf0d69a708016e23841f12f5f93682cabb905d79fb3ad7def4d552697751e88 SHA512 b77f6d04d460f3150a139d12dc786abb4da239de9513bda7fdcae14d0bf2f4d073d585895d73042a5692f7db469d0d5fdf910db27c7b3a14083cb8a599ebdc0f
+EBUILD postgresql-10.9.ebuild 13879 BLAKE2B 85e4ba2a1988e6f0038b5e3ce6a82be239cf5dd6dcbf90ed2e57e2364351a4300d1841c5ed0d43a028bffdb3d5ded951f51048b0fad5b8141cca38231bfa9800 SHA512 737d4e8dd17735a02ce6e9058906ceb4732c51d8746cb1ad826dd8240326c2b476d1f5302a4a787780f8280a60d80441bdac3f7b27d9b0044617d75278a01d50
+EBUILD postgresql-11.4.ebuild 14005 BLAKE2B 63cb3dbeec16bb6d7ce5310f6d39189d16dd1e1cfa9d07df5c4939636d3e0076b3144bdeb63eb631e87ec5cb8e82398a3e0fcb57c0820a3fed6ac9b843e65ebd SHA512 73f4221348bd9506857ccef2f7d38a908a844b3526fea792011b41dc9fca020c996d2372307ed134ddbf38999888e67485c212980b55a68137681670b8f99973
+EBUILD postgresql-11.5.ebuild 14013 BLAKE2B 40b9f6386b51881733e3babb60622caa7c21c51dcfbc85aa2b68d969c6f61cfffbeda2aa41bf0e8935a60147a4c8f21a1ef22c4a69751ea18638f360c52f5c9a SHA512 d7796d9d2a68f6a1c54022b75b2b44b70548647c29ca053742c65dac492741a1f8a4fb6658050d06fee0ed978950bfd4d71f50328e5448fd5c7ea798b6500fd7
+EBUILD postgresql-11.6.ebuild 14004 BLAKE2B 7d4006cdbcb0272d1ce5b148b3e7108bde5af8b788707706cb8579d018876bf02bf26f609c7dde1a063aa30d16ecfd1707eea173ac23015f0c00e57743fce6c6 SHA512 ab6a44c4ae29e7b8da2bb308f7db773ed167d95ce7580f778871baf6ac89a73d725c966140f8ba19b46b0b9e41c29ce19a1a4c1570d59f8252b554d066f82945
+EBUILD postgresql-12.0.ebuild 13989 BLAKE2B d26ba41c7c7f187969c8ccab7bc7c001d691996d56f742f11eb72cdf81aecbc37b4d1101013fd119327729e8a088c34082b3add556ef6544ce647c8daad3a95e SHA512 e77c7eadb5e8e7404c3126b0d7e92bb151d6bf67614ed38963e0a3113385d91c7af63729c6607d79619804e0979862815caffc638a6eb1b71bac63f84cfccd4a
+EBUILD postgresql-12.1.ebuild 13976 BLAKE2B bc029f68191eaab60263151fea4b18f1b981537f0eea1efe47e6a3726b6c0e9cc2e8fa8961332c568ce323063f0c28e78fcb24299aaea018e64f5009a7e577fd SHA512 26b272b194b17f9bb250d1c8730d79ba4a22401cd757656551e53cda28119e92cf447807f69567194a4945b707a0560026f86c0101f06540efec6af9792582b2
+EBUILD postgresql-9.4.22-r1.ebuild 14480 BLAKE2B 13ecb76a720c9e308965569ba04130d3f73229fdc310d0b3e57f8206b656c930ae2e0b837bdc9edc406fa20047bbd4aab75499f3ac03645ecedf279ac8f03667 SHA512 8c60ed090170ba6eb5cfeec7f8c1455fb810ed1473823c66541de724d5e5ab3d84cf5cf8232775687976fa4156a26c2e5c0c237148053cf1bf578b13a713932b
+EBUILD postgresql-9.4.22.ebuild 14343 BLAKE2B 19ccdfa7d9b90fa1539230395c4c2444b5c257f0276445f3c99919f2241c00c104a9ca87b3422ce67fe0647d02a7823804dcb1e4287ade349f47dbe7d4ddea3e SHA512 e25748ce695ec639ed6fe338ae7d76904552ced432da7595b02f6e9f271d5d5f8ea94fe7dd065b8f1ab112f66897fd9925a95bc8168f5c5e6acc3c811482eb98
+EBUILD postgresql-9.4.23.ebuild 14472 BLAKE2B 93f358222aebdfa452bab90609effcebbc43efbcd3f57fa245a42c284c628cac8a521e887aaf2fccd2c8b1e3773e6ad27e3285505e8063f383557b4c8af04e48 SHA512 e92206357b74844137b38bb2cb2b1b506f8f2cd82c32a8704bcde515cee0724af1c57c4637769b96cc883d78ab5ab926ddc1254a00a76e7066c890442ce7dce4
+EBUILD postgresql-9.4.24.ebuild 14480 BLAKE2B 13ecb76a720c9e308965569ba04130d3f73229fdc310d0b3e57f8206b656c930ae2e0b837bdc9edc406fa20047bbd4aab75499f3ac03645ecedf279ac8f03667 SHA512 8c60ed090170ba6eb5cfeec7f8c1455fb810ed1473823c66541de724d5e5ab3d84cf5cf8232775687976fa4156a26c2e5c0c237148053cf1bf578b13a713932b
+EBUILD postgresql-9.4.25.ebuild 14478 BLAKE2B 24a2993d8dc59203dd3fa342bcc32c806ca80b4363e8d49ac3238a8764e001d7e9eaadea87391d62c769d31af97e4935b002de4bcdc1ab4e5cd9a0264af28baa SHA512 ea444b6f10c07d8e912d7609dd009212986a23bd3e88afa04c08930d4be8612469d223e416203200f3f5666972807111296fcee287cf6cbdcb4fa8505e1ab78f
+EBUILD postgresql-9.5.17-r1.ebuild 14708 BLAKE2B acb148d0c65db0b133938c2dd14ddb67967078c51d43b5ca14895ce2a60e1fd77e8188322881f3a2f22e3c1e08fc6cc3931edcde68a7adcbe81ddd57077518c1 SHA512 7a24816e4d0e27a635183467c7a5e2df14123ae3eeb4fee6b4c1d6cc8163ce6da5df94bf8edf36d1cfc5048c7afb941e4bd823e9eee3ca60075fcaa4ef7ee005
+EBUILD postgresql-9.5.17.ebuild 14571 BLAKE2B ed5edff9cf26f4f33749485ad84d338b5b344a2506d796bbe24fead1b4723daf08d11dee3eedbd2fc59022906cf04fe9ed511fe63a108c2a9cff49653ec12dac SHA512 563acc59b608623142c7aa209dd128df3e8d7bf8e0a335e240643a169371f480732749ae1d87c8e8497103aa62911a9b7995c53023c6174d915d5b1e94c8ebb4
+EBUILD postgresql-9.5.18.ebuild 14700 BLAKE2B 6ab036cb83d33d5194a557cd90006572be1ec063d7a89c4bbb22e49614817311971aea04676c9fde062a0973e4cd470cae7d7927b49775e471a358268403457c SHA512 0980840c4f8d006bc73613fbeb230480b5d459ab443a7ec30c2beee415a3a36d79563e5408ac64b3bd504cb0bbbdccf515312b4d2cd064f0fb05f3f230c0fa33
+EBUILD postgresql-9.5.19.ebuild 14708 BLAKE2B acb148d0c65db0b133938c2dd14ddb67967078c51d43b5ca14895ce2a60e1fd77e8188322881f3a2f22e3c1e08fc6cc3931edcde68a7adcbe81ddd57077518c1 SHA512 7a24816e4d0e27a635183467c7a5e2df14123ae3eeb4fee6b4c1d6cc8163ce6da5df94bf8edf36d1cfc5048c7afb941e4bd823e9eee3ca60075fcaa4ef7ee005
+EBUILD postgresql-9.5.20.ebuild 14699 BLAKE2B 7ee57d817ff9345bc2ab147d728b761adc3806c76528f0f0c7db8f483873b399fc2d23c650cd9e5671d09199db5861d4485bb10c1ef858357f29096fc28ab8d8 SHA512 56eaa1ca58df256308674140eff53a3fa458ec70c9c150d9197e6543e5573b595ef85af0a1d955954d9dac3cc02428ec4fed75080433931ba15144e0ccef2977
+EBUILD postgresql-9.6.13-r1.ebuild 14941 BLAKE2B 7734f87c1f10d5ae200f6bef11f4d85342b48536440519ff198401abdb7b54cec857dfd11c742c9c5ddebc5af075afa53155bfddf21b873a620cfb092173c1ca SHA512 9f82442daae369b466679c28ba25a1ce3cd9888292f4cf3a290e454d2d84884b9adbc15c0d35a8b43807eb0aef90b5cf6f6d833f1f24c48259068913a8d191f7
+EBUILD postgresql-9.6.13.ebuild 14804 BLAKE2B 2ff7ee303d930a80ea232bc79d84a60fd275b0324b81dbc47836b59ff7fd8ee57140ddc51cdfa0ee81b5190aee5df3893244c24bccab7ca73a45738797c225f6 SHA512 5907ca2b1051b4622f0e3a3752282e09f22bb0470bda5f932ed5fa82350c6eb2fd251cfc9257674f97856d87f376c27eec6fadcb57ccb2c60e099fd68c224d8b
+EBUILD postgresql-9.6.14.ebuild 14933 BLAKE2B 7076f0bc1c51a8192afbadf202f699f339619b45bbfd4250a2ab0b7d0dbaa39c3daec3d573835ecd608aa8e0bc85c9e4498d243ed24463622cc3ce61147feed6 SHA512 70678562dc7bd7e113e6ffb567a2a687fdf96625cd37789ceffa9e6ec7c6650fb251aa0fab4e32f35b3acc20add3c8d70e23f3aa2d2a9cd4b42dd077eabbbc3f
+EBUILD postgresql-9.6.15.ebuild 14941 BLAKE2B 7734f87c1f10d5ae200f6bef11f4d85342b48536440519ff198401abdb7b54cec857dfd11c742c9c5ddebc5af075afa53155bfddf21b873a620cfb092173c1ca SHA512 9f82442daae369b466679c28ba25a1ce3cd9888292f4cf3a290e454d2d84884b9adbc15c0d35a8b43807eb0aef90b5cf6f6d833f1f24c48259068913a8d191f7
+EBUILD postgresql-9.6.16.ebuild 14932 BLAKE2B 9cdb7894bf2b59dd9c189d6be3af44c5b6da3a313252cbe1473baa261511f057793ef13858584ed2cb44b6394cfd70a3a6fb23de56eea867746b6484cb56b4c0 SHA512 ef44663d2e62aeedc386f31310ed31968ad4dccb9ab46018642355037c97c8164a65ec5c84b7b89c80f53d9ea81f3106bfffefc56a6099d3dae4a67b859c094b
+EBUILD postgresql-9999.ebuild 14442 BLAKE2B cea26ebf8ef18077b03b2f076c89ef2e6fca8f9334ba56c0b26448a4372f4cae12dbf7fe7715062160ac221c386379763d19502eb5771267559e567340ce8727 SHA512 81f7c20234a89b142b498c906f2dd6bb59686a67d9537e5ce3c658d3c83c8f82f8122a9389942e3f3cb28b24fb24f0a647a805cc8e5c063a2a31776b4a46c27b
 MISC metadata.xml 715 BLAKE2B 59ad51ae06a697fe649054d9fe13040423f425b95abdcf3797e1d0d5abba8c62d54cc8c1afb0be0d0a29d1a39d379912bd931925b5df480fb0bb9b238c36e598 SHA512 03027757eaf95313a6825710b1054a9671aa8396381789397006dfe2f66cd41e85cde418e792bf7d71d7db2413905816ff39685774219c1ea5e8b8d35c5cffd0
diff --git a/dev-db/postgresql/postgresql-10.10.ebuild b/dev-db/postgresql/postgresql-10.10.ebuild
index 4c21bf2c2fd8..e52794e837d7 100644
--- a/dev-db/postgresql/postgresql-10.10.ebuild
+++ b/dev-db/postgresql/postgresql-10.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		 zh_TW"
@@ -132,7 +132,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -281,7 +281,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -292,11 +292,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -330,15 +330,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -347,7 +347,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -359,7 +359,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -399,9 +399,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -444,7 +444,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-10.11.ebuild b/dev-db/postgresql/postgresql-10.11.ebuild
index 4db1706faa4c..bd7fac0fb3bb 100644
--- a/dev-db/postgresql/postgresql-10.11.ebuild
+++ b/dev-db/postgresql/postgresql-10.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		 zh_TW"
@@ -132,7 +132,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -281,7 +281,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -292,11 +292,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -330,15 +330,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -347,7 +347,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -359,7 +359,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -399,9 +399,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -444,7 +444,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-10.9.ebuild b/dev-db/postgresql/postgresql-10.9.ebuild
index dfd737bb1a58..bfeb46d7c2bb 100644
--- a/dev-db/postgresql/postgresql-10.9.ebuild
+++ b/dev-db/postgresql/postgresql-10.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		 zh_TW"
@@ -132,7 +132,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -281,7 +281,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -292,11 +292,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -330,15 +330,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -347,7 +347,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -359,7 +359,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -399,9 +399,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -444,7 +444,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-11.4.ebuild b/dev-db/postgresql/postgresql-11.4.ebuild
index 2a0a71668e6f..f0f63a2d6779 100644
--- a/dev-db/postgresql/postgresql-11.4.ebuild
+++ b/dev-db/postgresql/postgresql-11.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		 zh_TW"
@@ -133,7 +133,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -283,7 +283,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -294,11 +294,11 @@ pkg_postinst() {
 		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -332,15 +332,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -349,7 +349,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -361,7 +361,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -401,9 +401,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -446,7 +446,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-11.5.ebuild b/dev-db/postgresql/postgresql-11.5.ebuild
index 665416e9dcbc..6b5733b5761c 100644
--- a/dev-db/postgresql/postgresql-11.5.ebuild
+++ b/dev-db/postgresql/postgresql-11.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		 zh_TW"
@@ -133,7 +133,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -283,7 +283,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -294,11 +294,11 @@ pkg_postinst() {
 		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -332,15 +332,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -349,7 +349,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -361,7 +361,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -401,9 +401,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -446,7 +446,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-11.6.ebuild b/dev-db/postgresql/postgresql-11.6.ebuild
index bd2130f6d42f..7a06aa0c09d8 100644
--- a/dev-db/postgresql/postgresql-11.6.ebuild
+++ b/dev-db/postgresql/postgresql-11.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		 zh_TW"
@@ -133,7 +133,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -283,7 +283,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -294,11 +294,11 @@ pkg_postinst() {
 		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -332,15 +332,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -349,7 +349,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -361,7 +361,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -401,9 +401,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -446,7 +446,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-12.0.ebuild b/dev-db/postgresql/postgresql-12.0.ebuild
index 5bc6cd4acf10..126840b3d529 100644
--- a/dev-db/postgresql/postgresql-12.0.ebuild
+++ b/dev-db/postgresql/postgresql-12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		 zh_TW"
@@ -133,7 +133,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -283,7 +283,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -294,11 +294,11 @@ pkg_postinst() {
 		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -332,15 +332,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -349,7 +349,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -361,7 +361,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -401,9 +401,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -446,7 +446,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-12.1.ebuild b/dev-db/postgresql/postgresql-12.1.ebuild
index 1202ea084698..cd199332c1e3 100644
--- a/dev-db/postgresql/postgresql-12.1.ebuild
+++ b/dev-db/postgresql/postgresql-12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		 zh_TW"
@@ -133,7 +133,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -283,7 +283,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -294,11 +294,11 @@ pkg_postinst() {
 		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -332,15 +332,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -349,7 +349,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -361,7 +361,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -401,9 +401,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -446,7 +446,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.4.22-r1.ebuild b/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
index 43043da26219..0108773c8234 100644
--- a/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -290,7 +290,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -308,7 +308,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -319,11 +319,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -349,15 +349,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -366,7 +366,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -378,7 +378,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -418,9 +418,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -458,7 +458,7 @@ pkg_config() {
 		einfo "Or move the configuration files back:"
 		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.4.22.ebuild b/dev-db/postgresql/postgresql-9.4.22.ebuild
index 3ca85697fc72..2de7ac9d8898 100644
--- a/dev-db/postgresql/postgresql-9.4.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.22.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
diff --git a/dev-db/postgresql/postgresql-9.4.23.ebuild b/dev-db/postgresql/postgresql-9.4.23.ebuild
index 5d6471258c66..af2e5cbfc5e3 100644
--- a/dev-db/postgresql/postgresql-9.4.23.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -290,7 +290,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -308,7 +308,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -319,11 +319,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -349,15 +349,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -366,7 +366,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -378,7 +378,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -418,9 +418,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -458,7 +458,7 @@ pkg_config() {
 		einfo "Or move the configuration files back:"
 		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.4.24.ebuild b/dev-db/postgresql/postgresql-9.4.24.ebuild
index 43043da26219..0108773c8234 100644
--- a/dev-db/postgresql/postgresql-9.4.24.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.24.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -290,7 +290,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -308,7 +308,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -319,11 +319,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -349,15 +349,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -366,7 +366,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -378,7 +378,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -418,9 +418,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -458,7 +458,7 @@ pkg_config() {
 		einfo "Or move the configuration files back:"
 		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.4.25.ebuild b/dev-db/postgresql/postgresql-9.4.25.ebuild
index dccd9372c733..c243a5ff1140 100644
--- a/dev-db/postgresql/postgresql-9.4.25.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -290,7 +290,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -308,7 +308,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -319,11 +319,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -349,15 +349,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -366,7 +366,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -378,7 +378,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -418,9 +418,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -458,7 +458,7 @@ pkg_config() {
 		einfo "Or move the configuration files back:"
 		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.5.17-r1.ebuild b/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
index 1b7912c6d02b..19566040ab28 100644
--- a/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -291,7 +291,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -314,7 +314,7 @@ pkg_postinst() {
 	fi
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -325,11 +325,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -464,7 +464,7 @@ pkg_config() {
 		einfo "Or move the configuration files back:"
 		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.5.17.ebuild b/dev-db/postgresql/postgresql-9.5.17.ebuild
index b8663e8bbf3e..04b8485b94c7 100644
--- a/dev-db/postgresql/postgresql-9.5.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
diff --git a/dev-db/postgresql/postgresql-9.5.18.ebuild b/dev-db/postgresql/postgresql-9.5.18.ebuild
index f6e7247b9104..0a8e5066a378 100644
--- a/dev-db/postgresql/postgresql-9.5.18.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -291,7 +291,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -314,7 +314,7 @@ pkg_postinst() {
 	fi
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -325,11 +325,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -464,7 +464,7 @@ pkg_config() {
 		einfo "Or move the configuration files back:"
 		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.5.19.ebuild b/dev-db/postgresql/postgresql-9.5.19.ebuild
index 1b7912c6d02b..19566040ab28 100644
--- a/dev-db/postgresql/postgresql-9.5.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -291,7 +291,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -314,7 +314,7 @@ pkg_postinst() {
 	fi
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -325,11 +325,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -464,7 +464,7 @@ pkg_config() {
 		einfo "Or move the configuration files back:"
 		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.5.20.ebuild b/dev-db/postgresql/postgresql-9.5.20.ebuild
index 0631e478db3b..c3374ebe511f 100644
--- a/dev-db/postgresql/postgresql-9.5.20.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -291,7 +291,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -314,7 +314,7 @@ pkg_postinst() {
 	fi
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -325,11 +325,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -464,7 +464,7 @@ pkg_config() {
 		einfo "Or move the configuration files back:"
 		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.6.13-r1.ebuild b/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
index 1a2981407228..0aac8dd1aa22 100644
--- a/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		  zh_TW"
@@ -131,7 +131,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -296,7 +296,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -314,7 +314,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -325,11 +325,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -469,7 +469,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.6.13.ebuild b/dev-db/postgresql/postgresql-9.6.13.ebuild
index bbb43aee8a94..2ca03de3a2c5 100644
--- a/dev-db/postgresql/postgresql-9.6.13.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		  zh_TW"
@@ -131,7 +131,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
diff --git a/dev-db/postgresql/postgresql-9.6.14.ebuild b/dev-db/postgresql/postgresql-9.6.14.ebuild
index 2334b0f00b3e..3a608b2ef11d 100644
--- a/dev-db/postgresql/postgresql-9.6.14.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		  zh_TW"
@@ -131,7 +131,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -296,7 +296,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -314,7 +314,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -325,11 +325,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -469,7 +469,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.6.15.ebuild b/dev-db/postgresql/postgresql-9.6.15.ebuild
index 1a2981407228..0aac8dd1aa22 100644
--- a/dev-db/postgresql/postgresql-9.6.15.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		  zh_TW"
@@ -131,7 +131,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -296,7 +296,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -314,7 +314,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -325,11 +325,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -469,7 +469,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.6.16.ebuild b/dev-db/postgresql/postgresql-9.6.16.ebuild
index f4a28fd7b81c..33bb16a1957c 100644
--- a/dev-db/postgresql/postgresql-9.6.16.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		  zh_TW"
@@ -131,7 +131,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -296,7 +296,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -314,7 +314,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -325,11 +325,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -469,7 +469,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index 7d2460caf77f..afbfa7686f9a 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,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
 		 zh_TW"
@@ -158,7 +158,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -300,7 +300,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		[[ $(${canonicalise} "${l}") == *postgresql-9.7* ]] && rm "${l}"
 	done
 
@@ -316,21 +316,21 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	elog
 	elog "Gentoo specific documentation:"
 	elog "https://wiki.gentoo.org/wiki/PostgreSQL"
 	elog
 	elog "Official documentation:"
-	elog "${EROOT%/}/usr/share/doc/${PF}/html"
+	elog "${EROOT}/usr/share/doc/${PF}/html"
 	elog
 	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}/run/postgresql/"
+	elog "    ${EROOT}/run/postgresql/"
 	elog
 	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 	elog "so that it contains your preferred locale, and other options, in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	elog
 	elog "Then, execute the following command to setup the initial database"
 	elog "environment:"
@@ -353,15 +353,15 @@ pkg_postrm() {
 }
 
 pkg_config() {
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -370,7 +370,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -382,7 +382,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -422,9 +422,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -467,7 +467,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/pspg/Manifest b/dev-db/pspg/Manifest
index 2d29a22896e9..742183bab247 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -2,8 +2,8 @@ DIST pspg-1.6.5.tar.gz 1005525 BLAKE2B 2befb8a7081e1fcf5df60eca48f34b819d9de3d07
 DIST pspg-1.6.8.tar.gz 1017316 BLAKE2B 0150b4577365000b2fdd9de93307acbb5133915917c92affd1a598b3f16769ff0afa6e0b9c0d4639b771dcd62f1f7364a028a3b9d96cc6c40e3ac41c550a8d48 SHA512 337ae1eb9e92dc97ca32127322aaa3d0c5edb8766e5cab16e778148b3256119c7c5b1b2e4b6ab0b520113ede07c464d1c1c5e460c8efb7714f5a29acfa845e9d
 DIST pspg-2.5.4.tar.gz 1346559 BLAKE2B 01c0a35a6372ccb7ad007595d01eb0c8380428722418a4f4b6040a549757d2eab601371ded51a762d81677adc259abf5f8af4311fca6427fb24244e0c33035d2 SHA512 2a9c677bbff4eb032403b90f44dbe9f62a46775c1cf180e90fc3df2853973c4b584b674fa11e2b3be844402f5c00777388ff05782fdecee3b27d92280fc288ff
 DIST pspg-2.5.5.tar.gz 1346896 BLAKE2B 7b5b64affcc6ec52ae9712fab06089db3a8ae208d94190fa6695d2285d29a13ac2c5ca3854a1a13ec6907eed04dd6bb188b31cc6440963a069a2715ecf109eba SHA512 74e8c8c5a156d9115a2bc6c9957d302b5e48182181c9560100c09dea765f9a382d78b5fe74ca11fdccd40bdd2f8a165218edf89ffd7713e479f0443a49766c4d
-EBUILD pspg-1.6.5.ebuild 376 BLAKE2B 13fe8b4b7bbab57ea001be0d3473a62e40ed31cc6c0b3f37e8e924aefb71b50b445bd4ddc351ed85d9aff00454dc4858ce3cc452042edd925981c2d2a1fb3f8a SHA512 dbc7ea9e5187802bb5b810cdaaf35d544cd910a52f196b1e96d6ba3d63ea93eaa651b67a9457894aae5f2f3eb8f22470b6cf635859c464dd3f87d164c77102ff
-EBUILD pspg-1.6.8.ebuild 378 BLAKE2B 9bd9920de54fd7e3122025d78659d21c13335a0b9d65abfabd948776f3c074ed8bafae6679754cf6ce8b72fc0d7cb93d2d7689bdc2f666b1f23cb17bbd6595a9 SHA512 11791d983aff85e9a535c81f432270d7a4ba26bb8d4fc36dbff90dcb96573d7afd31e21ec37017cc0f0721fbc57be685c542c715cb6f1427ba62c5c74e70d819
-EBUILD pspg-2.5.4.ebuild 418 BLAKE2B 3659dc797a48d1ae1d30902b911bcee32660c6e35db9dc99f0df1222cd4ed1fb9f57c688e63cfef11f883f950b5abd7c292a954af22779fde0b5ee0df88a04a2 SHA512 4708f3a456ceb61b09cc6169cf15f50567b53f5a546d0f49236f634c2034122e1fd95bed3e9ea223311bd186358f860a8eaad86b86574afe0dc4375e5bd7ab5b
-EBUILD pspg-2.5.5.ebuild 418 BLAKE2B 3659dc797a48d1ae1d30902b911bcee32660c6e35db9dc99f0df1222cd4ed1fb9f57c688e63cfef11f883f950b5abd7c292a954af22779fde0b5ee0df88a04a2 SHA512 4708f3a456ceb61b09cc6169cf15f50567b53f5a546d0f49236f634c2034122e1fd95bed3e9ea223311bd186358f860a8eaad86b86574afe0dc4375e5bd7ab5b
+EBUILD pspg-1.6.5.ebuild 375 BLAKE2B bb7549458b1be4523cc653e1e7eeee86f4ce800e295667c934082091e8bd08a66070226ffc68a74653ff18cef3ae6298ea8287dae49d6ac35aaeaddbb31c849b SHA512 74e613beddf09251af9d2ca53ad791757c0c77178c18f135078671a3715f1086e18df6e124b66761d6f5df7bf9049f37f2381c28934b837dab6725aea8bdd0e2
+EBUILD pspg-1.6.8.ebuild 377 BLAKE2B b04b738ce992e16353c46cf20ac3e470e6e09433737d4f379994f052f5a0206d46eb64c4385cc9f2e665d9a97655cf7ac4ad087a824b4a8191bee1f35cea13a7 SHA512 58e07f2f682b77ad05a0be58bc3528a7e4a937b53c312bec5b43de77e0be74639ca2717ade092e2f4002a9d9d30222755c15cfd17e10ab0ad5cd2aff42db3a8f
+EBUILD pspg-2.5.4.ebuild 417 BLAKE2B 9d27ddd0d078b261afd67fbecf705c76671d5b3476aee3b4418aefcc199681fc8af5284e2ff468e4ab7516a91d934b8e7a1137f4bbf81725dd32adef79018dd5 SHA512 0408d58b2546ac4a9e15f7610b90517bed80bb3a6a7adf2a934805e9973f7d59658f675cd522614945f2900e9a119173731b9de413e877bae5769884b500c9c8
+EBUILD pspg-2.5.5.ebuild 417 BLAKE2B 9d27ddd0d078b261afd67fbecf705c76671d5b3476aee3b4418aefcc199681fc8af5284e2ff468e4ab7516a91d934b8e7a1137f4bbf81725dd32adef79018dd5 SHA512 0408d58b2546ac4a9e15f7610b90517bed80bb3a6a7adf2a934805e9973f7d59658f675cd522614945f2900e9a119173731b9de413e877bae5769884b500c9c8
 MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pspg/pspg-1.6.5.ebuild b/dev-db/pspg/pspg-1.6.5.ebuild
index 9f4383f0e53f..612f2529e008 100644
--- a/dev-db/pspg/pspg-1.6.5.ebuild
+++ b/dev-db/pspg/pspg-1.6.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/${PN}"
+HOMEPAGE="https://github.com/okbob/pspg"
 SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-db/pspg/pspg-1.6.8.ebuild b/dev-db/pspg/pspg-1.6.8.ebuild
index a537b5d8c3a9..2413a413b870 100644
--- a/dev-db/pspg/pspg-1.6.8.ebuild
+++ b/dev-db/pspg/pspg-1.6.8.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/${PN}"
+HOMEPAGE="https://github.com/okbob/pspg"
 SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-db/pspg/pspg-2.5.4.ebuild b/dev-db/pspg/pspg-2.5.4.ebuild
index 60a6aaa3b834..a3116171325a 100644
--- a/dev-db/pspg/pspg-2.5.4.ebuild
+++ b/dev-db/pspg/pspg-2.5.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/${PN}"
+HOMEPAGE="https://github.com/okbob/pspg"
 SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-db/pspg/pspg-2.5.5.ebuild b/dev-db/pspg/pspg-2.5.5.ebuild
index 60a6aaa3b834..a3116171325a 100644
--- a/dev-db/pspg/pspg-2.5.5.ebuild
+++ b/dev-db/pspg/pspg-2.5.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/${PN}"
+HOMEPAGE="https://github.com/okbob/pspg"
 SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 9e531814a0e1..a04643400c44 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -2,5 +2,5 @@ AUX unixODBC-2.3.5-CVE-2018-7485.patch 5224 BLAKE2B a21d659f75f9ae11a6d78a4a74b0
 DIST unixODBC-2.3.5.tar.gz 1633390 BLAKE2B f7c70740471b0c6ff298f2377a3895efbf160764adc4f607dfb65de2873ea3a39a2852399feaca50fc389875e20a10b3cd0389ba9e9f02d0548312d8063f5af5 SHA512 94b5ebb887571f4fa801ae4305cd6cb4eb0d03682fac1eb0422cdd13b046b077e60bff8286c578b0b5e291cfbc0bc8695495e39c3713858d2eeb7b38459397d5
 DIST unixODBC-2.3.7.tar.gz 1669501 BLAKE2B 0e6b2130b72ccfed3a26877ff1c8af9adc7cc514002d3198d5249a12da5de03322178bf0847b92336b5a373893751bf3cb5aec4c251163a3c9f0ef98c90e5db8 SHA512 a87afeaaa0476f4ae6345c7021b3af52718944e599abb595c864d9126744a21341889802512a1de3ebaf86ac89e7f8b1bbd7f8f5285e8f4bccf928bd1585ff70
 EBUILD unixODBC-2.3.5-r1.ebuild 1800 BLAKE2B 3d5b8c14075f26947a34c47c780004073003de604f62e682018aee401438d1b8c73f6a3ca6b2a2aded327fbe018e57bfcf82a912ed276487e09526e217eec363 SHA512 22382ed1161cd8b79eb23285d79b9791edd8b2576982af459e56a3c91eaea29e0f50ab9d6f47578ac2c6cc6bac416e05249abab32c9a2cb8491793f1beb43feb
-EBUILD unixODBC-2.3.7.ebuild 1758 BLAKE2B 37e000e8087c3cfe1124c3fb21d6444db3f91de33f9d436b3c25b45457b32423b4b19432e9ea5294c13fa0059a500a1283362e0f80baa6ae32c17f5ac38350e5 SHA512 fcadf160cf3f6ff6635fab76da0c86f5d54b32260cb87ba1da2ea0ed06bca735ab33958e9c2416be5f556e501a51641fb3df4c9fe9371309f269df98902cc7d1
+EBUILD unixODBC-2.3.7.ebuild 1757 BLAKE2B 4bea201307bb075caa1d4b75e0c7d3c3600aaad21a78b17e2c4255312f1b17e6fd9d08463024272e7f2f18f14e448f8fd575ac8d8111fc95f6676837e23b6fdc SHA512 6a207aa5205a97fd1629bc8151ecd873a54afd7ef0b9e921e75b41bd5ce804a6f1752fed6c98d83e226c7fc890886fc62e03082cd8a5261f4e115d195311b2ca
 MISC metadata.xml 393 BLAKE2B aae8c823c6e3d1a3b21910c6aece373e66e62c6686b152f1f6c8fb980a4c58b19dce1144afb76219d4d4e451ee097afe0f031130e82cbf933e6ac1ba3d4f1cc5 SHA512 76f899e62d86b476cc9f97daffe5c67fba8fe217fb0d6c0b1b39f2de8e6a92350e6d0433f37f54f57875d3cbb3be7908eaa9a3b1717fc1da687a1789062c0f86
diff --git a/dev-db/unixODBC/unixODBC-2.3.7.ebuild b/dev-db/unixODBC/unixODBC-2.3.7.ebuild
index 0577917ac657..7947fb4b671a 100644
--- a/dev-db/unixODBC/unixODBC-2.3.7.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~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 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+minimal odbcmanual static-libs unicode"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
commit	71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree	9f1f0dee23e13658e52f49437befe78427148c51 /dev-db
parent	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)