app-admin/scylla-jmx: version bump

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Manifest-Sign-Key: F30FAFEE3BD598228B24CB121A3A8C89C56D610B
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>

2 files changed, 110 insertions, 13 deletions

diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest
index af14f43..df8d7d4 100644
--- a/app-admin/scylla-jmx/Manifest
+++ b/app-admin/scylla-jmx/Manifest
@@ -4,25 +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-3.0.6.tar.gz 105826 BLAKE2B 5507a791a9a0c8d208640503e86689519facffad780853d7ffdc6b232552eabc8a13b3b1df126854c23a1ab707958910aaa5aa31ad9809752dc3de86fe4cbf69 SHA512 289b981faabf2d7221d17aee42db912bc67571d56d13548e88db9627e8cb79133ca9b69d90a2637d887fb1ae2f70b064f759a1156269ab6bf74f0d22b2a7fc59
+DIST scylla-jmx-3.0.7.tar.gz 105845 BLAKE2B 7b59282b9738b4417edb50563747624a75c1ca6cf14531f23eb550cc28b94f47ef99bfb2b94663e22f9849f47b31ea22d2d586621182383de7a0906461326610 SHA512 37087ccaa4a22f992a49752052cb51ef8a79297464bbf28c94898e390f64a7d7c931233f0127f7a7a2372342316f08a5298bb1e8722d13d8099d14f960e89a7b
 EBUILD scylla-jmx-3.0.6.ebuild 2300 BLAKE2B 3b8e24d44c56935434659fcab6549ff7a37a64ee52e0228b64aef00dfdc66d8e333b3f7b910698f4042f92019cca489e1e68f5323409ba4e4c7a8e0ae301aee0 SHA512 f78a41cd4ed1b08adbe406c8e58ea741b1731b263981ca20b36ddaaab0c8224b092042fe427770969ad404bc51cd68f997e63bcfda78bdfdf8f048b9ad1e117f
+EBUILD scylla-jmx-3.0.7.ebuild 2300 BLAKE2B 3b8e24d44c56935434659fcab6549ff7a37a64ee52e0228b64aef00dfdc66d8e333b3f7b910698f4042f92019cca489e1e68f5323409ba4e4c7a8e0ae301aee0 SHA512 f78a41cd4ed1b08adbe406c8e58ea741b1731b263981ca20b36ddaaab0c8224b092042fe427770969ad404bc51cd68f997e63bcfda78bdfdf8f048b9ad1e117f
 EBUILD scylla-jmx-9999.ebuild 2351 BLAKE2B 233492dfb11e01126d1e10d71a48a5e1ebd944d623e1680af1e2b65f368920bf6396b6fc18b45e434b0d26b8ef9ec9f03840d25128ef851f0cea351e28bade8f SHA512 4f305713b7b19481eb616171bd38307ca262b1aba3a60bb14b863b8c3c2304dfc30ac716d3e319212fc2bddc22d957b0f7bc6954e64a600222ca27761ef8e097
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEGiPLJcoPPNcvDvnY9mwK1B9ohkIFAlzTCMlfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEGiPLJcoPPNcvDvnY9mwK1B9ohkIFAl0CY/NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDFB
 MjNDQjI1Q0EwRjNDRDcyRjBFRjlEOEY2NkMwQUQ0MUY2ODg2NDIACgkQ9mwK1B9o
-hkIC3g/+Pn4me+F2DPogrXS5J4+SFtQWwaAblO6KRndsjiL/weqCIwwcbTgeRGYL
-YOWEoSaFpIkcIdIlWlSYUGKlDuAnKLs7ww+9odIa71JjVVaHsW8Nuf6XyhFVxWqe
-dXBVLeADdPEIgE/dNE/PlzRcpB/yhKG86AHimei/lR6uZRtcTOP999LsgTb+m4bY
-LAs8xBjmFlVoQdyibIVZDIjQKCDc3xj5XbN9cPqnn6t5y5Yjf6TrddgCNTrD1LDA
-NLGP56fG9Lyap+CVmUM/BzU+FshTwQXVfReh3O91cxQQ2srKlXgkvSrm7Y9SiYhg
-VAERYHqHtBYmER/c28QRPCMowZh3M8poV4aOBkEVv89u5zh9SjGJ/jiZ2ZlB0sbS
-gSEqplX1A24d1Ql8xvcsGlYc1BuIfd7tnJu4acTCxgsu3tuytyqBnd5gHzmSsZgZ
-1reYyAWmzagCkAnvApXtGyfoZZIJKUls/7SIkEFgY2EqPYaPgDgNjXxhI9f2rwsH
-L/nJUYrC0sjDU11UOSCX5eRLjs8Xpo5OR0ayQi4HWFXkvyQYUsHo+gASFbY/wOfb
-y6hJ69FN8cJNH8Hq2fDxgzwl6jNdHV5EdfhHLP7a6Bi9QqliO76wvKKRlqxK8Fsv
-CXA7J75AyMuJQLI6W9nT7jd9V83V9/s0aRdKAxBmnfzLwxqhpzs=
-=u5U0
+hkLu1Q//Yp/29P+JQ5b8+QFWgKnb8sGAQO4uubl2f7EK6NZ4iLZFoNsDDjSLTe2W
+n8cx7znyDOrOWsIhyG8miANi6d3w+dmtLmx6bk9IQlDlKHyXNEVqPJiOJaAgDXa9
+Ofl57r7gcxGge74NvZ9hUVSz6iWBTRMOb0jDHWnlB4uSOK/lq9NzRgAs0pq2pm8U
+CWoRKjGyimSi2iqm2VhQ5IbcJFPbdxvayuu7fLkjBw/e6G34MZm8LXfMJp6atJsq
+OcLfN1tusBmMlVvOs34JnN/fUUBNBgS76krmYKBYX/V0U84xwOzCkH0835+HGnWm
+lIAIrODVCnDExtq4aPi1qrRgRXiX29X/ortP8Ea0doAnjsjFdD17wWyd0AanFp0E
+7KSDiAfC6gFZF8ZfpMft62AT8jEfh0gFZLHzbPZGd1o7imRA2pn9h9HnRt9NSekd
+uW9llLHD84HCX9UBNSDy3wxAFIwEH1dtJVYRl8wrDLTTWc+aNLdaoijMGab1jiOG
+K1qleodrz/qGifj5uHWlTQNbMLcomefdeezoKogDQl7l/Y1IZIncthrvZNu2gidQ
+SgtFA8R0URxhFtSs5mer7RHBTqJ13adlFOGo8CzlAVrfGCZ8xb+lRbr2NskZFXK1
+w/xq1ibTnw4UhZeTyUEAI43XkbZFHEEjmdesVT+0xKua+2kuK5c=
+=eqnB
 -----END PGP SIGNATURE-----
diff --git a/app-admin/scylla-jmx/scylla-jmx-3.0.7.ebuild b/app-admin/scylla-jmx/scylla-jmx-3.0.7.ebuild
new file mode 100644
index 0000000..dee6268
--- /dev/null
+++ b/app-admin/scylla-jmx/scylla-jmx-3.0.7.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 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
+}