Adopt deps to unbundled x11-libs/libGLw situation

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 24 insertions, 18 deletions

diff --git a/sci-biology/arb/ChangeLog b/sci-biology/arb/ChangeLog
index b9d78830b2e0..ceeeaf8aecd3 100644
--- a/sci-biology/arb/ChangeLog
+++ b/sci-biology/arb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/arb
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/arb/ChangeLog,v 1.6 2011/08/11 21:36:06 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/arb/ChangeLog,v 1.7 2012/03/04 09:55:06 jlec Exp $
+
+  04 Mar 2012; Justin Lecher <jlec@gentoo.org> arb-5.1-r1.ebuild,
+  arb-5.2.ebuild:
+  Adopt deps to unbundled x11-libs/libGLw situation
 
   11 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org>
   +files/5.2-libpng15.patch, arb-5.2.ebuild:
diff --git a/sci-biology/arb/Manifest b/sci-biology/arb/Manifest
index b6d90d58ce2c..a3b08040c162 100644
--- a/sci-biology/arb/Manifest
+++ b/sci-biology/arb/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 5.1-bfr-overflow.patch 715 RMD160 6d547f471a31166ac40c0502206c389d649a625d SHA1 64d010c090b83c57bf211810f1760354cca0bed1 SHA256 bedb03c70bd0e4e180f8d6e966bfaf34af32125a1595aae8a994617e6a2f2833
 AUX 5.1-libs.patch 503 RMD160 a32610db2431b84e9195d7481f50be62dfa6e9da SHA1 37792a725b045bc9948e7bcb3883c29d7cabb0ce SHA256 dfa5f131eafbf163b9a3862360694a7b1f9d6231357247c7f18f696c4c4dd983
@@ -9,16 +9,14 @@ DIST arb-5.1-linker.patch.bz2 4406 RMD160 b1273f0b5c765c257c905f5945039864f4c619
 DIST arb-5.1.tgz 9727285 RMD160 8757446e7145faf28382c617fc7fe4b57a857baf SHA1 69696e52bf86eea5213ad9d27be30dd74f1255f3 SHA256 7f0a2411e7b95b94f23c51211461047eb74ffd3dd632552a82425cf903f89dbf
 DIST arb-5.2-linker.patch.bz2 4441 RMD160 7e410bdf330a946bea7746feaabed871305c9cb3 SHA1 cd13e3316c6734094f8e54a554c0c752ef334ff4 SHA256 3b804fca56e920f83b79f7cdfb124769bfa677a3f2216021eed04ba76ac886c6
 DIST arb-5.2.tgz 9729004 RMD160 d9d99d0ebadaa293091ff93f6ca588b2321bd8b0 SHA1 4ee493a16ece5231d46ed1071407c06e733d67c8 SHA256 cd68cfae317aae378da69c4c4ec8036a2babec064896d0b9d845fac2133f6edd
-EBUILD arb-5.1-r1.ebuild 2133 RMD160 846134ac1d2021ff1fb34a3e31145660c56ea1f2 SHA1 aed62a0169f663fe67c8e823181f1b986255bf7c SHA256 308a9ddffd81f563607a235f0b665f5557f90f65ac2933d85b13a2e08094d15e
-EBUILD arb-5.2.ebuild 2068 RMD160 234413a2fc64489fcaa48f7ea5e93edc579cf1dc SHA1 e5bb02105a17c0e8c9070450a9cf66d47b005c30 SHA256 b96c09e5d18816ad7b4b0008c5d260a17aee030df7d699f7945dd91cbab16a13
-MISC ChangeLog 1338 RMD160 12d855af3f4856cbfa1af4c06a6b0f4e11a1eec0 SHA1 8f474f6cc8d7c97b448345f70c6d8b850f55f48a SHA256 43d32542bbdb21a06ce81c2428e7e105d77dcf8eb7050bee1cfcd6cf3d2bded9
+EBUILD arb-5.1-r1.ebuild 2182 RMD160 9c485ae3017c99c9fee88eebab99930e1e9466b3 SHA1 7a2e02d74a3e7792bce5e84ba2bd5d4646095a89 SHA256 4c1035295ba7fa81312f861f98841bb3068208562766bea43f6b6f12f283a6b9
+EBUILD arb-5.2.ebuild 2111 RMD160 fdd8236f501ff64eafa682521dee133da858b054 SHA1 bf18d8088f0f9922059cb915063d501ed46beab2 SHA256 2a5b24c4e33c233ddadddff01dbe8e886fab08c9d491cd01f7da04e0eaf384ef
+MISC ChangeLog 1469 RMD160 ee4b463f0e06941e59e486eb9ac48a9311b889c3 SHA1 594857a646e4ec198b01f925eb8d8ca0908a722d SHA256 f29f38a276f449432f12ad99e419024b8a10f3310c055e1d161e138b1ad4a872
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk5ES08ACgkQIiMqcbOVdxQa+wP7BtxfMZEP45YZgt7EaroySYui
-RmY9BvIgRE1+3IYfaeZdt/OEefINzpdTSx9j0lo+e6XLQG/awJoZO2jVGe9ZBu69
-CcFBuD+L6CAjXTqJOAsVVwxMPuJugbGyxKQaBdZLyH7gbZb0QiXttbkgrt+aeJ6o
-1KwF914L2tgUZmZCOcQ=
-=AzTP
+iEYEAREKAAYFAk9TPAAACgkQgAnW8HDreRZXRACggG6/VQvir/G1TMwTq5ZdKJPD
+LcUAoMbqI4X1LnrVMX4WK/cPzVtnV/8U
+=/g5I
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/arb/arb-5.1-r1.ebuild b/sci-biology/arb/arb-5.1-r1.ebuild
index 17520b091f9f..4365d2a4e7a6 100644
--- a/sci-biology/arb/arb-5.1-r1.ebuild
+++ b/sci-biology/arb/arb-5.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/arb/arb-5.1-r1.ebuild,v 1.4 2011/06/20 07:34:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/arb/arb-5.1-r1.ebuild,v 1.5 2012/03/04 09:55:06 jlec Exp $
 
 EAPI=2
 
@@ -29,7 +29,9 @@ DEPEND="
 	opengl? (
 		media-libs/glew
 		media-libs/freeglut
-		media-libs/mesa[motif] )"
+		|| (
+			media-libs/mesa[motif]
+			( media-libs/mesa x11-libs/libGLw ) ) )"
 RDEPEND="${DEPEND}
 	sci-visualization/gnuplot"
 # Recommended: libmotif3 gv xfig xterm treetool java
diff --git a/sci-biology/arb/arb-5.2.ebuild b/sci-biology/arb/arb-5.2.ebuild
index cded5698b7ee..55ea8e8a81e7 100644
--- a/sci-biology/arb/arb-5.2.ebuild
+++ b/sci-biology/arb/arb-5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/arb/arb-5.2.ebuild,v 1.3 2011/08/11 21:36:06 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/arb/arb-5.2.ebuild,v 1.4 2012/03/04 09:55:06 jlec Exp $
 
 EAPI=4
 
@@ -27,7 +27,9 @@ CDEPEND="app-text/sablotron
 	opengl? (
 		media-libs/glew
 		media-libs/freeglut
-		media-libs/mesa[motif] )"
+		|| (
+			media-libs/mesa[motif]
+			( media-libs/mesa x11-libs/libGLw ) ) )"
 DEPEND="${CDEPEND}
 	sys-process/time"
 RDEPEND="${CDEPEND}