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

4 files changed, 37 insertions, 17 deletions

diff --git a/app-admin/scylla-tools/Manifest b/app-admin/scylla-tools/Manifest
index 7190c8a..70075fa 100644
--- a/app-admin/scylla-tools/Manifest
+++ b/app-admin/scylla-tools/Manifest
@@ -1,2 +1,4 @@
-EBUILD scylla-tools-1.7.4.ebuild 2128 SHA256 53dc44b59c57aa4c64ba7dddd5fc48f886d11e44620ab9001e33d0ef3d1ec0f3 SHA512 6b1cc2788241f54b0ce5c615958300cd58cf2790247acb59f3897ce86f34f57e71649571fd13ae871a01c25162890768e80b1482b78dd6e4f38f096c7cb3b5ac WHIRLPOOL 5a90ad41f297d9fc176c17b7ab743927cbca1c6584d02ac9ee5c8a6c9078db63fe043f3a38727095fe22f80aee4e13d0f9914b1056e5fb9687a9196e39ae135e
-EBUILD scylla-tools-9999.ebuild 2128 SHA256 3f2d359bbbcfc84fc1c15a24e917e591c9f09ade01cea4b28278b30d721e1c64 SHA512 5ab7c47c9910e0dbb35b12bfcc2d99be6cd3c153e379126f7a56a1169814abe11aac0edac37a51159c169c2865f3ca92c6084e62755714ad0ef12bb1570747a9 WHIRLPOOL bd708e3e4cab28b3fdff0e58c71309dc0fe06e91dbacfe017a853ca290f48df8f24829ebcf81e06d47d18d1ed4952d0e6bd1583bbe0380b5c955793b357d5ee1
+DIST scylla-tools-1.7.4.tar.gz 26856201 SHA256 0c42fb22a905dfc4cd707e6ab8e4720a213cd527417b358bdf03df913e09c4c6 SHA512 39b05ff7469cff5ffbd8560a96cfd0f8a1f5b93834aa5044da79fbc4024c70cb302583af57ec270a15ee32136a0b0dd1fa6e6a6ee72e3aa4c9b92f9fab1476a9 WHIRLPOOL 89737f5547ba938db6f90882b44167a9e2fbaf99f110152ae4044b3b2c6c346b149cdbcd53763cab3a30453156c2e67d10b0d1a3097adde26209ea9d2a0feebf
+EBUILD scylla-tools-1.7.4.ebuild 2181 SHA256 c49d27d4c7ccf7b5b36e54a9c984e159f0b4878eebeca04ba181090280e58312 SHA512 4b4d840def46ec906522aab8933cd1503ccddfa2ce0c66f8fc6bec1c0e59de1f9ed5f9e72672b59ff5e2b45dc8da3185fd624e42cedf163e08c8514673e8ca8a WHIRLPOOL aef3410fce450823c8a34a685f0aa0ea43b2d8384e4630a759de8740022243c120840f39bf2e2a22c6dd0b74fc094a4d8da15efb2019b449340b6f3c2cf356dd
+EBUILD scylla-tools-9999.ebuild 2181 SHA256 c49d27d4c7ccf7b5b36e54a9c984e159f0b4878eebeca04ba181090280e58312 SHA512 4b4d840def46ec906522aab8933cd1503ccddfa2ce0c66f8fc6bec1c0e59de1f9ed5f9e72672b59ff5e2b45dc8da3185fd624e42cedf163e08c8514673e8ca8a WHIRLPOOL aef3410fce450823c8a34a685f0aa0ea43b2d8384e4630a759de8740022243c120840f39bf2e2a22c6dd0b74fc094a4d8da15efb2019b449340b6f3c2cf356dd
+MISC metadata.xml 249 SHA256 658f3f0cb7921722166c25f4a815ec0d7418ad183b9e8a0377eb08b3c3139173 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c WHIRLPOOL 6031231a9c8d06218c688115fb3e0f734964735d3af0b4e4a932afa78cbebecd6586293a16cbf69985fbaad4dce3594b1095a00d91a3a131cf8d683e88c34841
diff --git a/app-admin/scylla-tools/metadata.xml b/app-admin/scylla-tools/metadata.xml
new file mode 100644
index 0000000..f4e95c6
--- /dev/null
+++ b/app-admin/scylla-tools/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-tools/scylla-tools-1.7.4.ebuild b/app-admin/scylla-tools/scylla-tools-1.7.4.ebuild
index 773749f..ab3b74c 100644
--- a/app-admin/scylla-tools/scylla-tools-1.7.4.ebuild
+++ b/app-admin/scylla-tools/scylla-tools-1.7.4.ebuild
@@ -3,21 +3,26 @@
 
 EAPI=6
 
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/scylladb/scylla-tools-java.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/scylladb/scylla-tools-java/archive/scylla-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/scylla-tools-java-scylla-${PV}"
+fi
+
 EANT_BUILD_TARGET="jar"
-EGIT_COMMIT="scylla-${PV}"
-EGIT_REPO_URI="https://github.com/scylladb/scylla-tools-java.git"
 PYTHON_COMPAT=( python2_7 )
 JAVA_PKG_IUSE="source doc"
 
-inherit java-pkg-2 java-ant-2 git-r3 python-single-r1
+inherit java-pkg-2 java-ant-2 python-single-r1
 
 DESCRIPTION="scylla tools (Java part)"
 HOMEPAGE="https://github.com/scylladb/scylla-tools-java"
-#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/antlr:3.5"
 RDEPEND="
@@ -28,8 +33,6 @@ DEPEND="
 	${CDEPEND}
 	>=virtual/jdk-1.8"
 
-#S="${WORKDIR}/${PN}-java-scylla-${PV}"
-
 RESTRICT="test"
 
 src_prepare() {
@@ -38,6 +41,8 @@ src_prepare() {
 }
 
 src_install() {
+	default
+
 	# maintainer's note: change/check me on version bumps
 	local origin_version="3.0.8"
 
diff --git a/app-admin/scylla-tools/scylla-tools-9999.ebuild b/app-admin/scylla-tools/scylla-tools-9999.ebuild
index 1fa4044..ab3b74c 100644
--- a/app-admin/scylla-tools/scylla-tools-9999.ebuild
+++ b/app-admin/scylla-tools/scylla-tools-9999.ebuild
@@ -3,21 +3,26 @@
 
 EAPI=6
 
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/scylladb/scylla-tools-java.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/scylladb/scylla-tools-java/archive/scylla-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/scylla-tools-java-scylla-${PV}"
+fi
+
 EANT_BUILD_TARGET="jar"
-#EGIT_COMMIT="scylla-${PV}"
-EGIT_REPO_URI="https://github.com/scylladb/scylla-tools-java.git"
 PYTHON_COMPAT=( python2_7 )
 JAVA_PKG_IUSE="source doc"
 
-inherit java-pkg-2 java-ant-2 git-r3 python-single-r1
+inherit java-pkg-2 java-ant-2 python-single-r1
 
 DESCRIPTION="scylla tools (Java part)"
 HOMEPAGE="https://github.com/scylladb/scylla-tools-java"
-#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/antlr:3.5"
 RDEPEND="
@@ -28,8 +33,6 @@ DEPEND="
 	${CDEPEND}
 	>=virtual/jdk-1.8"
 
-#S="${WORKDIR}/${PN}-java-scylla-${PV}"
-
 RESTRICT="test"
 
 src_prepare() {
@@ -38,6 +41,8 @@ src_prepare() {
 }
 
 src_install() {
+	default
+
 	# maintainer's note: change/check me on version bumps
 	local origin_version="3.0.8"
 
@@ -81,4 +86,4 @@ src_install() {
 	insinto /usr/share/scylla/cassandra/lib
 	doins lib/*.jar
 	doins lib/*.zip
-}
\ No newline at end of file
+}