* #149464 and #151980

Package-Manager: portage-2.1.2_pre3-r6

3 files changed, 21 insertions, 229 deletions

diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index ed61acd3e2ea..c49fcde0ad78 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
@@ -46,14 +49,14 @@ 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
-EBUILD licq-1.3.4.ebuild 4815 RMD160 124628bad92cb6f9aa970686621f55e74bf01f15 SHA1 87b894d993dd035524fdd974dcd15532d8675346 SHA256 a0cd4ee46b931584d51cfb9191d65be69d56a62080a08b539f351ba999e873b7
-MD5 d94d310318a75c20b10b8461c5fec7a1 licq-1.3.4.ebuild 4815
-RMD160 124628bad92cb6f9aa970686621f55e74bf01f15 licq-1.3.4.ebuild 4815
-SHA256 a0cd4ee46b931584d51cfb9191d65be69d56a62080a08b539f351ba999e873b7 licq-1.3.4.ebuild 4815
-MISC ChangeLog 13267 RMD160 4090d0778331ec7ec9890726e4309ae8133aeea0 SHA1 e277bd24e38b7c56ac6921c83e79bd1579eab4d9 SHA256 2a364685632b17df0ff370cf447efa10c984a76dd5f16c283d96b86211edc187
-MD5 4bd0dca75614879ea64d1dad3a06ad9a ChangeLog 13267
-RMD160 4090d0778331ec7ec9890726e4309ae8133aeea0 ChangeLog 13267
-SHA256 2a364685632b17df0ff370cf447efa10c984a76dd5f16c283d96b86211edc187 ChangeLog 13267
+EBUILD licq-1.3.4-r1.ebuild 4625 RMD160 24290209a90efecdd939da38659d2e46feb97027 SHA1 da2ed3e680c2a26193368058955b4b2923ae28e6 SHA256 a24e5b02dc24eecb7133ea1934e5175970d0de666e6c4d1acdf91ba11dfbf663
+MD5 3b80b12f56926878147e624b71159215 licq-1.3.4-r1.ebuild 4625
+RMD160 24290209a90efecdd939da38659d2e46feb97027 licq-1.3.4-r1.ebuild 4625
+SHA256 a24e5b02dc24eecb7133ea1934e5175970d0de666e6c4d1acdf91ba11dfbf663 licq-1.3.4-r1.ebuild 4625
+MISC ChangeLog 13436 RMD160 08bb23e3cc3a584fc248ebd4e4c4f5018c99b8d4 SHA1 90ef8a86f868bbbed1c7121adaf6fd3ca61d23d2 SHA256 3dd9246bce729f81d97ddf6879afbe308ce1191095f4e5b35e7e6f9460af7c2e
+MD5 354d24cf2982de5c9e20a29a38259186 ChangeLog 13436
+RMD160 08bb23e3cc3a584fc248ebd4e4c4f5018c99b8d4 ChangeLog 13436
+SHA256 3dd9246bce729f81d97ddf6879afbe308ce1191095f4e5b35e7e6f9460af7c2e ChangeLog 13436
 MISC metadata.xml 249 RMD160 09f64f681d0dd11fd8a5784ae17b7eaaa87cc12f SHA1 936e8c76314d77517317065331498434f2c59674 SHA256 bfa15ab9faf7742a9f33d2ba72410a089690beb639884f357b135951cd663230
 MD5 7adc6310a4dbd42bad26caa80683d4ec metadata.xml 249
 RMD160 09f64f681d0dd11fd8a5784ae17b7eaaa87cc12f metadata.xml 249
@@ -70,6 +73,13 @@ SHA256 d725a8686268a70d3eb84733378532356e9943e158b26129262c1770da4dfa76 files/di
 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 a75803be12a902115b5b72e209295472 files/digest-licq-1.3.4 238
-RMD160 d531e13a2baf381b4dd75653e4b047ce354b6322 files/digest-licq-1.3.4 238
-SHA256 662a17d419755708ff5f04e8870634a2237c11d319b2aa7ebaeaff8770c0f4b9 files/digest-licq-1.3.4 238
+MD5 a75803be12a902115b5b72e209295472 files/digest-licq-1.3.4-r1 238
+RMD160 d531e13a2baf381b4dd75653e4b047ce354b6322 files/digest-licq-1.3.4-r1 238
+SHA256 662a17d419755708ff5f04e8870634a2237c11d319b2aa7ebaeaff8770c0f4b9 files/digest-licq-1.3.4-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFO44zbwxeDFj+ScoRArgOAJ9+2Q8sZJagCyfG7dffGEAj0rCmyQCeOJVE
+pd83cAXL4hSoKL6P/O7b0AY=
+=hhEN
+-----END PGP SIGNATURE-----
diff --git a/net-im/licq/files/digest-licq-1.3.4 b/net-im/licq/files/digest-licq-1.3.4
deleted file mode 100644
index d66883ce487b..000000000000
--- a/net-im/licq/files/digest-licq-1.3.4
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/net-im/licq/licq-1.3.4.ebuild b/net-im/licq/licq-1.3.4.ebuild
deleted file mode 100644
index 6c3e479d9169..000000000000
--- a/net-im/licq/licq-1.3.4.ebuild
+++ /dev/null
@@ -1,215 +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.4.ebuild,v 1.2 2006/10/19 09:37:22 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"
-
-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
-}