remove old ebuilds, add new 4.14.0, mark 4.11.0 and 4.12.0 stable on x86

10 files changed, 89 insertions, 1194 deletions

diff --git a/net-im/centericq/ChangeLog b/net-im/centericq/ChangeLog
index 5f2cce5797ab..0c618c80d47d 100644
--- a/net-im/centericq/ChangeLog
+++ b/net-im/centericq/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/centericq
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/ChangeLog,v 1.51 2004/12/23 14:07:42 wschlich Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/ChangeLog,v 1.52 2005/01/19 12:14:37 wschlich Exp $
+
+*centericq-4.14.0 (19 Jan 2005)
+
+  19 Jan 2005; Wolfram Schlich <wschlich@gentoo.org>
+  -centericq-4.9.12-r1.ebuild, -centericq-4.9.12.ebuild,
+  -files/centericq-4.9.12-gcc3.4.patch, -files/missing_namespace.patch,
+  -files/nls.patch, centericq-4.11.0.ebuild, centericq-4.12.0.ebuild,
+  +centericq-4.14.0.ebuild:
+  remove old ebuilds, add new 4.14.0, mark 4.11.0 and 4.12.0 stable on x86
 
 *centericq-4.13.0 (23 Dec 2004)
 
diff --git a/net-im/centericq/Manifest b/net-im/centericq/Manifest
index 00e72cc783e3..1a8431bf84e1 100644
--- a/net-im/centericq/Manifest
+++ b/net-im/centericq/Manifest
@@ -1,15 +1,12 @@
-MD5 14783c2140a3056824016019cc66ccaa centericq-4.11.0.ebuild 1610
+MD5 e18f868bc611c90fed01c921b2ea4b8d centericq-4.11.0.ebuild 1609
 MD5 b42775646a55d2833833ff5d7d39a0ce centericq-4.9.12.ebuild 1576
 MD5 d0c53f2a1fcf6fb91d80ad95111bf1bb centericq-4.9.12-r1.ebuild 1627
-MD5 f32b2710f57a9a7a1258d3bbb2d54aa5 centericq-4.13.0.ebuild 2171
+MD5 43dfc0786e686d2b71d89f5d0024ed51 centericq-4.13.0.ebuild 2171
 MD5 7f795e49e944fe6f3aa15fe53e8da366 metadata.xml 693
-MD5 9eca4d192afe2a717815f660110da17a ChangeLog 7196
-MD5 9bd9ae28c6af565db12ed140e94bf14b centericq-4.12.0.ebuild 2140
-MD5 906791d5e39c347fdb98c7a9e312e960 files/digest-centericq-4.9.12 69
-MD5 e645af5e8774c5cf9be9396564e75850 files/missing_namespace.patch 432
-MD5 906791d5e39c347fdb98c7a9e312e960 files/digest-centericq-4.9.12-r1 69
+MD5 90936a43f4bf9f36953c62c4c9398e0b ChangeLog 7585
+MD5 b1866c4b5446820f8e1e991f8e3e0529 centericq-4.12.0.ebuild 2139
+MD5 ee96c97eebc4f8f783184e4d58e61831 centericq-4.14.0.ebuild 2171
 MD5 46e9d0c5b7ea4e05001e593b447715e1 files/digest-centericq-4.13.0 70
 MD5 3ff4d1ed212b9191d78f5d62dbbd4e71 files/digest-centericq-4.11.0 70
-MD5 e930249e8c8b5386353c1c829dbbc888 files/centericq-4.9.12-gcc3.4.patch 41292
+MD5 9e00bb9cbcf5f672594b4307ada536d0 files/digest-centericq-4.14.0 70
 MD5 f2b19b888bf1799ee2643a7a832f996b files/digest-centericq-4.12.0 70
-MD5 4dffe42a3b07b5ea3d785a442ed92f73 files/nls.patch 496
diff --git a/net-im/centericq/centericq-4.11.0.ebuild b/net-im/centericq/centericq-4.11.0.ebuild
index 641a2bfc102f..e47938c47a0b 100644
--- a/net-im/centericq/centericq-4.11.0.ebuild
+++ b/net-im/centericq/centericq-4.11.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.11.0.ebuild,v 1.1 2004/08/06 17:19:31 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.11.0.ebuild,v 1.2 2005/01/19 12:14:37 wschlich Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://thekonst.net/download/${P}.tar.bz2"
 HOMEPAGE="http://thekonst.net/en/centericq"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~hppa ~ppc64"
+KEYWORDS="x86 ~sparc ~amd64 ~ppc ~hppa ~ppc64"
 
 DEPEND="virtual/libc
 	>=sys-libs/ncurses-5.2
diff --git a/net-im/centericq/centericq-4.12.0.ebuild b/net-im/centericq/centericq-4.12.0.ebuild
index fcf82561844b..98b397a6a920 100644
--- a/net-im/centericq/centericq-4.12.0.ebuild
+++ b/net-im/centericq/centericq-4.12.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.12.0.ebuild,v 1.1 2004/10/17 22:25:31 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.12.0.ebuild,v 1.2 2005/01/19 12:14:37 wschlich Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://thekonst.net/download/${P}.tar.bz2"
 HOMEPAGE="http://thekonst.net/en/centericq"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~hppa ~ppc64"
+KEYWORDS="x86 ~sparc ~amd64 ~ppc ~hppa ~ppc64"
 
 DEPEND="virtual/libc
 	>=sys-libs/ncurses-5.2
diff --git a/net-im/centericq/centericq-4.13.0.ebuild b/net-im/centericq/centericq-4.13.0.ebuild
index 1d231102f6d8..841b53b9d6eb 100644
--- a/net-im/centericq/centericq-4.13.0.ebuild
+++ b/net-im/centericq/centericq-4.13.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.13.0.ebuild,v 1.2 2004/12/23 14:07:42 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.13.0.ebuild,v 1.3 2005/01/19 12:14:37 wschlich Exp $
 
 inherit eutils
 
diff --git a/net-im/centericq/centericq-4.14.0.ebuild b/net-im/centericq/centericq-4.14.0.ebuild
new file mode 100644
index 000000000000..7233825238cf
--- /dev/null
+++ b/net-im/centericq/centericq-4.14.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.14.0.ebuild,v 1.1 2005/01/19 12:14:37 wschlich Exp $
+
+inherit eutils
+
+IUSE="bidi nls ssl icq jabber aim msn yahoo" # gg irc rss lj
+
+DESCRIPTION="A ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
+SRC_URI="http://thekonst.net/download/${P}.tar.bz2"
+HOMEPAGE="http://thekonst.net/en/centericq"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~hppa ~ppc64"
+
+DEPEND="virtual/libc
+	>=sys-libs/ncurses-5.2
+	icq? ( !net-libs/libicq2000 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	msn? ( net-misc/curl )
+	bidi? ( dev-libs/fribidi )"
+
+RDEPEND="nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+}
+
+src_compile() {
+	local myopts="--with-gnu-ld --disable-konst"
+	use nls >&/dev/null && myopts="${myopts} --enable-locales-fix" || myopts="${myopts} --disable-nls"
+	use bidi >&/dev/null && myopts="${myopts} --with-fribidi"
+	use ssl >&/dev/null && myopts="${myopts} --with-ssl"
+
+	use icq >&/dev/null || myopts="${myopts} --disable-icq"
+	use jabber >&/dev/null || myopts="${myopts} --disable-jabber"
+	use aim >&/dev/null || myopts="${myopts} --disable-aim"
+	use msn >&/dev/null || myopts="${myopts} --disable-msn"
+	if use msn >&/dev/null && ! use ssl >&/dev/null; then
+		eerror ""
+		eerror "USE flag problem"
+		eerror "================"
+		eerror "'msn' USE flag detected, but 'ssl' USE flag missing:"
+		eerror "MSN support needs libcurl with SSL support."
+		eerror ""
+		die "Please either activate the 'ssl' USE flag or deactivate the 'msn' USE flag for net-im/centericq"
+	fi
+	use yahoo >&/dev/null || myopts="${myopts} --disable-yahoo"
+#	use gg >&/dev/null || myopts="${myopts} --disable-gg"
+#	use irc >&/dev/null || myopts="${myopts} --disable-irc"
+#	use rss >&/dev/null || myopts="${myopts} --disable-rss"
+#	use lj >&/dev/null || myopts="${myopts} --disable-lj"
+
+	econf ${myopts} || die "Configure failed"
+	emake || die "Compilation failed"
+}
+
+src_install () {
+	einstall || die "Installation failed"
+
+	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING FAQ README THANKS TODO
+}
diff --git a/net-im/centericq/files/centericq-4.9.12-gcc3.4.patch b/net-im/centericq/files/centericq-4.9.12-gcc3.4.patch
deleted file mode 100644
index bce94f7f5190..000000000000
--- a/net-im/centericq/files/centericq-4.9.12-gcc3.4.patch
+++ /dev/null
@@ -1,1149 +0,0 @@
-Only in ./: centericq-4.9.12-gcc3.4.patch
-diff -r -u /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/libicq2000-0.1/libicq2000/sigslot.h ./libicq2000-0.1/libicq2000/sigslot.h
---- /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/libicq2000-0.1/libicq2000/sigslot.h	2004-02-11 01:51:44.000000000 +0200
-+++ ./libicq2000-0.1/libicq2000/sigslot.h	2004-05-04 11:35:10.000000000 +0300
-@@ -745,8 +745,8 @@
- 	public:
- 		_connection0()
- 		{
--			pobject = NULL;
--			pmemfun = NULL;
-+			this->pobject = NULL;
-+			this->pmemfun = NULL;
- 		}
- 
- 		_connection0(dest_type* pobject, void (dest_type::*pmemfun)())
-@@ -786,8 +786,8 @@
- 	public:
- 		_connection1()
- 		{
--			pobject = NULL;
--			pmemfun = NULL;
-+			this->pobject = NULL;
-+			this->pmemfun = NULL;
- 		}
- 
- 		_connection1(dest_type* pobject, void (dest_type::*pmemfun)(arg1_type))
-@@ -827,8 +827,8 @@
- 	public:
- 		_connection2()
- 		{
--			pobject = NULL;
--			pmemfun = NULL;
-+			this->pobject = NULL;
-+			this->pmemfun = NULL;
- 		}
- 
- 		_connection2(dest_type* pobject, void (dest_type::*pmemfun)(arg1_type, arg2_type))
-@@ -889,7 +889,7 @@
- 			lock_block<mt_policy> lock(this);
- 			_connection0<dest_type, mt_policy>* conn
- 			    = new _connection0<dest_type, mt_policy>(pclass, pmemfun);
--			m_connected_slots.push_back(conn);
-+			this->m_connected_slots.push_back(conn);
- 			pclass->signal_connect(this);
- 		}
- 
-@@ -897,15 +897,15 @@
- 		{
- 			lock_block<mt_policy> lock(this);
- 			_sig_connection0<mt_policy>* conn = new _sig_connection0<mt_policy>(chainsig);
--			m_connected_slots.push_back(conn);
-+			this->m_connected_slots.push_back(conn);
- 			chainsig.signal_connect(this);
- 		}
- 
- 		void emit()
- 		{
- 			lock_block<mt_policy> lock(this);
--			typename connections_list::const_iterator itNext, it = m_connected_slots.begin();
--			typename connections_list::const_iterator itEnd = m_connected_slots.end();
-+			typename _signal_base0< mt_policy >::connections_list::const_iterator itNext, it = this->m_connected_slots.begin();
-+			typename _signal_base0< mt_policy >::connections_list::const_iterator itEnd = this->m_connected_slots.end();
- 
- 			while(it != itEnd)
- 			{
-@@ -921,8 +921,8 @@
- 		void operator()()
- 		{
- 			lock_block<mt_policy> lock(this);
--			typename connections_list::const_iterator itNext, it = m_connected_slots.begin();
--			typename connections_list::const_iterator itEnd = m_connected_slots.end();
-+			typename _signal_base0< mt_policy >::connections_list::const_iterator itNext, it = this->m_connected_slots.begin();
-+			typename _signal_base0< mt_policy >::connections_list::const_iterator itEnd = this->m_connected_slots.end();
- 
- 			while(it != itEnd)
- 			{
-@@ -957,7 +957,7 @@
- 			lock_block<mt_policy> lock(this);
- 			_connection1<dest_type, arg1_type, mt_policy>* conn
- 			    = new _connection1<dest_type, arg1_type, mt_policy>(pclass, pmemfun);
--			m_connected_slots.push_back(conn);
-+			this->m_connected_slots.push_back(conn);
- 			pclass->signal_connect(this);
- 		}
- 
-@@ -965,15 +965,15 @@
- 		{
- 			lock_block<mt_policy> lock(this);
- 			_sig_connection1<arg1_type, mt_policy>* conn = new _sig_connection1<arg1_type, mt_policy>(chainsig);
--			m_connected_slots.push_back(conn);
-+			this->m_connected_slots.push_back(conn);
- 			chainsig.signal_connect(this);
- 		}
- 
- 		void emit(arg1_type a1)
- 		{
- 			lock_block<mt_policy> lock(this);
--			typename connections_list::const_iterator itNext, it = m_connected_slots.begin();
--			typename connections_list::const_iterator itEnd = m_connected_slots.end();
-+			typename _signal_base1<arg1_type, mt_policy>::connections_list::const_iterator itNext, it = this->m_connected_slots.begin();
-+			typename _signal_base1<arg1_type, mt_policy>::connections_list::const_iterator itEnd = this->m_connected_slots.end();
- 
- 			while(it != itEnd)
- 			{
-@@ -989,8 +989,8 @@
- 		void operator()(arg1_type a1)
- 		{
- 			lock_block<mt_policy> lock(this);
--			typename connections_list::const_iterator itNext, it = m_connected_slots.begin();
--			typename connections_list::const_iterator itEnd = m_connected_slots.end();
-+			typename _signal_base1<arg1_type, mt_policy>::connections_list::const_iterator itNext, it = this->m_connected_slots.begin();
-+			typename _signal_base1<arg1_type, mt_policy>::connections_list::const_iterator itEnd = this->m_connected_slots.end();
- 
- 			while(it != itEnd)
- 			{
-@@ -1025,7 +1025,7 @@
- 			lock_block<mt_policy> lock(this);
- 			_connection2<dest_type, arg1_type, arg2_type, mt_policy>* conn
- 			    = new _connection2<dest_type, arg1_type, arg2_type, mt_policy>(pclass, pmemfun);
--			m_connected_slots.push_back(conn);
-+			this->m_connected_slots.push_back(conn);
- 			pclass->signal_connect(this);
- 		}
- 
-@@ -1033,15 +1033,15 @@
- 		{
- 			lock_block<mt_policy> lock(this);
- 			_sig_connection2<arg1_type, arg2_type, mt_policy>* conn = new _sig_connection2<arg1_type, arg2_type, mt_policy>(chainsig);
--			m_connected_slots.push_back(conn);
-+			this->m_connected_slots.push_back(conn);
- 			chainsig.signal_connect(this);
- 		}
- 
- 		void emit(arg1_type a1, arg2_type a2)
- 		{
- 			lock_block<mt_policy> lock(this);
--			typename connections_list::const_iterator itNext, it = m_connected_slots.begin();
--			typename connections_list::const_iterator itEnd = m_connected_slots.end();
-+			typename _signal_base2<arg1_type, arg2_type, mt_policy>::connections_list::const_iterator itNext, it = this->m_connected_slots.begin();
-+			typename _signal_base2<arg1_type, arg2_type, mt_policy>::connections_list::const_iterator itEnd = this->m_connected_slots.end();
- 
- 			while(it != itEnd)
- 			{
-@@ -1057,8 +1057,8 @@
- 		void operator()(arg1_type a1, arg2_type a2)
- 		{
- 			lock_block<mt_policy> lock(this);
--			typename connections_list::const_iterator itNext, it = m_connected_slots.begin();
--			typename connections_list::const_iterator itEnd = m_connected_slots.end();
-+			typename _signal_base2<arg1_type, arg2_type, mt_policy>::connections_list::const_iterator itNext, it = this->m_connected_slots.begin();
-+			typename _signal_base2<arg1_type, arg2_type, mt_policy>::connections_list::const_iterator itEnd = this->m_connected_slots.end();
- 
- 			while(it != itEnd)
- 			{
-diff -r -u /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/accountmanager.cc ./src/accountmanager.cc
---- /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/accountmanager.cc	2004-02-04 09:44:41.000000000 +0200
-+++ ./src/accountmanager.cc	2004-05-04 12:46:43.460755640 +0300
-@@ -47,7 +47,7 @@
- 
- void accountmanager::exec() {
-     dialogbox db;
--    protocolname pname;
-+    int pname;
-     icqconf::imaccount account;
-     int n, b, i, citem, action, pos;
-     set<hookcapab::enumeration> capab;
-@@ -75,15 +75,15 @@
-     for(fin = false; !fin; ) {
- 	t.clear();
- 
--	for(pname = icq; pname != protocolname_size; (int) pname += 1) {
--	    account = conf.getourid(pname);
-+	for(pname = icq; pname != protocolname_size; pname += 1) {
-+	    account = conf.getourid((protocolname)pname);
- 
- 	    if(pname != rss)
--	    if(gethook(pname).enabled() || !account.empty()) {
--		account = conf.getourid(pname);
--		n = t.addnode(0, 0, 0, " " + conf.getprotocolname(pname) + " ");
--		citem = ((int) (pname)+1) * 100;
--		capab = gethook(pname).getCapabs();
-+	    if(gethook((protocolname)pname).enabled() || !account.empty()) {
-+		account = conf.getourid((protocolname)pname);
-+		n = t.addnode(0, 0, 0, " " + conf.getprotocolname((protocolname)pname) + " ");
-+		citem = (pname+1) * 100;
-+		capab = gethook((protocolname)pname).getCapabs();
- 
- 		if(!account.empty()) {
- 		    tmp = "";
-@@ -154,9 +154,9 @@
- 	    pname = (protocolname) (citem/100-1);
- 	    action = citem-(citem/100)*100;
- 
--	    spname = conf.getprotocolname(pname);
--	    account = conf.getourid(pname);
--	    abstracthook &hook = gethook(pname);
-+	    spname = conf.getprotocolname((protocolname)pname);
-+	    account = conf.getourid((protocolname)pname);
-+	    abstracthook &hook = gethook((protocolname)pname);
- 
- 	    switch(action) {
- 		case 1:
-@@ -190,7 +190,7 @@
- 
- 		case 8:
- 		    if(!hook.online()) {
--			account = icqconf::imaccount(pname);
-+			account = icqconf::imaccount((protocolname)pname);
- 		    } else {
- 			face.status(_("You have to disconnect the service first!"));
- 		    }
-@@ -215,9 +215,9 @@
- 		    break;
- 
- 		case 10:
--		    if(face.edit(tmp = conf.getawaymsg(pname),
-+		    if(face.edit(tmp = conf.getawaymsg((protocolname)pname),
- 		    spname + ": " + _("away message"))) {
--			conf.setawaymsg(pname, tmp);
-+			conf.setawaymsg((protocolname)pname, tmp);
- 		    }
- 		    break;
- 
-diff -r -u /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/centericq.cc ./src/centericq.cc
---- /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/centericq.cc	2004-04-11 19:32:27.000000000 +0300
-+++ ./src/centericq.cc	2004-05-04 13:38:34.300836064 +0300
-@@ -71,8 +71,8 @@
- 	if(p)
- 	if(rus = (((string) p).substr(0, 2) == "ru")) {
- 	    conf.setcharsets("cp1251", "koi8-r");
--	    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
--		conf.setcpconvert(pname, true);
-+	    for(int pname = icq; pname != protocolname_size; pname += 1)
-+		conf.setcpconvert((protocolname)pname, true);
- 	}
- 
- 	if(updateconf()) {
-@@ -118,20 +118,20 @@
- }
- 
- bool centericq::checkpasswords() {
--    protocolname pname;
-+    int pname;
-     icqconf::imaccount ia;
-     bool r;
- 
-     r = regmode = true;
- 
--    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
--	if(!gethook(pname).getCapabs().count(hookcapab::optionalpassword)) {
--	    if(!(ia = conf.getourid(pname)).empty()) {
-+    for(pname = icq; pname != protocolname_size; pname += 1) {
-+	if(!gethook((protocolname)pname).getCapabs().count(hookcapab::optionalpassword)) {
-+	    if(!(ia = conf.getourid((protocolname)pname)).empty()) {
- 		if(ia.password.empty()) {
- 		    conf.setsavepwd(false);
- 
- 		    ia.password = face.inputstr("[" +
--			conf.getprotocolname(pname) + "] " +
-+			conf.getprotocolname((protocolname)pname) + "] " +
- 			_("password: "), "", '*');
- 
- 		    if(ia.password.empty()) {
-@@ -150,10 +150,10 @@
- }
- 
- void centericq::inithooks() {
--    protocolname pname;
-+    int pname;
- 
--    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
--	gethook(pname).init();
-+    for(pname = icq; pname != protocolname_size; pname += 1) {
-+	gethook((protocolname)pname).init();
-     }
- }
- 
-@@ -836,25 +836,25 @@
- }
- 
- void centericq::rereadstatus() {
--    protocolname pname;
-+    int pname;
-     icqconf::imaccount ia;
- 
--    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
--	ia = conf.getourid(pname);
-+    for(pname = icq; pname != protocolname_size; pname += 1) {
-+	ia = conf.getourid((protocolname)pname);
- 
- 	if(!ia.empty()) {
- 	    char cst;
--	    imstatus st;
--	    string fname = conf.getconfigfname((string) "status-" + conf.getprotocolname(pname));
-+	    int st;
-+	    string fname = conf.getconfigfname((string) "status-" + conf.getprotocolname((protocolname)pname));
- 	    ifstream f(fname.c_str());
- 
- 	    if(f.is_open()) {
- 		f >> cst, f.close(), f.clear();
- 		unlink(fname.c_str());
- 
--		for(st = offline; st != imstatus_size; (int) st += 1) {
-+		for(st = offline; st != imstatus_size; st += 1) {
- 		    if(imstatus2char[st] == cst) {
--			gethook(pname).setstatus(st);
-+			gethook((protocolname)pname).setstatus((imstatus)st);
- 			break;
- 		    }
- 		}
-@@ -1360,7 +1360,7 @@
-     fd_set rfds, wfds, efds;
-     struct timeval tv;
-     int hsockfd;
--    protocolname pname;
-+    int pname;
- 
-     for(keypressed = fin = false; !keypressed && !fin; ) {
- 	timer_keypress = lastkeypress();
-@@ -1375,8 +1375,8 @@
- 	if(!regmode) {
- 	    exectimers();
- 
--	    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
--		abstracthook &hook = gethook(pname);
-+	    for(pname = icq; pname != protocolname_size; pname += 1) {
-+		abstracthook &hook = gethook((protocolname)pname);
- 
- 		if(hook.online()) {
- 		    hook.getsockets(rfds, wfds, efds, hsockfd);
-@@ -1394,8 +1394,8 @@
- 	    keypressed = true;
- 	    time(&timer_keypress);
- 	} else {
--	    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
--		abstracthook &hook = gethook(pname);
-+	    for(pname = icq; pname != protocolname_size; pname += 1) {
-+		abstracthook &hook = gethook((protocolname)pname);
- 
- 		if(hook.online())
- 		if(hook.isoursocket(rfds, wfds, efds)) {
-@@ -1410,7 +1410,7 @@
- }
- 
- void centericq::setauto(imstatus astatus) {
--    protocolname pname;
-+    int pname;
-     imstatus stcurrent;
-     static bool autoset = false;
-     bool nautoset, changed = false;
-@@ -1424,8 +1424,8 @@
- 	nautoset = false;
-     }
- 
--    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
--	abstracthook &hook = gethook(pname);
-+    for(pname = icq; pname != protocolname_size; pname += 1) {
-+	abstracthook &hook = gethook((protocolname)pname);
- 	stcurrent = hook.getstatus();
- 
- 	if(hook.logged())
-@@ -1437,7 +1437,7 @@
- 	    default:
- 		if(autoset && (astatus == available)) {
- 		    face.log(_("+ [%s] status restored"),
--			conf.getprotocolname(pname).c_str());
-+			conf.getprotocolname((protocolname)pname).c_str());
- 
- 		    hook.restorestatus();
- 		    nautoset = false;
-@@ -1452,7 +1452,7 @@
- 			nautoset = changed = true;
- 
- 			face.log(_("+ [%s] automatically set %s"),
--			    conf.getprotocolname(pname).c_str(),
-+			    conf.getprotocolname((protocolname)pname).c_str(),
- 			    astatus == away ? _("away") : _("n/a"));
- 		    }
- 		}
-@@ -1469,7 +1469,7 @@
- #define MINCK0(x, y)       (x ? (y ? (x > y ? y : x) : x) : y)
- 
- void centericq::exectimers() {
--    protocolname pname;
-+    int pname;
-     int paway, pna;
-     bool fonline = false;
- 
-@@ -1481,9 +1481,9 @@
-     *
-     */
- 
--    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
--	if(!conf.getourid(pname).empty() || (pname == rss)) {
--	    abstracthook &hook = gethook(pname);
-+    for(pname = icq; pname != protocolname_size; pname += 1) {
-+	if(!conf.getourid((protocolname)pname).empty() || (pname == rss)) {
-+	    abstracthook &hook = gethook((protocolname)pname);
- 
- 	    /*
- 	    *
-@@ -1495,7 +1495,7 @@
- 
- 	    static map<protocolname, reconnectInfo> reconnect;
- 
--	    if(timer_current-reconnect[pname].timer > reconnect[pname].period) {
-+	    if(timer_current-reconnect[(protocolname)pname].timer > reconnect[(protocolname)pname].period) {
- 		/*
- 		*
- 		* Any need to try auto re-connecting?
-@@ -1503,15 +1503,15 @@
- 		*/
- 
- 		if(!hook.logged()) {
--		    time(&reconnect[pname].timer);
-+		    time(&reconnect[(protocolname)pname].timer);
- 
--		    if(reconnect[pname].period < 180)
--			reconnect[pname].period += reconnect[pname].period/2;
-+		    if(reconnect[(protocolname)pname].period < 180)
-+			reconnect[(protocolname)pname].period += reconnect[(protocolname)pname].period/2;
- 
- 		    if(hook.online()) {
- 			hook.disconnect();
- 
--		    } else if(conf.getstatus(pname) != offline) {
-+		    } else if(conf.getstatus((protocolname)pname) != offline) {
- 			if(conf.enoughdiskspace() && !manager.isopen()) {
- 			    hook.connect();
- 			}
-@@ -1519,7 +1519,7 @@
- 		    }
- 		} else {
- 		    fonline = true;
--		    reconnect[pname] = reconnectInfo();
-+		    reconnect[(protocolname)pname] = reconnectInfo();
- 		}
- 	    }
- 	}
-@@ -1577,8 +1577,8 @@
- 
- 	if(!conf.enoughdiskspace()) {
- 	    if(fonline) {
--		for(pname = icq; pname != protocolname_size; (int) pname += 1)
--		    gethook(pname).disconnect();
-+		for(pname = icq; pname != protocolname_size; pname += 1)
-+		    gethook((protocolname)pname).disconnect();
- 
- 		face.log(_("! free disk space is less than 10k, going offline"));
- 		face.log(_("! otherwise we can lose events and configuration"));
-diff -r -u /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/hooks/abstracthook.cc ./src/hooks/abstracthook.cc
---- /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/hooks/abstracthook.cc	2004-04-11 19:32:28.000000000 +0300
-+++ ./src/hooks/abstracthook.cc	2004-05-04 12:25:17.237291328 +0300
-@@ -71,9 +71,9 @@
- void abstracthook::setstatus(imstatus st) {
-     setautostatus(manualstatus = st);
- 
--    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) {
--	if(&gethook(pname) == this) {
--	    conf.savestatus(pname, manualstatus);
-+    for(int pname = icq; pname != protocolname_size; pname += 1) {
-+	if(&gethook((protocolname)pname) == this) {
-+	    conf.savestatus((protocolname)pname, manualstatus);
- 	    break;
- 	}
-     }
-diff -r -u /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/icqconf.cc ./src/icqconf.cc
---- /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/icqconf.cc	2004-03-17 21:08:31.000000000 +0200
-+++ ./src/icqconf.cc	2004-05-04 12:58:09.218504616 +0300
-@@ -52,7 +52,7 @@
- 
-     savepwd = mailcheck = fenoughdiskspace = true;
- 
--    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) {
-+    for(int pname = icq; pname != protocolname_size; pname += 1) {
- 	chatmode[pname] = true;
- 	cpconvert[pname] = entersends[pname] = nonimonline[pname] = false;
-     }
-@@ -376,7 +376,7 @@
-     string fname = getconfigfname("config"), buf, param, rbuf;
-     ifstream f(fname.c_str());
-     imaccount im;
--    protocolname pname;
-+    int pname;
- 
-     if(f.is_open()) {
- 	mailcheck = askaway = false;
-@@ -418,10 +418,10 @@
- 		ptpmin = atoi(getword(buf, "-").c_str());
- 		ptpmax = atoi(buf.c_str());
- 	    } else {
--		for(pname = icq; pname != protocolname_size; (int) pname += 1) {
--		    buf = getprotocolname(pname);
-+		for(pname = icq; pname != protocolname_size; pname += 1) {
-+		    buf = getprotocolname((protocolname)pname);
- 		    if(param.substr(0, buf.size()) == buf) {
--			im = getourid(pname);
-+			im = getourid((protocolname)pname);
- 			im.read(rbuf);
- 			setourid(im);
- 		    }
-@@ -430,8 +430,8 @@
- 	}
- 
- 	if(fromcharset.empty() && tocharset.empty())
--	for(pname = icq; pname != protocolname_size; (int) pname += 1) {
--	    if(getcpconvert(pname)) {
-+	for(pname = icq; pname != protocolname_size; pname += 1) {
-+	    if(getcpconvert((protocolname)pname)) {
- 		fromcharset = "cp1251";
- 		tocharset = "koi8-r";
- 		break;
-@@ -470,26 +470,26 @@
- 	    if(getaskaway()) f << "askaway" << endl;
- 
- 	    param = "";
--	    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
--		if(getchatmode(pname)) param += (string) " " + conf.getprotocolname(pname);
-+	    for(int pname = icq; pname != protocolname_size; pname += 1)
-+		if(getchatmode((protocolname)pname)) param += (string) " " + conf.getprotocolname((protocolname)pname);
- 	    if(!param.empty())
- 		f << "chatmode" << param << endl;
- 
- 	    param = "";
--	    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
--		if(getentersends(pname)) param += (string) " " + conf.getprotocolname(pname);
-+	    for(int pname = icq; pname != protocolname_size; pname += 1)
-+		if(getentersends((protocolname)pname)) param += (string) " " + conf.getprotocolname((protocolname)pname);
- 	    if(!param.empty())
- 		f << "entersends" << param << endl;
- 
- 	    param = "";
--	    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
--		if(getnonimonline(pname)) param += (string) " " + conf.getprotocolname(pname);
-+	    for(int pname = icq; pname != protocolname_size; pname += 1)
-+		if(getnonimonline((protocolname)pname)) param += (string) " " + conf.getprotocolname((protocolname)pname);
- 	    if(!param.empty())
- 		f << "nonimonline" << param << endl;
- 
- 	    param = "";
--	    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
--		if(getcpconvert(pname)) param += (string) " " + conf.getprotocolname(pname);
-+	    for(int pname = icq; pname != protocolname_size; pname += 1)
-+		if(getcpconvert((protocolname)pname)) param += (string) " " + conf.getprotocolname((protocolname)pname);
- 	    if(!param.empty())
- 		f << "convert" << param << endl;
- 
-@@ -594,7 +594,7 @@
-     string tname = getconfigfname("sounds"), buf, suin, skey;
-     int n, ffuin, i;
-     icqcontact *c;
--    imevent::imeventtype it;
-+    int it;
- 
-     typedef pair<imevent::imeventtype, string> eventsound;
-     vector<eventsound> soundnames;
-@@ -609,8 +609,8 @@
-     for(i = 0; i < clist.count; i++) {
- 	c = (icqcontact *) clist.at(i);
- 
--	for(it = imevent::message; it != imevent::imeventtype_size; (int) it += 1) {
--	    c->setsound(it, "");
-+	for(it = imevent::message; it != imevent::imeventtype_size; it += 1) {
-+	    c->setsound((imevent::imeventtype)it, "");
- 	}
-     }
- 
-@@ -685,20 +685,20 @@
- 		    suin.erase(0, i+1);
- 
- 		    imcontact ic;
--		    protocolname pname;
-+		    int pname;
- 
--		    for(pname = icq; pname != protocolname_size && skey != getprotocolname(pname); (int) pname += 1);
-+		    for(pname = icq; pname != protocolname_size && skey != getprotocolname((protocolname)pname); pname += 1);
- 
- 		    if(pname != protocolname_size) {
- 			if(suin == "*") {
- 			    for(i = 0; i < clist.count; i++) {
- 				c = (icqcontact *) clist.at(i);
- 
--				if(c->getdesc().pname == pname) c->setsound(it, buf);
-+				if(c->getdesc().pname == pname) c->setsound((imevent::imeventtype)it, buf);
- 			    }
- 			} else {
--			    if(pname == icq) ic = imcontact(strtoul(suin.c_str(), 0, 0), pname);
--				else ic = imcontact(suin, pname);
-+			    if(pname == icq) ic = imcontact(strtoul(suin.c_str(), 0, 0), (protocolname)pname);
-+				else ic = imcontact(suin, (protocolname)pname);
- 
- 			    c = clist.get(ic);
- 			}
-@@ -708,7 +708,7 @@
- 		c = clist.get(contactroot);
- 	    }
- 
--	    if(c) c->setsound(it, buf);
-+	    if(c) c->setsound((imevent::imeventtype)it, buf);
- 	}
- 
- 	fi.close();
-@@ -1003,18 +1003,18 @@
- }
- 
- imstatus icqconf::getstatus(protocolname pname) {
--    imstatus st = available;
-+    int st = available;
-     map<string, string>::iterator ia;
-     imaccount a = getourid(pname);
- 
-     if((ia = a.additional.find("status")) != a.additional.end()) {
- 	if(!ia->second.empty()) {
--	    for(st = offline; st != imstatus_size && imstatus2char[st] != ia->second[0]; (int) st += 1);
-+	    for(st = offline; st != imstatus_size && imstatus2char[st] != ia->second[0]; st += 1);
- 	    if(st == imstatus_size) st = available;
- 	}
-     }
- 
--    return st;
-+    return (imstatus)st;
- }
- 
- void icqconf::savestatus(protocolname pname, imstatus st) {
-@@ -1099,8 +1099,8 @@
- 		<< "Written by Konstantin Klyagin." << endl
- 		<< "Built-in protocols are:";
- 
--	    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
--		if(gethook(pname).enabled()) cout << " " << conf.getprotocolname(pname);
-+	    for(int pname = icq; pname != protocolname_size; pname += 1)
-+		if(gethook((protocolname)pname).enabled()) cout << " " << conf.getprotocolname((protocolname)pname);
- 
- 	    cout << endl << endl
- 		<< "This is free software; see the source for copying conditions.  There is NO" << endl
-@@ -1150,11 +1150,11 @@
- 	}
- 	cdest = imcontact(strtoul(dest.c_str(), 0, 0), icq);
-     } else {
--	protocolname pname;
-+	int pname;
- 
--	for(pname = icq; pname != protocolname_size; (int) pname += 1) {
--	    if(getprotocolname(pname) == proto) {
--		cdest = imcontact(dest, pname);
-+	for(pname = icq; pname != protocolname_size; pname += 1) {
-+	    if(getprotocolname((protocolname)pname) == proto) {
-+		cdest = imcontact(dest, (protocolname)pname);
- 		break;
- 	    }
- 	}
-@@ -1212,16 +1212,16 @@
- }
- 
- void icqconf::externalstatuschange(char st, const string &proto) const {
--    imstatus imst;
--    protocolname pname;
-+    int imst;
-+    int pname;
-     int rpid;
- 
-     if(st) {
--	for(pname = icq; pname != protocolname_size; (int) pname += 1)
--	    if(getprotocolname(pname) == proto)
-+	for(pname = icq; pname != protocolname_size; pname += 1)
-+	    if(getprotocolname((protocolname)pname) == proto)
- 		break;
- 
--	for(imst = offline; imst != imstatus_size; (int) imst += 1)
-+	for(imst = offline; imst != imstatus_size; imst += 1)
- 	    if(imstatus2char[imst] == st)
- 		break;
- 
-@@ -1287,14 +1287,14 @@
- 
- void icqconf::initmultiproto(bool p[], string buf) {
-     string w;
--    protocolname pname;
-+    int pname;
- 
--    for(pname = icq; pname != protocolname_size; (int) pname += 1)
-+    for(pname = icq; pname != protocolname_size; pname += 1)
- 	p[pname] = buf.empty();
- 
-     while(!(w = getword(buf)).empty()) {
--	for(pname = icq; pname != protocolname_size; (int) pname += 1) {
--	    if(getprotocolname(pname) == w) {
-+	for(pname = icq; pname != protocolname_size; pname += 1) {
-+	    if(getprotocolname((protocolname)pname) == w) {
- 		p[pname] = true;
- 		break;
- 	    }
-diff -r -u /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/icqcontact.cc ./src/icqcontact.cc
---- /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/icqcontact.cc	2004-04-11 19:32:27.000000000 +0300
-+++ ./src/icqcontact.cc	2004-05-04 12:29:40.598254376 +0300
-@@ -48,8 +48,10 @@
-     finlist = true;
-     congratulated = false;
- 
--    for(ie = imevent::message; ie != imevent::imeventtype_size; (int) ie += 1)
--	sound[ie] = "";
-+    int int_ie;
-+    for(int_ie = imevent::message; int_ie != imevent::imeventtype_size; int_ie += 1)
-+	sound[(imevent::imeventtype)int_ie] = "";
-+    ie = (imevent::imeventtype)int_ie;
- 
-     cdesc = adesc;
- 
-diff -r -u /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/icqdialogs.cc ./src/icqdialogs.cc
---- /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/icqdialogs.cc	2004-04-01 11:01:13.000000000 +0300
-+++ ./src/icqdialogs.cc	2004-05-04 12:40:26.961992152 +0300
-@@ -174,13 +174,13 @@
-     imsearchparams ts;
- 
-     if(subj != fsrss) {
--	for(protocolname apname = icq; apname != protocolname_size; (int) apname += 1) {
-+	for(int apname = icq; apname != protocolname_size; apname += 1) {
- 	    if(subj == fschannel)
--	    if(!gethook(apname).getCapabs().count(hookcapab::conferencing))
-+	    if(!gethook((protocolname)apname).getCapabs().count(hookcapab::conferencing))
- 		continue;
- 
--	    if(gethook(apname).logged() || apname == infocard) {
--		penabled.push_back(apname);
-+	    if(gethook((protocolname)apname).logged() || apname == infocard) {
-+		penabled.push_back((protocolname)apname);
- 	    }
- 	}
- 
-@@ -937,8 +937,8 @@
-     m.setwindow(textwindow(4, LINES-8, 20, LINES-4, conf.getcolor(cp_dialog_menu)));
-     m.idle = &menuidle;
- 
--    for(imgender i = genderUnspec; i != imgender_size; (int) i += 1) {
--	m.additemf(0, (int) i, " %s", strgender(i));
-+    for(int i = genderUnspec; i != imgender_size; i += 1) {
-+	m.additemf(0, i, " %s", strgender((imgender)i));
- 	if(i == f) m.setpos(m.getcount()-1);
-     }
- 
-@@ -953,13 +953,13 @@
-     m.setwindow(textwindow(4, LINES-8, 18, LINES-3, conf.getcolor(cp_dialog_menu)));
-     m.idle = &menuidle;
- 
--    for(ICQ2000::AgeRange i = ICQ2000::RANGE_NORANGE; i <= ICQ2000::RANGE_60_ABOVE; (int) i += 1) {
--	const char *p = stragerange(i);
-+    for(int i = ICQ2000::RANGE_NORANGE; i <= ICQ2000::RANGE_60_ABOVE; i += 1) {
-+	const char *p = stragerange((ICQ2000::AgeRange)i);
- 
- 	if(i == ICQ2000::RANGE_NORANGE)
- 	    p = _("none");
- 
--	m.additemf(0, (int) i, " %s", p);
-+	m.additemf(0, i, " %s", p);
- 	if(i == r) m.setpos(m.getcount()-1);
-     }
- 
-@@ -1071,14 +1071,14 @@
- }
- 
- void icqface::multichange(bool conv[], bool newstate) {
--    protocolname pname;
-+    int pname;
- 
--    for(pname = icq; pname != protocolname_size; (int) pname += 1)
--	if((!conf.getourid(pname).empty() || pname == rss) && conv[pname]) break;
-+    for(pname = icq; pname != protocolname_size; pname += 1)
-+	if((!conf.getourid((protocolname)pname).empty() || pname == rss) && conv[pname]) break;
- 
-     if(pname == protocolname_size || !newstate) {
--	for(pname = icq; pname != protocolname_size; (int) pname += 1)
--	    if(!conf.getourid(pname).empty() || pname == rss)
-+	for(pname = icq; pname != protocolname_size; pname += 1)
-+	    if(!conf.getourid((protocolname)pname).empty() || pname == rss)
- 		conv[pname] = newstate;
-     }
- }
-@@ -1086,7 +1086,7 @@
- bool icqface::updateconf(icqconf::regsound &s, icqconf::regcolor &c) {
-     bool finished, success, hasany;
-     int nopt, n, i, b, nconf, ncomm, aaway, ana, noth, nfeat, ncl;
--    protocolname pname;
-+    int pname;
-     string tmp, phidden;
- 
-     string smtp = conf.getsmtphost() + ":" + i2str(conf.getsmtpport());
-@@ -1133,15 +1133,15 @@
-     bool chatmode[protocolname_size], conv[protocolname_size],
- 	entersends[protocolname_size], nonimonline[protocolname_size];
- 
--    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
--	chatmode[pname] = conf.getchatmode(pname);
--	entersends[pname] = conf.getentersends(pname);
--	conv[pname] = conf.getcpconvert(pname);
--	nonimonline[pname] = conf.getnonimonline(pname);
-+    for(pname = icq; pname != protocolname_size; pname += 1) {
-+	chatmode[pname] = conf.getchatmode((protocolname)pname);
-+	entersends[pname] = conf.getentersends((protocolname)pname);
-+	conv[pname] = conf.getcpconvert((protocolname)pname);
-+	nonimonline[pname] = conf.getnonimonline((protocolname)pname);
-     }
- 
--    for(hasany = false, pname = icq; pname != protocolname_size && !hasany; (int) pname += 1)
--	hasany = !conf.getourid(pname).empty();
-+    for(hasany = false, pname = icq; pname != protocolname_size && !hasany; pname += 1)
-+	hasany = !conf.getourid((protocolname)pname).empty();
- 
-     dialogbox db;
- 
-@@ -1183,10 +1183,10 @@
- 
- 	i = t.addnode(_(" Codepages conversion "));
- 
--	for(tmp = "", pname = icq; pname != protocolname_size; (int) pname += 1)
-+	for(tmp = "", pname = icq; pname != protocolname_size; pname += 1)
- 	if(conv[pname])
--	if(!conf.getourid(pname).empty() || pname == rss)
--	    tmp += conf.getprotocolname(pname) + " ";
-+	if(!conf.getourid((protocolname)pname).empty() || pname == rss)
-+	    tmp += conf.getprotocolname((protocolname)pname) + " ";
- 
- 	t.addleaff(i, 0, 26, _(" Switch to language preset : %s "), iconvlang->c_str());
- 	t.addleaff(i, 0, 27, _(" Convert from : %s "), convertfrom.c_str());
-@@ -1206,15 +1206,15 @@
- 	t.addleaff(i, 0,  7, _(" Edit away message on status change : %s "), stryesno(askaway));
- 
- 	if(hasany) {
--	    for(tmp = "", pname = icq; pname != protocolname_size; (int) pname += 1)
--		if(chatmode[pname] && !conf.getourid(pname).empty())
--		    tmp += conf.getprotocolname(pname) + " ";
-+	    for(tmp = "", pname = icq; pname != protocolname_size; pname += 1)
-+		if(chatmode[pname] && !conf.getourid((protocolname)pname).empty())
-+		    tmp += conf.getprotocolname((protocolname)pname) + " ";
- 
- 	    t.addleaff(i, 0, 16, _(" Chat messaging mode for : %s"), tmp.c_str());
- 
--	    for(tmp = "", pname = icq; pname != protocolname_size; (int) pname += 1)
--		if(entersends[pname] && !conf.getourid(pname).empty())
--		    tmp += conf.getprotocolname(pname) + " ";
-+	    for(tmp = "", pname = icq; pname != protocolname_size; pname += 1)
-+		if(entersends[pname] && !conf.getourid((protocolname)pname).empty())
-+		    tmp += conf.getprotocolname((protocolname)pname) + " ";
- 
- 	    t.addleaff(i, 0, 25, _(" Enter key sends message for : %s"), tmp.c_str());
- 
-@@ -1224,8 +1224,8 @@
- 
- 	}
- 
--	for(tmp = "", pname = icq; pname != protocolname_size; (int) pname += 1)
--	    if(nonimonline[pname]) tmp += conf.getprotocolname(pname) + " ";
-+	for(tmp = "", pname = icq; pname != protocolname_size; pname += 1)
-+	    if(nonimonline[pname]) tmp += conf.getprotocolname((protocolname)pname) + " ";
- 
- 	t.addleaff(i, 0, 29, _(" Always online non-IM contacts for : %s"), tmp.c_str());
- 
-@@ -1267,7 +1267,7 @@
- 			break;
- 		    case 3:
- 			if(hasany) selectproto(conv, spIMplusRSS); else
--			    for(pname = icq; pname != protocolname_size; (int) pname += 1)
-+			    for(pname = icq; pname != protocolname_size; pname += 1)
- 				conv[pname] = !conv[pname];
- 			break;
- 		    case 4:
-@@ -1288,7 +1288,7 @@
- 		    case 15: mailcheck = !mailcheck; break;
- 		    case 16:
- 			if(hasany) selectproto(chatmode); else
--			    for(pname = icq; pname != protocolname_size; (int) pname += 1)
-+			    for(pname = icq; pname != protocolname_size; pname += 1)
- 				chatmode[pname] = !chatmode[pname];
- 			break;
- 
-@@ -1328,7 +1328,7 @@
- 			break;
- 		    case 25:
- 			if(hasany) selectproto(entersends); else
--			    for(pname = icq; pname != protocolname_size; (int) pname += 1)
-+			    for(pname = icq; pname != protocolname_size; pname += 1)
- 				entersends[pname] = !entersends[pname];
- 			break;
- 		    case 26:
-@@ -1381,13 +1381,13 @@
- 		conf.setaskaway(askaway);
- 		conf.setcharsets(convertfrom, convertto);
- 
--		for(pname = icq; pname != protocolname_size; (int) pname += 1) {
--		    conf.setchatmode(pname, chatmode[pname]);
--		    conf.setentersends(pname, entersends[pname]);
--		    conf.setnonimonline(pname, nonimonline[pname]);
-+		for(pname = icq; pname != protocolname_size; pname += 1) {
-+		    conf.setchatmode((protocolname)pname, chatmode[pname]);
-+		    conf.setentersends((protocolname)pname, entersends[pname]);
-+		    conf.setnonimonline((protocolname)pname, nonimonline[pname]);
- 
- 		    bool bconv = conv[pname] && (!convertfrom.empty() || !convertto.empty());
--		    conf.setcpconvert(pname, bconv || !hasany);
-+		    conf.setcpconvert((protocolname)pname, bconv || !hasany);
- 		}
- 
- 		conf.setbidi(bidi);
-@@ -1419,17 +1419,17 @@
-     int i, protmax;
-     bool r, finished = false;
- 
--    protocolname pname;
-+    int pname;
-     protocolname tempprots[protocolname_size];
-     bool aprots[protocolname_size];
- 
-     i = 0;
-     memcpy(aprots, prots, sizeof(aprots));
- 
--    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
-+    for(pname = icq; pname != protocolname_size; pname += 1) {
- 	if(mode == spnonIM) {
- 	    if(pname != infocard)
--	    if(!gethook(pname).getCapabs().count(hookcapab::nochat))
-+	    if(!gethook((protocolname)pname).getCapabs().count(hookcapab::nochat))
- 		continue;
- 
- 	    if(pname == livejournal)
-@@ -1438,19 +1438,19 @@
- 	} else {
- 	    if(mode != spIMplusRSS || pname != rss)
- 	    if(pname != livejournal || mode == spIMonly) {
--		if(gethook(pname).getCapabs().count(hookcapab::nochat))
-+		if(gethook((protocolname)pname).getCapabs().count(hookcapab::nochat))
- 		    continue;
- 
--		if(conf.getourid(pname).empty())
-+		if(conf.getourid((protocolname)pname).empty())
- 		    continue;
- 
- 	    }
- 
--	    if(!gethook(pname).enabled())
-+	    if(!gethook((protocolname)pname).enabled())
- 		continue;
- 	}
- 
--	tempprots[i++] = pname;
-+	tempprots[i++] = (protocolname)pname;
-     }
- 
-     protmax = i;
-diff -r -u /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/icqface.cc ./src/icqface.cc
---- /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/icqface.cc	2004-04-11 19:32:28.000000000 +0300
-+++ ./src/icqface.cc	2004-05-04 13:29:21.551866680 +0300
-@@ -204,16 +204,16 @@
- 
- void icqface::showtopbar() {
-     string buf;
--    protocolname pname;
-+    int pname;
-     icqconf::imaccount ia;
- 
--    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
--	ia = conf.getourid(pname);
-+    for(pname = icq; pname != protocolname_size; pname += 1) {
-+	ia = conf.getourid((protocolname)pname);
- 
- 	if(!ia.empty()) {
- 	    buf += " ";
--	    buf += conf.getprotocolname(pname) + ":";
--	    buf += imstatus2char[gethook(pname).getstatus()];
-+	    buf += conf.getprotocolname((protocolname)pname) + ":";
-+	    buf += imstatus2char[gethook((protocolname)pname).getstatus()];
- //            buf += ">";
- 	}
-     }
-@@ -1302,7 +1302,7 @@
- 
- void icqface::makeprotocolmenu(verticalmenu &m) {
-     icqconf::imaccount ia;
--    protocolname ipname;
-+    int ipname;
- 
-     static const string pitems[protocolname_size] = {
- 	_(" [icq] ICQ network"),
-@@ -1317,11 +1317,11 @@
- 	""
-     };
- 
--    for(ipname = icq; ipname != protocolname_size; (int) ipname += 1) {
--	ia = conf.getourid(ipname);
-+    for(ipname = icq; ipname != protocolname_size; ipname += 1) {
-+	ia = conf.getourid((protocolname)ipname);
- 
- 	if(!ia.empty()) {
--	    m.additem(0, ipname, pitems[ipname]);
-+	    m.additem(0, (protocolname)ipname, pitems[ipname]);
- 	}
-     }
- }
-@@ -1333,20 +1333,21 @@
- 
-     vector<imstatus> mst;
-     vector<imstatus>::iterator im;
--    protocolname pname, onechoice;
-+    int pname;
-+    protocolname onechoice;
- 
-     m.setwindow(textwindow(sizeWArea.x1, sizeWArea.y1, sizeWArea.x1+27,
- 	sizeWArea.y1+9, conf.getcolor(cp_main_text)));
- 
-     m.idle = &menuidle;
- 
--    for(protcount = 0, pname = icq; pname != protocolname_size; (int) pname += 1) {
--	if(!conf.getourid(pname).empty()) {
-+    for(protcount = 0, pname = icq; pname != protocolname_size; pname += 1) {
-+	if(!conf.getourid((protocolname)pname).empty()) {
- 	    protcount++;
--	    onechoice = pname;
-+	    onechoice = (protocolname)pname;
- 	}
- 
--	alrlogged = alrlogged || gethook(pname).getstatus() != offline;
-+	alrlogged = alrlogged || gethook((protocolname)pname).getstatus() != offline;
-     }
- 
-     if(protcount < 2) {
-@@ -1369,15 +1370,15 @@
-     if(r = i) {
- 	switch(choice) {
- 	    case -1:
--		for(pname = icq; pname != protocolname_size; (int) pname += 1)
--		    if(!conf.getourid(pname).empty())
--			pnames.push_back(pname);
-+		for(pname = icq; pname != protocolname_size; pname += 1)
-+		    if(!conf.getourid((protocolname)pname).empty())
-+			pnames.push_back((protocolname)pname);
- 		break;
- 	    case -2:
--		for(pname = icq; pname != protocolname_size; (int) pname += 1)
--		    if(!conf.getourid(pname).empty())
--		    if(gethook(pname).getstatus() != offline)
--			pnames.push_back(pname);
-+		for(pname = icq; pname != protocolname_size; pname += 1)
-+		    if(!conf.getourid((protocolname)pname).empty())
-+		    if(gethook((protocolname)pname).getstatus() != offline)
-+			pnames.push_back((protocolname)pname);
- 		break;
- 	    default:
- 		pnames.push_back((protocolname) choice);
-@@ -1655,9 +1656,9 @@
- 
-     set<protocolname> ps;
-     if(cs == csvisible || cs == csinvisible) {
--	for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
--	    if(gethook(pname).getCapabs().count(hookcapab::visibility))
--		ps.insert(pname);
-+	for(int pname = icq; pname != protocolname_size; pname += 1)
-+	    if(gethook((protocolname)pname).getCapabs().count(hookcapab::visibility))
-+		ps.insert((protocolname)pname);
-     }
- 
-     lst.fillmenu(db.getmenu(), cs);
-diff -r -u /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/icqgroup.cc ./src/icqgroup.cc
---- /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/icqgroup.cc	2003-11-22 21:14:33.000000000 +0200
-+++ ./src/icqgroup.cc	2004-05-04 13:30:37.417333376 +0300
-@@ -82,6 +82,6 @@
-     string oldname = name;
-     name = aname;
- 
--    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
--	gethook(pname).renamegroup(oldname, name);
-+    for(int pname = icq; pname != protocolname_size; pname += 1)
-+	gethook((protocolname)pname).renamegroup(oldname, name);
- }
-diff -r -u /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/imevents.cc ./src/imevents.cc
---- /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/imevents.cc	2004-04-11 19:32:28.000000000 +0300
-+++ ./src/imevents.cc	2004-05-04 13:24:29.099326224 +0300
-@@ -62,11 +62,11 @@
- }
- 
- imevent::imeventtype imevent::gettype() const {
--    return type;
-+    return (imevent::imeventtype)type;
- }
- 
- imevent::imdirection imevent::getdirection() const {
--    return direction;
-+    return (imevent::imdirection)direction;
- }
- 
- imcontact imevent::getcontact() const {
-@@ -111,14 +111,14 @@
-     if(rdbuf == "\f")
- 	getstring(f, rdbuf);
- 
--    for(direction = incoming; direction != imdirection_size; (int) direction += 1)
-+    for(direction = incoming; direction != imdirection_size; direction += 1)
- 	if(sdirection[direction] == rdbuf) break;
- 
-     getstring(f, rdbuf);
-     type = imeventtype_size;
- 
-     if(rdbuf != "") {
--	for(type = message; type != imeventtype_size; (int) type += 1)
-+	for(type = message; type != imeventtype_size; type += 1)
- 	    if(seventtype[type] == rdbuf) break;
-     }
- 
-diff -r -u /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/imevents.h ./src/imevents.h
---- /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/imevents.h	2004-02-21 18:15:05.000000000 +0200
-+++ ./src/imevents.h	2004-05-04 13:19:30.965649432 +0300
-@@ -30,8 +30,8 @@
- 
-     protected:
- 	imcontact contact;
--	imeventtype type;
--	imdirection direction;
-+	int type;
-+	int direction;
- 	time_t senttimestamp;
- 	time_t timestamp;
- 
-diff -r -u /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/imexternal.cc ./src/imexternal.cc
---- /var/tmp/portage/centericq-4.9.12/work/centericq-4.9.12/src/imexternal.cc	2004-03-20 18:49:08.000000000 +0200
-+++ ./src/imexternal.cc	2004-05-04 12:42:57.835055960 +0300
-@@ -393,20 +393,20 @@
- 
- 	    if(param == "event") {
- 		while(!(param = getword(buf)).empty()) {
--		    for(imevent::imeventtype et = imevent::message; et != imevent::imeventtype_size; (int) et += 1) {
--			if((param == geteventname(et))
-+		    for(int et = imevent::message; et != imevent::imeventtype_size;  et += 1) {
-+			if((param == geteventname((imevent::imeventtype)et))
- 			|| (param == "all")) {
--			    event.insert(et);
-+			    event.insert((imevent::imeventtype)et);
- 			}
- 		    }
- 		}
- 
- 	    } else if(param == "proto") {
- 		while(!(param = getword(buf)).empty()) {
--		    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) {
--			if((param == conf.getprotocolname(pname))
-+		    for(int pname = icq; pname != protocolname_size; pname += 1) {
-+			if((param == conf.getprotocolname((protocolname)pname))
- 			|| (param == "all")) {
--			    proto.insert(pname);
-+			    proto.insert((protocolname)pname);
- 			}
- 		    }
- 		}
diff --git a/net-im/centericq/files/digest-centericq-4.14.0 b/net-im/centericq/files/digest-centericq-4.14.0
new file mode 100644
index 000000000000..96768f2a54d7
--- /dev/null
+++ b/net-im/centericq/files/digest-centericq-4.14.0
@@ -0,0 +1 @@
+MD5 9cb9ccde5dcd05a2006ef251e3571dcc centericq-4.14.0.tar.bz2 1283829
diff --git a/net-im/centericq/files/missing_namespace.patch b/net-im/centericq/files/missing_namespace.patch
deleted file mode 100644
index c765b51ff4ee..000000000000
--- a/net-im/centericq/files/missing_namespace.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN centericq-4.9.5/libicq2000-0.1/libicq2000/Xml.h centericq-4.9.5-namespace/libicq2000-0.1/libicq2000/Xml.h
---- centericq-4.9.5/libicq2000-0.1/libicq2000/Xml.h	2003-07-13 05:37:00.000000000 -0500
-+++ centericq-4.9.5-namespace/libicq2000-0.1/libicq2000/Xml.h	2003-07-16 03:34:08.000000000 -0500
-@@ -24,6 +24,8 @@
- #ifndef XML_H
- #define XML_H
- 
-+using namespace std;
-+
- #include <string>
- #include <list>
- #include <ctype.h>
diff --git a/net-im/centericq/files/nls.patch b/net-im/centericq/files/nls.patch
deleted file mode 100644
index 6fdea28865a1..000000000000
--- a/net-im/centericq/files/nls.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/hooks/HTTPClient.cc	2003-10-01 23:01:52.000000000 +0000
-+++ src/hooks/HTTPClient~.cc	2003-10-12 19:46:50.574377224 +0000
-@@ -273,7 +273,11 @@
- 	MessageEvent *ev = *m_queue.begin();
- 	ev->setDelivered(false);
- 	ev->setFinished(true);
-+	#ifdef ENABLE_NLS
- 	dynamic_cast<HTTPRequestEvent*>(ev)->setHTTPResp(gettext("Timed out"));
-+	#else
-+	dynamic_cast<HTTPRequestEvent*>(ev)->setHTTPResp("Timed out");
-+	#endif
- 	ev->setDeliveryFailureReason(MessageEvent::Failed);
- 	messageack.emit(ev);
-