Enhance ebuild layout and helper function usage

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 21 insertions, 15 deletions

diff --git a/dev-java/scala-bin/ChangeLog b/dev-java/scala-bin/ChangeLog
index 5ffb25421b30..1c35635d9c2b 100644
--- a/dev-java/scala-bin/ChangeLog
+++ b/dev-java/scala-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/scala-bin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/ChangeLog,v 1.20 2015/03/24 09:16:58 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/ChangeLog,v 1.21 2015/03/24 09:33:33 jlec Exp $
+
+  24 Mar 2015; Justin Lecher <jlec@gentoo.org> metadata.xml,
+  scala-bin-2.11.5.ebuild, scala-bin-2.11.6.ebuild:
+  Enhance ebuild layout and helper function usage
 
 *scala-bin-2.11.6 (24 Mar 2015)
 
diff --git a/dev-java/scala-bin/metadata.xml b/dev-java/scala-bin/metadata.xml
index e80ed52a09bd..250f2d1940ea 100644
--- a/dev-java/scala-bin/metadata.xml
+++ b/dev-java/scala-bin/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<herd>java</herd>
+  <herd>java</herd>
 </pkgmetadata>
diff --git a/dev-java/scala-bin/scala-bin-2.11.5.ebuild b/dev-java/scala-bin/scala-bin-2.11.5.ebuild
index fb62c8e49535..1a70d138ade7 100644
--- a/dev-java/scala-bin/scala-bin-2.11.5.ebuild
+++ b/dev-java/scala-bin/scala-bin-2.11.5.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.5.ebuild,v 1.3 2015/03/21 15:11:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.5.ebuild,v 1.4 2015/03/24 09:33:33 jlec Exp $
+
 EAPI=5
 
 inherit java-pkg-2
diff --git a/dev-java/scala-bin/scala-bin-2.11.6.ebuild b/dev-java/scala-bin/scala-bin-2.11.6.ebuild
index af08a6fbcde9..8d3a3aca6dec 100644
--- a/dev-java/scala-bin/scala-bin-2.11.6.ebuild
+++ b/dev-java/scala-bin/scala-bin-2.11.6.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.6.ebuild,v 1.1 2015/03/24 09:16:58 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.6.ebuild,v 1.2 2015/03/24 09:33:33 jlec Exp $
+
 EAPI=5
 
 inherit java-pkg-2
@@ -8,39 +9,40 @@ inherit java-pkg-2
 DESCRIPTION="The Scala Programming Language"
 HOMEPAGE="http://scala.epfl.ch/"
 SRC_URI="http://downloads.typesafe.com/scala/${PV}/scala-${PV}.tgz"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="doc"
-DEPEND=""
 
-RDEPEND=">=virtual/jre-1.6
-!dev-lang/scala"
+DEPEND=""
+RDEPEND="
+	>=virtual/jre-1.6
+	!dev-lang/scala"
 
 JAVA_PKG_IUSE='doc'
+
 S=${WORKDIR}/scala-${PV}
 
 java_prepare() {
 	ebegin 'Cleaning .bat files'
-	rm -f bin/*.bat
+	rm -f bin/*.bat || die
 	eend $?
 
 	ebegin 'Patching SCALA_HOME variable in bin/ scripts'
 	for f in bin/*; do
-		sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' $f
+		sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' $f || die
 	done
 	eend $?
 }
 
 src_install() {
 	ebegin 'Installing bin scripts'
-	dodir /usr/bin
-	exeinto /usr/bin
-	doexe bin/*
+	dobin bin/*
 	eend $?
 
 	ebegin 'Installing jar files'
-	cd lib/
+	cd lib/ || die
 
 	# Unversion those libs
 	java-pkg_newjar scala-continuations-library_*.jar scala-continuations-library.jar
@@ -62,7 +64,7 @@ src_install() {
 
 	eend $?
 
-	cd ../
+	cd ../ || die
 
 	ebegin 'Installing man pages'
 	doman man/man1/*.1