From cbf8b3a68e7a7871459569e23cb4c7aa643598b1 Mon Sep 17 00:00:00 2001 From: Ultrabug Date: Fri, 28 Dec 2018 15:57:00 +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_rc2.ebuild | 95 -------------------------- app-admin/scylla-jmx/scylla-jmx-3.0_rc3.ebuild | 95 ++++++++++++++++++++++++++ 3 files changed, 110 insertions(+), 110 deletions(-) delete mode 100644 app-admin/scylla-jmx/scylla-jmx-3.0_rc2.ebuild create mode 100644 app-admin/scylla-jmx/scylla-jmx-3.0_rc3.ebuild (limited to 'app-admin/scylla-jmx') diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest index f7d55c3..531d77c 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.rc2.tar.gz 105647 BLAKE2B 765824a04b1026e88fb36726baa742bf89392bd31623e3060ba6b917d3f8674d00c4ea0dbc9eb279921624dcf78cd782c62b5a686fa08f60723493251751e1c4 SHA512 ecd793f3ee040200f3e7d1344b5dcd951817667be6d1d446a3ef5b6f51f99e3847ba4ad999081586bb043bbf0bf730b73f7a2bdf7bacef5971c39dc38fc78a0d +DIST scylla-jmx-3.0.rc3.tar.gz 105646 BLAKE2B c51830dc708b9cab28d5d9da7c2296c3221197bcdac15856af072561313197d7c7d465cc0d2ae9fcb8f7d28887f6abf1c86a7fa8d73afdbb026274843a29deaf SHA512 cb0de6bb2b2aa95d12873b545982f13b8b4a6f204f3ed17bb3f67d87ffeff29d166de3e716fdc0b0616456566497935475c2864306ec6c671f19de78951cf518 EBUILD scylla-jmx-2.3.1.ebuild 2300 BLAKE2B f8427423572652f682de88c20fe8cec52862ef5277334d335be53fdf51950a9e5b3ffde20470bb2cf3e5d16698d6c305da2fa1d90f2b2cc7abd9185e6743e2c4 SHA512 e0f6122bd75a0928d9edb4541732c2da059e2c6201bfd03b88d18ec8df31449e820d93ae60b3d2019730c6fc4ad11ad3627760216f4284c0b970472daa81aa10 -EBUILD scylla-jmx-3.0_rc2.ebuild 2300 BLAKE2B f8427423572652f682de88c20fe8cec52862ef5277334d335be53fdf51950a9e5b3ffde20470bb2cf3e5d16698d6c305da2fa1d90f2b2cc7abd9185e6743e2c4 SHA512 e0f6122bd75a0928d9edb4541732c2da059e2c6201bfd03b88d18ec8df31449e820d93ae60b3d2019730c6fc4ad11ad3627760216f4284c0b970472daa81aa10 +EBUILD scylla-jmx-3.0_rc3.ebuild 2300 BLAKE2B f8427423572652f682de88c20fe8cec52862ef5277334d335be53fdf51950a9e5b3ffde20470bb2cf3e5d16698d6c305da2fa1d90f2b2cc7abd9185e6743e2c4 SHA512 e0f6122bd75a0928d9edb4541732c2da059e2c6201bfd03b88d18ec8df31449e820d93ae60b3d2019730c6fc4ad11ad3627760216f4284c0b970472daa81aa10 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+v7jvVmCKLJMsSGjqMicVtYQsFAlwdYg1fFIAAAAAALgAo +iQKTBAEBCAB9FiEE8w+v7jvVmCKLJMsSGjqMicVtYQsFAlwmObpfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEYz MEZBRkVFM0JENTk4MjI4QjI0Q0IxMjFBM0E4Qzg5QzU2RDYxMEIACgkQGjqMicVt -YQvxIBAAjdXiQXjDkzcv6UtlDCh2AsKHfLpSgQDF0avLK7QiQnuXPYjYOg1k+Ucl -+dYlBGAvSw8SzTx71TEdpi3sh0EBggiA58O27xEHI/b58GdQOobvDtA0G5UXirZA -q0CAywHqmqSkw+qlgK+qL5ybswg+2XSKkwAXRxDTdRmEZawwKEXrDkpvH3tDntV3 -0zTBcf9t2jxxSEpWGfYJ+g2LScIMxNyHzxrndjejHAVjpdQQW0Iiz/KtnscZ/igc -VLG73WoetZHwStOgoD9RHLMYqZKiBw2WNnLfCf/eYFKKJ2bVQ0j9hwv5LnLflfiu -Cwb2ECve2S1CSIYJKDW+2rTiAWCGGEtdXJq2ET40PCwm5R547ldGOoQeTALgr82o -fSsLLonYpX5v9Vi1WO7aEmazSJX2sDHGvMTiZuTIolxnpB3MhwS7lzMnI7VOkv1T -IWr0atz2OpImJK6d7F6Clb9gF3MHz5zauhtf738r9V0y+ko9pOkjHxdKb9UikA1g -iF3SoFlm405LOQ0J94pytsgM2FmclIncrbLmO33m5Mp2Nyx/LBFL0wW0H368ytx+ -A7YHhO5cPTP8kMc/6wSnLulVoDaYiGv2MpKwC6jprT7arQDK0AbXeKVg7we+TUoI -j3JpyTMXq/ki8+1zR3vakWckA3B+dasmnx/aPEDRTzHu5aoPPGA= -=FB/x +YQs/Rg/9EcktVX7iJqyb3f3k6BUEQebS/l7G6NMWgHJQXqIPi3F4//aaxvohmGWy +T+htWN7lTeVG7u4w9PN9zwf8XvYoWe1Nx8rkANE4ZGSeAq5ZptWxc1pbWTFif3Br +kIQUU6k+0HMGF7pMU6ZPWGPugYhtYEgtaqVeUolBhXd/xZQKUBjcO+NcQs2Ui9E1 +A9TEGdJqeGxXAm+FDigPRAISlrsn0zjvp5dUCBkskUw5elP8ohSTtrHjI9HrkKSu +/v3OrQO7tVtY8l09bGkbxwB5Iweo7s4lbI5Lr9z39Kijh8cV4ciHl6qZgSecg9OF +1WYAaYk3cSj6QJz7laV1lqghHCnvUk5coG40o1vkfnbD0lnn/WH/Yc5MyrYutIzj +0ncL6NNC1FWoKp73wyIuAxBh2S5k0jwZaK9jfsZG72fkjZYbEjg2w42QT7xaQMvp +fGYESRuJQ33/jR2zKsA84WdLYyUvRahTuR+RiCuQZTHh55Iyv4/nTbsuIHHC+Jny +YjzhxkE3jWRDPRpgMr7d/iKtNzyuq0iQgtkOZbzfObB+8JM8E3NpP6KvI3i6fZa4 +DPnydS8QLVAfKerck5GkSaLACt6NaFy2yxIs/tZpNaTm2/9qRQSLqJVikG5j88uR +ygw+lQWeLbAJm4CEhiXXh6zDqVDGd0phKxuVrtlSKUf4zc3LHjE= +=CiQ7 -----END PGP SIGNATURE----- diff --git a/app-admin/scylla-jmx/scylla-jmx-3.0_rc2.ebuild b/app-admin/scylla-jmx/scylla-jmx-3.0_rc2.ebuild deleted file mode 100644 index a4fc91c..0000000 --- a/app-admin/scylla-jmx/scylla-jmx-3.0_rc2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2018 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_rc3.ebuild b/app-admin/scylla-jmx/scylla-jmx-3.0_rc3.ebuild new file mode 100644 index 0000000..a4fc91c --- /dev/null +++ b/app-admin/scylla-jmx/scylla-jmx-3.0_rc3.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2018 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