dev-db/scylla: 3.0_rc2 version bump

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Manifest-Sign-Key: F30FAFEE3BD598228B24CB121A3A8C89C56D610B
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>

3 files changed, 32 insertions, 24 deletions

diff --git a/dev-db/scylla/Manifest b/dev-db/scylla/Manifest
index ef8f476..74c162a 100644
--- a/dev-db/scylla/Manifest
+++ b/dev-db/scylla/Manifest
@@ -9,32 +9,32 @@ AUX scylla.sudoers 162 BLAKE2B 9aa0dce391da1f420a070d73d061452eeba60ad268f13a5bb
 DIST c-ares-fd6124c74da0801f23f9d324559d8b66fb83f533.tar.gz 1644001 BLAKE2B ee3f919dbb7de3f489a9027cf89b8db1dd36d9d5068e80f6e3851366c7a6fa532c67cf8ebf0d15e01b26a8ec5bb4e49e7844ec46b605f997fac1e961dcc436f1 SHA512 52b929e4d2615338d8ee4ce7c32f006f18e54ef2db9fbe2534c4e99cd3684d86661a6674d2659acb714592f439fac9c4f0ae6337d9d68c1ec3463d4d16572310
 DIST fmt-f61e71ccb9ab253f6d76096b2d958caf38fcccaa.tar.gz 616708 BLAKE2B e71c4ff6d494490366e490307b83fb0619b29228e06650d3abb0a97797009cd6205c23af777a348622eb4c4a08203a0e41c5475ab95c437d0f0c382967e2491f SHA512 d234a58af428e238e559ceec1599ff449fbfbe4ecc212ed00c82ef3f057a3351a9eb59906d3b6f7efeec76188645a49376507d7a78dd68d61806cd63d0fbb3a0
 DIST scylla-2.3.1.tar.gz 6249801 BLAKE2B 4d2ee126c2d73e0a4e9237f11141036262d4b7df7b9a359c9323f8f28f415862529977608861c48eb708bd132a360bdd5e459398d31dc6c289e9e84769fb8c2c SHA512 edb558981798caa6d8956ab0c8903b4a0dbd8bf7a2a73f075f0cbc20e69d860113faec6bd988b58d67abb86f9361f9fe6ca76e15b9b0a04fdb02afe05a1562dd
-DIST scylla-3.0.rc1.tar.gz 7745895 BLAKE2B b2f261b50fb639028a31cc1217a2b107481055966142b1d0d715723036ac9b6fd89ed34280abbb8acee8d1bf2f5567b10cc81635f7fdca2dffaac266860d1675 SHA512 226dae1cfbb4061b62c54146006ca38ae17ced92e688952b9fd1736b9d90efcea2010286916ce7c985ff1cc24e4325cd1e0c134bbfd84613134cd4527cd78634
+DIST scylla-3.0.rc2.tar.gz 7770366 BLAKE2B 9106baf6410d33660f5d10c882c80b4ab487524dcc04324ce9cf699b32cf41f643a70af99e1e9ff4f70485033978dbbe8eb474a66a70dc764e77878fb796c214 SHA512 43e4282c290229d1bca593695524c0b8a238a9143e68a764a8679c785eae58c2ede7b0ee1f557be1260fdaee52951c48370f174770c95bfca5b2f729c9bcae3f
 DIST scylla-ami-a425887809d281beb39297903198ee1a77a1065e.tar.gz 11221 BLAKE2B 2831a9b0a62e9a740b09f0bee32fd10165b8a419327c92c8299fe385ca8c378795fe109b4da73b50f64df0c1319550e0b45245ff1f74c5bf935add5c209adec4 SHA512 a0438a861ee98248bc0e7a51e85dcbac3f62d9c02111e9401ecbcb32c789f38b58d44200ed8501b6ec68db4ac4ecd166bcc46ff7cdf4cc940012b78033678745
 DIST scylla-swagger-ui-1b212bbe713905aac22af1edb836f5cf8cc39cc2.tar.gz 1372033 BLAKE2B 5f358f44051a2fa9a10d83fce9cab9e57b56505c4270f089a4d12aaa4e9c45a205665b342a0abb5cf314a9fd24b4186f3a176c58328cc627edc73cc854a30079 SHA512 c726a4dac73d3e9d16624727f4f0703688b7205783c627dd7b88b688b165c9055a1884cf7e9987d8c235d3fa470578852a951e34819431aec12059988394da99
-DIST seastar-39b89de2597834e2ba34270a3d958c88b6d9d996.tar.gz 847610 BLAKE2B 1f97d802455d5055efb264e3bf93be9eda4a87b3f26d843a1b31c7f55c9a2c5aa1580b4823aff446000d494839d217cd9fa6cf5a4e3a58149882b4cf6b738586 SHA512 be0c4ed09a33d8562dfb88c162bbdc7c5a9beeabecbab658336cc5112543367f49d9d245da0cafb92f6a327cd5811bccb141fa2ea01af5a4b9ccb14745d04a74
+DIST seastar-1651a2ac894e9692fe67d0c8f900214f465bdf8f.tar.gz 847725 BLAKE2B a7239806445f00c8c04227165a0c67498dc0f96e5a3e16dc7c52090fdf67a446cc35d1c354402102e437366a032a6bb80bfa4d1ade4beb321bb884513fba67f4 SHA512 b0cf774678f167c70bcc4f638b5d33f00d6f7c24fba7fa5b2ba39688b829c57295dd0be2241db60d9442205c86df361a6d18eac0c5bc1074c62e1a321c7c26fe
 DIST seastar-b846dfe25298ef08684604aaa77ff77873ebef39.tar.gz 840995 BLAKE2B a289fbe5462b622b60572a375f0f5da49aeb7f69be279c5b6bc98362cb9eb87e32c69b8978000368e53af949bdc33c1b87fdcc7b568f3801460f2b0413b6116e SHA512 c00ec8662bb8e806b9fc4bc0e4c7aa628f97227312eb5bd64a1697814e1bb6f1791b70649e87e44fd2df24aa81b2c13ccd71df68b60e365c29fe425f85a46491
 DIST xxhash-744892b802dcf61a78a3f2f1311d542577c16d66.tar.gz 29205 BLAKE2B 594f09421030809ed456ba7af906adfbf1243f7ded4161e7777ec2ef2b9ab24c653923f784a2e00b22731be0378aea76263e39614941432cb0128d972e9ff488 SHA512 f94b1b19d1c232c2e59058514be34ee169f2f11722a088ab401a38dcd75ae693bb0fbe87180060207ebff29f7b3c2a4444db54e4f57c61cac0438c4db1f118f3
 EBUILD scylla-2.3.1.ebuild 8840 BLAKE2B e209110f9ffb72b5a8320e9040be66ad19f55b73b0732aeff1c4782d7879121dc4d3d36e1d78e3c36233eceb33a13df24d61503bfda26bc4a0f5a3b1bcc9d323 SHA512 fcd3a72a067c0795359aef7dbe067bff0d85d9688c7326f28bb95487b536c2557f22a5b7a80cb0ca4464ecf6ab85ceda72bd8c1e3d81edb9f7b8c28369923605
-EBUILD scylla-3.0_rc1.ebuild 8562 BLAKE2B 462de0dd4d045dd209caae8d799dd3c548cb6f4acf48367eb94a8880c7e03c2a807c480a8945f3acaf83501fc61b7e025848b0b8f168e8e93b0c0608da3b1427 SHA512 9cfdec6aaa0aa8af537550a40955a8d9b04797b493d06b9b37742348832438a69e4088e8adeeb201ca9b6c9b06da0152311aeebf8f5232047fe9df91aab8e980
-EBUILD scylla-9999.ebuild 8612 BLAKE2B 049a7f2635b46c7e6eb74a286d0de8d16bb5c80d2cf4585c5bf5e6152d485c3b8bff9a4a5580b7ef9065e8db29388dcf1ed1c73eb77b07350a5f39df83dbded6 SHA512 01fae825e491c0aa0ac767c1d3aa279518be079b936a2ca059a6a08c6c92adf329188d7c4d453a7887d5655a1142e81e042b6ba6347482cda7d0de1e5ac052da
+EBUILD scylla-3.0_rc2.ebuild 8725 BLAKE2B 583602c4f9b9dfd9a714ceb917313ab24467cddc00a2001e33489d31c49d4042f70d639300847313043d30acfdad5374d48e225a16f0025eb3b9b008dbfa35ad SHA512 babb1a6490e0a21b3e2fb193575f64815e287acd141b4acf5d1e48d3c92cf736c707ed09a2ff4aa9b4d301fe759c1e6916829bee0112f1fe3b8e20336ae4f5e6
+EBUILD scylla-9999.ebuild 8775 BLAKE2B 3a27f68cf363673b8dd5fbbd1a9698a94c15efae6ac5c441dc092f8ba5de6954a9b1dddbade40f8b3fd0b736be095aa783ba4ca25fc3f5b346aeaef6862ed7f9 SHA512 3784373c38108413d3cc39c566c1e1412f8c0ed43133088c025eaa411bfe1f630d92ac573ce7c8ce684e94bcd248b7eff35802b10bdcd0e793baff661e4f6241
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEE8w+v7jvVmCKLJMsSGjqMicVtYQsFAlwG1epfFIAAAAAALgAo
+iQKTBAEBCAB9FiEE8w+v7jvVmCKLJMsSGjqMicVtYQsFAlwdYfVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEYz
 MEZBRkVFM0JENTk4MjI4QjI0Q0IxMjFBM0E4Qzg5QzU2RDYxMEIACgkQGjqMicVt
-YQtkCw//dRhhhlVY//5vrjBy7GDiLtOuzH71rBubyhlfC7bRTs1fY9Cc6V+bXsbg
-FiBg7EKJD2DbZT0HT0BtRuKs7EeC2v8SvC7oJXv9oQhDdBAX/n8SHmSAp7+MsQy3
-OBYh1OKj3yV7Y8LuTTn2WuGO9TPaWOvjzDZ3PrMRzhGCucKvTJlqf0Xx2E3TOXZg
-fiJlVnFpFc7nfsa8RNPO8C6cIOSZUb9H2WfhHMTd008TGwU7+xpMR7H4TXk9XEvU
-f1DqexjztD08Mfvp+f2TDFBdbrYhzkgVgYiPTPNI33ViWxEda6/KXSej8WFSePs/
-nZZ9bcM+uoH90lMgto6tTSwYO9kEWqEQe5mMYD+zYel6SRTrk3yDG1NOPIz26Nph
-eLJsehbo5cXBeBb4N1gWJ1F7E2ETBDBlvedNGOPv/1TNMc0DLtOoxUVHYxh4t27j
-ahTm2WNlidRB1/nYQkrW0p+rSxD1FWGe2RZYQ0TiikUCAmojC+aRsbA4cL4NWN7o
-kwnJvERRzZZZEfYFlCjVvW3tSGBYzdBTB7h4wNRJpwbA09bB0wqhKBS7ALWI8tuD
-OgWRCUcgPDUL3W4xfkFbg/gy8oblM8eQgU6Os/r3nZiNywOeMNg7wSpcxoAfwKaH
-CH0dUZnJsWPovDronRSKDvHAp7OMSk1PGWRTQLdiWOfRj+0kXuA=
-=rhXL
+YQuQtQ//QXXPbwozeg2RY4BL0kvtOUVUAn6UtqtpWG7KkjVfWnn9SsqnGMT6EyMN
+XEzJU2oPZwEkp3+kcS35w31scB794b1qT1ivjfmxDfiTSb4gUe+ew0lPE+C6Ztn3
+fsHadCRaAXUCcVt9XTBI2WYPvkfLyoYy3dTO1Az20zYj1gVWP7izlgoa3pxcRO8v
+gKigGI270jLtrscGuc1zBjqw4NX4iUwfdQP7rdr6TPijxgj5JwKnRCXRD86nSgML
+4d1gp8JlJk0CCLGbXGC5eFAsDRqUVUfEBPpdGTStm/SAPp8oiGFDLZuvMxId0OEX
+lrWpZ6BKlQuZkx9al1/7w3RcoICYfcGp6Pog/bmI+bost/iIYmCoxh36mhngd3/k
+2xKZecTvECM02WfCeU+ouxGgYcHOP5XUhUhFNVuap5KLYFsNrV088ZizFk906zG7
+p0pj0+Oi1j/0kR2Jcg6vjdh8/K0s67n+0RPgFzIrqp08VIfsHtJGoUUOYrlQ/lER
+18P1fmR2GyoA471cVkCJrd7h9/RTl9xopPa/WYtPTCOe5VB7mbKqNJdb/BIJai24
+Wcs7CsCc6j5HdkUWLvVt9KeHqHjSR/RJzjpmLqCaB1ezdAEMSAMbV+eTL7GCMqAR
+TR5Xh1WkxvSHmxIkfJKwGP7kdfA56MEx1n9UNhCD5obnhZEiihc=
+=G+jl
 -----END PGP SIGNATURE-----
diff --git a/dev-db/scylla/scylla-3.0_rc1.ebuild b/dev-db/scylla/scylla-3.0_rc2.ebuild
index a5822f6..a317ecd 100644
--- a/dev-db/scylla/scylla-3.0_rc1.ebuild
+++ b/dev-db/scylla/scylla-3.0_rc2.ebuild
@@ -12,7 +12,7 @@ else
 	MY_P="${PN}-${MY_PV}"
 	C_ARES_COMMIT="fd6124c74da0801f23f9d324559d8b66fb83f533"
 	FMT_COMMIT="f61e71ccb9ab253f6d76096b2d958caf38fcccaa"
-	SEASTAR_COMMIT="39b89de2597834e2ba34270a3d958c88b6d9d996"
+	SEASTAR_COMMIT="1651a2ac894e9692fe67d0c8f900214f465bdf8f"
 	SWAGGER_COMMIT="1b212bbe713905aac22af1edb836f5cf8cc39cc2"
 	XXHASH_COMMIT="744892b802dcf61a78a3f2f1311d542577c16d66"
 	SRC_URI="
@@ -159,6 +159,9 @@ src_prepare() {
 	pushd seastar/c-ares
 	eautoreconf || die
 	popd
+
+	# I don't agree with the old 4GB of RAM per job, it's more about 8GB now
+	sed -e 's/4000000000/8000000000/g' -i scripts/jobs || die
 }
 
 src_configure() {
@@ -183,9 +186,10 @@ src_configure() {
 }
 
 src_compile() {
-	# force number of parallel builds because ninja does a bad job in guessing
-	# and the default build will kill your RAM/Swap in no time
-	ninja -v build/release/scylla build/release/iotune -j2 || die
+	# we use the provided 'scripts/jobs' to figure out how many parallel
+	# compilation jobs we can sustain
+	einfo "Compiling using $(scripts/jobs) jobs"
+	ninja -v build/release/scylla build/release/iotune -j$(scripts/jobs) || die
 }
 
 src_install() {
diff --git a/dev-db/scylla/scylla-9999.ebuild b/dev-db/scylla/scylla-9999.ebuild
index 99e5c5c..58413ee 100644
--- a/dev-db/scylla/scylla-9999.ebuild
+++ b/dev-db/scylla/scylla-9999.ebuild
@@ -164,6 +164,9 @@ src_prepare() {
 	pushd seastar/c-ares
 	eautoreconf || die
 	popd
+
+	# I don't agree with the old 4GB of RAM per job, it's more about 8GB now
+	sed -e 's/4000000000/8000000000/g' -i scripts/jobs || die
 }
 
 src_configure() {
@@ -188,9 +191,10 @@ src_configure() {
 }
 
 src_compile() {
-	# force number of parallel builds because ninja does a bad job in guessing
-	# and the default build will kill your RAM/Swap in no time
-	ninja -v build/release/scylla build/release/iotune -j2 || die
+	# we use the provided 'scripts/jobs' to figure out how many parallel
+	# compilation jobs we can sustain
+	einfo "Compiling using $(scripts/jobs) jobs"
+	ninja -v build/release/scylla build/release/iotune -j$(scripts/jobs) || die
 }
 
 src_install() {