app-admin/scylla-jmx: version bump

Package-Manager: Portage-2.3.71, Repoman-2.3.17
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 1a9d9c5..8c6bbeb 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-3.0.6.tar.gz 105826 BLAKE2B 5507a791a9a0c8d208640503e86689519facffad780853d7ffdc6b232552eabc8a13b3b1df126854c23a1ab707958910aaa5aa31ad9809752dc3de86fe4cbf69 SHA512 289b981faabf2d7221d17aee42db912bc67571d56d13548e88db9627e8cb79133ca9b69d90a2637d887fb1ae2f70b064f759a1156269ab6bf74f0d22b2a7fc59
 DIST scylla-jmx-3.0.8.tar.gz 105833 BLAKE2B 276333b3ec9d2f72225d0f21c23fa50ddbb58bf00d84b8c1c0668566e5cf95aca97815e68edfdacc518f5da9669ceffeec83cd0759b19b3872c13e6a46b483db SHA512 ca801c6439dc4551bde58b0b624dea5ab8f99fab46e86f16f68508ed812956de8afd9a852c71b7ce82b914ce8c86b5627ffafee95795f89947f101a4ae045930
+DIST scylla-jmx-3.0.9.tar.gz 105833 BLAKE2B 4925b5943bf1f27aecbd1a82e11305ee7dedb53c130a12de9984aad35861c562db3ab1cb50f14ac04455fc11b75b4096b5553e2cfd6323c58fd6dada3c1687cf SHA512 b1cde10153c0cd55a9c0a4c8b80d6bf2e9496ad6e85417dd7b1c702eaa95038091a5b0f40a769878b60281af26353c7db81500db7574602aefaa6fd3eedb23af
 EBUILD scylla-jmx-3.0.6.ebuild 2300 BLAKE2B 3b8e24d44c56935434659fcab6549ff7a37a64ee52e0228b64aef00dfdc66d8e333b3f7b910698f4042f92019cca489e1e68f5323409ba4e4c7a8e0ae301aee0 SHA512 f78a41cd4ed1b08adbe406c8e58ea741b1731b263981ca20b36ddaaab0c8224b092042fe427770969ad404bc51cd68f997e63bcfda78bdfdf8f048b9ad1e117f
 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-9999.ebuild 2351 BLAKE2B 233492dfb11e01126d1e10d71a48a5e1ebd944d623e1680af1e2b65f368920bf6396b6fc18b45e434b0d26b8ef9ec9f03840d25128ef851f0cea351e28bade8f SHA512 4f305713b7b19481eb616171bd38307ca262b1aba3a60bb14b863b8c3c2304dfc30ac716d3e319212fc2bddc22d957b0f7bc6954e64a600222ca27761ef8e097
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEGiPLJcoPPNcvDvnY9mwK1B9ohkIFAl0cyBdfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEGiPLJcoPPNcvDvnY9mwK1B9ohkIFAl1Jp9lfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDFB
 MjNDQjI1Q0EwRjNDRDcyRjBFRjlEOEY2NkMwQUQ0MUY2ODg2NDIACgkQ9mwK1B9o
-hkIvMxAAn2L6QtcFvDvnN1tFVnnfeNggb0s3z1W/SQRyUizxVKMo0Rak8DnZW5lh
-yilpiOnGI43OP/DLXWJC4f83iQsJQt6jI98Od+DIAw9ugsMSbFclgX90SIp5I5/0
-0FO0PUdidAPiG0ORp5i8kmvCgOCZUgwyk39vOZQk/totvSfNmkWZdMQ7+TLsPcyE
-Ecq64ElG10BTWFS6lYlvYD3QUsSjQOKsEm8w495sQrj6MgGDqp/hUlxJo3aYXkVL
-Zmd6hbxdfql8p8BPtf7vtvFA/rv23srkpLXnJV/WXURqwqLpffl+M9hEI+/0Ioh6
-F8a9hqHVsjA2FlIKYDN1kR2VMQvvGQj2rpANDs3Uz0tUOVICHJZqBOQRA65uco2c
-236ni+w+PCS/9vO2cAbWXoMdEXGMoa8tBYKZKNXPGNNVGjtTwmCMSvNQyXTTYxhs
-zZjmxEkAZOnBgXNZpartal5/WYFa2uqS5xUtotjSY7fNi+F3TwTpCRUWSQp0RYXp
-2n2RFkMvfRysBWQ68Y/BScf4jcSrCgNDrkR2VjwFxgscBcDaL27GlSZTkZe9oPWG
-Xww/bvMtq3HR/MGkJYDNmbzhfJxowGwH9N51Ei/N3iuuA90AsQBe6nRt9B/lLsJQ
-2EqOhp5GFM2lAuoj97OnOl7cuewOeoRa0i92D8HK9FQrIqZVY4w=
-=eARw
+hkLWRxAAgrjcTMzHQ6UF/2cYh0F1Kqnr6E+XYytqL5Jlpx8lKdFIclRQHmoDW5YM
+ZaPXnUKkC81eVsha0vq31QTdxhkJj0LLTFCas54S/cwPaAVHJCRa/zqjcBR7qpWr
+tYDgjN8bDDUF68xynqJru2DHhPa9eFQX6Ziz6qok/3QNM6Lazi2BOSEfQ/1FnwtN
+tOZllipCffzU3WtDA5HO8zvyP1uRUlZbP2b6KCbckyMsFSaXMR1b7BasAzjwYfVy
+XsSt72hx3Ct5s7FZ3QpDxl9w6v7KS68U1D/jbtmEDZu39XUN1mGwKr/LotHXgzTT
+CQfu1jXe5gxO2MJkpvJ+m9o88g3f1t3PPI6XHkTDNV4nhHqBKOtC93pXq9t+zU5e
+zTIXg1h39b1z0LcNjfuk4/auhr1ydBXl/zNTLtcfMSZfhb/2xMujJ1QwnaT4vmtw
+vbxqYukkMuF4C/bQYjckVvZ11QQ0KIu7UsjoEfteWNKuH9FT/9H08UPzVp+sSFEb
+qWfXqwg4qsK4U8F6QScFLiQlDsLXg3yJgP4IrwnZ3pP4cFGM5I2DOaiEeHZwmOm4
+UtXjNI3fXG9Lrk17CxtNDgG+2dHggguvLBIY64plYemn4ZNQQZU30b2P9Jij9C2E
+8ka8qsLzVX9Skod2xMgaMgb7EuY4enHq2+aJ1tsNPyBBygXsCAk=
+=Mec7
 -----END PGP SIGNATURE-----
diff --git a/app-admin/scylla-jmx/scylla-jmx-3.0.9.ebuild b/app-admin/scylla-jmx/scylla-jmx-3.0.9.ebuild
new file mode 100644
index 0000000..dee6268
--- /dev/null
+++ b/app-admin/scylla-jmx/scylla-jmx-3.0.9.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
+}