summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-java/scala-bin/ChangeLog6
-rw-r--r--dev-java/scala-bin/scala-bin-2.11.4.ebuild4
-rw-r--r--dev-java/scala-bin/scala-bin-2.11.5.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-java/scala-bin/ChangeLog b/dev-java/scala-bin/ChangeLog
index 8793f478ded3..06c2dcf8e48d 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.17 2015/02/19 21:45:30 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/ChangeLog,v 1.18 2015/03/04 13:08:32 monsieurp Exp $
+
+ 04 Mar 2015; Patrice Clement <monsieurp@gentoo.org> scala-bin-2.11.4.ebuild,
+ scala-bin-2.11.5.ebuild:
+ Inherit java-pkg-2 instead of java-utils-2 (wrong eclass!). Fix bug 542086.
*scala-bin-2.11.5 (19 Feb 2015)
diff --git a/dev-java/scala-bin/scala-bin-2.11.4.ebuild b/dev-java/scala-bin/scala-bin-2.11.4.ebuild
index 60a377806801..a4f1e29b39e7 100644
--- a/dev-java/scala-bin/scala-bin-2.11.4.ebuild
+++ b/dev-java/scala-bin/scala-bin-2.11.4.ebuild
@@ -1,9 +1,9 @@
# 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.3 2015/02/02 10:22:05 monsieurp Exp $
+# $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 $
EAPI=5
-inherit java-utils-2
+inherit java-pkg-2
DESCRIPTION="The Scala Programming Language"
HOMEPAGE="http://scala.epfl.ch/"
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 105aa271d57b..98ee956a47cb 100644
--- a/dev-java/scala-bin/scala-bin-2.11.5.ebuild
+++ b/dev-java/scala-bin/scala-bin-2.11.5.ebuild
@@ -1,9 +1,9 @@
# 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 $
+# $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 $
EAPI=5
-inherit java-utils-2
+inherit java-pkg-2
DESCRIPTION="The Scala Programming Language"
HOMEPAGE="http://scala.epfl.ch/"