From: Konstantin V. Arkhipov Date: Thu, 4 Nov 2004 15:17:06 +0000 (+0000) Subject: closing bug #68452 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7ba6a1a003c76348f1643cac2db50de70aa78448;p=gentoo.git closing bug #68452 --- diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog index 0eafcd204e83..d26a4a7c4f0e 100644 --- a/net-im/licq/ChangeLog +++ b/net-im/licq/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-im/licq # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.49 2004/10/29 14:04:02 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.50 2004/11/04 15:17:06 voxus Exp $ + +*licq-1.3.0-r1 (04 Nov 2004) + + 04 Nov 2004; Konstantin Arkhipov + +licq-1.3.0-r1.ebuild: + Closing bug #68452, thanks to Sascha (kn0rki) Hoppe. + New cdk version now hard depended due to bug #66332. 30 Oct 2004; Joseph Jezak +metadata.xml, licq-1.3.0.ebuild: diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest index 4c53e51d32b5..c6b8ad5d6d1f 100644 --- a/net-im/licq/Manifest +++ b/net-im/licq/Manifest @@ -1,10 +1,12 @@ -MD5 a7282b7bdda09ce61fe841560bbe07d4 ChangeLog 7704 MD5 481c2244bfa25938051e82c760aba1b9 licq-1.2.7.ebuild 3494 +MD5 de71094e0975284a6688536fb64b767d licq-1.3.0-r1.ebuild 4159 MD5 14a523ae05c4c78e9c529514fc8c56f0 licq-1.3.0.ebuild 3910 +MD5 52885f4b5eb9267ac686df35c86df623 ChangeLog 7923 MD5 6ee65b2e61137a2656ef1d0deb541f1d metadata.xml 254 +MD5 b0a924ef22c21dd596d7918631f18559 files/digest-licq-1.3.0-r1 64 +MD5 3795e526fdf015e985be17fca698e2d1 files/digest-licq-1.2.7 64 +MD5 b0a924ef22c21dd596d7918631f18559 files/digest-licq-1.3.0 64 +MD5 52dadf7b64ef4fb690c7892d94b445d6 files/1.3.0-no_stupid_koloboks.patch 3160 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 52dadf7b64ef4fb690c7892d94b445d6 files/1.3.0-no_stupid_koloboks.patch 3160 -MD5 3795e526fdf015e985be17fca698e2d1 files/digest-licq-1.2.7 64 -MD5 b0a924ef22c21dd596d7918631f18559 files/digest-licq-1.3.0 64 diff --git a/net-im/licq/files/digest-licq-1.3.0-r1 b/net-im/licq/files/digest-licq-1.3.0-r1 new file mode 100644 index 000000000000..56eda9b63050 --- /dev/null +++ b/net-im/licq/files/digest-licq-1.3.0-r1 @@ -0,0 +1 @@ +MD5 c1b05d1078b9826273191c05d0d1a969 licq-1.3.0.tar.bz2 4284325 diff --git a/net-im/licq/licq-1.3.0-r1.ebuild b/net-im/licq/licq-1.3.0-r1.ebuild new file mode 100644 index 000000000000..a74e51bc3959 --- /dev/null +++ b/net-im/licq/licq-1.3.0-r1.ebuild @@ -0,0 +1,185 @@ +# Copyright 1999-2004 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-r1.ebuild,v 1.1 2004/11/04 15:17:06 voxus Exp $ + +inherit eutils + +DESCRIPTION="ICQ Client with v8 support" +HOMEPAGE="http://www.licq.org/" +SRC_URI="mirror://sourceforge/${PN}/${P/_pre/-PRE}.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.0.0 ) + ncurses? ( sys-libs/ncurses =dev-libs/cdk-4.9.11.20031210-r1 ) + crypt? ( =app-crypt/gpgme-0.3.14-r1 )" + +S=${WORKDIR}/${P} + +src_unpack() { + unpack ${A} + + 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 + + cd ${S}/plugins/qt-gui && \ + epatch ${FILESDIR}/${PV}-no_stupid_koloboks.patch || \ + ewarn "Fail to kill koloboks, forget it" +} + +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" + epatch ${FILESDIR}/1.3.0-gpgme3_hack.patch + else + myconf="${myconf} --disable-gpgme" + fi + + econf ${myconf} || die + emake || die + + # Create the various plug-ins + + # First, the Qt plug-in + if use qt + then + # A hack to build against the latest QT: + local v + for v in /usr/qt/[0-9] + do + [ -d "${v}" ] && export QTDIR="${v}" + done +# use kde && kde_src_compile myconf + use kde && myconf="${myconf} --with-kde" + + # 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 + + + 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 +}