media-gfx/openvrml: Fix deps for gnome3

svn path=/sunrise/; revision=11971

diff --git a/media-gfx/openvrml/ChangeLog b/media-gfx/openvrml/ChangeLog
index 6fbcf4f8016c34d5985f625299a49e1758886aa4..f91c2eafbb6516600ebfbc4cb469c4a33dd8e5dc 100644 (file)
--- a/media-gfx/openvrml/ChangeLog
+++ b/media-gfx/openvrml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/openvrml
 # Copyright 2002-2011 Gentoo Foundation; Distributed under the GPL v2
 
+  30 Apr 2011; Justin Lecher <jlec@gentoo.org> openvrml-9999.ebuild:
+  Fix deps for gnome3
+
   29 Apr 2011; Justin Lecher <jlec@gentoo.org> -openvrml-0.18.5.ebuild,
   +openvrml-0.18.8.ebuild:
   Fix deps for gnome3, Version Bump

diff --git a/media-gfx/openvrml/Manifest b/media-gfx/openvrml/Manifest
index 1998b3e064f67d5a489453dabd79c98fa46dbe6d..a225b2da4e04f67bf1fbe0e9fbbc3e76b9deb09b 100644 (file)
--- a/media-gfx/openvrml/Manifest
+++ b/media-gfx/openvrml/Manifest
@@ -1,5 +1,5 @@
 DIST openvrml-0.18.8.tar.gz 5282466 RMD160 cedab744f3dfc9747f06214f97afe357b99034a7 SHA1 e10ca8bcdfed365bdee741bff83a68500f6984d3 SHA256 3b7df66dac4e21da03cad2f38e89225fa0ee19c8babcaff78d11d1052c86eda5
 EBUILD openvrml-0.18.8.ebuild 2969 RMD160 59aefd06da92ee26e49ca2ccad223c4fa9f051e9 SHA1 e218ddba1666394c5d48e7944904ae67ce92cd38 SHA256 0c19a59abf7d00e0eb5a74f4c4768062d283acdd07cd9f90168b7a19038b9152
-EBUILD openvrml-9999.ebuild 3151 RMD160 3164deec3c2054287258c3807e3cebb4a38d2450 SHA1 203041d0f6fbd58fde6d61b07477d840af96c04e SHA256 5c4367fe8e39b1e7986f874d8ff0e2d745e1432b3d5ad023b49ccf93d2c219a7
-MISC ChangeLog 2555 RMD160 bc161388478c545fd6eaf781c3a8bccc862eab4a SHA1 ffc43902222a9d6459b2f2a2e1b42a6940dfd9ed SHA256 82e19b9f931974f059e3930ca23a5d9249b774161820685e0111e8161c362dc1
+EBUILD openvrml-9999.ebuild 3141 RMD160 63e29c8a14020574ae9cfb342805956865cb9275 SHA1 2d85bad077d8caac0c0e0d28d4134c959a8795e9 SHA256 317b2ac60b156d5d6934255c34c905ae6d0e7ef18123221667dc7a79e9a4dbfd
+MISC ChangeLog 2647 RMD160 a31ebcb369e36e2176c4a483bff393c10444c4ac SHA1 864418ad3d3c0117d08b563442eb1c16045ec5c4 SHA256 c5251531a1ec308573d9e023f0b20097ce2ec339cff7afa80ab4bdbe2cd76f20
 MISC metadata.xml 383 RMD160 7158ab82aac7d0e17e11856918aa905aefa36018 SHA1 445c4b61bc370b8474921fc74d6cf70dcdf3eb99 SHA256 1b8880e89d828ee13a906f6937418ed1192bb20fb8f099f3e3814f3740d454ef

diff --git a/media-gfx/openvrml/openvrml-9999.ebuild b/media-gfx/openvrml/openvrml-9999.ebuild
index cb33cc34818b4338778b9f5b97544f17735dc203..6d49469e036f09c4345fed20fb7a1ec36144b4f3 100644 (file)
--- a/media-gfx/openvrml/openvrml-9999.ebuild
+++ b/media-gfx/openvrml/openvrml-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -26,22 +26,36 @@ IUSE="examples jpeg nsplugin opengl player png truetype xembed"
 # the dependencies are done so that this can be resolved automatically
 # in the configure phase, all required functionality is then switched on
 
-RDEPEND="dev-libs/libxml2
+OPENGL_DEPS="
+       virtual/opengl
+       media-libs/freeglut"
+GTK_DEPS="
+       x11-libs/gtk+:2
+       x11-libs/gtkglext"
+
+RDEPEND="
+       dev-libs/libxml2
        >=dev-libs/boost-1.37
-       >=dev-libs/glib-2.6
+       dev-libs/glib:2
        sys-libs/zlib
        png? ( media-libs/libpng )
        jpeg? ( media-libs/jpeg )
        truetype? ( >=media-libs/freetype-2 media-libs/fontconfig )
-       opengl? ( virtual/opengl virtual/glut )
-       xembed? ( x11-libs/gtk+ x11-libs/gtkglext
-               virtual/opengl virtual/glut )
-       player? ( gnome-base/libgnomeui >=gnome-base/libgnome-2.14.1 gnome-base/libglade net-misc/curl
-               x11-libs/gtk+ x11-libs/gtkglext
-               virtual/opengl virtual/glut )
-       nsplugin? ( net-libs/xulrunner
-               x11-libs/gtk+ x11-libs/gtkglext
-               virtual/opengl virtual/glut )
+       opengl? ( ${OPENGL_DEPS} )
+       xembed? (
+               ${GTK_DEPS}
+               ${OPENGL_DEPS} )
+       player? (
+               gnome-base/libgnomeui
+               gnome-base/libgnome
+               gnome-base/libglade
+               net-misc/curl
+               ${GTK_DEPS}
+               ${OPENGL_DEPS} )
+       nsplugin? (
+               net-libs/xulrunner
+               ${GTK_DEPS}
+               ${OPENGL_DEPS} )
        examples? ( media-libs/libsdl )"
 
 DEPEND="${RDEPEND}