dev-db/scylla: handle new libdeflate bundled lib

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, 25 insertions, 25 deletions

diff --git a/dev-db/scylla/Manifest b/dev-db/scylla/Manifest
index 74c162a..aa880da 100644
--- a/dev-db/scylla/Manifest
+++ b/dev-db/scylla/Manifest
@@ -8,6 +8,7 @@ AUX scylla-server.initd 962 BLAKE2B cbe13c8a03cb4d084e477dd449ff51355e886a31d70a
 AUX scylla.sudoers 162 BLAKE2B 9aa0dce391da1f420a070d73d061452eeba60ad268f13a5bb8c0525d714d27dfa438efa9c6871c916b82ebf56f34c507826315de8b1fadc3d0eb5feae663cbcc SHA512 aabdeb3854eaad4b1cf9037a998cf94b8f55b2011e8f81a1778095b71806d89e217f2025e772c636569f833f7df45108e2e30c2c1e70fdb59acf37e6cdf81485
 DIST c-ares-fd6124c74da0801f23f9d324559d8b66fb83f533.tar.gz 1644001 BLAKE2B ee3f919dbb7de3f489a9027cf89b8db1dd36d9d5068e80f6e3851366c7a6fa532c67cf8ebf0d15e01b26a8ec5bb4e49e7844ec46b605f997fac1e961dcc436f1 SHA512 52b929e4d2615338d8ee4ce7c32f006f18e54ef2db9fbe2534c4e99cd3684d86661a6674d2659acb714592f439fac9c4f0ae6337d9d68c1ec3463d4d16572310
 DIST fmt-f61e71ccb9ab253f6d76096b2d958caf38fcccaa.tar.gz 616708 BLAKE2B e71c4ff6d494490366e490307b83fb0619b29228e06650d3abb0a97797009cd6205c23af777a348622eb4c4a08203a0e41c5475ab95c437d0f0c382967e2491f SHA512 d234a58af428e238e559ceec1599ff449fbfbe4ecc212ed00c82ef3f057a3351a9eb59906d3b6f7efeec76188645a49376507d7a78dd68d61806cd63d0fbb3a0
+DIST libdeflate-e7e54eab42d7fd3c684cfe8278084fc354a2455a.tar.gz 123934 BLAKE2B 430eba5f7f6b751d01964198d93ca3683c0131f41964b871c3c2872932f76f35d88dce4df1ac80b03f5719d618d0965097831fe8f12cb0bf0d8233129aad070b SHA512 7f63b71a2e29e6c5cbdb6d18c75122f2d54cc52e09cbce6694db9f76812c03757d1222c219bbd8a10a7d42ea2086d6641505b3385016345b2cb9b034848de1c7
 DIST scylla-2.3.1.tar.gz 6249801 BLAKE2B 4d2ee126c2d73e0a4e9237f11141036262d4b7df7b9a359c9323f8f28f415862529977608861c48eb708bd132a360bdd5e459398d31dc6c289e9e84769fb8c2c SHA512 edb558981798caa6d8956ab0c8903b4a0dbd8bf7a2a73f075f0cbc20e69d860113faec6bd988b58d67abb86f9361f9fe6ca76e15b9b0a04fdb02afe05a1562dd
 DIST scylla-3.0.rc2.tar.gz 7770366 BLAKE2B 9106baf6410d33660f5d10c882c80b4ab487524dcc04324ce9cf699b32cf41f643a70af99e1e9ff4f70485033978dbbe8eb474a66a70dc764e77878fb796c214 SHA512 43e4282c290229d1bca593695524c0b8a238a9143e68a764a8679c785eae58c2ede7b0ee1f557be1260fdaee52951c48370f174770c95bfca5b2f729c9bcae3f
 DIST scylla-ami-a425887809d281beb39297903198ee1a77a1065e.tar.gz 11221 BLAKE2B 2831a9b0a62e9a740b09f0bee32fd10165b8a419327c92c8299fe385ca8c378795fe109b4da73b50f64df0c1319550e0b45245ff1f74c5bf935add5c209adec4 SHA512 a0438a861ee98248bc0e7a51e85dcbac3f62d9c02111e9401ecbcb32c789f38b58d44200ed8501b6ec68db4ac4ecd166bcc46ff7cdf4cc940012b78033678745
@@ -16,25 +17,25 @@ DIST seastar-1651a2ac894e9692fe67d0c8f900214f465bdf8f.tar.gz 847725 BLAKE2B a723
 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_rc2.ebuild 8725 BLAKE2B 583602c4f9b9dfd9a714ceb917313ab24467cddc00a2001e33489d31c49d4042f70d639300847313043d30acfdad5374d48e225a16f0025eb3b9b008dbfa35ad SHA512 babb1a6490e0a21b3e2fb193575f64815e287acd141b4acf5d1e48d3c92cf736c707ed09a2ff4aa9b4d301fe759c1e6916829bee0112f1fe3b8e20336ae4f5e6
-EBUILD scylla-9999.ebuild 8775 BLAKE2B 3a27f68cf363673b8dd5fbbd1a9698a94c15efae6ac5c441dc092f8ba5de6954a9b1dddbade40f8b3fd0b736be095aa783ba4ca25fc3f5b346aeaef6862ed7f9 SHA512 3784373c38108413d3cc39c566c1e1412f8c0ed43133088c025eaa411bfe1f630d92ac573ce7c8ce684e94bcd248b7eff35802b10bdcd0e793baff661e4f6241
+EBUILD scylla-3.0_rc2.ebuild 9001 BLAKE2B 538bd9d48c677e7211b894cedcca3e3268347e7a9593d2f1ce2fa20b1d45aa86b84f4d88e53291b36848e1b1ce8526ffd9fd8d489e2f1c1c78daa62f9759f6f4 SHA512 3ae85929a6a70e717d8a2415e16b4407bca4c8707852482f8beae6849961e8e3d3cb494e644ea6280cdea14e5eb226b0acd9fef5968b6f9ac231c1f9035054e5
+EBUILD scylla-9999.ebuild 8688 BLAKE2B 0f84bf4ed3834298e6d1cf7c1a1da742ca98fbec1be030df3b274b1e38834ea67a7a6debb4609b1062e71229ff623e6e03133bf676caf290dd8e510b1112c6d6 SHA512 87fecca8063641f38a4b3dc5e04fd33c492766889e68c072f78c9d4d2659f17bca34d939297439992666698fa2f12f137aee2aeae3740f82389d0b9b4cddfd88
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEE8w+v7jvVmCKLJMsSGjqMicVtYQsFAlwdYfVfFIAAAAAALgAo
+iQKTBAEBCAB9FiEE8w+v7jvVmCKLJMsSGjqMicVtYQsFAlwda5tfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEYz
 MEZBRkVFM0JENTk4MjI4QjI0Q0IxMjFBM0E4Qzg5QzU2RDYxMEIACgkQGjqMicVt
-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
+YQuXSA/+NrvMw6o/T/ztl4McSfe9Vhilcxc/iWbETSGg4/sYGPrCvVfkQSj/h2Kh
+sX1GbaYGVhtaWvG3UTSlax+1XUIxUDcQVq2CEgxM9QOpzp8FaaPcDkXBQDDKuSbI
+pKw2A7vfsfHurtL9BmD0/lSnHjvoMmI8cX4ROMK1AD6KQlovw1zcTGyysDKy8+rs
+B0YxnLALH4gdfhQ5L5qe6rYt6PIEvcGlaO36LxVMtErK6qcQnam8Z3OUR9oXlcyw
+rPCsmOkAowp4YKd2aqZCsSx0vrlTmsc6INhhQ11e9aotRHuNr1Ts6wBF8cyHq9Aj
+yPw0LZLYHkNgWX8QD4iOUqFhC+AIJeTf3GTnsNoQuL9f5BphuGzdaju6dTWF4XmU
+eE3e9y8Mgb24enNcbhLb20Cl2HhQcx4kwRnnyxykkXV21Ohitrx8lqCCAjwfeM3J
+jaTvVSLCAdAv2wd8Ut7BwMDMPn5OqCfTD678CmA6JHQQMrcRHgk7JhLDz2arPoxj
+xbFdJPXOdkRi/Q7EUdueMKhqIl6hLd7xJ0zMt9t2sh/6YZrqY3wq39uWixHOcJBu
+4rE+qcasb6Wfj9kedoi5dg9+zHiRe+UYsB4uHutZnPNMvQko24A6WwueGFfg+qax
+Pz3lr2URp9dBEBcC829DaeRLHR/lB93iyvvMCHuoX8pOVY5kA+E=
+=bkUN
 -----END PGP SIGNATURE-----
diff --git a/dev-db/scylla/scylla-3.0_rc2.ebuild b/dev-db/scylla/scylla-3.0_rc2.ebuild
index a317ecd..6b6d0ab 100644
--- a/dev-db/scylla/scylla-3.0_rc2.ebuild
+++ b/dev-db/scylla/scylla-3.0_rc2.ebuild
@@ -12,6 +12,7 @@ else
 	MY_P="${PN}-${MY_PV}"
 	C_ARES_COMMIT="fd6124c74da0801f23f9d324559d8b66fb83f533"
 	FMT_COMMIT="f61e71ccb9ab253f6d76096b2d958caf38fcccaa"
+	LIBDEFLATE_COMMIT="e7e54eab42d7fd3c684cfe8278084fc354a2455a"
 	SEASTAR_COMMIT="1651a2ac894e9692fe67d0c8f900214f465bdf8f"
 	SWAGGER_COMMIT="1b212bbe713905aac22af1edb836f5cf8cc39cc2"
 	XXHASH_COMMIT="744892b802dcf61a78a3f2f1311d542577c16d66"
@@ -21,6 +22,7 @@ else
 		https://github.com/scylladb/scylla-swagger-ui/archive/${SWAGGER_COMMIT}.tar.gz -> scylla-swagger-ui-${SWAGGER_COMMIT}.tar.gz
 		https://github.com/scylladb/fmt/archive/${FMT_COMMIT}.tar.gz -> fmt-${FMT_COMMIT}.tar.gz
 		https://github.com/scylladb/c-ares/archive/${C_ARES_COMMIT}.tar.gz -> c-ares-${C_ARES_COMMIT}.tar.gz
+		https://github.com/scylladb/libdeflate/archive/${LIBDEFLATE_COMMIT}.tar.gz -> libdeflate-${LIBDEFLATE_COMMIT}.tar.gz
 		https://github.com/scylladb/xxHash/archive/${XXHASH_COMMIT}.tar.gz -> xxhash-${XXHASH_COMMIT}.tar.gz
 	"
 	KEYWORDS="~amd64"
@@ -140,6 +142,9 @@ src_prepare() {
 		rmdir xxHash || die
 		mv "${WORKDIR}/xxHash-${XXHASH_COMMIT}" xxHash || die
 
+		rmdir libdeflate || die
+		mv "${WORKDIR}/libdeflate-${LIBDEFLATE_COMMIT}" libdeflate || die
+
 		# set version
 		echo "${MY_PV}-gentoo" > version
 	fi
diff --git a/dev-db/scylla/scylla-9999.ebuild b/dev-db/scylla/scylla-9999.ebuild
index 58413ee..6d2da5a 100644
--- a/dev-db/scylla/scylla-9999.ebuild
+++ b/dev-db/scylla/scylla-9999.ebuild
@@ -11,7 +11,6 @@ else
 	MY_PV="${PV/_rc/.rc}"
 	MY_P="${PN}-${MY_PV}"
 	AMI_COMMIT=""
-	C_ARES_COMMIT=""
 	FMT_COMMIT=""
 	SEASTAR_COMMIT=""
 	SWAGGER_COMMIT=""
@@ -19,9 +18,9 @@ else
 	SRC_URI="
 		https://github.com/scylladb/${PN}/archive/scylla-${MY_PV}.tar.gz -> ${MY_P}.tar.gz
 		https://github.com/scylladb/seastar/archive/${SEASTAR_COMMIT}.tar.gz -> seastar-${SEASTAR_COMMIT}.tar.gz
+		https://github.com/scylladb/libdeflate/archive/${LIBDEFLATE_COMMIT}.tar.gz -> libdeflate-${LIBDEFLATE_COMMIT}.tar.gz
 		https://github.com/scylladb/scylla-swagger-ui/archive/${SWAGGER_COMMIT}.tar.gz -> scylla-swagger-ui-${SWAGGER_COMMIT}.tar.gz
 		https://github.com/scylladb/fmt/archive/${FMT_COMMIT}.tar.gz -> fmt-${FMT_COMMIT}.tar.gz
-		https://github.com/scylladb/c-ares/archive/${C_ARES_COMMIT}.tar.gz -> c-ares-${C_ARES_COMMIT}.tar.gz
 		https://github.com/scylladb/scylla-ami/archive/${AMI_COMMIT}.tar.gz -> scylla-ami-${AMI_COMMIT}.tar.gz
 		https://github.com/scylladb/xxHash/archive/${AMI_COMMIT}.tar.gz -> scylla-xxhash-${XXHASH_COMMIT}.tar.gz
 	"
@@ -130,9 +129,6 @@ src_prepare() {
 		rmdir seastar || die
 		mv "${WORKDIR}/seastar-${SEASTAR_COMMIT}" seastar || die
 
-		rmdir seastar/c-ares || die
-		mv "${WORKDIR}/c-ares-${C_ARES_COMMIT}" seastar/c-ares || die
-
 		rmdir seastar/fmt || die
 		mv "${WORKDIR}/fmt-${FMT_COMMIT}" seastar/fmt || die
 
@@ -145,6 +141,9 @@ src_prepare() {
 		rmdir xxHash || die
 		mv "${WORKDIR}/xxHash-${XXHASH_COMMIT}" xxHash || die
 
+		rmdir libdeflate || die
+		mv "${WORKDIR}/libdeflate-${LIBDEFLATE_COMMIT}" libdeflate || die
+
 		# set version
 		echo "${MY_PV}-gentoo" > version
 	fi
@@ -160,11 +159,6 @@ src_prepare() {
 	# since some files can take up to 8GB of RAM to compile!
 	# sed -e 's/\-O3//g' -i configure.py || die
 
-	# run a clean autoreconf on c-ares
-	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
 }