Adopt deps to unbundled x11-libs/libGLw situation

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

5 files changed, 33 insertions, 27 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index e457fedde3cb..896ec1e73925 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.110 2012/01/23 11:40:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.111 2012/03/04 09:50:15 jlec Exp $
+
+  04 Mar 2012; Justin Lecher <jlec@gentoo.org> grass-6.4.1.ebuild,
+  grass-6.4.1-r1.ebuild, metadata.xml:
+  Adopt deps to unbundled x11-libs/libGLw situation
 
 *grass-6.4.1-r1 (23 Jan 2012)
 
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index a09802ddf274..29654cd69f7c 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX grass-6.4.0-html-nonviz.patch 1774 RMD160 95f278e851dc782fa89861a60e97f2c6c4da564b SHA1 d917690626b669a9e9455b12bcb1aa14db65c29d SHA256 6da939c90fa851c50895aeb26c54bd9a512e2e7ca14c3da3268e1daa672442ff
 AUX grass-6.4.1-libpng15.patch 906 RMD160 50d1df3a4470f937776ad1f1a30afa757f6423e7 SHA1 79f06b8e62a4e09889cf44289e7b98b361264ef9 SHA256 60135350574b9f2c769cb1513446c6b9fea5f949bc084a9e05d2d81a20ae6d55
@@ -7,18 +7,14 @@ AUX grass-6.4.1-nopycompile.patch 533 RMD160 fd245f604ac1b09476916bd116152afee0e
 AUX grass-6.4.1-timer_flags.patch 337 RMD160 9ea5905fe405ef55cd82a7008e2b64edec4e3bb5 SHA1 6d61aa234bd8b616c407ed79d9afabeaf17dfdd7 SHA256 fe574ff5657b3c4a13e857f9cb182ee89a74db07d3a59e3f2e84c742510f847c
 AUX grass-pkgconf.patch 1322 RMD160 7b48d8e05a07090d8d36d2fb96b385f2d655e066 SHA1 cb33293f442ad0bdd5592f842bcafe13eb021b48 SHA256 2d80c1a3851cd82bdcd7401c537348ec43e488c8b475718727d65ac423a5640c
 DIST grass-6.4.1.tar.gz 23608488 RMD160 2a9ee5da891c9d89a5ad0e66f914d2dd763e5128 SHA1 ea1cdfd1b7422367d671eeaf66f362d694a94abd SHA256 8b886faf8635f77f0d1626806454e6e8bdfa9155e3c10a0bc3e10447b9e6bd03
-EBUILD grass-6.4.1-r1.ebuild 7987 RMD160 db264cc0dcadff0139fb076815b9eb719e6ee3e3 SHA1 510495501a1d87d1ed496e9c98095d0d7d308f3d SHA256 6727bb26aaee14f2a6379ce8c13c09f73412a0aa4bb9c149e471fe4ef46e828a
-EBUILD grass-6.4.1.ebuild 7916 RMD160 c215ee0028231cbdeeb49a2125f10970b4f05798 SHA1 e348311a483d8430d6935976bbd0925585bc794d SHA256 e89bdef021400cf0ef5a359740946db63197af7b8f57fb179295c7e2ac60ab9c
-MISC ChangeLog 21451 RMD160 21fc5af345499ec853a75fbcd7330024e748f1e6 SHA1 9943fa0ddba286dce8684ecc5c1115a30312f0a3 SHA256 40414b59c6b97cc1c315c69848834517d1a95fd1379ed3b15c20f332ff21c672
-MISC metadata.xml 623 RMD160 f3ab7360eb95e18d25fa0f35bd8817e8628e3246 SHA1 497c577a971010147239a61515ab66a678881569 SHA256 d6200460324878b71cae01dc1193c77749b88b7c2e723041d9f426487c50c85f
+EBUILD grass-6.4.1-r1.ebuild 8039 RMD160 500b75be9ac241d1d1fbbaddc10cbd5608cb7a15 SHA1 c91433d6ccd1d603ff1ac81e066352e32a9ed50e SHA256 056717b76c9440442066bc7ab82e1db119aee0334159538d2a17f1c719122069
+EBUILD grass-6.4.1.ebuild 7971 RMD160 2b21ffe1831b53c0c0d53b547bcbe6047cb65ce4 SHA1 d0ecc94a95b341174dc6fadcfb81b2ebd1c859b5 SHA256 b517d3becf30876bdd4da6b7d40a7d9f17af566304bff1014afba19afc254070
+MISC ChangeLog 21605 RMD160 6263cef68514823aadebcf47a87b52cf58904fc1 SHA1 fc65b210e8fcd8624248d71fc0e576b3cd8d3943 SHA256 e809bdad6c4a7a0815dcc6c32167af3c9bf10775773b9c3f2ef87d72d5e62c36
+MISC metadata.xml 629 RMD160 69f5617b3320877ac6089e4f48b753da437e2458 SHA1 0b8d802fbe536bff533c76b591e0ec3accfe9dd1 SHA256 e6307680fa4020225e1dd8769ead3e2d20452f87d80d2467b52849c50c2d765b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPHUamAAoJEEdUh39IaPFNV1IH/j0gyDN35u/rzauMS8G8yQ5W
-l0OblKjysZlhzU2dHTChuP47OkQoSb3I+BBFmbppfCFGLKk5DugD0qNZ98MuUw30
-q6oQS8ZKKR6U0vXcQd/njMBQZXvLS6e6RiKLsmbh+yDsmEJW7C+l/wgtTofCXeed
-I+MsoKNBHnHnpidl5oz15h91v6VYT0VTYT5SObQyD2zcU0/fGpkOu6ByARuNbo9H
-S0xLSIGi6L2OvhYXpTD0qi4oBLqhJT4/CQdazfaegHvEhOy8CndM5IivlTSaJaCl
-x9ZMO+bGcb1IwAHFDh05hM4LSgENwvpaxxiFplfskzeYFWRhRvTH81maeEC78hA=
-=6UWQ
+iEYEAREKAAYFAk9TOt4ACgkQgAnW8HDreRaXKACgn0+YGg6I4Pdh8xSSi6lsxM4q
+O/IAn2qc7NG0o1UBM+xM57Zz+ct6knO9
+=T1oK
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/grass/grass-6.4.1-r1.ebuild b/sci-geosciences/grass/grass-6.4.1-r1.ebuild
index 4582116acec9..4c3e593dfee8 100644
--- a/sci-geosciences/grass/grass-6.4.1-r1.ebuild
+++ b/sci-geosciences/grass/grass-6.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.1-r1.ebuild,v 1.1 2012/01/23 11:40:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.1-r1.ebuild,v 1.2 2012/03/04 09:50:16 jlec Exp $
 
 EAPI=3
 
@@ -60,7 +60,10 @@ RDEPEND="
 		x11-libs/libXt
 		motif? (
 			>=x11-libs/openmotif-2.3:0
-			opengl? ( media-libs/mesa[motif] )
+			opengl? (
+				|| (
+					media-libs/mesa[motif]
+					( media-libs/mesa x11-libs/libGLw ) ) )
 		)
 		opengl? (
 			virtual/opengl
diff --git a/sci-geosciences/grass/grass-6.4.1.ebuild b/sci-geosciences/grass/grass-6.4.1.ebuild
index 1ecf735c2274..cbb918caddf6 100644
--- a/sci-geosciences/grass/grass-6.4.1.ebuild
+++ b/sci-geosciences/grass/grass-6.4.1.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-geosciences/grass/grass-6.4.1.ebuild,v 1.9 2011/11/15 04:05:27 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.1.ebuild,v 1.10 2012/03/04 09:50:16 jlec Exp $
 
 EAPI=3
 
@@ -60,7 +60,10 @@ RDEPEND="
 		x11-libs/libXt
 		motif? (
 			>=x11-libs/openmotif-2.3:0
-			opengl? ( media-libs/mesa[motif] )
+			opengl? (
+				|| (
+					media-libs/mesa[motif]
+					( media-libs/mesa x11-libs/libGLw ) ) )
 		)
 		opengl? (
 			virtual/opengl
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index e0cbe3e38441..a23b87957462 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
-<maintainer>
-  <email>nerdboy@gentoo.org</email>
-  <name>Steve Arnold</name>
-</maintainer>
-<longdescription>The original GIS, yes the first one, developed by the US Army Corp of Engineers, now an active open source GIS. 
+	<herd>sci-geosciences</herd>
+	<maintainer>
+		<email>nerdboy@gentoo.org</email>
+		<name>Steve Arnold</name>
+	</maintainer>
+	<longdescription>The original GIS, yes the first one, developed by the US Army Corp of Engineers, now an active open source GIS. 
 See the GRASS Documentation Project for more info http://grass.itc.it/gdp/index.php
 </longdescription>
-<use>
-  <flag name='gmath'>Enable gmath wrapper for BLAS/Lapack (<pkg>virtual/blas</pkg>, <pkg>virtual/lapack</pkg>)</flag>
-</use>
+	<use>
+		<flag name="gmath">Enable gmath wrapper for BLAS/Lapack (<pkg>virtual/blas</pkg>, <pkg>virtual/lapack</pkg>)</flag>
+	</use>
 </pkgmetadata>