Slot scala

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

5 files changed, 43 insertions, 31 deletions

diff --git a/sci-mathematics/isabelle/ChangeLog b/sci-mathematics/isabelle/ChangeLog
index 4aef8d2c85b1..c4c8407e9220 100644
--- a/sci-mathematics/isabelle/ChangeLog
+++ b/sci-mathematics/isabelle/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-mathematics/isabelle
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/ChangeLog,v 1.13 2015/03/25 01:46:06 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/ChangeLog,v 1.14 2015/04/17 14:41:21 gienah Exp $
+
+*isabelle-2013-r2 (17 Apr 2015)
+*isabelle-2013.2-r1 (17 Apr 2015)
+
+  17 Apr 2015; Mark Wright <gienah@gentoo.org> +isabelle-2013-r2.ebuild,
+  +isabelle-2013.2-r1.ebuild, -isabelle-2013-r1.ebuild, -isabelle-2013.2.ebuild,
+  files/isabelle-2013-classpath.patch, files/isabelle-2013.2-classpath.patch:
+  Slot scala
 
   25 Mar 2015; Mark Wright <gienah@gentoo.org> isabelle-2011.1-r2.ebuild,
   isabelle-2012-r1.ebuild, isabelle-2013-r1.ebuild, isabelle-2013.2.ebuild:
diff --git a/sci-mathematics/isabelle/files/isabelle-2013-classpath.patch b/sci-mathematics/isabelle/files/isabelle-2013-classpath.patch
index 47a125461f49..e3b2271a30c5 100644
--- a/sci-mathematics/isabelle/files/isabelle-2013-classpath.patch
+++ b/sci-mathematics/isabelle/files/isabelle-2013-classpath.patch
@@ -1,28 +1,28 @@
 --- Isabelle2013-orig/lib/Tools/java	2013-02-13 00:31:02.000000000 +1100
-+++ Isabelle2013/lib/Tools/java	2013-08-18 14:07:51.704133000 +1000
++++ Isabelle2013/lib/Tools/java	2015-04-17 12:16:04.734716358 +1000
 @@ -6,5 +6,5 @@
  
  CLASSPATH="$(jvmpath "$CLASSPATH")"
  isabelle_jdk java -Dfile.encoding=UTF-8 -server \
 -  "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext")" "$@"
-+  "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext:$(java-config -p scala | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
++  "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext:$(java-config -p scala-2.10 | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
  
 --- Isabelle2013-orig/lib/Tools/scala	2013-02-13 00:31:02.000000000 +1100
-+++ Isabelle2013/lib/Tools/scala	2013-08-18 14:07:00.795248000 +1000
++++ Isabelle2013/lib/Tools/scala	2015-04-17 12:12:21.606890256 +1000
 @@ -8,4 +8,4 @@
  
  CLASSPATH="$(jvmpath "$CLASSPATH")"
  isabelle_scala scala -Dfile.encoding=UTF-8 \
 -  "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext")" "$@"
-+  "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext:$(java-config -p scala | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
++  "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext:$(java-config -p scala-2.10 | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
 --- Isabelle2013-orig/lib/Tools/scalac	2013-02-13 00:31:02.000000000 +1100
-+++ Isabelle2013/lib/Tools/scalac	2013-08-18 14:07:32.751448000 +1000
++++ Isabelle2013/lib/Tools/scalac	2015-04-17 12:12:36.895871214 +1000
 @@ -8,5 +8,5 @@
  
  CLASSPATH="$(jvmpath "$CLASSPATH")"
  isabelle_scala scalac -Dfile.encoding=UTF-8 \
 -  "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext")" "$@"
-+  "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext:$(java-config -p scala | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
++  "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext:$(java-config -p scala-2.10 | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
  
 --- Isabelle2013-orig/src/Pure/build-jars	2013-02-13 00:31:15.000000000 +1100
 +++ Isabelle2013/src/Pure/build-jars	2013-08-18 12:55:51.400924000 +1000
diff --git a/sci-mathematics/isabelle/files/isabelle-2013.2-classpath.patch b/sci-mathematics/isabelle/files/isabelle-2013.2-classpath.patch
index 4532bd3b8ad3..b3ad4ae95cd9 100644
--- a/sci-mathematics/isabelle/files/isabelle-2013.2-classpath.patch
+++ b/sci-mathematics/isabelle/files/isabelle-2013.2-classpath.patch
@@ -1,29 +1,29 @@
 --- Isabelle2013-2-orig/lib/Tools/java	2013-12-06 02:18:34.000000000 +1100
-+++ Isabelle2013-2/lib/Tools/java	2014-02-09 20:53:30.085279943 +1100
++++ Isabelle2013-2/lib/Tools/java	2015-04-17 12:23:11.535463796 +1000
 @@ -10,5 +10,5 @@
  unset CLASSPATH
  
  isabelle_jdk java "${JAVA_ARGS[@]}" \
 -  -classpath "$(jvmpath "$ISABELLE_CLASSPATH")" "$@"
-+  -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
++  -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala-2.11 | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
  
 --- Isabelle2013-2-orig/lib/Tools/scala	2013-12-06 02:18:34.000000000 +1100
-+++ Isabelle2013-2/lib/Tools/scala	2014-02-09 20:54:22.418737591 +1100
++++ Isabelle2013-2/lib/Tools/scala	2015-04-17 12:23:24.836455672 +1000
 @@ -7,5 +7,5 @@
  isabelle_admin_build jars || exit $?
  
  isabelle_scala scala -Dfile.encoding=UTF-8 \
 -  -classpath "$(jvmpath "$ISABELLE_CLASSPATH")" "$@"
-+  -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
++  -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala-2.11 | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
  
 --- Isabelle2013-2-orig/lib/Tools/scalac	2013-12-06 02:18:34.000000000 +1100
-+++ Isabelle2013-2/lib/Tools/scalac	2014-02-09 20:55:03.999895037 +1100
++++ Isabelle2013-2/lib/Tools/scalac	2015-04-17 12:23:33.084450628 +1000
 @@ -7,5 +7,5 @@
  isabelle_admin_build jars || exit $?
  
  isabelle_scala scalac -Dfile.encoding=UTF-8 \
 -  -classpath "$(jvmpath "$ISABELLE_CLASSPATH")" "$@"
-+  -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
++  -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala-2.11 | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
  
 --- Isabelle2013-2-orig/src/Tools/jEdit/lib/Tools/jedit	2013-12-06 02:19:04.000000000 +1100
 +++ Isabelle2013-2/src/Tools/jEdit/lib/Tools/jedit	2014-02-09 20:59:14.026841490 +1100
diff --git a/sci-mathematics/isabelle/isabelle-2013-r1.ebuild b/sci-mathematics/isabelle/isabelle-2013-r2.ebuild
index 91ba03fd42ec..c54c50e2d2f2 100644
--- a/sci-mathematics/isabelle/isabelle-2013-r1.ebuild
+++ b/sci-mathematics/isabelle/isabelle-2013-r2.ebuild
@@ -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/sci-mathematics/isabelle/isabelle-2013-r1.ebuild,v 1.3 2015/03/25 01:46:06 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2013-r2.ebuild,v 1.1 2015/04/17 14:41:21 gienah Exp $
 
 EAPI="5"
 
@@ -22,6 +22,8 @@ JFREECHART_P="${JFREECHART_PN}-${JFREECHART_PV}"
 JFREECHART_IC_PN="${JFREECHART_PN}-isabelle-component"
 JFREECHART_IC_P="${JFREECHART_IC_PN}-${JFREECHART_PV}"
 
+SS="2.10"
+
 DESCRIPTION="Isabelle is a generic proof assistant"
 HOMEPAGE="http://www.cl.cam.ac.uk/research/hvg/Isabelle/index.html"
 SRC_URI="http://www.cl.cam.ac.uk/research/hvg/Isabelle/dist/${MY_P}.tar.gz
@@ -51,7 +53,7 @@ DEPEND=">=app-shells/bash-3.0:*
 		virtual/latex-base
 		dev-tex/rail
 	)
-	>=dev-lang/scala-2.10.2 <dev-lang/scala-2.11.1
+	>=dev-lang/scala-2.10.2:${SS}
 	ledit? (
 		app-misc/ledit
 	)
@@ -73,7 +75,7 @@ JFREECHART_S="${WORKDIR}/${JFREECHART_P}"
 TARGETDIR="/usr/share/Isabelle"${MY_PV}
 LIBDIR="/usr/"$(get_libdir)"/Isabelle"${MY_PV}
 
-LIBRARY_PKGS="scala,itext,jcommon-1.0,jfreechart-1.0,xml-xmlbeans-1"
+LIBRARY_PKGS="scala-${SS},itext,jcommon-1.0,jfreechart-1.0,xml-xmlbeans-1"
 
 src_unpack() {
 	unpack "${MY_P}.tar.gz"
@@ -120,7 +122,7 @@ src_prepare() {
 		ISABELLE_OCAML="${ROOT}usr/bin/ocaml"
 		ISABELLE_SWIPL="${ROOT}usr/bin/swipl"
 		ISABELLE_JDK_HOME="\$(java-config --jdk-home)"
-		SCALA_HOME="${ROOT}usr/share/scala"
+		SCALA_HOME="${ROOT}usr/share/scala-${SS}"
 		SHA1_HOME="/usr/$(get_libdir)/sha1-polyml"
 	EOF
 	cat <<- EOF >> "${S}/etc/components"
diff --git a/sci-mathematics/isabelle/isabelle-2013.2.ebuild b/sci-mathematics/isabelle/isabelle-2013.2-r1.ebuild
index 91894d96160b..7f5778731ab1 100644
--- a/sci-mathematics/isabelle/isabelle-2013.2.ebuild
+++ b/sci-mathematics/isabelle/isabelle-2013.2-r1.ebuild
@@ -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/sci-mathematics/isabelle/isabelle-2013.2.ebuild,v 1.2 2015/03/25 01:46:06 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2013.2-r1.ebuild,v 1.1 2015/04/17 14:41:21 gienah Exp $
 
 EAPI="5"
 
@@ -28,6 +28,8 @@ POLYML_P="${POLYML_PN}-${POLYML_PV}"
 POLYML_IC_PN="${POLYML_PN}-isabelle-component"
 POLYML_IC_P="${POLYML_IC_PN}-${POLYML_PV}"
 
+SS="2.11"
+
 DESCRIPTION="Isabelle is a generic proof assistant"
 HOMEPAGE="http://www.cl.cam.ac.uk/research/hvg/Isabelle/index.html"
 SRC_URI="http://www.cl.cam.ac.uk/users/lcp/archive/${MY_P}.tar.gz
@@ -59,7 +61,7 @@ DEPEND=">=app-shells/bash-3.0:*
 		virtual/latex-base
 		dev-tex/rail
 	)
-	>=dev-lang/scala-2.11.1
+	>=dev-lang/scala-2.11.1:${SS}
 	ledit? (
 		app-misc/ledit
 	)
@@ -91,7 +93,7 @@ LIBDIR="/usr/"$(get_libdir)"/Isabelle"${MY_PV}
 # marker/MarkerSetsPlugin.class                   http://plugins.jedit.org/plugins/?MarkerSets
 # projectviewer/gui/OptionPaneBase.class          http://plugins.jedit.org/plugins/?ProjectViewer
 
-LIBRARY_PKGS="ant-core,itext,jcommon-1.0,jfreechart-1.0,scala,xml-xmlbeans-1,xz-java"
+LIBRARY_PKGS="ant-core,itext,jcommon-1.0,jfreechart-1.0,scala-${SS},xml-xmlbeans-1,xz-java"
 
 src_unpack() {
 	unpack "${MY_P}.tar.gz"
@@ -139,7 +141,7 @@ src_prepare() {
 		ISABELLE_OCAML="${ROOT}usr/bin/ocaml"
 		ISABELLE_SWIPL="${ROOT}usr/bin/swipl"
 		ISABELLE_JDK_HOME="\$(java-config --jdk-home)"
-		SCALA_HOME="${ROOT}usr/share/scala"
+		SCALA_HOME="${ROOT}usr/share/scala-${SS}"
 		SHA1_HOME="/usr/$(get_libdir)/sha1-polyml"
 	EOF
 	cat <<- EOF >> "${S}/etc/components"
@@ -308,16 +310,16 @@ src_install() {
 	dodoc ANNOUNCE CONTRIBUTORS COPYRIGHT NEWS README
 
 	java-pkg_regjar \
-		"${ED}${TARGETDIR}/contrib/jedit_build-20131106/contrib/Console.jar" \
-		"${ED}${TARGETDIR}/contrib/jedit_build-20131106/contrib/ErrorList.jar" \
-		"${ED}${TARGETDIR}/contrib/jedit_build-20131106/contrib/Highlight.jar" \
-		"${ED}${TARGETDIR}/contrib/jedit_build-20131106/contrib/idea-icons.jar" \
-		"${ED}${TARGETDIR}/contrib/jedit_build-20131106/contrib/jedit-5.1.0-patched/jars/QuickNotepad.jar" \
-		"${ED}${TARGETDIR}/contrib/jedit_build-20131106/contrib/jedit-5.1.0-patched/jedit.jar" \
-		"${ED}${TARGETDIR}/contrib/jedit_build-20131106/contrib/jsr305-2.0.0.jar" \
-		"${ED}${TARGETDIR}/contrib/jedit_build-20131106/contrib/MacOSX.jar" \
-		"${ED}${TARGETDIR}/contrib/jedit_build-20131106/contrib/SideKick.jar" \
-		"${ED}${TARGETDIR}/contrib/jfreechart-1.0.14-1/jfreechart-1.0.14-demo.jar" \
+		"${ED}${TARGETDIR}/contrib/${JEDIT_P}/contrib/Console.jar" \
+		"${ED}${TARGETDIR}/contrib/${JEDIT_P}/contrib/ErrorList.jar" \
+		"${ED}${TARGETDIR}/contrib/${JEDIT_P}/contrib/Highlight.jar" \
+		"${ED}${TARGETDIR}/contrib/${JEDIT_P}/contrib/idea-icons.jar" \
+		"${ED}${TARGETDIR}/contrib/${JEDIT_P}/contrib/jedit-5.1.0-patched/jars/QuickNotepad.jar" \
+		"${ED}${TARGETDIR}/contrib/${JEDIT_P}/contrib/jedit-5.1.0-patched/jedit.jar" \
+		"${ED}${TARGETDIR}/contrib/${JEDIT_P}/contrib/jsr305-2.0.0.jar" \
+		"${ED}${TARGETDIR}/contrib/${JEDIT_P}/contrib/MacOSX.jar" \
+		"${ED}${TARGETDIR}/contrib/${JEDIT_P}/contrib/SideKick.jar" \
+		"${ED}${TARGETDIR}/contrib/${JFREECHART_P}/jfreechart-1.0.14-demo.jar" \
 		"${ED}${TARGETDIR}/lib/browser/GraphBrowser.jar" \
 		"${ED}${TARGETDIR}/lib/classes/Graphview.jar" \
 		"${ED}${TARGETDIR}/lib/classes/Pure.jar" \