app-admin/scylla-jmx: version bump

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Manifest-Sign-Key: 34FCB257983BA23A8CEC5EB7EB9E6405C24BFAE5
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>

2 files changed, 102 insertions, 15 deletions

diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest
index 0dec0d3..3547d33 100644
--- a/app-admin/scylla-jmx/Manifest
+++ b/app-admin/scylla-jmx/Manifest
@@ -12,24 +12,20 @@ EBUILD scylla-jmx-3.0.6.ebuild 2300 BLAKE2B 3b8e24d44c56935434659fcab6549ff7a37a
 EBUILD scylla-jmx-3.0.8.ebuild 2300 BLAKE2B 3b8e24d44c56935434659fcab6549ff7a37a64ee52e0228b64aef00dfdc66d8e333b3f7b910698f4042f92019cca489e1e68f5323409ba4e4c7a8e0ae301aee0 SHA512 f78a41cd4ed1b08adbe406c8e58ea741b1731b263981ca20b36ddaaab0c8224b092042fe427770969ad404bc51cd68f997e63bcfda78bdfdf8f048b9ad1e117f
 EBUILD scylla-jmx-3.0.9.ebuild 2300 BLAKE2B 3b8e24d44c56935434659fcab6549ff7a37a64ee52e0228b64aef00dfdc66d8e333b3f7b910698f4042f92019cca489e1e68f5323409ba4e4c7a8e0ae301aee0 SHA512 f78a41cd4ed1b08adbe406c8e58ea741b1731b263981ca20b36ddaaab0c8224b092042fe427770969ad404bc51cd68f997e63bcfda78bdfdf8f048b9ad1e117f
 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-9999.ebuild 2156 BLAKE2B 24940d3f607b1ad2794e3a17ac8cd9cfdc213c0afcbee28a7215b9b4e010c41c78a30a0fa2ff90a023378bb0b9a5e1aa11b88438215aa8e3c158cc4cba3faccb SHA512 79c973c82d1f961be034f8eb2040ce89eb9a227d1c936a42a68afe9bc73d994c46327465f5105fc4ae61b27ac7aef460ec80e5fba38f7feca7f4daa39f4c567d
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEGiPLJcoPPNcvDvnY9mwK1B9ohkIFAl2pdhhfFIAAAAAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDFB
-MjNDQjI1Q0EwRjNDRDcyRjBFRjlEOEY2NkMwQUQ0MUY2ODg2NDIACgkQ9mwK1B9o
-hkLmrg//RzwqlAn8AvFgcqfm4UQh9LKITcPnfHPuUQjmCb8lRzYmdfWGhzCN5W4t
-arDs5EVHJb7bIvP+Hq9h8zdL7wdbnnrRggQBXMJQTQM69KxSOAfdfemowTcTjSo9
-JBXx8d0TojaO+6Gvh0hWV/vciSxbhqftiLDnQFoIv6Z0w06IcRHDr1ngE5jSmFXp
-6JVhgzUYsVME9029YMD42EL0dPQJAYsWIQ5Cie7QMdYiYuMEHovHeFtZQGZll+MI
-1vnka794DFWIg0/N3KsUe5PlOc9dojwq3Jv2W9RJrcZAT02Mjx/z0mqk+NH3Jrmy
-QK733vGLM4nWS8jCcIXPYgQlJnKDja4KV5BhgDN/riSXNy+IdJTg0fr5a880qVpA
-bBMYjgJ8z4jVkdqxGT0B/GEEZnVY+Gd3aYxFMDhNzzubnQPWycZXo3FJ73ylbJ2U
-/KmnmPYdNF2oVbxZm/1xuzrmSI1jyRHw4kxQw3JDlXLXLCtaoYSI74XTaNVxcXTL
-zXNsp4IJRbUr3M5ZEzmXkH0fFmPGMnYnUOa1uRv9/XUDofFY9b26bHHDlCC8CqRU
-45K3d2e1WU2IiQhxRVRMGOJEavLyS5yK/UXwTrL8cEeZTZ68bPCoOTyTfxdvcXyV
-mWY4/vls6GwJKlyXOyw6n7SysBGhDd/ZMkxk3MNm2048J3+/YX4=
-=dkXE
+iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl3K0upfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDA3
+QjM0NkQ4QUE4RDZEMEMzQzgyQTQzQjUxRkYyM0YxQUM5Nzc3MkYACgkQUf8j8ayX
+dy8GdQgAlgKPi0SQFgvAokBAno/wbwQ3dybZ8bE+oRWaJxp1MzIibOblwyc33r9g
+2qokpzK6tSlSzvn9e3tMifieggI0Mm3/MaIxUdLZpIPKLwxBBu+089C2WKLeRoPh
+mopyeiuD1o+xPNwcANG7PtKCktTQlz4FYOiBOFpuICQP5q+O+L4xeiRhiWOjBIgJ
+qYY34vaP0/sZ7v7OkDq/c4YTOJWP3faR78OUXzlcm4rnLdXpgukzBhYGubcsE8Mo
+okQ247GzIWXdobX7ae4Otopd70BjI6Y4ccASNIeSc9VkVBFCwkr2Oqo+XkqvtLGV
+zXT32uY1L3u3OnFsgTAkp9QrS4qY3w==
+=RxF1
 -----END PGP SIGNATURE-----
diff --git a/app-admin/scylla-jmx/scylla-jmx-3.1.1.ebuild b/app-admin/scylla-jmx/scylla-jmx-3.1.1.ebuild
new file mode 100644
index 0000000..025cfbe
--- /dev/null
+++ b/app-admin/scylla-jmx/scylla-jmx-3.1.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_beta/}"
+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() {
+	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
+}