From e6a16fb3c6ced7c9e421980acc5e7e8da6c5a2d2 Mon Sep 17 00:00:00 2001
From: Ultrabug <ultrabug@gentoo.org>
Date: Mon, 14 May 2018 15:43:51 +0200
Subject: scylla: version bump to 2.1.3

---
 app-admin/scylla-jmx/Manifest                |  4 +-
 app-admin/scylla-jmx/scylla-jmx-2.1.2.ebuild | 95 ----------------------------
 app-admin/scylla-jmx/scylla-jmx-2.1.3.ebuild | 95 ++++++++++++++++++++++++++++
 3 files changed, 97 insertions(+), 97 deletions(-)
 delete mode 100644 app-admin/scylla-jmx/scylla-jmx-2.1.2.ebuild
 create mode 100644 app-admin/scylla-jmx/scylla-jmx-2.1.3.ebuild

(limited to 'app-admin/scylla-jmx')

diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest
index 0f5755e..6e12ea5 100644
--- a/app-admin/scylla-jmx/Manifest
+++ b/app-admin/scylla-jmx/Manifest
@@ -1,6 +1,6 @@
 AUX scylla-jmx.confd 243 BLAKE2B a056f7c70df3ff6c903a182f352aa34ca9d23eed458b7c6f5a51c9f6656cf0f989c133e8e45b221991800fcc79fd1505b037410dde7d5dfffdf75e0ee6670090 SHA512 18b5f550c2e0616f4c0da123adfda3fb959bec5711b6be57df3e316613cfa154467353e65504b6b68852911f8faa21f1acccf3fa51970a132b639c1e6d1ea402
 AUX scylla-jmx.initd 592 BLAKE2B e1492a3da5ab275fbe6f7f1f4f9beaa3129f037fa54523211a8628d479e196a2da711c41c8051416612d34322c3261e95c3370525e68c84eb80c98ac0949ab69 SHA512 8bf35201a2dd240b1e74d35c3153251f2c15878f2454a8ed05f006ad35679a85d08de413dc8ce8b53aaa2b8e367a806a76d56d63d9b691f4bac569b647764037
-DIST scylla-jmx-2.1.2.tar.gz 98652 BLAKE2B a8388136aeabfcbfc603a241e1c2881b1f56548484f6c366b2ee57df9b62e4a2648b753ededd8930b1c2e6e02fcef8983abb71792600707a7358882af0666ab3 SHA512 71fe7a9b5ca05b6f37baa209401fff08ba8eec213058c146877b020d0b0432ba022b28c0a3bfc254257a772cba03e48a6e0ebf7790c2d1509a47236d8080dce6
-EBUILD scylla-jmx-2.1.2.ebuild 2355 BLAKE2B f8001c2f7f4c06ec1012d50449294eff4bf3307bfd5439baecc921c7d925324a1c136ef46eb3fe0b0988e9f9582c493819625b9659b334ca5297c21afc7995af SHA512 1e8c37dfdd7bd3fa7c2558d23e1659c65dfccce50d40ab20bdf11794a87e99a5ff6187269dae86922596ca196d0729897147114b9c7060867bea0b6653422d49
+DIST scylla-jmx-2.1.3.tar.gz 98644 BLAKE2B 8e63e26ccc88a628095f3512d70e84204e91bfaa79f5f67daac89c126f503ec72328dddea2b235fcbd7e629bf59dd8393a5c2a7b676bc5001245e79f2fde04bf SHA512 448dccda4b38dbcaff808eeb20f6d99c15aff141dc51c6399e93106541c27c5cb3cc07960370d74df754338fef51cab2ff7b37b42a248d147449c3e196009772
+EBUILD scylla-jmx-2.1.3.ebuild 2355 BLAKE2B f8001c2f7f4c06ec1012d50449294eff4bf3307bfd5439baecc921c7d925324a1c136ef46eb3fe0b0988e9f9582c493819625b9659b334ca5297c21afc7995af SHA512 1e8c37dfdd7bd3fa7c2558d23e1659c65dfccce50d40ab20bdf11794a87e99a5ff6187269dae86922596ca196d0729897147114b9c7060867bea0b6653422d49
 EBUILD scylla-jmx-9999.ebuild 2354 BLAKE2B 2dcb7c649f9ed55001cd7c9367911403de1f1afdf05db92d1df9dc32918c073ba775e74b1b0d093c828e38265024ba6ddcd2cd08a4a60353caa56830ec8b3004 SHA512 29120858692d1404b4a277cd0d807137a7a35d047be4ae5cca521b6d152582a79dce4a45e4189530b6300d54eb53a40e0a8f39ff62ffb1c88386299242f785ab
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
diff --git a/app-admin/scylla-jmx/scylla-jmx-2.1.2.ebuild b/app-admin/scylla-jmx/scylla-jmx-2.1.2.ebuild
deleted file mode 100644
index 001ec6f..0000000
--- a/app-admin/scylla-jmx/scylla-jmx-2.1.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 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 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"
-
-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-2.1.3.ebuild b/app-admin/scylla-jmx/scylla-jmx-2.1.3.ebuild
new file mode 100644
index 0000000..001ec6f
--- /dev/null
+++ b/app-admin/scylla-jmx/scylla-jmx-2.1.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 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 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"
+
+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
+}
-- 
cgit v1.2.3-65-gdbad