non critical patch added

6 files changed, 19 insertions, 138 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 2f090f556042..3e5c76084209 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,8 +1,13 @@
 # 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.29 2002/11/19 22:26:52 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.30 2002/11/21 01:03:07 foser Exp $
 
-*xchat-1.9.5 (19 Nov 2002)
+*xchat-1.9.5-r2 (20 Nov 2002)
+
+  20 Nov 2002; foser <foser@gentoo.org> xchat-1.9.5-r2.ebuild :
+  Added private chat logging patch
+
+*xchat-1.9.5-r1 (19 Nov 2002)
 
   19 Nov 2002; foser <foser@gentoo.org> xchat-1.9.5-r1.ebuild :
   They fixed the plugins, removed the symlinks to make them work again
diff --git a/net-irc/xchat/files/digest-xchat-1.9.3-r3 b/net-irc/xchat/files/digest-xchat-1.9.3-r3
deleted file mode 100644
index 634374dec87b..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.9.3-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7fbb3d96ab4b288343a6d9cf9e597d25 xchat-1.9.3.tar.bz2 701422
diff --git a/net-irc/xchat/files/digest-xchat-1.9.4 b/net-irc/xchat/files/digest-xchat-1.9.4
deleted file mode 100644
index 7e2dffc2770d..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.9.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ed0820b35e5a9c7c5860108a1555236f xchat-1.9.4.tar.bz2 700920
diff --git a/net-irc/xchat/files/digest-xchat-1.9.5-r2 b/net-irc/xchat/files/digest-xchat-1.9.5-r2
new file mode 100644
index 000000000000..73aa3bc57e3e
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-1.9.5-r2
@@ -0,0 +1 @@
+MD5 f737b02e09360b5fee58cff85fee0ce6 xchat-1.9.5.tar.bz2 797336
diff --git a/net-irc/xchat/xchat-1.9.3-r3.ebuild b/net-irc/xchat/xchat-1.9.3-r3.ebuild
deleted file mode 100644
index 53735dbcaba0..000000000000
--- a/net-irc/xchat/xchat-1.9.3-r3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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.3-r3.ebuild,v 1.1 2002/11/02 20:11:47 foser Exp $
-
-IUSE="perl gnome ssl gtk python mmx ipv6 nls" 
-
-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"
-HOMEPAGE="http://www.xchat.org/"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="x86 ppc sparc sparc64"
-
-RDEPEND=">=dev-libs/glib-2.0.4
-	>=x11-libs/gtk+-2.0.5
-	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 )" 
-               
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.10.38 )"
-
-
-src_unpack() {
-	unpack ${A}
-	
-	#fixes a problem with gtk2.1
-	patch -d ${S} -p1 < ${FILESDIR}/${P}-tolowertab.patch
-	#adds tint options to menu; patch by foser <foser@gentoo.org>
-	patch -d ${S} -p1 < ${FILESDIR}/gentoo-${P}-bgtint.patch	
-}
-
-
-# From the xchat 1.9.3 README_FIRST file:
-# (one of the) REMAINING PROBLEMS:
-# * can't compile with gnome, panel and zvt support *
-# stroke 
-
-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
-
-	use gtk \
-		|| myopts="${myopts} --disable-gtkfe"
-	
-	use ssl \
-		&& myopts="${myopts} --enable-openssl"
-
-	use perl \
-		|| myopts="${myopts} --disable-perl"
-
-	use python \
-                || myopts="${myopts} --disable-python"
-
-	use nls \
-		&& myopts="${myopts} --enable-hebrew --enable-japanese-conv" \
-		|| myopts="${myopts} --disable-nls"
-
-	use mmx	\
-		&& myopts="${myopts} --enable-mmx"	\
-		|| myopts="${myopts} --disable-mmx"
-	
-	use ipv6 \
-		&& myopts="${myopts} --enable-ipv6"
-
-
-	[ -n "${DISABLE_XFT}" ] && myopts="${myopts} --disable-xft"
-	
-	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	
-	sed -e "s:Exec=xchat:Exec=xchat-2:" -e "s:Name=X-Chat:Name=X-Chat 2:" xchat.desktop > xchat-2.desktop
-
-	use kde && insinto ${KDEDIR}/share/applnk/Internet \
-		|| insinto /usr/share/gnome/apps/Internet 
-	doins xchat-2.desktop	
-
-	einstall install || die "Install failed"
-
-	# we prefer our own launcher
-	rm ${D}/etc/X11/applnk/Internet/xchat.desktop
-	rmdir -p ${D}/etc/X11/applnk/Internet
-
-	use python &&
-	(	dosym /usr/lib/xchat/plugins/python.so-2 /usr/lib/xchat/plugins/python.so )
-	use perl &&
-	(	dosym /usr/lib/xchat/plugins/perl.so-2 /usr/lib/xchat/plugins/perl.so  )
-
-	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"
-}
diff --git a/net-irc/xchat/xchat-1.9.4.ebuild b/net-irc/xchat/xchat-1.9.5-r2.ebuild
index e512841acdca..48fb0aeb2a77 100644
--- a/net-irc/xchat/xchat-1.9.4.ebuild
+++ b/net-irc/xchat/xchat-1.9.5-r2.ebuild
@@ -1,9 +1,10 @@
 # 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.4.ebuild,v 1.2 2002/11/05 16:31:47 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.9.5-r2.ebuild,v 1.1 2002/11/21 01:03:07 foser Exp $
 
-IUSE="perl gnome ssl gtk python mmx ipv6 nls kde" 
+inherit eutils
 
+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"
@@ -11,7 +12,7 @@ HOMEPAGE="http://www.xchat.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="x86 ppc sparc sparc64"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
 
 RDEPEND=">=dev-libs/glib-2.0.4
 	>=x11-libs/gtk+-2.0.5
@@ -25,12 +26,16 @@ RDEPEND=">=dev-libs/glib-2.0.4
 DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.10.38 )"
 
-
 # From the xchat 1.9.3 README_FIRST file:
 # (one of the) REMAINING PROBLEMS:
 # * can't compile with gnome, panel and zvt support *
 # stroke 
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-private-logging.patch
+}
+
 src_compile() {
 
 	local myopts myflags
@@ -80,23 +85,11 @@ src_compile() {
 
 src_install() {
 	# some magic to create a menu entry for xchat 2	
-	sed -e "s:Exec=xchat:Exec=xchat-2:" -e "s:Name=X-Chat:Name=X-Chat 2:" xchat.desktop > xchat-2.desktop
-
-	use kde && insinto ${KDEDIR}/share/applnk/Internet \
-		|| insinto /usr/share/gnome/apps/Internet
-	doins xchat-2.desktop	
+	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"
 
-	# we prefer our own launcher
-	rm ${D}/etc/X11/applnk/Internet/xchat.desktop
-	rmdir -p ${D}/etc/X11/applnk/Internet
-
-	use python &&
-	(	dosym /usr/lib/xchat/plugins/python.so-2 /usr/lib/xchat/plugins/python.so )
-	use perl &&
-	(	dosym /usr/lib/xchat/plugins/perl.so-2 /usr/lib/xchat/plugins/perl.so  )
-
 	dodoc AUTHORS COPYING ChangeLog README
 }