#86000 fixed

(Portage version: 2.0.51.19)

5 files changed, 212 insertions, 2 deletions

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index ce3d96e95738..372c2acdb759 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,12 @@
 # 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.52 2005/03/18 15:11:27 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.53 2005/03/20 16:54:48 voxus Exp $
+
+*licq-1.3.0-r3 (20 Mar 2005)
+
+  20 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> +licq-1.3.0-r3.ebuild,
+  +files/1.3.0-msnpacket_sync.patch:
+  Trivial fix for bug #86000.
 
 *licq-1.3.0-r2 (18 Mar 2005)
 
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index edbfceda47ec..1d7ac0be78fe 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -1,11 +1,14 @@
 MD5 69526f145fad83e4da0428a8bf08d832 licq-1.2.7.ebuild 3373
 MD5 8ed87dbba0842af5931937ace9957a52 licq-1.3.0-r1.ebuild 4037
 MD5 1a060d707747d04725904cf993e58d85 licq-1.3.0.ebuild 3787
-MD5 cb7f2e7ac359284bc1c1e308031f5de1 ChangeLog 8289
+MD5 af641b685ce8bbc2f9a0126a3c039876 licq-1.3.0-r3.ebuild 4227
+MD5 416918496f453ecdd0218a0866e6c116 ChangeLog 8464
 MD5 4591de5e9ce3061a5ea3ee964a397e28 licq-1.3.0-r2.ebuild 4132
 MD5 6ee65b2e61137a2656ef1d0deb541f1d metadata.xml 254
 MD5 b0a924ef22c21dd596d7918631f18559 files/digest-licq-1.3.0-r1 64
 MD5 2332f809f740f6e4433631eecda3335d files/digest-licq-1.3.0-r2 145
+MD5 2332f809f740f6e4433631eecda3335d files/digest-licq-1.3.0-r3 145
+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 52dadf7b64ef4fb690c7892d94b445d6 files/1.3.0-no_stupid_koloboks.patch 3160
diff --git a/net-im/licq/files/1.3.0-msnpacket_sync.patch b/net-im/licq/files/1.3.0-msnpacket_sync.patch
new file mode 100644
index 000000000000..33dec5264f5d
--- /dev/null
+++ b/net-im/licq/files/1.3.0-msnpacket_sync.patch
@@ -0,0 +1,11 @@
+--- 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/digest-licq-1.3.0-r3 b/net-im/licq/files/digest-licq-1.3.0-r3
new file mode 100644
index 000000000000..574dbf4158e6
--- /dev/null
+++ b/net-im/licq/files/digest-licq-1.3.0-r3
@@ -0,0 +1,2 @@
+MD5 c1b05d1078b9826273191c05d0d1a969 licq-1.3.0.tar.bz2 4284325
+MD5 9d27f4422743c4c5aadb8bd5f5a84466 licq-branch-update-20050315.patch.bz2 27952
diff --git a/net-im/licq/licq-1.3.0-r3.ebuild b/net-im/licq/licq-1.3.0-r3.ebuild
new file mode 100644
index 000000000000..da5dc6bf00ac
--- /dev/null
+++ b/net-im/licq/licq-1.3.0-r3.ebuild
@@ -0,0 +1,188 @@
+# 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.1 2005/03/20 16:54:48 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"
+
+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.0.0 )
+	ncurses? ( sys-libs/ncurses =dev-libs/cdk-4.9.11.20031210-r1 )
+	crypt? ( >=app-crypt/gpgme-1.0.0 )"
+
+S=${WORKDIR}/${P}
+
+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
+}