8 files changed, 6 insertions, 240 deletions
diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index e7d2ee14e8a8..2c12af319e85 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.248 2007/05/27 08:22:21 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.249 2007/05/28 18:24:42 armin76 Exp $
+
+  28 May 2007; Raúl Porcel <armin76@gentoo.org>
+  -files/xchat-2.6.6-suffix.patch, -files/xc280-fix-back.diff,
+  -files/xc280-fix-ja.diff, -xchat-2.6.6.ebuild, -xchat-2.8.0.ebuild:
+  old
 
   27 May 2007; Joshua Kinard <kumba@gentoo.org> xchat-2.8.2.ebuild:
   Stable on mips.
diff --git a/net-irc/xchat/files/digest-xchat-2.6.6 b/net-irc/xchat/files/digest-xchat-2.6.6
deleted file mode 100644
index 48ad87596305..000000000000
--- a/net-irc/xchat/files/digest-xchat-2.6.6
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 43c187582beb31e744c4c5a833a022b5 xchat-2.6.6.tar.bz2 1098934
-RMD160 27cef034342dc831e2ddb11f8bd5f6cb727e8f93 xchat-2.6.6.tar.bz2 1098934
-SHA256 c4b38d29e6a9872c8ffde27c8866d8c3b9f1fe6e227cef5fed39bc79f983d44c xchat-2.6.6.tar.bz2 1098934
-MD5 c0220456a4df8ee54ae02e7704a6e024 xchat-dccserver-0.6.patch.bz2 49320
-RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 xchat-dccserver-0.6.patch.bz2 49320
-SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f xchat-dccserver-0.6.patch.bz2 49320
diff --git a/net-irc/xchat/files/digest-xchat-2.8.0 b/net-irc/xchat/files/digest-xchat-2.8.0
deleted file mode 100644
index dfa385249197..000000000000
--- a/net-irc/xchat/files/digest-xchat-2.8.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 dddb703d1daf9be7a7bc9461cf11ede7 xchat-2.8.0.tar.bz2 1257232
-RMD160 a65329728c050c5448b2cbab2ea6c68ba72a0c95 xchat-2.8.0.tar.bz2 1257232
-SHA256 f417891d2405980875fd3ce03eb78f8e2ad3ea7354df8b7bb0a2939a55e20906 xchat-2.8.0.tar.bz2 1257232
-MD5 c0220456a4df8ee54ae02e7704a6e024 xchat-dccserver-0.6.patch.bz2 49320
-RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 xchat-dccserver-0.6.patch.bz2 49320
-SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f xchat-dccserver-0.6.patch.bz2 49320
diff --git a/net-irc/xchat/files/xc280-fix-back.diff b/net-irc/xchat/files/xc280-fix-back.diff
deleted file mode 100644
index c63316c83707..000000000000
--- a/net-irc/xchat/files/xc280-fix-back.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Fix: /BACK command not working after upgrading from xchat < 2.8.0
-#
---- xchat-2.8.0/src/common/cfgfiles.c	2 Jan 2007 00:26:40 -0000	1.102
-+++ xchat-2.8.0p1/src/common/cfgfiles.c	3 Jan 2007 14:01:00 -0000
-@@ -45,7 +45,7 @@
- 	int cmd_len = 1, name_len;
- 
- 	/* remove <2.8.0 stuff */
--	if (!strcmp (cmd, "AWAY") & !strcmp (name, "BACK"))
-+	if (!strcmp (cmd, "away") & !strcmp (name, "BACK"))
- 		return;
- 
- 	if (cmd)
diff --git a/net-irc/xchat/files/xc280-fix-ja.diff b/net-irc/xchat/files/xc280-fix-ja.diff
deleted file mode 100644
index 737a5457fcef..000000000000
--- a/net-irc/xchat/files/xc280-fix-ja.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Japanese translation error in 2.6.8 and 2.8.0 causes xchat NOT to run!
-#
---- xchat-2.6.8/po/ja.po	8 Aug 2006 14:39:41 -0000	1.16
-+++ xchat-2.6.8p1/po/ja.po	15 Nov 2006 00:59:59 -0000
-@@ -1082,7 +1176,7 @@
- 
- #: src/common/textevents.h:318
- msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
--msgstr "%C28-%C29$1/Wallops%C28-%O$t$"
-+msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
- 
- #: src/common/textevents.h:321
- #, fuzzy
diff --git a/net-irc/xchat/files/xchat-2.6.6-suffix.patch b/net-irc/xchat/files/xchat-2.6.6-suffix.patch
deleted file mode 100644
index bf5ac2fafcc0..000000000000
--- a/net-irc/xchat/files/xchat-2.6.6-suffix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur xchat-2.6.6.orig/plugins/dbus/xchat-remote.c xchat-2.6.6/plugins/dbus/xchat-remote.c
---- xchat-2.6.6.orig/plugins/dbus/xchat-remote.c	2006-07-15 08:27:21.000000000 +0000
-+++ xchat-2.6.6/plugins/dbus/xchat-remote.c	2006-10-13 14:16:57.801263851 +0000
-@@ -110,7 +110,7 @@
-         if (fork() == 0)
-         {
-           gchar *url = g_strdup_printf ("--url=%s", opt_open_url);
--          execl (PREFIX"/bin/"PACKAGE_TARNAME, PACKAGE_TARNAME, "-a", url, NULL);
-+          execl (PREFIX"/bin/"PACKAGE_TARNAME"-2", PACKAGE_TARNAME"-2", "-a", url, NULL);
-         }
-       } else
-         write_error (_("Failed to complete command"), error);
diff --git a/net-irc/xchat/xchat-2.6.6.ebuild b/net-irc/xchat/xchat-2.6.6.ebuild
deleted file mode 100644
index 7529b743083d..000000000000
--- a/net-irc/xchat/xchat-2.6.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.6.ebuild,v 1.16 2007/05/04 09:38:43 armin76 Exp $
-
-inherit eutils versionator gnome2
-
-DESCRIPTION="Graphical IRC client"
-SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	xchatdccserver? ( mirror://gentoo/${PN}-dccserver-0.6.patch.bz2 )"
-HOMEPAGE="http://www.xchat.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="perl dbus tcl python ssl mmx ipv6 nls spell xchattext xchatnogtk xchatdccserver"
-
-RDEPEND=">=dev-libs/glib-2.6.0
-	!xchatnogtk? ( >=x11-libs/gtk+-2.6.0 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( >=dev-lang/perl-5.6.1 )
-	python? ( >=dev-lang/python-2.2 )
-	tcl? ( dev-lang/tcl )
-	dbus? ( || ( >=dev-libs/dbus-glib-0.71
-			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) ) )
-	spell? ( app-text/enchant )
-	!<net-irc/xchat-gnome-0.9"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.7
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
-	epatch "${FILESDIR}"/xchat-2.6.6-suffix.patch
-
-	# use libdir/xchat/plugins as the plugin directory
-	if [ $(get_libdir) != "lib" ] ; then
-		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
-			"${S}"/configure{,.in} || die
-	fi
-}
-
-src_compile() {
-	# Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org>
-	if [ ${ARCH} = "sparc" ] ; then
-		replace-flags "-O[3-9]" "-O2"
-	fi
-
-	# xchat's configure script uses sys.path to find library path
-	# instead of python-config (#25943)
-	unset PYTHONPATH
-
-	econf \
-		--enable-shm \
-		$(use_enable ssl openssl) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable tcl) \
-		$(use_enable mmx) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_enable dbus) \
-		$(use_enable spell spell static) \
-		$(use_enable xchattext textfe) \
-		$(use_enable !xchatnogtk gtkfe) \
-		--program-suffix=-2 \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# some magic to create a menu entry for xchat 2
-	sed -i \
-		-e "s:^Exec=xchat$:Exec=xchat-2:" \
-		-e "s:Name=XChat IRC:Name=XChat 2 IRC:" \
-		xchat.desktop
-
-	USE_DESTDIR=1 gnome2_src_install || die "make install failed"
-
-	# install plugin development header
-	insinto /usr/include/xchat
-	doins src/common/xchat-plugin.h || die "doins failed"
-
-	dodoc ChangeLog README* || die "dodoc failed"
-}
diff --git a/net-irc/xchat/xchat-2.8.0.ebuild b/net-irc/xchat/xchat-2.8.0.ebuild
deleted file mode 100644
index 5ccd5e6cd0a2..000000000000
--- a/net-irc/xchat/xchat-2.8.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.0.ebuild,v 1.15 2007/05/02 18:12:18 kloeri Exp $
-
-inherit eutils versionator gnome2
-
-DESCRIPTION="Graphical IRC client"
-SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	xchatdccserver? ( mirror://gentoo/${PN}-dccserver-0.6.patch.bz2 )"
-HOMEPAGE="http://www.xchat.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="perl dbus tcl python ssl mmx ipv6 nls spell xchattext xchatnogtk xchatdccserver"
-
-RDEPEND=">=dev-libs/glib-2.6.0
-	!xchatnogtk? ( >=x11-libs/gtk+-2.10.0 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( >=dev-lang/perl-5.6.1 )
-	python? ( >=dev-lang/python-2.2 )
-	tcl? ( dev-lang/tcl )
-	dbus? ( || ( >=dev-libs/dbus-glib-0.71
-			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) ) )
-	spell? ( app-text/enchant )
-	!<net-irc/xchat-gnome-0.9"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.7
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
-
-	epatch "${FILESDIR}"/xc280-fix-back.diff
-	epatch "${FILESDIR}"/xc280-fix-ja.diff
-
-	# use libdir/xchat/plugins as the plugin directory
-	if [ $(get_libdir) != "lib" ] ; then
-		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
-			"${S}"/configure{,.in} || die
-	fi
-}
-
-src_compile() {
-	# Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org>
-	if [[ ${ARCH} = sparc ]] ; then
-		replace-flags "-O[3-9]" "-O2"
-	fi
-
-	# xchat's configure script uses sys.path to find library path
-	# instead of python-config (#25943)
-	unset PYTHONPATH
-
-	econf \
-		--enable-shm \
-		$(use_enable ssl openssl) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable tcl) \
-		$(use_enable mmx) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_enable dbus) \
-		$(use_enable spell spell static) \
-		$(use_enable xchattext textfe) \
-		$(use_enable !xchatnogtk gtkfe) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	USE_DESTDIR=1 gnome2_src_install || die "make install failed"
-
-	# install plugin development header
-	insinto /usr/include/xchat
-	doins src/common/xchat-plugin.h || die "doins failed"
-
-	dodoc ChangeLog README* || die "dodoc failed"
-}
-
-pkg_postinst() {
-	elog
-	elog "XChat binary has been renamed from xchat-2 to xchat."
-	elog
-
-	if has_version net-irc/xchat-systray
-	then
-		elog "XChat now includes it's own systray icon, you may want to remove net-irc/xchat-systray."
-		elog
-	fi
-}