app-admin/scylla-jmx: master and 3.1 version bump

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

3 files changed, 116 insertions, 30 deletions

diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest
index 8c6bbeb..3deecaa 100644
--- a/app-admin/scylla-jmx/Manifest
+++ b/app-admin/scylla-jmx/Manifest
@@ -9,24 +9,25 @@ DIST scylla-jmx-3.0.9.tar.gz 105833 BLAKE2B 4925b5943bf1f27aecbd1a82e11305ee7ded
 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
+EBUILD scylla-jmx-3.1_beta.ebuild 2130 BLAKE2B 58b7a92314ae726365fa4346d98c73abd5b9b7bb40727d73a47fc0d214f0a190f6413303f510443579905bf5257783fb29c0c77d94407ab233b2b765a5f5acc0 SHA512 66dfa539f57e352c8d610c12a1d2f842a3cdb84f4aa1073eb8c0777d1da40454357daa27ad6b48db5ef22ab7abdf9b693700ba2ea70a876391962a8594503601
+EBUILD scylla-jmx-9999.ebuild 2102 BLAKE2B aba20893156fd5bb0552d972196bcd361526b48972e2d64a0fbdfbd41276d6de5318dba4c9bb3c0a5ff5eec0ea129156f6b7dc0aa71d7bdf6a8ee8267c910ef4 SHA512 4ef6dee6d0f77ad7fb0a8c8bb6cfdff4f0a3d475c07585d5c61ebea4ffa8369dca15da594fc93b4aaeb24313703bf305995889a5a0b542b04769fe85036acc79
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEGiPLJcoPPNcvDvnY9mwK1B9ohkIFAl1Jp9lfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEGiPLJcoPPNcvDvnY9mwK1B9ohkIFAl1R1adfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDFB
 MjNDQjI1Q0EwRjNDRDcyRjBFRjlEOEY2NkMwQUQ0MUY2ODg2NDIACgkQ9mwK1B9o
-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
+hkLeCQ//a0r/N86qIMsR1iyjKhMDPAdN4f6oPpo94AND3NkIOsMtkQWlksSn5j3M
+5RTmmCz0j173r6lZtnvFahQeGRzFPUICpSJ9xnW35h0Xy5laeWtnIteTjaq3b9i9
+u6P4eCy/qK/VUdGnrFI23DstwI08/bH7RLIjIaj7/J+1XxHF4lM4zmA6eSdyb0d+
+5nbSLBsSM7hCJ/TZZ2Ax1ErQ79ax3SG+Rb4TTg4g9uUvzzkAW0X8K5Pm9JtGxqIy
+7jNW2Gv7uUp11qI8cw29V+x+7RLcu12/FdwmSoVL5nsKpjv1/5FRSEFh2nFMdnB3
+z8I+gw9Ca54rejiAPfydNF8jkpugjFKg+cdk4ANjyPIACqYLWmo6ekV1yiTH2hlG
+lgt7aD/gwBFnNrZIme9K5P7dfPxp4FSUIqoOB3kwD4u9Jydylg2a9tWCCgKbddt7
+qjqrCrzNefSNp1MMd7yHeqNpFEL6j297zKkVSVmDxmt9bYZRrtZiKT4d0QlEox/f
+h7OrFk4oiTP46wx0faONJEGZPii4GnKKkLukFhittP/plUfsAMjAaRFMv6MQOkr4
+MgHmnvkCCvQPCAjoLqArEYOmWMXG4hX3sGjRZ49kbf0PZfXo6kKp78P2u2EjYl65
+YwqZdCjMnEXayfvhSRBi4b+htJ/OPjqIQFqRUzl6pNtywO8uH4M=
+=wMDf
 -----END PGP SIGNATURE-----
diff --git a/app-admin/scylla-jmx/scylla-jmx-3.1_beta.ebuild b/app-admin/scylla-jmx/scylla-jmx-3.1_beta.ebuild
new file mode 100644
index 0000000..6851696
--- /dev/null
+++ b/app-admin/scylla-jmx/scylla-jmx-3.1_beta.ebuild
@@ -0,0 +1,90 @@
+# 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="next-${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"
+
+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
+}
diff --git a/app-admin/scylla-jmx/scylla-jmx-9999.ebuild b/app-admin/scylla-jmx/scylla-jmx-9999.ebuild
index e29b1c1..a122a45 100644
--- a/app-admin/scylla-jmx/scylla-jmx-9999.ebuild
+++ b/app-admin/scylla-jmx/scylla-jmx-9999.ebuild
@@ -1,18 +1,13 @@
-# Copyright 1999-2018 Gentoo Authors
+# 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
+EGIT_CLONE_TYPE="mirror"
+EGIT_COMMIT="master"
+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
@@ -30,6 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${CDEPEND}
 	${PYTHON_DEPS}
+	dev-python/pystache[${PYTHON_USEDEP}]
 	>=virtual/jre-1.8"
 
 DEPEND="
@@ -46,10 +42,6 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# fix systemd service config path
-	cp dist/common/systemd/scylla-jmx.service.in dist/common/systemd/scylla-jmx.service || die
-	sed -e "s#@@SYSCONFDIR@@#/etc/sysconfig#g" -i dist/common/systemd/scylla-jmx.service || die
-
 	# 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
@@ -78,7 +70,10 @@ src_install() {
 
 	newinitd "${FILESDIR}/scylla-jmx.initd" ${PN}
 	newconfd "${FILESDIR}/scylla-jmx.confd" ${PN}
-	systemd_dounit dist/common/systemd/*.service
+
+	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() {