* closing #97982, #98263 and #98584

(Portage version: 2.0.51.22-r1)

7 files changed, 282 insertions, 26 deletions

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index 544d3a96c229..c134d9baa479 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,13 @@
 # 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.57 2005/07/07 04:52:23 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.58 2005/07/14 19:37:41 voxus Exp $
+
+*licq-1.3.0-r6 (14 Jul 2005)
+
+  14 Jul 2005; Konstantin Arkhipov <voxus@gentoo.org> +licq-1.3.0-r6.ebuild,
+  +files/1.3.0-include_iconv.patch, +files/1.3.0-missing_chars.patch,
+  +files/1.3.0-save_koloboks.patch:
+  Closing bugs #97982, #98263 and #98584.
 
   07 Jul 2005; Caleb Tennis <caleb@gentoo.org> licq-1.2.7.ebuild,
   licq-1.3.0.ebuild, licq-1.3.0-r3.ebuild, licq-1.3.0-r4.ebuild,
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index 3fae2fce5cf9..8206b7d764fa 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -1,29 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4477fe7580cbb0196ba0399398007426 ChangeLog 9193
-MD5 c18e90be9c36c7efb06211733ad765ff files/1.2.7-debugflag.patch 396
-MD5 5f64e4b71c311ff7b6489953fc8bf1f9 files/1.2.7-nptl.patch 1178
-MD5 5dbb2a47d1d863a55f564e874c871d30 files/1.3.0-gpgme3_hack.patch 878
-MD5 d38a9fdc959bde15d9f463c2b288bed6 files/1.3.0-koloboks.patch 2955
-MD5 4d468b5f66d46b27840fb3ecf788bfbe files/1.3.0-msnpacket_sync.patch 513
-MD5 52dadf7b64ef4fb690c7892d94b445d6 files/1.3.0-no_stupid_koloboks.patch 3160
-MD5 100dc5f1d551dc769a337a71734d0e59 files/1.3.0-suse_bool.patch 191
-MD5 3795e526fdf015e985be17fca698e2d1 files/digest-licq-1.2.7 64
-MD5 b0a924ef22c21dd596d7918631f18559 files/digest-licq-1.3.0 64
-MD5 2332f809f740f6e4433631eecda3335d files/digest-licq-1.3.0-r3 145
-MD5 2332f809f740f6e4433631eecda3335d files/digest-licq-1.3.0-r4 145
-MD5 d6d219fd6946088cdcaa8a708cc209d2 files/digest-licq-1.3.0-r5 226
+MD5 1e352af319b2d12a468b4f2fd93dd21e licq-1.3.0-r4.ebuild 4420
 MD5 f30c97a120a37f90edd8abdf612cd52a licq-1.2.7.ebuild 3368
+MD5 37270892698aa13451cfc7a9da89646a licq-1.3.0-r6.ebuild 4963
+MD5 0e85dd4498bf89db7c161ae23372341f licq-1.3.0.ebuild 3766
 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 0e85dd4498bf89db7c161ae23372341f licq-1.3.0.ebuild 3766
+MD5 4477fe7580cbb0196ba0399398007426 ChangeLog 9193
 MD5 6ee65b2e61137a2656ef1d0deb541f1d metadata.xml 254
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0HO1I1lqEGTUzyQRAnzJAKDAhSfuQWA6wXN2QYvJN/Eo5Z5C/gCeO2EG
-n2rfxdGVJZ/OqJZCGGT6ThM=
-=wsJ/
------END PGP SIGNATURE-----
+MD5 2332f809f740f6e4433631eecda3335d files/digest-licq-1.3.0-r3 145
+MD5 2332f809f740f6e4433631eecda3335d files/digest-licq-1.3.0-r4 145
+MD5 d6d219fd6946088cdcaa8a708cc209d2 files/digest-licq-1.3.0-r5 226
+MD5 d6d219fd6946088cdcaa8a708cc209d2 files/digest-licq-1.3.0-r6 226
+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 c18e90be9c36c7efb06211733ad765ff files/1.2.7-debugflag.patch 396
+MD5 100dc5f1d551dc769a337a71734d0e59 files/1.3.0-suse_bool.patch 191
+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
diff --git a/net-im/licq/files/1.3.0-include_iconv.patch b/net-im/licq/files/1.3.0-include_iconv.patch
new file mode 100644
index 000000000000..e62430ee00eb
--- /dev/null
+++ b/net-im/licq/files/1.3.0-include_iconv.patch
@@ -0,0 +1,10 @@
+--- 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-missing_chars.patch b/net-im/licq/files/1.3.0-missing_chars.patch
new file mode 100644
index 000000000000..9c12ffcd6bcb
--- /dev/null
+++ b/net-im/licq/files/1.3.0-missing_chars.patch
@@ -0,0 +1,10 @@
+--- 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-save_koloboks.patch b/net-im/licq/files/1.3.0-save_koloboks.patch
new file mode 100644
index 000000000000..8119c9bfd5b3
--- /dev/null
+++ b/net-im/licq/files/1.3.0-save_koloboks.patch
@@ -0,0 +1,18 @@
+--- 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-r6 b/net-im/licq/files/digest-licq-1.3.0-r6
new file mode 100644
index 000000000000..c08397616e88
--- /dev/null
+++ b/net-im/licq/files/digest-licq-1.3.0-r6
@@ -0,0 +1,3 @@
+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/licq-1.3.0-r6.ebuild b/net-im/licq/licq-1.3.0-r6.ebuild
new file mode 100644
index 000000000000..7895a4c68173
--- /dev/null
+++ b/net-im/licq/licq-1.3.0-r6.ebuild
@@ -0,0 +1,213 @@
+# 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
+}