Version bump, bug #237816, remove old

Package-Manager: portage-2.1.4.5

7 files changed, 139 insertions, 858 deletions

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index 4d60e9c95426..5ff0c9fa4edb 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/licq
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.98 2008/07/05 16:48:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.99 2008/10/29 16:13:13 tester Exp $
+
+*licq-1.3.6 (29 Oct 2008)
+
+  29 Oct 2008; Olivier Crête <tester@gentoo.org> -licq-1.3.2.ebuild,
+  -licq-1.3.2-r1.ebuild, -licq-1.3.4-r1.ebuild, -licq-1.3.5.ebuild,
+  +licq-1.3.6.ebuild:
+  Version bump, bug #237816, remove old
 
   05 Jul 2008; Raúl Porcel <armin76@gentoo.org> licq-1.3.5-r1.ebuild:
   alpha/ia64/sparc stable wrt #219708
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index 799d26244f87..8df2f10a816c 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
 AUX 1.2.7-nptl.patch 1178 RMD160 dd48fbebb541e6e4257b99cd09a72701e3cbc4b9 SHA1 23cb8638ebfd3664a42e26ade08d4343cd422667 SHA256 cf319b0a91f563fbae6a3590264f8bfe9d767ad55179f616adf804609b1aa0db
 AUX 1.3.0-gpgme3_hack.patch 878 RMD160 d01f33df1e045791ba169759a0476c2a4bfe20c9 SHA1 1fcf053c89ae51d3d109fab7b4c3d817a078dd33 SHA256 7cdf7f5a111b07b1b37db144dec58464851ff4daa7c6cef7155ca9d5254afb2b
@@ -8,13 +11,16 @@ AUX licq-1.3.2-gcc41.patch 1238 RMD160 99a4628325ee2818a215dd2af870b0fdd7a76659
 AUX licq-1.3.5-gcc43.patch 3640 RMD160 9ab77b228e9426082d8015f452c9f25e46548b4c SHA1 ea20203897d26f9c842fa6fc648b9ce5db5c4b8b SHA256 4acd8891b02ce496176a4724d193fbf07330bc6ca40834a00ccfd0f2ea3b70dc
 AUX licq-1.3.5-logonfix.patch 451 RMD160 c951b408e545e0aac009830061a93c614d19aeb7 SHA1 0a1d2ecab14d8f453727dbe47ad01b1c6021c9b9 SHA256 7b64b67852392278efa6ff081033fe16efe261da9093606e69799bfdfe249b5a
 AUX licq-1.3.5-prevent-dos.patch 3866 RMD160 55a44ea3cbcdbac57c839f56fce5f90231d846bb SHA1 ff3c92832827ad2a132ce2946b42e5f912b59025 SHA256 9f9ddcd1469445b1c3aa08b39956d040ccb583b747e3bbf6d79504f0aba8806e
-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-1.3.5.tar.bz2 3260471 RMD160 4442f6cb3630d8300e5f128617a522bd2cb863dc SHA1 a1059173f36694e6e5ec9ba62ced6e9738807916 SHA256 ca6692026e87459082b33ebb6480cc5c600001c93e1d9e2bbde65f3cf2238d3e
-EBUILD licq-1.3.2-r1.ebuild 5062 RMD160 143bd539f2c07c94634e1113aa013200acd0e573 SHA1 30200a65a08d185b95359b63599973b17ce3f6b5 SHA256 330d054e518c3a843af5982cacf2e619599a0585806f51fbf3faaddb7269c08a
-EBUILD licq-1.3.2.ebuild 4895 RMD160 bdec2a191ad39da76c807576e7a8b2addb542e9f SHA1 d0287ef7d46897520a821f1941e096066b68e3d4 SHA256 e1cc635403af5e2959929cd3b26f53f21aff7ce9d276cf0a57f83b512ad435b0
-EBUILD licq-1.3.4-r1.ebuild 4635 RMD160 186a512cd96cdf2515ac0af3e0b7cb74d0987d0f SHA1 457a031f2ee4c69b48ea579906795682d24b5177 SHA256 6216f4e5d56d4008cddd56042a55b54bf7a6bf98905e46240ec16d38975dfeb9
+DIST licq-1.3.6.tar.bz2 4777777 RMD160 0d626640e02c9991309d6f7c32725cd1d5bdfa37 SHA1 1451da41c82b9a13424c96d8641e642895b723ac SHA256 ad6ea66301923e5d106111a6b4654aaa72131d8b5c499d16dc9fbbc8cd29845e
 EBUILD licq-1.3.5-r1.ebuild 5149 RMD160 f6c213829418044ca322eb776047d21db36330fe SHA1 3157b4990dea9b8a18891190980fae5a735383cd SHA256 e8943afddc5bc94b3e0c31ca821f5020be7c0a342a7f808323be4e89eb3d153e
-EBUILD licq-1.3.5.ebuild 4690 RMD160 c0ea1b97aad000fa0dd90b5ca1ca48021ae29782 SHA1 487e2b2e4a16271292485db425a2e8eb403d6cb0 SHA256 5914bb274378c6801251c800b0bdd7a954c9102446c2f1ba761c318fe10fefa3
-MISC ChangeLog 15001 RMD160 bef4f624c5b7b2db00ce66c1929a9154b83d10ad SHA1 da3f8a2b2fcabc8b9199e4a6c3a1c4b2e457f783 SHA256 06fe09863b58179d64c0a11664729ff35b9898e0c1f77495eac63ec50d888e31
+EBUILD licq-1.3.6.ebuild 3310 RMD160 808f88d447b13f6f70008a8d36c790d7d4d3b865 SHA1 a9b8c9124d11d4840978c8efb7494ae7d947c1cb SHA256 b24854936482ceec190e9f8237d87752eafeef91bfea2a409b1f6e120c3c9a8b
+MISC ChangeLog 15228 RMD160 a53e0ae28f9123dfaea0346c25fa0d7bfdf23697 SHA1 5ddc516dbfb7bae8302d15cb5f87c05781870bdf SHA256 ab7596db5f45982b7b83205a33030d83c037d43f839ea93543ed35f9950d8324
 MISC metadata.xml 249 RMD160 09f64f681d0dd11fd8a5784ae17b7eaaa87cc12f SHA1 936e8c76314d77517317065331498434f2c59674 SHA256 bfa15ab9faf7742a9f33d2ba72410a089690beb639884f357b135951cd663230
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkIi54ACgkQ+IXOQtHLm/h2jgCdG05lnd5VrtdNmkDz6nj0/lW6
+EKkAn0By6mNjEKzQHtOWWsiFF85OT3+I
+=IVnc
+-----END PGP SIGNATURE-----
diff --git a/net-im/licq/licq-1.3.2-r1.ebuild b/net-im/licq/licq-1.3.2-r1.ebuild
deleted file mode 100644
index 4d3c074b604b..000000000000
--- a/net-im/licq/licq-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# 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.2-r1.ebuild,v 1.11 2006/09/24 09:10:17 hansmi 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"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
-IUSE="ssl socks5 qt3 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:
-DEPEND="kde? ( >=kde-base/kdelibs-3.0 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	qt3? ( =x11-libs/qt-3* )
-	ncurses? ( sys-libs/ncurses >=dev-libs/cdk-4.9.11.20031210-r1 )
-	crypt? ( >=app-crypt/gpgme-1.0.0 )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	use ncurses && epatch ${FILESDIR}/1.3.0-suse_bool.patch
-	epatch "${FILESDIR}"/${P}-gcc41.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 qt3
-		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} -C || die
-
-	CONFCACHE="--cache-file=${S}/config.cache"
-
-	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 qt3 || use kde
-	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} ${CONFCACHE} || die
-		emake || die
-	fi
-
-	# Now the console plug-in
-	if use ncurses
-	then
-		cd ${S}/plugins/console
-		einfo "Compiling the Console plug-in"
-		econf ${CONFCACHE} || die
-		emake || die
-	fi
-
-	# The Auto-Responder plug-in
-	cd ${S}/plugins/auto-reply
-	einfo "Compiling the Auto-Reply plug-in"
-	econf ${CONFCACHE} || die
-	emake || die
-
-	# The Remote Management Service
-	cd ${S}/plugins/rms
-	einfo "Compiling Remote Management Services plug-in"
-	econf ${CONFCACHE} || die
-	emake || die
-
-	# MSN PLugin
-	if use msn
-	then
-		cd ${S}/plugins/msn
-		einfo "Compiling MSN plug-in"
-		econf ${CONFCACHE} || die
-		emake || die
-	fi
-
-	# Email PLugin
-	cd ${S}/plugins/email
-	epatch ${FILESDIR}/${PV}-email_typo.patch
-	einfo "Compiling Email plug-in"
-	econf ${CONFCACHE} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc ChangeLog INSTALL README* doc/*
-
-	# Install the plug-ins
-	if use qt3 || use kde
-	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}/$(echo ${D} | awk -F / '{print $2}')
-}
-
-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.ebuild b/net-im/licq/licq-1.3.2.ebuild
deleted file mode 100644
index 0e4ab3e555d3..000000000000
--- a/net-im/licq/licq-1.3.2.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# 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.2.ebuild,v 1.7 2006/08/14 15:33:29 genstef 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"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ia64 ~ppc ~sparc ~x86"
-IUSE="ssl socks5 qt3 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 )
-	qt3? ( =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 qt3
-		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 qt3
-	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
-	epatch ${FILESDIR}/${PV}-email_typo.patch
-	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 qt3
-	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}/$(echo ${D} | awk -F / '{print $2}')
-}
-
-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.4-r1.ebuild b/net-im/licq/licq-1.3.4-r1.ebuild
deleted file mode 100644
index b48bd88ccab6..000000000000
--- a/net-im/licq/licq-1.3.4-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2007 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-r1.ebuild,v 1.4 2007/08/22 12:32:44 uberlord 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"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ia64 ppc ~sparc x86 ~x86-fbsd"
-IUSE="ssl socks5 qt3 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 )
-	qt3? ( =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 qt3
-		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
-
-	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 qt3
-	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 qt3
-	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 and #149464
-	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.5.ebuild b/net-im/licq/licq-1.3.5.ebuild
deleted file mode 100644
index c06200b3d337..000000000000
--- a/net-im/licq/licq-1.3.5.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.5.ebuild,v 1.1 2007/12/01 20:35:44 genstef 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"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="ssl socks5 qt3 kde ncurses crypt msn debug"
-
-# 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 )
-	qt3? ( =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 qt3
-		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"
-	use debug   && myconf="${myconf} --enable-debug"
-
-	if use crypt
-	then
-		myconf="${myconf} --enable-gpgme"
-	else
-		myconf="${myconf} --disable-gpgme"
-	fi
-
-	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 qt3
-	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 qt3
-	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 and #149464
-	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.6.ebuild b/net-im/licq/licq-1.3.6.ebuild
new file mode 100644
index 000000000000..077a1a981d4c
--- /dev/null
+++ b/net-im/licq/licq-1.3.6.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.6.ebuild,v 1.1 2008/10/29 16:13:13 tester Exp $
+
+EAPI="1"
+
+inherit eutils kde-functions multilib
+
+DESCRIPTION="ICQ Client with v8 support"
+HOMEPAGE="http://www.licq.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="crypt debug kde msn ncurses nls qt3 qt4 socks5 ssl xosd"
+
+# we use kde as KDE4
+RDEPEND="kde? (
+		qt3? ( kde-base/kdelibs:3.5 )
+	)
+	ssl? ( dev-libs/openssl )
+	qt3? ( x11-libs/qt:3 )
+	qt4? ( x11-libs/qt-gui:4 )
+	nls? ( sys-devel/gettext )
+	ncurses? ( sys-libs/ncurses =dev-libs/cdk-5* )
+	crypt? ( app-crypt/gpgme:1 )
+	xosd? ( x11-libs/xosd )"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	qt4? ( >=dev-util/cmake-2.6.2 )"
+
+_generate_plugins_directories() {
+	PLUGINS="auto-reply email rms"
+	use msn && PLUGINS="${PLUGINS} msn"
+	use ncurses && PLUGINS="${PLUGINS} console"
+	use xosd &&  PLUGINS="${PLUGINS} osd"
+	# QT4 is something extra. Uses cmake.
+	use qt4 && PLUGINS_CMAKE="${PLUGINS_CMAKE} qt4-gui"
+	use qt3 && PLUGINS="${PLUGINS} qt-gui"
+	elog "I will generate these plugins/frontends for licq:"
+	elog "${PLUGINS} ${PLUGINS_CMAKE}"
+}
+
+pkg_setup() {
+	_generate_plugins_directories
+}
+
+src_compile() {
+	local myconf myconf2 plugin
+	# global config setup for automake
+	myconf="$(use_enable crypt gpgme)
+		$(use_enable ssl openssl)
+		$(use_enable socks5)
+		$(use_enable debug)
+		$(use_enable nls)"
+
+	einfo "Compiling Licq core."
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+
+	for plugin in ${PLUGINS}; do
+		cd "${S}"/plugins/"${plugin}"
+		einfo "Compiling Licq: \"${plugin}\"."
+		if use qt3; then
+			set-qtdir 3
+			set-kdedir 3
+			use kde && myconf2="${myconf} --with-kde"
+			myconf2="${myconf2} --with-qt-libraries=${QTDIR}/$(get_libdir)"
+		fi
+		econf ${myconf} ${myconf2} || die "econf failed"
+		emake || die "emake failed"
+	done
+	# we like qt4 it uses cmake
+	if use qt4; then
+		cd "${S}"/plugins/qt4-gui
+		einfo "Compiling Licq: \"qt4-gui\"."
+		# Possible error because of one tiny issue we introduce in kde
+		# it is called kdeprefix and in that case you can't be sure where it
+		# find kde stuff. This is working only for -kdeprefix so someone will
+		# need to fix this later
+		myconf2="-DCMAKE_INSTALL_PREFIX=/usr"
+		# kde not yet workie
+		# use kde && myconf2="${myconf2} -DWITH_KDE=1"
+		use kde && ewarn "Sorry but kde4 support is duped and not working so not
+		enabling for now"
+		cmake . ${myconf2} || die "cmake failed"
+		emake || die "emake failed"
+	fi
+}
+
+src_install() {
+	# install core
+	einfo "Installing Licq core."
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ChangeLog INSTALL README* doc/*
+	# Install the plug-ins
+	for plugin in ${PLUGINS}; do
+		cd "${S}"/plugins/"${plugin}"
+		einfo "Installing Licq: \"${plugin}\"."
+		emake DESTDIR="${D}" install || die "emake install failed"
+		dodoc README* *.conf
+	done
+	if use qt4; then
+		cd "${S}"/plugins/qt4-gui
+		einfo "Installing Licq: \"qt4-gui\"."
+		emake DESTDIR="${D}" install || die
+		docinto plugins/qt4-gui
+		dodoc doc/README*
+	fi
+
+	exeinto /usr/share/${PN}/upgrade
+	doexe "${S}"/upgrade/*
+
+	# fixes bug #22136 and #149464
+	rm -fR "${D}"/var
+}
+