New version

4 files changed, 32 insertions, 20 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 6484d919c95a..b4fb3c42dd02 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,7 +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.25 2002/11/02 20:11:47 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.26 2002/11/05 15:44:57 foser Exp $
 
+*xchat-1.9.4 (05 Nov 2002)
+
+  05 Nov 2002; foser <foser@gentoo.org> xchat-1.9.4.ebuild :
+  New version, moved to slot 2.
+  IMPORTANT : xchat-1.8 should move to slot 1 next revision/release 
+ 
 *xchat-1.9.3-r3.ebuild (02 Nov 2002)
 
   02 Nov 2002; foser <foser@gentoo.org> xchat-1.9.3-r3.ebuild :
diff --git a/net-irc/xchat/files/digest-xchat-1.9.3-r2 b/net-irc/xchat/files/digest-xchat-1.9.3-r2
deleted file mode 100644
index 634374dec87b..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.9.3-r2
+++ /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
new file mode 100644
index 000000000000..7e2dffc2770d
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-1.9.4
@@ -0,0 +1 @@
+MD5 ed0820b35e5a9c7c5860108a1555236f xchat-1.9.4.tar.bz2 700920
diff --git a/net-irc/xchat/xchat-1.9.3-r2.ebuild b/net-irc/xchat/xchat-1.9.4.ebuild
index 4aa7803b4e2d..815deddf3c10 100644
--- a/net-irc/xchat/xchat-1.9.3-r2.ebuild
+++ b/net-irc/xchat/xchat-1.9.4.ebuild
@@ -1,8 +1,8 @@
 # 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-r2.ebuild,v 1.2 2002/11/02 20:11:47 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.9.4.ebuild,v 1.1 2002/11/05 15:44:57 foser Exp $
 
-IUSE="perl gnome ssl gtk python mmx ipv6 nls" 
+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."
@@ -10,7 +10,7 @@ SRC_URI="http://www.xchat.org/files/source/1.9/${P}.tar.bz2"
 HOMEPAGE="http://www.xchat.org/"
 
 LICENSE="GPL-2"
-SLOT="1"
+SLOT="2"
 KEYWORDS="x86 ppc sparc sparc64"
 
 RDEPEND=">=dev-libs/glib-2.0.4
@@ -26,16 +26,6 @@ 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 *
@@ -77,7 +67,9 @@ src_compile() {
 	
 	use ipv6 \
 		&& myopts="${myopts} --enable-ipv6"
-	
+
+
+	[ -n "${DISABLE_XFT}" ] && myopts="${myopts} --disable-xft"
 	
 	econf \
 		--program-suffix=-2 \
@@ -87,15 +79,29 @@ 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; \
+		doins xchat-2.desktop
+	use gnome && insinto /usr/share/gnome/apps/Internet; \
+		doins xchat-2.desktop	
+
+	einstall install || die "Install failed"
 
-	einstall utildir=${D}${KDEDIR}/share/applnk/Internet 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 gnome && 
-	(	insinto /usr/share/gnome/apps/Internet
-		doins xchat.desktop  )
 	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"
+}