Enhance ebuild layout and helper function usage

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 42 insertions, 28 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/Manifest b/dev-java/scala-bin/Manifest
index d85370f52926..9ee72beb7997 100644
--- a/dev-java/scala-bin/Manifest
+++ b/dev-java/scala-bin/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST scala-1.2.0.1.tar.bz2 4548508 SHA256 975d6e10febf5d52a3f2d826afa7f98ddbec0a6f05eaf6c30a3f27a472ca84b9 SHA512 8fd4958e1603b576cb73f7372a88a7b06c1432e4f8a0fa6a987aa4397343c6d859ddda9972af039e0b4b1ea722dbbbfd4df03fe2edf9cc54bbc72e5cebbf200b WHIRLPOOL dfa5d71b39ffa1012d66ac8bcc281562182af13ec642fceee2e1fb7f3228a303a198a401e0578e3aad7d7608a26ae6e11978042fd488b4503ffb144e5d2efa44
 DIST scala-2.11.4.tgz 26509669 SHA256 000f5a19de78049bc06e33ee98063c7ad3cfd51212df92a8a164af89aeef8084 SHA512 f963279cba5d2f4d41d195f80dad32bf529bc5f2c3d306ce6c1b9fbb6d4977a481796d98c3d1758f3987824880ab0925ac72e3a70e4165faf7c7985e64cece28 WHIRLPOOL a76a97854e0d4ac9f2f555ab3b5196d473e8723c88926163f88c891ac31cacb7d97acadf437aee101b2d9db0fc0295f4b3fc95c5db6bc16de8e6ff54b1a2ecda
@@ -7,18 +7,26 @@ DIST scala-2.11.5.tgz 27135212 SHA256 6d593ce6df0e4f2e90ae423f2d40b915cd9be2bd41
 DIST scala-2.11.6.tgz 27130723 SHA256 41ba45e4600404634217a66d6b2c960459d3a67e0344a7c3d9642d0eaa446583 SHA512 aeb6dd1b586d4e66e01f268aa8a647a303f2f960cbe255e9c79ced978dad92b6cef3cba143945affa3427548daed6e5e1d607b9ecb4d7567adc886d64546da61 WHIRLPOOL 20c1bd8b905ad4f7d155d366637a2aeaeb50569025ba585a0e6e3bb2268068e7b74bed26769a9b3a1d1d662833b6d5f57781c7165ec84d1c63142cdd6edae294
 EBUILD scala-bin-1.2.0.1.ebuild 1460 SHA256 c8e4b2b860b5bc8f64c4e88063719862900914eba80f6e19f28deaab5db64029 SHA512 bfbd26744bdf89b3388dffd690f97148f7b9a46bb68733577419a83c81bcab79423e45ebcbbd9988d1b66d95dd50f92e04841e2a6cbbd2bc6770799ba76cea7d WHIRLPOOL 117d23760fd46c6ebdd66a0b937fa48020754d86220d79d0ea2ae98c48e131500a4f5ff3236f96df5401591bece3ba72bfe7ae8dbf4b3566102170be3231a0a0
 EBUILD scala-bin-2.11.4.ebuild 1912 SHA256 b9fb23a0fcd8f6cf01510ea9d795e899bea250c428bc48e69268c1ed6120b432 SHA512 e0ab52c2f8cffbb012c2b8246a49f939e4bf26be7bc1f116462d802ec8d6f46f7962124461ae9c5e5c1875bb6d4174d0b4f6e30c22376c3b699332647157d86a WHIRLPOOL 48b0074a6d120ff792e23e891530e411f00da93154cd66d0bb2fb50c4aff39e53813a64f3661a09ddb9cf28e0ab2ae7e94735854769d956926f7ebd58f193663
-EBUILD scala-bin-2.11.5.ebuild 1911 SHA256 07c41cf4add19c6d0941d73bbfab4a735a8f4ff20ca23fcb7ec3f5c4ec67a0ab SHA512 c6b7d278cdfc1c0e32f0e97dbab536536be4f5031c431cb10296bd22a6ca3ea1493999f5ee63844efce3becbbfdd391290d4e1a3cd26d9bdb4f453ceea2ca554 WHIRLPOOL 3e3e9f32ad42902c50712563acfc5f9197e40e0a9ef60bea485feee2dcee3612711f8d8ee8ffe6ee61acaa47355ee629ba3e8cc102e1b9567d474f7ad6f9899e
-EBUILD scala-bin-2.11.6.ebuild 1917 SHA256 ad749df73d160795d0f74341bf06b64c94cff2435742d5c6bfaa9791ee90c710 SHA512 dfc39b704c10a0189ebc2c5c1ec8dee36d4c4ce0dc5801d5e253929eb73ec79da88f3cec67f2b9e4f4063068a0ad5650bf379c62d4e8d4b223d8bfafb86df5ad WHIRLPOOL 3595cc741f525c0be311433dc94eecbf501388a62f5623d37c19d935378e8efe2a8b36a708a141b1c3998448a54d6226dabcd5344277db6fa86ce1782eb33950
-MISC ChangeLog 3063 SHA256 0140e6673a0bdc0ecc4a02ee6e441ae8374e495c5a12e34388b0018b92ed90a5 SHA512 2694ce45b4a153dd18adcd1e166bcfac36ea7d829984bbad5f5282d88988cb2727c6c68d6cb7af439f9d9e029f1dfd2b31cded665985ff6a638478c1c67f2e83 WHIRLPOOL 218bd30948bd0e04ae10df3d3bc75d815b5abe30117a99014ad44560f63027b6f1bf9d9467ce7f79ad1bde3c9751141861dba753b7ceacc5664dc528093e587b
-MISC metadata.xml 159 SHA256 da2aaa3223c5418688dfbba6f899648c5bcb2e4610126519a1a862913c4f8fa6 SHA512 f5bc77a4e168cdb5a9f9c347f6f437b16bd28978351ec692d4f7e406ba93479424e2272de70fe85d2e0668172de8ccd3aa096f49d5912ed91d17bea11756865b WHIRLPOOL b0cba2d5917cc20d7409ccfedc345ab38c71df76c5c030df578d6db718f8a60dcfc1927c20e7062fafc62e955a90ec9f21cdcef6d7a566fddf374ce766ca64cc
+EBUILD scala-bin-2.11.5.ebuild 1912 SHA256 1317d9ca491907b03dab2def64c7753f6579f9a794f591b8ca75361d5a609096 SHA512 723662cf003c598c23ac34070fa57848e40c0844e826704b3e1b04370042221a37e2cb5647eea3177cfe4d9dcb2002a1d7c4fb046e8ae9beebfbe72804535de4 WHIRLPOOL 2762d799b0ca66d7ef1e3f39688c17f3715f763034eecfdbae89514107734e982efbdc97fede69ac98943d40d6c0f85cf0705d2080f3766a1501a3e2d703ba8e
+EBUILD scala-bin-2.11.6.ebuild 1912 SHA256 3b4c8288c6aa8079ef77e072a74d5d5769319eb7b626f6483cb3f5929a191ce9 SHA512 06a375f7dc4fcb2557684b96967890eafa2aae598c7e1df7209bd6d7f9767df3dbbde7deb514051c0a5aa58fc6a3d46da2ffcb55eaee42dd395eba067af9f599 WHIRLPOOL d87515e00e8dbe241c02c75717bc99d9b7d9ba645924ca3edcc226d3db478ce58e930b03c3973d4c41331db39cb69fdebd0a040622e356887b21810a4a270fc8
+MISC ChangeLog 3222 SHA256 eae50137b462b041b86ca489f81d7d5eebd7f5bc92eefa46ac53dd718bbb858a SHA512 b11ed0bc164fc45e2e2bd12e902a98ffddbcd8aff31ea0b8ca508487e4e748d7161c1ba392cfb0abd728db2ccd6f02e338167d5d61875605cccbe675d55aece5 WHIRLPOOL 600305b0b2bbc5db67b3a815f7b6eae019ce29a34da5d6a3c0353ad6d2c74c716e11f58a2060c9b323b3adda094cb94117b355c41ac77f14cd18ddf7d29a94c0
+MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVESudAAoJEJGRpfGTSRu4w5wIAImCUSewzumorfEesLxFP3yL
-iyrf3zZWDZs/OQln5OvjZ4BJncrskWV+CdXRTXuEm9km8074swX2MOQblznkb9wq
-LRN01AmmvXCLRfWtcCHieCckHR9mmbU1rRskGWxJQDEB6CngDIP+y7oOQOR6TGGP
-QwwWB9FjhEKK86T76lharl8RwpH0yS/1doUsp7DBriH/+U+3CjHCBTe5VcBTM+HI
-/7iFv4CwBagC15rTO9NX596IBuRbE1Nseo/2lgCVK0DBPAcAjG8QW6c5ozIp/d+9
-bV5LzDLGnFVtwBSQgYhOfH14itxDCwjfaeuGWGD3cPhMugZiDM4Y/JabH5UUHpE=
-=jBcW
+iQJ8BAEBCgBmBQJVES9uXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirlOYQAIEVU0QwUwe6/5IUKRBzBLF2
+Oge104KbE3HUWYmJiOeJSFAeVwM5qC0JDcGkp314JvZm4ueQmGezanyWLdsq0sH4
+dewjFKoYiwx9xurjE6im5oCvelH117TttNlcCSv8KMyS6xoduvnDv+SqnI/YpZ4c
+R3Jk1/UT5TNNt6LXzGWcAHLFqrT9JtpGvwo6dnrg17Lq2WzquU5/paNZbLKFO9C6
+juNZJ+qocgivJPcMq3YUWAJGFqAtsEiu11PQvq+l/qEMOK7VrjhsyjIv5G5WW7mR
+RA6LPvNdkoy8D8njf/cUbOR0XHPIjpDSf+0khsWMDJMcAg8T2IP3aVLx230hGAT+
+X7Z8EGC2y913JXlxZZQaw51K9lnnirPuJ2L1LRgIBUfxOmUTU2dNYG8zQUkZb/vL
+wjsqvLDek7kdf6rKk49bh1alsdxiUtLB/NdSb4Jkg8KdHmvBNsuxwsOxIQ30GhBy
+4lUyGovVz0zkLe7PreULpeWW8a/S3e+ATjHjxmaCVuY/A6lkhSGpfxNezb+EFaHi
+DLY3s+YnckWMtojIQAyJE+MPUklpGkGDRvgtf/ph9JOx6BFRW+sKkskRQHdFTYt3
+4fKfg6hpKzQQI9rDN3m5+xTEV7NF55+nBNP4pi84p58v36aykTZMJuqOJgemrKoS
+wtZtJCxqnVWTvRbT4MMv
+=jw62
 -----END PGP SIGNATURE-----
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