diff options
author | Konstantin V. Arkhipov <voxus@gentoo.org> | 2005-07-03 15:52:16 +0000 |
---|---|---|
committer | Konstantin V. Arkhipov <voxus@gentoo.org> | 2005-07-03 15:52:16 +0000 |
commit | 2b6a74dabf1debdaed3e2f59e1302c641eee235f (patch) | |
tree | bfba333d19ecc4c582220f93a1db2913520b2e9f /net-im/licq | |
parent | Fix #85373. This is boot critical so we do need to be in /bin, not /usr/bin. (diff) | |
download | historical-2b6a74dabf1debdaed3e2f59e1302c641eee235f.tar.gz historical-2b6a74dabf1debdaed3e2f59e1302c641eee235f.tar.bz2 historical-2b6a74dabf1debdaed3e2f59e1302c641eee235f.zip |
* bump to todays cvs' snapshot
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'net-im/licq')
-rw-r--r-- | net-im/licq/ChangeLog | 8 | ||||
-rw-r--r-- | net-im/licq/Manifest | 5 | ||||
-rw-r--r-- | net-im/licq/files/1.3.0-koloboks.patch | 59 | ||||
-rw-r--r-- | net-im/licq/files/digest-licq-1.3.0-r5 | 3 | ||||
-rw-r--r-- | net-im/licq/licq-1.3.0-r5.ebuild | 209 |
5 files changed, 282 insertions, 2 deletions
diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog index e07cac5ceeec..bbd1ee22d1c1 100644 --- a/net-im/licq/ChangeLog +++ b/net-im/licq/ChangeLog @@ -1,6 +1,12 @@ # 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.55 2005/05/29 16:03:12 voxus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.56 2005/07/03 15:52:16 voxus Exp $ + +*licq-1.3.0-r5 (03 Jul 2005) + + 03 Jul 2005; Konstantin Arkhipov <voxus@gentoo.org> +licq-1.3.0-r5.ebuild, + +files/1.3.0-koloboks.patch: + Updated to cvs snapshot from 20050703. Anti-koloboks patch updated too. *licq-1.3.0-r4 (29 May 2005) diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest index c0f71cb1d853..6830823715e6 100644 --- a/net-im/licq/Manifest +++ b/net-im/licq/Manifest @@ -2,13 +2,16 @@ MD5 49711170606d3c85a30a51efd60d33d0 licq-1.3.0-r4.ebuild 4424 MD5 69526f145fad83e4da0428a8bf08d832 licq-1.2.7.ebuild 3373 MD5 1a060d707747d04725904cf993e58d85 licq-1.3.0.ebuild 3787 MD5 8afc60d4c617289c650df4250f25b2b7 licq-1.3.0-r3.ebuild 4227 -MD5 4f9603bd04f198272d84356ea4e128d1 ChangeLog 8811 +MD5 1eda24ff11fdffe7c34a4f5d07163408 licq-1.3.0-r5.ebuild 4863 +MD5 707904f5939b7423ede172a7c0a9f55c ChangeLog 9024 MD5 6ee65b2e61137a2656ef1d0deb541f1d metadata.xml 254 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 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 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 diff --git a/net-im/licq/files/1.3.0-koloboks.patch b/net-im/licq/files/1.3.0-koloboks.patch new file mode 100644 index 000000000000..99337fe4e6a1 --- /dev/null +++ b/net-im/licq/files/1.3.0-koloboks.patch @@ -0,0 +1,59 @@ +--- src/mainwin.h 2005-07-03 14:46:37.500823472 +0400 ++++ src~/mainwin.h 2005-07-03 14:47:49.051946048 +0400 +@@ -137,6 +137,7 @@ + m_bAutoPosReplyWin, + m_bAutoSendThroughServer, + m_bEnableMainwinMouseMovement, ++ m_bShowKoloboks, + m_bPopEmail, + m_bPopPhone, + m_bPopFax, +--- src/mlview3.cpp 2005-07-03 14:46:37.501823320 +0400 ++++ src~/mlview3.cpp 2005-07-03 14:48:38.163479960 +0400 +@@ -83,7 +83,8 @@ + // not used for html now QString text = QStyleSheet::escape(s); + QString text = useHTML ? s: QStyleSheet::escape(s); + +- gMainWindow->emoticons->ParseMessage(text); ++ if (gMainWindow->m_bShowKoloboks) ++ gMainWindow->emoticons->ParseMessage(text); + + // We must hightlight URLs at this step, before we convert + // linebreaks to richtext tags and such. Also, check to make sure +--- src/optionsdlg.cpp 2005-07-03 14:46:37.502823168 +0400 ++++ src~/optionsdlg.cpp 2005-07-03 14:50:13.186034336 +0400 +@@ -240,6 +240,7 @@ + chkFlashTaskbar->setChecked(mainwin->m_bFlashTaskbar); + chkAutoSendThroughServer->setChecked(mainwin->m_bAutoSendThroughServer); + chkEnableMainwinMouseMovement->setChecked(mainwin->m_bEnableMainwinMouseMovement); ++ chkShowKoloboks->setChecked(mainwin->m_bShowKoloboks); + popEmail->setChecked(mainwin->m_bPopEmail); + popPhone->setChecked(mainwin->m_bPopPhone); + popFax->setChecked(mainwin->m_bPopFax); +@@ -533,6 +534,7 @@ + mainwin->m_bFlashTaskbar = chkFlashTaskbar->isChecked(); + mainwin->m_bAutoSendThroughServer = chkAutoSendThroughServer->isChecked(); + mainwin->m_bEnableMainwinMouseMovement = chkEnableMainwinMouseMovement->isChecked(); ++ mainwin->m_bShowKoloboks = chkShowKoloboks->isChecked(); + + mainwin->m_bPopEmail= popEmail->isChecked(); + mainwin->m_bPopPhone= popPhone->isChecked(); +@@ -813,6 +815,8 @@ + chkEnableMainwinMouseMovement = new QCheckBox(tr("Allow dragging main window"), boxMainWin); + QWhatsThis::add(chkEnableMainwinMouseMovement, tr("Lets you drag around the main window " + "with your mouse")); ++ chkShowKoloboks = new QCheckBox(tr("Show graphical smiles instead of text ones"), boxMainWin); ++ QWhatsThis::add(chkShowKoloboks, tr("Lets you see only text messages, without any emotional icons")); + + chkMsgChatView = new QCheckBox(tr("Chatmode Messageview"), boxMainWin); + QWhatsThis::add(chkMsgChatView, tr("Show the current chat history in Send Window")); +--- src/optionsdlg.h 2005-07-03 14:46:37.502823168 +0400 ++++ src~/optionsdlg.h 2005-07-03 14:50:41.079793840 +0400 +@@ -92,6 +92,7 @@ + *chkAlwaysShowONU, *chkScrollBar, *chkShowExtIcons, + *chkSysBack, *chkSendFromClipboard, *chkMsgChatView, *chkAutoPosReplyWin, + *chkFlashTaskbar, *chkAutoSendThroughServer, *chkTabbedChatting, ++ *chkShowKoloboks, + *chkEnableMainwinMouseMovement, *chkShowHistory; + QRadioButton *rdbDockDefault, *rdbDockThemed, *rdbDockSmall; + QComboBox *cmbDockTheme, *cmbSortBy; diff --git a/net-im/licq/files/digest-licq-1.3.0-r5 b/net-im/licq/files/digest-licq-1.3.0-r5 new file mode 100644 index 000000000000..c08397616e88 --- /dev/null +++ b/net-im/licq/files/digest-licq-1.3.0-r5 @@ -0,0 +1,3 @@ +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 diff --git a/net-im/licq/licq-1.3.0-r5.ebuild b/net-im/licq/licq-1.3.0-r5.ebuild new file mode 100644 index 000000000000..57b5f620e615 --- /dev/null +++ b/net-im/licq/licq-1.3.0-r5.ebuild @@ -0,0 +1,209 @@ +# 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-r5.ebuild,v 1.1 2005/07/03 15:52:16 voxus Exp $ + +inherit eutils kde-functions + +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" + +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-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 + } + + 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 + 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 +} + +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" + + # 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 +} |