gentoo resync : 03.03.2021

8 files changed, 29 insertions, 24 deletions

diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index ad022b549aee..15a502e47479 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,3 +1,4 @@
+AUX postgresql-10.0-icu68-2.patch 315 BLAKE2B 4729962a531e56cd88d9b98d7c5386de9c2a37545c003c9e397a9545c2646cbbd1a32cc11752b4e0b37314470de4ab1d9109c5ef8a6cdeaa4e573186d036a810 SHA512 299ffb34c840b1af9c16d217c9a9c740ad7a585bd91e15bc90848f958cb3aa764368064e624c873233965e8d0079a3fd69dc94a006350c248359ee7b5e7b86e6
 AUX postgresql-10.0-icu68.patch 606 BLAKE2B ebe222879ddd0e97da8762ad85994beced0d706d2db140db9b3e588951f485763f698d70a8ff4e4bbfe1d66f8762bf3d329bc97aaa70bf5b36f0e2e72e53a508 SHA512 1c3c994c79155845d6b3d1a92df002d4127fc576eb837f892aef0ba2e0b914d107c35656f9e5946084892693054cb935e85eb5902be2296fd04c7cf958ba98ea
 AUX postgresql-10.2-no-server.patch 3117 BLAKE2B 399e295e393aa84aeaefbe236bf63e091414c9f3d9238ef8f4af3ec955cc0ded6324f4241ee4e78ee1aa775524768f65b15d5064cf4330f5b3149bed2e13aad3 SHA512 1888985a0fa67241b18d3c21c1ededc34666c55f6f4f3806efbe4dcb5a2e30d6d08c955a3bbcc52f589bc5bb857d1c09bd82b555069637a71afe9062994199fd
 AUX postgresql-11_beta1-no-server.patch 3080 BLAKE2B 29d4f5d8e26e9360490876d2d51cb29cc340128fe77c0bd76248073157c9e5be09c788cc4344e09c0c2bf2f57e274d5f31f211d1950ee3f47660dfdc4cb7b455 SHA512 42c39e602a019d1d44c39795904fb37a7f14b4623fa90b066f4f26a743d80b6eeaef2e8c7de4c47dddf53d7e89cbe5a2a3473b456ddc76fc0e96f57ff6a9df69
@@ -11,17 +12,17 @@ AUX postgresql.init-9.3-r1 4999 BLAKE2B f2bc23a51b6d9643bbc14320aaa9c41b7eb1df86
 AUX postgresql.service-9.2 1666 BLAKE2B d4b81415539db3d78e0f5908185f903b70966ce3a27feed9bdf80eb6a9065ca6bd4b49e4bb822c41548b7efa9de37656378c395a8bd00a7a3daaa52911a2f674 SHA512 8c64b59f1e80096382a7166e1e8f183a5b9cf14c75138c15a39de74b983bfbed2f41cf9b33b2c72c3b9c79130c10104836a3505c96cb18ac1be1297c0fce1af0
 AUX postgresql.service-9.6-r1 1477 BLAKE2B 2a652d5b2892f3a52f484fcc0b4f4dad09cf4b46c3739c3f805072040a26128cb2ad9a25d4a7c9f109a95696d739538d379af6bac53c656f5c41af45b6110de5 SHA512 9e2b04923f6ebec1424c0f276c58a6a0c4933f2de5e2a9776169227729afd06ce5284461be8b6ed70e5aaff2a68b9f96c6893d867d35761c9977f9847ccfe93d
 AUX postgresql.tmpfiles 39 BLAKE2B 25a5725af53c8e4e4009887e998172dd863ce218a5438351194548c4fc8ea15308dfba3602d5a922cf49b46015198268a4a4528119d8a74dcef4cc4c1767c052 SHA512 498060f2a597cf374f4fb31deaa2d6c5b00edef68efc0e71b82bfc20b717ae12518ba18fcb455a0c518ebba1a0868f38321470616151d02fa79b889a66dcb9f8
-DIST postgresql-10.15.tar.bz2 19089779 BLAKE2B 3b1b30fca0253122aa20eb3fc0cac0b022379b0f0daded46d3295e76167c0063698226198bc905bed5b689a71f4dd2bab5795861207767c2091f037a2b0e9663 SHA512 88fe322a8691692f8c1b8ca7f7a5a035c399c1d2a0e6276b60863f2c0cb8e4857b041d7364641e0738438aee0836688e712b9c176ac454ee98386dfd18754636
-DIST postgresql-11.10.tar.bz2 20003842 BLAKE2B 21446b5e9202c84dad4d6c768f16aab539e656d0a836121343ca4051269845a9ef06859ea37dab09030467336599eb1b72175115d61ca965ed74b7c2fed9ffbf SHA512 0cc0e9b0f76e00727dc699ea59a45d760d37d91ec736a62cbc9bda3e38eb1ef1565e4e399dd3ae96bad87f866e56e364f916de7740d8be6e1cfc2bf654dfbb68
-DIST postgresql-12.5.tar.bz2 20729654 BLAKE2B 7f7458346a0823d155f5caea0061aa14048d6f3cac27b1ea23dba03b02a39f39314ad1d44e589520d5e287004ffd32e042fea99ebfeda24b2cc23867b402d336 SHA512 9895bcb1bb26206500666ab4441e663ef83702d428b85a6ff177a4eaf44b0ae06b35d5c4da2672ccb4ec18296649af95bf2f0aed526afaa6a216a8c2d2c5627e
-DIST postgresql-13.1.tar.bz2 21034192 BLAKE2B 609ac10f87da800754223c7f7d6b02efa3ed1308a5d27cc793c937be983f4041576e20de3b2efe514e3f61dc863e6212ec01d73adb93f6bcc373a596b2946675 SHA512 b7bd378db1dcb74ebcd5fffba03b82d8117d182029e4caca48eef62d8bcdbeef2c2e10f18eef0cdafb9d7acf21aa164d040e56687709f97b08c51540a786eeca
-DIST postgresql-9.5.24.tar.bz2 17881872 BLAKE2B b86019c4616142a0f5a8db3d00422e16181650d1e1ba755bf6453b76e50b3feff75d7319839ee6f28949d743e46bbdaea32fa3d51f39dd4b4439c88943665d6d SHA512 6e649cd31f2761e2d070d8028b59a690ad76ff3d83a3aa982c4b222c8ea2927fda5e8f473330526673e27ad4b3cc99e8c66810e097c3dfc6517571405c6aede3
-DIST postgresql-9.6.20.tar.bz2 18944478 BLAKE2B 46c7b27ca60f967f71984d6b747c3054ae6ef4acdcbcd14cfbe3c1ede32a9303b99911e521ed0aa2ba6f899c0d8b9ec03e4e6804379ea6e2371a696f32a6f867 SHA512 6d247e5640a515fa6e6a4c68a992c83aeb19e35924b8e3d21191b3289200766588d1426c5863a13bfc4a11944da3202df9efebc94460d16454c29e5a79384c75
-EBUILD postgresql-10.15.ebuild 13623 BLAKE2B 2516f0cac15ec107c4cc9d07d6a871d7a05c4daa0b84dbacec6aa1da553c7fc2ba3b008e7d06749146309be569348bbc528b13a21e9cf35c6c76c4c22633b7b0 SHA512 7d4dbed65695d70209fe142b08f282ff3abd94cbf62b3c391ce7c8219c3400e99170d2f48b6abaf5aaee04433b1b11ce0a855cbfa94749b622343524c780bdad
-EBUILD postgresql-11.10.ebuild 13743 BLAKE2B b236d5f6340164bb808d737bc35ca26b89d6c7029aa6a165ffa92568989e05d6cd485c3828529f075571e43c794a1dc4ba337fb146615a293d013720e69ef1b2 SHA512 1c1b60f85f971140947d6ceb0886ee43f087213d2a1a9f670a79e1f5523134f9c690837f3f8fc5f4a713a7600c39a1911fcbd664899648b7b7055180e2db66f6
-EBUILD postgresql-12.5.ebuild 13715 BLAKE2B 99298404ec4954cbe690bfad9f7b7886a45a7c97d40e51c70c276ba972ad09111e910c88345f477c0c1d5aa759a2d259e9c3077a71a1ab7fc36030368af14da3 SHA512 6d80e3a5e7e0bc7c2fa80e5c81d93d63dc6c752fcd0ff0b45855ef5d6efdfe019def44bc3174b7f53373be8c0bae9052789d1f0c352c719d1e573a5f5f9db6ae
-EBUILD postgresql-13.1.ebuild 13961 BLAKE2B a3ccd721772ab1fe1e4524582fed0735ece3dde73f41e7a5bf9774ad7c7f5a338bc789d584265be5dd751b88cc4d99d6736c70fe96c9cab8f30e237f6b966a3d SHA512 df9e6b69a1e53423136dcce6363b79de15b3da8c91806e2a4482321146aff0a4f064bb5b2beb7241afefecdbd0b9e935cb7a9929eabd14cac579c5270ceab59b
-EBUILD postgresql-9.5.24.ebuild 14359 BLAKE2B c61f3f4f220ed10a11641abc0cc0d0a0a3439aaa63518efd3dbe5a9d5604104114d3e54d583e7d914d23e47ce9a7af73e65e681a520d12f4e3f9bfe999dc8d94 SHA512 ad601a1faeccceb04a777216bba48f16ac7d5e7e3b433352e4b4992d0995380228f234a90257df46748782016933a1c1f707535d76a32d78656f15866f725605
-EBUILD postgresql-9.6.20.ebuild 14581 BLAKE2B c6072c5be1257207d1a89a976a7ffca7e3806c5332f85d8de6b6a2957995af56293dd895daec7a23c82a6dc2f5f2fe5fb13ffb76ebcd27f8f1834302cdc6f9d0 SHA512 995ce668dda42cc416d0636269677edddfbd147747963cf275528a51c3579369ee91c134de3671cd71b2786b2f6fa995831a8da607e220b7df1a0b11a52d5d5d
+DIST postgresql-10.16.tar.bz2 19140221 BLAKE2B 37fccd3f5c72ac489cbc26225dcc6992fa7fd5884a0141ec093122f556d7959a053181e01c6892d2e322af54028bf40b2293d090afa6366739cdefd3f62abd73 SHA512 690649b4e2f4e0650e5b927048e06894e60c5cf1663bb63ab89143f49e5f753e590d3f011b44df3c402379953a9c23f4832f0cf97c984f03c37d14cb85c860aa
+DIST postgresql-11.11.tar.bz2 20054359 BLAKE2B d15a75319c53fb38a63e4e331567e32014e30fd8696ce19e4c50a458e866827f934d1bc7d28a0c28fddbf1ff7e9f61e5b3016cef27ed988ca43aabb3278bb64d SHA512 8d38e6b7826e73191159f1ee69efde28adc061e0041eb136f55681503a189355b869b2ff312860325d454c1f95367d921fb61dd2de31f584261f165f229bcdb9
+DIST postgresql-12.6.tar.bz2 20771172 BLAKE2B 7df8eb901255f56b4574cdd94a5e9d5a907d800edded805d4e8a9d1b85e5aac1c9b1963c9f8980ff5c95607e046e8e92f35a808f009cfdd36d54e1aca2e35db0 SHA512 5742c9d861c53bbdd032972e63b706d24ccb39492474c446cf4edac235d57357f036e48727027819004177003c4328123148e3d767d2b3d7866a52f333f8d68d
+DIST postgresql-13.2.tar.bz2 21057276 BLAKE2B 982feffdd98d3f519ff1e790d35ac828710d3ca6cbf935a78bf04011dbc12b4523b451bc7f2421a788a709d1746b2cca9135842bfc1d5048ef5951ed48b20b6a SHA512 6d93cbae8de8637deeccd851fb676a12015e8e1efa6be2424f506f232db535c54b974b11f47ed4578575f90f6de1947b1647f399794b4ec242838efd4c5b2bce
+DIST postgresql-9.5.25.tar.bz2 17923796 BLAKE2B 432e035e78dacddddfd46fd4d04775b61e2e4db9e61945fa5f7e1c3c5ea3516a5e327489b4e57313b0d6ba4f2e20f52a164f96db01aa22b755ff625039f262eb SHA512 621b36d767d2c7eb2e942cb7b26ca7491450fcfd9606114849f7336b4d8a0bc0196badb44da4918e748145d21b6f72ccf1255a1309dff2427da8b39b63fca427
+DIST postgresql-9.6.21.tar.bz2 18990266 BLAKE2B 42a2feaf15b8fd4cfcc028a744a696314f0ce7b22ec6c18c43152d7e4b8149a9d5acd6cf22c1d13643709dd2b3f1de571e2925c7fc501dc361248c99c88e3f42 SHA512 6fba42171cbe4ec24ed250c32cc8f35be70ddfbc6d1ef0df733bbd094b29174ef198db351f6679a26170effe1fed44269dbe9dbdd619bb18be87f5b539f74475
+EBUILD postgresql-10.16.ebuild 13708 BLAKE2B 396868b51d52e84fe31b13adfb2b5c39b812c7c7cbcd3649fd6e15c98c33f40656f580c693fc2c18a2a466bf5419be08d595b8f1874a029312bb33ee4463d0d2 SHA512 6b621120e7e8b841e711b231bf598401f562c046f49a36d8fa78956f01e95674aa08ff7c399480e012c2b9bf52595b3d920664f790b372964ec094f2bea69f24
+EBUILD postgresql-11.11.ebuild 13658 BLAKE2B ad4d0294dbf082790da80a852e35b68d5e6c800098785e342deefe4f31035b67f02ccf0781cdc15228b5e29928bc4f1b98232d6cc47f4aab1c17743f504572b4 SHA512 7be02dd64b0a660a8a0be400c73abbf389da35e8d06eaacc652143da1bfbf6c1bcaee3646c1857b7cb50dd27abea484875b10dd0dfb8576736c45436df09e6aa
+EBUILD postgresql-12.6.ebuild 13630 BLAKE2B a16b26a6baf869c8702df6cc07e1c32bb15e5399e1ac436b7a79f310c3bd3d359e4059702621c42ace7ab3f5a6371552de3838a6aa0b250590cdf90d417a0555 SHA512 f0fcf871e436a00b67065c1a4698a4178276d3a1da2332d7f6d525e4ea9655efbe208d747eae10f37bde568aa9b31d930cb6b53eaea52e78dc6a8ea1958f2829
+EBUILD postgresql-13.2.ebuild 13876 BLAKE2B a9a7451e095c3eb37f98e8030d5ac0b2d32d45448758793fc4d6190575ea20aa03394628f809fd925de669772e41ddd3b03c4149bc3526cd6241527d9622289c SHA512 7fc2e90a874911ee7be23bc464040d792a6b03bceeb35c7cdfe81595d4a4f236a7f30dc8d6d70d2ebe523785ccf100590af207ce611f2d18c4ecfd154c85e691
+EBUILD postgresql-9.5.25.ebuild 14359 BLAKE2B 023fef7d638339180a10b499cb6c727bb7799092611e88cfa0c47d9b1a86d68386898181dce1be9b21e2fbd764fec41d209fb5dc2a8d5f3de8fb5b57a1fc5e13 SHA512 161d3212b00465fca5367032bd5300ab65e763dca25cea82ef81064ea0b15c27967ffb7d9d7c00cb741472e8f72f966b0672bb04b326cae650ddafbfc4e40973
+EBUILD postgresql-9.6.21.ebuild 14581 BLAKE2B c6072c5be1257207d1a89a976a7ffca7e3806c5332f85d8de6b6a2957995af56293dd895daec7a23c82a6dc2f5f2fe5fb13ffb76ebcd27f8f1834302cdc6f9d0 SHA512 995ce668dda42cc416d0636269677edddfbd147747963cf275528a51c3579369ee91c134de3671cd71b2786b2f6fa995831a8da607e220b7df1a0b11a52d5d5d
 EBUILD postgresql-9999.ebuild 14057 BLAKE2B 39b35eb26ed5c45812065a32a55a96fdf53ac1a4f462b2132a43089630158b3fbba9ab1a4f9485f2df493503e52affd9d612bfa874f6a155cc0223aaccbced0a SHA512 87cf7ca36bcaa2af4b990a86cda7fb78f922c25f988f34014f52258d57a9ae99e9684fda7b9add256d07ea8861ddced460e71f25d837abbe92802cfd7b6417f2
 MISC metadata.xml 715 BLAKE2B 71b868113676bdbb1996ecc8e3727b0cc16a559c5906e6459a41c330bcb5a5f4b3f4b5c4473a81905713c2f0735f185cd14612c69108b6bb602a7d8a92d6f3ce SHA512 4148c9c11ffaea5d30cd18befb06af914147d41eec4a8f905127f0abc5317ca370a745e0fd51b03c4583efde927fe9c1b3333853e80c2aa3e7677de65cd5d1ba
diff --git a/dev-db/postgresql/files/postgresql-10.0-icu68-2.patch b/dev-db/postgresql/files/postgresql-10.0-icu68-2.patch
new file mode 100644
index 000000000000..871516f9bf3d
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-10.0-icu68-2.patch
@@ -0,0 +1,11 @@
+tardiff /usr/portage/distfiles/postgresql-10.15.tar.bz2 -upN
+--- postgresql-10.15/src/include/utils/pg_locale.h
++++ postgresql-10.15/src/include/utils/pg_locale.h	2021-02-09 12:03:19.403549986 -0800
+@@ -17,6 +17,7 @@
+ #endif
+ #ifdef USE_ICU
+ #include <unicode/ucol.h>
++#undef bool
+ #endif
+ 
+ #include "utils/guc.h"
diff --git a/dev-db/postgresql/postgresql-10.15.ebuild b/dev-db/postgresql/postgresql-10.16.ebuild
index 869058b39480..e82b2d2d08b4 100644
--- a/dev-db/postgresql/postgresql-10.15.ebuild
+++ b/dev-db/postgresql/postgresql-10.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -111,7 +111,9 @@ src_prepare() {
 	fi
 
 	# https://bugs.gentoo.org/753257
-	eapply "${FILESDIR}"/postgresql-10.0-icu68.patch
+	# https://bugs.gentoo.org/766225
+	eapply "${FILESDIR}"/postgresql-10.0-icu68.patch \
+		   "${FILESDIR}"/postgresql-10.0-icu68-2.patch
 
 	eapply_user
 }
diff --git a/dev-db/postgresql/postgresql-11.10.ebuild b/dev-db/postgresql/postgresql-11.11.ebuild
index 41a7002385ed..cf5cd351c515 100644
--- a/dev-db/postgresql/postgresql-11.10.ebuild
+++ b/dev-db/postgresql/postgresql-11.11.ebuild
@@ -111,9 +111,6 @@ src_prepare() {
 			die 'PGSQL_PAM_SERVICE rename failed.'
 	fi
 
-	# https://bugs.gentoo.org/753257
-	eapply "${FILESDIR}"/postgresql-10.0-icu68.patch
-
 	eapply_user
 }
 
diff --git a/dev-db/postgresql/postgresql-12.5.ebuild b/dev-db/postgresql/postgresql-12.6.ebuild
index aa723637c011..512e4dfc2d3a 100644
--- a/dev-db/postgresql/postgresql-12.5.ebuild
+++ b/dev-db/postgresql/postgresql-12.6.ebuild
@@ -111,9 +111,6 @@ src_prepare() {
 			die 'PGSQL_PAM_SERVICE rename failed.'
 	fi
 
-	# https://bugs.gentoo.org/753257
-	eapply "${FILESDIR}"/postgresql-10.0-icu68.patch
-
 	eapply_user
 }
 
diff --git a/dev-db/postgresql/postgresql-13.1.ebuild b/dev-db/postgresql/postgresql-13.2.ebuild
index dcc0c9aa3dfc..7661f3aed842 100644
--- a/dev-db/postgresql/postgresql-13.1.ebuild
+++ b/dev-db/postgresql/postgresql-13.2.ebuild
@@ -111,9 +111,6 @@ src_prepare() {
 			die 'PGSQL_PAM_SERVICE rename failed.'
 	fi
 
-	# https://bugs.gentoo.org/753257
-	eapply "${FILESDIR}"/postgresql-10.0-icu68.patch
-
 	eapply_user
 }
 
diff --git a/dev-db/postgresql/postgresql-9.5.24.ebuild b/dev-db/postgresql/postgresql-9.5.25.ebuild
index ffff57e4a1a3..21b9e356bb31 100644
--- a/dev-db/postgresql/postgresql-9.5.24.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-db/postgresql/postgresql-9.6.20.ebuild b/dev-db/postgresql/postgresql-9.6.21.ebuild
index 974a58975c23..974a58975c23 100644
--- a/dev-db/postgresql/postgresql-9.6.20.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.21.ebuild