From 84af5c7d5ac8e6c6af844813d387aca5731844e8 Mon Sep 17 00:00:00 2001 From: Ultrabug Date: Fri, 17 Nov 2017 13:44:43 +0100 Subject: scylla: version bump to 2.0.1 --- app-admin/scylla-jmx/Manifest | 4 +- app-admin/scylla-jmx/scylla-jmx-2.0.0.ebuild | 90 ---------------------------- app-admin/scylla-jmx/scylla-jmx-2.0.1.ebuild | 90 ++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 92 deletions(-) delete mode 100644 app-admin/scylla-jmx/scylla-jmx-2.0.0.ebuild create mode 100644 app-admin/scylla-jmx/scylla-jmx-2.0.1.ebuild (limited to 'app-admin/scylla-jmx') diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest index d7ce837..f72beb8 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.0.tar.gz 98505 SHA256 1d9866cdac795492802b9a020080248f631b010b1ba22ee7a74ffa4ae682e113 SHA512 35f5ed31c081656a83bdf6ada0969fec77c954f4c568816a592c0936e8faa855e888578de2b885e9ba6a84ffe5c3da2fe4125ab3c0c1eca760e8bd134a8a7588 WHIRLPOOL fd6c15d04c245981565367357df109b0193b120eaf75a0a567f66fa83b5c0efd7e4028d3ed5b0ef57864e3ea360d3cee43b7453d3e6d086f52b79e2ab8b7f713 -EBUILD scylla-jmx-2.0.0.ebuild 2303 SHA256 3062fe2e2e1fd21814b93f383321becde22a9c1394bf58c948921869780c62ad SHA512 8b48edd4c8ba7e8739596b0531fe570f7b40565b90f0778f339bf523d14edb706f751913018553ef6dd89d6f66306143c0f6a2f6ae493352e9cec7d62208f810 WHIRLPOOL 41f0a4dc70eb530b98e8950b8ef7cfdd1ce3e8303665c229d109bcc3db2473724f466e53a5f514dfcf4b6332ee1e8b98eb4415b8b15cc44790903140a10c57bf +DIST scylla-jmx-2.0.1.tar.gz 98501 SHA256 4f025d52379dd39ca0a998c5a1577da2f44e5a9caf3dd24b928a20a628ef153f SHA512 251143b1d07384fc9b9b5425ab255e628a26332be69485d913006b9b0fb8c4d00fe904f38adf6c5be2992828758e0503a683b219fa2058bb9bbed395b56899b4 WHIRLPOOL d12ebd2b06bef93e753974a75afdd126dacf34a40848afa4b63616b27e9beb01007e911a3a10fd69783c5b47df43b68772ea0346cefd7bdadeb924c8b9e91a38 +EBUILD scylla-jmx-2.0.1.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.0.ebuild b/app-admin/scylla-jmx/scylla-jmx-2.0.0.ebuild deleted file mode 100644 index 3bae0e9..0000000 --- a/app-admin/scylla-jmx/scylla-jmx-2.0.0.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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 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" -RDEPEND=" - ${CDEPEND} - ${PYTHON_DEPS} - >=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 systemd service config path - cp dist/common/systemd/scylla-jmx.service.in dist/common/systemd/scylla-jmx.service || die - sed -e "s#@@SYSCONFDIR@@#/etc/sysconfig#g" -i dist/common/systemd/scylla-jmx.service || die - - # 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} - systemd_dounit dist/common/systemd/*.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-2.0.1.ebuild b/app-admin/scylla-jmx/scylla-jmx-2.0.1.ebuild new file mode 100644 index 0000000..3bae0e9 --- /dev/null +++ b/app-admin/scylla-jmx/scylla-jmx-2.0.1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2017 Gentoo Foundation +# 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 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" +RDEPEND=" + ${CDEPEND} + ${PYTHON_DEPS} + >=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 systemd service config path + cp dist/common/systemd/scylla-jmx.service.in dist/common/systemd/scylla-jmx.service || die + sed -e "s#@@SYSCONFDIR@@#/etc/sysconfig#g" -i dist/common/systemd/scylla-jmx.service || die + + # 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} + systemd_dounit dist/common/systemd/*.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