Fix dependencies and cmake install path. Per bugs #268134 and #241396. Remove old patches.

(Portage version: 2.2_rc33/cvs/Linux i686)

9 files changed, 22 insertions, 206 deletions

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index bcebdc4b6a0a..f3e8995e85f9 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/licq
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.100 2008/11/17 20:51:05 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.101 2009/05/31 11:05:13 scarabeus Exp $
+
+  31 May 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/1.2.7-debugflag.patch, -files/1.2.7-nptl.patch,
+  -files/1.3.0-gpgme3_hack.patch, -files/1.3.0-no_stupid_koloboks.patch,
+  -files/1.3.2-email_typo.patch, -files/licq-1.3.2-gcc41.patch,
+  licq-1.3.5-r1.ebuild, licq-1.3.6.ebuild:
+  Fix dependencies and cmake install path. Per bugs #268134 and #241396.
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/licq-1.3.5-prevent-dos.patch:
diff --git a/net-im/licq/files/1.2.7-debugflag.patch b/net-im/licq/files/1.2.7-debugflag.patch
deleted file mode 100644
index f76f278be2e7..000000000000
--- a/net-im/licq/files/1.2.7-debugflag.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure	2003-06-25 13:23:18.000000000 -0400
-+++ configure.new	2003-06-27 05:14:46.000000000 -0400
-@@ -3335,8 +3335,8 @@
- fi;
- 
- if test "$licqdaemon_use_debug" = "no"; then
--  CXXFLAGS="`echo $CXXFLAGS | sed 's/-g[^ ]*//'`"
--  CFLAGS="`echo $CFLAGS | sed 's/-g[^ ]*//'`"
-+  CXXFLAGS="`echo $CXXFLAGS | sed \"s/-g[^ ]*//\"`"
-+  CFLAGS="`echo $CFLAGS | sed \"s/-g[^ ]*//\"`"
- fi
- 
- ac_ext=cc
diff --git a/net-im/licq/files/1.2.7-nptl.patch b/net-im/licq/files/1.2.7-nptl.patch
deleted file mode 100644
index 0308b33bde31..000000000000
--- a/net-im/licq/files/1.2.7-nptl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: configure.in
-===================================================================
-RCS file: /cvsroot/licq/licq/configure.in,v
-retrieving revision 1.63
-diff -u -d -p -r1.63 configure.in
---- configure.in        2 Jul 2003 04:44:47 -0000       1.63
-+++ configure.in        1 Jan 2004 01:46:12 -0000
-@@ -142,6 +142,8 @@ dlopen(NULL, RTLD_NOW)
- 
- AC_CHECK_FUNCS(inet_addr inet_aton mktime select strdup strerror hstrerror readdir_r)
- 
-+AC_CHECK_FUNC(pthread_kill_other_threads_np,[AC_DEFINE([HAVE_PTHREAD_KILL_OTHER_THREADS_NP],
-+[], [we are not using NTPL])])
- AC_CHECK_SOCKS5
- LICQ_CHECK_OPENSSL
- 
-Index: src/sighandler.c
-===================================================================
-RCS file: /cvsroot/licq/licq/src/sighandler.c,v
-retrieving revision 1.5
-diff -u -d -p -r1.5 sighandler.c
---- src/sighandler.c    16 Jun 2003 17:09:46 -0000      1.5
-+++ src/sighandler.c    1 Jan 2004 01:46:12 -0000
-@@ -83,7 +83,10 @@ void licq_handle_sigsegv(int s)
-     fprintf(stderr, "%s\n", res[0]);*/
-   }
-   fprintf(stderr, "Attempting to generate core file.\n");
-+
-+  #ifdef HAVE_PTHREAD_KILL_OTHER_THREADS_NP
-   pthread_kill_other_threads_np();
-+  #endif
- #endif
- 
-   abort();
diff --git a/net-im/licq/files/1.3.0-gpgme3_hack.patch b/net-im/licq/files/1.3.0-gpgme3_hack.patch
deleted file mode 100644
index 996b4169edbd..000000000000
--- a/net-im/licq/files/1.3.0-gpgme3_hack.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure~	2004-08-22 20:10:52.000000000 +0400
-+++ configure	2004-08-22 20:11:10.000000000 +0400
-@@ -6388,7 +6388,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgpgme  $LIBS"
-+LIBS="-lgpgme3  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -6438,7 +6438,7 @@
- echo "${ECHO_T}$ac_cv_lib_gpgme_gpgme_check_version" >&6
- if test $ac_cv_lib_gpgme_gpgme_check_version = yes; then
- 
--                    LIBS="$LIBS -lgpgme"
-+                    LIBS="$LIBS -lgpgme3"
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBGPGME 1
---- include/licq_gpg.h.orig	2004-08-22 22:58:46.660566481 +0400
-+++ include/licq_gpg.h	2004-08-22 22:57:15.460429001 +0400
-@@ -3,7 +3,7 @@
- #define _LICQ_GPG_H_INCLUDED_
- 
- #ifdef HAVE_LIBGPGME
--#include <gpgme.h>
-+#include <gpgme3/gpgme.h>
- #endif
- #include <pthread.h>
- 
diff --git a/net-im/licq/files/1.3.0-no_stupid_koloboks.patch b/net-im/licq/files/1.3.0-no_stupid_koloboks.patch
deleted file mode 100644
index 76ee1be9eb48..000000000000
--- a/net-im/licq/files/1.3.0-no_stupid_koloboks.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -uraN src/mainwin.h src~/mainwin.h
---- src/mainwin.h	2004-09-15 19:14:06.000000000 +0400
-+++ src~/mainwin.h	2004-09-28 19:16:56.485815523 +0400
-@@ -150,6 +150,7 @@
-        m_bAutoPosReplyWin,
-        m_bAutoSendThroughServer,
-        m_bEnableMainwinMouseMovement,
-+       m_bShowKoloboks,
-        m_bPopEmail,
-        m_bPopPhone,
-        m_bPopFax,
-diff -uraN src/mlview3.cpp src~/mlview3.cpp
---- src/mlview3.cpp	2004-01-17 16:18:18.000000000 +0300
-+++ src~/mlview3.cpp	2004-09-28 19:17:53.767142190 +0400
-@@ -83,7 +83,8 @@
-   // not used for html now QString text = QStyleSheet::escape(s);
-   QString text = useHTML ? s: QStyleSheet::escape(s);
- 
--  gMainWindow->emoticons->ParseMessage(text);
-+  if (gMainWindow->m_bShowKoloboks)
-+    gMainWindow->emoticons->ParseMessage(text);
- 
-     // We must hightlight URLs at this step, before we convert
-     // linebreaks to richtext tags and such.  Also, check to make sure
-diff -uraN src/optionsdlg.cpp src~/optionsdlg.cpp
---- src/optionsdlg.cpp	2004-09-06 16:50:56.000000000 +0400
-+++ src~/optionsdlg.cpp	2004-09-28 19:19:38.975690580 +0400
-@@ -216,6 +216,7 @@
-   chkAutoPosReplyWin->setChecked(mainwin->m_bAutoPosReplyWin);
-   chkAutoSendThroughServer->setChecked(mainwin->m_bAutoSendThroughServer);
-   chkEnableMainwinMouseMovement->setChecked(mainwin->m_bEnableMainwinMouseMovement);
-+  chkShowKoloboks->setChecked(mainwin->m_bShowKoloboks);
-   popEmail->setChecked(mainwin->m_bPopEmail);
-   popPhone->setChecked(mainwin->m_bPopPhone);
-   popFax->setChecked(mainwin->m_bPopFax);
-@@ -494,6 +495,7 @@
-   mainwin->m_bAutoPosReplyWin = chkAutoPosReplyWin->isChecked();
-   mainwin->m_bAutoSendThroughServer = chkAutoSendThroughServer->isChecked();
-   mainwin->m_bEnableMainwinMouseMovement = chkEnableMainwinMouseMovement->isChecked();
-+  mainwin->m_bShowKoloboks = chkShowKoloboks->isChecked();
- 
-   mainwin->m_bPopEmail= popEmail->isChecked();
-   mainwin->m_bPopPhone= popPhone->isChecked();
-@@ -768,6 +770,8 @@
-   chkEnableMainwinMouseMovement = new QCheckBox(tr("Allow dragging main window"), boxMainWin);
-   QWhatsThis::add(chkEnableMainwinMouseMovement, tr("Lets you drag around the main window "
-    "with your mouse"));
-+  chkShowKoloboks = new QCheckBox(tr("Show graphical smiles instead of text ones"), boxMainWin);
-+  QWhatsThis::add(chkShowKoloboks, tr("Lets you see only text messages, without any emotional icons"));
- 
-   chkMsgChatView = new QCheckBox(tr("Chatmode Messageview"), boxMainWin);
-   QWhatsThis::add(chkMsgChatView, tr("Show the current chat history in Send Window"));
-diff -uraN src/optionsdlg.h src~/optionsdlg.h
---- src/optionsdlg.h	2004-07-12 05:36:17.000000000 +0400
-+++ src~/optionsdlg.h	2004-09-28 19:19:52.303971975 +0400
-@@ -79,7 +79,8 @@
-              *chkAlwaysShowONU, *chkScrollBar, *chkShowExtIcons,
-              *chkSysBack, *chkSendFromClipboard, *chkMsgChatView, *chkAutoPosReplyWin,
- 	     *chkAutoSendThroughServer, *chkTabbedChatting,
--             *chkEnableMainwinMouseMovement;
-+             *chkEnableMainwinMouseMovement,
-+	     *chkShowKoloboks;
-    QRadioButton *rdbDockDefault, *rdbDockThemed, *rdbDockSmall;
-    QComboBox *cmbDockTheme, *cmbSortBy;
- 
diff --git a/net-im/licq/files/1.3.2-email_typo.patch b/net-im/licq/files/1.3.2-email_typo.patch
deleted file mode 100644
index 07237eb6bd48..000000000000
--- a/net-im/licq/files/1.3.2-email_typo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/email/src/forwarder.cpp	2005-10-21 19:55:08.032358648 +0400
-+++ plugins/email/src/forwarder.cpp	2005-10-21 19:55:13.245566120 +0400
-@@ -373,7 +373,7 @@
-     if (nPPID == LICQ_PPID)
-       sprintf (szFrom, "From: \"%s\" <%s@pager.icq.com>", u->GetAlias(), u->IdString());
-     else
--      sprintf (szFrom, "From: \"%s\" <%s>", u->GeAlias(), u->GetEmailPrimary());
-+      sprintf (szFrom, "From: \"%s\" <%s>", u->GetAlias(), u->GetEmailPrimary());
-     sprintf (szReplyTo, "Reply-To: \"%s %s\" <%s>", u->GetFirstName(), u->GetLastName(), u->GetEmailPrimary());
-   }
-   sprintf (szDate, "Date: %s", ctime(&t));
diff --git a/net-im/licq/files/licq-1.3.2-gcc41.patch b/net-im/licq/files/licq-1.3.2-gcc41.patch
deleted file mode 100644
index 72ae1f7fb20c..000000000000
--- a/net-im/licq/files/licq-1.3.2-gcc41.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur licq-1.3.2-orig/include/licq_buffer.h licq-1.3.2/include/licq_buffer.h
---- licq-1.3.2-orig/include/licq_buffer.h	2006-03-15 00:41:39.000000000 -0500
-+++ licq-1.3.2/include/licq_buffer.h	2006-03-15 00:42:25.000000000 -0500
-@@ -62,7 +62,7 @@
- 
-    char *Pack(CBuffer *);
-    char *Pack(const char *data, int size);
--   char *CBuffer::PackLNTS(const char *);
-+   char *PackLNTS(const char *);
-    char *PackString(const char *data, unsigned short max = 0);
-    char *PackUnsignedShort(unsigned short data);
-    char *PackUnsignedLong(unsigned long data);
-diff -ur licq-1.3.2-orig/include/licq_icqd.h licq-1.3.2/include/licq_icqd.h
---- licq-1.3.2-orig/include/licq_icqd.h	2006-03-15 00:41:39.000000000 -0500
-+++ licq-1.3.2/include/licq_icqd.h	2006-03-15 00:45:49.000000000 -0500
-@@ -837,6 +837,17 @@
-   bool bFinished;
- };
- 
-+//Forward declarations for friend functions
-+void *ProcessRunningEvent_Server_tep(void *p);
-+void *Ping_tep(void *p);
-+void *UpdateUsers_tep(void *p);
-+void *MonitorSockets_tep(void *p);
-+void *ReverseConnectToUser_tep(void *p);
-+void *ProcessRunningEvent_Client_tep(void *p);
-+void *ProcessRunningEvent_Server_tep(void *p);
-+void *Shutdown_tep(void *p);
-+void *ConnectToServer_tep(void *s);
-+
- 
- 
- #endif
-
diff --git a/net-im/licq/licq-1.3.5-r1.ebuild b/net-im/licq/licq-1.3.5-r1.ebuild
index 5236aacf2756..cdb147b1480b 100644
--- a/net-im/licq/licq-1.3.5-r1.ebuild
+++ b/net-im/licq/licq-1.3.5-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.5-r1.ebuild,v 1.6 2008/07/05 16:48:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.5-r1.ebuild,v 1.7 2009/05/31 11:05:13 scarabeus Exp $
 
+EAPI="1"
 WANT_AUTOMAKE=1.9
 
 inherit autotools eutils kde-functions multilib
@@ -21,8 +22,8 @@ IUSE="ssl socks5 qt3 kde ncurses crypt msn debug"
 # need-kde and their eclass friends inject things into DEPEND. But we only
 # want them enabled if the kde USE flag is set. We get around this in the
 # following dep lines:
-RDEPEND="kde? ( >=kde-base/kdelibs-3.0 )"
-DEPEND="kde? ( >=kde-base/kdelibs-3.0 )
+RDEPEND="kde? ( >=kde-base/kdelibs-3.0:3.5 )"
+DEPEND="kde? ( >=kde-base/kdelibs-3.0:3.5 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	qt3? ( =x11-libs/qt-3* )
 	ncurses? ( sys-libs/ncurses >=dev-libs/cdk-4.9.11.20031210-r1 )
diff --git a/net-im/licq/licq-1.3.6.ebuild b/net-im/licq/licq-1.3.6.ebuild
index a536f98284ac..40fa3f700db2 100644
--- a/net-im/licq/licq-1.3.6.ebuild
+++ b/net-im/licq/licq-1.3.6.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.6.ebuild,v 1.2 2008/11/03 16:40:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.6.ebuild,v 1.3 2009/05/31 11:05:13 scarabeus Exp $
 
 EAPI="1"
 
-inherit eutils kde-functions multilib
+CMAKE_USE_DIR="${S}/plugins/qt4-gui"
+inherit eutils kde-functions multilib cmake-utils
 
 DESCRIPTION="ICQ Client with v8 support"
 HOMEPAGE="http://www.licq.org/"
@@ -23,12 +24,11 @@ RDEPEND="kde? (
 	qt3? ( x11-libs/qt:3 )
 	qt4? ( x11-libs/qt-gui:4 )
 	nls? ( sys-devel/gettext )
-	ncurses? ( sys-libs/ncurses =dev-libs/cdk-5* )
+	ncurses? ( sys-libs/ncurses dev-libs/cdk )
 	crypt? ( app-crypt/gpgme:1 )
 	xosd? ( x11-libs/xosd )"
 DEPEND="${RDEPEND}
-	dev-libs/boost
-	qt4? ( >=dev-util/cmake-2.6.2 )"
+	dev-libs/boost"
 
 _generate_plugins_directories() {
 	PLUGINS="auto-reply email rms"
@@ -73,19 +73,16 @@ src_compile() {
 	done
 	# we like qt4 it uses cmake
 	if use qt4; then
-		cd "${S}"/plugins/qt4-gui
 		einfo "Compiling Licq: \"qt4-gui\"."
 		# Possible error because of one tiny issue we introduce in kde
 		# it is called kdeprefix and in that case you can't be sure where it
 		# find kde stuff. This is working only for -kdeprefix so someone will
 		# need to fix this later
-		myconf2="-DCMAKE_INSTALL_PREFIX=/usr"
 		# kde not yet workie
 		# use kde && myconf2="${myconf2} -DWITH_KDE=1"
 		use kde && ewarn "Sorry but kde4 support is duped and not working so not
 		enabling for now"
-		cmake . ${myconf2} || die "cmake failed"
-		emake || die "emake failed"
+		cmake-utils_src_compile
 	fi
 }
 
@@ -102,9 +99,8 @@ src_install() {
 		dodoc README* *.conf
 	done
 	if use qt4; then
-		cd "${S}"/plugins/qt4-gui
 		einfo "Installing Licq: \"qt4-gui\"."
-		emake DESTDIR="${D}" install || die
+		cmake-utils_src_install
 		docinto plugins/qt4-gui
 		dodoc doc/README*
 	fi