amd64 stable wrt #274070

Package-Manager: portage-2.2_rc58/cvs/Linux x86_64

8 files changed, 8 insertions, 465 deletions

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index 80d1ad462e33..f181e4a4003b 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/licq
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.109 2009/10/26 11:49:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.110 2009/12/11 15:11:08 ssuominen Exp $
+
+  11 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> licq-1.3.6.ebuild:
+  amd64 stable wrt #274070
 
 *licq-1.3.7 (26 Oct 2009)
 
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index b9928a1e940c..177611556a02 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -1,13 +1,7 @@
-AUX 1.3.0-suse_bool.patch 191 RMD160 0b8b913f192328485f213c9d7cf12575158c4584 SHA1 4112dd355aea01b9c5c8f89d9ed2681eb616c4d7 SHA256 e061f929c965d28724cc2ff5ad7a859035331e24c52f8fd9cd2c73a07d32898a
-AUX licq-1.3.5-gcc43.patch 3640 RMD160 9ab77b228e9426082d8015f452c9f25e46548b4c SHA1 ea20203897d26f9c842fa6fc648b9ce5db5c4b8b SHA256 4acd8891b02ce496176a4724d193fbf07330bc6ca40834a00ccfd0f2ea3b70dc
-AUX licq-1.3.5-logonfix.patch 451 RMD160 c951b408e545e0aac009830061a93c614d19aeb7 SHA1 0a1d2ecab14d8f453727dbe47ad01b1c6021c9b9 SHA256 7b64b67852392278efa6ff081033fe16efe261da9093606e69799bfdfe249b5a
-AUX licq-1.3.5-prevent-dos.patch 3874 RMD160 e85cf207499c032c68d15b08ae7cd8c9ec418a9b SHA1 ed7e73bc1aae4418d7e3abe74e8b6179c1297229 SHA256 d6b83ff13c0e30f11226ffdedf2511c28a7a48abffc0326c72563f01cc48154a
 AUX licq-1.3.6-glibc-2.10.patch 6864 RMD160 807108dcaaec5dfa3cbee446c3a4967bd1189194 SHA1 48014f3e1ede20b7b3e90c0f8e8e610f8ea5517a SHA256 70131d3a3cc6c4b3d3a87c05465ab0b946458d5de03ea5bcd46728dbbf78e211
-DIST licq-1.3.5.tar.bz2 3260471 RMD160 4442f6cb3630d8300e5f128617a522bd2cb863dc SHA1 a1059173f36694e6e5ec9ba62ced6e9738807916 SHA256 ca6692026e87459082b33ebb6480cc5c600001c93e1d9e2bbde65f3cf2238d3e
 DIST licq-1.3.6.tar.bz2 4777777 RMD160 0d626640e02c9991309d6f7c32725cd1d5bdfa37 SHA1 1451da41c82b9a13424c96d8641e642895b723ac SHA256 ad6ea66301923e5d106111a6b4654aaa72131d8b5c499d16dc9fbbc8cd29845e
 DIST licq-1.3.7.tar.bz2 4713892 RMD160 c76bd2e6291157a5969b7f1877c44fd9c041d5ca SHA1 7e7d4e81defb2a175914fda3292b4dbb1f1e70c7 SHA256 a111fdbe05b7aa5e3afece253d24c3e2a8d61ca421c32b6c2ef44752f056ee45
-EBUILD licq-1.3.5-r1.ebuild 5168 RMD160 017f47c03609244ffe02620f7f411a7fa6771c44 SHA1 a6b1cc95dee2a7fc7e81abf9725318d8eb56c8b6 SHA256 7b56c81a073e12034f114416062a0d8f0938c5dc3d949e345c73e17d477fcb03
-EBUILD licq-1.3.6.ebuild 3173 RMD160 e533a49dd53d669a9b4720a857e75f4301f8f568 SHA1 0a3d272ff39b4f364368ab200f9c4284cae7bc02 SHA256 f7e953d9b4333d6687f53ad3443739525f6c3f5f1350777ad8c98ab1a21e78bd
+EBUILD licq-1.3.6.ebuild 3175 RMD160 adfcca3470a535675cb598dba079370d4ab5cb12 SHA1 3adc62fc35b1b68b25e130717959fa049720afb6 SHA256 cab4d059b9543b3a9a6b7d25ce80f330a76c2ad3d70d377f489425305a1f4c2e
 EBUILD licq-1.3.7.ebuild 3179 RMD160 44a71156c1fb15886a5bd11fb34e78c67387de1a SHA1 b79dfa35a0d537c30180950a0d685b1edb3bcd2a SHA256 6ace542c1d65057f490b00bdcda776a167ad89f7ad5fba265fb423a7905b0364
-MISC ChangeLog 16784 RMD160 77ae1473be61e832a635b5db6c111ed219385d53 SHA1 2950559c6e0da9376c23ce718faeb628023b06fa SHA256 72674da2240e12ad3c02a0ef7f613ddb556b468408fd817bac3281c221ff9609
+MISC ChangeLog 16887 RMD160 e630d9c1b19ac3be8d4e53ce9c0c4f0161591a6c SHA1 04b7a3b409c105b97ec140c8069ee6941549c97f SHA256 27a9512918ede850be5c1c1da7dcd55c21baf84502a4d38098c035b8f8418c56
 MISC metadata.xml 249 RMD160 09f64f681d0dd11fd8a5784ae17b7eaaa87cc12f SHA1 936e8c76314d77517317065331498434f2c59674 SHA256 bfa15ab9faf7742a9f33d2ba72410a089690beb639884f357b135951cd663230
diff --git a/net-im/licq/files/1.3.0-suse_bool.patch b/net-im/licq/files/1.3.0-suse_bool.patch
deleted file mode 100644
index e9d952eb66a5..000000000000
--- a/net-im/licq/files/1.3.0-suse_bool.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/console/src/console.h
-+++ plugins/console/src/console.h
-@@ -10,6 +10,8 @@
- #include "window.h"
- #include "licq_user.h"
- 
-+#undef bool
-+
- using namespace std;
- 
- #define MAX_CON 8
diff --git a/net-im/licq/files/licq-1.3.5-gcc43.patch b/net-im/licq/files/licq-1.3.5-gcc43.patch
deleted file mode 100644
index fa064cf5c4a3..000000000000
--- a/net-im/licq/files/licq-1.3.5-gcc43.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-Source: Anders Olofsson, zimous, Peter Alfredsen, maybe others too.
-Upstream: Probably fixed in next release.
-Reason: gcc-4.3 and glibc-2.8 errors, bugs #218814 and #228373
-diff -NrU5 licq-1.3.5.orig/plugins/auto-reply/configure.ac licq-1.3.5/plugins/auto-reply/configure.ac
---- licq-1.3.5.orig/plugins/auto-reply/configure.ac	2008-06-21 14:49:20.000000000 +0200
-+++ licq-1.3.5/plugins/auto-reply/configure.ac	2008-06-21 14:52:18.000000000 +0200
-@@ -44,11 +44,11 @@
- 
- dnl Switch to C++ mode and check for needed C++ headers
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- 
--AC_CHECK_HEADER(vector.h,,
-+AC_CHECK_HEADER(vector,,
-   AC_MSG_ERROR(You need to have the libstdc++ headers installed))
- 
- AC_LANG_RESTORE
- 
- AC_OUTPUT(
-diff -NrU5 licq-1.3.5.orig/plugins/auto-reply/src/autoreply.cpp licq-1.3.5/plugins/auto-reply/src/autoreply.cpp
---- licq-1.3.5.orig/plugins/auto-reply/src/autoreply.cpp	2008-06-21 14:49:20.000000000 +0200
-+++ licq-1.3.5/plugins/auto-reply/src/autoreply.cpp	2008-06-21 14:52:18.000000000 +0200
-@@ -10,10 +10,11 @@
- #include <ctype.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/wait.h>
- #include <signal.h>
-+#include <climits>
- #ifdef HAVE_ERRNO_H
- #include <errno.h>
- #else
- extern int errno;
- #endif
-diff -NrU5 licq-1.3.5.orig/plugins/email/configure.ac licq-1.3.5/plugins/email/configure.ac
---- licq-1.3.5.orig/plugins/email/configure.ac	2008-06-21 14:49:20.000000000 +0200
-+++ licq-1.3.5/plugins/email/configure.ac	2008-06-21 14:52:18.000000000 +0200
-@@ -46,11 +46,11 @@
- 
- dnl Switch to C++ mode and check for needed C++ headers
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- 
--AC_CHECK_HEADER(vector.h,,
-+AC_CHECK_HEADER(vector,,
-   AC_MSG_ERROR(You need to have the libstdc++ headers installed))
- 
- AC_LANG_RESTORE
- 
- AC_OUTPUT(
-diff -NrU5 licq-1.3.5.orig/plugins/email/src/forwarder.cpp licq-1.3.5/plugins/email/src/forwarder.cpp
---- licq-1.3.5.orig/plugins/email/src/forwarder.cpp	2008-06-21 14:49:20.000000000 +0200
-+++ licq-1.3.5/plugins/email/src/forwarder.cpp	2008-06-21 15:17:53.000000000 +0200
-@@ -7,10 +7,11 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <string.h>
- #include <ctype.h>
- #include <stdio.h>
-+#include <climits>
- #ifdef HAVE_ERRNO_H
- #include <errno.h>
- #else
- extern int errno;
- #endif
-diff -NrU5 licq-1.3.5.orig/plugins/msn/configure.ac licq-1.3.5/plugins/msn/configure.ac
---- licq-1.3.5.orig/plugins/msn/configure.ac	2008-06-21 14:49:20.000000000 +0200
-+++ licq-1.3.5/plugins/msn/configure.ac	2008-06-21 14:52:18.000000000 +0200
-@@ -51,11 +51,11 @@
- 
- dnl Switch to C++ mode and check for needed C++ headers
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- 
--AC_CHECK_HEADER(vector.h,,
-+AC_CHECK_HEADER(vector,,
-   AC_MSG_ERROR(You need to have the libstdc++ headers installed))
- 
- AC_LANG_RESTORE
- 
- msn_gcc_major_version=0
-diff -NrU5 licq-1.3.5.orig/plugins/rms/src/rms.cpp licq-1.3.5/plugins/rms/src/rms.cpp
---- licq-1.3.5.orig/plugins/rms/src/rms.cpp	2008-06-21 14:49:20.000000000 +0200
-+++ licq-1.3.5/plugins/rms/src/rms.cpp	2008-06-21 15:08:27.000000000 +0200
-@@ -7,10 +7,11 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <string.h>
- #include <ctype.h>
- #include <stdio.h>
-+#include <climits>
- #ifdef HAVE_ERRNO_H
- #include <errno.h>
- #else
- extern int errno;
- #endif
-diff -NrU5 licq-1.3.5.orig/src/fifo.cpp licq-1.3.5/src/fifo.cpp
---- licq-1.3.5.orig/src/fifo.cpp	2008-06-21 14:49:20.000000000 +0200
-+++ licq-1.3.5/src/fifo.cpp	2008-06-21 14:52:18.000000000 +0200
-@@ -28,10 +28,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <ctype.h>
-+#include <climits>
- #include "time-fix.h"
- 
- #ifdef HAVE_ERRNO_H
- #include <errno.h>
- #else
diff --git a/net-im/licq/files/licq-1.3.5-logonfix.patch b/net-im/licq/files/licq-1.3.5-logonfix.patch
deleted file mode 100644
index bf8cbaa95eb0..000000000000
--- a/net-im/licq/files/licq-1.3.5-logonfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: Upstream homepage, already applied.
-Reason: Can't login after protocol change, bug #230387
---- src/icqpacket.cpp
-+++ src/icqpacket.cpp
-@@ -821,7 +821,7 @@
- 
-   // Static versioning
-   buffer->PackUnsignedLongBE(0x00160002);
--  buffer->PackUnsignedShortBE(0x010A);
-+  buffer->PackUnsignedShortBE(0x010B);
-   // Client version major (4 == ICQ2000, 5 == ICQ2001)
-   buffer->PackUnsignedLongBE(0x00170002);
-   buffer->PackUnsignedShortBE(0x0014);
diff --git a/net-im/licq/files/licq-1.3.5-prevent-dos.patch b/net-im/licq/files/licq-1.3.5-prevent-dos.patch
deleted file mode 100644
index aa4e36731ed7..000000000000
--- a/net-im/licq/files/licq-1.3.5-prevent-dos.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-Source: http://www.licq.org/changeset/6146
-Reason: DoS via large number of connections, bug #219708
---- a/trunk/licq/include/licq_socket.h
-+++ b/trunk/licq/include/licq_socket.h
-@@ -251,4 +251,5 @@
-   fd_set SocketSet()   {  return m_sSockets.SocketSet(); }
-   int LargestSocket()  {  return m_sSockets.Largest(); }
-+  unsigned short Num() {  return m_sSockets.Num(); }
- 
- protected:
---- a/trunk/licq/src/socket.cpp
-+++ b/trunk/licq/src/socket.cpp
-@@ -818,6 +818,24 @@
-   socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
- 
--  newSocket.m_nDescriptor = accept(m_nDescriptor, (struct sockaddr *)&newSocket.m_sRemoteAddr, &sizeofSockaddr);
--  newSocket.SetLocalAddress();
-+  // Make sure we stay under FD_SETSIZE
-+  // See:
-+  // * http://www.securityfocus.com/archive/1/490711
-+  // * http://securityvulns.com/docs7669.html
-+  // for more details
-+  // This probably has no affect, since we are using multiple threads, but keep it here 
-+  // to be used as a sanity check.
-+  int newDesc = accept(m_nDescriptor, (struct sockaddr *)&newSocket.m_sRemoteAddr, &sizeofSockaddr);
-+  if (newDesc < FD_SETSIZE)
-+  {
-+    newSocket.m_nDescriptor = newDesc;
-+    newSocket.SetLocalAddress();
-+  }
-+  else
-+  {
-+    gLog.Error(tr("%sCannot accept new connection, too many descriptors in use.\n"), L_ERRORxSTR);
-+    close(newDesc);
-+
-+    // TODO throw an exception, or do something to tell the caller it failed
-+  }
- }
- 
---- a/trunk/licq/src/icqd-threads.cpp
-+++ b/trunk/licq/src/icqd-threads.cpp
-@@ -24,4 +24,5 @@
- #include "gettext.h"
- 
-+#define MAX_CONNECTS  256
- #define DEBUG_THREADS(x)
- //#define DEBUG_THREADS(x) gLog.Info(x)
-@@ -781,6 +782,19 @@
-               tcp->RecvConnection(*newSocket);
-               gSocketManager.DropSocket(tcp);
--              gSocketManager.AddSocket(newSocket);
--              gSocketManager.DropSocket(newSocket);
-+
-+              // Make sure we can handle another socket before accepting it
-+              if (gSocketManager.Num() > MAX_CONNECTS)
-+              {
-+                // Too many sockets, drop this one
-+                char remoteIp[32];
-+                gLog.Warn(tr("%sToo many connected sockets, rejecting connection from %s.\n"),
-+                    L_WARNxSTR, newSocket->RemoteIpStr(remoteIp));
-+                delete newSocket;
-+              }
-+              else
-+              {
-+                gSocketManager.AddSocket(newSocket);
-+                gSocketManager.DropSocket(newSocket);
-+              }
-             }
-           }
---- a/trunk/licq/src/icqd-chat.cpp
-+++ b/trunk/licq/src/icqd-chat.cpp
-@@ -24,4 +24,5 @@
- #include "gettext.h"
- 
-+#define MAX_CONNECTS  256
- #define DEBUG_THREADS(x)
- 
-@@ -2384,14 +2385,22 @@
-         else if (nCurrentSocket == chatman->chatServer.Descriptor())
-         {
--          CChatUser *u = new CChatUser;
--          u->m_pClient = new CChatClient;
--
--          chatman->chatServer.RecvConnection(u->sock);
--          chatman->sockman.AddSocket(&u->sock);
--          chatman->sockman.DropSocket(&u->sock);
--
--          u->state = CHAT_STATE_HANDSHAKE;
--          chatman->chatUsers.push_back(u);
--          gLog.Info(tr("%sChat: Received connection.\n"), L_TCPxSTR);
-+          if (chatman->sockman.Num() >= MAX_CONNECTS)
-+          {
-+            // Too many sockets, drop this one
-+            gLog.Warn(tr("%sToo many connected clients, rejecting new connection.\n"), L_WARNxSTR);
-+          }
-+          else
-+          {
-+            CChatUser *u = new CChatUser;
-+            u->m_pClient = new CChatClient;
-+
-+            chatman->chatServer.RecvConnection(u->sock);
-+            chatman->sockman.AddSocket(&u->sock);
-+            chatman->sockman.DropSocket(&u->sock);
-+
-+            u->state = CHAT_STATE_HANDSHAKE;
-+            chatman->chatUsers.push_back(u);
-+            gLog.Info(tr("%sChat: Received connection.\n"), L_TCPxSTR);
-+          }
-         }
- 
-
diff --git a/net-im/licq/licq-1.3.5-r1.ebuild b/net-im/licq/licq-1.3.5-r1.ebuild
deleted file mode 100644
index cdb147b1480b..000000000000
--- a/net-im/licq/licq-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# 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.7 2009/05/31 11:05:13 scarabeus Exp $
-
-EAPI="1"
-WANT_AUTOMAKE=1.9
-
-inherit autotools eutils kde-functions multilib
-
-DESCRIPTION="ICQ Client with v8 support"
-HOMEPAGE="http://www.licq.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
-IUSE="ssl socks5 qt3 kde ncurses crypt msn debug"
-
-# we can't have conditional dependencies so "use kde && inherit kde"
-# won't work -- messes up dep caching.
-
-# 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: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 )
-	crypt? ( >=app-crypt/gpgme-1.0.0 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-logonfix.patch
-	epatch "${FILESDIR}"/${P}-prevent-dos.patch
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-
-	use ncurses && epatch "${FILESDIR}"/1.3.0-suse_bool.patch
-
-	if use kde
-	then
-		# fix for #12436
-		ebegin "Setting kde plugin as default"
-		cp "${S}"/src/licq.conf.h "${T}"
-		sed "s:Plugin1 = qt-gui:Plugin1 = kde-gui:" \
-			"${T}"/licq.conf.h > "${S}"/src/licq.conf.h
-		eend $?
-	else
-		if ! use qt3
-		then
-			ebegin "Setting console plugin as default..."
-			cp "${S}"/src/licq.conf.h "${T}"
-			sed "s:Plugin1 = qt-gui:Plugin1 = console:" \
-				"${T}"/licq.conf.h > "${S}"/src/licq.conf.h
-			eend $?
-		fi
-	fi
-
-	# Install plugins in the correct libdir
-	sed -i -e "s:lib/licq/:$(get_libdir)/licq/:" \
-		"${S}"/include/licq_constants.h || die "sed failed"
-	sed -i -e 's:$(prefix)/lib:@libdir@:' \
-		"${S}"/plugins/*/src/Makefile.{in,am} || die "sed failed"
-
-	#Autoconf >=2.62 and libtool >2 requires this. Sigh.
-	rm -f $(find . -name 'acinclude.m4')
-	cp admin/acinclude.m4{.in,}
-	cp acinclude.m4{.in,}
-	AT_M4DIR="admin" eautoreconf
-
-	AT_M4DIR="../../admin"
-	for plugin in auto-reply console email msn rms; do
-		cd "${S}"/plugins/${plugin}
-		cp acinclude.m4{.in,} || die "acinclude not found"
-		eautoreconf
-	done
-	cd "${S}"/plugins/qt-gui
-	cp acinclude.m4{.in,} || die "acinclude not found"
-	eaclocal
-	eautomake
-	perl am_edit {src/,share/,po/}Makefile.in
-	eautoconf
-}
-
-src_compile() {
-	local myconf
-	use ssl     || myconf="${myconf} --disable-openssl"
-	use socks5  && myconf="${myconf} --enable-socks5"
-	use debug   && myconf="${myconf} --enable-debug"
-
-	myconf="${myconf} $(use_enable crypt gpgme)"
-
-	cd "${S}"
-
-	# bug #21009
-	find . -name 'configure' -exec sed -e "s:sed 's/-g:sed 's/^-g:" -i {} \;
-
-	econf ${myconf} || die "econf failed"
-
-	use crypt && {
-		# workaround for gpgme's headers inclusion path
-		sed \
-			-e "s:FAULT_INCLUDES =:FAULT_INCLUDES = -I/usr/include/gpgme:" \
-			-i "${S}"/src/Makefile
-	}
-
-	emake || die "emake failed"
-
-	# Create the various plug-ins
-
-	# First, the Qt plug-in
-	if use qt3
-	then
-		set-qtdir 3
-		set-kdedir 3
-
-		use kde && myconf="${myconf} --with-kde"
-
-		# Problems finding qt on multilib systems
-		myconf="${myconf} --with-qt-libraries=${QTDIR}/$(get_libdir)"
-
-		# note! watch the --prefix=/usr placement;
-		# licq itself installs into /usr, but the
-		# optional kde/qt interface (to which second_conf belogns)
-		# installs its files in $KDE3DIR/{lib,share}/licq
-
-		cd "${S}"/plugins/qt-gui
-		einfo "Compiling Qt GUI plug-in"
-		econf ${myconf} || die
-		emake || die
-	fi
-
-	# Now the console plug-in
-	if use ncurses
-	then
-		cd "${S}"/plugins/console
-		einfo "Compiling the Console plug-in"
-		econf || die
-		emake || die
-	fi
-
-	for plugin in auto-reply rms msn email ; do
-		cd "${S}"/plugins/${plugin}
-		einfo "Compiling '${plugin}' plug-in"
-		econf || die "econf failed for ${plugin} plugin"
-		emake || die "emake failed for ${plugin} plugin"
-	done
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ChangeLog INSTALL README* doc/*
-
-	# Install the plug-ins
-	if use qt3
-	then
-		cd "${S}"/plugins/qt-gui
-		emake DESTDIR="${D}" install || die
-		docinto plugins/qt-gui
-		dodoc README*
-
-	fi
-
-	if use ncurses
-	then
-		cd "${S}"/plugins/console
-		emake DESTDIR="${D}" install || die
-		docinto plugins/console
-		dodoc README
-	fi
-
-	if use msn
-	then
-		cd "${S}"/plugins/msn
-		make DESTDIR="${D}" install || die
-		docinto plugins/msn
-		dodoc README
-	fi
-
-	cd "${S}"/plugins/auto-reply
-	emake DESTDIR="${D}" install || die
-	docinto plugins/auto-reply
-	dodoc README licq_autoreply.conf
-
-	cd "${S}"/plugins/rms
-	make DESTDIR="${D}" install || die
-	docinto plugins/rms
-	dodoc README licq_rms.conf
-
-	exeinto /usr/share/${PN}/upgrade
-	doexe "${S}"/upgrade/*
-
-	# fixes bug #22136 and #149464
-	rm -fR "${D}"/var
-}
-
-pkg_postinst() {
-	echo
-	ewarn
-	ewarn "If you're upgrading from <=licq-1.3.0 - you have to manually "
-	ewarn "upgrade your existing licq installation. Please backup your "
-	ewarn "settings and look into: /usr/share/licq/upgrade for scripts."
-	ewarn
-	echo
-}
diff --git a/net-im/licq/licq-1.3.6.ebuild b/net-im/licq/licq-1.3.6.ebuild
index 813bf6a129cd..458fe67d18f1 100644
--- a/net-im/licq/licq-1.3.6.ebuild
+++ b/net-im/licq/licq-1.3.6.ebuild
@@ -1,6 +1,6 @@
 # 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.10 2009/09/27 14:09:08 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.6.ebuild,v 1.11 2009/12/11 15:11:08 ssuominen Exp $
 
 EAPI="1"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha ~amd64 ia64 ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE="crypt debug kde msn ncurses nls qt3 qt4 socks5 ssl xosd"
 
 # we use kde as KDE4