gtk is optional

5 files changed, 9 insertions, 113 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index b94308654ce0..d3c684f90fea 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.49 2003/03/23 07:45:22 vladimir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.50 2003/03/25 10:14:41 seemant Exp $
 
   10 Mar 2003; Olivier Reisch <doctomoe@gentoo.org> xchat-2.0.0.ebuild:
   Mark stable on ppc
@@ -41,6 +41,10 @@
 
 *xchat-1.8.11 (23 Jan 2003)
 
+  25 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xchat-1.8.10-r1.ebuild,
+  xchat-1.8.10.ebuild, xchat-1.8.10.ebuild, xchat-1.8.11.ebuild:
+  made gtk an optional USE based dep
+
   09 Mar 2003; Aron Griffis <agriffis@gentoo.org> xchat-1.8.11.ebuild:
   Mark stable on alpha
 
diff --git a/net-irc/xchat/files/digest-xchat-1.8.10 b/net-irc/xchat/files/digest-xchat-1.8.10
deleted file mode 100644
index dfe9b6320489..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.8.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9295830df5d040d7723620322a65f89c xchat-1.8.10.tar.bz2 824407
diff --git a/net-irc/xchat/xchat-1.8.10-r1.ebuild b/net-irc/xchat/xchat-1.8.10-r1.ebuild
index aab1c65c4578..34a5d00a512b 100644
--- a/net-irc/xchat/xchat-1.8.10-r1.ebuild
+++ b/net-irc/xchat/xchat-1.8.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.10-r1.ebuild,v 1.11 2003/03/11 21:11:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.10-r1.ebuild,v 1.12 2003/03/25 10:14:41 seemant Exp $
 
 IUSE="ssl nls mmx gnome ipv6 python kde gtk perl"
 
@@ -13,7 +13,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc ~alpha"
 
-RDEPEND="=x11-libs/gtk+-1.2*
+RDEPEND="gtk? ( =x11-libs/gtk+-1.2* )
 	python? ( >=dev-lang/python-2.2-r7 )
 	perl?   ( >=dev-lang/perl-5.6.1 )
 	gnome?  ( <gnome-base/gnome-panel-1.5.0
diff --git a/net-irc/xchat/xchat-1.8.10.ebuild b/net-irc/xchat/xchat-1.8.10.ebuild
deleted file mode 100644
index a1e3081e0eaf..000000000000
--- a/net-irc/xchat/xchat-1.8.10.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.10.ebuild,v 1.9 2003/03/11 21:11:46 seemant Exp $
-
-IUSE="ssl nls mmx gnome ipv6 python kde gtk perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="X-Chat is a graphical IRC client for UNIX operating systems."
-SRC_URI="http://www.xchat.org/files/source/1.8/${P}.tar.bz2"
-HOMEPAGE="http://www.xchat.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	python? ( >=dev-lang/python-2.2-r7 )
-	perl?   ( >=dev-lang/perl-5.6.1 )
-	gnome?  ( <gnome-base/gnome-panel-1.5.0
-				>=media-libs/gdk-pixbuf-0.11.0-r1 )
-	ssl?    ( >=dev-libs/openssl-0.9.6a )"
-
-DEPEND="${RDEPEND}
-	nls?    ( >=sys-devel/gettext-0.10.38 )"
-
-src_unpack() {
-
-	unpack ${A}
-	
-	cd ${S}
-	
-	patch -p1 <${FILESDIR}/xc1810fixme3.diff
-	cp configure configure.orig
-
-	use python && ( \
-		local mylibs=`/usr/bin/python-config`
-		sed -e 's:PY_LIBS=".*":PY_LIBS="'"$mylibs"'":' \
-			configure.orig > configure
-	)
-}
-
-src_compile() {
-
-	local myopts myflags
-	use gnome \
-		&& myopts="${myopts} --enable-gnome --enable-panel" \
-		|| myopts="${myopts} --enable-gtkfe --disable-gnome --disable-zvt --disable-gdk-pixbuf"
-		
-	use gnome \
-		&& CFLAGS="${CFLAGS} -I/usr/include/orbit-1.0" \
-		|| myopts="${myopts} --disable-gnome"
-
-	use gtk \
-		|| myopts="${myopts} --disable-gtkfe"
-	
-	use ssl \
-		&& myopts="${myopts} --enable-openssl"
-
-	use perl \
-		|| myopts="${myopts} --disable-perl"
-
-	use nls \
-		&& myopts="${myopts} --enable-hebrew --enable-japanese-conv" \
-		|| myopts="${myopts} --disable-nls"
-
-	if use x86
-	then
-		use mmx	\
-			&& myopts="${myopts} --enable-mmx"	\
-			|| myopts="${myopts} --disable-mmx"
-	fi
-	
-	use ipv6 \
-		&& myopts="${myopts} --enable-ipv6"
-	
-	use python \
-		&& myflags="`python-config`" \
-	 	&& myopts="${myopts} --enable-python"
-	
-	./configure \
-		--prefix=/usr \
-		--host=${CHOST} \
-		${myopts} || die
-	
-	emake || die
-}
-
-src_install() {
-	
-	use kde && ( \
-		make \
-			prefix=${D}/usr \
-			utildir=${D}${KDEDIR}/share/applnk/Internet \
-			install || die
-	) || ( \
-		make \
-			prefix=${D}/usr \
-			install || die
-	)
-
-	use gnome && ( \
-		insinto /usr/share/gnome/apps/Internet
-		doins xchat.desktop
-	)
-
-	dodoc AUTHORS COPYING ChangeLog README
-}
diff --git a/net-irc/xchat/xchat-1.8.11.ebuild b/net-irc/xchat/xchat-1.8.11.ebuild
index d9c82f8d9987..8806cdcbe4eb 100644
--- a/net-irc/xchat/xchat-1.8.11.ebuild
+++ b/net-irc/xchat/xchat-1.8.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.11.ebuild,v 1.5 2003/03/11 21:11:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.11.ebuild,v 1.6 2003/03/25 10:14:41 seemant Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SLOT="1"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc ~sparc alpha"
 
-RDEPEND="=x11-libs/gtk+-1.2*
+RDEPEND="gtk? ( =x11-libs/gtk+-1.2* )
 	python? ( >=dev-lang/python-2.2-r7 )
 	perl?   ( >=dev-lang/perl-5.6.1 )
 	gnome?  ( <gnome-base/gnome-panel-1.5.0