Adjusted dependencies to work with net-irc/xchat-gnome.

Package-Manager: portage-2.0.51.22-r1

9 files changed, 43 insertions, 27 deletions

diff --git a/net-irc/xchat-systray/ChangeLog b/net-irc/xchat-systray/ChangeLog
index 16a4dcc0f4b6..9513c2b4ca0b 100644
--- a/net-irc/xchat-systray/ChangeLog
+++ b/net-irc/xchat-systray/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/xchat-systray
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-systray/ChangeLog,v 1.21 2005/06/09 16:37:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-systray/ChangeLog,v 1.22 2005/06/21 13:20:11 swegener Exp $
+
+  21 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  xchat-systray-2.4.5-r1.ebuild, xchat-systray-2.4.5-r2.ebuild:
+  Adjusted dependencies to work with net-irc/xchat-gnome.
 
 *xchat-systray-2.4.5-r2 (09 Jun 2005)
 
diff --git a/net-irc/xchat-systray/xchat-systray-2.4.5-r1.ebuild b/net-irc/xchat-systray/xchat-systray-2.4.5-r1.ebuild
index c17fa2aef3d6..a97091acf253 100644
--- a/net-irc/xchat-systray/xchat-systray-2.4.5-r1.ebuild
+++ b/net-irc/xchat-systray/xchat-systray-2.4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-systray/xchat-systray-2.4.5-r1.ebuild,v 1.6 2005/06/08 16:00:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-systray/xchat-systray-2.4.5-r1.ebuild,v 1.7 2005/06/21 13:20:11 swegener Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -17,7 +17,10 @@ IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.0.3
 	>=x11-libs/gtk+-2.0.3
-	>=net-irc/xchat-2.0.3"
+	|| (
+		>=net-irc/xchat-2.0.3
+		>=net-irc/xchat-gnome-0.4
+	)"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
diff --git a/net-irc/xchat-systray/xchat-systray-2.4.5-r2.ebuild b/net-irc/xchat-systray/xchat-systray-2.4.5-r2.ebuild
index cbe12bc5faa3..3ac72846eb41 100644
--- a/net-irc/xchat-systray/xchat-systray-2.4.5-r2.ebuild
+++ b/net-irc/xchat-systray/xchat-systray-2.4.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-systray/xchat-systray-2.4.5-r2.ebuild,v 1.2 2005/06/09 16:38:22 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-systray/xchat-systray-2.4.5-r2.ebuild,v 1.3 2005/06/21 13:20:11 swegener Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -17,7 +17,10 @@ IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.0.3
 	>=x11-libs/gtk+-2.0.3
-	>=net-irc/xchat-2.0.3"
+	|| (
+		>=net-irc/xchat-2.0.3
+		>=net-irc/xchat-gnome-0.4
+	)"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
diff --git a/net-irc/xchat-xsys/ChangeLog b/net-irc/xchat-xsys/ChangeLog
index 1433bb94dc7c..03d6dcd7293a 100644
--- a/net-irc/xchat-xsys/ChangeLog
+++ b/net-irc/xchat-xsys/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/xchat-xsys
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/ChangeLog,v 1.20 2005/06/20 18:49:00 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/ChangeLog,v 1.21 2005/06/21 13:14:51 swegener Exp $
+
+  21 Jun 2005; Sven Wegener <swegener@gentoo.org> xchat-xsys-2.0.5.ebuild,
+  xchat-xsys-2.0.6-r1.ebuild:
+  Adjusted dependencies to work with net-irc/xchat-gnome.
 
 *xchat-xsys-2.0.6-r1 (20 Jun 2005)
 
diff --git a/net-irc/xchat-xsys/xchat-xsys-2.0.5.ebuild b/net-irc/xchat-xsys/xchat-xsys-2.0.5.ebuild
index 1ee5f970b03e..29603c87b33f 100644
--- a/net-irc/xchat-xsys/xchat-xsys-2.0.5.ebuild
+++ b/net-irc/xchat-xsys/xchat-xsys-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.5.ebuild,v 1.4 2005/06/19 17:21:00 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.5.ebuild,v 1.5 2005/06/21 13:14:51 swegener Exp $
 
 inherit toolchain-funcs
 
@@ -15,7 +15,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 x86"
 IUSE="bmp xmms buttons"
 
-DEPEND=">=net-irc/xchat-2.4.0
+DEPEND="|| (
+		>=net-irc/xchat-2.4.0
+		>=net-irc/xchat-gnome-0.4
+	)
 	bmp? ( media-plugins/bmp-infopipe )
 	xmms? ( media-plugins/xmms-infopipe )"
 
diff --git a/net-irc/xchat-xsys/xchat-xsys-2.0.6-r1.ebuild b/net-irc/xchat-xsys/xchat-xsys-2.0.6-r1.ebuild
index b590704d3604..83c1053aad70 100644
--- a/net-irc/xchat-xsys/xchat-xsys-2.0.6-r1.ebuild
+++ b/net-irc/xchat-xsys/xchat-xsys-2.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.6-r1.ebuild,v 1.1 2005/06/20 18:49:00 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.6-r1.ebuild,v 1.2 2005/06/21 13:14:51 swegener Exp $
 
 inherit toolchain-funcs eutils
 
@@ -15,7 +15,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
 IUSE="bmp xmms buttons"
 
-DEPEND=">=net-irc/xchat-2.4.0
+DEPEND="|| (
+		>=net-irc/xchat-2.4.0
+		>=net-irc/xchat-gnome-0.4
+	)
 	sys-apps/pciutils
 	bmp? ( media-plugins/bmp-infopipe )
 	xmms? ( media-plugins/xmms-infopipe )"
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index af193acbdb5f..80786dcd0ed6 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 88af6fe96819e547faad972327e3dcea ChangeLog 24517
+MD5 5ed7fac9efa2b084e422df4cef41828c ChangeLog 24673
 MD5 9d213a58f6822d1958b6a5a4ad07ec14 files/2.4.1-close-fds-on-exec.patch 1041
 MD5 e4f52004b3e7ca6598d403f2fa74dcd4 files/2.4.1-fe-text.patch 697
 MD5 e2b99b2d2dfc54ba96e560c0ed8392df files/digest-xchat-1.8.11-r1 65
@@ -13,13 +10,6 @@ MD5 31de685eff3d16d9466416434c9fd6c3 files/xc208-fixsocks5.diff 688
 MD5 ee98eba7f1061680d8d0582a10d72cb7 files/xchat-dccserver-0.5.patch 11776
 MD5 fb5772136a872c08434566d4f0bcdc7f metadata.xml 179
 MD5 8ebf40ee60968abaf73442bfb9873e93 xchat-1.8.11-r1.ebuild 2267
-MD5 3bb8c4066c7d1aa003a24e9bccd5f2d5 xchat-2.4.1-r1.ebuild 2100
-MD5 625d03b30e8f948c51ec974e2e384d2f xchat-2.4.3.ebuild 2243
-MD5 70aad23de8d464a8a07dd358f57af393 xchat-2.4.4.ebuild 2194
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCuAL6I1lqEGTUzyQRAg0hAJ0fQbO/iPWFzCuSwRsm7bJatyrORwCfSOKq
-vq4t2vlFkMT1xjUcgZ5wtbw=
-=NBhn
------END PGP SIGNATURE-----
+MD5 226dfd2adcaa59afe576e0e0c2ea4bfb xchat-2.4.1-r1.ebuild 2123
+MD5 737bedde0349b8a122fe3c06d1d49843 xchat-2.4.3.ebuild 2268
+MD5 5fc29f259bb2b347e5d03cbe3304b9ed xchat-2.4.4.ebuild 2216
diff --git a/net-irc/xchatosd/ChangeLog b/net-irc/xchatosd/ChangeLog
index 52928ec631d6..fb6bb3e03f8e 100644
--- a/net-irc/xchatosd/ChangeLog
+++ b/net-irc/xchatosd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-irc/xchatosd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/ChangeLog,v 1.13 2005/04/22 14:49:40 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/ChangeLog,v 1.14 2005/06/21 13:18:26 swegener Exp $
+
+  21 Jun 2005; Sven Wegener <swegener@gentoo.org> xchatosd-5.18.ebuild:
+  Adjusted dependencies to work with net-irc/xchat-gnome.
 
   22 Apr 2005; Sven Wegener <swegener@gentoo.org>
   -files/5.12-return-values.patch, -xchatosd-5.12.ebuild,
diff --git a/net-irc/xchatosd/xchatosd-5.18.ebuild b/net-irc/xchatosd/xchatosd-5.18.ebuild
index 265569ed920c..26ee991223fa 100644
--- a/net-irc/xchatosd/xchatosd-5.18.ebuild
+++ b/net-irc/xchatosd/xchatosd-5.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/xchatosd-5.18.ebuild,v 1.4 2005/04/22 14:49:40 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/xchatosd-5.18.ebuild,v 1.5 2005/06/21 13:18:26 swegener Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -13,7 +13,10 @@ KEYWORDS="x86 ~ppc ~amd64 ~ia64"
 IUSE="iconv"
 
 RDEPEND=">=x11-libs/xosd-2.2.5
-	>=net-irc/xchat-2.0.9"
+	|| (
+		>=net-irc/xchat-2.0.9
+		>=net-irc/xchat-gnome-0.4
+	)"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"