gentoo resync : 28.09.2019

32 files changed, 64 insertions, 34 deletions

diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 92ae8a91bb93..7f85fde7b1d5 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -22,6 +22,10 @@ EBUILD mongodb-3.6.13.ebuild 4230 BLAKE2B b2d7e960c5d6a4dc9e4f882d999446eb9ab4e8
 EBUILD mongodb-3.6.14.ebuild 4231 BLAKE2B d285158017e7495ab091797ff655f86f192558eeb483863fa2307f4da26299b093ac1329c9a80560a2921134e573e1f23c249240c88e15ccb818e6bcf6433e53 SHA512 372a006e05788a405e9aae7363d12d4019974a2957be9f1c730fa10d93d1eb4374c01c252f3d286a76917f3e9fc3e7058ad33f586523fe9f7e96150ea5a8d4a8
 EBUILD mongodb-3.6.8.ebuild 4197 BLAKE2B d28a62156019eaeab2d0fa8b4de5c5589e96c955145f283d810ba58c906d01e6447d74b08fc8037e2ebfff9b43dea38c3f6d5b28615e322ebee892bbe9c97d3a SHA512 90c2f9937355bed8d110044a89a7a5a3980c236b0e33b67457c3bc3ffce2ba3dc730dd55b977667cdd43ff07ecec4489183cee50e8e0e2a618ee2ec3e4fe82ef
 EBUILD mongodb-4.0.10.ebuild 4231 BLAKE2B 981c770cdbde22763fa8f4c7be235de7e8d312b1a1b1b6e688de557201cd0c265405b4bd8e5415d9e845618abdd0156bb594036376185ec57caa02cbe7b7ef56 SHA512 9e8153cd872408325dd0941f7e2fdffef09e6b1bd24dd8cf297821fdeb94098c1096df1a722db8e282db18a3bff0f95ce672cc3a3243801cbe3408135094c91a
+<<<<<<< HEAD
 EBUILD mongodb-4.0.12.ebuild 4292 BLAKE2B 083dfd2200179cecda627ea545d4d0e5c7f26b7f0c5f4c0bfaf030d666b4cb1ee476056ab494b7e1dbf3678848e8a68f58a00d618f16b1d511954f028bf6bf8c SHA512 76d5a91f4530754698084c273115cdd7932edd0c8045148bd575c9d03cf73f8aa70ad28e4b0e826232cab37637d8af9353f7ff13e6cfe0f8beea43d6951a7ed5
+=======
+EBUILD mongodb-4.0.12.ebuild 4291 BLAKE2B dedfea39b0454fd1d4c13fe96c032845d8c951f75bcb6bc85bac84fbd1d6577e415cf817fddf5a6fab50e958b01dbdb467bcb1d33f4a3f1652efee2eacf745c3 SHA512 d0ec6aa07bb7a46b54ce43e4dccb599149e6e67dea4ecd7a85ff7332d515b802e7cf14f5dfc384e1c37820d9503913082bb0699bee37f6ab5308b12c8c26c5af
+>>>>>>> next
 EBUILD mongodb-4.2.0-r2.ebuild 4333 BLAKE2B 0ec1ff9596f0840de62c4ef6844aa0f38fd01a4f0de1c9a9545bb9de991482fae3ee398f3cec39367457c92758f442414986914354dbe8cd8d5bf3b34b37ccbd SHA512 01f7426d86a90f3e52b0310c260ce738b77c31baf01f3634734e41c978fa0123946c269834e12af93f4fe748d3019782d234a30c7a327a3814c3f7ef63d42a5d
 MISC metadata.xml 901 BLAKE2B f7fde58679ba05518634b82bf5fcc371897165364fe5b023a2ec161790c869de82b4a3dd769d5e1bb450f99679869b60bb1e35beb8d41c54d3448dfca580a7ae SHA512 48f133d396aa31b992bac5f947e5a262b2d07a1016c6d49fa3c86dabb85981edfa332abb867413826762d88051ff3981cc77c2ec92e992d7a231c3b542336e36
diff --git a/dev-db/mongodb/mongodb-4.0.12.ebuild b/dev-db/mongodb/mongodb-4.0.12.ebuild
index d549bea6ba8f..2792ff470fe4 100644
--- a/dev-db/mongodb/mongodb-4.0.12.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.12.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
 
 RDEPEND=">=app-arch/snappy-1.1.3
diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index c31e26d3b9c7..6d8c4dc1acff 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -6,6 +6,6 @@ DIST percona-xtrabackup-2.4.13.tar.gz 57254236 BLAKE2B 061cbee03374193359ae55790
 DIST percona-xtrabackup-2.4.15.tar.gz 57357749 BLAKE2B fcc64736230636a3a5584a300229e0507f00bcd64a3d0b8e00f834b15ec757347a55a85521dd0aea939761c3a26b1ef99466ff7e633133b8088cd290bd835444 SHA512 789b6870d3ad06861126f67190717ffb31224628d1b9631ec5f39d0a41b3c66aaf2127e3ec4b38d3e8f7858a1438a74f0e89b07b9f4248b637b2ed39143ab599
 DIST percona-xtrabackup-8.0.6.tar.gz 120345254 BLAKE2B e5cd5fe77cc439ffc42be9e8c97a987fbadc079262f1dd4a56d0fc93692bac604bc0ffaeefe2acd1e7edc2f57bfbeccff34621b4dfb5b707f5daa3d2653b0ec7 SHA512 39d4235e3c8e4f6d035d73154293968fd5e13d0d1430935c470155d7f00338ad612886e47c24a6a4d5f69985871ee9dd57d925f963b7c887412cf0c2480e3de1
 EBUILD percona-xtrabackup-2.4.13.ebuild 2082 BLAKE2B 88bdf030af98129fdc5053bb808f9779d5ee8d3223901826b1d9665d2d76ef686db42d24337bfe02dd0bc49eb185c0271f724e6a7a275504bfeb1c0a73806f41 SHA512 0674ab6381326d68b5857253aa002d9132b65a407e8452a095c1811793064366f8a18300b6e1589cee4dfdeca0d8171213f75412cc0a7a0d1548fdb96e8e0897
-EBUILD percona-xtrabackup-2.4.15.ebuild 1798 BLAKE2B a6d71b1832521ac0126a63c7274691192ab8cfb6586c39c4e6237b50e76ea41cbf9b702ecde925829cbc0f6d58a24c0c6c8be0e620ae66056df86731ca8b0cb7 SHA512 4b75233ce6351566e412063375db20867405295d3214902db0c42bb1dc558827f746cc1e8eabd0f248937eb3f3542911dde1483220bc9a8ad18b529b738b1380
+EBUILD percona-xtrabackup-2.4.15.ebuild 1796 BLAKE2B 917f941081d07055251b8d66b2241208d0725e8c234f3ef502cfb52745d38f224f8556932c2435441a40aee6358dad131f588bf26e1ee76509a2f62231eb2e13 SHA512 01f27e72408a6f79d619de2e8364769487096725c1a5097e0768a4a24146f1aec93963b9373990e07b928ff753a3bb746f7c877fe14fee36070015f445818396
 EBUILD percona-xtrabackup-8.0.6.ebuild 1382 BLAKE2B 6738553dcff17fc83dd2574880da6128c2b1d2f42e229d5c6338b33397f10e56265fe48463041891cf01641fb344e0960a2c38f3b9729ec865c1a2b34bfd6037 SHA512 a23f2934451d0fb0030ad24c088c0729c2b1bdf73087c187f77c10b1937a67cf9f39bc1d66a8ce64bff5274d6ee8f8a8521a0b537b81ae84b6b94921eeae511d
 MISC metadata.xml 563 BLAKE2B 5c657288a3cd0ece118920159db14756bad6a2faa308e5495cdf1eca6dd160dfbd05c979857fd55a031bc0acacdc7a81db628c0ca31a9b2d3dae226838e2abf5 SHA512 050e1a78c8c7f4b024b207754005dcec28188697b3be2d93c30f800f8a91da1a3376b4501a4a6e061dcd096a958a9a4cba62251f5003b2056dfadee5bfda6716
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild
index bb46be8d4816..2ca76ece9d82 100644
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/s
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	app-arch/lz4:0=
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index 4eaf490b0f75..d3398e8efe38 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,7 +1,7 @@
 DIST pgadmin4-4.10.tar.gz 22809776 BLAKE2B 70a9857de31721b1cd5816b9e15abf325516f94ad5248f3ce5387cca5081ba96d7fca6c487265960ffac8d63c2fd09c3dea44d24a1cc9f8dbb170bd76d5de545 SHA512 b7f91d85fdc39766a294d9b66e8539f709b99f971726551d013345595161ff017e03505f05a41352575892be9d9622e86f4ccdbac76bcea435e2fb88a690b565
 DIST pgadmin4-4.5.tar.gz 22420769 BLAKE2B ae16e34c4cfce0ae78f06321ea1fc34aac0e081df4c0d5906fc4da0c82abb67e374477b8f9a9266d003579eb8887541e4224465ce6eccd86589129e1b3efff24 SHA512 835434612ac2a7ff89fab4c4bed89644e43506491ce12d2b74ffdbc25b33f2ac9ae566c95e886d4b4f8bca6499c40be5f0d776b18bfdcebd44d7ffe3b89deb5f
 DIST pgadmin4-4.8.tar.gz 22780924 BLAKE2B 7b64ef8ac3782e9c8207d5938f3638d67ddf5c86ca520afbfb296a824b39411362ca6e9d8b03920e35cca38d1303efe81750e5bfc849cfb363f370da3d25ac44 SHA512 68b35c1091435fbeb39e67c7f93038fcba95cd5ae7098434b5d3afee10595f875ef9fd997934f2bbd93c914bcd5c3c71bd43f032f788e55c5795f5ad63b57cd7
-EBUILD pgadmin4-4.10.ebuild 3548 BLAKE2B eb50e0ba9d541446afbf1a36ec8ecb7f53725a64fcb8e5d22e65483de3912864099084a795d7ea790998c83940e0fc4b7925004860f4b5fbdef485b41f83ab67 SHA512 2c4459777262f3a9a1a83e4b55948e0a7d65bf6f397de732b24ea1f97be0008304f9ca579690a8fd5224aa68e6710d363a3f2a765feb266ccc3ee34f59f424a9
-EBUILD pgadmin4-4.5.ebuild 3546 BLAKE2B 63cd5428156c990ab72a6973d4da580b9af519b91d33436457f922a363e868082d7337cf91fddb2508bbacf89ddf3211996e7b6b3563be4e1b6d932d0eb31f8d SHA512 5f33bb279eacbafd1f58a8d952423ed8665cb44a13dcf717d479898251ab294eb87a5961f4a4f039f4b0b8395ed8f26f0ceb2d40eb117121acd078f06e8a59ce
-EBUILD pgadmin4-4.8.ebuild 3548 BLAKE2B eb50e0ba9d541446afbf1a36ec8ecb7f53725a64fcb8e5d22e65483de3912864099084a795d7ea790998c83940e0fc4b7925004860f4b5fbdef485b41f83ab67 SHA512 2c4459777262f3a9a1a83e4b55948e0a7d65bf6f397de732b24ea1f97be0008304f9ca579690a8fd5224aa68e6710d363a3f2a765feb266ccc3ee34f59f424a9
+EBUILD pgadmin4-4.10.ebuild 3559 BLAKE2B 4dadf2c0c44f091558cd0c510f4188842b7fa097ed91594c5ce3605d83f5a277a2f57a08bfe6165712520c2a2d2e4d6b1b9f141b86968cdc99326003e94aad9d SHA512 f6819b1183e57c6855d094bd4cc5bd9ba6073c55204f87f6a9542f117566550edabc6f76a506d26bfc142e5c1297dfc1dc298bb893f493d19738d0392c79bcc9
+EBUILD pgadmin4-4.5.ebuild 3557 BLAKE2B d94690d8d884c26a070d5cd4a67c9aa79e308f5fa91f5f6d368193f9aeab733b5d176b8ae03c50251bbdb37cc0327504f2e78d06c125e90508f39e545cbb9739 SHA512 c9ed54b183053d0a93876fc8a7aa9565f36b6295fc437dfed965c76b2e9e3fc45b2b6739e841c340f44612bbdd8fe62b95ced938e7446559cf82e56a9bcd368e
+EBUILD pgadmin4-4.8.ebuild 3559 BLAKE2B 4dadf2c0c44f091558cd0c510f4188842b7fa097ed91594c5ce3605d83f5a277a2f57a08bfe6165712520c2a2d2e4d6b1b9f141b86968cdc99326003e94aad9d SHA512 f6819b1183e57c6855d094bd4cc5bd9ba6073c55204f87f6a9542f117566550edabc6f76a506d26bfc142e5c1297dfc1dc298bb893f493d19738d0392c79bcc9
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-4.10.ebuild b/dev-db/pgadmin4/pgadmin4-4.10.ebuild
index 31cf045d0bf6..741c799eb200 100644
--- a/dev-db/pgadmin4/pgadmin4-4.10.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-4.10.ebuild
@@ -10,7 +10,7 @@ inherit python-single-r1 qmake-utils
 
 DESCRIPTION="GUI administration and development platform for PostgreSQL"
 HOMEPAGE="https://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
+SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
 
 LICENSE="POSTGRESQL"
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-db/pgadmin4/pgadmin4-4.5.ebuild b/dev-db/pgadmin4/pgadmin4-4.5.ebuild
index d532f06fc995..828b27ee6a0e 100644
--- a/dev-db/pgadmin4/pgadmin4-4.5.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-4.5.ebuild
@@ -10,7 +10,7 @@ inherit python-single-r1 qmake-utils
 
 DESCRIPTION="GUI administration and development platform for PostgreSQL"
 HOMEPAGE="https://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
+SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
 
 LICENSE="POSTGRESQL"
 KEYWORDS="amd64 x86"
diff --git a/dev-db/pgadmin4/pgadmin4-4.8.ebuild b/dev-db/pgadmin4/pgadmin4-4.8.ebuild
index 31cf045d0bf6..741c799eb200 100644
--- a/dev-db/pgadmin4/pgadmin4-4.8.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-4.8.ebuild
@@ -10,7 +10,7 @@ inherit python-single-r1 qmake-utils
 
 DESCRIPTION="GUI administration and development platform for PostgreSQL"
 HOMEPAGE="https://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
+SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
 
 LICENSE="POSTGRESQL"
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-db/pgagent/Manifest b/dev-db/pgagent/Manifest
index c1c2d679e55a..4a339ca90336 100644
--- a/dev-db/pgagent/Manifest
+++ b/dev-db/pgagent/Manifest
@@ -7,6 +7,6 @@ AUX postgres-10-build-fix.patch 2421 BLAKE2B 3b6865e7843edf420b59b1f2ededbca9707
 AUX save-stderr-jobstep-output.patch 2626 BLAKE2B 8a0eb06fecb9450e027219f2ede7b9dc3fbeb6ad1d70e15f5294c954a924c9eb82b10569a6b045e6acd79430b1f5d7116ba4f19316599a2354dc9795ae274458 SHA512 b84b52e5a96d98067eab5e4877c54e02e3c912215067f4e1a1c9d3983a29acfd3e63fe666c6e62cf46391fb72cb02b4197d23e305cadf88da096f80d8e0c8167
 DIST pgAgent-3.4.0-Source.tar.gz 45081 BLAKE2B 81f074213285253743127188d9e203cb01d8492ce502dc5215279c7c557fdd7f532fa383a4578a8d9cc8ea46668ea971015e4cc5989d1b8022ed8924a92b988b SHA512 3b068fc6f5e51ff20604f8cec3e067d04b5b1537229da15ee442000f5fe834697a4eae86be0e9a58b8ee5da24cc985c8c9804d71cb2a50e93ec4cf9a424a4ff0
 DIST pgAgent-4.0.0-Source.tar.gz 63561 BLAKE2B 1731e748a6a5e76cd8b177162eb5b82ae633d1b507739e3193a8857a0eee0fe775fdaadb871eb5d708c0f7e80558680b5d7d246f4cb5d2bc1c10955bdf9cc09e SHA512 df2d6f5817d83d4cf60f0f1106718225870bcfd2f5b882765e5fd459e1614208225f90b29de492bec5284f3727f3d4be9f724b92ef503fea08029fab22a8fbb4
-EBUILD pgagent-3.4.0-r3.ebuild 2048 BLAKE2B 31024adad4855032de45c132b387ca6ab77b77f25a377bd99a41b01e762e3894b4bfaaa4473ea7b59bdb5ce9ec29fa74b3d9103293a967e1f4836a73a246908f SHA512 e4eb7d78268f4198159480b5105a815aff8c4d408b85f5a005057cdd04bf1393da136efe0f85b728de1e268d1053d7ace2b36ddc2d6d8f5271afb73706a9e013
-EBUILD pgagent-4.0.0.ebuild 1166 BLAKE2B 67a5bef1c550290e4e63f994f11b738699c463198afdc124b6ad88ded3d63ba8489ac8848bc88b0266cad6813b8354c68f6fe418da9b0d476fd3e81aa688a2ad SHA512 f6f194f88955e4a4651c82ffcbf58491957dde578bfc632598a44c91cd18fab0f10593a24b8be3c95ba4740c8f2edef8c21ba0d0d51c188049b60e362d980af6
+EBUILD pgagent-3.4.0-r3.ebuild 2059 BLAKE2B 3ecbee255f034b6d9f8110a951148fe30175ea680b12991a9a7924d9b703f7323935ba0378c2168bc490b99f0d6ea41e065a59f2f96d09dccca5ef27b6bedf39 SHA512 c1c7a60dca4cfbd71eaf3af8fd05737b06274e9575846db33ec062de9c6f8e766866dfc3b9f5d4642543eb8b243e8e967185ad51fadf61b520eee28a0c566ea4
+EBUILD pgagent-4.0.0.ebuild 1177 BLAKE2B 8db48f73f87790fa3fde33b846bb62093757ae6b70735743081b36eddd99bbdd7d8f4a094546d889362bb2f00c13b49a266776d6828547db4853b078c48c52f1 SHA512 2a732df46d076d08a9934d73a4ed1ee15d0de5e1f94b141f0a64eb80fcd77800c06db4baaec333da36a509a7ec7ed5e59d57e673fadc25d5b64d6da8da700ff1
 MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pgagent/pgagent-3.4.0-r3.ebuild b/dev-db/pgagent/pgagent-3.4.0-r3.ebuild
index 81dd4cdf8aad..399bd3b0ab28 100644
--- a/dev-db/pgagent/pgagent-3.4.0-r3.ebuild
+++ b/dev-db/pgagent/pgagent-3.4.0-r3.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="amd64 x86"
 
 DESCRIPTION="${MY_PN} is a job scheduler for PostgreSQL"
 HOMEPAGE="http://www.pgadmin.org/download/pgagent.php"
-SRC_URI="mirror://postgresql/pgadmin3/release/${PN}/${MY_PN}-${PV}-Source.tar.gz"
+SRC_URI="https://ftp.postgresql.org/pub/pgadmin3/release/${PN}/${MY_PN}-${PV}-Source.tar.gz"
 LICENSE="POSTGRESQL GPL-2"
 SLOT="0"
 IUSE=""
diff --git a/dev-db/pgagent/pgagent-4.0.0.ebuild b/dev-db/pgagent/pgagent-4.0.0.ebuild
index 19115c249627..dab33c73221a 100644
--- a/dev-db/pgagent/pgagent-4.0.0.ebuild
+++ b/dev-db/pgagent/pgagent-4.0.0.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="${MY_PN} is a job scheduler for PostgreSQL"
 HOMEPAGE="https://www.pgadmin.org/download/pgagent-source-code/"
-SRC_URI="mirror://postgresql/pgadmin/${PN}/${MY_PN}-${PV}-Source.tar.gz"
+SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/${MY_PN}-${PV}-Source.tar.gz"
 
 LICENSE="POSTGRESQL GPL-2"
 SLOT="0"
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 9e889075563b..4a1be6a42b56 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -13,8 +13,13 @@ DIST postgresql-10.10.tar.bz2 19012049 BLAKE2B 44ed5cfe2dc57ff3533faa1e921c981e0
 DIST postgresql-10.9.tar.bz2 18981395 BLAKE2B ef2ac003b393ea7cbf24c45fac6b3dc69df2a8694a9e891d5a68f7310d63fb816649d16a7351d03b63a4eb2256703efcab616a0146324478335267c39f3b9829 SHA512 4e2f30a0fd262f2e3ce5fc836425be635326600cd6cd4e117c57f59ea7ab2e9ea463a8d357fe7adb8c0dd0094e43d08efc2a137f8f9975715a5908e35920f98e
 DIST postgresql-11.4.tar.bz2 19759635 BLAKE2B a3f35df40d31dce52073eeacf4e16bc7ccb487dc0a6e15b84d087f04fd130b66b1168ece3edc63927c377ca1044b54ccb3db5fb9b4a5c86a5b0e179a6678c73c SHA512 159fb84134e05ddc58e40a879ca52ed4d58ced7bcd1e7310d59bda84f9055339a31a92cfaab2c063a88685f7417b9a828534394bf9a2477fc33d1fb6cd26186b
 DIST postgresql-11.5.tar.bz2 19773087 BLAKE2B 32dca67ddfe2f6a6801a5d82a25fe7df0cc2dd89c35eee87a57ebe6391b8d7d4bccc59d6cac3e821ad76731ab319e3303f2fcbce9ee8cda1cfef13b2185c0ab1 SHA512 537148079dc6c33cfb9bf9722171e524707b42ef01369deb968d0d6e8fa9b7f16f6ce67139d9dc45fb7385defbf56aa2c0affe5ee9d76e996f31e47486192141
+<<<<<<< HEAD
 DIST postgresql-12beta3.tar.bz2 20698785 BLAKE2B 438ed0345730bd94478f73d4f1481b0a184aab8fd04c7097e41913d0648587e728e219f88f6ed37409acd41b3cef9a92b0c3c5de421cf845f643bd7c5f8288bc SHA512 c437fa0292ec770b0ad4f8c99ab9d0824a33aa1e4e609904b22cbfe0412ea7e54671fd08657d191932231a637d2356e76eaa2f690c6a9e3cf2e68006df04b299
 DIST postgresql-12beta4.tar.bz2 20710205 BLAKE2B 7a1a1732c4fe36aeadb3e80b4cc85796a3799ffe815f5199d8528668bd9588cf1edbd55a56c499bbff68e7dca01b734be6f50db3143cad3cd679dece6bfd9719 SHA512 52bf2fca13ea52890e5f6c6d42bfe8724267a3bb0c703cf792cab67cb7d71794107ec68a54e1b7cdc88d5050aa0745ad4980336074b04dcc610967b70776503b
+=======
+DIST postgresql-12beta4.tar.bz2 20710205 BLAKE2B 7a1a1732c4fe36aeadb3e80b4cc85796a3799ffe815f5199d8528668bd9588cf1edbd55a56c499bbff68e7dca01b734be6f50db3143cad3cd679dece6bfd9719 SHA512 52bf2fca13ea52890e5f6c6d42bfe8724267a3bb0c703cf792cab67cb7d71794107ec68a54e1b7cdc88d5050aa0745ad4980336074b04dcc610967b70776503b
+DIST postgresql-12rc1.tar.bz2 20718193 BLAKE2B 4c40c7ab6e98e43da4073d0b7b8341f47b61326ab4b552fe2e075a5135ba22b6b82a1fcd0aee80863e9cfd3cdb659bd609832e44618feadde4329dbc669ccecc SHA512 bea1fbf40836597f2427a5d3de4f9b5732a795b755aaa3263205210b8b27aab0a7a860e73c4698de77cd4f95b685390ad96732f5e71e35839df2ca317f75badd
+>>>>>>> next
 DIST postgresql-9.4.22.tar.bz2 16848787 BLAKE2B 5c2aaef13ef0cf33c421e6839877a8e4e1fc5dbe41d9cabefddd369925869f92f6c6b8a124b5778f9b25359103f0a7ada1eddcaf4bac498709f563928f25e7e3 SHA512 f11623a89b2320616fd53eda52da544bdfcb63bff08cb78fccde134ef628eee7ee90b3de6952f4e08c10297d356624faabf0e5b181b0105f51797796cd04efef
 DIST postgresql-9.4.23.tar.bz2 16848808 BLAKE2B fd747fb3f6f540190ecbd53116ef7b8b812d05f5968e32c9d09c5902239eaf073281262dba9836514344303a3c894f48c617e050ce713be7c09f53ee49c7b3cd SHA512 b1eb392b939ac8369c76e4ecc142c78f380afc498b60ec0ea97acb16c21ffa5c11a24c2c46463032865955b7c531492c08feb6ef1efc46a549369f026594ea61
 DIST postgresql-9.4.24.tar.bz2 16842941 BLAKE2B 999a33addd493d1169ba3222a269fea827f4ed866453727bf9545d6a8873943d56b8e71773daf0f116150dc557afaf2e80dc570e8f351ba64b196ae8bcd8fbc9 SHA512 8e7b4da8a5cf48cf4d98cce117614f7ab594087d0002f996c1fedc2a38af6eaa663ad3ce67ced6d6b0fd6d0b00aee932025bf50a4314933ba535716577e9393f
@@ -24,6 +29,7 @@ DIST postgresql-9.5.19.tar.bz2 17571998 BLAKE2B 24bd617ecef4d0add443d20ea3528eb8
 DIST postgresql-9.6.13.tar.bz2 18767279 BLAKE2B c1ec780a7f938f878425cbd6556145e60a613135129daaacc52e9a699cc448a22481b01fac20d0c09373ea6a026f39bc58234aae4f1126333b94f621981a8135 SHA512 65cc70410ad4a1a738b92855b92eecdbb9efbbca0eb9a45a138d47b696c8f9c9cd19073fbfdf5c80eea7633d0be29b4ed8acbadd38724acf8f18c90bb30f9b26
 DIST postgresql-9.6.14.tar.bz2 18787744 BLAKE2B be5a0d90fe1cd5ea682d8446e512271175f705bc49514215535d7aa4b631669846c0bd6167f985028c07dc5d6d394a1ea809028c5a5e15a5f010e85c2bede8cf SHA512 dccc183a6992ef4ece4ef5c638339708ab484e571ecd66ed993c9071cd55f250b4277fd3367f9a5ee545aa83e29dc5f7a239200e200e3314d5acc847f35e790c
 DIST postgresql-9.6.15.tar.bz2 18799121 BLAKE2B 5dee0fac7592cecf4412deaef54cedbd86eb6081fc268b6ef8a5f01c31af930747749fb54a77d766e1d6ef705bab5d550a7bace25c86d201f25ed69163d920fc SHA512 cc35a059bf59ea3487c17a8432b791ca2a19afaa24b07403a8d33904b3a97ebe601e3036ca8ec766c54cb87a7def7d4618a425a4446e6832391185d7c71117db
+<<<<<<< HEAD
 EBUILD postgresql-10.10.ebuild 13936 BLAKE2B f5e02688e7d569e8905f3501b8d2d6842130dbea5becad4e6cd073b7785f20c8ac26b0fc91ef3ceac5d480c4774ed1002124d0e44a881e994b6f494181330c3e SHA512 39ef59111f296500dac0f5ce88cdf8e51d446e11256ab6a6be01657935b7285159447e368a32fb05c60c6d67ac65674da1ceeb432ad645b0a3d8406b3d34d309
 EBUILD postgresql-10.9.ebuild 13928 BLAKE2B e9df06af21c478279778b92d268ae532dc8b4c477027eeac9a67c6047b2c823291bd4c32749ac651ce6f5f6f044fc47411fa6d0a40fe4b137237035db0d87f86 SHA512 0148c7289460c0a6e88bc9e64df5a44baba55fb8e3795ddfd3d9d2e0299a963e6bbdd42a9813636e783b84be33e40ae409d945ef360a638b775e9ab806577c4b
 EBUILD postgresql-11.4.ebuild 14054 BLAKE2B 2e346a9b6996c82e4e0b091a7f466fb25d9b4f2fb6612056767c2104dec8a085f2f59a26f913f9d4d9e67717e79e572c5f6f883f4b7f2a8af7d6aa7250212ad3 SHA512 081a24ff08b3f48a7f494385acfe5a24f6fa3eaee4c13054c9d64912787d65d06b138003dddb70debb9c436de99961993a0999695ddc5d101730fb0c6d4f2fa0
@@ -42,5 +48,25 @@ EBUILD postgresql-9.6.13-r1.ebuild 14993 BLAKE2B e62949c713914f8fd68fab5e70c6669
 EBUILD postgresql-9.6.13.ebuild 14829 BLAKE2B fffb2f1e956b93a561d289f657cf678f4e414e21787c73d1ebddf7182aba7b8374307e878841edb25de82feb866f88d79b89ed115bb4d916b8ed929c1a30b5d1 SHA512 c8c70732f1390285906e45cbce8afa3e3435814210c53e092bc0c2fa9f0ebe8d86b3f782e6eaed989a4c2a9a766a158232623e203e2d4917cfa95a05ab88d213
 EBUILD postgresql-9.6.14.ebuild 14984 BLAKE2B 08316d3f38924aea07f8dee69a823eb82277c0e15332c243de2218419155bde7103c062d644d38f08615b9035c244aabccd9b7df719c11bcc48bd64270047c34 SHA512 2f6e0e0aeb148e8e3e6fccf7f913ad902ff27aaac97cec43024b5e6fd8799ae77832d7aa7d312a08baaef1621f1ab4aaa29ac3fb2e4af8ef74c063112a72eba6
 EBUILD postgresql-9.6.15.ebuild 14993 BLAKE2B e62949c713914f8fd68fab5e70c66695c092c8c28b9d6c51a9e853c294281a017c15541e4fe1c879a2bd4997b7ae4a2cdc233fa55ab735ae27049bca3ead1113 SHA512 f3d6093665243f2c95f89bc20d84275c16d194eb7d5108fce5d4f8ba72b4224bf5ef43d6157db4489198bda6c3b9c401e51768877618521f1029c13ecbe0d24f
+=======
+EBUILD postgresql-10.10.ebuild 13947 BLAKE2B 352dda96771363d7dde12febdd215eb61afc11a697f6944b62bf3eea87c6447f21847afa3938987c2c7d1b20bac57e02d8b3def58b1d180bcfabba1e8f1ea796 SHA512 5fc97c1b23e7a08d8711c4b6ce1a707f525dddc24fec964421618862a34c240ab6178913fcb9fa8f5bec2583daf0bbdd26a088a664b2f43c48e9781520eeae54
+EBUILD postgresql-10.9.ebuild 13939 BLAKE2B 78b7297728faa00aa428f5cb3f7e9c83ea19775ca745245430938620d20c831d2f51013e26100ebba6db9b562967cb1f1a8a508b92a7cc756650cfc251c4d305 SHA512 12effc38127b99f1207124fbf9ff57828a76fd90837d22ed26bcf68fc1ce9a6a5e8e8a4788326e38a14c331bbfc37c72f74090e1d24478e8181c838b417a3514
+EBUILD postgresql-11.4.ebuild 14065 BLAKE2B 6200e64e83b140ab7bc589f892bfe173b8f78150d2a303cc0c404edce094fdb6bd2c754e7a1366aa72837335156a335a71ef71c1313f5c479947ec3e3ff4f370 SHA512 0f3e334f519ce5baba89d0da36365c48d99ca71b694dc4ef211195092d96ca89152ead4bc274671912e608b94b716bd49a53ed7a5deaf455c46dc6674025a398
+EBUILD postgresql-11.5.ebuild 14074 BLAKE2B e85761e67faae1454046a73cb772afcbcb1ae41110bf124e9ffe5abd115de949178775c702d55fc37ce2b86c3f274475eb879389e0984c40c53a44be46056fa5 SHA512 55df1be5bd2a62e20fc4301bc6eedc41215fad368adf2603d51763f34d23aa14222801cb9b4c73226f8e3401f60e08c21f5266d4dc669bd6ecd06e584e8773c4
+EBUILD postgresql-12_beta4.ebuild 14050 BLAKE2B 00ed9541c0e86f70e642c03dc37f9f492b240c55334ecaa3e2250baaa740537e1377c6cfaee7ca783623f486cdf8ca64a887bad4c9458a8f5e8be3108f62e31b SHA512 429f9b34a826b393ad371fc254f07b36f1d61aea2f4d5f32ea458580c4bfea0150953e922a5cd675f0025d571958aaf66cd4569b02a002545932d35767a8f0ca
+EBUILD postgresql-12_rc1.ebuild 14049 BLAKE2B bc13b731f8d4e247f98c541cece3f6192235a350b3cdc77f8de40ad120f2343df0e318ec72c8085597a99db3256e76c95ed1fd7b854b570a7fa3e48d8c1c80fd SHA512 f2677416d03403879cd33dc6365cf1025d0c3262ba05cad6f43709487bea5e18bd2451a157a115c6acb8c67db7764a93d9a5a9bd501a5edbcaee1dacd5c4b545
+EBUILD postgresql-9.4.22-r1.ebuild 14543 BLAKE2B 4dfe4223e44ec628c8a4c9351acf5f01a6648f763bb8f9fd1b0a20d79b7353883a70fdce1779030e946c9303df8c678c78a3c8a554a619790e08c9447d9bb2eb SHA512 f95af512dca7c87894b4ca8ff6f5e2d5c05469fa33ca27c33a6153f7f0e58b843de9ba21a078e359f496d4d4c527e19bd7cbc62f9115f96ef5fe252d76612c18
+EBUILD postgresql-9.4.22.ebuild 14379 BLAKE2B c844c437f7c01cc98ecaaa015361fa4990884d8d8ca98a2faf6fb32bdca0201e2036f16f1fb6deff5569815ef90c77f3e8974815a89e4c58f7834e9cfbb2bd44 SHA512 18afeb355f61613513d1179a777bab73bff31ea4388ceb26d3a2fb9ba0d4907a4d58bd227549cc63866ef7e9af850e7dc511dbe24f456ae0032b75308cf74b26
+EBUILD postgresql-9.4.23.ebuild 14534 BLAKE2B ccba91e327faf9e0d9bcba9a10d4df260026a90a6ca7cae84d9638f4adf2ca4bfd395cb8bdfd0439710fbed1bd304b7c025b3b6ed6e215f0a47ce6786bc5aa0a SHA512 29964e46c19310066d292674c4b5a86936b1c80607bb81762495e126c593b25d8e67b4a5460ef064651388f48e14a45e5a0c584a100257f473f99a88c3ef1c85
+EBUILD postgresql-9.4.24.ebuild 14543 BLAKE2B 4dfe4223e44ec628c8a4c9351acf5f01a6648f763bb8f9fd1b0a20d79b7353883a70fdce1779030e946c9303df8c678c78a3c8a554a619790e08c9447d9bb2eb SHA512 f95af512dca7c87894b4ca8ff6f5e2d5c05469fa33ca27c33a6153f7f0e58b843de9ba21a078e359f496d4d4c527e19bd7cbc62f9115f96ef5fe252d76612c18
+EBUILD postgresql-9.5.17-r1.ebuild 14771 BLAKE2B 9b54c6f7082efded06e46810a8944843f156ff9f19d4ef0965ddd0a5d90e80849abdf35fbfe53d2063b1d98b3a97fbb0bcdeee7d66ffe42cf9f53d155aae04f7 SHA512 7769be3ca9b63b57a8eae0518ccae3bb6e380b27887d6c713b3222e86fd275433e7811089958937cebf3052456e1fc88ea7145871f037b662109162f71e71b71
+EBUILD postgresql-9.5.17.ebuild 14607 BLAKE2B 9c36cf95f2311afc937cad269a99b80dd32dd2b6de707c4b9a9ec991af843a28f303657dcbbdaebfdee357d62e9a2ddce76f4099493c95cb9e312e413394332c SHA512 421053e94b62647344a059d11b5b0d79b3d869499a24478bd41435aa2168d4dea8fba31857199e30a5fa4db5601dc660b5fa8dbbc86ded320cba02c772411cf2
+EBUILD postgresql-9.5.18.ebuild 14762 BLAKE2B 96c0adcfd697dec77081ce1f2b97beee88550ef941e9a2319f35c79b1c600ae19758a7c058c4a66ce59e28d44627619b073624136d1def3aa1c60894cd009bd1 SHA512 bf255a8dc2376fa892e4f08379cc2adafc8ccbe690df7bf3a6f8d192ff527155079c746aa187eda12b018a9fe5b73a2bda91f3f8e1f0156f419079551def1f04
+EBUILD postgresql-9.5.19.ebuild 14771 BLAKE2B 9b54c6f7082efded06e46810a8944843f156ff9f19d4ef0965ddd0a5d90e80849abdf35fbfe53d2063b1d98b3a97fbb0bcdeee7d66ffe42cf9f53d155aae04f7 SHA512 7769be3ca9b63b57a8eae0518ccae3bb6e380b27887d6c713b3222e86fd275433e7811089958937cebf3052456e1fc88ea7145871f037b662109162f71e71b71
+EBUILD postgresql-9.6.13-r1.ebuild 15004 BLAKE2B 4feeaa04209151ba5a86687710737eefb1fbf195e89174dc30f4546f8007d1768ce2793579a17989c47fcf10403800dfb11ea021ec9eda5939cb45048eaec8d7 SHA512 305f6fd0a55f316c358afc41a85a566e52ce8befeccec039e4569366da1cd850d2d8ac322819af05d493dccdfa395f9c64442f0bdec8e3e139b6b19126b234d0
+EBUILD postgresql-9.6.13.ebuild 14840 BLAKE2B 2e29f79cf8160f6eba190d0ab6b7aa9506dae41e5aa6b64cf1b3a26d0645a23ce5ee66e37a1b9c360b0b191726fc22d251e8172d21faf429a6377d16a26b9f98 SHA512 bec8a9a610dbf0a17a8ee3fcb7dc3c1eebb1d69f1acf0d34899409538824d3b3d14254c38efd8f331bb5f981c5aad6bad74a29ce17b27bfd09d33320bbfbc07c
+EBUILD postgresql-9.6.14.ebuild 14995 BLAKE2B f552296e01e087c9d6dff82b46c26cb172c8208d9e053b7fa9eb418d9e39ceb267a076d4181adf8f473c6c6591741c88347227ea02fbaf580e2afa908331c73e SHA512 24178fabba811c351d1fcb88c96a0bf112d8be1bc819cdc6abaf562260e400c43baade9a289a67bcff7a38cd345bdfad1aff13c610c1fe9ea98a1c121be0fa12
+EBUILD postgresql-9.6.15.ebuild 15004 BLAKE2B 4feeaa04209151ba5a86687710737eefb1fbf195e89174dc30f4546f8007d1768ce2793579a17989c47fcf10403800dfb11ea021ec9eda5939cb45048eaec8d7 SHA512 305f6fd0a55f316c358afc41a85a566e52ce8befeccec039e4569366da1cd850d2d8ac322819af05d493dccdfa395f9c64442f0bdec8e3e139b6b19126b234d0
+>>>>>>> next
 EBUILD postgresql-9999.ebuild 14485 BLAKE2B 386379214652708fc23727970999371b77804bd9a0a13dcbdcd94e6f8a0d5b30b3657063884177a0f903f88845f2fd202bf6b05e1fb51fd82c6aa5bdc3d290e2 SHA512 4173d20a00da315d9bb15a32474f202edfb0580494fd37501e8a9c5f61ae334421ad092da408783690557621ca95455baa7d5e22436973c723c5de6f9d79e286
 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 88115ec2c2a7..72659d598d65 100644
--- a/dev-db/postgresql/postgresql-10.10.ebuild
+++ b/dev-db/postgresql/postgresql-10.10.ebuild
@@ -18,7 +18,7 @@ SLOT=$(ver_cut 1)
 MY_PV=${PV/_/}
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
diff --git a/dev-db/postgresql/postgresql-10.9.ebuild b/dev-db/postgresql/postgresql-10.9.ebuild
index 6f4ca015ad5a..130b09e017ab 100644
--- a/dev-db/postgresql/postgresql-10.9.ebuild
+++ b/dev-db/postgresql/postgresql-10.9.ebuild
@@ -18,7 +18,7 @@ SLOT=$(ver_cut 1)
 MY_PV=${PV/_/}
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
diff --git a/dev-db/postgresql/postgresql-11.4.ebuild b/dev-db/postgresql/postgresql-11.4.ebuild
index b8d3d3ef5e82..dad3df04d2b1 100644
--- a/dev-db/postgresql/postgresql-11.4.ebuild
+++ b/dev-db/postgresql/postgresql-11.4.ebuild
@@ -18,7 +18,7 @@ SLOT=$(ver_cut 1)
 MY_PV=${PV/_/}
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
diff --git a/dev-db/postgresql/postgresql-11.5.ebuild b/dev-db/postgresql/postgresql-11.5.ebuild
index b55fe07666c3..eabaceb15f27 100644
--- a/dev-db/postgresql/postgresql-11.5.ebuild
+++ b/dev-db/postgresql/postgresql-11.5.ebuild
@@ -18,7 +18,7 @@ SLOT=$(ver_cut 1)
 MY_PV=${PV/_/}
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
diff --git a/dev-db/postgresql/postgresql-12_beta3.ebuild b/dev-db/postgresql/postgresql-12_rc1.ebuild
index 56f37570a009..d16b0dfd1e74 100644
--- a/dev-db/postgresql/postgresql-12_beta3.ebuild
+++ b/dev-db/postgresql/postgresql-12_rc1.ebuild
@@ -17,7 +17,7 @@ SLOT=$(ver_cut 1)
 
 MY_PV=${PV/_/}
 S="${WORKDIR}/${PN}-${MY_PV}"
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
diff --git a/dev-db/postgresql/postgresql-9.4.22-r1.ebuild b/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
index b08e6262967a..ee114bf8e475 100644
--- a/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 
 SLOT=$(ver_cut 1-2)
 
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+SRC_URI="https://ftp.postgresql.org/pub/source/v${PV}/postgresql-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
diff --git a/dev-db/postgresql/postgresql-9.4.22.ebuild b/dev-db/postgresql/postgresql-9.4.22.ebuild
index 9463417f714b..38c1097dd516 100644
--- a/dev-db/postgresql/postgresql-9.4.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.22.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-f
 
 SLOT="$(get_version_component_range 1-2)"
 
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+SRC_URI="https://ftp.postgresql.org/pub/source/v${PV}/postgresql-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
diff --git a/dev-db/postgresql/postgresql-9.4.23.ebuild b/dev-db/postgresql/postgresql-9.4.23.ebuild
index a072d8d9cc2d..5df32e9adf27 100644
--- a/dev-db/postgresql/postgresql-9.4.23.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.23.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-f
 
 SLOT=$(ver_cut 1-2)
 
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+SRC_URI="https://ftp.postgresql.org/pub/source/v${PV}/postgresql-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
diff --git a/dev-db/postgresql/postgresql-9.4.24.ebuild b/dev-db/postgresql/postgresql-9.4.24.ebuild
index b08e6262967a..ee114bf8e475 100644
--- a/dev-db/postgresql/postgresql-9.4.24.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.24.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 
 SLOT=$(ver_cut 1-2)
 
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+SRC_URI="https://ftp.postgresql.org/pub/source/v${PV}/postgresql-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
diff --git a/dev-db/postgresql/postgresql-9.5.17-r1.ebuild b/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
index 14d84350ff6b..4e557c0bbc53 100644
--- a/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 
 SLOT=$(ver_cut 1-2)
 
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+SRC_URI="https://ftp.postgresql.org/pub/source/v${PV}/postgresql-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
diff --git a/dev-db/postgresql/postgresql-9.5.17.ebuild b/dev-db/postgresql/postgresql-9.5.17.ebuild
index cdbace433fe4..2e4ee174bda4 100644
--- a/dev-db/postgresql/postgresql-9.5.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.17.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~
 
 SLOT="$(get_version_component_range 1-2)"
 
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+SRC_URI="https://ftp.postgresql.org/pub/source/v${PV}/postgresql-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
diff --git a/dev-db/postgresql/postgresql-9.5.18.ebuild b/dev-db/postgresql/postgresql-9.5.18.ebuild
index 4a767c62cce4..e3f872906c49 100644
--- a/dev-db/postgresql/postgresql-9.5.18.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.18.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~
 
 SLOT=$(ver_cut 1-2)
 
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+SRC_URI="https://ftp.postgresql.org/pub/source/v${PV}/postgresql-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
diff --git a/dev-db/postgresql/postgresql-9.5.19.ebuild b/dev-db/postgresql/postgresql-9.5.19.ebuild
index 14d84350ff6b..4e557c0bbc53 100644
--- a/dev-db/postgresql/postgresql-9.5.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.19.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 
 SLOT=$(ver_cut 1-2)
 
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+SRC_URI="https://ftp.postgresql.org/pub/source/v${PV}/postgresql-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
diff --git a/dev-db/postgresql/postgresql-9.6.13-r1.ebuild b/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
index a6c2ed402e20..a9cd0fae585c 100644
--- a/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
@@ -18,7 +18,7 @@ SLOT=$(ver_cut 1-2)
 MY_PV=${PV/_/}
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
diff --git a/dev-db/postgresql/postgresql-9.6.13.ebuild b/dev-db/postgresql/postgresql-9.6.13.ebuild
index 8c7844abba34..4d92591e0fa6 100644
--- a/dev-db/postgresql/postgresql-9.6.13.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.13.ebuild
@@ -18,7 +18,7 @@ SLOT="$(get_version_component_range 1-2)"
 MY_PV=${PV/_/}
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
diff --git a/dev-db/postgresql/postgresql-9.6.14.ebuild b/dev-db/postgresql/postgresql-9.6.14.ebuild
index bde8d9887523..5a56c9a09fbf 100644
--- a/dev-db/postgresql/postgresql-9.6.14.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.14.ebuild
@@ -18,7 +18,7 @@ SLOT=$(ver_cut 1-2)
 MY_PV=${PV/_/}
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
diff --git a/dev-db/postgresql/postgresql-9.6.15.ebuild b/dev-db/postgresql/postgresql-9.6.15.ebuild
index a6c2ed402e20..a9cd0fae585c 100644
--- a/dev-db/postgresql/postgresql-9.6.15.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.15.ebuild
@@ -18,7 +18,7 @@ SLOT=$(ver_cut 1-2)
 MY_PV=${PV/_/}
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
diff --git a/dev-db/psqlodbc/Manifest b/dev-db/psqlodbc/Manifest
index b9b626b3822c..e2752d5472f5 100644
--- a/dev-db/psqlodbc/Manifest
+++ b/dev-db/psqlodbc/Manifest
@@ -1,5 +1,5 @@
 DIST psqlodbc-10.01.0000.tar.gz 915109 BLAKE2B a09de8218dbfbacf7972fc02c02863891ed65d19b86217a646aa0176ad7a8b962da83bb5036ad11b819a583409e4d1f3ce257a0457838000bc9cc060753c67b3 SHA512 1c5b9732a9c7e7bff0fd0a04cc7f0b45db9150486a2c3a8a96d85fb55e9296a80f12ee652cfb7ff54700e7dfc10accf9e5420b7ca798df31be51f997bbda88aa
 DIST psqlodbc-11.01.0000.tar.gz 919372 BLAKE2B ce84b4bb210c4c3c3f2a3e9eae713c875e4bae491e20f207f740a02af69cb771f504de6b1da06fcd12306d986299e1537184a6787eac80e320eea6d8c13dc142 SHA512 57762bfa9925012946e56a3d5b815af00078299c121ba0142865c06f877cabf314512e4e6efc654589fb409c4dd2cbb9a3b7fd7aa1a6ace361879552774b11d7
-EBUILD psqlodbc-10.01.0000.ebuild 683 BLAKE2B 76d3476a6e36f014af7c3db05aa468e98574997572b33f7f70d3ed3fe10aa3bd87028b2a9ba9509991b9050278fb66683b3f75d86d6b260cbaf0900cf33c8390 SHA512 cbd689bc332a0e43e4779286ee82ee4538ad6bb707b15acc0ae86b4c03b5a3a331c22b9115864b97ee5a825f6a09899709119d11e9c3c1e5d0d5f6de3c9f134c
-EBUILD psqlodbc-11.01.0000.ebuild 679 BLAKE2B 89284344955ecedf8ff80d6ed1ad052cfc5689f1934a31ca08dbf8e99ceddca395b8c47034e440355ec92082ead1f8c39b0c01c9b21f88e0a4e1df5e6a0a83e5 SHA512 ec25ed4f5e74b0242510633fa4d97d3b37f9906b4024785145b409c5848f0cbc6d83a8c69ea222c202278618e940340d1f7a36ae2d3addf9352f303be24e48a2
+EBUILD psqlodbc-10.01.0000.ebuild 694 BLAKE2B 980058570611ee2b1926e864f75fbff4893c27c7427f2c0cd1616181adb0ac83cdf43f3f45c5cb9118b6860c0ed54e2aeafffb5f309d645be1dde2e109ed0cc5 SHA512 15aa0ca7dc3fddd4052ba7a05eeb8ae08739a5c69532585ee59c3f38fc4e0a60e0b73a81b60d1648e5ff3712d18949fa54f596c7b5164c4a72313f130461a778
+EBUILD psqlodbc-11.01.0000.ebuild 690 BLAKE2B 9f70ec2a0c718567611936ac3cadadee457a2338bb3792ed4a14ff2f84ca4f7c70b1d63b2a731abac47530e17436af414f0c0864ee7aa58717efc2866116cea9 SHA512 308f135df50933cc6a0a41cfe5cc1468bad9e76163383e73101437eb8011d0e45dcdbf34ac50f4cda354aeb3357d439254baa2022e3952f92681c8509a36ad12
 MISC metadata.xml 366 BLAKE2B 9ec9629e72aec8407fc260e061f7bfe22f4ed13c6a4a99ddfffbd16eeac41cc09bcbe10045f6e4cba92d7ced6a874b09b7a7614aedd7cd45afa6e03e096f869e SHA512 a6aa6cbb188fa2ed889ecb69c60b77d33c52ee69a5e9b3c20d8faf9bd9616d33f592c85bded3351fb099b6424e2f7728ee11fb1114121604ceacd9e7e0a13f7b
diff --git a/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild b/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
index 075039ab2e17..2e2bc98f9a4d 100644
--- a/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
+++ b/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 DESCRIPTION="Official ODBC driver for PostgreSQL"
 HOMEPAGE="https://www.postgresql.org/"
-SRC_URI="mirror://postgresql/odbc/versions/src/${P}.tar.gz"
+SRC_URI="https://ftp.postgresql.org/pub/odbc/versions/src/${P}.tar.gz"
 SLOT="0"
 LICENSE="LGPL-2"
 KEYWORDS="amd64 x86"
diff --git a/dev-db/psqlodbc/psqlodbc-11.01.0000.ebuild b/dev-db/psqlodbc/psqlodbc-11.01.0000.ebuild
index 95c78aea20ca..2e25f4eb74be 100644
--- a/dev-db/psqlodbc/psqlodbc-11.01.0000.ebuild
+++ b/dev-db/psqlodbc/psqlodbc-11.01.0000.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Official ODBC driver for PostgreSQL"
 HOMEPAGE="https://odbc.postgresql.org/"
-SRC_URI="mirror://postgresql/odbc/versions/src/${P}.tar.gz"
+SRC_URI="https://ftp.postgresql.org/pub/odbc/versions/src/${P}.tar.gz"
 SLOT="0"
 LICENSE="LGPL-2"
 KEYWORDS="amd64 x86"