[dev-java/jeuclid-core,sci-biology/jalview] Removed pmask for packages with dependencies in the java overlay. For now.

7 files changed, 19 insertions, 32 deletions

diff --git a/dev-java/jeuclid-core/ChangeLog b/dev-java/jeuclid-core/ChangeLog
index bf3ab51d9..7e11501f1 100644
--- a/dev-java/jeuclid-core/ChangeLog
+++ b/dev-java/jeuclid-core/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Jul 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
+  jeuclid-core-3.1.8.ebuild:
+  Added comment about dependency: dev-java/jcip-annotations is only in the
+  java overlay. Removed pmask for now.
+
   11 Jul 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> ChangeLog:
   Masked for removal since dependencies cannot be fulfilled.
 
diff --git a/dev-java/jeuclid-core/Manifest b/dev-java/jeuclid-core/Manifest
index 876e433e6..1dc49fb0d 100644
--- a/dev-java/jeuclid-core/Manifest
+++ b/dev-java/jeuclid-core/Manifest
@@ -1,5 +1,5 @@
 AUX jeuclid-core-no-freehep.patch 338 RMD160 d12ce25165fe85517b58a7c77ad27ee36c337479 SHA1 aa19c59bd604795ba15dd77f2a91f3f7532f8d3d SHA256 a9ef36f83728a13563ea4ae1de3a0a6ad25e6cae9d5edcca0ed9c93c2d551292
 DIST jeuclid-parent-3.1.8-src.zip 8844588 RMD160 4f7a6f2fc5acd3bba23c0aa715798140dda17836 SHA1 02647c735f620e194e2177d779c16ca027e7b674 SHA256 4c80740a78bef42c6e5b87e09df931448caa210469382270ac4f70016ac21a0c
-EBUILD jeuclid-core-3.1.8.ebuild 1559 RMD160 44cef6e24c31e77c2ecc8aebe7ba71b82c9eda86 SHA1 5ea3dfa4786aff2901dadfecb90afdb7579088a7 SHA256 75b3f9a063d9a204e18513c1af32c83a91683a8f6d4a3dce3f89b5e06c1d99a6
-MISC ChangeLog 402 RMD160 4b9b186ab0f3a440e53b8b332ebd211ce0e933cb SHA1 bd4e950fabe4f3f14b9b8827b17c909385324fb7 SHA256 7a89129b104f83dd5ba68d3174a56576bf079eb2dd171bf46670063598b87886
+EBUILD jeuclid-core-3.1.8.ebuild 1617 RMD160 c2e01de26685f8d344cc1784df5a7b1a3834fbf9 SHA1 30daad044caaa9e0acb1cc7b8cc547f3f9cfd7e3 SHA256 409924878faac6f66df30dab8a5505326deecd211acbf05a13207a25e9812f3b
+MISC ChangeLog 612 RMD160 d98f728b95f6ba38464f785a6e2fa07728beae5a SHA1 f39162c328df9c72bbec2ceec119047a27959e4a SHA256 45037bfa7fe42db480033275a60f2584981548c055c9713a258b16f2873ba23f
 MISC metadata.xml 551 RMD160 78073c1046eb7e19d02bfb39995e35f3a41e334f SHA1 57e6f5aa3b4e8f3414722d21e196c06cd65007c6 SHA256 0a36a9192975d8a551f1a34fc1c38184a479c9bfe96022e98e182495eb849f7c
diff --git a/dev-java/jeuclid-core/jeuclid-core-3.1.8.ebuild b/dev-java/jeuclid-core/jeuclid-core-3.1.8.ebuild
index a17e585dc..944678780 100644
--- a/dev-java/jeuclid-core/jeuclid-core-3.1.8.ebuild
+++ b/dev-java/jeuclid-core/jeuclid-core-3.1.8.ebuild
@@ -22,6 +22,8 @@ COMMON_DEPEND="dev-java/ant-core
 	dev-java/xml-commons-external:1.3
 	dev-java/xmlgraphics-commons:1.3"
 
+# note: dev-java/jcip-annotations is in the java overlay
+
 RDEPEND=">=virtual/jre-1.5
 	${COMMON_DEPEND}"
 
diff --git a/profiles/package.mask b/profiles/package.mask
index 60c58d425..389739f25 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -94,10 +94,3 @@ sci-biology/newbler
 # Avoid accidental upgrade
 =sci-libs/vtk-5.6.0-r3
 
-# Andreas K. Huettel (dilfridge) (11 Jul 2010)
-# mask for removal since dependencies cannot be fulfilled (dev-java/vecmath)
-sci-biology/jalview
-
-# Andreas K. Huettel (dilfridge) (11 Jul 2010)
-# mask for removal since dependencies cannot be fulfilled (dev-java/jcip-annotations)
-dev-java/jeuclid-core
diff --git a/sci-biology/jalview/ChangeLog b/sci-biology/jalview/ChangeLog
index 14e2a12c6..81505752d 100644
--- a/sci-biology/jalview/ChangeLog
+++ b/sci-biology/jalview/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Jul 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
+  jalview-2.4.ebuild:
+  Added comment about dependency: dev-java/vecmath is only in the java
+  overlay. Removed pmask for now.
+
   10 Jul 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> ChangeLog:
   mask for removal since dependencies cannot be fulfilled (dev-java/vecmath)
 
diff --git a/sci-biology/jalview/Manifest b/sci-biology/jalview/Manifest
index b6eda2fbc..302ac606e 100644
--- a/sci-biology/jalview/Manifest
+++ b/sci-biology/jalview/Manifest
@@ -1,24 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST jalview_2_4.tar.gz 11319073 RMD160 770f57a9c9b7822c0b13d0dfa46977b95ad8384a SHA1 f0f69b3b4716285aece7fc914df3a3133baf1abe SHA256 c4fe3a4b214ed7f06d48bd88fd53e068c2151390ec8004acd6705bea47b4918a
-EBUILD jalview-2.4.ebuild 1764 RMD160 02ce95fe3152ab424609b3789e60669e23d62d5c SHA1 da36d1747192093277de48e8a85c84991c58ff6e SHA256 79b2fa96a1a1f0109393e7f54b2ada9d506084d5b4436a5a22af3f3e44a82c29
-MISC ChangeLog 373 RMD160 23bc3be40c1fc5c6543a0543c3ac58fa240a9478 SHA1 f0f632c49c091aecd4cce24fb647bb405bc2d1d6 SHA256 37c9efe0e806cbae7750bc340af1a727b8c35060953ea50798ab1883d8470374
+EBUILD jalview-2.4.ebuild 1814 RMD160 8dda318d55d5dd6af2b7d411dccf8c8de05d9d37 SHA1 7fd5b0b50371a73655fbe227bdefc40f67566724 SHA256 cc4e0ad0e916ce6e3afc938f97e16fa8aca6151f6bf48154490661d1ac10ebcc
+MISC ChangeLog 567 RMD160 6f08f4799d1210764dac988cf6fc85e4552b2fee SHA1 c326236d18d212de6112d8a8600cfadb2763ee40 SHA256 45a3ddf974c79ff2d59f2c28a1d5a0adec7dad95f51a76201e4d5578e95abb26
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iQIcBAEBAgAGBQJMOPMIAAoJENwGBM22xffeb6MP/3+rppCoYX75+/80AS5CbB4s
-mHB5NsOjtlfNrBDKvaWGfYhmZCshzYY6nKGsE+YFMpeY6kO1PCB3iPy//Cr4nVTE
-MF9w70TedZvp+iUofKMOvZv7L638fW3m8Wm45wXFfE/QzZpueklDTzxYQ6gAEXp0
-Hvtdby2Z9Cif88kvCvmsuYW8S5pU7zdSceJZo3mM9N71zOm4u1zMOThO/mRqWBih
-z+xqmHBbpThM5bp3WUQD5An0CLaBO1Yd2l+EcCQZzIIuzzqIcB3XT4XK2ubeBmhE
-+66LMbJgV/HDl8IMVjR/CbxYW6V1CO2+P5ehSgOF6cM2Xd/qoq4Z0iPzohUsq3Er
-PASTSqB1vrWMnpEtHcjCE6cJD3ooUUO44A1P4L/idxRsHrkb987CosOJjErzJf8U
-NO1AkKF9xMNHF3nrN7KIqAtn9Y+8r9kfOFHl6hNpx/djJzkVoDj6NjOhDXxJ4RYX
-ri5YXNgDtOhnwkbquBR+jMMieiqSBBR5ylfKK4yWILhGkyD0lTzhIRrbySyLbK6g
-i7JXqvAg/H9rjijzih69EGXBPDKc6dIrpYpDEk4AbnJ+C0Dhkvd7udM6GzxctxGN
-qhfeglIPeXP9tgJX/Axj7bZuWHLrhiPPCx7SgFrWWNlz3O3Go2/YoxqGukPtNXi7
-H9lC9A+VPVf9P18eydMu
-=7VXj
------END PGP SIGNATURE-----
diff --git a/sci-biology/jalview/jalview-2.4.ebuild b/sci-biology/jalview/jalview-2.4.ebuild
index d1c1dea85..1e4e4ef25 100644
--- a/sci-biology/jalview/jalview-2.4.ebuild
+++ b/sci-biology/jalview/jalview-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-biology/beast-mcmc/beast-mcmc-1.5.1.ebuild,v 1.1 2009/10/02 21:47:11 weaver Exp $
 
@@ -37,6 +37,8 @@ RDEPEND=">=virtual/jre-1.5
 	dev-java/sun-javamail
 	${COMMON_DEPS}"
 
+# Note: dev-java/vecmath is in the java overlay.
+
 S="${WORKDIR}/${PN}"
 
 java_prepare() {