dev-db/scylla: version bump

Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>

5 files changed, 18 insertions, 16 deletions

diff --git a/dev-db/scylla/Manifest b/dev-db/scylla/Manifest
index 534456c..b12fc51 100644
--- a/dev-db/scylla/Manifest
+++ b/dev-db/scylla/Manifest
@@ -1,14 +1,15 @@
 AUX 10-scylla.conf 64 BLAKE2B 31ce1b2173214bcac351b71cf19e5506ab08cefbca446ce23ad753c98c5e4fd7fbb89b0f79703ea4dcf1f6233e7929268365eeaab1b4e2e7b31553aa7928a969 SHA512 c24b3ec2f0ea3b1ad0792c05a8eb044b3a157862b59759e020586ae872f9789a558d423fe1dff1a8c6d8342049cf4d919faf31a1439a6a1c69af915365b4ec82
 AUX boost-1.65.0-icl-ttp-matching.patch 1427 BLAKE2B de9c77253963656f85ed2d05babd600bc5b59b567bc889ed815dfba97f2a1334df48dbb1e67879dea1419fb439c513c54a66531d4e8ec28a7848385f70471334 SHA512 aaa7959df631c17a80486e5b6724d76bf2193694f5559443350c74567506f36c133f740adcbb1b2d3a5a2760730f498f0fd655ec6eff6d20393b6e49549c6ec8
 AUX scylla-server.confd 386 BLAKE2B e075e8f5cac2ac373a43a637a4080fde5cbd402b5bef2a3865980f3f9d123366315d994ebf9abbd749167db6e1fa9c840295171add7c5507120be70020aaefa1 SHA512 5d3c55933a02d3b16837013b37110f6669c14e01599532f30935b5dc29871a5bed897c9eb01a6e89469eab7d645c9231745a06c2ef827f6700e13c8faa9cdb87
-AUX scylla-server.initd 964 BLAKE2B 46ec149dc24f33773bba1f5edd36d4cab8f4248346e56752ba6fd4b149d056d28cf3297e889adcc0c776da46cd347d25d4b16bb91f545779dc14f59bd8dfcc5d SHA512 e72b817e8a42d843f6766b0cd25c33b8231efbd223f4ad31bca9a2610f670b3980c1be256343f5e3b0fe0f54ba460713f6db8de92c27cf67653140794299f760
+AUX scylla-server.initd 962 BLAKE2B cbe13c8a03cb4d084e477dd449ff51355e886a31d70a8da1cf2a899b3f48c2c01680dd020d665c71497b1c6b2dadd38d417ea80389413b1e54ee622f207c37ce SHA512 b77473bba63e1fa9e83c0d0c9ba5cd7cc69920ada8b1a79de1a5bc609f797e870b7cd31af658cb11d84d019c905c78a4a0420173226163048ca6439ea2210a16
+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 scylla-2.3.0.tar.gz 6252219 BLAKE2B 254ed07516caf5b151833033f0d6203aa044b5408fe84f5b6dece8bd7d2369112591aef547895064bb25e04ed618a1ddd3be7ebe29f3afa3237b2db8460d2c7a SHA512 9d4e814f48b672e19abf9037c43712f01727435a9a9aabfa3eaa7eb1d03c20ce4ae55e28efcd736217cad8d2ff96dface74026a40fcb5d66c606f300708890d1
-DIST scylla-ami-e7aa504db29e6e2f49b7f597846547155f0a7f64.tar.gz 11172 BLAKE2B 963a078b96430d49a38cf36d5844400a5fabbab96b3b9e0c8ad2e456dd835dee65add30aa48c7057b8d21bc728105047ae0273c1b1f9584515b1adb16ea86d05 SHA512 af5b6e56a3d048042c30eb97ee35c1bae7cb37a5f55171f7c4176a227bca486c34b0cad79f7d58629fc8c6eb38706ade3eb79bde50fc61d78a7677d5db2cfe0e
+DIST scylla-2.3.1.tar.gz 6249801 BLAKE2B 4d2ee126c2d73e0a4e9237f11141036262d4b7df7b9a359c9323f8f28f415862529977608861c48eb708bd132a360bdd5e459398d31dc6c289e9e84769fb8c2c SHA512 edb558981798caa6d8956ab0c8903b4a0dbd8bf7a2a73f075f0cbc20e69d860113faec6bd988b58d67abb86f9361f9fe6ca76e15b9b0a04fdb02afe05a1562dd
+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-ebf48120c2e4f973a1c33d8938c7d7bbc819a2d6.tar.gz 841010 BLAKE2B 1d50c7caf2e8bd4f9371cf82c335691d07c50d11c90a9d9895e7b0af5527b3ee57ff6007e657faa9b8c9d9c0a2be0beb5fb8f0769050d10645d7d062b0b8fc55 SHA512 ca9bf80e92bea5e5fc58bad400075c775b32edbd233fa1c174063be78c4accb710e625a0a50cebea887a2383d5d9dd3bece28d001733bdad5852b75b83039368
+DIST seastar-b846dfe25298ef08684604aaa77ff77873ebef39.tar.gz 840995 BLAKE2B a289fbe5462b622b60572a375f0f5da49aeb7f69be279c5b6bc98362cb9eb87e32c69b8978000368e53af949bdc33c1b87fdcc7b568f3801460f2b0413b6116e SHA512 c00ec8662bb8e806b9fc4bc0e4c7aa628f97227312eb5bd64a1697814e1bb6f1791b70649e87e44fd2df24aa81b2c13ccd71df68b60e365c29fe425f85a46491
 DIST xxhash-744892b802dcf61a78a3f2f1311d542577c16d66.tar.gz 29205 BLAKE2B 594f09421030809ed456ba7af906adfbf1243f7ded4161e7777ec2ef2b9ab24c653923f784a2e00b22731be0378aea76263e39614941432cb0128d972e9ff488 SHA512 f94b1b19d1c232c2e59058514be34ee169f2f11722a088ab401a38dcd75ae693bb0fbe87180060207ebff29f7b3c2a4444db54e4f57c61cac0438c4db1f118f3
-EBUILD scylla-2.3.0.ebuild 8843 BLAKE2B a9325f48c473753cf0d267ba44532138ef70004f2a887a26d2210cec67690f2fa97284813b5d83420386974d4c722b6ba030b7437571e95401d8a8ff623b7050 SHA512 3e437ea56761c8ada3da8cc4088458dcbd69e637029e932ec38cad38b517fb94b7d27d26badf0118ca9ee9269ad60cc6dd7f2265163adcb63750646850ba2270
-EBUILD scylla-9999.ebuild 8611 BLAKE2B 93ab4555ccdd43956447f1a0413d5431434f20013f0702423585f08e4d41c9af92610fafc7f86019b8c65436d3583540583cfa15c4f84ce856551ec23c12489f SHA512 da81255143b8c147e214f5782f40138a907feb322422a727decf372181f1a8b54e2b2f13753050bc1dd5204ba99be2236753425b919f2cc63154dd98dde1f081
+EBUILD scylla-2.3.1.ebuild 8840 BLAKE2B e209110f9ffb72b5a8320e9040be66ad19f55b73b0732aeff1c4782d7879121dc4d3d36e1d78e3c36233eceb33a13df24d61503bfda26bc4a0f5a3b1bcc9d323 SHA512 fcd3a72a067c0795359aef7dbe067bff0d85d9688c7326f28bb95487b536c2557f22a5b7a80cb0ca4464ecf6ab85ceda72bd8c1e3d81edb9f7b8c28369923605
+EBUILD scylla-9999.ebuild 8612 BLAKE2B 049a7f2635b46c7e6eb74a286d0de8d16bb5c80d2cf4585c5bf5e6152d485c3b8bff9a4a5580b7ef9065e8db29388dcf1ed1c73eb77b07350a5f39df83dbded6 SHA512 01fae825e491c0aa0ac767c1d3aa279518be079b936a2ca059a6a08c6c92adf329188d7c4d453a7887d5655a1142e81e042b6ba6347482cda7d0de1e5ac052da
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
diff --git a/dev-db/scylla/files/scylla-server.initd b/dev-db/scylla/files/scylla-server.initd
index 80b4977..bb94f93 100644
--- a/dev-db/scylla/files/scylla-server.initd
+++ b/dev-db/scylla/files/scylla-server.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 config_file=${config_file:-/etc/scylla/scylla.yaml}
@@ -33,4 +33,4 @@ start_pre() {
 stop_post() {
 	ebegin "Running scylla_stop"
 	/usr/lib/scylla/scylla_stop >/dev/null
-}
\ No newline at end of file
+}
diff --git a/dev-db/scylla/files/scylla.sudoers b/dev-db/scylla/files/scylla.sudoers
new file mode 100644
index 0000000..62270ed
--- /dev/null
+++ b/dev-db/scylla/files/scylla.sudoers
@@ -0,0 +1 @@
+scylla ALL=(ALL) NOPASSWD: /usr/lib/scylla/scylla_prepare,/usr/lib/scylla/scylla_stop,/usr/lib/scylla/scylla_io_setup,/usr/lib/scylla/scylla-ami/scylla_ami_setup
diff --git a/dev-db/scylla/scylla-2.3.0.ebuild b/dev-db/scylla/scylla-2.3.1.ebuild
index c632fb4..4c0f94a 100644
--- a/dev-db/scylla/scylla-2.3.0.ebuild
+++ b/dev-db/scylla/scylla-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,10 +10,10 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_PV="${PV/_rc/.rc}"
 	MY_P="${PN}-${MY_PV}"
-	AMI_COMMIT="e7aa504db29e6e2f49b7f597846547155f0a7f64"
+	AMI_COMMIT="a425887809d281beb39297903198ee1a77a1065e"
 	C_ARES_COMMIT="fd6124c74da0801f23f9d324559d8b66fb83f533"
 	FMT_COMMIT="f61e71ccb9ab253f6d76096b2d958caf38fcccaa"
-	SEASTAR_COMMIT="ebf48120c2e4f973a1c33d8938c7d7bbc819a2d6"
+	SEASTAR_COMMIT="b846dfe25298ef08684604aaa77ff77873ebef39"
 	SWAGGER_COMMIT="1b212bbe713905aac22af1edb836f5cf8cc39cc2"
 	XXHASH_COMMIT="744892b802dcf61a78a3f2f1311d542577c16d66"
 	SRC_URI="
@@ -190,7 +190,7 @@ 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 -j4 || die
+	ninja -v build/release/scylla build/release/iotune -j2 || die
 }
 
 src_install() {
diff --git a/dev-db/scylla/scylla-9999.ebuild b/dev-db/scylla/scylla-9999.ebuild
index 981a33d..99e5c5c 100644
--- a/dev-db/scylla/scylla-9999.ebuild
+++ b/dev-db/scylla/scylla-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_COMMIT="scylla-2.3.0"
+	#EGIT_COMMIT="scylla-"
 	EGIT_REPO_URI="https://github.com/scylladb/scylla.git"
 	inherit git-r3
 else
@@ -190,7 +190,7 @@ 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 -j4 || die
+	ninja -v build/release/scylla build/release/iotune -j2 || die
 }
 
 src_install() {
@@ -271,7 +271,7 @@ src_install() {
 	done
 
 	insinto /etc/sudoers.d
-	doins dist/debian/sudoers.d/scylla
+	newins "${FILESDIR}"/scylla.sudoers scylla
 
 	insinto /etc/rsyslog.d
 	doins "${FILESDIR}/10-scylla.conf"