Slot scala

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

6 files changed, 51 insertions, 39 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/Manifest b/sci-mathematics/isabelle/Manifest
index ea26f8591119..395bfa46fd95 100644
--- a/sci-mathematics/isabelle/Manifest
+++ b/sci-mathematics/isabelle/Manifest
@@ -13,10 +13,10 @@ AUX isabelle-2012-redundant-equations-in-function-definitions-error.patch 1319 S
 AUX isabelle-2012-reverse-line-editor-order.patch 423 SHA256 51a172b46baaaa269488801bad3d46ba4ccd0e3df35b2c15dc9b75592ceb843e SHA512 de9499e5c0d9bc22a72ef15320490fea7e71afbfe1ab6bc3a6a71a866eda2050833d47aadc7c0c7b106d4f0a28fa9a062ec2d9a6c15bf6c0eedd54274df20515 WHIRLPOOL 3a96e039df568ffd449dc0dc18a888d55a5b3db2940beb7f7e28628e0abdd3bd4132162abc7cac8c633f562cb2b18afb8a4e84cea26fa18f086488bfd3781a48
 AUX isabelle-2012-signal-handling.patch 457 SHA256 df6e274300a8ac440fa140c7bdb130c42191a45b40067bac46fcf8141861df6f SHA512 a505385c64ab1d4687543a1f12cfe0be6c50947161860b25a4abac3ef28219ee51f6f2c560ae5fa6894c2be191836c84ba3a0cf3cc6c65e9ca3a6c07aa8ba823 WHIRLPOOL 8151a64ea11a5d800aebb64d9e0d622aa428ef7e071d3d8ff90551855bd753f5c82e3af79bc09c95ca1e6cb3780e2aa8786031e71be1cd62072c5c4bbe81654f
 AUX isabelle-2013-HOL-Predicate_Compile_Examples.patch 3388 SHA256 690917da79d2c4db7055dbabcff0923a604674ac3b82616e596aeb128034b7fd SHA512 105b7067a9e9470ee8f54212cb8ec4ff50806a9c3b2468eae7972884267c27da33c0606850376f7d318f40dcddbc0305235f895c1409d88412d917c9c973fc0a WHIRLPOOL 7bbe4d3e254ea1b677189daf9bd7925e497dfd386df7466d2e81bd6e11ba46dfa8bcb3cd8b662baf479f8e0e58eb2f3feea6eecf54d88c064adba803a9f85893
-AUX isabelle-2013-classpath.patch 5309 SHA256 5b6fad7851876fd1e070e12b714688aad749f7e85d83665aa99abb5a74ad9233 SHA512 47874fd4570ffa865cca1069f2e5189d0765ecac0df65e19997ea50f6ebe2790ed9b588a3d4669c9abca4c67b3c160d4cf563171b20218c8729391cb82f2b197 WHIRLPOOL 3d6e8d8e87ff11ceae025cae987f7901f765b64f01e5fd7cbf7c06715b8758e9648c8066adc01ce91920aaf1526108db80f008b818ce85dbbb938888a45f521e
+AUX isabelle-2013-classpath.patch 5324 SHA256 e0586868aaef339f54cd1a579bd0627cee1d40308dd69eb8979f383d174bc92b SHA512 e380fd81a9bc92798431fb1d360e8c6328f8db485b111ab37c89d51f5d363834ddef82e5790c36b9ee86c8c41432084a9280818a3c6332de8413ba97fc85e23c WHIRLPOOL 99e505edf03fc63f15a26e6cc77bba3cf317edd06c08197ec7577a54c6a929ee48a351778d0ff6b7bc92cc7647ae7f531adb2a203bd3b2057654826fc4f1200a
 AUX isabelle-2013-gentoo-settings.patch 600 SHA256 8b8a0bd49fa4bc58222906c6d0315b03a09144b5c419acb21c03bad4ee13cdfb SHA512 d9eee090f79f5d4a82cb478160f69ac107ba486925ca1e87ea3cfbc84c402155665b384803b9b78c52514568d90ba77a177abfdf004a4ca9c4080eb49879b0e2 WHIRLPOOL 2b132ae5c8a57b440ec11a70a25061251d1bfb6551627848df21bce907a10834f7889d277a3f5c6cb9928817142c8aa1f08be2b8b783f84c766a6c5309d79863
 AUX isabelle-2013.2-HOL-Predicate_Compile_Examples.patch 3365 SHA256 f6eb29e06d2411bd74d68a987972ab975d35e28004404761b920f61cb9a7a43d SHA512 a2302959545ce7ac4783c8f076bded4fe98695c0fda17b5c0c015ac2a43a5daa92d11081ef8f33aa03a6db2b8770955b284ea04cc06d7f5d3ccec2c497598665 WHIRLPOOL ec5bdf3878b60f64875dff645c441907674d59e23845308f97951f2f06ca36c7af9eede75c1d310011231b9ef963f99fa225418f72d7a90c39d3b0f24fe74cf4
-AUX isabelle-2013.2-classpath.patch 4404 SHA256 425f1481799367627c5bea0915eb7609331a4028d17ec538d8eb74f7fe073db0 SHA512 b665a26d5e09d35eceb0b770dfbf5a67a715e91d29f8b9d06813035c0ed74c2501fc158522ca133b4de66468042859360b5754c2518f67f03e42efa11608179c WHIRLPOOL fb4eff34fc8ad8d36fd28fd8e7b9cc0f7361af66360e19148c99ceb6bfabf72026ca100e59ba20e59d3293b766e821720d2b8e86ba8e4ce459183f7d65ca7644
+AUX isabelle-2013.2-classpath.patch 4419 SHA256 50e7c0853916f34bd0c3a550ee9a3440bbd8f05c5bc2204b6771a3fa3bb44afb SHA512 2beda26c5121cac85f3b3ddcbb5b789572cc224172a56968e3b54ea38142738876ac3fbef213ba59773d23412d46f39efd3119bac683a2cdf94e3cad98427131 WHIRLPOOL 09c9a8b76905d10e9471fd8c998e905a9fe6943b19707b0ebbba83ec0d2339de11cc9ee6797a1fc9275b658ec969d7a261bb4ddf5df4dea4d778c52bf772d27e
 DIST Isabelle2011-1.tar.gz 42239059 SHA256 48d77fe31a16b44f6015aa7953a60bdad8fcec9e60847630dc7b98c053edfc08 SHA512 213207951455395659a91b0bc6c8520c084cb6c75098c8f24c0800e41474c90c92aae86ffb99415142f6cf63d569556661ba350024fe458daa54a5cc9db372fd WHIRLPOOL 7e7868c3f464f507aceb8e1f648c04394fdd69746242179e66cfad64f927cf4d6aba41970428da5e45cce90a30bcee29bdc373d8a9e4943eb61cd97480d0a366
 DIST Isabelle2012-doc-src.tar.gz 2688496 SHA256 e18965fe0f7f89b286d4707e38201f1edbea81f6b26aed59d63a633c03fec097 SHA512 5aaea56eb67e535d745d63314278b6ee8469e6d3bbf4ce4d7b3f5e04b24557783b56d50d905a5ad69187c42f44407023c95a9bfb6faab125c21edff7638ff21d WHIRLPOOL 278b63a243950b1596376ee04cbfddb7a93c747e9f6ee66c5b069ca0dae4ca8d10bef43e03069b6186a19c703f71a585633fc47c3c1a15de3a886ff468232127
 DIST Isabelle2012.tar.gz 49529865 SHA256 b86f957dee221041f92c9d4ced4758d45b4950339743d0d58b1ea6061e2b53f0 SHA512 1346f563233eba10bc14f7d140706b8bfba8e832f7ee5887316c829926136af07d700914a925272d8adc1275b0bdd682540518957910c136a15bfc60d61285a0 WHIRLPOOL 23b764a1a0044a9525d058e95da318f4425fadf7660edc8ab8f35b248f98dcff0dba2e533ff18d8bf47ea164cec12a9648642749de2a49887bbe84ed4e71a68b
@@ -31,14 +31,14 @@ DIST polyml-isabelle-component-5.5.1-1.tar.gz 831 SHA256 f19a4dfc3117792423270cb
 EBUILD isabelle-2011.1-r2.ebuild 8117 SHA256 61c49cd4699c9b069d4dfcef1b8eb2b85484ad363f8e54a327d89a4f8319735c SHA512 c29060c53c6ab7f73790aeac92c1665dd43407ced38e2bf66947255d44bd4abc4c616129bc7c770506d3abedab5e64d2038d846ced72ca814a3366ff21877830 WHIRLPOOL 745c7d21f3eedaac384f5df515642a15109dc75293fc9b6fac0a28eb618fce6fa10db81de8c63f58d71ff064cfa70d5c2ae78cdbe725f3cfb8ee502221700759
 EBUILD isabelle-2011.1.ebuild 4036 SHA256 6063b32c39e50c42e81051197ce46a735bb16448c13b5ff1f8af5018f07b3020 SHA512 430524175bd5fbf4beb325a93ef746bf5df5c2beabc4b6d9536c1f7370e0c1babdd9bf00a617076a74ff892e5909ffe01f791a7121bdf3fb3cd817eb42f4bf66 WHIRLPOOL 3e3bcc27aa6ff8f4853fb142c0a4312bb7eeb908639a3fc826ae882a16fca60c03374387f4e06b19f4b079afb562d782d786c75c1c4a36c2cac2db47c0f04e18
 EBUILD isabelle-2012-r1.ebuild 11017 SHA256 19cd30a1690f58dc518f50cbcfd0c92704e25c49b3ef829a6e5bd4dfcee705a1 SHA512 4de5cdecd01dafadbffff04bd2122c829ee50576688cc5807db2de239671b3142b357f20433f6aedcd9fcbdc5aedc184eb16953222e9f05c8480400f37762336 WHIRLPOOL af0ba053668ff08e605995072e9d8bfdb97f6d7e3f167b36eedb1623a60e8e4a26422752d0fe315b106d7f14c699a0eb97ad284731c579f3130e637a7a523f6f
-EBUILD isabelle-2013-r1.ebuild 12459 SHA256 5a602167ab7b38ffb452b5aa560640119f02514bd765da2027e759b32b1d8448 SHA512 ccc1512533db20c5c6ea43aef6e8bd345607609de2e3eac9231fcb90381456ca1aed85f6fa6fc5e231ed00a00d14095c737b11f6396b546ba45686da49915647 WHIRLPOOL e3b601c3f9e5639543651d81b99a527a591c7d9ba39017b4d6c56a26c248001e827a6d2fbd6d4901dc582f900034e4abd808347805debd94afbf6f1dc6de66a5
-EBUILD isabelle-2013.2.ebuild 13900 SHA256 8cf490511b5a1328e193c85fc6353e5f5ba0bfc87e1dc9ff3c2f2aaca2497d60 SHA512 cdf2317177e06a80ec81f6763abb9b036423c168797e63f7e3e4649f0923d1061ae6a73a71268f9f81c0f412368be42912039c4dbaabc0768a05ca0faa81b2ec WHIRLPOOL 2ab953c7dc609216102c6fb63f10adef26bb14a7c1c8a4274a313d0bba17e559c2fb357a10b8424cf130100859d6691edd74f7b63646071421ec35b49d2c3adb
-MISC ChangeLog 4424 SHA256 d3dc691b43e556be29f771c1fe9f545ff3269da95f5cc918c1681f0ddb70a97a SHA512 669352654b91a2f7b5d1767182471227a8a4c80f2368768086c4fcc2652f854dbb13d277c2da139720955695456793f4c6d3386f6a115e069c62f526889b2177 WHIRLPOOL 74d073ff1d6ac3b312a49e04992c5aaa2c61fbe3c1958e13cf749e66257d7d0e2ea6afa3d7adc733426c7892ba4b9eb093c61a1bb11910ededf1916cf50f70e1
+EBUILD isabelle-2013-r2.ebuild 12465 SHA256 644dd0b01ce82b8ef372db9a43270f6a5e242ea007232a944d1dd08ae75e78c9 SHA512 da214e6edd32aa0b0155619acb0485f12a47980e9eecb135c6b00b1af113749f65fd8f30bbaf4a7316e4132dd35f9311043160d3587630968fef49e07a968d9a WHIRLPOOL daf52ca43c67385138504d24e92d58bf13c2e7dc830f7ab33e23ab84a893ca74a339a293e00c570ef6e865a70e906e51c57761b3447dfddb5378e7c5740c7a81
+EBUILD isabelle-2013.2-r1.ebuild 13838 SHA256 0f9f7924ce1f6be82b0240ecd2b3cef3d326717ec68ec6e474eacd2376f2f80a SHA512 997203d97cb7d89d05d9e05d04dec314fe17241f9a8fa2f28e4d8e4b0c63bc3091c392abf2c5fd42f44717491ef4c08466ad81b1db653b0b5d610446f4f59f4e WHIRLPOOL 1e3bc72aead5ddb41e1167f1fb4cc774dcac556142b57e88503ce00e0370da8ec665f52e689d9ed03f17c4f5ea1fd3eaf52b496035c5a48e8d320cf8af21d6af
+MISC ChangeLog 4737 SHA256 8248af61826e77588bf83a0f9f6c80ff77b77bdffc09616061cfcbbcd39a9fcc SHA512 daa0e357b200d5b3896fad1e54860b388cfff74eab89aa4e7a5eee372130f720f4295f6f514c30d6a1463e15e47c920b6fd3df33d35dc7938412a388aed627a1 WHIRLPOOL 2aca3833b8bd919f15c9510fd90468486574ab80a4b80ceeb47fef03d172f788522e9d5d74603c61c1b0b7da2bfeb8eb10dd63219f6849e66a89803d8b9a5c3a
 MISC metadata.xml 2156 SHA256 cade1f090a62a67146e6ebce508a20436e2c883d62dbc5a260733a60f69bd43b SHA512 cade4e370f3adbf9a5ae9bc6a73adabbe36f3ccc707c47f6f4516f2f0604b26f34439cff170bf478b3d52f0c507d72d9eef8f69657d7de2fda1f70a8a96de137 WHIRLPOOL 2edf4ab8a07ba560d34e168a9fd618a6fc1f9946dd0f9b62a2d071d1f19546d5e15413f54658c898e1e71df0c110ea832529f95cf904b7333489734fdfd5749b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUSE2oACgkQoBEVQmGOlx9zAgEAyHV+P3iPdGNo17RzUmHxRQ5G
-gg0E5fdtWuBGczu8qDYBAIAZ5NYkG/K6tdkeiCkC796SJznkSmAQ0CagxX5Bx2uQ
-=8Rgl
+iF4EAREIAAYFAlUxG5kACgkQoBEVQmGOlx93mgEAuIiJAEFDcvt/TnUdbdhYgHlY
+KaKMVGNwRnr//zfwNfwA/1isjLH5R7pLIjvHF+jAzEKB2u2caud0siEzxTzj1R53
+=wDjN
 -----END PGP SIGNATURE-----
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" \