From e20514faf2ad287eea21adf0e8955964f6f0ecc6 Mon Sep 17 00:00:00 2001 From: Ultrabug Date: Fri, 18 Oct 2019 09:52:40 +0200 Subject: app-admin/scylla-jmx: version bump Package-Manager: Portage-2.3.76, Repoman-2.3.17 Manifest-Sign-Key: F30FAFEE3BD598228B24CB121A3A8C89C56D610B Signed-off-by: Alexys Jacob --- app-admin/scylla-jmx/Manifest | 28 ++++---- app-admin/scylla-jmx/scylla-jmx-3.1.0.ebuild | 90 +++++++++++++++++++++++++ app-admin/scylla-jmx/scylla-jmx-3.1_beta.ebuild | 90 ------------------------- 3 files changed, 104 insertions(+), 104 deletions(-) create mode 100644 app-admin/scylla-jmx/scylla-jmx-3.1.0.ebuild delete mode 100644 app-admin/scylla-jmx/scylla-jmx-3.1_beta.ebuild diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest index 73f76c5..6eaef02 100644 --- a/app-admin/scylla-jmx/Manifest +++ b/app-admin/scylla-jmx/Manifest @@ -11,25 +11,25 @@ EBUILD scylla-jmx-3.0.10.ebuild 2300 BLAKE2B 3b8e24d44c56935434659fcab6549ff7a37 EBUILD scylla-jmx-3.0.6.ebuild 2300 BLAKE2B 3b8e24d44c56935434659fcab6549ff7a37a64ee52e0228b64aef00dfdc66d8e333b3f7b910698f4042f92019cca489e1e68f5323409ba4e4c7a8e0ae301aee0 SHA512 f78a41cd4ed1b08adbe406c8e58ea741b1731b263981ca20b36ddaaab0c8224b092042fe427770969ad404bc51cd68f997e63bcfda78bdfdf8f048b9ad1e117f EBUILD scylla-jmx-3.0.8.ebuild 2300 BLAKE2B 3b8e24d44c56935434659fcab6549ff7a37a64ee52e0228b64aef00dfdc66d8e333b3f7b910698f4042f92019cca489e1e68f5323409ba4e4c7a8e0ae301aee0 SHA512 f78a41cd4ed1b08adbe406c8e58ea741b1731b263981ca20b36ddaaab0c8224b092042fe427770969ad404bc51cd68f997e63bcfda78bdfdf8f048b9ad1e117f EBUILD scylla-jmx-3.0.9.ebuild 2300 BLAKE2B 3b8e24d44c56935434659fcab6549ff7a37a64ee52e0228b64aef00dfdc66d8e333b3f7b910698f4042f92019cca489e1e68f5323409ba4e4c7a8e0ae301aee0 SHA512 f78a41cd4ed1b08adbe406c8e58ea741b1731b263981ca20b36ddaaab0c8224b092042fe427770969ad404bc51cd68f997e63bcfda78bdfdf8f048b9ad1e117f -EBUILD scylla-jmx-3.1_beta.ebuild 2130 BLAKE2B 58b7a92314ae726365fa4346d98c73abd5b9b7bb40727d73a47fc0d214f0a190f6413303f510443579905bf5257783fb29c0c77d94407ab233b2b765a5f5acc0 SHA512 66dfa539f57e352c8d610c12a1d2f842a3cdb84f4aa1073eb8c0777d1da40454357daa27ad6b48db5ef22ab7abdf9b693700ba2ea70a876391962a8594503601 +EBUILD scylla-jmx-3.1.0.ebuild 2132 BLAKE2B f28a85925622cf8466c21290c6cc892ab6ece580775da8eaa62046a753d5746c319ded968779ff534f756a0585235464c4656925b398bebffe87f1e68ac982a9 SHA512 cb8ef48c45de32550a4a7e2a6fad7614f272a3ceee5c20827196a11291852d5601c47fcc27ffd54088e9a6aa24db453e581253510541dff8b1f2451a97d87f83 EBUILD scylla-jmx-9999.ebuild 2156 BLAKE2B 24940d3f607b1ad2794e3a17ac8cd9cfdc213c0afcbee28a7215b9b4e010c41c78a30a0fa2ff90a023378bb0b9a5e1aa11b88438215aa8e3c158cc4cba3faccb SHA512 79c973c82d1f961be034f8eb2040ce89eb9a227d1c936a42a68afe9bc73d994c46327465f5105fc4ae61b27ac7aef460ec80e5fba38f7feca7f4daa39f4c567d MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQKTBAEBCAB9FiEEGiPLJcoPPNcvDvnY9mwK1B9ohkIFAl2E8oBfFIAAAAAALgAo +iQKTBAEBCAB9FiEEGiPLJcoPPNcvDvnY9mwK1B9ohkIFAl2pbytfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDFB MjNDQjI1Q0EwRjNDRDcyRjBFRjlEOEY2NkMwQUQ0MUY2ODg2NDIACgkQ9mwK1B9o -hkK8iw//ebbp7K01aLxXg2YOOW3XoIhQMur9e2lTAeqKVb5CiLrp5cYbLCz9WeV3 -ye0saxMoTbTii4/8i6JxdOKzOwDW0iQ284mxXyK1kogIbsnQdJbfE+2zIoxcFMj+ -eHF6WOB67yKOdPa3wYbf5RJWEhFGr6pUpIE0FXedCpnKiHW193bdNs9C0+sVCBtB -6cdiP9w3VsAoVNITMDyyIiX/dJc1H4VpUtcLC57UVIlEHVvY3M3h+yFn4XBzIMMW -p4uJOCEg/MbAvTU8rSHdbCUVSc9sIa9Uxi6ZBi5cNWO2cGR/PoUdawYuKcdHs9Xy -4zHXysS337+l8+y1SWgEistSng1zUgFtb+wZETz5h9hsjmxZ0aoqdIt1rPVf07AI -wdp79PQRdEXhYIrFBh94O6ow8GwCIs/qa4/+9oq266d6C+hD+grur8CDPTYGnh+c -0RfqUIB/lfuBojwm/UF37OqQnlLhUdnL8Fgq2Go+BaETFkQlJeje6qY+ItYh7sHi -+0q8cPRl51Iv/N7/4vAcwPmq6Xh7G37GmhPgQhfgg7mNl0+nHsGVfiZv8RULcP3o -EjCsSx6nJGFTeGmuZFAGa+9pRWwYGWhCRkaA6hliZBlT++nr8c+Xth/aRbPAPThs -JFJgKmi0BKN8Y/rc2My9qH5Imq88mZKSqM3iJR7ZO4bySG4Y7MA= -=Nr+G +hkKqlRAAkKPVokOqqmU3nHqHhFkMwo447xs03jjatQWSS3MrhVuD3mPNROTQKO86 +KC13kIo/QNNB6LR9PjbS+S0I9ftpOqXDmakvl7HJGtykaVhBMH0Q/13w24tdCwlX +NuEhGScnBzlcvASrkUuETe0NdLRrBRNQezfgaa/aY31fSIlNYVU/YzW5BIf0KiJr +STocH0jYUOGlthAN2YYScXGFQYrItrevCdsMyNa28+pB+U2rsejXlzoOIaMD3kBq +LdhNlX7E1JxaTSxSAslLALbIAUQInRL3RRzcylxAvIm2Wip+KzfhBljLzOJ7iO4Q +A2LeMyd/xi9A6N2MvOylVFmBKB9HX6xIi5KqsM5rlXtq+TmwZFbwrTinL7OhAKJZ +RICmiq19wdUJ22A/RhQtaphiZyNMeIcsgBuGjH1Chp+FKleubqlw3xkDD5wSzhsH +uQeiLfvEzwUlGaGY9WichqBnAFGF5bL6yl38G+R3xZv07MDNDyxQonbVODGz+0vW +L6I/Ycxb3cJaNGlPfjrMdsOjR85iXOn3KiZ96IE53Ho/41JkUWzviR9eFnYENFDg +iSf44ZAymB7OILb5vhaVT7Ph+q99g+eQFyzfm456PXIYjp011XUJ8weU5zyWSYZY +TGAOQ2Mr5n4Eai8oeA9R8kgKpdWnJdU/FevI7Ey1WWBXfrZSy1Q= +=m0F1 -----END PGP SIGNATURE----- diff --git a/app-admin/scylla-jmx/scylla-jmx-3.1.0.ebuild b/app-admin/scylla-jmx/scylla-jmx-3.1.0.ebuild new file mode 100644 index 0000000..bd94dd5 --- /dev/null +++ b/app-admin/scylla-jmx/scylla-jmx-3.1.0.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MY_PV="${PV/_beta/}" +EGIT_CLONE_TYPE="mirror" +EGIT_COMMIT="scylla-${MY_PV}" +EGIT_REPO_URI="https://github.com/scylladb/scylla-jmx.git" +inherit git-r3 + +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} + dev-python/pystache[${PYTHON_USEDEP}] + >=virtual/jre-1.8" + +DEPEND=" + ${CDEPEND} + >=virtual/jdk-1.8" + +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.1_beta.ebuild b/app-admin/scylla-jmx/scylla-jmx-3.1_beta.ebuild deleted file mode 100644 index 6851696..0000000 --- a/app-admin/scylla-jmx/scylla-jmx-3.1_beta.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PV="${PV/_beta/}" -EGIT_CLONE_TYPE="mirror" -EGIT_COMMIT="next-${MY_PV}" -EGIT_REPO_URI="https://github.com/scylladb/scylla-jmx.git" -inherit git-r3 - -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} - dev-python/pystache[${PYTHON_USEDEP}] - >=virtual/jre-1.8" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.8" - -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