2 files changed, 110 insertions, 13 deletions
diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest
index 330d76c..ca38750 100644
--- a/app-admin/scylla-jmx/Manifest
+++ b/app-admin/scylla-jmx/Manifest
@@ -5,26 +5,28 @@ AUX scylla-jmx.confd 243 BLAKE2B a056f7c70df3ff6c903a182f352aa34ca9d23eed458b7c6
 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.5.tar.gz 105825 BLAKE2B a240363948d244a04044310c5d94f2007cfb703bf82b2531d3524d2416ae5a6d6b1751bbdb66e75db79d69e20b0f7b4acdfa95b325d2fa53530a1bb02437a657 SHA512 f39ae2022c3f6b26518aedf5d80e477c8a30dbf8b43ec47368b20151d7c44eaacd67f52bd9d083b52d8388ef3b28a3eee2790b13bd36ecb67152af0f111428f0
+DIST scylla-jmx-3.0.6.tar.gz 105826 BLAKE2B 5507a791a9a0c8d208640503e86689519facffad780853d7ffdc6b232552eabc8a13b3b1df126854c23a1ab707958910aaa5aa31ad9809752dc3de86fe4cbf69 SHA512 289b981faabf2d7221d17aee42db912bc67571d56d13548e88db9627e8cb79133ca9b69d90a2637d887fb1ae2f70b064f759a1156269ab6bf74f0d22b2a7fc59
 EBUILD scylla-jmx-2.3.1.ebuild 2300 BLAKE2B f8427423572652f682de88c20fe8cec52862ef5277334d335be53fdf51950a9e5b3ffde20470bb2cf3e5d16698d6c305da2fa1d90f2b2cc7abd9185e6743e2c4 SHA512 e0f6122bd75a0928d9edb4541732c2da059e2c6201bfd03b88d18ec8df31449e820d93ae60b3d2019730c6fc4ad11ad3627760216f4284c0b970472daa81aa10
 EBUILD scylla-jmx-3.0.5.ebuild 2300 BLAKE2B 3b8e24d44c56935434659fcab6549ff7a37a64ee52e0228b64aef00dfdc66d8e333b3f7b910698f4042f92019cca489e1e68f5323409ba4e4c7a8e0ae301aee0 SHA512 f78a41cd4ed1b08adbe406c8e58ea741b1731b263981ca20b36ddaaab0c8224b092042fe427770969ad404bc51cd68f997e63bcfda78bdfdf8f048b9ad1e117f
+EBUILD scylla-jmx-3.0.6.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
 
-iQKTBAEBCAB9FiEEGiPLJcoPPNcvDvnY9mwK1B9ohkIFAly2AkhfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEGiPLJcoPPNcvDvnY9mwK1B9ohkIFAlzSvPVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDFB
 MjNDQjI1Q0EwRjNDRDcyRjBFRjlEOEY2NkMwQUQ0MUY2ODg2NDIACgkQ9mwK1B9o
-hkL8Eg//Wpnayqp9DPaHFTnhzbT1JIK4isq3qM1iZlcdyM7+upRX2pkq27XePRl5
-M1LEZ0ugqxhhXnccgZdq2l8gfxMJHpUd5zh7cR1OsBaQMK63Vs+YIyKVfioB86r3
-R0esSZXpycKxgaDnBR+9TZZfCKSJgpLNEE1XHWZvRkfOjiU38qvY780BHro2tVO4
-RKFfrsmBBgYbilzZkRDuYz81dIgQk6SiTVS1kdPsXiYBVxFb/0rovfGmHTSwdtfy
-dnVKvrPJFihMqd7njgwjFds+RG2bf5g0Y4xLwWu8FGmB7y7ojwqa9N6JS6MVjkr8
-+Ctu6Ol3WN/XDmhNpIH+8KfuGb3yA3/MoVpng4IrhJaPAkkLN/MV2BjV+/SUzodp
-NS6G84ZZItrlxWaXVf8dOI9ds7zre/QwzJwO181dfUg07THQKCWyscXSz2VzMu6K
-xUgq307fRjnA5xgl+ppfOU1EwoshYs0GssjgYWDGjT0m4gBJNP84F2O3/yoIgrud
-jsE9jx5ignyoexk8FfiU7FNW2aLRcPAwwYngpSgOTJUpIf84zTe+gEbJchYbbBvI
-FVk0sTjtWMrpvGcV3caIuNURT3vCzbTDt0mSJsjm+YuJMIt+wPxgUs/Cjiz9r3uN
-O46BjYsA/Wh5fkgaCHS1PDO2kWJbme3XKtes/VfsDdWT3PMvd3w=
-=xQ+a
+hkKAFxAAlrdCsfumULE3QH3T87kk4+u+vwo4XS8J9GUZeZ1CSb/cVPZ5t8qXgtFV
+cGOdm3wnhZvR2yzUiQLkfJ3TtZgQIjNsvCZSBIoRT8pQnOEMqbXGupSbrFmvKu6q
+VdghTkJLSzoKPq3pLXmOEdJ5crxZzk+ot7FfkgJ//NjIEX8FesCPN7Coe+b9bL6v
+0oBk/sifRVbHr6ZmbJyi3dZIYpTWQeml/4O+/Lr0NY/5aNcbTM9Kt000N3vvQm3K
+hl/0l2wgYaheXkxFuE2J+0VjIFpZ/gFkwtSSomsPab+WB8jROMYCao7YoYsCDAeH
+hm1VzQQQZwkuuKGE/T4sozrMqbzZjP8cdYpbeS7Z35Vxvm2Jbi2KIsb872qswuSf
+dTTJHz9j+83UhS58A44Vrb5Rtv5xm4wegX7TOo71EFPTxHuih8ecc+GlkL+EkW1P
+3+wazDPUqdmfFsTUMMFCzQKckar1i4jshUY6FHlMpWWrOmtiaodyuGS5NI8NMIGk
++tXsOTl/4p7i8QCYH+2qKviRohGgT38bLFNJo7JHzlNthvh6UxM6NV0eAz+9/Rwq
+K+5PhPk9D8OSHnsuoBEfJFvBWCGWSRZfh2oiL9hppR2hOLRl+L7GbEZUc7xZ7vmv
+tue4y1XkumBI3X4X1JL+5ky7kOvXc0IODaz6woyzgyQvXLQX0dk=
+=+EHb
 -----END PGP SIGNATURE-----
diff --git a/app-admin/scylla-jmx/scylla-jmx-3.0.6.ebuild b/app-admin/scylla-jmx/scylla-jmx-3.0.6.ebuild
new file mode 100644
index 0000000..dee6268
--- /dev/null
+++ b/app-admin/scylla-jmx/scylla-jmx-3.0.6.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
+}