Change x11-base/xfree dependency to virtual/x11.

6 files changed, 37 insertions, 36 deletions

diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index cfb6de913a53..6f3c8c7d8031 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.159 2004/03/29 04:21:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.160 2004/03/30 05:18:16 spyderous Exp $
+
+  30 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; mozilla-1.6-r1.ebuild,
+  mozilla-1.7_alpha.ebuild, mozilla-1.7_beta-r1.ebuild,
+  mozilla-1.7_beta.ebuild:
+  Change x11-base/xfree dependency to virtual/x11.
 
   28 Mar 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.7_beta-r1.ebuild:
   Add missing dodir before dosym for bug 46049
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index a4a226a8e192..17e1c479fbac 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -1,40 +1,40 @@
-MD5 ac07e75b4b3983be607bcb0ca70b92af mozilla-1.7_beta-r1.ebuild 15891
-MD5 fc835875ad70abe8992f0f1aa01a7261 mozilla-1.6-r1.ebuild 17064
-MD5 a7094c4d8cfc97f9d3aba34eda1e5e80 mozilla-1.7_alpha.ebuild 16584
-MD5 ec3569111aa3e1aedae55a5e4a59abf9 mozilla-1.7_beta.ebuild 16748
-MD5 500fcb4863751aab4f0124096b9327a6 ChangeLog 27125
+MD5 905dfba9c4a904f4a88b5612093f7bde ChangeLog 27339
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 86a2efd9164c974ff253653635baf1ed mozilla-1.7_beta-r1.ebuild 15864
+MD5 eff720b42149187a0a663e0592b0c47c mozilla-1.6-r1.ebuild 17040
+MD5 ee535d8164b0dda4e9e7882da440f2ed mozilla-1.7_alpha.ebuild 16557
+MD5 5508df6b2c7e79aeafb2dae0e901c0d2 mozilla-1.7_beta.ebuild 16725
+MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
+MD5 11cae063228d9997b2cf9f150d9837fe files/digest-mozilla-1.6-r1 201
+MD5 240600242a2f1d0899178c5df10718ec files/digest-mozilla-1.7_alpha 202
+MD5 ce10376ba06082440ad0e4ecc3218dc5 files/digest-mozilla-1.7_beta 209
+MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
-MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-1.4-amd64.patch 35052
-MD5 ce10376ba06082440ad0e4ecc3218dc5 files/digest-mozilla-1.7_beta-r1 209
-MD5 240600242a2f1d0899178c5df10718ec files/digest-mozilla-1.7_alpha 202
-MD5 11cae063228d9997b2cf9f150d9837fe files/digest-mozilla-1.6-r1 201
-MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
 MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
-MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
-MD5 2e275ac9f0f12d670020e3b18a295dfb files/mozilla.sh 6688
-MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
-MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
 MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
-MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
-MD5 ce10376ba06082440ad0e4ecc3218dc5 files/digest-mozilla-1.7_beta 209
 MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
-MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
-MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
+MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
+MD5 2e275ac9f0f12d670020e3b18a295dfb files/mozilla.sh 6688
+MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
+MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-1.4-amd64.patch 35052
+MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
+MD5 ce10376ba06082440ad0e4ecc3218dc5 files/digest-mozilla-1.7_beta-r1 209
+MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
 MD5 83da5242120c74b0ca6cceae9d6cf237 files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 2838
-MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
+MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
 MD5 d63b3ff6f56728d85392ac75a9745a15 files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 605
-MD5 fd94ea7ab54ecfd812c46fa5ce53cd0e files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 1030
 MD5 9ec98639ee6359407ab5150486c3d0d1 files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 387
-MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
-MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
+MD5 fd94ea7ab54ecfd812c46fa5ce53cd0e files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 1030
+MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
 MD5 696d4810f2ccb8f2bcb0275fa13c67b9 files/1.2/mozilla-1.2b-gtk2.patch.bz2 6091
+MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
+MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
 MD5 1655fea18e9fc538b41d88561d6080c7 files/1.3/mozilla-1.3-fix-gtkim.patch 921
-MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
 MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
+MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
 MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
 MD5 ba7b561abda8274253ec38859a8797fc files/icon/mozilla.desktop 121
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
diff --git a/net-www/mozilla/mozilla-1.6-r1.ebuild b/net-www/mozilla/mozilla-1.6-r1.ebuild
index 775abac1ddd6..9d8742576dad 100644
--- a/net-www/mozilla/mozilla-1.6-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.6-r1.ebuild,v 1.7 2004/03/28 22:57:25 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.6-r1.ebuild,v 1.8 2004/03/30 05:18:16 spyderous Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama"
 # Internal USE flags that I do not really want to advertise ...
@@ -71,7 +71,7 @@ KEYWORDS="x86 ppc sparc alpha amd64 ia64"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 
-RDEPEND=">=x11-base/xfree-4.2.0-r11
+RDEPEND="virtual/x11
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/fontconfig-2.1
 	!moznoxft ( virtual/xft )
@@ -94,7 +94,6 @@ RDEPEND=">=x11-base/xfree-4.2.0-r11
 	crypt? ( >=app-crypt/gnupg-1.2.1 )"
 
 DEPEND="${RDEPEND}
-	virtual/x11
 	dev-util/pkgconfig
 	dev-lang/perl
 	java? ( >=dev-java/java-config-0.2.0 )
diff --git a/net-www/mozilla/mozilla-1.7_alpha.ebuild b/net-www/mozilla/mozilla-1.7_alpha.ebuild
index 0db077b163be..89bc59b1305f 100644
--- a/net-www/mozilla/mozilla-1.7_alpha.ebuild
+++ b/net-www/mozilla/mozilla-1.7_alpha.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_alpha.ebuild,v 1.2 2004/03/21 05:27:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_alpha.ebuild,v 1.3 2004/03/30 05:18:16 spyderous Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama"
 # Internal USE flags that I do not really want to advertise ...
@@ -71,7 +71,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 
-RDEPEND=">=x11-base/xfree-4.2.0-r11
+RDEPEND="virtual/x11
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/fontconfig-2.1
 	!moznoxft ( virtual/xft )
@@ -94,7 +94,6 @@ RDEPEND=">=x11-base/xfree-4.2.0-r11
 	crypt? ( >=app-crypt/gnupg-1.2.1 )"
 
 DEPEND="${RDEPEND}
-	virtual/x11
 	dev-util/pkgconfig
 	dev-lang/perl
 	java? ( >=dev-java/java-config-0.2.0 )"
diff --git a/net-www/mozilla/mozilla-1.7_beta-r1.ebuild b/net-www/mozilla/mozilla-1.7_beta-r1.ebuild
index d8b5ead453ba..a86234d0158f 100644
--- a/net-www/mozilla/mozilla-1.7_beta-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.7_beta-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_beta-r1.ebuild,v 1.4 2004/03/29 04:21:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_beta-r1.ebuild,v 1.5 2004/03/30 05:18:16 spyderous Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama"
 # Internal USE flags that I do not really want to advertise ...
@@ -71,7 +71,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 
-RDEPEND=">=x11-base/xfree-4.2.0-r11
+RDEPEND="virtual/x11
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/fontconfig-2.1
 	!moznoxft ( virtual/xft )
@@ -96,7 +96,6 @@ RDEPEND=">=x11-base/xfree-4.2.0-r11
 	net-www/mozilla-launcher"
 
 DEPEND="${RDEPEND}
-	virtual/x11
 	dev-util/pkgconfig
 	dev-lang/perl
 	java? ( >=dev-java/java-config-0.2.0 )"
diff --git a/net-www/mozilla/mozilla-1.7_beta.ebuild b/net-www/mozilla/mozilla-1.7_beta.ebuild
index 9b5b2ea5d314..0081daab8668 100644
--- a/net-www/mozilla/mozilla-1.7_beta.ebuild
+++ b/net-www/mozilla/mozilla-1.7_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_beta.ebuild,v 1.1 2004/03/23 21:00:16 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_beta.ebuild,v 1.2 2004/03/30 05:18:16 spyderous Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama"
 # Internal USE flags that I do not really want to advertise ...
@@ -71,7 +71,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 
-RDEPEND=">=x11-base/xfree-4.2.0-r11
+RDEPEND="virtual/x11
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/fontconfig-2.1
 	!moznoxft ( virtual/xft )
@@ -95,7 +95,6 @@ RDEPEND=">=x11-base/xfree-4.2.0-r11
 	gnome? ( >=gnome-base/gnome-vfs-2.3.5 )"
 
 DEPEND="${RDEPEND}
-	virtual/x11
 	dev-util/pkgconfig
 	dev-lang/perl
 	java? ( >=dev-java/java-config-0.2.0 )"