summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/scala/ChangeLog7
-rw-r--r--sci-chemistry/scala/Manifest14
-rw-r--r--sci-chemistry/scala/scala-3.3.20.ebuild6
3 files changed, 11 insertions, 16 deletions
diff --git a/sci-chemistry/scala/ChangeLog b/sci-chemistry/scala/ChangeLog
index 8625e6fa781e..10ff511ed4dd 100644
--- a/sci-chemistry/scala/ChangeLog
+++ b/sci-chemistry/scala/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-chemistry/scala
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/scala/ChangeLog,v 1.20 2012/12/17 08:10:58 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/scala/ChangeLog,v 1.21 2015/02/28 19:15:33 monsieurp Exp $
+
+ 28 Feb 2015; Patrice Clement <monsieurp@gentoo.org> scala-3.3.20.ebuild:
+ Add two blockers against scala ebuilds and fix bug 541440. Signed off by jlec.
17 Dec 2012; Justin Lecher <jlec@gentoo.org> -scala-3.3.18-r2.ebuild,
metadata.xml:
diff --git a/sci-chemistry/scala/Manifest b/sci-chemistry/scala/Manifest
index 5a967cfd1971..108ed8b468e2 100644
--- a/sci-chemistry/scala/Manifest
+++ b/sci-chemistry/scala/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX 3.3.18-gcc4.6.patch 436 SHA256 915f1ee06f884d17758a8fd3b31914c682d218344ec08236ffd7b36768f8bb28 SHA512 30f2825245c4af33c54248c0786f423241420bb4b7b8a0a471d6d44912f09f7e276a7c0756bb96496aa0613b27f96a241e0ef8ee95a10e3d022bd99107d31483 WHIRLPOOL 8e08c75b4382f32c0d3a2ca11a65400b7f00f72b34586177a804caa727429a75d6dca9ada4cb165b50db86bce5d4c56b7364606f907c94a58eb1aa03f8d5c814
AUX Makefile.am 79 SHA256 d655d49aa232e166c512d22b4545f77072abe8cdd9e24f67e1fe998b6c307979 SHA512 5939699f85c5fe3b071a7ad7a36a36e399b6383af99ad1c73f0f2df7ccd94da10a310ce0606054e512f5c9a132eb0f4f699b136ea2d10c053e2e6ed1b1d527b0 WHIRLPOOL 201f328ec3877e318415d0fcfed54697476bd4f3decaec0bafbbc3542c49138130d8e5b9a2b44c77be6ac631d8eabad708071d97d48ef45a82e4883230cddfb7
AUX configure.ac 351 SHA256 d1f8afc52e0dd275173be950c1d218dced367afb1724da477941e199e23e2cbb SHA512 bfb33f30caadfad1bb7fa57d43e0b40cfb3211a1ac6d9b94496fa6e2c86ee85fc94322cad69d3c359d0044f86cbfba444b7c4942df52c03f58e1d4fe4e3cb3d8 WHIRLPOOL 68de411083de14cc81f5b029b98d194d61699a2afb71cc44333db448f696528a380eb65e305eb3b6feeee6e48bb58eb29e1ae7202e41ee213c5ffdc558b5418b
DIST scala-3.3.20.tar.gz 368628 SHA256 0efb108923a4d21fdc75d7ee92567e4bac4ae409f8798fbabd8142b5b026e976 SHA512 9f9812527013d87c80101333baf7ee646f6b3c665cdb477bb4e633c0a1fa57b31b6327913cf712e961c4484a9d9edf1aab5f3cfc66e6834aca1e970a4e0ca898 WHIRLPOOL 7d6082872a9f2f992186a2626dbf7ccd9f827b1322d1399b41ebc1b07267a46cfed5f7ea085403415c01eba4fc44e9d51983080537db04b227469d6871f8f1f9
-EBUILD scala-3.3.20.ebuild 863 SHA256 8c20c4fd02bf1f72f405ce559e515769452cf065aa11c5502ab7cb8932ec9507 SHA512 3d7000debc313da146742c60bb2710d90d20ce070dd9848f428cf4e236d39b954bcbb0d533eeb048ee36c0c07722afa84b5c94c7a1363124c4da66d580176c09 WHIRLPOOL 7b2b7ec58ed6443dd2a37b7907c414846c01628b6a41d4e97ea9c21e813cd6a598c2090cbe54ad5adf05c1a44230e9e5d1bbdfe1ae9521d518af2ee95325246f
-MISC ChangeLog 2802 SHA256 c155d54af31779c1b15ed5b8d3e5da2b3033bfb65513ecca1682ed97a86fbb53 SHA512 15131b0897e7db9defb88aabdd7dc7ed228cf1a888ef740fa7c3a01cd227b0dd46adac74f3d58e4a6a492f901dac935bec076aa5ec098601bda0b12e7bb64eca WHIRLPOOL 5f16c0c2499c666593d3ba66f9cea80d22f3d1d1f06d022df01709c793f50769baf1dbcbe66e6c73a169bfd1f28588f48590fa652ef4bf6283be79e746755cad
+EBUILD scala-3.3.20.ebuild 907 SHA256 9153f04679c2747229b9dd63ecfc669b5f15f925e23509cffe052c52fdb5f31d SHA512 348a7b3c18cf407fb6e37f45e6286a65163ae0aa109488f016ee5f1a975137737556185b179cd2c5f5e9efff58bbaac28b964b64975cc31af79c45f266c2a34c WHIRLPOOL c7fbb360e06d7a111ad5375927c5142114cacbff83b1bbcfbe306ea7e9ea97407ba29ebada804939a0b2e6e17dca96db10cc546c2063767fba42240eea2701b1
+MISC ChangeLog 2964 SHA256 3f3e40380df6f2919c030fc6c797a92d49c457e1da8a00d96a668bf2863194b1 SHA512 490de24ab50bc8b16aa3215229b683aa244f77f05e0949de4795c4cc8012319ce2e46ac7966439ce279191fbcf8c1b23e07770ca8a4816b6579f6dbdf5028e9a WHIRLPOOL e290fe34fc8d5eb15a2c0385cef55b6adc3261e5c27aa41e9a75675d19f7f081848af9b617beabf12fddc5956bc54c902c3846880c2c72446862fb4fbd2ac322
MISC metadata.xml 435 SHA256 2addf3fdc18ed1e106aaa4770c10e448ed3301bafbdec1b5a121222d401be4fc SHA512 d2adeb058c009036d00e823e0c7bf90980ccc4ea13bc3d09ca6868a8fe54241a25c78a041d815f537212d831c0ef47a94a4fa5ed053354425919129531a80c54 WHIRLPOOL c3e55a259ddae23eadd65a41b8946041587463cf000082201644763f2241a57972ff1c69b1c7c503379a03648f05a4eb3272c7d033d668794527ff652bf9c3b7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlDO05QACgkQgAnW8HDreRYVPgCfZxDxFkJwymdzB7xkdzkBPTwX
-ey0AniS74ZrnL3jOkfzIUnF+yuzkYSb/
-=/yj9
------END PGP SIGNATURE-----
diff --git a/sci-chemistry/scala/scala-3.3.20.ebuild b/sci-chemistry/scala/scala-3.3.20.ebuild
index cfc9a589993d..70537f2c06a6 100644
--- a/sci-chemistry/scala/scala-3.3.20.ebuild
+++ b/sci-chemistry/scala/scala-3.3.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/scala/scala-3.3.20.ebuild,v 1.6 2012/12/16 19:52:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/scala/scala-3.3.20.ebuild,v 1.7 2015/02/28 19:15:33 monsieurp Exp $
EAPI=4
@@ -17,6 +17,8 @@ IUSE=""
RDEPEND="
!<sci-chemistry/ccp4-6.1.2
+ !dev-java/scala-bin
+ !dev-lang/scala
sci-libs/ccp4-libs
virtual/lapack"
DEPEND="${RDEPEND}