gentoo resync : 25.11.2020

9 files changed, 48 insertions, 14 deletions

diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index d3d9a44c0742..e4a97c2fab5e 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,3 +1,4 @@
+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
 AUX postgresql-12.1-no-server.patch 2965 BLAKE2B 168f39c02f0614c57a60c0ce3bb540e0d29dc407c569661d0cd29ddb57657bfada44aa90ca915c8474ca5541ac1f4cc152fbd70c105efcbe83f9e5b9f918eeb5 SHA512 5e025da1cb5f696821b19093ab893667426a08b1bbc8e3f748d34207730026625b61a8cfd2596af124080a4a292363546dce5b703ce6164efceceabc6b170aa2
@@ -10,17 +11,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.14.tar.bz2 19042154 BLAKE2B addddf00179190780bd30ed97cf6881670d18fda77062cdb5dc7cc161c64c3d5522db288902d0612db30fc6fcc1b619c7a102887ed438e27739e936bf5659425 SHA512 eecd2aa8df7e4779606ec547b7bf0207ebb2be10a4b332f06c3b72116f0619fe27fb651f2fd4504c73b740ab7f92468919244a615d460bb9c35085174a0dbc78
-DIST postgresql-11.9.tar.bz2 19959019 BLAKE2B 655d1c9e6eebde19402a4c220ee674c589641c5b6f4e6298c8c06d3330069178952455f5af58f90b9af196ba9c8fd03db0ccd70b8bc49335e465f0ed537eaf59 SHA512 2c5c2f51aa01f02af4aa0849441767383e30fef69dd52efa442892f39d2456bfa8bf01f633a265e00eca0745e792609d2c1d33f77d8f29a02f5f374c84f2bf6e
-DIST postgresql-12.4.tar.bz2 20669776 BLAKE2B fb3f865a8a5e5280e7cc5da43f8658029170cd15dae8cc5fb1e741a122ea1f13418ac7743ec417ab4436976bc0ce12753fc8a301200143c975e8739d59816fa7 SHA512 36daf10878ca153370829178786dd6ee366ab4d4d6dc9c527536740fdb14b688ae4c33f850eb4243a7667d23f87e4bfd1ddee0755447ad4f3996e423e391c2f3
-DIST postgresql-13.0.tar.bz2 20999465 BLAKE2B c2c6475ad3c1c79afac1bc181ae3f9b74c097f9679bf562a0f1b4e16f426c9b0235aec476582ef548d14987a9232b938f2920446a8d5a8aa08ae5752f40481f2 SHA512 1fde89487c3e50a7a07e1d42fba60d415645ea89c5d4c5c7fcc93fbd5330feca7ec991d5b274f6ab757d5d04667ca1a7efdf4eaaa760add19d2e02437465f8f5
-DIST postgresql-9.5.23.tar.bz2 17682366 BLAKE2B 74713d6483ae1ad3d2dfc4b1ac9d30a6785ff34f61b735924f2d469861516ad5160cbfda9c09b96adf264237b6f3ad8fd6ddeef60b6af6b5b63d6c1a36fb9354 SHA512 b7a1e936a0043b57b3ece79610855820d2ea6a86e4a4be0c4c8358bf3e1ef8fa88bc60106d6b865d86231d16b5e3c098b4dbd93125a125b3cc5d468ffea64db1
-DIST postgresql-9.6.19.tar.bz2 18880036 BLAKE2B ad9c5684e2c0fb276589560f7dbe01241b5caf763f5a20991244ad7b473397576c9530658eb91e085e8416156b0ac81750f08ed85d5e5a689321891d10b6e114 SHA512 4d8d4a0e4645d71683a5fccb9cd88917e1870ba139f102e0ea82da9c8d1ad669f029e0feb6d409e2016dfd247229ec7daf04f7f2de3ab6c5b4053834ac244a26
-EBUILD postgresql-10.14.ebuild 13539 BLAKE2B 79ca887021d2bbc53b2e6a2ac201cdd8dde5b43a042608f609cbdfe3bf41b4b8410357fa1de6ea10cff6666ac8a2e6f9afb9838e096f92eca127c6a924b1a816 SHA512 c6c95f2e4a0c538eaab7969c3abae90056ee74eab6da639819d4e0b3b43c517df46e32bfe2afbeacf9ff99a74e682eaa3cbdd45ac3c2d00a9249e4e4569b3ed2
-EBUILD postgresql-11.9.ebuild 13670 BLAKE2B cbfeb229e65b864add0f5282ea9e5b38ad48dd837b4df4d18a7fab4ddd1eb7e5a67423207237043a9865e5433161a0e9386f587d617be78e064faea0ec6f2ae2 SHA512 d657eb9925c54a4e0dc5ff9b1f5397eff267ab45b5b526f5776006c1afdc7a7d323f612c5198b46cdf28092fdcb0b27e1cfdd23491b5d3a01a9772081aff85ed
-EBUILD postgresql-12.4.ebuild 13642 BLAKE2B 62b40b236c8e2ae78224868ff4d42dbf195fb6f0f2864b528dbdadf91529bbd71b03dac89899f336b9858e1e574c057729afbc0a5e122534c08d6d2ddda6c2b9 SHA512 83964ccf386a54ecd86bae1e3ec75650a45eccd3f1b0db7dc5bfcf6cab20a3dc216a053a25c312cff6df23586211f3482ce665a10a1c6509db1563d5b448343f
-EBUILD postgresql-13.0.ebuild 13654 BLAKE2B cb1a2882dcc848dd1706006f35d0362715f6be1079eb9482cfd656d028aad9d19a80b17deb8bad410a5ac830222cb23a6e5d59781f19c19496e2976525e6b7a5 SHA512 e14cd8831c4d1e7f9c605001dc5b6858d09c9e865a0cfc1237d48ea162ddd07615d91151fadf70382ddb03167c63759e0738725b921e2fab27dc68c4d4ba6647
-EBUILD postgresql-9.5.23.ebuild 14360 BLAKE2B 5737e94065f6efecdf7d43298c071fedd1281d484ebbf7a77731d3de68e5920e69a36581d6b43634c5d8805724688668cce9d4550e8235e22d85025fb99c245b SHA512 be18fb31727ae3f0796f3a0fd9ff0c272be7fbcd0f7a287b94caa18c781f6aa0be1e36b3a4b926fca8c789405d5ac84af8c55c14198c4aac735f8203c0eb633a
-EBUILD postgresql-9.6.19.ebuild 14593 BLAKE2B 41614372b80c5691822bd59a02f66b93139eebc3f49421237660643b8690baec26c0466b38bca1a502108d220659a01a10ebc45d729412c3dd83bb3ebe3fe8c5 SHA512 a2ffcfcbed1637c78ebae251a272d49b6730a37137aaeb7ea9a9958b0644e958033243a2d8a35a0a9bc5eda5b86a7761fabe8068a44f0f8498c48c68acc15e18
-EBUILD postgresql-9999.ebuild 13812 BLAKE2B f0eb8f0d79c3d4d9f0bdd0fe49f9b8354ce0bbd237b286e1509b9d9573cb6c023a855c10c97d836909495a0e23fc785716820e6e54e86b0f31765e0aef53a645 SHA512 3e56a9b619e4a94658035121d71a5e86c115f7dd3a13318ff0b6c341b59ad0cb836376b7f0074a3e28e7b17f93c3e2b9317a6662de19f77d6f6c4e6b4bc1066b
+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 13624 BLAKE2B f45bccb381be1c4ff728b8c04778eaa936c9b90275afb48e885065c175d01bce54c157007427e996851070dfa0bbc3926af0a5eb91d7bee90ed0beb44081b9fc SHA512 043bf014648cdd7f5145a9eb18616ed1d120fc209dc19b18156cf5fef106887df0cc5cc12739ab4ba43664088cc2b6866a4720aadc1b02f90be9840600db7cc1
+EBUILD postgresql-11.10.ebuild 13755 BLAKE2B 397f66c62b76b11667dd47c5968c409347388e63fcbc05244f6be25b15ea9ec6a993281b487f37776f2a297d0d8381197d99ede25927fac9cb10f435c42d4db2 SHA512 550f4938ee6909cab7213f9b76ba3359db1606104af4966d0d5d23ab8c2d5d3b877ffb116a7f26bcdd7a25a4dda8fe66220b9e88d41f6b58ba95412d09faf9a5
+EBUILD postgresql-12.5.ebuild 13727 BLAKE2B cd7bc2d88bb24546eca15495eb368c1baae25c4a1d8cf35d4276a6d599966a1f90d495e26074b32d06d63248b26aec2b9ea4f197a945ba390635da983acbf50c SHA512 c4e9b06d3f3f51509bc7f0ccec744d1af8d61c1c969a02d81e7725b0ad9daf0ad3f40ec670a01800dda5c7ae06442c62ad2ff15153695444c176767b935488ae
+EBUILD postgresql-13.1.ebuild 13981 BLAKE2B c99c02c02de0fc3a2cca7a7adbebc142de7467cbaa4056e48365c92eeb435259fe923b06aa209405088fe26d9378e570428bfb50397e13feada03ee3eae0628c SHA512 feeae61aa22cd50615e43a68d3704c5b07fe1fc63815539dc0c74d3ee775e775ea391ab29f4849a23fe86d7bd4173c36e7411dc868e63f12813932d06cb4ec33
+EBUILD postgresql-9.5.24.ebuild 14360 BLAKE2B 5737e94065f6efecdf7d43298c071fedd1281d484ebbf7a77731d3de68e5920e69a36581d6b43634c5d8805724688668cce9d4550e8235e22d85025fb99c245b SHA512 be18fb31727ae3f0796f3a0fd9ff0c272be7fbcd0f7a287b94caa18c781f6aa0be1e36b3a4b926fca8c789405d5ac84af8c55c14198c4aac735f8203c0eb633a
+EBUILD postgresql-9.6.20.ebuild 14593 BLAKE2B 41614372b80c5691822bd59a02f66b93139eebc3f49421237660643b8690baec26c0466b38bca1a502108d220659a01a10ebc45d729412c3dd83bb3ebe3fe8c5 SHA512 a2ffcfcbed1637c78ebae251a272d49b6730a37137aaeb7ea9a9958b0644e958033243a2d8a35a0a9bc5eda5b86a7761fabe8068a44f0f8498c48c68acc15e18
+EBUILD postgresql-9999.ebuild 14055 BLAKE2B 5b0143afed6634552561adff30f858e8ce2af41c3aec395856a13701465fcc0a8c1ceb66526ddc1795bb10976bb31726702fa45acfb65db2ec9199b476271873 SHA512 395dd97cc70928dc46943da16311d61e70a894a53ce436dd068b9df1a54d791c80033dff47c86f5c21183507d65cbc01306d6f06e69ff03ec5bb218d3142536e
 MISC metadata.xml 715 BLAKE2B 71b868113676bdbb1996ecc8e3727b0cc16a559c5906e6459a41c330bcb5a5f4b3f4b5c4473a81905713c2f0735f185cd14612c69108b6bb602a7d8a92d6f3ce SHA512 4148c9c11ffaea5d30cd18befb06af914147d41eec4a8f905127f0abc5317ca370a745e0fd51b03c4583efde927fe9c1b3333853e80c2aa3e7677de65cd5d1ba
diff --git a/dev-db/postgresql/files/postgresql-10.0-icu68.patch b/dev-db/postgresql/files/postgresql-10.0-icu68.patch
new file mode 100644
index 000000000000..789e47f746ae
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-10.0-icu68.patch
@@ -0,0 +1,12 @@
+diff -rupN a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c
+--- a/src/backend/commands/collationcmds.c	2020-11-07 08:03:24.122756440 +0300
++++ b/src/backend/commands/collationcmds.c	2020-11-07 08:04:18.168901199 +0300
+@@ -464,7 +464,7 @@ get_icu_language_tag(const char *localen
+ 	UErrorCode	status;
+ 
+ 	status = U_ZERO_ERROR;
+-	uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status);
++	uloc_toLanguageTag(localename, buf, sizeof(buf), true, &status);
+ 	if (U_FAILURE(status))
+ 		ereport(ERROR,
+ 				(errmsg("could not convert locale name \"%s\" to language tag: %s",
diff --git a/dev-db/postgresql/postgresql-10.14.ebuild b/dev-db/postgresql/postgresql-10.15.ebuild
index a0d0ae70a56a..ccd03770937c 100644
--- a/dev-db/postgresql/postgresql-10.14.ebuild
+++ b/dev-db/postgresql/postgresql-10.15.ebuild
@@ -110,6 +110,9 @@ 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-11.9.ebuild b/dev-db/postgresql/postgresql-11.10.ebuild
index f49a3c2de54f..2c2d6218bcb0 100644
--- a/dev-db/postgresql/postgresql-11.9.ebuild
+++ b/dev-db/postgresql/postgresql-11.10.ebuild
@@ -111,6 +111,9 @@ 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.4.ebuild b/dev-db/postgresql/postgresql-12.5.ebuild
index 88a1f960cb28..d1b15a8f3102 100644
--- a/dev-db/postgresql/postgresql-12.4.ebuild
+++ b/dev-db/postgresql/postgresql-12.5.ebuild
@@ -111,6 +111,9 @@ 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.0.ebuild b/dev-db/postgresql/postgresql-13.1.ebuild
index 36cc823987e9..d40e0d61ff5c 100644
--- a/dev-db/postgresql/postgresql-13.0.ebuild
+++ b/dev-db/postgresql/postgresql-13.1.ebuild
@@ -111,6 +111,9 @@ src_prepare() {
 			die 'PGSQL_PAM_SERVICE rename failed.'
 	fi
 
+	# https://bugs.gentoo.org/753257
+	eapply "${FILESDIR}"/postgresql-10.0-icu68.patch
+
 	eapply_user
 }
 
@@ -443,8 +446,12 @@ pkg_config() {
 
 src_test() {
 	if use server && [[ ${UID} -ne 0 ]] ; then
+		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
+		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
+		local old_ctype=${LC_CTYPE}
+		export LC_CTYPE=${LC_COLLATE}
 		emake check
-
+		export LC_CTYPE=${old_ctype}
 		einfo "If you think other tests besides the regression tests are necessary, please"
 		einfo "submit a bug including a patch for this ebuild to enable them."
 	else
diff --git a/dev-db/postgresql/postgresql-9.5.23.ebuild b/dev-db/postgresql/postgresql-9.5.24.ebuild
index acc5e9779fd6..acc5e9779fd6 100644
--- a/dev-db/postgresql/postgresql-9.5.23.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.24.ebuild
diff --git a/dev-db/postgresql/postgresql-9.6.19.ebuild b/dev-db/postgresql/postgresql-9.6.20.ebuild
index b36d51b81cea..b36d51b81cea 100644
--- a/dev-db/postgresql/postgresql-9.6.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.20.ebuild
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index 1ca6f1f03d09..9b9884bf901e 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -455,7 +455,12 @@ pkg_config() {
 
 src_test() {
 	if [[ ${UID} -ne 0 ]] ; then
+		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
+		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
+		local old_ctype=${LC_CTYPE}
+		export LC_CTYPE=${LC_COLLATE}
 		emake check
+		export LC_CTYPE=${old_ctype}
 
 		einfo "If you think other tests besides the regression tests are necessary, please"
 		einfo "submit a bug including a patch for this ebuild to enable them."