gentoo auto-resync : 13:02:2023 - 14:17:03

4 files changed, 88 insertions, 1 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 38e63adac2f6..ddca762c5f67 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/citus/Manifest b/dev-db/citus/Manifest
index 832d92c34e79..c5388008c04c 100644
--- a/dev-db/citus/Manifest
+++ b/dev-db/citus/Manifest
@@ -1,3 +1,4 @@
+AUX citus-11.2.0-redefine.patch 2590 BLAKE2B b1b9a3324db6aec700fc3f40bea7c222742aaad025588383731e211f70d1000d00536f6f92c779f5a80760ee4a384316e95c9ce4b1ca55870c56c1085bb27b56 SHA512 cb813522019da0724338ed1482fa993b4788dca605c92ac4de6d28c12c4379bd0a8f1b9ac786e7facbb7c2399367517634a8ef2f14215ac12ef8561856ccf307
 DIST citus-10.2.7.tar.gz 5549985 BLAKE2B cb562437757624cc34f80219e8039fdcaf27ebc4a63b30714beafe5555a85769f44a92d74173fb94085f48d09bedaffc019463ec6db67217f8554154a91e2e74 SHA512 32441e964d97d3a69eed309c8d52f65ae31a3a7b79c6e765e967025c7f6a041420925dfb5fb0835cec1ae66549f59fe256994f4120514ec2e781169b771c85e6
 DIST citus-11.0.6.tar.gz 6021221 BLAKE2B 7b19328890b79ce639599cf2f99ee15f6dc7e87a062fbd538b288895a3ec6e4af36eabad0a7111de8b53029670be8d6a66ba692a66101c43120640f4fffc37d4 SHA512 4b5667fcfdc89a171ae8e15095d5e688a1d8b4707d13cd4742f5695f9e57e76190e11c4fe933044a64ac00b0982da91d6a253cd272af6ba58131b787ad4b13ef
 DIST citus-11.0.7.tar.gz 6032102 BLAKE2B af36e0f0f3f7f3a3d438f8455caa0531b00b3312b5ec8d85922acdef36a25583b5c5af6054e151ae989122a19d4d78e66a983af41d7a3ac5f781c494fd5247d9 SHA512 3c10a3bd471f82a83f9b3769ac23c107052470d692cc555c2798acfe2afadfc0bcb843db374fe22a0ee41d4f90d1b0f3d2eda6e6e5d9e6e359dd9a9731c26b6b
@@ -9,5 +10,5 @@ EBUILD citus-11.0.6.ebuild 643 BLAKE2B 112b8708755f1459308b7b421f5d70562ebbce7e6
 EBUILD citus-11.0.7.ebuild 646 BLAKE2B 3557d4be852f27d0e92ce85ed4175fcd975fa0d8dd58c4dffc3109bee5cfa7086444815530cef1dd86d3eedd84a74d24ed51b3904a93c875d7da36e51629b03d SHA512 aeb8d416efb27eed1bf23e2936a314c3d73fd3702ab7f279cbbdcf8b965ae54d1a7fed2c3ac1e3ed5d7c63c0a9ab6f6297a9a52c4c04f5932f8f4f6b210fc02c
 EBUILD citus-11.1.4.ebuild 646 BLAKE2B 0a53954e30a7a8170971367fc333e92e946be56e247fa6b6bd3301d98cdee73f26347124cb4af8e3ad00b8289c9382a4db8896be77daf7699b923602153ef8de SHA512 529fbf5739ef635b46aca44fe3c48200fc08122ce39ccf0240d91d112806e93df7b3fe756d4d3bd975c1b9fce8655414519e0a3638fb37812393e65545218d98
 EBUILD citus-11.1.5.ebuild 646 BLAKE2B 3557d4be852f27d0e92ce85ed4175fcd975fa0d8dd58c4dffc3109bee5cfa7086444815530cef1dd86d3eedd84a74d24ed51b3904a93c875d7da36e51629b03d SHA512 aeb8d416efb27eed1bf23e2936a314c3d73fd3702ab7f279cbbdcf8b965ae54d1a7fed2c3ac1e3ed5d7c63c0a9ab6f6297a9a52c4c04f5932f8f4f6b210fc02c
-EBUILD citus-11.2.0.ebuild 646 BLAKE2B 3557d4be852f27d0e92ce85ed4175fcd975fa0d8dd58c4dffc3109bee5cfa7086444815530cef1dd86d3eedd84a74d24ed51b3904a93c875d7da36e51629b03d SHA512 aeb8d416efb27eed1bf23e2936a314c3d73fd3702ab7f279cbbdcf8b965ae54d1a7fed2c3ac1e3ed5d7c63c0a9ab6f6297a9a52c4c04f5932f8f4f6b210fc02c
+EBUILD citus-11.2.0.ebuild 745 BLAKE2B 6dd3a2c52f60ca01586764bf6dd9b33318b61166f22d149f43615c10bdf04b9fa36d8ffe2b63198a976075e1fa7d853eb2711e10e6f3daa7a2f8630471ceccc5 SHA512 7c79748f92b93851b9f26fc59710fdb8297ee48dda40d2b6a9a872bd2ab9588fa6bc8708ce8cc373c9fa2c55d85b25850ba419324395161c6098825e83fa87fd
 MISC metadata.xml 281 BLAKE2B 85a0d31b886497ac44662bb58420de2f6af5444882f008f902287c6a8265f6e76afa7513b0edeca5b34a26d69d9aa61832c5fb3287c577a7f047180aa3fb242e SHA512 9e9007a37a7acc9948a6eb15bd1bdfea46c95eacc88e96a878237baaf01298b1f849d6e170f04638bbfb68f2c8b8a3bf227e563b5309f859cfcd23d43bc5dd85
diff --git a/dev-db/citus/citus-11.2.0.ebuild b/dev-db/citus/citus-11.2.0.ebuild
index 1b91866bc2b8..514c4a7fa4d6 100644
--- a/dev-db/citus/citus-11.2.0.ebuild
+++ b/dev-db/citus/citus-11.2.0.ebuild
@@ -30,6 +30,13 @@ DEPEND="${POSTGRES_DEP}
 	"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	eapply "${FILESDIR}"/citus-11.2.0-redefine.patch
+
+	postgres-multi_src_prepare
+}
+
+
 src_configure() {
 	postgres-multi_foreach econf
 }
diff --git a/dev-db/citus/files/citus-11.2.0-redefine.patch b/dev-db/citus/files/citus-11.2.0-redefine.patch
new file mode 100644
index 000000000000..d45fba3d65a1
--- /dev/null
+++ b/dev-db/citus/files/citus-11.2.0-redefine.patch
@@ -0,0 +1,79 @@
+From 341fdb32fc07a3aea2dda2fa33a70d22819be37b Mon Sep 17 00:00:00 2001
+From: Jelte Fennema <jelte.fennema@microsoft.com>
+Date: Fri, 10 Feb 2023 16:02:03 +0100
+Subject: [PATCH] Support compilation and run tests on latest PG versions
+ (#6711)
+
+Postgres got minor updates this starts using the images with the latest
+version for our tests.
+
+These new Postgres versions caused a compilation issue in PG14 and PG13
+due to some function being backported that we had already backported
+ourselves. Due this backport being a static inline function it doesn't
+matter who provides this and there will be no linkage errors when either
+running old Citus packages on new PG versions or the other way around.
+
+(cherry picked from commit 3200187757600180fa2b90a5fdba13cbf8aee8b6)
+---
+ .circleci/config.yml            | 10 +++++-----
+ src/include/pg_version_compat.h | 11 +++++++++++
+ 2 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/.circleci/config.yml b/.circleci/config.yml
+index 4905dfbc52c..3a5c30132f6 100644
+--- a/.circleci/config.yml
++++ b/.circleci/config.yml
+@@ -6,19 +6,19 @@ orbs:
+ parameters:
+   image_suffix:
+     type: string
+-    default: '-v7e4468f'
++    default: '-vc4b1573'
+   pg13_version:
+     type: string
+-    default: '13.9'
++    default: '13.10'
+   pg14_version:
+     type: string
+-    default: '14.6'
++    default: '14.7'
+   pg15_version:
+     type: string
+-    default: '15.1'
++    default: '15.2'
+   upgrade_pg_versions:
+     type: string
+-    default: '13.9-14.6-15.1'
++    default: '13.10-14.7-15.2'
+   style_checker_tools_version:
+     type: string
+     default: '0.8.18'
+diff --git a/src/include/pg_version_compat.h b/src/include/pg_version_compat.h
+index fcb857c4111..eb81bca43ac 100644
+--- a/src/include/pg_version_compat.h
++++ b/src/include/pg_version_compat.h
+@@ -55,6 +55,14 @@ pg_strtoint64(char *s)
+ }
+ 
+ 
++/*
++ * RelationGetSmgr got backported in 13.10 and 14.7 so redefining it for any
++ * version higher causes compilation errors due to redefining of the function.
++ * We want to use it in all versions. So we backport it ourselves in earlier
++ * versions, and rely on the Postgres provided version in the later versions.
++ */
++#if PG_VERSION_NUM >= PG_VERSION_13 && PG_VERSION_NUM < 130010 \
++	|| PG_VERSION_NUM >= PG_VERSION_14 && PG_VERSION_NUM < 140007
+ static inline SMgrRelation
+ RelationGetSmgr(Relation rel)
+ {
+@@ -66,6 +74,9 @@ RelationGetSmgr(Relation rel)
+ }
+ 
+ 
++#endif
++
++
+ #define CREATE_SEQUENCE_COMMAND \
+ 	"CREATE SEQUENCE IF NOT EXISTS %s AS %s INCREMENT BY " INT64_FORMAT \
+ 	" MINVALUE " INT64_FORMAT " MAXVALUE " INT64_FORMAT \