From fd3716cfc582d7fd8c97bd80ffe9c4eb24a3a034 Mon Sep 17 00:00:00 2001 From: Ultrabug Date: Mon, 1 Oct 2018 11:00:48 +0200 Subject: dev-db/scylla: bump to version 2.3.0 --- app-admin/scylla-jmx/Manifest | 4 +- app-admin/scylla-jmx/scylla-jmx-2.2.0.ebuild | 95 ---------------------------- app-admin/scylla-jmx/scylla-jmx-2.3.0.ebuild | 95 ++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 97 deletions(-) delete mode 100644 app-admin/scylla-jmx/scylla-jmx-2.2.0.ebuild create mode 100644 app-admin/scylla-jmx/scylla-jmx-2.3.0.ebuild (limited to 'app-admin/scylla-jmx') diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest index 96a7b9c..a469109 100644 --- a/app-admin/scylla-jmx/Manifest +++ b/app-admin/scylla-jmx/Manifest @@ -1,6 +1,6 @@ AUX scylla-jmx.confd 243 BLAKE2B a056f7c70df3ff6c903a182f352aa34ca9d23eed458b7c6f5a51c9f6656cf0f989c133e8e45b221991800fcc79fd1505b037410dde7d5dfffdf75e0ee6670090 SHA512 18b5f550c2e0616f4c0da123adfda3fb959bec5711b6be57df3e316613cfa154467353e65504b6b68852911f8faa21f1acccf3fa51970a132b639c1e6d1ea402 AUX scylla-jmx.initd 592 BLAKE2B e1492a3da5ab275fbe6f7f1f4f9beaa3129f037fa54523211a8628d479e196a2da711c41c8051416612d34322c3261e95c3370525e68c84eb80c98ac0949ab69 SHA512 8bf35201a2dd240b1e74d35c3153251f2c15878f2454a8ed05f006ad35679a85d08de413dc8ce8b53aaa2b8e367a806a76d56d63d9b691f4bac569b647764037 -DIST scylla-jmx-2.2.0.tar.gz 98666 BLAKE2B bb024576bf3eff4188b4aa8654932cb6521ff492f4d227c43b810c70b0df26ea7a76ec8eacadb1d82c1d79e1ee887b03ab12ad55b4fb3bddcc0dccfaeefcdfd0 SHA512 b1bd6906930504d887a804c81af748318e0e84482669ef69b8ed795d7047e66064eb6d69bc2fd786c303252ca78599e23b483b1c740e00540e34d932afde7f83 -EBUILD scylla-jmx-2.2.0.ebuild 2355 BLAKE2B f8001c2f7f4c06ec1012d50449294eff4bf3307bfd5439baecc921c7d925324a1c136ef46eb3fe0b0988e9f9582c493819625b9659b334ca5297c21afc7995af SHA512 1e8c37dfdd7bd3fa7c2558d23e1659c65dfccce50d40ab20bdf11794a87e99a5ff6187269dae86922596ca196d0729897147114b9c7060867bea0b6653422d49 +DIST scylla-jmx-2.3.0.tar.gz 103133 BLAKE2B 4ccac783156e0fcc0c9e24e7e5a949db2aac6a5f60ad0335b66242969063a9c5795164f6b862fcbc731da8fdc22525adcd2f7a59e3961c1fa06556e79d2f8575 SHA512 3fc158daf11625ecf2cd600b05d08f3f1457a8db6d2feb52c3ab55616976f6c24ad7129186bee143b5889b5ad31ab2a985d0cb1fbabb8b9266d876fe1a94214b +EBUILD scylla-jmx-2.3.0.ebuild 2303 BLAKE2B 938bff52beba93b9a8b22e1fb7fc470ad44ec0140393b0e62753b80fa204d1c5e2d309e5ae820044f45e36bda95b9f05565e057413dc47615551a3f1dba920f5 SHA512 227f871e5620956f0070a83a3d18d4f2e703160df46de7fca5b63c3742291d342ba6d71d5cc81adbaacaea56d4e7315acc99b707840be852fe54092d7d0e3471 EBUILD scylla-jmx-9999.ebuild 2354 BLAKE2B 2dcb7c649f9ed55001cd7c9367911403de1f1afdf05db92d1df9dc32918c073ba775e74b1b0d093c828e38265024ba6ddcd2cd08a4a60353caa56830ec8b3004 SHA512 29120858692d1404b4a277cd0d807137a7a35d047be4ae5cca521b6d152582a79dce4a45e4189530b6300d54eb53a40e0a8f39ff62ffb1c88386299242f785ab MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c diff --git a/app-admin/scylla-jmx/scylla-jmx-2.2.0.ebuild b/app-admin/scylla-jmx/scylla-jmx-2.2.0.ebuild deleted file mode 100644 index 001ec6f..0000000 --- a/app-admin/scylla-jmx/scylla-jmx-2.2.0.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2018 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 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" - -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.3.0.ebuild b/app-admin/scylla-jmx/scylla-jmx-2.3.0.ebuild new file mode 100644 index 0000000..9c936ee --- /dev/null +++ b/app-admin/scylla-jmx/scylla-jmx-2.3.0.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2018 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 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