minor fixes, mark 2.0.2-r2 x86 and cleanup

7 files changed, 20 insertions, 170 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 0329ffead3c9..032308fc9f68 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,9 +1,12 @@
 # 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.53 2003/05/26 09:26:06 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.54 2003/06/08 13:22:56 foser Exp $
 
 *xchat-2.0.2-r2 (26 May 2003)
 
+  08 Jun 2003; foser <foser@gentoo.org> xchat-2.0.2-r2.ebuild :
+  Fixed gtk dependancy to follow USE flag, removed xchat link
+
   26 May 2003; Alastair Tse <liquidx@gentoo.org> xchat-2.0.2-r2.ebuild,
   files/xc202-fixdetach.diff, files/xc202-fixurlg.diff:
   add post-release stable patches from xchat.org (#21459)
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index b032a8ffd965..45e8d77aad65 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,20 +1,16 @@
-MD5 3cf976f563f05aa1a99ab484be470c63 ChangeLog 7833
-MD5 d6896c2421454aab5a0cefef7bed9946 xchat-1.8.10-r1.ebuild 2307
-MD5 5e5d21a6b4e47c04f504c69b4272b029 xchat-1.8.11.ebuild 2285
 MD5 e533d379622f911ced2832e22263f31b xchat-2.0.1.ebuild 1982
+MD5 5e5d21a6b4e47c04f504c69b4272b029 xchat-1.8.11.ebuild 2285
 MD5 d4b23b8ff3dd54a2ca5560884c64bf7f xchat-2.0.0.ebuild 1909
-MD5 e23102dd159394d07147429bcc35c3e6 xchat-2.0.2.ebuild 1982
-MD5 ed63b6200f3e7fe3087333cf3a8d1df4 xchat-2.0.2-r1.ebuild 2085
-MD5 37eaba9a63ecac8c87248336b021aab0 xchat-2.0.2-r2.ebuild 2198
-MD5 011b499714e85d4177185aabaeb1db15 files/00_all_tabs-leftright-and-gtk-icons.patch 13367
-MD5 fb93538acf146307088f7e6707ae3150 files/digest-xchat-2.0.2 64
-MD5 7c2450584076659603dc908ffc53b537 files/digest-xchat-1.8.10-r1 65
-MD5 e2b99b2d2dfc54ba96e560c0ed8392df files/digest-xchat-1.8.11 65
-MD5 1ee812a2b3e28e3866413e75a80ff983 files/digest-xchat-2.0.1 64
+MD5 ce38270d89eee2d655d607e5346381ec xchat-2.0.2-r2.ebuild 2132
+MD5 d6896c2421454aab5a0cefef7bed9946 xchat-1.8.10-r1.ebuild 2307
+MD5 8e80fa1afdfe4876e6c1d9f549bc76b4 ChangeLog 7958
 MD5 acbd4afdd7d00bceb3816147eb508e4b files/digest-xchat-2.0.0 64
-MD5 fb93538acf146307088f7e6707ae3150 files/digest-xchat-2.0.2-r1 64
-MD5 be3a6832adcb4e41de90396ae3f741dc files/xc202-fixdetach.diff 269
-MD5 9636578d0e88ec0185c97a30edb81ce5 files/xc1810fixme3.diff 1025
+MD5 1ee812a2b3e28e3866413e75a80ff983 files/digest-xchat-2.0.1 64
 MD5 a8f607d224408d4a27777d2ffce8beac files/xc1811fixststint.diff 422
 MD5 579cf7b7098f443691fcd6e3e41acba2 files/xc202-fixurlg.diff 510
+MD5 011b499714e85d4177185aabaeb1db15 files/00_all_tabs-leftright-and-gtk-icons.patch 13367
+MD5 be3a6832adcb4e41de90396ae3f741dc files/xc202-fixdetach.diff 269
+MD5 9636578d0e88ec0185c97a30edb81ce5 files/xc1810fixme3.diff 1025
+MD5 7c2450584076659603dc908ffc53b537 files/digest-xchat-1.8.10-r1 65
+MD5 e2b99b2d2dfc54ba96e560c0ed8392df files/digest-xchat-1.8.11 65
 MD5 fb93538acf146307088f7e6707ae3150 files/digest-xchat-2.0.2-r2 64
diff --git a/net-irc/xchat/files/digest-xchat-2.0.2 b/net-irc/xchat/files/digest-xchat-2.0.2
deleted file mode 100644
index 8051bdcbb34b..000000000000
--- a/net-irc/xchat/files/digest-xchat-2.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 909a2855c891d7649e73bf9dfd628e1d xchat-2.0.2.tar.bz2 749398
diff --git a/net-irc/xchat/files/digest-xchat-2.0.2-r1 b/net-irc/xchat/files/digest-xchat-2.0.2-r1
deleted file mode 100644
index 8051bdcbb34b..000000000000
--- a/net-irc/xchat/files/digest-xchat-2.0.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 909a2855c891d7649e73bf9dfd628e1d xchat-2.0.2.tar.bz2 749398
diff --git a/net-irc/xchat/xchat-2.0.2-r1.ebuild b/net-irc/xchat/xchat-2.0.2-r1.ebuild
deleted file mode 100644
index 4fb5e281f9b6..000000000000
--- a/net-irc/xchat/xchat-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2003 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-2.0.2-r1.ebuild,v 1.1 2003/05/16 16:06:49 foser Exp $
-
-IUSE="perl tcltk python ssl gtk mmx ipv6" 
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="X-Chat is a graphical IRC client for UNIX operating systems."
-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.3
-	>=x11-libs/gtk+-2.0.3
-	perl?   ( >=dev-lang/perl-5.6.1 )
-	ssl?	( >=dev-libs/openssl-0.9.6d ) 
-	python? ( dev-lang/python )
-	tcltk? ( dev-lang/tcl )"               
-
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.10.38 )"
-
-src_compile() {
-	local myopts
-
-	use gtk \
-		&& myopts="${myopts} --enable-gtkfe" \
-		|| myopts="${myopts} --disable-gtkfe"
-	use ssl \
-		&& myopts="${myopts} --enable-openssl" \
-		|| myopts="${myopts} --disable-openssl"
-	use perl \
-		&& myopts="${myopts} --enable-perl" \
-		|| myopts="${myopts} --disable-perl"
-	use python \
-		&& myopts="${myopts} --enable-python" \
-                || myopts="${myopts} --disable-python"
-	use tcltk \
-		&& myopts="${myopts} --enable-tcl" \
-                || myopts="${myopts} --disable-tcl"
-	use mmx	\
-		&& myopts="${myopts} --enable-mmx" \
-		|| myopts="${myopts} --disable-mmx"
-	use ipv6 \
-		&& myopts="${myopts} --enable-ipv6" \
-		|| myopts="${myopts} --disable-ipv6"
-
-	econf \
-		--program-suffix=-2 \
-		${myopts} || die "Configure failed"
-	
-	MAKEOPTS="-j1" emake || die "Compile failed"
-}
-
-src_install() {
-	# some magic to create a menu entry for xchat 2	
-	mv xchat.desktop xchat.desktop.old
-	sed -e "s:Exec=xchat:Exec=xchat-2:" -e "s:Name=XChat IRC:Name=XChat 2 IRC:" xchat.desktop.old > xchat.desktop
-
-	einstall install || die "Install failed"
-
-	# install plugin development header
-	insinto /usr/include/xchat	
-	doins src/common/xchat-plugin.h
-
-	! has_version "<xchat-2" \
-		&& dosym /usr/bin/xchat-2 /usr/bin/xchat
-
-	dodoc AUTHORS COPYING ChangeLog README*
-}
diff --git a/net-irc/xchat/xchat-2.0.2-r2.ebuild b/net-irc/xchat/xchat-2.0.2-r2.ebuild
index b0dcb83c5ea9..d9b197ff450a 100644
--- a/net-irc/xchat/xchat-2.0.2-r2.ebuild
+++ b/net-irc/xchat/xchat-2.0.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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-2.0.2-r2.ebuild,v 1.1 2003/05/26 09:26:06 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.2-r2.ebuild,v 1.2 2003/06/08 13:22:56 foser Exp $
 
 IUSE="perl tcltk python ssl gtk mmx ipv6" 
 
@@ -12,12 +12,12 @@ HOMEPAGE="http://www.xchat.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
 RDEPEND=">=dev-libs/glib-2.0.3
-	>=x11-libs/gtk+-2.0.3
-	perl?   ( >=dev-lang/perl-5.6.1 )
-	ssl?	( >=dev-libs/openssl-0.9.6d ) 
+	gtk? ( >=x11-libs/gtk+-2.0.3 )
+	perl? ( >=dev-lang/perl-5.6.1 )
+	ssl? ( >=dev-libs/openssl-0.9.6d ) 
 	python? ( dev-lang/python )
 	tcltk? ( dev-lang/tcl )"               
 
@@ -64,7 +64,7 @@ src_compile() {
 
 src_install() {
 	# some magic to create a menu entry for xchat 2	
-	mv xchat.desktop xchat.desktop.old
+	mv xchat.desktop xchat.desktop.old \
 	sed -e "s:Exec=xchat:Exec=xchat-2:" -e "s:Name=XChat IRC:Name=XChat 2 IRC:" xchat.desktop.old > xchat.desktop
 
 	einstall install || die "Install failed"
@@ -73,8 +73,5 @@ src_install() {
 	insinto /usr/include/xchat	
 	doins src/common/xchat-plugin.h
 
-	! has_version "<xchat-2" \
-		&& dosym /usr/bin/xchat-2 /usr/bin/xchat
-
 	dodoc AUTHORS COPYING ChangeLog README*
 }
diff --git a/net-irc/xchat/xchat-2.0.2.ebuild b/net-irc/xchat/xchat-2.0.2.ebuild
deleted file mode 100644
index 1f4475f17a55..000000000000
--- a/net-irc/xchat/xchat-2.0.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2003 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-2.0.2.ebuild,v 1.1 2003/04/22 01:52:33 avenj Exp $
-
-IUSE="perl tcltk python ssl gtk mmx ipv6" 
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="X-Chat is a graphical IRC client for UNIX operating systems."
-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.3
-	>=x11-libs/gtk+-2.0.3
-	perl?   ( >=dev-lang/perl-5.6.1 )
-	ssl?	( >=dev-libs/openssl-0.9.6d ) 
-	python? ( dev-lang/python )
-	tcltk? ( dev-lang/tcl )"               
-
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.10.38 )"
-
-src_compile() {
-	local myopts
-
-	use gtk \
-		&& myopts="${myopts} --enable-gtkfe" \
-		|| myopts="${myopts} --disable-gtkfe"
-	use ssl \
-		&& myopts="${myopts} --enable-openssl" \
-		|| myopts="${myopts} --disable-openssl"
-	use perl \
-		&& myopts="${myopts} --enable-perl" \
-		|| myopts="${myopts} --disable-perl"
-	use python \
-		&& myopts="${myopts} --enable-python" \
-                || myopts="${myopts} --disable-python"
-	use tcltk \
-		&& myopts="${myopts} --enable-tcl" \
-                || myopts="${myopts} --disable-tcl"
-	use mmx	\
-		&& myopts="${myopts} --enable-mmx" \
-		|| myopts="${myopts} --disable-mmx"
-	use ipv6 \
-		&& myopts="${myopts} --enable-ipv6" \
-		|| myopts="${myopts} --disable-ipv6"
-
-	econf \
-		--program-suffix=-2 \
-		${myopts} || die "Configure failed"
-	
-	MAKEOPTS="-j1" emake || die "Compile failed"
-}
-
-src_install() {
-	# some magic to create a menu entry for xchat 2	
-	mv xchat.desktop xchat.desktop.old
-	sed -e "s:Exec=xchat:Exec=xchat-2:" -e "s:Name=XChat IRC:Name=XChat 2 IRC:" xchat.desktop.old > xchat.desktop
-
-	einstall install || die "Install failed"
-
-	! has_version "<xchat-2" \
-		&& dosym /usr/bin/xchat-2 /usr/bin/xchat
-
-	dodoc AUTHORS COPYING ChangeLog README*
-}