* branch update

Package-Manager: portage-2.0.51.22-r2

4 files changed, 260 insertions, 32 deletions

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index 4a2d9d5713c5..25c10f6355cf 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,11 @@
 # 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.61 2005/08/25 04:24:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.62 2005/09/02 10:48:40 voxus Exp $
+
+*licq-1.3.0-r8 (02 Sep 2005)
+
+  02 Sep 2005; Konstantin Arkhipov <voxus@gentoo.org> +licq-1.3.0-r8.ebuild:
+  Probably the last branch update.
 
   25 Aug 2005; Aron Griffis <agriffis@gentoo.org> licq-1.3.0.ebuild:
   Move epatch to src_unpack.  Stable on ia64
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index ad597b2e35f8..e2d1d820a55e 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -1,36 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1d1b5091c92001b9fbedd644f98b047b ChangeLog 9782
-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 7b47a2f238a265b96a6bec3df10dbc67 files/1.3.0-include_iconv.patch 256
-MD5 d38a9fdc959bde15d9f463c2b288bed6 files/1.3.0-koloboks.patch 2955
-MD5 7613512e9464951b3c3fbb7983aac70c files/1.3.0-missing_chars.patch 316
-MD5 4d468b5f66d46b27840fb3ecf788bfbe files/1.3.0-msnpacket_sync.patch 513
-MD5 52dadf7b64ef4fb690c7892d94b445d6 files/1.3.0-no_stupid_koloboks.patch 3160
-MD5 24bcac53f7df732761fe3519b6581fa2 files/1.3.0-save_koloboks.patch 1033
-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 d6d219fd6946088cdcaa8a708cc209d2 files/digest-licq-1.3.0-r6 226
-MD5 519f2e13db3610087c70ccc1884c29d4 files/digest-licq-1.3.0-r7 307
+MD5 1e352af319b2d12a468b4f2fd93dd21e licq-1.3.0-r4.ebuild 4420
 MD5 f30c97a120a37f90edd8abdf612cd52a licq-1.2.7.ebuild 3368
+MD5 0279027e445f3bb8dd80ac12b788e1e5 licq-1.3.0-r6.ebuild 4963
+MD5 f8691d71dd37438ad228897e6e32b908 licq-1.3.0.ebuild 3800
+MD5 a6808e47945eee75b9f348efd890d7fd licq-1.3.0-r8.ebuild 5588
 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 d4604f150e6c91c43bd79128ac8a365f ChangeLog 9922
 MD5 0ebf34bdd8d7db53a7dbb99eb7f36412 licq-1.3.0-r7.ebuild 5455
-MD5 f8691d71dd37438ad228897e6e32b908 licq-1.3.0.ebuild 3800
 MD5 6ee65b2e61137a2656ef1d0deb541f1d metadata.xml 254
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDDbWpI1lqEGTUzyQRAriuAKCeFbrbCKn5lDJw2JWm5yHI9wQc+wCgz71I
-ggm985Z2LXTrTsd0nKtTTr4=
-=Tc8J
------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 519f2e13db3610087c70ccc1884c29d4 files/digest-licq-1.3.0-r7 307
+MD5 8ccd59c054d03443f0561e01d406d0a8 files/digest-licq-1.3.0-r8 388
+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/digest-licq-1.3.0-r8 b/net-im/licq/files/digest-licq-1.3.0-r8
new file mode 100644
index 000000000000..4afcf76c2112
--- /dev/null
+++ b/net-im/licq/files/digest-licq-1.3.0-r8
@@ -0,0 +1,5 @@
+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/licq-1.3.0-r8.ebuild b/net-im/licq/licq-1.3.0-r8.ebuild
new file mode 100644
index 000000000000..d18cc8c52908
--- /dev/null
+++ b/net-im/licq/licq-1.3.0-r8.ebuild
@@ -0,0 +1,226 @@
+# 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
+}