console gui depends on ncurses USE flag now .. added patch to try other gui plugins too (not only qt&kde)

3 files changed, 56 insertions, 13 deletions

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index df98d047c043..cacdfd180448 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-im/licq
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.15 2003/02/07 12:18:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.16 2003/02/07 13:37:54 lordvan Exp $
 
 *licq-1.2.4-r2 (07 Feb 2003)
 
@@ -14,6 +14,13 @@
   management and auto-respond are built by default now.  Closes bug #15084
   by Bruno Lustosa <bruno@lustosa.net>
 
+  07 Feb 2003; Thomas Raschbacher <lordvan@gentoo.org> licq-1.2.4-r2.ebuild
+  files/licq.cpp-plugins.patch :
+
+  Console plugin only gets installed if ncurses is in USE.
+  Patch for src/licq.cpp to check for gtk and console plugin too if there
+  is no qt or kde plugin.
+
 *licq-1.2.4-r1 (31 Jan 2003)
 
   03 Feb 2003; Seemant Kulleen <seemant@gentoo.org> licq-1.2.4-r1.ebuild :
diff --git a/net-im/licq/files/licq.cpp-plugins.patch b/net-im/licq/files/licq.cpp-plugins.patch
new file mode 100644
index 000000000000..e57ea855a087
--- /dev/null
+++ b/net-im/licq/files/licq.cpp-plugins.patch
@@ -0,0 +1,25 @@
+--- licq.cpp	2003-01-18 02:29:32.000000000 +0100
++++ licq.cpp.patched	2003-02-07 14:29:22.000000000 +0100
+@@ -355,9 +355,19 @@
+     }
+     else  // If no plugins, try qt-gui
+     {
+-      if (LoadPlugin("qt-gui", argc, argv) == NULL)
+-        if (LoadPlugin("kde-gui", argc, argv) == NULL)
+-          return false;
++      if (LoadPlugin("qt-gui", argc, argv) == NULL) {
++				printf("no qt-gui");
++        if (LoadPlugin("kde-gui", argc, argv) == NULL) {
++					printf("no kde-gui");
++					if (LoadPlugin("jons-gtk-gui", argc, argv) == NULL) {
++						printf("no jons-gtk-gui");
++						if (LoadPlugin("console", argc, argv) == NULL) {
++							printf("no console-gui");
++							return false;
++						} //console
++					} // jons-gtk-gui
++				} // kde-gui
++			} // qt-gui
+     }
+   }
+ 
diff --git a/net-im/licq/licq-1.2.4-r2.ebuild b/net-im/licq/licq-1.2.4-r2.ebuild
index 0723a9f83483..b4bf7fef2e63 100644
--- a/net-im/licq/licq-1.2.4-r2.ebuild
+++ b/net-im/licq/licq-1.2.4-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.4-r2.ebuild,v 1.2 2003/02/07 12:06:22 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.4-r2.ebuild,v 1.3 2003/02/07 13:37:54 lordvan Exp $
 
-IUSE="ssl socks5 qt kde"
+IUSE="ssl socks5 qt kde ncurses"
 
 use kde && inherit kde-base
 use kde && need-kde 3.0
@@ -14,7 +14,8 @@ LICENSE="GPL-2"
 DEPEND="${DEPEND}
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	qt?  ( >=x11-libs/qt-3.0.0 )
-	gtk? ( =x11-libs/gtk+-1.2* )"
+	gtk? ( =x11-libs/gtk+-1.2* )
+	ncurses? ( >=sys-libs/ncurses-5.3 )"
 
 SRC_URI="http://download.sourceforge.net/licq/${P}.tar.bz2"
 SLOT="2"
@@ -25,7 +26,11 @@ src_compile() {
 	local first_conf
 	use ssl		|| first_conf="${first_conf} --disable-openssl"
 	use socks5	&& first_conf="${first_conf} --enable-socks5"
-	
+
+	# check for other plugins than qt or kde by default too
+	patch -p0 ${S}/src/licq.cpp < ${FILESDIR}/licq.cpp-plugins.patch
+	einfo "Patched licq.cpp"
+		
 	econf ${first_conf} || die
 	emake || die
 
@@ -65,10 +70,13 @@ src_compile() {
 	fi
 
 	# Now the console plug-in
-	cd ${S}/plugins/console
-	einfo "Compiling the Console plug-in"
-	econf || die
-	emake || die
+	if [ "`use ncurses `" ]
+	then
+	    cd ${S}/plugins/console
+	    einfo "Compiling the Console plug-in"
+	    econf || die
+	    emake || die
+	fi
 
 	# The Auto-Responder plug-in
 	cd ${S}/plugins/auto-reply
@@ -114,10 +122,13 @@ src_install() {
 		dodoc TODO
 	fi
 
-	cd ${S}/plugins/console
-	make DESTDIR=${D} install || die
-	docinto plugins/console
-	dodoc README
+	if [ "`use ncurses`" ]
+	then
+	    cd ${S}/plugins/console
+	    make DESTDIR=${D} install || die
+	    docinto plugins/console
+	    dodoc README
+	fi
 
 
 	cd ${S}/plugins/auto-reply