jlec 15/03/21 15:11:24
Modified: scala-bin-2.11.5.ebuild scala-bin-2.11.4.ebuild
ChangeLog
Log:
use dobin instead of exeinto /usr/bin/ && doexe; add missing die; make ebuild
layout better readable
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.3 dev-java/scala-bin/scala-bin-2.11.5.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.5.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.5.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.5.ebuild?r1=1.2&r2=1.3
Index: scala-bin-2.11.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.5.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scala-bin-2.11.5.ebuild 4 Mar 2015 13:08:32 -0000 1.2
+++ scala-bin-2.11.5.ebuild 21 Mar 2015 15:11:24 -0000 1.3
@@ -1,6 +1,6 @@
# 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.2
2015/03/04 13:08:32 monsieurp Exp $
+# $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 $
EAPI=5
inherit java-pkg-2
@@ -8,39 +8,40 @@
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 +63,7 @@
eend $?
- cd ../
+ cd ../ || die
ebegin 'Installing man pages'
doman man/man1/*.1
1.5 dev-java/scala-bin/scala-bin-2.11.4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.4.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.4.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.4.ebuild?r1=1.4&r2=1.5
Index: scala-bin-2.11.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.4.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scala-bin-2.11.4.ebuild 4 Mar 2015 13:08:32 -0000 1.4
+++ scala-bin-2.11.4.ebuild 21 Mar 2015 15:11:24 -0000 1.5
@@ -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.4.ebuild,v 1.4
2015/03/04 13:08:32 monsieurp Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.4.ebuild,v 1.5
2015/03/21 15:11:24 jlec Exp $
+
EAPI=5
inherit java-pkg-2
@@ -8,39 +9,40 @@
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 @@
eend $?
- cd ../
+ cd ../ || die
ebegin 'Installing man pages'
doman man/man1/*.1
1.19 dev-java/scala-bin/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/ChangeLog?rev=1.19&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/ChangeLog?rev=1.19&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/ChangeLog?r1=1.18&r2=1.19
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/scala-bin/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog 4 Mar 2015 13:08:32 -0000 1.18
+++ ChangeLog 21 Mar 2015 15:11:24 -0000 1.19
@@ -1,6 +1,11 @@
# 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.18
2015/03/04 13:08:32 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/ChangeLog,v 1.19
2015/03/21 15:11:24 jlec Exp $
+
+ 21 Mar 2015; Justin Lecher <[email protected]> scala-bin-2.11.4.ebuild,
+ scala-bin-2.11.5.ebuild:
+ use dobin instead of exeinto /usr/bin/ && doexe; add missing die; make ebuild
+ layout better readable
04 Mar 2015; Patrice Clement <[email protected]> scala-bin-2.11.4.ebuild,
scala-bin-2.11.5.ebuild:
