app-admin/scylla-*: update related packages for 2.0_rc1

3 files changed, 97 insertions, 4 deletions

diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest
index 3c863b2..53460c2 100644
--- a/app-admin/scylla-jmx/Manifest
+++ b/app-admin/scylla-jmx/Manifest
@@ -1,4 +1,6 @@
 AUX scylla-jmx.confd 243 SHA256 31398e8dedcf01a72d5532b0ed30a9c0df5818d372ff5dca78d8e851f4d1f5d8 SHA512 18b5f550c2e0616f4c0da123adfda3fb959bec5711b6be57df3e316613cfa154467353e65504b6b68852911f8faa21f1acccf3fa51970a132b639c1e6d1ea402 WHIRLPOOL c5a6009774867aaf4b6896016206d352d0bc2774dcb92389828c00ac5cf792211555a6612abb7e6e90e5d88a4560fae51fec755d5994e40f918088c9f9818e04
 AUX scylla-jmx.initd 592 SHA256 63bdbcf7458e766c04b351aa576efd92fd796840f2469cb85b80d364c492d950 SHA512 8bf35201a2dd240b1e74d35c3153251f2c15878f2454a8ed05f006ad35679a85d08de413dc8ce8b53aaa2b8e367a806a76d56d63d9b691f4bac569b647764037 WHIRLPOOL f53e9546d6d73f7109301280529a00fc5360cc4549c3e5985183d2e6d55562cc897bc0cf93d1f267fdf0d7ea587dd25c5b0e72817459d3e17a0366dc651b64d1
-EBUILD scylla-jmx-9999.ebuild 2267 SHA256 70680ae370cad1dfc7a87ca78e05bf6905987c4b29a1b093f5d9820df1a92648 SHA512 f96cc056c5e320dda111bb9ecd7375281b12acf71b3d76147da5336f089d69670888f82de257bfec3e8e130cb0dd25e01675c4a875bacfe314b9807c95ab04c8 WHIRLPOOL e0c3b82a0f1e3411ac71de3b0c3be2842365cc371b51c194407b6904b22177488ae405f0b304877118ab059a7f29f39eada94adbb50dd48708d9bd095b9dd85b
+DIST scylla-jmx-2.0.rc1.tar.gz 98498 SHA256 151ca228081b0a57984db5f5aaaf25d022a16a5e4666ca0d670a44ea79364e12 SHA512 3df4304d4000fb8c6ebf631fed456ec1970b3f8d5c777499643437cf48c919af233e8d0237635c8ae69c65a120c4a7a11562710f412c1cd2f3b9475f8776a212 WHIRLPOOL 46c9b00c6c0a1f1684fc26843f81a8d5dde2ec759d14e1ec7fdc0b0c3070fa5fd1d24a1ec101db78adbd49d9a92ffbada0721f119d1c3b45e0376f06142bcda4
+EBUILD scylla-jmx-2.0_rc1.ebuild 2303 SHA256 3062fe2e2e1fd21814b93f383321becde22a9c1394bf58c948921869780c62ad SHA512 8b48edd4c8ba7e8739596b0531fe570f7b40565b90f0778f339bf523d14edb706f751913018553ef6dd89d6f66306143c0f6a2f6ae493352e9cec7d62208f810 WHIRLPOOL 41f0a4dc70eb530b98e8950b8ef7cfdd1ce3e8303665c229d109bcc3db2473724f466e53a5f514dfcf4b6332ee1e8b98eb4415b8b15cc44790903140a10c57bf
+EBUILD scylla-jmx-9999.ebuild 2303 SHA256 3062fe2e2e1fd21814b93f383321becde22a9c1394bf58c948921869780c62ad SHA512 8b48edd4c8ba7e8739596b0531fe570f7b40565b90f0778f339bf523d14edb706f751913018553ef6dd89d6f66306143c0f6a2f6ae493352e9cec7d62208f810 WHIRLPOOL 41f0a4dc70eb530b98e8950b8ef7cfdd1ce3e8303665c229d109bcc3db2473724f466e53a5f514dfcf4b6332ee1e8b98eb4415b8b15cc44790903140a10c57bf
 MISC metadata.xml 249 SHA256 658f3f0cb7921722166c25f4a815ec0d7418ad183b9e8a0377eb08b3c3139173 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c WHIRLPOOL 6031231a9c8d06218c688115fb3e0f734964735d3af0b4e4a932afa78cbebecd6586293a16cbf69985fbaad4dce3594b1095a00d91a3a131cf8d683e88c34841
diff --git a/app-admin/scylla-jmx/scylla-jmx-2.0_rc1.ebuild b/app-admin/scylla-jmx/scylla-jmx-2.0_rc1.ebuild
new file mode 100644
index 0000000..3bae0e9
--- /dev/null
+++ b/app-admin/scylla-jmx/scylla-jmx-2.0_rc1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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 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"
+RDEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+	>=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 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
+	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}
+	systemd_dounit dist/common/systemd/*.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 c819465..3bae0e9 100644
--- a/app-admin/scylla-jmx/scylla-jmx-9999.ebuild
+++ b/app-admin/scylla-jmx/scylla-jmx-9999.ebuild
@@ -6,11 +6,12 @@ EAPI=6
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/scylladb/scylla-jmx.git"
 	inherit git-r3
-	KEYWORDS="~amd64"
 else
-	SRC_URI="https://github.com/scylladb/${PN}/archive/scylla-${PV}.tar.gz -> ${P}.tar.gz"
+	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-${PV}"
+	S="${WORKDIR}/scylla-jmx-scylla-${MY_PV}"
 fi
 PYTHON_COMPAT=( python2_7 )