* bump

(Portage version: 2.0.53_rc6)

10 files changed, 27 insertions, 451 deletions

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index e3abf65e27e2..9db68a5a7323 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.66 2005/10/19 11:17:12 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.67 2005/10/21 16:08:34 voxus Exp $
+
+*licq-1.3.2 (21 Oct 2005)
+
+  21 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> -licq-1.3.2_rc1.ebuild,
+  -licq-1.3.2_rc2.ebuild, -licq-1.3.2_rc3.ebuild, +files/1.3.2-email_typo.patch,
+  +licq-1.3.2.ebuild:
+  Bump to final release.
 
 *licq-1.3.2_rc3 (19 Oct 2005)
 
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index 36da0d267d6c..2d03a7328017 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -4,14 +4,11 @@ MD5 5f64e4b71c311ff7b6489953fc8bf1f9 files/1.2.7-nptl.patch 1178
 MD5 5dbb2a47d1d863a55f564e874c871d30 files/1.3.0-gpgme3_hack.patch 878
 MD5 52dadf7b64ef4fb690c7892d94b445d6 files/1.3.0-no_stupid_koloboks.patch 3160
 MD5 100dc5f1d551dc769a337a71734d0e59 files/1.3.0-suse_bool.patch 191
+MD5 60faacd9044ad4dd88db77e0bd53dc7f files/1.3.2-email_typo.patch 620
 MD5 3795e526fdf015e985be17fca698e2d1 files/digest-licq-1.2.7 64
 MD5 b0a924ef22c21dd596d7918631f18559 files/digest-licq-1.3.0 64
-MD5 8124caae500e8e705dc712c346268385 files/digest-licq-1.3.2_rc1 67
-MD5 95f2796fd0ca2da4e48996a4ba8f3226 files/digest-licq-1.3.2_rc2 67
-MD5 5e3f22705cf1050fac3fed1288fbabf4 files/digest-licq-1.3.2_rc3 67
+MD5 b7d176e7d3091d82fed1f4931604b327 files/digest-licq-1.3.2 64
 MD5 f30c97a120a37f90edd8abdf612cd52a licq-1.2.7.ebuild 3368
 MD5 f8691d71dd37438ad228897e6e32b908 licq-1.3.0.ebuild 3800
-MD5 656e37eb3e2065039c7b7f641536e9a9 licq-1.3.2_rc1.ebuild 4868
-MD5 7ffeea7bd4e4e1abadd8f8323164d363 licq-1.3.2_rc2.ebuild 4868
-MD5 ff6a8226f37f7cab958792d2f56fb0fb licq-1.3.2_rc3.ebuild 4868
+MD5 763d781915a235b37bef751bda27969c licq-1.3.2.ebuild 4872
 MD5 7adc6310a4dbd42bad26caa80683d4ec metadata.xml 249
diff --git a/net-im/licq/files/1.3.2-email_typo.patch b/net-im/licq/files/1.3.2-email_typo.patch
new file mode 100644
index 000000000000..07237eb6bd48
--- /dev/null
+++ b/net-im/licq/files/1.3.2-email_typo.patch
@@ -0,0 +1,11 @@
+--- plugins/email/src/forwarder.cpp	2005-10-21 19:55:08.032358648 +0400
++++ plugins/email/src/forwarder.cpp	2005-10-21 19:55:13.245566120 +0400
+@@ -373,7 +373,7 @@
+     if (nPPID == LICQ_PPID)
+       sprintf (szFrom, "From: \"%s\" <%s@pager.icq.com>", u->GetAlias(), u->IdString());
+     else
+-      sprintf (szFrom, "From: \"%s\" <%s>", u->GeAlias(), u->GetEmailPrimary());
++      sprintf (szFrom, "From: \"%s\" <%s>", u->GetAlias(), u->GetEmailPrimary());
+     sprintf (szReplyTo, "Reply-To: \"%s %s\" <%s>", u->GetFirstName(), u->GetLastName(), u->GetEmailPrimary());
+   }
+   sprintf (szDate, "Date: %s", ctime(&t));
diff --git a/net-im/licq/files/digest-licq-1.3.2 b/net-im/licq/files/digest-licq-1.3.2
new file mode 100644
index 000000000000..38bccae79e8a
--- /dev/null
+++ b/net-im/licq/files/digest-licq-1.3.2
@@ -0,0 +1 @@
+MD5 0471bb8fed91eefb23dfe153c9a4a806 licq-1.3.2.tar.bz2 3980117
diff --git a/net-im/licq/files/digest-licq-1.3.2_rc1 b/net-im/licq/files/digest-licq-1.3.2_rc1
deleted file mode 100644
index e73c24bb40c0..000000000000
--- a/net-im/licq/files/digest-licq-1.3.2_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 de36241e1465988c3550693d99e0c624 licq-1.3.2RC1.tar.bz2 3744071
diff --git a/net-im/licq/files/digest-licq-1.3.2_rc2 b/net-im/licq/files/digest-licq-1.3.2_rc2
deleted file mode 100644
index 73dbc1d9f96e..000000000000
--- a/net-im/licq/files/digest-licq-1.3.2_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3edb6220dc4a4730e5e8a5522f3ff22c licq-1.3.2RC2.tar.bz2 3771206
diff --git a/net-im/licq/files/digest-licq-1.3.2_rc3 b/net-im/licq/files/digest-licq-1.3.2_rc3
deleted file mode 100644
index 9bd726a50f1b..000000000000
--- a/net-im/licq/files/digest-licq-1.3.2_rc3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 83663a9034da5ac25fcd1544e7c1b4e3 licq-1.3.2RC3.tar.bz2 3776482
diff --git a/net-im/licq/licq-1.3.2_rc2.ebuild b/net-im/licq/licq-1.3.2.ebuild
index fc71accd2072..f76fb9c0049a 100644
--- a/net-im/licq/licq-1.3.2_rc2.ebuild
+++ b/net-im/licq/licq-1.3.2.ebuild
@@ -1,12 +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.2_rc2.ebuild,v 1.1 2005/10/02 01:00:14 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.2.ebuild,v 1.1 2005/10/21 16:08:34 voxus Exp $
 
 inherit eutils kde-functions multilib
 
 DESCRIPTION="ICQ Client with v8 support"
 HOMEPAGE="http://www.licq.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_rc/RC}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
@@ -26,8 +26,6 @@ DEPEND="kde? ( >=kde-base/kdelibs-3.0 )
 	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}
 
@@ -74,7 +72,7 @@ src_compile() {
 		myconf="${myconf} --disable-gpgme"
 	fi
 
-	for n in `echo auto-reply console email msn osd qt-gui rms`; do
+	for n in `echo auto-reply console email msn qt-gui rms`; do
 		cd ${S}/plugins/${n}
 
 		ebegin "Recreating configure in plugins/${n}"
@@ -154,6 +152,7 @@ src_compile() {
 
 	# Email PLugin
 	cd ${S}/plugins/email
+	epatch ${FILESDIR}/${PV}-email_typo.patch
 	einfo "Compiling Email plug-in"
 	econf || die
 	emake || die
diff --git a/net-im/licq/licq-1.3.2_rc1.ebuild b/net-im/licq/licq-1.3.2_rc1.ebuild
deleted file mode 100644
index 1b7e7fe926f4..000000000000
--- a/net-im/licq/licq-1.3.2_rc1.ebuild
+++ /dev/null
@@ -1,218 +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.2_rc1.ebuild,v 1.1 2005/10/01 14:58:52 voxus Exp $
-
-inherit eutils kde-functions multilib
-
-DESCRIPTION="ICQ Client with v8 support"
-HOMEPAGE="http://www.licq.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_rc/RC}.tar.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 )"
-
-S="${WORKDIR}/${P/_rc/RC}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	use ncurses && epatch ${FILESDIR}/1.3.0-suse_bool.patch
-
-	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
-
-	# 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() {
-
-	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
-
-	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 && {
-		# 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"
-		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.2_rc3.ebuild b/net-im/licq/licq-1.3.2_rc3.ebuild
deleted file mode 100644
index ebe416363a71..000000000000
--- a/net-im/licq/licq-1.3.2_rc3.ebuild
+++ /dev/null
@@ -1,218 +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.2_rc3.ebuild,v 1.1 2005/10/19 11:17:12 voxus Exp $
-
-inherit eutils kde-functions multilib
-
-DESCRIPTION="ICQ Client with v8 support"
-HOMEPAGE="http://www.licq.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_rc/RC}.tar.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 )"
-
-S="${WORKDIR}/${P/_rc/RC}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	use ncurses && epatch ${FILESDIR}/1.3.0-suse_bool.patch
-
-	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
-
-	# 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() {
-
-	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
-
-	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 && {
-		# 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"
-		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
-}