From 827df1d2b37fc1186f10738c4c6e9b1b1270ea4a Mon Sep 17 00:00:00 2001 From: Ultrabug Date: Tue, 21 Jan 2020 10:25:56 +0100 Subject: app-admin/scylla-jmx: version bump Package-Manager: Portage-2.3.81, Repoman-2.3.20 Manifest-Sign-Key: 34FCB257983BA23A8CEC5EB7EB9E6405C24BFAE5 Signed-off-by: Alexys Jacob --- app-admin/scylla-jmx/Manifest | 18 ++--- app-admin/scylla-jmx/scylla-jmx-3.2.0.ebuild | 93 ++++++++++++++++++++++++++ app-admin/scylla-jmx/scylla-jmx-3.2_rc3.ebuild | 93 -------------------------- 3 files changed, 102 insertions(+), 102 deletions(-) create mode 100644 app-admin/scylla-jmx/scylla-jmx-3.2.0.ebuild delete mode 100644 app-admin/scylla-jmx/scylla-jmx-3.2_rc3.ebuild diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest index e48a3a8..a5d8279 100644 --- a/app-admin/scylla-jmx/Manifest +++ b/app-admin/scylla-jmx/Manifest @@ -14,20 +14,20 @@ EBUILD scylla-jmx-3.0.9.ebuild 2300 BLAKE2B 3b8e24d44c56935434659fcab6549ff7a37a EBUILD scylla-jmx-3.1.0.ebuild 2150 BLAKE2B b8871d1919d1ac1a086b757d66ac3f541a2f167d107a3f43cae83f92141d06bb643aa6a8868c5c15a7c81abb4e2f3e3cb36a8b258043c7b834cd1e0002fceb5c SHA512 da96882e13fb025ee0e8a801d5632ef84c073d9f68f1d89f1af5b6d326cf6641e65a2363096aa0478059a430eb146e83c2ed6a3b566d33d494bb07839c22ecb2 EBUILD scylla-jmx-3.1.1.ebuild 2150 BLAKE2B b8871d1919d1ac1a086b757d66ac3f541a2f167d107a3f43cae83f92141d06bb643aa6a8868c5c15a7c81abb4e2f3e3cb36a8b258043c7b834cd1e0002fceb5c SHA512 da96882e13fb025ee0e8a801d5632ef84c073d9f68f1d89f1af5b6d326cf6641e65a2363096aa0478059a430eb146e83c2ed6a3b566d33d494bb07839c22ecb2 EBUILD scylla-jmx-3.1.2.ebuild 2150 BLAKE2B b8871d1919d1ac1a086b757d66ac3f541a2f167d107a3f43cae83f92141d06bb643aa6a8868c5c15a7c81abb4e2f3e3cb36a8b258043c7b834cd1e0002fceb5c SHA512 da96882e13fb025ee0e8a801d5632ef84c073d9f68f1d89f1af5b6d326cf6641e65a2363096aa0478059a430eb146e83c2ed6a3b566d33d494bb07839c22ecb2 -EBUILD scylla-jmx-3.2_rc3.ebuild 2165 BLAKE2B ee0d56c1008b533ad4cba3f502524d545268467d1b317c12bd64f8400bb37f56cb8e17ae3fc4a2640914edcfac3634b446933c37488cd3a9c44e0fd01ef500f1 SHA512 018da94177f1d577f5bba6facb2d37b3e4f164479c23663ef66493824346aceb482906e1de95c345129573df625a6ff4f2931e1400329783cded2bf3b77f1eb4 +EBUILD scylla-jmx-3.2.0.ebuild 2165 BLAKE2B 276451ee1fa097b5028b7a5281426a5c50c845e3eb0cb4a30db069d4497d8e6c2f7894add10907830a4fce26fae4827d2b54eaf8a89fd57881485744b3aca317 SHA512 b4d2d8a2ca89c21e690ae7dd0c9114512390b4a3ef9fb34a07c5aa54056aded4089ad35d9cb5d77222f136b7f86e0f6867d1159cfc51be47d145807f5bc0a525 EBUILD scylla-jmx-9999.ebuild 2156 BLAKE2B 24940d3f607b1ad2794e3a17ac8cd9cfdc213c0afcbee28a7215b9b4e010c41c78a30a0fa2ff90a023378bb0b9a5e1aa11b88438215aa8e3c158cc4cba3faccb SHA512 79c973c82d1f961be034f8eb2040ce89eb9a227d1c936a42a68afe9bc73d994c46327465f5105fc4ae61b27ac7aef460ec80e5fba38f7feca7f4daa39f4c567d MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl37YvhfFIAAAAAALgAo +iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl4mw3dfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDA3 QjM0NkQ4QUE4RDZEMEMzQzgyQTQzQjUxRkYyM0YxQUM5Nzc3MkYACgkQUf8j8ayX -dy9YAggAtBdgbCSSPS1lCdYCunGJFBQsDzwotmDHCm7sVR1UEBcikuutrYfpfev/ -Dob9TEz0A89QYGOuO6j5CzfupwuZjAMPT5uPIs7BBKEwkG6fcpSh3bOb5QKIMBIg -MTL8Rg+95ebvsnbWf3AU/nsxIBbTvhcxHrMRg4vpEJoh6oXMYG4Uq+napw6lU02b -2haOKi1WL8TO7TgGv5QwODHI9NNVCDDhZ1tXgCyVsIak4YLieYY0zX1JENUOCDsX -m0hcYeCPbKj5d9Z+JPOu8EmY0xGFuTaq+T+JJvV4Jw9bnHvf/VagfQ3QAzypD08d -gagUdKT2YHvRzMUfb56hQgf4nFojBQ== -=A5xs +dy+svQgAiDU3XnN0XBRThEKUNtPqGUwhSHjQxry9xMFHSWhECB2VUnOgZZw9oVkl +AIIFxduKMTFiZraJ0Bo4lO+VknCouIqSe2Zd0IWBm8gcRVbqD2Tj1j3poqDU6Sca +ng3+zSveTWBhrrNr4WmkI73CtPWEje/q+5SYba/AR9sRCcTaaWX26rlQouKIDyBg +LgXRu3UZTjuu/ocORfT6E/BiDhg5b5f96VnPegoQHctcEb8nZLcQDjrME8Xztxfh +4OK+2pVwikll/vY+gJ/4ULWyoPyiuC/Hli2dMLOHRMkt/KL34z5gAkKiUuUfMpzO +saETAMr4GMOAtpuUzMfEv8ei65gzgw== +=Liy3 -----END PGP SIGNATURE----- diff --git a/app-admin/scylla-jmx/scylla-jmx-3.2.0.ebuild b/app-admin/scylla-jmx/scylla-jmx-3.2.0.ebuild new file mode 100644 index 0000000..abefda0 --- /dev/null +++ b/app-admin/scylla-jmx/scylla-jmx-3.2.0.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MY_PV="${PV/_/.}" +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" + +KEYWORDS="~amd64" +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() { + pushd scylla-jmx-parent + mvn -B install || die + popd +} + +src_install() { + default + + insinto /etc/default + doins dist/common/sysconfig/scylla-jmx + + insinto /usr/lib/scylla/jmx + doins target/*.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.2_rc3.ebuild b/app-admin/scylla-jmx/scylla-jmx-3.2_rc3.ebuild deleted file mode 100644 index 18fbcfe..0000000 --- a/app-admin/scylla-jmx/scylla-jmx-3.2_rc3.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PV="${PV/_/.}" -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" - -KEYWORDS="~amd64" -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() { - pushd scylla-jmx-parent - mvn -B install || die - popd -} - -src_install() { - default - - insinto /etc/default - doins dist/common/sysconfig/scylla-jmx - - insinto /usr/lib/scylla/jmx - doins target/*.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