app-admin/scylla-jmx: proper live and non live ebuilds

4 files changed, 34 insertions, 16 deletions

diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest
index 7dc94a2..68bb328 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-1.7.4.ebuild 2152 SHA256 8730842c0b16663ec3e1513f4be8402a44b46d4ebb66f3d323405d1a57d309a5 SHA512 e0037945a627516b7996028f94c44b79634f9bb88fade757420469c06e44c869927390b27f1ab0e04f426c862374e2c4c314f52070284dc09eb4fcaf5f174b31 WHIRLPOOL b8e4ab738ad3f5b71f37693e0f5e6a2bf60a2064e9588c29248799505857186457c545d81c3976ff581d2a60021e4663fdaea082ee7e61bf8fbb7ca5bcd6f990
-EBUILD scylla-jmx-9999.ebuild 2159 SHA256 2695b68d5b0a71ff37310fab5eb971464157cb770941303b93fa3fc1a7fdf8d5 SHA512 fc802ac3dd376f0003c7579c5f3346feb70487b75c56915cb08816f0cec25e818c131aa30ddbbfc0808c7fc1ca0c3f33e88fdac238aeb3ec91b0894df23aaf68 WHIRLPOOL f147100d4debd71079b850e5c11618299f0ae8181e25ec29dca42d767e3efaa5c9475777167bc9791094289d91af459c323468fe02baac7f34c943d2bfef1a91
+DIST scylla-jmx-1.7.4.tar.gz 96913 SHA256 0b13e8ceeb17e95b690921bd61ac38948440493304f3f6ae386912bcdb4b7435 SHA512 aa9704eb4683f2633b7fc4fa02701049d5554af8c8ca34013819d6c0a8ca308ea71e48b8333e42dad5b25f555d07a40a3c43482b709933da48a5571b0caf1e5c WHIRLPOOL 20c7d68d050eb847ccef5542d28592522be026bd1039fdca84ffc1e13b8426c48ac0f126bf320b392b95476332cf34126eecccfc11ba59ca3cba81c097def00f
+EBUILD scylla-jmx-1.7.4.ebuild 2220 SHA256 49fdbe0363511c1b022dbc3a0a7de8d55268b291c29d2e0f889b96d750602300 SHA512 acf0eb0380921440fb225084beb8141c14fc3ac160470eec2192ab502ca14460c0082756ce92f3828e4f18d75ade459740e23db614ebf531b2c4fcf402b347b6 WHIRLPOOL 30a3062fbe4aa87e76f246326f5f678a2a5f44dca857c084f707a876b9e73ba61df88329f2bf619bf911f80310d44ace032b9fbe8164195bbd9231a21a4c4fc7
+EBUILD scylla-jmx-9999.ebuild 2220 SHA256 49fdbe0363511c1b022dbc3a0a7de8d55268b291c29d2e0f889b96d750602300 SHA512 acf0eb0380921440fb225084beb8141c14fc3ac160470eec2192ab502ca14460c0082756ce92f3828e4f18d75ade459740e23db614ebf531b2c4fcf402b347b6 WHIRLPOOL 30a3062fbe4aa87e76f246326f5f678a2a5f44dca857c084f707a876b9e73ba61df88329f2bf619bf911f80310d44ace032b9fbe8164195bbd9231a21a4c4fc7
+MISC metadata.xml 249 SHA256 658f3f0cb7921722166c25f4a815ec0d7418ad183b9e8a0377eb08b3c3139173 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c WHIRLPOOL 6031231a9c8d06218c688115fb3e0f734964735d3af0b4e4a932afa78cbebecd6586293a16cbf69985fbaad4dce3594b1095a00d91a3a131cf8d683e88c34841
diff --git a/app-admin/scylla-jmx/metadata.xml b/app-admin/scylla-jmx/metadata.xml
new file mode 100644
index 0000000..f4e95c6
--- /dev/null
+++ b/app-admin/scylla-jmx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ultrabug@gentoo.org</email>
+    <name>Ultrabug</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-admin/scylla-jmx/scylla-jmx-1.7.4.ebuild b/app-admin/scylla-jmx/scylla-jmx-1.7.4.ebuild
index 29bc1e0..90005c3 100644
--- a/app-admin/scylla-jmx/scylla-jmx-1.7.4.ebuild
+++ b/app-admin/scylla-jmx/scylla-jmx-1.7.4.ebuild
@@ -3,21 +3,25 @@
 
 EAPI=6
 
-EGIT_COMMIT="scylla-${PV}"
-EGIT_REPO_URI="https://github.com/scylladb/scylla-jmx.git"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/scylladb/scylla-jmx.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/scylladb/${PN}/archive/scylla-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/scylla-jmx-scylla-${PV}"
+fi
 PYTHON_COMPAT=( python2_7 )
 
-inherit git-r3 systemd user
+inherit systemd user
 
 DESCRIPTION="Scylla JMX"
 HOMEPAGE="https://github.com/scylladb/scylla-jmx"
-#SRC_URI="https://github.com/scylladb/${PN}-java/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
 
-CDEPEND="dev-java/maven-bin"
+CDEPEND="dev-java/maven-bin:3.3"
 RDEPEND="
 	${CDEPEND}
 	${PYTHON_DEPS}
diff --git a/app-admin/scylla-jmx/scylla-jmx-9999.ebuild b/app-admin/scylla-jmx/scylla-jmx-9999.ebuild
index e0fa51a..90005c3 100644
--- a/app-admin/scylla-jmx/scylla-jmx-9999.ebuild
+++ b/app-admin/scylla-jmx/scylla-jmx-9999.ebuild
@@ -3,21 +3,25 @@
 
 EAPI=6
 
-#EGIT_COMMIT="scylla-${PV}"
-EGIT_REPO_URI="https://github.com/scylladb/scylla-jmx.git"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/scylladb/scylla-jmx.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/scylladb/${PN}/archive/scylla-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/scylla-jmx-scylla-${PV}"
+fi
 PYTHON_COMPAT=( python2_7 )
 
-inherit git-r3 systemd user
+inherit systemd user
 
 DESCRIPTION="Scylla JMX"
 HOMEPAGE="https://github.com/scylladb/scylla-jmx"
-#SRC_URI="https://github.com/scylladb/${PN}-java/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
 
-CDEPEND="dev-java/maven-bin"
+CDEPEND="dev-java/maven-bin:3.3"
 RDEPEND="
 	${CDEPEND}
 	${PYTHON_DEPS}
@@ -47,7 +51,7 @@ src_prepare() {
 }
 
 src_compile() {
-	mvn -B install || die
+	mvn -B install
 }
 
 src_install() {
@@ -79,4 +83,4 @@ pkg_postinst() {
 		ewarn "**************************************************************"
 		ewarn
 	fi
-}
\ No newline at end of file
+}