summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUltrabug <ultrabug@gentoo.org>2017-08-21 18:02:11 +0200
committerUltrabug <ultrabug@gentoo.org>2017-08-21 18:02:11 +0200
commit7e94f074b0257fcd094b957747d962e1d8850db1 (patch)
tree3da0fd3e7a24e4d2b7bb23b2900821ac83ef8c39
parentapp-admin/scylla-tools: tag got fixed upstream (diff)
downloadultrabug-7e94f074b0257fcd094b957747d962e1d8850db1.tar.gz
ultrabug-7e94f074b0257fcd094b957747d962e1d8850db1.tar.bz2
ultrabug-7e94f074b0257fcd094b957747d962e1d8850db1.zip
scylla: overall bump to 2.0_rc2
-rw-r--r--app-admin/scylla-jmx/Manifest4
-rw-r--r--app-admin/scylla-jmx/scylla-jmx-2.0_rc2.ebuild (renamed from app-admin/scylla-jmx/scylla-jmx-2.0_rc1.ebuild)0
-rw-r--r--app-admin/scylla-tools/Manifest4
-rw-r--r--app-admin/scylla-tools/scylla-tools-2.0_rc2.ebuild (renamed from app-admin/scylla-tools/scylla-tools-2.0_rc1.ebuild)0
-rw-r--r--dev-db/scylla/Manifest6
-rw-r--r--dev-db/scylla/scylla-2.0_rc2.ebuild (renamed from dev-db/scylla/scylla-2.0_rc1.ebuild)6
6 files changed, 10 insertions, 10 deletions
diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest
index 53460c2..846d9a2 100644
--- a/app-admin/scylla-jmx/Manifest
+++ b/app-admin/scylla-jmx/Manifest
@@ -1,6 +1,6 @@
AUX scylla-jmx.confd 243 SHA256 31398e8dedcf01a72d5532b0ed30a9c0df5818d372ff5dca78d8e851f4d1f5d8 SHA512 18b5f550c2e0616f4c0da123adfda3fb959bec5711b6be57df3e316613cfa154467353e65504b6b68852911f8faa21f1acccf3fa51970a132b639c1e6d1ea402 WHIRLPOOL c5a6009774867aaf4b6896016206d352d0bc2774dcb92389828c00ac5cf792211555a6612abb7e6e90e5d88a4560fae51fec755d5994e40f918088c9f9818e04
AUX scylla-jmx.initd 592 SHA256 63bdbcf7458e766c04b351aa576efd92fd796840f2469cb85b80d364c492d950 SHA512 8bf35201a2dd240b1e74d35c3153251f2c15878f2454a8ed05f006ad35679a85d08de413dc8ce8b53aaa2b8e367a806a76d56d63d9b691f4bac569b647764037 WHIRLPOOL f53e9546d6d73f7109301280529a00fc5360cc4549c3e5985183d2e6d55562cc897bc0cf93d1f267fdf0d7ea587dd25c5b0e72817459d3e17a0366dc651b64d1
-DIST scylla-jmx-2.0.rc1.tar.gz 98498 SHA256 151ca228081b0a57984db5f5aaaf25d022a16a5e4666ca0d670a44ea79364e12 SHA512 3df4304d4000fb8c6ebf631fed456ec1970b3f8d5c777499643437cf48c919af233e8d0237635c8ae69c65a120c4a7a11562710f412c1cd2f3b9475f8776a212 WHIRLPOOL 46c9b00c6c0a1f1684fc26843f81a8d5dde2ec759d14e1ec7fdc0b0c3070fa5fd1d24a1ec101db78adbd49d9a92ffbada0721f119d1c3b45e0376f06142bcda4
-EBUILD scylla-jmx-2.0_rc1.ebuild 2303 SHA256 3062fe2e2e1fd21814b93f383321becde22a9c1394bf58c948921869780c62ad SHA512 8b48edd4c8ba7e8739596b0531fe570f7b40565b90f0778f339bf523d14edb706f751913018553ef6dd89d6f66306143c0f6a2f6ae493352e9cec7d62208f810 WHIRLPOOL 41f0a4dc70eb530b98e8950b8ef7cfdd1ce3e8303665c229d109bcc3db2473724f466e53a5f514dfcf4b6332ee1e8b98eb4415b8b15cc44790903140a10c57bf
+DIST scylla-jmx-2.0.rc2.tar.gz 98495 SHA256 3fd207b3c7199542597085a5c6282539d05fc675bf54515db1aa19241d87557d SHA512 1021432d927abee2aab59e9e879bfaacfe1dc545a8b25bfc9961430b81ca0b22fd727041a15fbf152d06562148b20fee01ec7be5ee2fef4b1141baf6bc031a40 WHIRLPOOL 220aa25bbbade5ea41051b46c3613b67024f76887075e4a7f5d96c76123a14b80c206a81ea048d7b464b7826e656f7ad7320f7fcbdcae3891959cb6f76885684
+EBUILD scylla-jmx-2.0_rc2.ebuild 2303 SHA256 3062fe2e2e1fd21814b93f383321becde22a9c1394bf58c948921869780c62ad SHA512 8b48edd4c8ba7e8739596b0531fe570f7b40565b90f0778f339bf523d14edb706f751913018553ef6dd89d6f66306143c0f6a2f6ae493352e9cec7d62208f810 WHIRLPOOL 41f0a4dc70eb530b98e8950b8ef7cfdd1ce3e8303665c229d109bcc3db2473724f466e53a5f514dfcf4b6332ee1e8b98eb4415b8b15cc44790903140a10c57bf
EBUILD scylla-jmx-9999.ebuild 2303 SHA256 3062fe2e2e1fd21814b93f383321becde22a9c1394bf58c948921869780c62ad SHA512 8b48edd4c8ba7e8739596b0531fe570f7b40565b90f0778f339bf523d14edb706f751913018553ef6dd89d6f66306143c0f6a2f6ae493352e9cec7d62208f810 WHIRLPOOL 41f0a4dc70eb530b98e8950b8ef7cfdd1ce3e8303665c229d109bcc3db2473724f466e53a5f514dfcf4b6332ee1e8b98eb4415b8b15cc44790903140a10c57bf
MISC metadata.xml 249 SHA256 658f3f0cb7921722166c25f4a815ec0d7418ad183b9e8a0377eb08b3c3139173 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c WHIRLPOOL 6031231a9c8d06218c688115fb3e0f734964735d3af0b4e4a932afa78cbebecd6586293a16cbf69985fbaad4dce3594b1095a00d91a3a131cf8d683e88c34841
diff --git a/app-admin/scylla-jmx/scylla-jmx-2.0_rc1.ebuild b/app-admin/scylla-jmx/scylla-jmx-2.0_rc2.ebuild
index 3bae0e9..3bae0e9 100644
--- a/app-admin/scylla-jmx/scylla-jmx-2.0_rc1.ebuild
+++ b/app-admin/scylla-jmx/scylla-jmx-2.0_rc2.ebuild
diff --git a/app-admin/scylla-tools/Manifest b/app-admin/scylla-tools/Manifest
index 266af57..bc310af 100644
--- a/app-admin/scylla-tools/Manifest
+++ b/app-admin/scylla-tools/Manifest
@@ -1,4 +1,4 @@
-DIST scylla-tools-2.0.rc1.tar.gz 26859161 SHA256 595d9d85555ebc904ef8a08b3b3219c4360ef404f3f34459b4d135f89dbd20e5 SHA512 f03e481fe1ec808f4d17ae1efdca398c834b922ee6c22d4f14375c1824828731e6bbe3b62e62acfd3299886a9c7529ea489782d0d2fce31a519e028d4ae27f53 WHIRLPOOL def751bc12d9da0c63b0d0dcaf0f6e188b437f13512f92eaae670657c291facdf2d20bd3c292951903d367ee7fe81b1a029966a610d26cc9b74b6a9775869b00
-EBUILD scylla-tools-2.0_rc1.ebuild 2236 SHA256 2e5c2b173dad3547e64101219b70be988b769b61287f6279a33fe2d041116337 SHA512 4f521a960fccc072a4c570eac9ad96946bbc3f6bbaff0158aa15bd0bc86cc315fb83d1331548a8f28478f251fc7845a9b16fe4532e5d76452ec3d456351bf216 WHIRLPOOL 97780d7ab406cf4bbb3de3328bc48d182517f92cea088df0d2666a6cee09f16e37181b5012d3920a1c6235615b505407bfc390b83eaeda587378072d8d938d63
+DIST scylla-tools-2.0.rc2.tar.gz 26859425 SHA256 18663d5b1df1c59cdf515c71d9b23135767459308b0e6e9b3ccf8d16afb1b95c SHA512 3c060bbfbeeaed417d3d61cadfe69d033bd1753554ff070695e7cd4cd541b81e226b40d2384a8835b0bfa3c6328c732d2b02224cfbf0b9813f060170a1b88d04 WHIRLPOOL 3b57b9ea379de37e80206b9bde68bd0eba32cd5c6b505b91fec99c8f925b5439bd966840a777169e6b62693907fa5668089fe128f9cad8e7007b41fe25543ee0
+EBUILD scylla-tools-2.0_rc2.ebuild 2236 SHA256 2e5c2b173dad3547e64101219b70be988b769b61287f6279a33fe2d041116337 SHA512 4f521a960fccc072a4c570eac9ad96946bbc3f6bbaff0158aa15bd0bc86cc315fb83d1331548a8f28478f251fc7845a9b16fe4532e5d76452ec3d456351bf216 WHIRLPOOL 97780d7ab406cf4bbb3de3328bc48d182517f92cea088df0d2666a6cee09f16e37181b5012d3920a1c6235615b505407bfc390b83eaeda587378072d8d938d63
EBUILD scylla-tools-9999.ebuild 2236 SHA256 2e5c2b173dad3547e64101219b70be988b769b61287f6279a33fe2d041116337 SHA512 4f521a960fccc072a4c570eac9ad96946bbc3f6bbaff0158aa15bd0bc86cc315fb83d1331548a8f28478f251fc7845a9b16fe4532e5d76452ec3d456351bf216 WHIRLPOOL 97780d7ab406cf4bbb3de3328bc48d182517f92cea088df0d2666a6cee09f16e37181b5012d3920a1c6235615b505407bfc390b83eaeda587378072d8d938d63
MISC metadata.xml 249 SHA256 658f3f0cb7921722166c25f4a815ec0d7418ad183b9e8a0377eb08b3c3139173 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c WHIRLPOOL 6031231a9c8d06218c688115fb3e0f734964735d3af0b4e4a932afa78cbebecd6586293a16cbf69985fbaad4dce3594b1095a00d91a3a131cf8d683e88c34841
diff --git a/app-admin/scylla-tools/scylla-tools-2.0_rc1.ebuild b/app-admin/scylla-tools/scylla-tools-2.0_rc2.ebuild
index 25d2fa1..25d2fa1 100644
--- a/app-admin/scylla-tools/scylla-tools-2.0_rc1.ebuild
+++ b/app-admin/scylla-tools/scylla-tools-2.0_rc2.ebuild
diff --git a/dev-db/scylla/Manifest b/dev-db/scylla/Manifest
index 47e014e..bb94c2e 100644
--- a/dev-db/scylla/Manifest
+++ b/dev-db/scylla/Manifest
@@ -4,10 +4,10 @@ AUX scylla-server.initd 964 SHA256 b99672314a6e236939fcb19d37c89f98098e34227ea77
DIST c-ares-fd6124c74da0801f23f9d324559d8b66fb83f533.tar.gz 1643982 SHA256 fceaa0d2644e94422e56e66d6198cf391626b4faa3544701ae4684e2d1140c06 SHA512 5848f480574e41dfd44a65085c7141233f1575f650bc704f92ac5f30f1a27f423d26c76969f84d2b27411660909428449c7bc593f756ee9a1f68991318fc961b WHIRLPOOL a9e562c284806b137dfc1925d31acadab12d34db8911da85c88113b4342a327a65436b14e5bd5c908e3ef48f0781851afd84c2df763e0c2bc7711817c7e0c0b6
DIST dpdk-10a8b45350c9af0c2d7731a2f058b0983a0c845a.tar.gz 11653100 SHA256 bd2846ec2d19f15db2516f7eaf0fdf795a93c7c8249562af95df4a12e28844d1 SHA512 5bec70e2a69010aa02dd51cca84df399c7a12173dd2797e471008d429ad83a7d52368c62b66fa1d14447b0e58a202d74d9fde44c74695dc351ff558d84f7ad40 WHIRLPOOL 81f2956b906dfdb579091ce142839f7f34ea0aa29dc24bef35dc0510b8eeca8de0138115bab2875b6838b67c7b7be2c090b791ad1aa873f8ca263bca996e0667
DIST fmt-f61e71ccb9ab253f6d76096b2d958caf38fcccaa.tar.gz 616708 SHA256 1087c7f55cf5e2cd7d1ab82d5210132d2b5669cfd7ac9ff162b25e49026ad972 SHA512 d234a58af428e238e559ceec1599ff449fbfbe4ecc212ed00c82ef3f057a3351a9eb59906d3b6f7efeec76188645a49376507d7a78dd68d61806cd63d0fbb3a0 WHIRLPOOL 1cfd1047208ba12f03a4f43e56b4cfe54972f54e8bc09d091a12cdcc7e8989cb2aa30b932db7229dc23480aa8888939e5d127909bf2e7f0a365feee65e27f185
-DIST scylla-2.0.rc1.tar.gz 2426589 SHA256 60b371e19e557c7270329873320be464336ca500f947ba6ece8f1be09cb36fd9 SHA512 a9dadda91a7fdfd78e6b63299eef8988d4dfcce39c5d559e054413cab32228ab8cfaebe57b217b38c3ac5942add39393d646ad163fb0109c7884329e91db5dbb WHIRLPOOL 40def45fb246a75c0ae8ddecfe2d1bf0dd08a276c02915fe01f2120acaed407e66a069e7132f852a387cec62a88a2334fc6c2b810109056089735d818ac6b873
+DIST scylla-2.0.rc2.tar.gz 2426544 SHA256 169419dcc9e205f4efd8f86f93a7d3e8f5bfff4634c7f39b9957f1b5d24c7bba SHA512 f00ce5b800a89a2f7539e1d44801c8dbf34871bad43873d00a7d7d9a987d2f57aa432793a1bc1f2cbfcb68c62e421f2fdc454c81566d9ea7a8539cd61d025647 WHIRLPOOL 767f17d7c9a2e64eddc89526b4b5e89557063cd49447e4c03314f223416fa92e01724300126280dbb03bff05be5852b87f2b5bcd4a5c3cdced42621b3cf96c8a
DIST scylla-ami-b41e5eb8baeb4b5414d128536a6f51e9147f7a22.tar.gz 9799 SHA256 91a3c1da915b810f35fb08882c35e7ce8e944ff2bab7fc8a46e1553a4ff141f2 SHA512 270a3f7ada908ef954e9bda6f029e9e4f73f215545b3462238df996ec06257f02b0f93307e5b8e4525ebe6189fe2128268f55f04aa4d61d3d7f995a70ed31c5c WHIRLPOOL bef38b2fc17afffa07f9799d7885b63d01fd122164e411dec89b2b58a0d717c9c92196b34b66776290caee1788eed7095fbf48c62eb36ca043910420b8c1c171
+DIST scylla-seastar-d67c344513b3de0c6dc86795ca7bc8eaf1811dcd.tar.gz 719738 SHA256 deaf9360f2c7c3b684fcf48c769de202c7dcc1137fbd521af287a71816163775 SHA512 abe64143688034cacb006731430603325ccb2d89d99c8b05d9761cf77a3a616c94967e4204c0dbc635ca99c03781460474252f83407ef729165e3ac2989d9815 WHIRLPOOL d58ce6aa73ee0bc0e7bbb5dd723274e5fca9057db6d25cf2ead69106ec170acbdfb1580836e706ffdddeb98733a7371b56aaca343a9d0fc36bbfbe515d3d90b6
DIST scylla-swagger-ui-1b212bbe713905aac22af1edb836f5cf8cc39cc2.tar.gz 1372033 SHA256 ea8589de7031945bb9a378708486d0e641ebbfab1c1cedb1a77215437db2ba8b SHA512 c726a4dac73d3e9d16624727f4f0703688b7205783c627dd7b88b688b165c9055a1884cf7e9987d8c235d3fa470578852a951e34819431aec12059988394da99 WHIRLPOOL ca3387d1703bbcc854750d6b67102e16bab185265b762d4fe2ae0a0fbc6f4545ef6ea1495be68a8933b7717f03799fc96ac91715c2472f3806660fff37b7c19c
-DIST seastar-867b7c724508de54610bc78d1009d3720b198586.tar.gz 716633 SHA256 b29677fec700067de9f91e77aa15d96b47f0cecd76c8e618a7f00c97a011594c SHA512 f3d7cac4ad28797871f8779eb2e81ef27bba0c4b23c0c3e322f223fba4f89d6d2b4fd26147fc8ef7c517339d06e17ea81024bd848327c35c62d7db51d7e1a175 WHIRLPOOL 8218ede8d848e848e70b668600c9670fdd1028a01886ae50764179282342816cf1f0d54d438c4957e8d858ec26445ec919d9e6649ad61cdd23c1c23502d4daa1
-EBUILD scylla-2.0_rc1.ebuild 7166 SHA256 146370aa5085cc423882e49f33b55a9f0d17a0147f59570b7ae2b88dd9d91f2e SHA512 67d234863c1bb555a4bf527664a8176c0bc117f9790c8662552691fc20d3e6e3b60a4639d01944b7291edaf0f2b1d874983abcd48b5b83c7b91920d42ad33983 WHIRLPOOL 7f7f36db87e06007e8b1c98b439a9d2530c209c13ee10833d0869f3772bc1578c4046a2d8f2afc42fc186a5ebc5f773714f40721e71a1e50b45a0a39e73808d5
+EBUILD scylla-2.0_rc2.ebuild 7187 SHA256 c7015c30bae2731bc375759785fbb8f2d14cadf13b58ac8e95527c25558cbfdd SHA512 64a8d53ba83970f4d34661d7834cdb39bf5e21f7131b04224b39f3b2feb033af05f86ff74e2b4d09e5afcae1cfb4f9de0af3ad40b13736e85acbaa3173f3bc62 WHIRLPOOL 9d3e1f70b2f7b8e5a15ed31a0042207505707630bb5dc1dbafc64e969edcee6eaae60c424831771ebc1005743fb99a300763d129d3d5bd57b66ab1f07e6a7c88
EBUILD scylla-9999.ebuild 6926 SHA256 4fa2c2458133aaff43704b8ee9a11f3d3385f417bd1eebe049a13984babe56d7 SHA512 5944860fd4ae85b600f3da30390a2a9974855b7738332985b994e41ba3985ded2f23ecf481483f623dbb6ce0864a0f073636b463b73f9f3c8a53764b35506cb2 WHIRLPOOL 21bdf5c1a79701f41db20d7911ffdb69d0894e05e5cf482dc5f9367d9a18bbf05ff391ffec5f2c6d51b6be83d429a086b1f2f7a53e82e9a9a51088f506d13535
MISC metadata.xml 249 SHA256 658f3f0cb7921722166c25f4a815ec0d7418ad183b9e8a0377eb08b3c3139173 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c WHIRLPOOL 6031231a9c8d06218c688115fb3e0f734964735d3af0b4e4a932afa78cbebecd6586293a16cbf69985fbaad4dce3594b1095a00d91a3a131cf8d683e88c34841
diff --git a/dev-db/scylla/scylla-2.0_rc1.ebuild b/dev-db/scylla/scylla-2.0_rc2.ebuild
index 445c5e0..8e721e2 100644
--- a/dev-db/scylla/scylla-2.0_rc1.ebuild
+++ b/dev-db/scylla/scylla-2.0_rc2.ebuild
@@ -13,11 +13,11 @@ else
C_ARES_COMMIT="fd6124c74da0801f23f9d324559d8b66fb83f533"
DPDK_COMMIT="10a8b45350c9af0c2d7731a2f058b0983a0c845a"
FMT_COMMIT="f61e71ccb9ab253f6d76096b2d958caf38fcccaa"
- SEASTAR_COMMIT="867b7c724508de54610bc78d1009d3720b198586"
+ SEASTAR_COMMIT="d67c344513b3de0c6dc86795ca7bc8eaf1811dcd"
SWAGGER_COMMIT="1b212bbe713905aac22af1edb836f5cf8cc39cc2"
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/scylla-seastar/archive/${SEASTAR_COMMIT}.tar.gz -> scylla-seastar-${SEASTAR_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/dpdk/archive/${DPDK_COMMIT}.tar.gz -> dpdk-${DPDK_COMMIT}.tar.gz
https://github.com/scylladb/fmt/archive/${FMT_COMMIT}.tar.gz -> fmt-${FMT_COMMIT}.tar.gz
@@ -106,7 +106,7 @@ src_prepare() {
echo "${PV}-${git_commit}" > version
else
rmdir seastar || die
- mv "${WORKDIR}/seastar-${SEASTAR_COMMIT}" seastar || die
+ mv "${WORKDIR}/scylla-seastar-${SEASTAR_COMMIT}" seastar || die
rmdir seastar/dpdk || die
mv "${WORKDIR}/dpdk-${DPDK_COMMIT}" seastar/dpdk || die