From 087580ed46837254e10a7422045cbd1721746f22 Mon Sep 17 00:00:00 2001 From: Ultrabug Date: Mon, 18 Feb 2019 16:29:06 +0100 Subject: app-admin/scylla-jmx: version bump Package-Manager: Portage-2.3.52, Repoman-2.3.12 Manifest-Sign-Key: F30FAFEE3BD598228B24CB121A3A8C89C56D610B Signed-off-by: Alexys Jacob --- app-admin/scylla-jmx/Manifest | 30 ++++----- app-admin/scylla-jmx/scylla-jmx-3.0.2.ebuild | 95 ---------------------------- app-admin/scylla-jmx/scylla-jmx-3.0.3.ebuild | 95 ++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+), 110 deletions(-) delete mode 100644 app-admin/scylla-jmx/scylla-jmx-3.0.2.ebuild create mode 100644 app-admin/scylla-jmx/scylla-jmx-3.0.3.ebuild (limited to 'app-admin/scylla-jmx') diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest index 023258c..3627ab3 100644 --- a/app-admin/scylla-jmx/Manifest +++ b/app-admin/scylla-jmx/Manifest @@ -4,27 +4,27 @@ Hash: SHA256 AUX scylla-jmx.confd 243 BLAKE2B a056f7c70df3ff6c903a182f352aa34ca9d23eed458b7c6f5a51c9f6656cf0f989c133e8e45b221991800fcc79fd1505b037410dde7d5dfffdf75e0ee6670090 SHA512 18b5f550c2e0616f4c0da123adfda3fb959bec5711b6be57df3e316613cfa154467353e65504b6b68852911f8faa21f1acccf3fa51970a132b639c1e6d1ea402 AUX scylla-jmx.initd 592 BLAKE2B e1492a3da5ab275fbe6f7f1f4f9beaa3129f037fa54523211a8628d479e196a2da711c41c8051416612d34322c3261e95c3370525e68c84eb80c98ac0949ab69 SHA512 8bf35201a2dd240b1e74d35c3153251f2c15878f2454a8ed05f006ad35679a85d08de413dc8ce8b53aaa2b8e367a806a76d56d63d9b691f4bac569b647764037 DIST scylla-jmx-2.3.1.tar.gz 103146 BLAKE2B a16c63dff716dd50d0d7df8b082974fe685de19bf753eaebb33e059ef779be3b8772bcbdd3bbb4f01bb49b43c96a6519b20b3bcde532960d76a37d7df84524d2 SHA512 6c707814e764f3bbcb68dc1fd74f9f67f1ce16473528f908339d407ccb57ccf95d0f1549c128a4c34fa17d57e49aab692cccfee09302807ee5fba7c097a4de40 -DIST scylla-jmx-3.0.2.tar.gz 105662 BLAKE2B 1f56543924432a23f45921fdd0e3c3f8fb79dc398be232adc9640595f5d2a06f922d4169d94214721802b14f4497c401fef2bbed668f49d28c8584d8386c6933 SHA512 c057d8de0681f9c4661e97128f803020a3889614d67c1cf82393d84c8b8806443182889f7164851d2bd04127dd62f5567640f5b75e865cb299914e4130a107fe +DIST scylla-jmx-3.0.3.tar.gz 105657 BLAKE2B 21e3757d5e7257b80c1bc706c1b22121dac600a4cfd52eee6c6735b65f1466ac7a8d7e51396eb10eb8974ecd1150926f727692336bdf544c16527f05f0118460 SHA512 3826b78ab41cc2ae64cd7b95f45de823866fcbe3201f259d706d7d192d84b5fb0064cafc769a06c62d6b658e4b1bc2dee6a06498596482b0e6cdf8bb408c5447 EBUILD scylla-jmx-2.3.1.ebuild 2300 BLAKE2B f8427423572652f682de88c20fe8cec52862ef5277334d335be53fdf51950a9e5b3ffde20470bb2cf3e5d16698d6c305da2fa1d90f2b2cc7abd9185e6743e2c4 SHA512 e0f6122bd75a0928d9edb4541732c2da059e2c6201bfd03b88d18ec8df31449e820d93ae60b3d2019730c6fc4ad11ad3627760216f4284c0b970472daa81aa10 -EBUILD scylla-jmx-3.0.2.ebuild 2300 BLAKE2B 3b8e24d44c56935434659fcab6549ff7a37a64ee52e0228b64aef00dfdc66d8e333b3f7b910698f4042f92019cca489e1e68f5323409ba4e4c7a8e0ae301aee0 SHA512 f78a41cd4ed1b08adbe406c8e58ea741b1731b263981ca20b36ddaaab0c8224b092042fe427770969ad404bc51cd68f997e63bcfda78bdfdf8f048b9ad1e117f +EBUILD scylla-jmx-3.0.3.ebuild 2300 BLAKE2B 3b8e24d44c56935434659fcab6549ff7a37a64ee52e0228b64aef00dfdc66d8e333b3f7b910698f4042f92019cca489e1e68f5323409ba4e4c7a8e0ae301aee0 SHA512 f78a41cd4ed1b08adbe406c8e58ea741b1731b263981ca20b36ddaaab0c8224b092042fe427770969ad404bc51cd68f997e63bcfda78bdfdf8f048b9ad1e117f EBUILD scylla-jmx-9999.ebuild 2351 BLAKE2B 233492dfb11e01126d1e10d71a48a5e1ebd944d623e1680af1e2b65f368920bf6396b6fc18b45e434b0d26b8ef9ec9f03840d25128ef851f0cea351e28bade8f SHA512 4f305713b7b19481eb616171bd38307ca262b1aba3a60bb14b863b8c3c2304dfc30ac716d3e319212fc2bddc22d957b0f7bc6954e64a600222ca27761ef8e097 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQKTBAEBCAB9FiEE8w+v7jvVmCKLJMsSGjqMicVtYQsFAlxYqLRfFIAAAAAALgAo +iQKTBAEBCAB9FiEE8w+v7jvVmCKLJMsSGjqMicVtYQsFAlxqz0BfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEYz MEZBRkVFM0JENTk4MjI4QjI0Q0IxMjFBM0E4Qzg5QzU2RDYxMEIACgkQGjqMicVt -YQt5cw//X0xmv/xmHhNR6qRtnjBkllmkN5ssF4zadkUG/IyI6PW+U+OKF3OVRGD6 -gldISvfj+30rhyCHL4UeuEXpJ9tDdT8wUF0gZZfgDcIOxXF7+E+H/W/hZLIipFGM -tB3fBfBsVg4eIun832aoSoo4Pt6GEmSQlPJFaalkQT3ij2R5zova5UI2/errUFF3 -VcadB1yAvpbY/4MsR9rGI8YhAPwWAUAMbCzD4QMjSuBRmy4TGfg6pWSWhSKuAM5F -U4JR27A9ZlqHJfw7c4gAjuV0CUpIVDR60D6BkUthPbacmIpA291LcPQ0n/+qOThj -DAfl9e40XUiSfNqZDYa3YPX3KKPVT5gQbn6SQr01yTAujx/B7mxU+00ZOfHAzWxt -ZFxb9hCoTOvJbNGSwojK2cPmMSqdys4Uh709zarnuvTv1JygIJtqW60n1oUUsYYE -/fOGQhlzCWD304OwUIpsiMQ7I06OuTvXi0iPPoa9vnFuPxSfQcauCv+ytnXcv/bm -1AogHbqqXZeAvmimokFJ53v+x5N6QLa4cTRw/82SiMWmvYWmfWjAiVjNwwhv8AlW -8AFFjW9aKa6cyJynxPm/doXo9qKP3/BNzhvSkFoepq65T50XRJDCk8r7thaXgZJG -QGRIQH7dTkohgjIArpCFVUUgpVsL/Vn7wEDUtHiVQjqS3DVen0Q= -=paiM +YQtMqhAAnXQfrRgu+3BMDoourqqBeFdB3vOWcJlxvqY9GHqIgR0UPTUm9A/NehEB +0DWJSTF2XyUykbQ/G7WT5jDaY2pwVznVwft01JyWE6D7qGIsLw/TkRZTbfaZE69F +Fkt7GvyK3Bl0l1Ea3Ji2BVY2wJOisGO8U+ZfTKgi0PXu8d62ocbzOEUrJSWbCbWt +M/kOsfT+zBDdM1qIxRsjreBivUz/BYQ5qBFHQ/I7coqhpmEghz4gNaVNqPr+29+h +C5LYhBVBTZ+PYiSSeTr/i9iznb9XqSUhcth0pvxRF+iTvUFGhnwwxSzetlZhHWPP +hc2TVnCy3P9HVTPILk+QhSEXAnBdzIxHdfsAI2RUZoQVgf74x9TAw/hlWyRru/3W +/OnXiYXdADU6PzePB4jYAST7VcuTzMHJ3DdlYBWEFQ5vMlrPha3RloVh83UmiUv0 +efAXgSsQOnXk2ToVLTY+cVjXQYV62Az4ROf5fgvDJulEsMMcTq57qR7xL6fmGp1K +IIl0M6mY0US5zArNeokkLx29vmMjWnBI8zFsMqbABkaopfhtQRsodSD7RhMo9AGi +cE3Zh2K1btuQd3AaBDNTdTanlAtueVTN9DPNC0wDcTzmsCnDUpH1ZH7LtAw9j43l +fejyAjcU1I4zEZCSQxy6/zvUjcNW/Xkn4YiuYFnVCMqHfm14fR4= +=9BT7 -----END PGP SIGNATURE----- diff --git a/app-admin/scylla-jmx/scylla-jmx-3.0.2.ebuild b/app-admin/scylla-jmx/scylla-jmx-3.0.2.ebuild deleted file mode 100644 index dee6268..0000000 --- a/app-admin/scylla-jmx/scylla-jmx-3.0.2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/scylladb/scylla-jmx.git" - inherit git-r3 -else - MY_PV="${PV/_rc/.rc}" - MY_P="${PN}-${MY_PV}" - SRC_URI="https://github.com/scylladb/${PN}/archive/scylla-${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/scylla-jmx-scylla-${MY_PV}" -fi - -PYTHON_COMPAT=( python2_7 ) - -inherit java-pkg-2 python-r1 systemd user - -DESCRIPTION="Scylla JMX" -HOMEPAGE="https://github.com/scylladb/scylla-jmx" - -LICENSE="Apache-2.0" -SLOT="0" - -CDEPEND="dev-java/maven-bin:3.3" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${CDEPEND} - ${PYTHON_DEPS} - >=virtual/jre-1.8" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.8 - dev-python/pystache[${PYTHON_USEDEP}]" - -RESTRICT="test" - -pkg_setup() { - enewgroup scylla - enewuser scylla -1 -1 /var/lib/${PN} scylla -} - -src_prepare() { - default - - # fix symlink runtime error on scylla-jmx script - # * scylla-jmx is not available for oracle-jdk-bin-1.8 on x86_64 - # * IMPORTANT: some Java tools are not available on some VMs on some architectures - sed -e 's@"$LOCATION_SCRIPTS"/symlinks/scylla-jmx@/usr/bin/java@g' -i scripts/scylla-jmx || die -} - -src_compile() { - mvn -B install || die -} - -src_install() { - default - - insinto /etc/default - doins dist/common/sysconfig/scylla-jmx - - insinto /usr/lib/scylla/jmx - doins target/scylla-jmx-1.0.jar - - # removed because of src_prepare fix - #dodir /usr/lib/scylla/jmx/symlinks - #dosym /usr/bin/java /usr/lib/scylla/jmx/symlinks/scylla-jmx - - exeinto /usr/lib/scylla/jmx - doexe scripts/scylla-jmx - - newinitd "${FILESDIR}/scylla-jmx.initd" ${PN} - newconfd "${FILESDIR}/scylla-jmx.confd" ${PN} - - local MUSTACHE_DIST="\"debian\": true" - pystache dist/common/systemd/scylla-jmx.service.mustache "{ $MUSTACHE_DIST }" > scylla-jmx.service - systemd_dounit scylla-jmx.service -} - -pkg_postinst() { - ping -c1 `hostname` > /dev/null 2>&1 - if [ $? -ne 0 ]; then - ewarn - ewarn "**************************************************************" - ewarn "* WARNING: You need to add hostname on /etc/hosts, otherwise *" - ewarn "* scylla-jmx will not able to start up. *" - ewarn "**************************************************************" - ewarn - fi -} diff --git a/app-admin/scylla-jmx/scylla-jmx-3.0.3.ebuild b/app-admin/scylla-jmx/scylla-jmx-3.0.3.ebuild new file mode 100644 index 0000000..dee6268 --- /dev/null +++ b/app-admin/scylla-jmx/scylla-jmx-3.0.3.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/scylladb/scylla-jmx.git" + inherit git-r3 +else + MY_PV="${PV/_rc/.rc}" + MY_P="${PN}-${MY_PV}" + SRC_URI="https://github.com/scylladb/${PN}/archive/scylla-${MY_PV}.tar.gz -> ${MY_P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/scylla-jmx-scylla-${MY_PV}" +fi + +PYTHON_COMPAT=( python2_7 ) + +inherit java-pkg-2 python-r1 systemd user + +DESCRIPTION="Scylla JMX" +HOMEPAGE="https://github.com/scylladb/scylla-jmx" + +LICENSE="Apache-2.0" +SLOT="0" + +CDEPEND="dev-java/maven-bin:3.3" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${CDEPEND} + ${PYTHON_DEPS} + >=virtual/jre-1.8" + +DEPEND=" + ${CDEPEND} + >=virtual/jdk-1.8 + dev-python/pystache[${PYTHON_USEDEP}]" + +RESTRICT="test" + +pkg_setup() { + enewgroup scylla + enewuser scylla -1 -1 /var/lib/${PN} scylla +} + +src_prepare() { + default + + # fix symlink runtime error on scylla-jmx script + # * scylla-jmx is not available for oracle-jdk-bin-1.8 on x86_64 + # * IMPORTANT: some Java tools are not available on some VMs on some architectures + sed -e 's@"$LOCATION_SCRIPTS"/symlinks/scylla-jmx@/usr/bin/java@g' -i scripts/scylla-jmx || die +} + +src_compile() { + mvn -B install || die +} + +src_install() { + default + + insinto /etc/default + doins dist/common/sysconfig/scylla-jmx + + insinto /usr/lib/scylla/jmx + doins target/scylla-jmx-1.0.jar + + # removed because of src_prepare fix + #dodir /usr/lib/scylla/jmx/symlinks + #dosym /usr/bin/java /usr/lib/scylla/jmx/symlinks/scylla-jmx + + exeinto /usr/lib/scylla/jmx + doexe scripts/scylla-jmx + + newinitd "${FILESDIR}/scylla-jmx.initd" ${PN} + newconfd "${FILESDIR}/scylla-jmx.confd" ${PN} + + local MUSTACHE_DIST="\"debian\": true" + pystache dist/common/systemd/scylla-jmx.service.mustache "{ $MUSTACHE_DIST }" > scylla-jmx.service + systemd_dounit scylla-jmx.service +} + +pkg_postinst() { + ping -c1 `hostname` > /dev/null 2>&1 + if [ $? -ne 0 ]; then + ewarn + ewarn "**************************************************************" + ewarn "* WARNING: You need to add hostname on /etc/hosts, otherwise *" + ewarn "* scylla-jmx will not able to start up. *" + ewarn "**************************************************************" + ewarn + fi +} -- cgit v1.2.3-65-gdbad