* bump and cleanups

(Portage version: 2.0.52-r1)

20 files changed, 56 insertions, 1230 deletions

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index 5e8585225fc2..ae595cc4b02d 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-im/licq
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.63 2005/09/05 17:36:13 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.64 2005/10/01 14:58:52 voxus Exp $
+
+*licq-1.3.2_rc1 (01 Oct 2005)
+
+  01 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> -licq-1.3.0-r3.ebuild,
+  -licq-1.3.0-r4.ebuild, -licq-1.3.0-r5.ebuild, -licq-1.3.0-r6.ebuild,
+  -licq-1.3.0-r7.ebuild, -licq-1.3.0-r8.ebuild, -files/1.3.0-koloboks.patch,
+  -files/1.3.0-save_koloboks.patch, -files/1.3.0-include_iconv.patch,
+  -files/1.3.0-msnpacket_sync.patch, -files/1.3.0-missing_chars.patch,
+  +licq-1.3.2_rc1.ebuild:
+  Version bump. CVS snapshots dropped.
 
   05 Sep 2005; Olivier Crête <tester@gentoo.org> metadata.xml:
   Make metadata.xml header say utf-8, bug #104663
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index 51684b6fe7f5..fea407847a41 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -1,38 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7adc6310a4dbd42bad26caa80683d4ec metadata.xml 249
-MD5 57c210d6dbd0e62134450d102b068f1e ChangeLog 10038
 MD5 f30c97a120a37f90edd8abdf612cd52a licq-1.2.7.ebuild 3368
 MD5 f8691d71dd37438ad228897e6e32b908 licq-1.3.0.ebuild 3800
-MD5 33aad642b7982399eceef594de44d7c5 licq-1.3.0-r3.ebuild 4207
-MD5 1e352af319b2d12a468b4f2fd93dd21e licq-1.3.0-r4.ebuild 4420
-MD5 b66e6263d95baca44239d23a900d565e licq-1.3.0-r5.ebuild 4859
-MD5 0279027e445f3bb8dd80ac12b788e1e5 licq-1.3.0-r6.ebuild 4963
-MD5 0ebf34bdd8d7db53a7dbb99eb7f36412 licq-1.3.0-r7.ebuild 5455
-MD5 a6808e47945eee75b9f348efd890d7fd licq-1.3.0-r8.ebuild 5588
-MD5 5f64e4b71c311ff7b6489953fc8bf1f9 files/1.2.7-nptl.patch 1178
-MD5 c18e90be9c36c7efb06211733ad765ff files/1.2.7-debugflag.patch 396
-MD5 b0a924ef22c21dd596d7918631f18559 files/digest-licq-1.3.0 64
+MD5 6d4c75d7a4cf02ff3849c31b9dc6858b licq-1.3.2_rc1.ebuild 4867
+MD5 57c210d6dbd0e62134450d102b068f1e ChangeLog 10038
+MD5 7adc6310a4dbd42bad26caa80683d4ec metadata.xml 249
+MD5 8124caae500e8e705dc712c346268385 files/digest-licq-1.3.2_rc1 67
+MD5 7b47a2f238a265b96a6bec3df10dbc67 files/1.3.0-include_iconv.patch 256
+MD5 4d468b5f66d46b27840fb3ecf788bfbe files/1.3.0-msnpacket_sync.patch 513
 MD5 3795e526fdf015e985be17fca698e2d1 files/digest-licq-1.2.7 64
+MD5 b0a924ef22c21dd596d7918631f18559 files/digest-licq-1.3.0 64
+MD5 d38a9fdc959bde15d9f463c2b288bed6 files/1.3.0-koloboks.patch 2955
+MD5 24bcac53f7df732761fe3519b6581fa2 files/1.3.0-save_koloboks.patch 1033
 MD5 52dadf7b64ef4fb690c7892d94b445d6 files/1.3.0-no_stupid_koloboks.patch 3160
-MD5 5dbb2a47d1d863a55f564e874c871d30 files/1.3.0-gpgme3_hack.patch 878
-MD5 4d468b5f66d46b27840fb3ecf788bfbe files/1.3.0-msnpacket_sync.patch 513
-MD5 2332f809f740f6e4433631eecda3335d files/digest-licq-1.3.0-r3 145
+MD5 c18e90be9c36c7efb06211733ad765ff files/1.2.7-debugflag.patch 396
 MD5 100dc5f1d551dc769a337a71734d0e59 files/1.3.0-suse_bool.patch 191
-MD5 2332f809f740f6e4433631eecda3335d files/digest-licq-1.3.0-r4 145
-MD5 7b47a2f238a265b96a6bec3df10dbc67 files/1.3.0-include_iconv.patch 256
-MD5 d38a9fdc959bde15d9f463c2b288bed6 files/1.3.0-koloboks.patch 2955
+MD5 5f64e4b71c311ff7b6489953fc8bf1f9 files/1.2.7-nptl.patch 1178
+MD5 5dbb2a47d1d863a55f564e874c871d30 files/1.3.0-gpgme3_hack.patch 878
 MD5 7613512e9464951b3c3fbb7983aac70c files/1.3.0-missing_chars.patch 316
-MD5 24bcac53f7df732761fe3519b6581fa2 files/1.3.0-save_koloboks.patch 1033
-MD5 d6d219fd6946088cdcaa8a708cc209d2 files/digest-licq-1.3.0-r5 226
-MD5 d6d219fd6946088cdcaa8a708cc209d2 files/digest-licq-1.3.0-r6 226
-MD5 519f2e13db3610087c70ccc1884c29d4 files/digest-licq-1.3.0-r7 307
-MD5 8ccd59c054d03443f0561e01d406d0a8 files/digest-licq-1.3.0-r8 388
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDHII2mOfEJZHYOKcRAnbuAJ9c01mhZDQwAYo5+LcAuLnAIPddswCffWAv
-XNvB2VlwhKuTbeEUHQNMIrs=
-=awEo
------END PGP SIGNATURE-----
diff --git a/net-im/licq/files/1.3.0-include_iconv.patch b/net-im/licq/files/1.3.0-include_iconv.patch
deleted file mode 100644
index e62430ee00eb..000000000000
--- a/net-im/licq/files/1.3.0-include_iconv.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/translate.cpp	2005-07-14 23:03:29.000000000 +0400
-+++ src/translate.cpp	2005-07-14 23:03:37.000000000 +0400
-@@ -22,6 +22,7 @@
- extern int errno;
- #endif
- #include <string.h>
-+#include <iconv.h>
- 
- #include "licq_translate.h"
- #include "licq_log.h"
diff --git a/net-im/licq/files/1.3.0-koloboks.patch b/net-im/licq/files/1.3.0-koloboks.patch
deleted file mode 100644
index 99337fe4e6a1..000000000000
--- a/net-im/licq/files/1.3.0-koloboks.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/mainwin.h	2005-07-03 14:46:37.500823472 +0400
-+++ src~/mainwin.h	2005-07-03 14:47:49.051946048 +0400
-@@ -137,6 +137,7 @@
-        m_bAutoPosReplyWin,
-        m_bAutoSendThroughServer,
-        m_bEnableMainwinMouseMovement,
-+       m_bShowKoloboks,
-        m_bPopEmail,
-        m_bPopPhone,
-        m_bPopFax,
---- src/mlview3.cpp	2005-07-03 14:46:37.501823320 +0400
-+++ src~/mlview3.cpp	2005-07-03 14:48:38.163479960 +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
---- src/optionsdlg.cpp	2005-07-03 14:46:37.502823168 +0400
-+++ src~/optionsdlg.cpp	2005-07-03 14:50:13.186034336 +0400
-@@ -240,6 +240,7 @@
-   chkFlashTaskbar->setChecked(mainwin->m_bFlashTaskbar);
-   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);
-@@ -533,6 +534,7 @@
-   mainwin->m_bFlashTaskbar = chkFlashTaskbar->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();
-@@ -813,6 +815,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"));
---- src/optionsdlg.h	2005-07-03 14:46:37.502823168 +0400
-+++ src~/optionsdlg.h	2005-07-03 14:50:41.079793840 +0400
-@@ -92,6 +92,7 @@
-              *chkAlwaysShowONU, *chkScrollBar, *chkShowExtIcons,
-              *chkSysBack, *chkSendFromClipboard, *chkMsgChatView, *chkAutoPosReplyWin,
- 	     *chkFlashTaskbar, *chkAutoSendThroughServer, *chkTabbedChatting,
-+	     *chkShowKoloboks,
-              *chkEnableMainwinMouseMovement, *chkShowHistory;
-    QRadioButton *rdbDockDefault, *rdbDockThemed, *rdbDockSmall;
-    QComboBox *cmbDockTheme, *cmbSortBy;
diff --git a/net-im/licq/files/1.3.0-missing_chars.patch b/net-im/licq/files/1.3.0-missing_chars.patch
deleted file mode 100644
index 9c12ffcd6bcb..000000000000
--- a/net-im/licq/files/1.3.0-missing_chars.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/icqpacket.cpp	2005-07-14 23:13:54.000000000 +0400
-+++ src/icqpacket.cpp	2005-07-14 23:15:23.988169456 +0400
-@@ -4385,6 +4385,7 @@
- //  buffer->PackUnsignedShort(0x0021);
-   if (Channel() == ICQ_CHNxNONE)
-   {
-+    buffer->PackUnsignedShort(m_nMsgLen);
-     buffer->Pack(m_szMessage, m_nMsgLen);
-   }
-   else
diff --git a/net-im/licq/files/1.3.0-msnpacket_sync.patch b/net-im/licq/files/1.3.0-msnpacket_sync.patch
deleted file mode 100644
index 33dec5264f5d..000000000000
--- a/net-im/licq/files/1.3.0-msnpacket_sync.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/msn/src/msnpacket.h.orig	2005-03-20 18:48:11.000000000 +0300
-+++ plugins/msn/src/msnpacket.h	2005-03-20 18:48:19.000000000 +0300
-@@ -36,7 +36,7 @@
-   const unsigned short Command() { return 0; }
-   const unsigned short SubSequence() { return 0; }
-   const unsigned short SubCommand() { return 0; }
--  const unsigned long Sequence() { return m_nSequence; }
-+  const unsigned short Sequence() { return m_nSequence; }
-   const char* MSNCommand() { return m_szCommand; }
-   
-   virtual void InitBuffer();
diff --git a/net-im/licq/files/1.3.0-save_koloboks.patch b/net-im/licq/files/1.3.0-save_koloboks.patch
deleted file mode 100644
index 8119c9bfd5b3..000000000000
--- a/net-im/licq/files/1.3.0-save_koloboks.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/mainwin.cpp	2005-07-14 22:37:55.000000000 +0400
-+++ src/mainwin.cpp	2005-07-14 22:55:57.000000000 +0400
-@@ -441,6 +441,7 @@
-   licqConf.ReadBool("AutoPosReplyWin", m_bAutoPosReplyWin, true);
-   licqConf.ReadBool("AutoSendThroughServer", m_bAutoSendThroughServer, false);
-   licqConf.ReadBool("EnableMainwinMouseMovement", m_bEnableMainwinMouseMovement, true);
-+  licqConf.ReadBool("ShowEmoticons", m_bShowKoloboks, true);
-   licqConf.ReadNum("ChatMessageStyle", m_nMsgStyle, 0);
-   licqConf.ReadBool("ChatAppendLinebreak", m_bAppendLineBreak, true);
-   licqConf.ReadBool("FlashTaskbar", m_bFlashTaskbar, true);
-@@ -3549,6 +3550,7 @@
-   licqConf.WriteBool("AutoPosReplyWin", m_bAutoPosReplyWin);
-   licqConf.WriteBool("AutoSendThroughServer", m_bAutoSendThroughServer);
-   licqConf.WriteBool("EnableMainwinMouseMovement", m_bEnableMainwinMouseMovement);
-+  licqConf.WriteBool("ShowEmoticons", m_bShowKoloboks);
-   licqConf.WriteBool("FlashTaskbar", m_bFlashTaskbar);
-   
-   licqConf.WriteNum("ChatMessageStyle", m_nMsgStyle);
diff --git a/net-im/licq/files/digest-licq-1.3.0-r3 b/net-im/licq/files/digest-licq-1.3.0-r3
deleted file mode 100644
index 574dbf4158e6..000000000000
--- a/net-im/licq/files/digest-licq-1.3.0-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c1b05d1078b9826273191c05d0d1a969 licq-1.3.0.tar.bz2 4284325
-MD5 9d27f4422743c4c5aadb8bd5f5a84466 licq-branch-update-20050315.patch.bz2 27952
diff --git a/net-im/licq/files/digest-licq-1.3.0-r4 b/net-im/licq/files/digest-licq-1.3.0-r4
deleted file mode 100644
index 574dbf4158e6..000000000000
--- a/net-im/licq/files/digest-licq-1.3.0-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c1b05d1078b9826273191c05d0d1a969 licq-1.3.0.tar.bz2 4284325
-MD5 9d27f4422743c4c5aadb8bd5f5a84466 licq-branch-update-20050315.patch.bz2 27952
diff --git a/net-im/licq/files/digest-licq-1.3.0-r5 b/net-im/licq/files/digest-licq-1.3.0-r5
deleted file mode 100644
index c08397616e88..000000000000
--- a/net-im/licq/files/digest-licq-1.3.0-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c1b05d1078b9826273191c05d0d1a969 licq-1.3.0.tar.bz2 4284325
-MD5 9d27f4422743c4c5aadb8bd5f5a84466 licq-branch-update-20050315.patch.bz2 27952
-MD5 b759d989af1f3c13ff3c50260d4fa8ac licq-branch-update-20050703.patch.bz2 89285
diff --git a/net-im/licq/files/digest-licq-1.3.0-r6 b/net-im/licq/files/digest-licq-1.3.0-r6
deleted file mode 100644
index c08397616e88..000000000000
--- a/net-im/licq/files/digest-licq-1.3.0-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c1b05d1078b9826273191c05d0d1a969 licq-1.3.0.tar.bz2 4284325
-MD5 9d27f4422743c4c5aadb8bd5f5a84466 licq-branch-update-20050315.patch.bz2 27952
-MD5 b759d989af1f3c13ff3c50260d4fa8ac licq-branch-update-20050703.patch.bz2 89285
diff --git a/net-im/licq/files/digest-licq-1.3.0-r7 b/net-im/licq/files/digest-licq-1.3.0-r7
deleted file mode 100644
index e1518eec9538..000000000000
--- a/net-im/licq/files/digest-licq-1.3.0-r7
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 c1b05d1078b9826273191c05d0d1a969 licq-1.3.0.tar.bz2 4284325
-MD5 9d27f4422743c4c5aadb8bd5f5a84466 licq-branch-update-20050315.patch.bz2 27952
-MD5 b759d989af1f3c13ff3c50260d4fa8ac licq-branch-update-20050703.patch.bz2 89285
-MD5 997a8b5998d9a94c54b6703df7b345ad licq-branch-update-20050803.patch.bz2 18636
diff --git a/net-im/licq/files/digest-licq-1.3.0-r8 b/net-im/licq/files/digest-licq-1.3.0-r8
deleted file mode 100644
index 4afcf76c2112..000000000000
--- a/net-im/licq/files/digest-licq-1.3.0-r8
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 c1b05d1078b9826273191c05d0d1a969 licq-1.3.0.tar.bz2 4284325
-MD5 9d27f4422743c4c5aadb8bd5f5a84466 licq-branch-update-20050315.patch.bz2 27952
-MD5 b759d989af1f3c13ff3c50260d4fa8ac licq-branch-update-20050703.patch.bz2 89285
-MD5 997a8b5998d9a94c54b6703df7b345ad licq-branch-update-20050803.patch.bz2 18636
-MD5 ac6eee5df001ee4cb29dbf1ea915d83c licq-branch-update-20050902.patch.bz2 11820
diff --git a/net-im/licq/files/digest-licq-1.3.2_rc1 b/net-im/licq/files/digest-licq-1.3.2_rc1
new file mode 100644
index 000000000000..e73c24bb40c0
--- /dev/null
+++ b/net-im/licq/files/digest-licq-1.3.2_rc1
@@ -0,0 +1 @@
+MD5 de36241e1465988c3550693d99e0c624 licq-1.3.2RC1.tar.bz2 3744071
diff --git a/net-im/licq/licq-1.3.0-r3.ebuild b/net-im/licq/licq-1.3.0-r3.ebuild
deleted file mode 100644
index f2cba264d97f..000000000000
--- a/net-im/licq/licq-1.3.0-r3.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.0-r3.ebuild,v 1.3 2005/07/10 01:02:30 swegener Exp $
-
-inherit eutils kde-functions
-
-DESCRIPTION="ICQ Client with v8 support"
-HOMEPAGE="http://www.licq.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_pre/-PRE}.tar.bz2
-		http://dev.gentoo.org/~voxus/licq/licq-branch-update-20050315.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64"
-IUSE="ssl socks5 qt kde ncurses crypt msn"
-
-# 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 )"
-DEPEND="kde? ( >=kde-base/kdelibs-3.0 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	qt? ( =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 ${DISTDIR}/${PN}-branch-update-20050315.patch.bz2
-
-	if use msn
-	then
-		epatch ${FILESDIR}/${PV}-msnpacket_sync.patch || die "msn fix failed"
-	fi
-
-	if use kde
-	then
-		# fix for #12436
-		inherit
-		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 qt
-		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
-
-	cd ${S}/plugins/qt-gui && \
-		epatch ${FILESDIR}/${PV}-no_stupid_koloboks.patch || \
-		ewarn "Fail to kill koloboks, forget it"
-}
-
-src_compile() {
-	local first_conf
-	use ssl		|| myconf="${myconf} --disable-openssl"
-	use socks5	&& myconf="${myconf} --enable-socks5"
-	if use crypt
-	then
-		myconf="${myconf} --enable-gpgme"
-	else
-		myconf="${myconf} --disable-gpgme"
-	fi
-
-	econf ${myconf} || die
-	emake || die
-
-	# Create the various plug-ins
-
-	# First, the Qt plug-in
-	if use qt
-	then
-		set-qtdir 3
-		set-kdedir 3
-
-		use kde && myconf="${myconf} --with-kde"
-
-		# 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
-
-	# The Auto-Responder plug-in
-	cd ${S}/plugins/auto-reply
-	einfo "Compiling the Auto-Reply plug-in"
-	econf || die
-	emake || die
-
-	# The Remote Management Service
-	cd ${S}/plugins/rms
-	einfo "Compiling Remote Management Services plug-in"
-	econf || die
-	emake || die
-
-	# MSN PLugin
-	if use msn
-	then
-		cd ${S}/plugins/msn
-		einfo "Compiling MSN plug-in"
-		econf || die
-		emake || die
-	fi
-
-	# Email PLugin
-	cd ${S}/plugins/email
-	einfo "Compiling Email plug-in"
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc ChangeLog INSTALL README* doc/*
-
-	# Install the plug-ins
-	if use qt
-	then
-		cd ${S}/plugins/qt-gui
-		make DESTDIR=${D} install || die
-		docinto plugins/qt-gui
-		dodoc README*
-
-	fi
-
-	if use ncurses
-	then
-	    cd ${S}/plugins/console
-	    make DESTDIR=${D} install || die
-	    docinto plugins/console
-	    dodoc README
-	fi
-
-
-	cd ${S}/plugins/auto-reply
-	make 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
-	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.0-r4.ebuild b/net-im/licq/licq-1.3.0-r4.ebuild
deleted file mode 100644
index 0a7143dd1933..000000000000
--- a/net-im/licq/licq-1.3.0-r4.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.0-r4.ebuild,v 1.2 2005/07/07 04:52:24 caleb Exp $
-
-inherit eutils kde-functions
-
-DESCRIPTION="ICQ Client with v8 support"
-HOMEPAGE="http://www.licq.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_pre/-PRE}.tar.bz2
-		http://dev.gentoo.org/~voxus/licq/licq-branch-update-20050315.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64"
-IUSE="ssl socks5 qt kde ncurses crypt msn"
-
-# 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 )"
-DEPEND="kde? ( >=kde-base/kdelibs-3.0 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	qt? ( =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 ${DISTDIR}/${PN}-branch-update-20050315.patch.bz2
-
-	if use msn
-	then
-		epatch ${FILESDIR}/${PV}-msnpacket_sync.patch || die "msn fix failed"
-	fi
-
-	if use ncurses
-	then
-		epatch ${FILESDIR}/${PV}-suse_bool.patch || die "console patch failed"
-	fi
-
-	if use kde
-	then
-		# fix for #12436
-		inherit
-		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 qt
-		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
-
-	cd ${S}/plugins/qt-gui && \
-		epatch ${FILESDIR}/${PV}-no_stupid_koloboks.patch || \
-		ewarn "Fail to kill koloboks, forget it"
-}
-
-src_compile() {
-	local first_conf
-	use ssl		|| myconf="${myconf} --disable-openssl"
-	use socks5	&& myconf="${myconf} --enable-socks5"
-	if use crypt
-	then
-		myconf="${myconf} --enable-gpgme"
-	else
-		myconf="${myconf} --disable-gpgme"
-	fi
-
-	econf ${myconf} || die
-	emake || die
-
-	# Create the various plug-ins
-
-	# First, the Qt plug-in
-	if use qt
-	then
-		set-qtdir 3
-		set-kdedir 3
-
-		use kde && myconf="${myconf} --with-kde"
-
-		# 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
-
-	# The Auto-Responder plug-in
-	cd ${S}/plugins/auto-reply
-	einfo "Compiling the Auto-Reply plug-in"
-	econf || die
-	emake || die
-
-	# The Remote Management Service
-	cd ${S}/plugins/rms
-	einfo "Compiling Remote Management Services plug-in"
-	econf || die
-	emake || die
-
-	# MSN PLugin
-	if use msn
-	then
-		cd ${S}/plugins/msn
-		einfo "Compiling MSN plug-in"
-		econf || die
-		emake || die
-	fi
-
-	# Email PLugin
-	cd ${S}/plugins/email
-	einfo "Compiling Email plug-in"
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc ChangeLog INSTALL README* doc/*
-
-	# Install the plug-ins
-	if use qt
-	then
-		cd ${S}/plugins/qt-gui
-		make DESTDIR=${D} install || die
-		docinto plugins/qt-gui
-		dodoc README*
-
-	fi
-
-	if use ncurses
-	then
-	    cd ${S}/plugins/console
-	    make 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
-	make 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
-	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.0-r6.ebuild b/net-im/licq/licq-1.3.0-r6.ebuild
deleted file mode 100644
index 7895a4c68173..000000000000
--- a/net-im/licq/licq-1.3.0-r6.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.0-r6.ebuild,v 1.1 2005/07/14 19:37:41 voxus Exp $
-
-inherit eutils kde-functions
-
-DESCRIPTION="ICQ Client with v8 support"
-HOMEPAGE="http://www.licq.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_pre/-PRE}.tar.bz2
-		http://dev.gentoo.org/~voxus/licq/licq-branch-update-20050315.patch.bz2
-		http://dev.gentoo.org/~voxus/licq/licq-branch-update-20050703.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64"
-IUSE="ssl socks5 qt kde ncurses crypt msn"
-
-# 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 )"
-DEPEND="kde? ( >=kde-base/kdelibs-3.0 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	qt? ( =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 ${DISTDIR}/${PN}-branch-update-20050315.patch.bz2
-		epatch ${DISTDIR}/${PN}-branch-update-20050703.patch.bz2
-		epatch ${FILESDIR}/${PV}-include_iconv.patch
-	}
-
-	if use ncurses
-	then
-		epatch ${FILESDIR}/${PV}-suse_bool.patch || die "console patch failed"
-	fi
-
-	if use kde
-	then
-		# fix for #12436
-		inherit
-		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 $?
-		cd ${S}/plugins/qt-gui && {
-			epatch ${FILESDIR}/${PV}-koloboks.patch
-			epatch ${FILESDIR}/${PV}-save_koloboks.patch
-		}
-	else
-		if ! use qt
-		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
-}
-
-src_compile() {
-	local first_conf
-	use ssl		|| myconf="${myconf} --disable-openssl"
-	use socks5	&& myconf="${myconf} --enable-socks5"
-	if use crypt
-	then
-		myconf="${myconf} --enable-gpgme"
-	else
-		myconf="${myconf} --disable-gpgme"
-	fi
-
-	rm -f configure && make -f Makefile.cvs
-	econf ${myconf} || die
-
-	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
-
-	# Create the various plug-ins
-
-	# First, the Qt plug-in
-	if use qt
-	then
-		set-qtdir 3
-		set-kdedir 3
-
-		use kde && myconf="${myconf} --with-kde"
-
-		# 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"
-		rm -f configure && make -f Makefile.cvs
-		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"
-		rm -f configure && make -f Makefile.cvs
-		econf || die
-		emake || die
-	fi
-
-	# The Auto-Responder plug-in
-	cd ${S}/plugins/auto-reply
-	einfo "Compiling the Auto-Reply plug-in"
-	rm -f configure && make -f Makefile.cvs
-	econf || die
-	emake || die
-
-	# The Remote Management Service
-	cd ${S}/plugins/rms
-	einfo "Compiling Remote Management Services plug-in"
-	rm -f configure && make -f Makefile.cvs
-	econf || die
-	emake || die
-
-	# MSN PLugin
-	if use msn
-	then
-		cd ${S}/plugins/msn
-		einfo "Compiling MSN plug-in"
-		rm -f configure && make -f Makefile.cvs
-		econf || die
-		emake || die
-	fi
-
-	# Email PLugin
-	cd ${S}/plugins/email
-	einfo "Compiling Email plug-in"
-	rm -f configure && make -f Makefile.cvs
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc ChangeLog INSTALL README* doc/*
-
-	# Install the plug-ins
-	if use qt
-	then
-		cd ${S}/plugins/qt-gui
-		make DESTDIR=${D} install || die
-		docinto plugins/qt-gui
-		dodoc README*
-
-	fi
-
-	if use ncurses
-	then
-	    cd ${S}/plugins/console
-	    make 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
-	make 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
-	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.0-r7.ebuild b/net-im/licq/licq-1.3.0-r7.ebuild
deleted file mode 100644
index d0afceb9b56f..000000000000
--- a/net-im/licq/licq-1.3.0-r7.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.0-r7.ebuild,v 1.2 2005/08/10 20:54:40 herbs Exp $
-
-inherit eutils kde-functions multilib
-
-DESCRIPTION="ICQ Client with v8 support"
-HOMEPAGE="http://www.licq.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_pre/-PRE}.tar.bz2
-		http://dev.gentoo.org/~voxus/licq/licq-branch-update-20050315.patch.bz2
-		http://dev.gentoo.org/~voxus/licq/licq-branch-update-20050703.patch.bz2
-		http://dev.gentoo.org/~voxus/licq/licq-branch-update-20050803.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64"
-IUSE="ssl socks5 qt kde ncurses crypt msn"
-
-# 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 )"
-DEPEND="kde? ( >=kde-base/kdelibs-3.0 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	qt? ( =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 ${DISTDIR}/${PN}-branch-update-20050315.patch.bz2
-		epatch ${DISTDIR}/${PN}-branch-update-20050703.patch.bz2
-		epatch ${DISTDIR}/${PN}-branch-update-20050803.patch.bz2
-		epatch ${FILESDIR}/${PV}-include_iconv.patch
-	}
-
-	if use ncurses
-	then
-		epatch ${FILESDIR}/${PV}-suse_bool.patch || die "console patch failed"
-	fi
-
-	if use kde
-	then
-		# fix for #12436
-		inherit
-		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 $?
-		cd ${S}/plugins/qt-gui && {
-			epatch ${FILESDIR}/${PV}-koloboks.patch
-			epatch ${FILESDIR}/${PV}-save_koloboks.patch
-		}
-	else
-		if ! use qt
-		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"
-}
-
-src_compile() {
-	local first_conf
-	use ssl		|| myconf="${myconf} --disable-openssl"
-	use socks5	&& myconf="${myconf} --enable-socks5"
-	if use crypt
-	then
-		myconf="${myconf} --enable-gpgme"
-	else
-		myconf="${myconf} --disable-gpgme"
-	fi
-
-	rm -f configure && make -f Makefile.cvs
-	econf ${myconf} || die
-
-	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
-
-	# Create the various plug-ins
-
-	# First, the Qt plug-in
-	if use qt
-	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"
-		rm -f configure && make -f Makefile.cvs
-		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"
-		rm -f configure && make -f Makefile.cvs
-		econf || die
-		emake || die
-	fi
-
-	# The Auto-Responder plug-in
-	cd ${S}/plugins/auto-reply
-	einfo "Compiling the Auto-Reply plug-in"
-	rm -f configure && make -f Makefile.cvs
-	econf || die
-	emake || die
-
-	# The Remote Management Service
-	cd ${S}/plugins/rms
-	einfo "Compiling Remote Management Services plug-in"
-	rm -f configure && make -f Makefile.cvs
-	econf || die
-	emake || die
-
-	# MSN PLugin
-	if use msn
-	then
-		cd ${S}/plugins/msn
-		einfo "Compiling MSN plug-in"
-		rm -f configure && make -f Makefile.cvs
-		econf || die
-		emake || die
-	fi
-
-	# Email PLugin
-	cd ${S}/plugins/email
-	einfo "Compiling Email plug-in"
-	rm -f configure && make -f Makefile.cvs
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc ChangeLog INSTALL README* doc/*
-
-	# Install the plug-ins
-	if use qt
-	then
-		cd ${S}/plugins/qt-gui
-		make DESTDIR=${D} install || die
-		docinto plugins/qt-gui
-		dodoc README*
-
-	fi
-
-	if use ncurses
-	then
-	    cd ${S}/plugins/console
-	    make 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
-	make 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
-	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.0-r8.ebuild b/net-im/licq/licq-1.3.0-r8.ebuild
deleted file mode 100644
index d18cc8c52908..000000000000
--- a/net-im/licq/licq-1.3.0-r8.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.0-r8.ebuild,v 1.1 2005/09/02 10:48:40 voxus Exp $
-
-inherit eutils kde-functions multilib
-
-DESCRIPTION="ICQ Client with v8 support"
-HOMEPAGE="http://www.licq.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_pre/-PRE}.tar.bz2
-		http://dev.gentoo.org/~voxus/licq/licq-branch-update-20050315.patch.bz2
-		http://dev.gentoo.org/~voxus/licq/licq-branch-update-20050703.patch.bz2
-		http://dev.gentoo.org/~voxus/licq/licq-branch-update-20050803.patch.bz2
-		http://dev.gentoo.org/~voxus/licq/licq-branch-update-20050902.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64"
-IUSE="ssl socks5 qt kde ncurses crypt msn"
-
-# 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 )"
-DEPEND="kde? ( >=kde-base/kdelibs-3.0 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	qt? ( =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 ${DISTDIR}/${PN}-branch-update-20050315.patch.bz2
-		epatch ${DISTDIR}/${PN}-branch-update-20050703.patch.bz2
-		epatch ${DISTDIR}/${PN}-branch-update-20050803.patch.bz2
-		epatch ${DISTDIR}/${PN}-branch-update-20050902.patch.bz2
-		epatch ${FILESDIR}/${PV}-include_iconv.patch
-	}
-
-	if use ncurses
-	then
-		epatch ${FILESDIR}/${PV}-suse_bool.patch || die "console patch failed"
-	fi
-
-	if use kde
-	then
-		# fix for #12436
-		inherit
-		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 $?
-		cd ${S}/plugins/qt-gui && {
-			epatch ${FILESDIR}/${PV}-koloboks.patch
-			epatch ${FILESDIR}/${PV}-save_koloboks.patch
-		}
-	else
-		if ! use qt
-		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"
-}
-
-src_compile() {
-	local first_conf
-	use ssl		|| myconf="${myconf} --disable-openssl"
-	use socks5	&& myconf="${myconf} --enable-socks5"
-	if use crypt
-	then
-		myconf="${myconf} --enable-gpgme"
-	else
-		myconf="${myconf} --disable-gpgme"
-	fi
-
-	rm -f configure && make -f Makefile.cvs
-	econf ${myconf} || die
-
-	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
-
-	# Create the various plug-ins
-
-	# First, the Qt plug-in
-	if use qt
-	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"
-		rm -f configure && make -f Makefile.cvs
-		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"
-		rm -f configure && make -f Makefile.cvs
-		econf || die
-		emake || die
-	fi
-
-	# The Auto-Responder plug-in
-	cd ${S}/plugins/auto-reply
-	einfo "Compiling the Auto-Reply plug-in"
-	rm -f configure && make -f Makefile.cvs
-	econf || die
-	emake || die
-
-	# The Remote Management Service
-	cd ${S}/plugins/rms
-	einfo "Compiling Remote Management Services plug-in"
-	rm -f configure && make -f Makefile.cvs
-	econf || die
-	emake || die
-
-	# MSN PLugin
-	if use msn
-	then
-		cd ${S}/plugins/msn
-		einfo "Compiling MSN plug-in"
-		rm -f configure && make -f Makefile.cvs
-		econf || die
-		emake || die
-	fi
-
-	# Email PLugin
-	cd ${S}/plugins/email
-	einfo "Compiling Email plug-in"
-	rm -f configure && make -f Makefile.cvs
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc ChangeLog INSTALL README* doc/*
-
-	# Install the plug-ins
-	if use qt
-	then
-		cd ${S}/plugins/qt-gui
-		make DESTDIR=${D} install || die
-		docinto plugins/qt-gui
-		dodoc README*
-
-	fi
-
-	if use ncurses
-	then
-	    cd ${S}/plugins/console
-	    make 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
-	make 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
-	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.0-r5.ebuild b/net-im/licq/licq-1.3.2_rc1.ebuild
index 806a21096859..1b7e7fe926f4 100644
--- a/net-im/licq/licq-1.3.0-r5.ebuild
+++ b/net-im/licq/licq-1.3.2_rc1.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.0-r5.ebuild,v 1.2 2005/07/07 04:52:24 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.2_rc1.ebuild,v 1.1 2005/10/01 14:58:52 voxus Exp $
 
-inherit eutils kde-functions
+inherit eutils kde-functions multilib
 
 DESCRIPTION="ICQ Client with v8 support"
 HOMEPAGE="http://www.licq.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_pre/-PRE}.tar.bz2
-		http://dev.gentoo.org/~voxus/licq/licq-branch-update-20050315.patch.bz2
-		http://dev.gentoo.org/~voxus/licq/licq-branch-update-20050703.patch.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P/_rc/RC}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
@@ -25,21 +23,17 @@ RDEPEND="kde? ( >=kde-base/kdelibs-3.0 )"
 DEPEND="kde? ( >=kde-base/kdelibs-3.0 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	qt? ( =x11-libs/qt-3* )
-	ncurses? ( sys-libs/ncurses =dev-libs/cdk-4.9.11.20031210-r1 )
+	ncurses? ( sys-libs/ncurses >=dev-libs/cdk-4.9.11.20031210-r1 )
 	crypt? ( >=app-crypt/gpgme-1.0.0 )"
 
+S="${WORKDIR}/${P/_rc/RC}"
+
 src_unpack() {
 	unpack ${A}
 
-	cd ${S} && {
-		epatch ${DISTDIR}/${PN}-branch-update-20050315.patch.bz2
-		epatch ${DISTDIR}/${PN}-branch-update-20050703.patch.bz2
-	}
+	cd ${S}
 
-	if use ncurses
-	then
-		epatch ${FILESDIR}/${PV}-suse_bool.patch || die "console patch failed"
-	fi
+	use ncurses && epatch ${FILESDIR}/1.3.0-suse_bool.patch
 
 	if use kde
 	then
@@ -50,7 +44,6 @@ src_unpack() {
 		sed "s:Plugin1 = qt-gui:Plugin1 = kde-gui:" \
 			${T}/licq.conf.h > ${S}/src/licq.conf.h
 		eend $?
-		cd ${S}/plugins/qt-gui && epatch ${FILESDIR}/${PV}-koloboks.patch
 	else
 		if ! use qt
 		then
@@ -61,12 +54,19 @@ src_unpack() {
 			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"
 }
 
 src_compile() {
-	local first_conf
+
 	use ssl		|| myconf="${myconf} --disable-openssl"
 	use socks5	&& myconf="${myconf} --enable-socks5"
+
 	if use crypt
 	then
 		myconf="${myconf} --enable-gpgme"
@@ -74,7 +74,19 @@ src_compile() {
 		myconf="${myconf} --disable-gpgme"
 	fi
 
-	rm -f configure && make -f Makefile.cvs
+	for n in `echo auto-reply console email msn osd qt-gui rms`; do
+		cd ${S}/plugins/${n}
+
+		ebegin "Recreating configure in plugins/${n}"
+		rm -f Makefile && make -f Makefile.cvs 2>&1 > /dev/null
+		eend ${?}
+	done
+
+	cd ${S}
+
+	# bug #21009
+	find . -name 'configure' -exec sed -e "s:sed 's/-g:sed 's/^-g:" -i {} \;
+
 	econf ${myconf} || die
 
 	use crypt && {
@@ -96,6 +108,9 @@ src_compile() {
 
 		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)
@@ -103,7 +118,6 @@ src_compile() {
 
 		cd ${S}/plugins/qt-gui
 		einfo "Compiling Qt GUI plug-in"
-		rm -f configure && make -f Makefile.cvs
 		econf ${myconf} || die
 		emake || die
 	fi
@@ -113,7 +127,6 @@ src_compile() {
 	then
 		cd ${S}/plugins/console
 		einfo "Compiling the Console plug-in"
-		rm -f configure && make -f Makefile.cvs
 		econf || die
 		emake || die
 	fi
@@ -121,14 +134,12 @@ src_compile() {
 	# The Auto-Responder plug-in
 	cd ${S}/plugins/auto-reply
 	einfo "Compiling the Auto-Reply plug-in"
-	rm -f configure && make -f Makefile.cvs
 	econf || die
 	emake || die
 
 	# The Remote Management Service
 	cd ${S}/plugins/rms
 	einfo "Compiling Remote Management Services plug-in"
-	rm -f configure && make -f Makefile.cvs
 	econf || die
 	emake || die
 
@@ -137,7 +148,6 @@ src_compile() {
 	then
 		cd ${S}/plugins/msn
 		einfo "Compiling MSN plug-in"
-		rm -f configure && make -f Makefile.cvs
 		econf || die
 		emake || die
 	fi
@@ -145,7 +155,6 @@ src_compile() {
 	# Email PLugin
 	cd ${S}/plugins/email
 	einfo "Compiling Email plug-in"
-	rm -f configure && make -f Makefile.cvs
 	econf || die
 	emake || die
 }