first stable gtk2 release

5 files changed, 21 insertions, 136 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 3fc49f64c6fc..ab43b66b89f1 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.42 2003/02/03 03:36:07 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.43 2003/02/11 17:14:36 foser Exp $
+
+*xchat-2.0.0 (11 Feb 2003)
+
+  11 Feb 2003; foser <foser@gentoo.org> xchat-2.0.0.ebuild :
+  First stable gtk2 release
 
 *xchat-2.0.0pr1-r1 (02 Feb 2003)
   
diff --git a/net-irc/xchat/files/digest-xchat-1.9.7 b/net-irc/xchat/files/digest-xchat-1.9.7
deleted file mode 100644
index be10fcfa6c32..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.9.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a26011f12370559ec3d3ac56934afa2 xchat-1.9.7.tar.bz2 825812
diff --git a/net-irc/xchat/files/digest-xchat-2.0.0 b/net-irc/xchat/files/digest-xchat-2.0.0
new file mode 100644
index 000000000000..d6b76da19fba
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-2.0.0
@@ -0,0 +1 @@
+MD5 4751c5ccb398060c12835dd37768d8d8 xchat-2.0.0.tar.bz2 703788
diff --git a/net-irc/xchat/files/xchat-1.9.7-serverlist-corruption-fix.patch b/net-irc/xchat/files/xchat-1.9.7-serverlist-corruption-fix.patch
deleted file mode 100644
index 8fca6bbd52e5..000000000000
--- a/net-irc/xchat/files/xchat-1.9.7-serverlist-corruption-fix.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -ru --exclude=po --exclude=intl --exclude=Makefile.in xchat-1.9.7/src/fe-gtk/servlistgui.c xchat-1.9.8/src/fe-gtk/servlistgui.c
---- xchat-1.9.7/src/fe-gtk/servlistgui.c	2002-12-12 15:30:40.000000000 +1100
-+++ xchat-1.9.8/src/fe-gtk/servlistgui.c	2002-12-13 19:35:04.000000000 +1100
-@@ -45,6 +45,7 @@
- static GtkWidget *networks_tree;	/* network TreeView */
- static GtkWidget *connect_button;
- static GtkWidget *connectnew_button;
-+static int ignore_changed = FALSE;
- 
- /* global user info */
- static GtkWidget *entry_nick1;
-@@ -98,10 +99,12 @@
- static void
- servlist_entries_populate (ircnet *net)
- {
--	void *old = selected_net;
- 	static GList *cbitems = NULL;
- 	int i;
- 
-+	/* avoid the "changed" callback */
-+	ignore_changed = TRUE;
-+
- 	gtk_entry_set_text (GTK_ENTRY (entry_nick), net->nick ? net->nick : "");
- 	gtk_entry_set_text (GTK_ENTRY (entry_user), net->user ? net->user : "");
- 	gtk_entry_set_text (GTK_ENTRY (entry_real), net->real ? net->real : "");
-@@ -121,11 +124,9 @@
- 		gtk_combo_set_popdown_strings (GTK_COMBO (combo_encoding), cbitems);
- 	}
- 
--	/* avoid the "changed" callback */
--	old = selected_net;
--	selected_net = NULL;
- 	gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (combo_encoding)->entry), net->encoding ? net->encoding : "System default");
--	selected_net = old;
-+
-+	ignore_changed = FALSE;
- 
- 	if (net->flags & FLAG_USE_GLOBAL)
- 	{
-@@ -745,8 +746,11 @@
- 	if (!selected_net)
- 		return;
- 
--	free (*str);
--	*str = strdup (GTK_ENTRY (entry)->text);
-+	if (!ignore_changed)
-+	{
-+		free (*str);
-+		*str = strdup (GTK_ENTRY (entry)->text);
-+	}
- }
- 
- static GtkWidget *
-@@ -938,9 +942,12 @@
- 	if (!selected_net)
- 		return;
- 
--	if (selected_net->encoding)
--		free (selected_net->encoding);
--	selected_net->encoding = strdup (entry->text);
-+	if (!ignore_changed)
-+	{
-+		if (selected_net->encoding)
-+			free (selected_net->encoding);
-+		selected_net->encoding = strdup (entry->text);
-+	}
- }
- 
- static GtkWidget *
-@@ -969,7 +976,6 @@
- 
- 	cb = gtk_combo_new ();
- 	gtk_combo_set_popdown_strings (GTK_COMBO (cb), cbitems);
--	/*gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (cb)->entry), _("System default"));*/
- 	g_signal_connect (G_OBJECT (GTK_COMBO (cb)->entry), "changed",
- 							G_CALLBACK (servlist_combo_cb), NULL);
- 	gtk_table_attach (GTK_TABLE (table), cb, 1, 2, 7, 8,
-@@ -1082,14 +1088,14 @@
- 	return tree;
- }
- 
--static void
-+/*static void
- skip_motd (GtkWidget * igad, gpointer serv)
- {
- 	if (GTK_TOGGLE_BUTTON (igad)->active)
- 		prefs.skipmotd = TRUE;
- 	else
- 		prefs.skipmotd = FALSE;
--}
-+}*/
- 
- static void
- no_servlist (GtkWidget * igad, gpointer serv)
diff --git a/net-irc/xchat/xchat-1.9.7.ebuild b/net-irc/xchat/xchat-2.0.0.ebuild
index e51882289332..ee1176bc9096 100644
--- a/net-irc/xchat/xchat-1.9.7.ebuild
+++ b/net-irc/xchat/xchat-2.0.0.ebuild
@@ -1,49 +1,31 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.9.7.ebuild,v 1.2 2002/12/16 23:15:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.0.ebuild,v 1.1 2003/02/11 17:14:36 foser Exp $
 
-inherit eutils
+IUSE="perl tcltk python ssl gtk mmx ipv6" 
 
-IUSE="perl gnome ssl gtk python mmx ipv6 nls kde" 
 S=${WORKDIR}/${P}
+
 DESCRIPTION="X-Chat is a graphical IRC client for UNIX operating systems."
-SRC_URI="http://www.xchat.org/files/source/1.9/${P}.tar.bz2"
+SRC_URI="http://www.xchat.org/files/source/2.0/${P}.tar.bz2"
 HOMEPAGE="http://www.xchat.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
-RDEPEND=">=dev-libs/glib-2.0.4
-	>=x11-libs/gtk+-2.0.5
+RDEPEND=">=dev-libs/glib-2.0.3
+	>=x11-libs/gtk+-2.0.3
 	perl?   ( >=sys-devel/perl-5.6.1 )
-	gnome? ( >=x11-libs/libzvt-2.0.1
-		 >=gnome-base/libgnome-2.0.1
-		 >=gnome-base/gnome-applets-2.0.0
-		 >=gnome-base/gnome-panel-2.0.1 )
 	ssl?	( >=dev-libs/openssl-0.9.6d ) 
-	python? ( dev-lang/python )"               
+	python? ( dev-lang/python )
+	tcltk? ( dev-lang/tcl )"               
 
 DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.10.38 )"
 
-src_unpack() {
-	unpack ${A}	
-	epatch ${FILESDIR}/${P}-serverlist-corruption-fix.patch
-}
-
 src_compile() {
-	local myopts myflags
-
-	if [ ! `use perl` ] ; then
-		use gnome \
-			&& myopts="${myopts} --enable-gnome --enable-panel" \
-			|| myopts="${myopts} --enable-gtkfe --disable-gnome --disable-zvt"
-		
-	#	use gnome \
-	#		&& CFLAGS="${CFLAGS} -I/usr/include/orbit-2.0" \
-	#		|| myopts="${myopts} --disable-gnome"
-	fi
+	local myopts
 
 	use gtk \
 		&& myopts="${myopts} --enable-gtkfe" \
@@ -57,19 +39,16 @@ src_compile() {
 	use python \
 		&& myopts="${myopts} --enable-python" \
                 || myopts="${myopts} --disable-python"
-	use nls \
-		&& myopts="${myopts} --enable-nls --enable-hebrew" \
-		|| myopts="${myopts} --disable-nls --disable-hebrew"
-	# --enable-japanese-conv  is broken
+	use tcltk \
+		&& myopts="${myopts} --enable-tcl" \
+                || myopts="${myopts} --disable-tcl"
 	use mmx	\
-		&& myopts="${myopts} --enable-mmx"	\
+		&& myopts="${myopts} --enable-mmx" \
 		|| myopts="${myopts} --disable-mmx"
 	use ipv6 \
 		&& myopts="${myopts} --enable-ipv6" \
 		|| myopts="${myopts} --disable-ipv6"
 
-	[ -n "${DISABLE_XFT}" ] && myopts="${myopts} --disable-xft"
-	
 	econf \
 		--program-suffix=-2 \
 		${myopts} || die "Configure failed"
@@ -84,10 +63,5 @@ src_install() {
 
 	einstall install || die "Install failed"
 
-	dodoc AUTHORS COPYING ChangeLog README
-}
-
-pkg_postinst() {
-	einfo "If you want X-Chat to correctly display Hebrew (bidi) do "
-	einfo "'export DISABLE_XFT=1' and re-emerge xchat"
+	dodoc AUTHORS COPYING ChangeLog README*
 }