new revision - fix bug: when gnome is in use, both gtkbitchx and plain bitchx will now be installed.

4 files changed, 30 insertions, 13 deletions

diff --git a/net-irc/bitchx/ChangeLog b/net-irc/bitchx/ChangeLog
index 6da80234f52b..88fabbf88dad 100644
--- a/net-irc/bitchx/ChangeLog
+++ b/net-irc/bitchx/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-irc/bitchx
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.2 2002/02/25 00:43:52 danarmak Exp $
+
+*bitchx-1.0.18-r5 (25 Feb 2002)
+
+  25 Feb 2002; Dan Armak <danarmak@gentoo.org> ChangeLog :
+  
+  Fixed bug #817 - now, when gnome is in use both gtkBitchX and plain BitchX
+  are built and installed.
+  
+  Also, fixed case where gtkBitchX would be built even when gnome isn't in use.
 
 *bitchx-1.0.18-r4 (1 Feb 2002)
 
diff --git a/net-irc/bitchx/bitchx-1.0.18-r4.ebuild b/net-irc/bitchx/bitchx-1.0.18-r5.ebuild
index 8534bf521ed7..c47aae953799 100644
--- a/net-irc/bitchx/bitchx-1.0.18-r4.ebuild
+++ b/net-irc/bitchx/bitchx-1.0.18-r5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.0.18-r4.ebuild,v 1.2 2001/10/07 11:11:08 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.0.18-r5.ebuild,v 1.1 2002/02/25 00:43:52 danarmak Exp $
 
 A=ircii-pana-1.0c18.tar.gz
 S=${WORKDIR}/BitchX
@@ -32,20 +32,31 @@ src_compile() {
 		myopts="$myopts --with-ssl"
 	fi
 
-	if [ -n "`use gnome`" ]
-	then
-		myopts="$myopts --with-gtk"
-	fi
 
 	if [ -n "`use esd`" ]
 	then
 		myopts="$myopts --enable-sound"
 	fi
+	
+	if [ -z "`use gnome`" ]
+	then
+	    myopts="$myopts --without-gtk"
+	fi
 
 	./configure --prefix=/usr --host=${CHOST} --build=${CHOST}	\
 		    --enable-cdrom --enable-ipv6 --with-plugins 	\
 		    ${myopts} || die
 	emake || die
+
+	if [ -n "`use gnome`" ]
+	then
+		myopts="$myopts --with-gtk"
+		./configure --prefix=/usr --host=${CHOST} --build=${CHOST}	\
+		    --enable-cdrom --enable-ipv6 --with-plugins 	\
+		    ${myopts} || die
+		emake || die
+	fi
+
 }
 
 src_install () {
@@ -54,14 +65,11 @@ src_install () {
 
         if [ -n "`use gnome`" ]
 	then
-  		rm -f gtkBitchX
-		dosym /usr/bin/gtkBitchX-1.0c18 /usr/bin/gtkBitchX
-		dosym /usr/bin/gtkBitchX-1.0c18 /usr/bin/bitchX
-	else
-		rm -f BitchX
-		dosym /usr/bin/BitchX-1.0c18 /usr/bin/BitchX
-		dosym /usr/bin/BitchX-1.0c18 /usr/bin/bitchX
+		exeinto /usr/bin
+		newexe ${S}/source/BitchX BitchX-1.0c18
+		dosym gtkBitchX-1.0c18 /usr/bin/gtkBitchX
 	fi
+	dosym BitchX-1.0c18 /usr/bin/BitchX
 
 	chmod -x ${D}/usr/lib/bx/plugins/BitchX.hints
 
diff --git a/net-irc/bitchx/files/bitchx-1.0.18-r4-gentoo.diff b/net-irc/bitchx/files/bitchx-1.0.18-r5-gentoo.diff
index 034b395952d9..034b395952d9 100644
--- a/net-irc/bitchx/files/bitchx-1.0.18-r4-gentoo.diff
+++ b/net-irc/bitchx/files/bitchx-1.0.18-r5-gentoo.diff
diff --git a/net-irc/bitchx/files/digest-bitchx-1.0.18-r4 b/net-irc/bitchx/files/digest-bitchx-1.0.18-r5
index 1caa62171540..1caa62171540 100644
--- a/net-irc/bitchx/files/digest-bitchx-1.0.18-r4
+++ b/net-irc/bitchx/files/digest-bitchx-1.0.18-r5