* bump, closing bug #144718

Package-Manager: portage-2.1.2_pre3-r4

6 files changed, 264 insertions, 14 deletions

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index 9e83a93bbd36..6a8e4b85b19c 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/licq
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.83 2006/09/24 09:10:17 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.84 2006/10/18 14:42:23 voxus Exp $
+
+*licq-1.3.4 (18 Oct 2006)
+
+  18 Oct 2006; Konstantin V. Arkhipov <voxus@gentoo.org> +licq-1.3.4.ebuild:
+  Version bump, closing bug #144718.
 
   24 Sep 2006; Michael Hanselmann <hansmi@gentoo.org> licq-1.3.2-r1.ebuild:
   Stable on ppc.
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index 6ecf2df41219..e503ed81f55d 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.2.7-debugflag.patch 396 RMD160 c1c52e57c34dd1b218fd26b338be7b3a47aa7cc6 SHA1 c184cb6d3aa70a3790a2b16a669d483d1f9ba666 SHA256 a00700f5170bf56bef28ffce010c530734f97fbf5d4341b08e9804d022314655
 MD5 c18e90be9c36c7efb06211733ad765ff files/1.2.7-debugflag.patch 396
 RMD160 c1c52e57c34dd1b218fd26b338be7b3a47aa7cc6 files/1.2.7-debugflag.patch 396
@@ -26,9 +29,11 @@ AUX licq-1.3.2-gcc41.patch 1238 RMD160 99a4628325ee2818a215dd2af870b0fdd7a76659
 MD5 c493da59c47a80c87d079309fc47c880 files/licq-1.3.2-gcc41.patch 1238
 RMD160 99a4628325ee2818a215dd2af870b0fdd7a76659 files/licq-1.3.2-gcc41.patch 1238
 SHA256 eca8a5920942d8ce938e3bf907daf4f5353721a95af4447db9e65874b58e745e files/licq-1.3.2-gcc41.patch 1238
-DIST licq-1.2.7.tar.bz2 3407644
-DIST licq-1.3.0.tar.bz2 4284325
-DIST licq-1.3.2.tar.bz2 3980117 RMD160 19242437cce5ec3fd9bde6be50a4e29a8654950b SHA256 3c6ec77d42973c93a9d1926a3aa444ff0388263f38a19c9b51e1337cde60f8bc
+DIST licq-1.2.7.tar.bz2 3407644 RMD160 6e0653fd730e9b0d5439589591d71d3b39c3af58 SHA1 e2c072863a8021bd9d754438de4404f07f2a0018 SHA256 a5a026ef5af4d19a3d56aff3ec6972e5ac1c3739a1c76ba2304ae8c81d48f9eb
+DIST licq-1.3.0.tar.bz2 4284325 RMD160 fce5ca851ce2be09a2ebd8fad28d28248725c1f9 SHA1 9e782c6a451411c137e43ab2e4cd03ffcffa17e7 SHA256 f7d6574f5ee6fea5234da269ab09756c26f05d725580f72e482d53d40e1bd47c
+DIST licq-1.3.2.tar.bz2 3980117 RMD160 19242437cce5ec3fd9bde6be50a4e29a8654950b SHA1 c31dc3e995be13b4d7957715b77f2d3338d14eab SHA256 3c6ec77d42973c93a9d1926a3aa444ff0388263f38a19c9b51e1337cde60f8bc
+DIST licq-1.3.4.tar.bz2 3088438 RMD160 2251da50f5a37903b57cf74d331b4ead693f4e23 SHA1 08485a4a445aae64f6065724527d28a4cb074038 SHA256 eed39b1fa78d6c03655babc6cb03155ed71391ec1422752d0611bd2583c2f608
+DIST licq-branch-update-20060203.patch.bz2 41685 RMD160 69c61afb3d25d6d6084c158482d8889181ae3fa2 SHA1 572db6d94dbf696b5489b1c11910296c97a7567a SHA256 25df9f213494d2396f9c7c5dc66ba4030c93a8a7f10e7af2f31780fce18a0a49
 EBUILD licq-1.2.7.ebuild 3408 RMD160 93aaadc7b3ea0cf4d7fb2241103546517866e40e SHA1 9ffd33ea4db6ef32763b30ecb5451d32094fbf0e SHA256 9fa9b7a236ef855457731e884dcf334cfaad3eb3446577037fb3c0ef87924417
 MD5 1b4d8d3f57a8e60d2a055df916e1631c licq-1.2.7.ebuild 3408
 RMD160 93aaadc7b3ea0cf4d7fb2241103546517866e40e licq-1.2.7.ebuild 3408
@@ -45,23 +50,37 @@ EBUILD licq-1.3.2.ebuild 4895 RMD160 bdec2a191ad39da76c807576e7a8b2addb542e9f SH
 MD5 7db7a50bc198264c35d6340b5e31ca4a licq-1.3.2.ebuild 4895
 RMD160 bdec2a191ad39da76c807576e7a8b2addb542e9f licq-1.3.2.ebuild 4895
 SHA256 e1cc635403af5e2959929cd3b26f53f21aff7ce9d276cf0a57f83b512ad435b0 licq-1.3.2.ebuild 4895
-MISC ChangeLog 13002 RMD160 a5513d7340d6b11a3477403ec85092b331851ffb SHA1 06b05366500e5ddc6d73ecdcdb6961ee74a3ac2d SHA256 31fe0c957725cf217ea88fd8f6b0633cfc54c3f81b7b0d85aa8c3e937612e3e9
-MD5 6f769de2f1420bbcb6ec7e00b2dc9b54 ChangeLog 13002
-RMD160 a5513d7340d6b11a3477403ec85092b331851ffb ChangeLog 13002
-SHA256 31fe0c957725cf217ea88fd8f6b0633cfc54c3f81b7b0d85aa8c3e937612e3e9 ChangeLog 13002
+EBUILD licq-1.3.4.ebuild 4887 RMD160 3177b27e415a527fb629e1babf40d44b98374254 SHA1 76904dad0fe3f689e7d5d18e9efedac7769ae071 SHA256 7bb786ac641a622c4ce144491ad91f7efa6230383c443f18891a0f7e536d9623
+MD5 d4b17f0dbc5c0301076d9078f062a01c licq-1.3.4.ebuild 4887
+RMD160 3177b27e415a527fb629e1babf40d44b98374254 licq-1.3.4.ebuild 4887
+SHA256 7bb786ac641a622c4ce144491ad91f7efa6230383c443f18891a0f7e536d9623 licq-1.3.4.ebuild 4887
+MISC ChangeLog 13143 RMD160 d1f4ccaf1835795e98d61a4b59cf54b5999bf7c2 SHA1 ef9e7e2be4f65bab528a97674438fe4713f92dfc SHA256 62dab35b7cd0f8a2232f4b28f1d9705968dca31ed3b74a8963e67eedf20d4728
+MD5 f690b41efca1dbd8a73087c385608cb7 ChangeLog 13143
+RMD160 d1f4ccaf1835795e98d61a4b59cf54b5999bf7c2 ChangeLog 13143
+SHA256 62dab35b7cd0f8a2232f4b28f1d9705968dca31ed3b74a8963e67eedf20d4728 ChangeLog 13143
 MISC metadata.xml 249 RMD160 09f64f681d0dd11fd8a5784ae17b7eaaa87cc12f SHA1 936e8c76314d77517317065331498434f2c59674 SHA256 bfa15ab9faf7742a9f33d2ba72410a089690beb639884f357b135951cd663230
 MD5 7adc6310a4dbd42bad26caa80683d4ec metadata.xml 249
 RMD160 09f64f681d0dd11fd8a5784ae17b7eaaa87cc12f metadata.xml 249
 SHA256 bfa15ab9faf7742a9f33d2ba72410a089690beb639884f357b135951cd663230 metadata.xml 249
-MD5 3795e526fdf015e985be17fca698e2d1 files/digest-licq-1.2.7 64
-RMD160 072fc2d49a3387b2ad781155dea82a78a457266f files/digest-licq-1.2.7 64
-SHA256 8e8ed4a8d98a7d8af1456a3811d3793c4fb326a55b2a84c42bac403b1d939eca files/digest-licq-1.2.7 64
-MD5 b0a924ef22c21dd596d7918631f18559 files/digest-licq-1.3.0 64
-RMD160 7e9e4bf0ae34e11e876fcd1c5d7c3cd9ddd31c3b files/digest-licq-1.3.0 64
-SHA256 c6f59d6e143febf42e5c1eb8090eace762be301a3d493076dbf10795dfc29b1a files/digest-licq-1.3.0 64
+MD5 dc2567f6dec8381657992658f38a1424 files/digest-licq-1.2.7 238
+RMD160 13b42397bb7f05d2ec087d779dda0e833661f8dc files/digest-licq-1.2.7 238
+SHA256 dbe457a74fc8ceea00dfa661b4a387ca77c98dbc6a1dffcc4a8cb9dfbc86acea files/digest-licq-1.2.7 238
+MD5 903885e1256666f9fb38e685b54f6456 files/digest-licq-1.3.0 238
+RMD160 e7c9e0cee786c20e5141458e8ee98bb614580ae0 files/digest-licq-1.3.0 238
+SHA256 6658b0ba2db9ead2246cb5fa78e6d3ac6b78267eabe76a156d5648e361561587 files/digest-licq-1.3.0 238
 MD5 5cf1f1e3a3bac2f951531b04661d56e6 files/digest-licq-1.3.2 238
 RMD160 eb01ac57f0b87dd1b96636323b46cb6a0fe2ed0a files/digest-licq-1.3.2 238
 SHA256 d725a8686268a70d3eb84733378532356e9943e158b26129262c1770da4dfa76 files/digest-licq-1.3.2 238
 MD5 5cf1f1e3a3bac2f951531b04661d56e6 files/digest-licq-1.3.2-r1 238
 RMD160 eb01ac57f0b87dd1b96636323b46cb6a0fe2ed0a files/digest-licq-1.3.2-r1 238
 SHA256 d725a8686268a70d3eb84733378532356e9943e158b26129262c1770da4dfa76 files/digest-licq-1.3.2-r1 238
+MD5 4a9fbb28f5a080826cd435430cccb1ea files/digest-licq-1.3.4 527
+RMD160 c5c2bd37dcf0bd0ac68759a093ebf2ab5aa6dc40 files/digest-licq-1.3.4 527
+SHA256 ed23d0a4b458f45226e383c29b211e73bebfe1d67a5341523f1afa65c942bdef files/digest-licq-1.3.4 527
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFNj1dbwxeDFj+ScoRAldRAJ49UQYkhgB5mHrRXTe/bmP06bAYSQCcCViX
+PCF02dhrMF6/Xh+Ak54rVGw=
+=DCgH
+-----END PGP SIGNATURE-----
diff --git a/net-im/licq/files/digest-licq-1.2.7 b/net-im/licq/files/digest-licq-1.2.7
index 748f4d8e91f3..13d53d07be29 100644
--- a/net-im/licq/files/digest-licq-1.2.7
+++ b/net-im/licq/files/digest-licq-1.2.7
@@ -1 +1,3 @@
 MD5 e331c88151b95330f0b9b08570853318 licq-1.2.7.tar.bz2 3407644
+RMD160 6e0653fd730e9b0d5439589591d71d3b39c3af58 licq-1.2.7.tar.bz2 3407644
+SHA256 a5a026ef5af4d19a3d56aff3ec6972e5ac1c3739a1c76ba2304ae8c81d48f9eb licq-1.2.7.tar.bz2 3407644
diff --git a/net-im/licq/files/digest-licq-1.3.0 b/net-im/licq/files/digest-licq-1.3.0
index 56eda9b63050..97d757f47239 100644
--- a/net-im/licq/files/digest-licq-1.3.0
+++ b/net-im/licq/files/digest-licq-1.3.0
@@ -1 +1,3 @@
 MD5 c1b05d1078b9826273191c05d0d1a969 licq-1.3.0.tar.bz2 4284325
+RMD160 fce5ca851ce2be09a2ebd8fad28d28248725c1f9 licq-1.3.0.tar.bz2 4284325
+SHA256 f7d6574f5ee6fea5234da269ab09756c26f05d725580f72e482d53d40e1bd47c licq-1.3.0.tar.bz2 4284325
diff --git a/net-im/licq/files/digest-licq-1.3.4 b/net-im/licq/files/digest-licq-1.3.4
new file mode 100644
index 000000000000..80ce7a407d36
--- /dev/null
+++ b/net-im/licq/files/digest-licq-1.3.4
@@ -0,0 +1,6 @@
+MD5 3bab0c9d1977f9b14421d36110e17e0c licq-1.3.4.tar.bz2 3088438
+RMD160 2251da50f5a37903b57cf74d331b4ead693f4e23 licq-1.3.4.tar.bz2 3088438
+SHA256 eed39b1fa78d6c03655babc6cb03155ed71391ec1422752d0611bd2583c2f608 licq-1.3.4.tar.bz2 3088438
+MD5 17e1046925c642acad86dd87008ad9ef licq-branch-update-20060203.patch.bz2 41685
+RMD160 69c61afb3d25d6d6084c158482d8889181ae3fa2 licq-branch-update-20060203.patch.bz2 41685
+SHA256 25df9f213494d2396f9c7c5dc66ba4030c93a8a7f10e7af2f31780fce18a0a49 licq-branch-update-20060203.patch.bz2 41685
diff --git a/net-im/licq/licq-1.3.4.ebuild b/net-im/licq/licq-1.3.4.ebuild
new file mode 100644
index 000000000000..fd7f7706f579
--- /dev/null
+++ b/net-im/licq/licq-1.3.4.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.4.ebuild,v 1.1 2006/10/18 14:42:23 voxus Exp $
+
+inherit eutils kde-functions multilib
+
+DESCRIPTION="ICQ Client with v8 support"
+HOMEPAGE="http://www.licq.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+http://dev.gentoo.org/~voxus/licq/licq-branch-update-20060203.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}
+
+	use ncurses && epatch ${FILESDIR}/1.3.0-suse_bool.patch
+
+	if use kde
+	then
+		# fix for #12436
+		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 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
+}