Bump to version 2.11.5. Fix bug #540704.

Package-Manager: portage-2.2.14/cvs/Linux x86_64

3 files changed, 86 insertions, 2 deletions

diff --git a/dev-java/scala-bin/ChangeLog b/dev-java/scala-bin/ChangeLog
index ab4e6ce3e453..8793f478ded3 100644
--- a/dev-java/scala-bin/ChangeLog
+++ b/dev-java/scala-bin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2015/02/02 10:22:05 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/ChangeLog,v 1.17 2015/02/19 21:45:30 monsieurp Exp $
+
+*scala-bin-2.11.5 (19 Feb 2015)
+
+  19 Feb 2015; Patrice Clement <monsieurp@gentoo.org> +scala-bin-2.11.5.ebuild,
+  scala-bin-2.11.4.ebuild:
+  Bump to version 2.11.5. Fix bug #540704.
 
   02 Feb 2015; Patrice Clement <monsieurp@gentoo.org> scala-bin-2.11.4.ebuild:
   Add forgotten `doc' USE flag to IUSE flags. Fix bug 538480.
diff --git a/dev-java/scala-bin/Manifest b/dev-java/scala-bin/Manifest
index d434d2dc8cd2..274f28b8636d 100644
--- a/dev-java/scala-bin/Manifest
+++ b/dev-java/scala-bin/Manifest
@@ -1,6 +1,8 @@
 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
+DIST scala-2.11.5.tgz 27135212 SHA256 6d593ce6df0e4f2e90ae423f2d40b915cd9be2bd41708b7fc1df56ebbdf0893c SHA512 c906cb1e42a62fc271674cb95b3eacd968dd579dfd43a1adaae8a102b4069096907af4798a6a002dfec796905e3cff05d58116013c8e45a7277879935c39d3d3 WHIRLPOOL d05fd600bf5c24a856f75ca245338d97da642dd7d68033bf21364aa9ba82aa79c00b37a1a8721cd761126e011556ef52ad06a370d680b04aa5391488e695f739
 EBUILD scala-bin-1.2.0.1.ebuild 1460 SHA256 c8e4b2b860b5bc8f64c4e88063719862900914eba80f6e19f28deaab5db64029 SHA512 bfbd26744bdf89b3388dffd690f97148f7b9a46bb68733577419a83c81bcab79423e45ebcbbd9988d1b66d95dd50f92e04841e2a6cbbd2bc6770799ba76cea7d WHIRLPOOL 117d23760fd46c6ebdd66a0b937fa48020754d86220d79d0ea2ae98c48e131500a4f5ff3236f96df5401591bece3ba72bfe7ae8dbf4b3566102170be3231a0a0
 EBUILD scala-bin-2.11.4.ebuild 1919 SHA256 f338032c9b90aab16e17d03902544c0dacba0c992f961fb0e2a90a8b3ee2679e SHA512 3e350a6499959fdb9eb2c30f1a1d6d23ffc9a47d0caed2bfb052264e5466d8cf5c93cebb50a8836438b09593598058f90a8352ed3548c1b758d9762b286e30d1 WHIRLPOOL 6e79379af152918d8680c258f639d43d79de33318d863d5d1d643ee372fccd07401fdfe64383c07f3a1697428104dc2f6013de8472d8e3d8a3f77ec62f953d69
-MISC ChangeLog 2343 SHA256 8fae143560cdb8bda7726fe2d3d66d3d91865aa3e1906765362d8943554ff6a4 SHA512 6a43187a029f67967aa3420d43187933be2bf95b78366e2c09b1be433b9b6316c71209d7355b392cbbacbbbcd69587e8c0bc3ae2bc4f969ce3a18359e83cff9a WHIRLPOOL ca58a9e5fedcd997449e2b1fef520f725afb8a59043c1037706f88328db0181886986dff652c709aca837750fa3b36a68d047070e3655fbfba2b9d399da6efe5
+EBUILD scala-bin-2.11.5.ebuild 1919 SHA256 3712335420de070691fb763f0931a1a61c7358846aade8d4421421308583ef1c SHA512 a48a07df103e78dcfb4859461e3bb95ee5d1f434f4991dafaaf01287851f87cbea8de1fb92e4cc7b6c3841ac993d4650f66f2ef2c631c1ebfc617ac9b306adbc WHIRLPOOL c3871fac1c6c673a0d5ad4d639440250b4807e28fc753458358494f31872a4e23962561c37f59f10eb7801f1d765b3d96a08f1a9d5d464b0f5f2149055ac2bcf
+MISC ChangeLog 2527 SHA256 b590fad8c60bcdbb039871021bccd81c11e20bb46228c5c3cace252b659b14a4 SHA512 761127f4127e7712e0d3db98cc10c1ef4a6d6b7fcd1c7beb3dfb3b12d93a3d0172537311cbdbda9ba291e41705ef559af6882f61a3543875abba9f378ba93c78 WHIRLPOOL 86ca929ed9439cc566641502fcd3b43622b5a1fcd1b644560e0c9cd572a4168a95649fc5de2f0635db98c6e1728bc307408dc05fea89b5bea73df920fc9b1bc8
 MISC metadata.xml 159 SHA256 da2aaa3223c5418688dfbba6f899648c5bcb2e4610126519a1a862913c4f8fa6 SHA512 f5bc77a4e168cdb5a9f9c347f6f437b16bd28978351ec692d4f7e406ba93479424e2272de70fe85d2e0668172de8ccd3aa096f49d5912ed91d17bea11756865b WHIRLPOOL b0cba2d5917cc20d7409ccfedc345ab38c71df76c5c030df578d6db718f8a60dcfc1927c20e7062fafc62e955a90ec9f21cdcef6d7a566fddf374ce766ca64cc
diff --git a/dev-java/scala-bin/scala-bin-2.11.5.ebuild b/dev-java/scala-bin/scala-bin-2.11.5.ebuild
new file mode 100644
index 000000000000..105aa271d57b
--- /dev/null
+++ b/dev-java/scala-bin/scala-bin-2.11.5.ebuild
@@ -0,0 +1,76 @@
+# 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.1 2015/02/19 21:45:30 monsieurp Exp $
+EAPI=5
+
+inherit java-utils-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"
+
+JAVA_PKG_IUSE='doc'
+S=${WORKDIR}/scala-${PV}
+
+java_prepare() {
+	ebegin 'Cleaning .bat files'
+	rm -f bin/*.bat
+	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
+	done
+	eend $?
+}
+
+src_install() {
+	ebegin 'Installing bin scripts'
+	dodir /usr/bin
+	exeinto /usr/bin
+	doexe bin/*
+	eend $?
+
+	ebegin 'Installing jar files'
+	cd lib/
+
+	# Unversion those libs
+	java-pkg_newjar scala-continuations-library_*.jar scala-continuations-library.jar
+	java-pkg_newjar akka-actor_*.jar akka-actor.jar
+	java-pkg_newjar config-*.jar config.jar
+	java-pkg_newjar scala-actors-2.11.0.jar scala-actors.jar
+	java-pkg_newjar scala-actors-migration_*.jar scala-actors-migration.jar
+	java-pkg_newjar scala-swing_*.jar scala-swing.jar
+	java-pkg_newjar scala-parser-combinators_*.jar scala-parser-combinators.jar
+	java-pkg_newjar scala-xml_*.jar scala-xml.jar
+	java-pkg_newjar jline-*.jar jline.jar
+	java-pkg_newjar scala-continuations-plugin_*.jar scala-continuations-plugin.jar
+	java-pkg_newjar scalap-*.jar scalap.jar
+
+	# Install these the usual way
+	java-pkg_dojar scala-compiler.jar
+	java-pkg_dojar scala-library.jar
+	java-pkg_dojar scala-reflect.jar
+
+	eend $?
+
+	cd ../
+
+	ebegin 'Installing man pages'
+	doman man/man1/*.1
+	eend $?
+
+	if use doc; then
+		ebegin 'Installing documentation'
+		java-pkg_dohtml -r doc/tools
+		eend $?
+	fi
+}