dev-db/scylla: add 3.1 patch

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Manifest-Sign-Key: 34FCB257983BA23A8CEC5EB7EB9E6405C24BFAE5
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>

3 files changed, 29 insertions, 23 deletions

diff --git a/dev-db/scylla/Manifest b/dev-db/scylla/Manifest
index d8af45f..2de5646 100644
--- a/dev-db/scylla/Manifest
+++ b/dev-db/scylla/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 0001-thrift-support-version-0.11-after-THRIFT-2221.patch 40277 BLAKE2B 4296b042320db3f3669f487961e58f75403d79fbdce06a4f04b3c9e83b243b637a513cf868c618fac26df82d20bfb7de44b51c959e09d299f6a1f72e54387761 SHA512 5403833a82972be26e5d50f0557cb7a4a2985dec487be3aeb907720b5a8f638d1e3c6bfd3d06bb0c097c707135f29b137f63e77d76ba918f009d179a27dc0c91
 AUX 10-scylla.conf 64 BLAKE2B 31ce1b2173214bcac351b71cf19e5506ab08cefbca446ce23ad753c98c5e4fd7fbb89b0f79703ea4dcf1f6233e7929268365eeaab1b4e2e7b31553aa7928a969 SHA512 c24b3ec2f0ea3b1ad0792c05a8eb044b3a157862b59759e020586ae872f9789a558d423fe1dff1a8c6d8342049cf4d919faf31a1439a6a1c69af915365b4ec82
+AUX 3.1-revert-64-bit-gc_clock.patch 1132 BLAKE2B 7ed59d5f898babc4940bcd10a8aaf467545c80fd8c7417e481d80abc07fc27b4859396cafa5b1d1da4d386f8c490e6f417c0ce63064eea7177ce869869387480 SHA512 8ff0019080687993939fb5c0bb24945214799dfe0942982d8154769155159c02bc75e448978343c1b08a162a6670bede3721247a70c6fabfe1cd9730dbf4f77a
 AUX 3.1-thrift-support.patch 39980 BLAKE2B 7de8bde052186b8a62ea83b7082e9828d4c320ed86381a93d5136906ba014631dc3b5e2a2b1dfd33bec21c6bd7d685fa3f1f270c97f233934cca24473d0e52b5 SHA512 d33e50dbef01dfd4845a093c160b5cbedc658770c1b5a5de063c56b43df0731329fe0cdb3ddfa5d72020ab25573682e4d14a3c39ad366a208694062a3fd49155
 AUX boost-1.65.0-icl-ttp-matching.patch 1427 BLAKE2B de9c77253963656f85ed2d05babd600bc5b59b567bc889ed815dfba97f2a1334df48dbb1e67879dea1419fb439c513c54a66531d4e8ec28a7848385f70471334 SHA512 aaa7959df631c17a80486e5b6724d76bf2193694f5559443350c74567506f36c133f740adcbb1b2d3a5a2760730f498f0fd655ec6eff6d20393b6e49549c6ec8
 AUX fix-fmt-3.5.0-compilation.patch 3785 BLAKE2B 3cd23ccffe1ec33d5f7e2c6c3583631b294fc0e6d36e49eef582598fd168968805dd7ca4cc786c02cb20ae1e758a814e1b761dbd41a86330906cd4b5af5d6666 SHA512 d7606559fb2aef9ea009e8c417397dcc94d0c708da8283d4c1c6393c059ecca50d9806cfb19d1fe69b8d7898da2b8d194fbc8b8dd1aa9c12e0d6120d52bc2518
@@ -25,25 +23,6 @@ EBUILD scylla-3.0.10.ebuild 9218 BLAKE2B b993e32bb1eefb017cfad93061be4b1bf752c23
 EBUILD scylla-3.0.6.ebuild 9030 BLAKE2B a8ac0f6fef3c5b096a8df627c2bd3cb25374214883e655618a2308e6a0652970c2c60d2b48fae42fffd3374189c96441d8cc0c4c7ee5359d500ffe2352058c28 SHA512 87b9fe1aabaedac861fd6868e65501f6e08b75450fa801ba760d0125666445b97cab10683dd07eab7b988d2520d471458ecb5cb867d8822f7ac6d1fe50cb8986
 EBUILD scylla-3.0.8.ebuild 9111 BLAKE2B 565f5d1b42257afbfdf12ec729b7950b77b0f8d7bffb07960c4412e74223966ec368057236ee8fa75c8aee1bdc6f6fa6d06acb4d57a34ffedc2c8670a4178149 SHA512 477be22fcf71b9ec149aeb5b61b5419b3dd0cdb5b28e1d6c094f1acdd6b3aaa1c34b9b0d85bbd13feb9fd2d1b64ba8d90a7dda00b8cb1804f61eec1bdc73fd33
 EBUILD scylla-3.0.9.ebuild 9218 BLAKE2B 0b2966a89c72872bebfd3dbe3bc6fea72257a40e269e812037f574491e5fa28f87b1838978251893e83cf207f6d19db63c4800783071a80d137f24cef6f72cde SHA512 1dbe1b9b4cc719c0241fd9f33f96dffbb2b3430963fc4b57e300059547d274dd3e6592db31bacc60cca783fbe862586c93efd58c8b3b6bbbb303864066d5be12
-EBUILD scylla-3.1.0.ebuild 6966 BLAKE2B 3b0b55e2a18f243876814cf8100d00ea96cdac538e98d033fc0762c77dae7144448286aa8c4a1eac5647695a2fc11e35c68d18b7cff843db8a31657a9c420a9c SHA512 7ea6f811d1249373c109557056c399466b20027a9360e2d94bc6bd671814da3b89fc0766b7526c739e2959e2014f5b458d609f5c08d95945a5b826ec82515b8e
+EBUILD scylla-3.1.0.ebuild 7014 BLAKE2B 817456ee18a809ca710627130d5925ff955e22ae1ebcd6c3301c7873c65596b7e21969afd235ab16fbeeff958e0597ab29d78be4ec6ba1bf3b9d7696426dce48 SHA512 7bd0f4e42cca1dd5d66c24af642b93fce48401ad1585c5956496dffa2b2d8e700acd8e67d603395b7bdf9604a3c72929860bdeb49d66bd75036efb3527aeb9ef
 EBUILD scylla-9999.ebuild 6833 BLAKE2B c21b0db85ca5b2dbe90a7523b739fa6614d40fd0264d8cd5bf77f1c1b37b31f1f042c946b76d5c1e74907badf931c188f7f5112105089658ff6acfc80f440021 SHA512 e5237eddd44fa0f4f88a6aa4bd2d6015dc6c61597636e03957ea932cce240de05533e223aae0abb68d37d16c7734e64267f2b77aedb3913c24b6b73210629972
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQKTBAEBCAB9FiEEGiPLJcoPPNcvDvnY9mwK1B9ohkIFAl2phzFfFIAAAAAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDFB
-MjNDQjI1Q0EwRjNDRDcyRjBFRjlEOEY2NkMwQUQ0MUY2ODg2NDIACgkQ9mwK1B9o
-hkJHAg//azymcuMAwqwMz+dS/tXWslAxq+1PhIcamBdiA2KpLY+jy8XUfduZrbjs
-+gJVsOvXm7pwr0W4J1PNFQnJGjC5ioaR+wXPUuCveJhLW+VYIaphakDVWlUqmX3b
-XxrxgWN7A4LdADBKRzipZ022ydxjmlPWGI8NZfjmIOaSnXuoX4wD7RwaxqPwpV+T
-C8G0EjO6DfkShOlEml1rNKzXUJJ+D6yJrCPb0Hv1az/eYpRHsvY6+yD7Nt8DM92c
-jUO733IYkO7NGmUvtRK9Ds3gJGmKY7/ouNnzIs36PBnLuWSk8Ex3yYHvO97oTxpf
-M8p1hrz7J3NSfhZ4PtZMJbjix/zog4KR2bImMFZdSRsoSsyVghlYXsMMq9Zev5E3
-A9PW3g2mj7X21DGg17sVT5/p2F6U4dbfbwKnT+C6SB/Mu9UkyPo5vcPwkNDQk2Gj
-4fecRMRP0kdOrmhO42YVNZ0giQPfrKRz/ekKhbgLGqr1zdUulTa2K1uEbQKTkNlD
-RFFMboF+Dg9pm1pN6HYxyg7mokmVbltKkTb4FZuyP6ZDmbMp6OTvetTFjYjUUKMB
-GnuvNwb3wFcPJ39ewFxHJtzun4dC07Lg32zjQDu4LyjwUFpDO6fpiYT4lRQHsIKk
-QNXl2WjZQXsp2HCZr43Mu3KadNjA8+V+dWVDy4XYfVvDnWCKLd0=
-=mQZX
------END PGP SIGNATURE-----
diff --git a/dev-db/scylla/files/3.1-revert-64-bit-gc_clock.patch b/dev-db/scylla/files/3.1-revert-64-bit-gc_clock.patch
new file mode 100644
index 0000000..ca3c105
--- /dev/null
+++ b/dev-db/scylla/files/3.1-revert-64-bit-gc_clock.patch
@@ -0,0 +1,26 @@
+diff --git a/gc_clock.hh b/gc_clock.hh
+index ac3cbeb95..0e2ef5548 100644
+--- a/gc_clock.hh
++++ b/gc_clock.hh
+@@ -32,7 +32,7 @@
+ class gc_clock final {
+ public:
+     using base = seastar::lowres_system_clock;
+-    using rep = int64_t;
++    using rep = int32_t;
+     using period = std::ratio<1, 1>; // seconds
+     using duration = std::chrono::duration<rep, period>;
+     using time_point = std::chrono::time_point<gc_clock, duration>;
+diff --git a/sstables/mc/writer.cc b/sstables/mc/writer.cc
+index d36789899..717766d8e 100644
+--- a/sstables/mc/writer.cc
++++ b/sstables/mc/writer.cc
+@@ -335,7 +335,7 @@ void write_delta_ttl(W& out, gc_clock::duration ttl, const encoding_stats& enc_s
+ template <typename W>
+ GCC6_CONCEPT(requires Writer<W>())
+ void write_delta_local_deletion_time(W& out, int64_t local_deletion_time, const encoding_stats& enc_stats) {
+-    write_unsigned_delta_vint(out, local_deletion_time, enc_stats.min_local_deletion_time.time_since_epoch().count());
++    write_unsigned_delta_vint(out, local_deletion_time, (int64_t)enc_stats.min_local_deletion_time.time_since_epoch().count());
+ }
+ 
+ template <typename W>
diff --git a/dev-db/scylla/scylla-3.1.0.ebuild b/dev-db/scylla/scylla-3.1.0.ebuild
index f5c0ec5..c0315b4 100644
--- a/dev-db/scylla/scylla-3.1.0.ebuild
+++ b/dev-db/scylla/scylla-3.1.0.ebuild
@@ -88,6 +88,7 @@ DOCS=( LICENSE.AGPL NOTICE.txt ORIGIN README.md README-DPDK.md )
 PATCHES=(
 	"${FILESDIR}/fix-fmt-3.5.0-compilation.patch"
 	"${FILESDIR}/3.1-thrift-support.patch"
+	"${FILESDIR}/3.1-revert-64-bit-gc_clock.patch"
 )
 
 pkg_setup() {