fix modular x dep (galeon)

Package-Manager: portage-2.1_pre3-r1

5 files changed, 20 insertions, 18 deletions

diff --git a/www-client/galeon/ChangeLog b/www-client/galeon/ChangeLog
index 7689527cb29d..322df1ed82c8 100644
--- a/www-client/galeon/ChangeLog
+++ b/www-client/galeon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/galeon
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/ChangeLog,v 1.20 2005/11/28 17:14:31 hanno Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/ChangeLog,v 1.21 2006/01/14 09:09:04 hanno Exp $
+
+  14 Jan 2006; Hanno Boeck <hanno@gentoo.org> galeon-1.3.21.ebuild,
+  galeon-2.0.0.ebuild:
+  Remove redundant virtual/x11 dep.
 
 *galeon-2.0.0 (28 Nov 2005)
 
diff --git a/www-client/galeon/Manifest b/www-client/galeon/Manifest
index eb4e49d6d3d6..2fdaf8148d77 100644
--- a/www-client/galeon/Manifest
+++ b/www-client/galeon/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 571d3c8320da2ed9b968618377f24e6a ChangeLog 17351
+MD5 ac642e5bd939fd76e85b9fc8be97a937 ChangeLog 17479
 MD5 511883d67fd68cc5fcef2df81022339f files/digest-galeon-1.3.21 67
 MD5 c2a24e5bb4adef9844eae66296a77624 files/digest-galeon-2.0.0 66
 MD5 96546bb1b58d9e16eae70f22da8315c9 files/galeon-2.0.0-gcc41.patch 430
-MD5 89f85dbadf0965796219c18068ece3d1 galeon-1.3.21.ebuild 1328
-MD5 7b1b14732b38c792ccf6f45db217f96c galeon-2.0.0.ebuild 1413
-MD5 4c1c1e710ea77d8d7db9906084c4228d metadata.xml 215
+MD5 78ef48511fc06901c0e0095a6e63c691 galeon-1.3.21.ebuild 1313
+MD5 8073f38a7456d3280e22cf622283cb29 galeon-2.0.0.ebuild 1400
+MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDizsOr2QksT29OyARAr79AJ9SCElDdvrw8fC1fAJ2K/MyGQ8lWQCfQO3W
-GSgVrTIPfF0A2vJCYua4CJI=
-=W0LR
+iD8DBQFDyMAEr2QksT29OyARAhDBAKCA5M/Y3EXYvD+5Qc29mU99epL4zACfXQkj
+pB4FAi6sbievYubWNH/W968=
+=o3l0
 -----END PGP SIGNATURE-----
diff --git a/www-client/galeon/galeon-1.3.21.ebuild b/www-client/galeon/galeon-1.3.21.ebuild
index 737624cb7cce..84626906b908 100644
--- a/www-client/galeon/galeon-1.3.21.ebuild
+++ b/www-client/galeon/galeon-1.3.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-1.3.21.ebuild,v 1.9 2005/09/17 01:02:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-1.3.21.ebuild,v 1.10 2006/01/14 09:09:04 hanno Exp $
 
 inherit gnome2 debug libtool
 
@@ -13,8 +13,7 @@ IUSE="firefox"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 SLOT="0"
 
-RDEPEND="virtual/x11
-	!firefox? ( >=www-client/mozilla-1.7.6-r1 )
+RDEPEND="!firefox? ( >=www-client/mozilla-1.7.6-r1 )
 	firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 )
 	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2.4.0
diff --git a/www-client/galeon/galeon-2.0.0.ebuild b/www-client/galeon/galeon-2.0.0.ebuild
index 6678b7556785..5c19634431f9 100644
--- a/www-client/galeon/galeon-2.0.0.ebuild
+++ b/www-client/galeon/galeon-2.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-2.0.0.ebuild,v 1.1 2005/11/28 17:14:31 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-2.0.0.ebuild,v 1.2 2006/01/14 09:09:04 hanno Exp $
 
 inherit gnome2 debug libtool eutils
 
@@ -13,8 +13,7 @@ IUSE="firefox"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 SLOT="0"
 
-RDEPEND="virtual/x11
-	!firefox? ( >=www-client/mozilla-1.7.6-r1 )
+RDEPEND="!firefox? ( >=www-client/mozilla-1.7.6-r1 )
 	firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 )
 	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2.4.0
diff --git a/www-client/galeon/metadata.xml b/www-client/galeon/metadata.xml
index 3540eeda5716..efa54454de71 100644
--- a/www-client/galeon/metadata.xml
+++ b/www-client/galeon/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<herd>no-herd</herd>
 <maintainer><email>hanno@gentoo.org</email></maintainer>
 </pkgmetadata>