Change x11-base/xfree dependency to virtual/x11. Everyone on xfree should be on 4.3.0-r3 or greater by now, so #20407 shouldn't be an issue.

4 files changed, 21 insertions, 22 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 790845d6aeca..29d8658cab72 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.87 2004/03/18 18:05:02 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.88 2004/03/30 05:22:29 spyderous Exp $
+
+  30 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; gtk+-2.2.4-r1.ebuild,
+  gtk+-2.4.0.ebuild:
+  Change x11-base/xfree dependency to virtual/x11. Everyone on xfree should be
+  on 4.3.0-r3 or greater by now, so #20407 shouldn't be an issue.
 
 *gtk+-2.4.0 (18 Mar 2004)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 6cde39dac5d4..e3724f00cda1 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,17 +1,17 @@
-MD5 db116695699bc21786a6a1e41c5b45bc gtk+-1.2.10-r11.ebuild 1756
-MD5 138bb1b99345a2f114c1df0c9728ed34 gtk+-2.4.0.ebuild 2222
-MD5 d8e7ddacf1e549cbd044d0a33565a06a gtk+-2.2.4-r1.ebuild 2525
+MD5 6eea7581ae520d259bb272a1079b614e ChangeLog 14555
 MD5 458e3585f989fdafdfb2437aca36e65b gtk+-1.2.10-r10.ebuild 1735
-MD5 4305c6200212b6e1a5543c72bc374c2d ChangeLog 14307
+MD5 359e8611fad10f8b9b95f5a29baff430 gtk+-2.4.0.ebuild 2123
+MD5 a693316a8b90fa23bf56eacf80559a0b gtk+-2.2.4-r1.ebuild 2425
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 d53a0b86cfefe71e851e14a48b2251fd files/digest-gtk+-2.4.0 64
+MD5 db116695699bc21786a6a1e41c5b45bc gtk+-1.2.10-r11.ebuild 1756
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
-MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
-MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
+MD5 d53a0b86cfefe71e851e14a48b2251fd files/digest-gtk+-2.4.0 64
+MD5 a4bb1381a10a526da3a6f968a8b3a4a2 files/digest-gtk+-2.2.4-r1 64
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
-MD5 897d9bcb56e9f9303b1e35c6f521ae35 files/gtk+-2.2-notificationarea_loop.patch 440
-MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
 MD5 c979d9262eccf5bdf8dbfa50b8d57b13 files/gtk+-2-xftprefs.patch 6711
-MD5 0ab7928b5279c384b39e7aaf56e3aa69 files/gtk+-wm.patch 11496
-MD5 a4bb1381a10a526da3a6f968a8b3a4a2 files/digest-gtk+-2.2.4-r1 64
+MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
+MD5 0ab7928b5279c384b39e7aaf56e3aa69 files/gtk+-wm.patch 11496
+MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
+MD5 897d9bcb56e9f9303b1e35c6f521ae35 files/gtk+-2.2-notificationarea_loop.patch 440
+MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
diff --git a/x11-libs/gtk+/gtk+-2.2.4-r1.ebuild b/x11-libs/gtk+/gtk+-2.2.4-r1.ebuild
index 48ef6778c32b..af36f2533542 100644
--- a/x11-libs/gtk+/gtk+-2.2.4-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.2.4-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/x11-libs/gtk+/gtk+-2.2.4-r1.ebuild,v 1.13 2004/03/07 04:04:55 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.4-r1.ebuild,v 1.14 2004/03/30 05:22:29 spyderous Exp $
 
 inherit eutils libtool flag-o-matic
 
@@ -13,10 +13,7 @@ SLOT="2"
 KEYWORDS="x86 ppc alpha sparc amd64 hppa ia64 ~mips"
 IUSE="doc tiff jpeg"
 
-# virtual/x11
-# Need this specific xfree version to get bugfree xinput support (#20407)
-
-RDEPEND=">=x11-base/xfree-4.3.0-r3
+RDEPEND="virtual/x11
 	>=dev-libs/glib-2.2
 	>=dev-libs/atk-1.2
 	>=x11-libs/pango-1.2
diff --git a/x11-libs/gtk+/gtk+-2.4.0.ebuild b/x11-libs/gtk+/gtk+-2.4.0.ebuild
index 864363b70635..655664a309fe 100644
--- a/x11-libs/gtk+/gtk+-2.4.0.ebuild
+++ b/x11-libs/gtk+/gtk+-2.4.0.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/x11-libs/gtk+/gtk+-2.4.0.ebuild,v 1.1 2004/03/18 18:05:02 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.0.ebuild,v 1.2 2004/03/30 05:22:29 spyderous Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -13,10 +13,7 @@ SLOT="2"
 KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64 ~hppa ~ia64 ~mips"
 IUSE="doc tiff jpeg"
 
-# virtual/x11
-# Need this specific xfree version to get bugfree xinput support (#20407)
-
-RDEPEND=">=x11-base/xfree-4.3.0-r3
+RDEPEND="virtual/x11
 	>=dev-libs/glib-2.4
 	>=dev-libs/atk-1.0.1
 	>=x11-libs/pango-1.4