dev-java/sbt-bin: Add metadata.xml file. Set SLOTs to 0. Fix default install directories.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

7 files changed, 105 insertions, 60 deletions

diff --git a/dev-java/sbt-bin/Manifest b/dev-java/sbt-bin/Manifest
index dced49b5397..4cca8971646 100644
--- a/dev-java/sbt-bin/Manifest
+++ b/dev-java/sbt-bin/Manifest
@@ -3,8 +3,3 @@ DIST sbt-0.13.6.tgz 1066241 SHA256 5564024afbcb107e9a476c7e3be77bb50347580ce6c8a
 DIST sbt-0.13.7.tgz 1058904 SHA256 019ac98231a7159ce75a6b4b2c6b5ec8c968bd2fca0e25d356ea17bbe416fdc3 SHA512 6022ed88b2d25f947ab068b7971e51fdcf8df77cea3d0a03eceff6df4442f013fd13cbeda11cdfcc35cc23ee85e1661986c53921f48d4350e2fa8bf0ae5f3e1f WHIRLPOOL b708ffd47e821a17207f7e3e3ccb29af3eb0d5ab3b866034b034d73ef0ca7e211724055069825cc333770e8bc02cf0f660f0e1098d79fe8377e733d8d90729b7
 DIST sbt-0.13.8.tgz 1059183 SHA256 f481c5db5b9e5ef35d87be9cd30a917e363812d67f218b25ae0c9e66078417dd SHA512 79479308c631b78b71196dfe4f8b26bd9b75727272c17432fce5ddd61a0dcaf4e261dd1eb9a8376b1e7a836ba6d84917819d181c35d19b543360d803193286d8 WHIRLPOOL 0b2f29e7f9030a923e1c68f4f2d7d546b949c237ff81d9b44097b3899540c0ca9adecd6177d66edd69387c01e37022556c60be8d1c526b1dc9ee6a48866930ba
 DIST sbt-0.13.9.tgz 1049367 SHA256 148f2801f2993773de6f8859fe0e6520fcabe649d66bb316e13aff8b2fd7f504 SHA512 cf0deb1a5a07ce3690a831a2ee0f499a5c904cd9a9038873ab78773717a12ce4dec668e00c3dd6b89e7919357c32b26ff97a78613de5c6252b495bc7fdc763f3 WHIRLPOOL 6b29d1ae7ea7b643a23f05e3014727c8bbbb7a65b2ed5a41861edef45be2f062b7652e9e9c17107f6e4647d236835b6d39f31a8be96aaf5eab42792c6467afd7
-EBUILD sbt-bin-0.12.4.ebuild 722 SHA256 a6af71ba84d4027bb4e1c6cb0af9638bfbb989b8485a0e1670f9e093b037e30a SHA512 e8acd7ff4397dec78c29b8a703150430ddd0084d0392ca7c6fbe20b6633639b16fcee61dbfef00360abe35000342ab5d1801c36d55b8970c40c2f6175124fabc WHIRLPOOL dd706f95206ec48189ed0ed478c7c82de0b01120217c060779f6ed29428113be182cdcaa7eeaae74808fef5c54fe4a4e8acda6d1544b63d8b48b7fff909a7daa
-EBUILD sbt-bin-0.13.6.ebuild 709 SHA256 5f568eff06393b58f228d5940cd8e63699b6480775496510df782824fce5e427 SHA512 bc7bf14590d647ab5509067144ac2880e4e2a9065d957a415aa6e25fe02f1f24c0c4e860e5b90f6e66e1a35a15384ab725b064c0898f1014759c71981311c0a0 WHIRLPOOL 5bbf34ee1b083fd7d6afd7b88726e291691f96b871224845a696de828ed61f6cc53e440da065472c733d810830d41db6d5693b841427e9adce5f2198ba912074
-EBUILD sbt-bin-0.13.7.ebuild 716 SHA256 c0208d5a7964a74f658bcffdf1971a8ab42a08c3c0e258504ca9b87db2e6fb8a SHA512 48189f608775eb59b19530394dd347e34c16b39e0763db38562390f65b822f7f2dea7a281a00edc23224a3befc9ceb2db8095ebd4bce366a56aeb6f64bb29bc7 WHIRLPOOL 69e475efee5b072dbe69df905c8b1434022db08bb1661a9841e50f9233997bef0ab8b50fc96966e6f92b2f6efebc614cea4283641e21366892c30e3313a730ea
-EBUILD sbt-bin-0.13.8.ebuild 716 SHA256 c0208d5a7964a74f658bcffdf1971a8ab42a08c3c0e258504ca9b87db2e6fb8a SHA512 48189f608775eb59b19530394dd347e34c16b39e0763db38562390f65b822f7f2dea7a281a00edc23224a3befc9ceb2db8095ebd4bce366a56aeb6f64bb29bc7 WHIRLPOOL 69e475efee5b072dbe69df905c8b1434022db08bb1661a9841e50f9233997bef0ab8b50fc96966e6f92b2f6efebc614cea4283641e21366892c30e3313a730ea
-EBUILD sbt-bin-0.13.9.ebuild 716 SHA256 c0208d5a7964a74f658bcffdf1971a8ab42a08c3c0e258504ca9b87db2e6fb8a SHA512 48189f608775eb59b19530394dd347e34c16b39e0763db38562390f65b822f7f2dea7a281a00edc23224a3befc9ceb2db8095ebd4bce366a56aeb6f64bb29bc7 WHIRLPOOL 69e475efee5b072dbe69df905c8b1434022db08bb1661a9841e50f9233997bef0ab8b50fc96966e6f92b2f6efebc614cea4283641e21366892c30e3313a730ea
diff --git a/dev-java/sbt-bin/metadata.xml b/dev-java/sbt-bin/metadata.xml
new file mode 100644
index 00000000000..7303cef9696
--- /dev/null
+++ b/dev-java/sbt-bin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/sbt-bin/sbt-bin-0.12.4.ebuild b/dev-java/sbt-bin/sbt-bin-0.12.4.ebuild
index e83cb55d74b..10f324c0d97 100644
--- a/dev-java/sbt-bin/sbt-bin-0.12.4.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-0.12.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 
@@ -11,29 +11,38 @@ HOMEPAGE="http://scala-sbt.org"
 SRC_URI="https://dl.bintray.com/sbt/native-packages/sbt/${PV}/${PN/-bin}-${PV}.tgz"
 
 LICENSE="BSD"
-SLOT="0.12"
+SLOT="0"
 KEYWORDS="~amd64"
 
 IUSE=""
 
-DEPEND=">=virtual/jre-1.7"
-RDEPEND="${DEPEND}"
+DEPEND=""
+RDEPEND="
+	>=virtual/jre-1.7
+	!dev-java/sbt"
 
 src_unpack() {
 	default
-
 	mv "${WORKDIR}/sbt" "${S}" || die
 }
 
+java_prepare() {
+	java-pkg_init_paths_
+}
+
 src_install() {
-	local dest="/opt/${P}"
+	local dest="${JAVA_PKG_SHAREPATH}"
+
+	rm -f bin/sbt.bat || die
+	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
+		bin/sbt-launch-lib.bash || die
 
-	# Remove Windows batch file
-	rm -f "${S}/bin/sbt.bat" || die
+	insinto "${dest}/lib"
+	doins bin/* || die
 
 	insinto "${dest}"
-	doins -r bin jansi-license.txt || die
-	fperms 0755 "${dest}/bin/sbt" || die
+	doins -r conf || die
 
-	dosym "${dest}/bin/sbt" /usr/bin/sbt || die
+	fperms 0755 "${dest}/lib/sbt" || die
+	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
 }
diff --git a/dev-java/sbt-bin/sbt-bin-0.13.6.ebuild b/dev-java/sbt-bin/sbt-bin-0.13.6.ebuild
index 41a20cd677b..10f324c0d97 100644
--- a/dev-java/sbt-bin/sbt-bin-0.13.6.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-0.13.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 
@@ -11,29 +11,38 @@ HOMEPAGE="http://scala-sbt.org"
 SRC_URI="https://dl.bintray.com/sbt/native-packages/sbt/${PV}/${PN/-bin}-${PV}.tgz"
 
 LICENSE="BSD"
-SLOT="0.13"
+SLOT="0"
 KEYWORDS="~amd64"
 
 IUSE=""
 
-DEPEND=">=virtual/jre-1.7"
-RDEPEND="${DEPEND}"
+DEPEND=""
+RDEPEND="
+	>=virtual/jre-1.7
+	!dev-java/sbt"
 
 src_unpack() {
 	default
-
 	mv "${WORKDIR}/sbt" "${S}" || die
 }
 
+java_prepare() {
+	java-pkg_init_paths_
+}
+
 src_install() {
-	local dest="/opt/${P}"
+	local dest="${JAVA_PKG_SHAREPATH}"
+
+	rm -f bin/sbt.bat || die
+	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
+		bin/sbt-launch-lib.bash || die
 
-	# Remove Windows batch file
-	rm -f "${S}/bin/sbt.bat" || die
+	insinto "${dest}/lib"
+	doins bin/* || die
 
 	insinto "${dest}"
-	doins -r bin conf || die
-	fperms 0755 "${dest}/bin/sbt" || die
+	doins -r conf || die
 
-	dosym "${dest}/bin/sbt" /usr/bin/sbt || die
+	fperms 0755 "${dest}/lib/sbt" || die
+	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
 }
diff --git a/dev-java/sbt-bin/sbt-bin-0.13.7.ebuild b/dev-java/sbt-bin/sbt-bin-0.13.7.ebuild
index 4c1456d529f..10f324c0d97 100644
--- a/dev-java/sbt-bin/sbt-bin-0.13.7.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-0.13.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 
@@ -11,29 +11,38 @@ HOMEPAGE="http://scala-sbt.org"
 SRC_URI="https://dl.bintray.com/sbt/native-packages/sbt/${PV}/${PN/-bin}-${PV}.tgz"
 
 LICENSE="BSD"
-SLOT="0.13"
+SLOT="0"
 KEYWORDS="~amd64"
 
 IUSE=""
 
-DEPEND=">=virtual/jre-1.7"
-RDEPEND="${DEPEND}"
+DEPEND=""
+RDEPEND="
+	>=virtual/jre-1.7
+	!dev-java/sbt"
 
 src_unpack() {
 	default
+	mv "${WORKDIR}/sbt" "${S}" || die
+}
 
-	mv "${WORKDIR}/${PN/-bin}" "${S}" || die
+java_prepare() {
+	java-pkg_init_paths_
 }
 
 src_install() {
-	local dest="/opt/${P}"
+	local dest="${JAVA_PKG_SHAREPATH}"
+
+	rm -f bin/sbt.bat || die
+	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
+		bin/sbt-launch-lib.bash || die
 
-	# Remove Windows batch file
-	rm -f "${S}/bin/sbt.bat" || die
+	insinto "${dest}/lib"
+	doins bin/* || die
 
 	insinto "${dest}"
-	doins -r bin conf || die
-	fperms 0755 "${dest}/bin/sbt" || die
+	doins -r conf || die
 
-	dosym "${dest}/bin/sbt" /usr/bin/sbt || die
+	fperms 0755 "${dest}/lib/sbt" || die
+	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
 }
diff --git a/dev-java/sbt-bin/sbt-bin-0.13.8.ebuild b/dev-java/sbt-bin/sbt-bin-0.13.8.ebuild
index 4c1456d529f..10f324c0d97 100644
--- a/dev-java/sbt-bin/sbt-bin-0.13.8.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-0.13.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 
@@ -11,29 +11,38 @@ HOMEPAGE="http://scala-sbt.org"
 SRC_URI="https://dl.bintray.com/sbt/native-packages/sbt/${PV}/${PN/-bin}-${PV}.tgz"
 
 LICENSE="BSD"
-SLOT="0.13"
+SLOT="0"
 KEYWORDS="~amd64"
 
 IUSE=""
 
-DEPEND=">=virtual/jre-1.7"
-RDEPEND="${DEPEND}"
+DEPEND=""
+RDEPEND="
+	>=virtual/jre-1.7
+	!dev-java/sbt"
 
 src_unpack() {
 	default
+	mv "${WORKDIR}/sbt" "${S}" || die
+}
 
-	mv "${WORKDIR}/${PN/-bin}" "${S}" || die
+java_prepare() {
+	java-pkg_init_paths_
 }
 
 src_install() {
-	local dest="/opt/${P}"
+	local dest="${JAVA_PKG_SHAREPATH}"
+
+	rm -f bin/sbt.bat || die
+	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
+		bin/sbt-launch-lib.bash || die
 
-	# Remove Windows batch file
-	rm -f "${S}/bin/sbt.bat" || die
+	insinto "${dest}/lib"
+	doins bin/* || die
 
 	insinto "${dest}"
-	doins -r bin conf || die
-	fperms 0755 "${dest}/bin/sbt" || die
+	doins -r conf || die
 
-	dosym "${dest}/bin/sbt" /usr/bin/sbt || die
+	fperms 0755 "${dest}/lib/sbt" || die
+	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
 }
diff --git a/dev-java/sbt-bin/sbt-bin-0.13.9.ebuild b/dev-java/sbt-bin/sbt-bin-0.13.9.ebuild
index 4c1456d529f..10f324c0d97 100644
--- a/dev-java/sbt-bin/sbt-bin-0.13.9.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-0.13.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 
@@ -11,29 +11,38 @@ HOMEPAGE="http://scala-sbt.org"
 SRC_URI="https://dl.bintray.com/sbt/native-packages/sbt/${PV}/${PN/-bin}-${PV}.tgz"
 
 LICENSE="BSD"
-SLOT="0.13"
+SLOT="0"
 KEYWORDS="~amd64"
 
 IUSE=""
 
-DEPEND=">=virtual/jre-1.7"
-RDEPEND="${DEPEND}"
+DEPEND=""
+RDEPEND="
+	>=virtual/jre-1.7
+	!dev-java/sbt"
 
 src_unpack() {
 	default
+	mv "${WORKDIR}/sbt" "${S}" || die
+}
 
-	mv "${WORKDIR}/${PN/-bin}" "${S}" || die
+java_prepare() {
+	java-pkg_init_paths_
 }
 
 src_install() {
-	local dest="/opt/${P}"
+	local dest="${JAVA_PKG_SHAREPATH}"
+
+	rm -f bin/sbt.bat || die
+	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
+		bin/sbt-launch-lib.bash || die
 
-	# Remove Windows batch file
-	rm -f "${S}/bin/sbt.bat" || die
+	insinto "${dest}/lib"
+	doins bin/* || die
 
 	insinto "${dest}"
-	doins -r bin conf || die
-	fperms 0755 "${dest}/bin/sbt" || die
+	doins -r conf || die
 
-	dosym "${dest}/bin/sbt" /usr/bin/sbt || die
+	fperms 0755 "${dest}/lib/sbt" || die
+	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
 }