diff options
Diffstat (limited to 'kde-base/kdenetwork')
| -rw-r--r-- | kde-base/kdenetwork/ChangeLog | 725 | ||||
| -rw-r--r-- | kde-base/kdenetwork/Manifest | 56 | ||||
| -rw-r--r-- | kde-base/kdenetwork/files/kdenetwork-3.3.2-kopete-msn.patch | 884 | ||||
| -rw-r--r-- | kde-base/kdenetwork/files/lisa | 10 | ||||
| -rw-r--r-- | kde-base/kdenetwork/files/reslisa | 10 | ||||
| -rw-r--r-- | kde-base/kdenetwork/kdenetwork-3.3.2-r2.ebuild | 4 | ||||
| -rw-r--r-- | kde-base/kdenetwork/kdenetwork-3.4.1-r1.ebuild | 4 | ||||
| -rw-r--r-- | kde-base/kdenetwork/kdenetwork-3.4.2.ebuild | 2 | ||||
| -rw-r--r-- | kde-base/kdenetwork/kdenetwork-3.4.3.ebuild | 4 | ||||
| -rw-r--r-- | kde-base/kdenetwork/kdenetwork-3.5.0.ebuild | 2 | ||||
| -rw-r--r-- | kde-base/kdenetwork/kdenetwork-3.5.0_beta2.ebuild | 2 | ||||
| -rw-r--r-- | kde-base/kdenetwork/kdenetwork-3.5.0_rc1.ebuild | 4 | ||||
| -rw-r--r-- | kde-base/kdenetwork/kdenetwork-3.5_beta1.ebuild | 6 | ||||
| -rw-r--r-- | kde-base/kdenetwork/metadata.xml | 2 |
14 files changed, 875 insertions, 840 deletions
diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog index f88cf550f99d..cfdca47194a6 100644 --- a/kde-base/kdenetwork/ChangeLog +++ b/kde-base/kdenetwork/ChangeLog @@ -1,6 +1,727 @@ # ChangeLog for kde-base/kdenetwork -# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $ + + 25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdenetwork-3.4.3.ebuild: + Stable on amd64, bug 112842. + +*kdenetwork-3.5.0 (22 Nov 2005) + + 33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdenetwork-3.5.0.ebuild: + Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked. + + 21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> + kdenetwork-3.4.3.ebuild: + Stable on sparc wrt #112842 + + 17 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> + kdenetwork-3.5.0_rc1.ebuild: + Correct dependency on meanwhile (#112808). + +*kdenetwork-3.5.0_rc1 (16 Nov 2005) + + 16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> + +files/kopete-3.5.0_rc1-fix.patch, +kdenetwork-3.5.0_rc1.ebuild: + New version. + + 17 Oct 2005; Aron Griffis <agriffis@gentoo.org> + kdenetwork-3.4.1-r1.ebuild: + Mark 3.4.1-r1 stable on alpha + +*kdenetwork-3.5.0_beta2 (15 Oct 2005) + + 15 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> + +kdenetwork-3.5.0_beta2.ebuild: + New version. + +*kdenetwork-3.4.3 (13 Oct 2005) + + 13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdenetwork-3.4.3.ebuild: + New version. + +*kdenetwork-3.4.3 (12 Oct 2005) + + 12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kdenetwork-3.4.3.ebuild: + New version. + + 06 Oct 2005; Hardave Riar <hardave@gentoo.org> kdenetwork-3.4.2.ebuild: + Keyworded ~mips. + +*kdenetwork-3.5_beta1 (21 Sep 2005) + + 21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org> + +files/kdenetwork-3.5_beta1-gadu.patch, +kdenetwork-3.5_beta1.ebuild: + New version. + + 25 Aug 2005; Aron Griffis <agriffis@gentoo.org> + kdenetwork-3.4.1-r1.ebuild: + stable on ia64 + +*kdenetwork-3.5_alpha1 (24 Aug 2005) + + 24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> + +kdenetwork-3.5_alpha1.ebuild: + KDE 3.5 prerelease. Add support for the Sametime protocol. + + 30 Jul 2005; Dan Armak <danarmak@gentoo.org> kdenetwork-3.4.2.ebuild: + Removed ~mips keyword, because kdelibs-3.4.2 doesn't have it. The mips team + should readd it soon, I'm not sure why it's gone from kdelibs. This is + preparatory to unmasking. + +*kdenetwork-3.4.2 (28 Jul 2005) + + 28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> + +files/kdenetwork-3.4-configure.patch, +kdenetwork-3.4.2.ebuild: + New version. Add configure patch (#81966). + + 27 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdenetwork-3.4.1-r1.ebuild: + Stable on hppa. + + 22 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> + kdenetwork-3.3.2-r2.ebuild: + Stable on ia64, bug 99754. + + 22 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> + kdenetwork-3.3.2-r2.ebuild: + Stable on alpha, bug 99754. + + 22 Jul 2005; Danny van Dyk <kugelfang@gentoo.org> + kdenetwork-3.3.2-r2.ebuild, kdenetwork-3.4.1-r1.ebuild: + Marked stable on amd64. + + 22 Jul 2005; Hardave Riar <hardave@gentoo.org> kdenetwork-3.3.2-r2.ebuild: + Stable on mips, bug #99754. + + 22 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> + kdenetwork-3.3.2-r2.ebuild, kdenetwork-3.4.1-r1.ebuild: + Stable on sparc wrt #99754 + + 22 Jul 2005; Joseph Jezak <josejx@gentoo.org> kdenetwork-3.3.2-r2.ebuild, + kdenetwork-3.4.1-r1.ebuild: + Marked ppc stable for bug #99754. + + 21 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> + kdenetwork-3.3.2-r2.ebuild: + Stable on hppa. bug #99754 + + 21 Jul 2005; Markus Rothe <corsair@gentoo.org> kdenetwork-3.3.2-r2.ebuild: + Stable on ppc64 (bug #99754) + +*kdenetwork-3.4.1-r1 (21 Jul 2005) +*kdenetwork-3.3.2-r2 (21 Jul 2005) + + 21 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> + +kdenetwork-3.3.2-r2.ebuild, +kdenetwork-3.4.1-r1.ebuild: + Fix vulnerabilities in libgadu (#99754). + + 14 Jul 2005; Hardave Riar <hardave@gentoo.org> kdenetwork-3.4.1.ebuild: + Keyworded ~mips + + 08 Jul 2005; Hardave Riar <hardave@gentoo.org> kdenetwork-3.3.2-r1.ebuild: + Stable on mips. + + 08 Jul 2005; Jason Wever <weeve@gentoo.org> kdenetwork-3.4.1.ebuild: + Stable on SPARC. + + 04 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> + kdenetwork-3.4.1.ebuild: + Add ~alpha keyword. + + 02 Jul 2005; Jason Wever <weeve@gentoo.org> kdenetwork-3.3.2-r1.ebuild: + Stable on SPARC. + + 01 Jul 2005; Joseph Jezak <josejx@gentoo.org> kdenetwork-3.4.1.ebuild: + Marked ppc stable for bug #97544. + + 30 Jun 2005; Dan Armak <danarmak@gentoo.org> + +files/disable-meanwhile.diff, kdenetwork-3.4.1.ebuild: + Force meanwhile support to off. It was unpredictable, was missing a dep, and + broke compilation with meanwhile >=0.4. Bug 96778. + + 29 Jun 2005; Dan Armak <danarmak@gentoo.org> + +files/wireless-extensions-api.diff, kdenetwork-3.4.1.ebuild: + Fix bug 94719: add patch from upstream branch cvs allowing kwifimanager to + compile with wireless extensions 28_pre8. + + 21 Jun 2005; Markus Rothe <corsair@gentoo.org> kdenetwork-3.3.2-r1.ebuild: + Stable on ppc64 + + 19 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> + kdenetwork-3.3.2-r1.ebuild: + Stable on x86. + + 02 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> kdenetwork-3.4.1.ebuild: + Correct dependency on wireless-tools for bug #94719. + + 28 May 2005; Gregorio Guidi <greg_g@gentoo.org> kdenetwork-3.4.1.ebuild: + Depend on rdesktop >= 1.4.1 (#94036). + +*kdenetwork-3.4.1 (27 May 2005) + + 27 May 2005; Gregorio Guidi <greg_g@gentoo.org> +kdenetwork-3.4.1.ebuild: + New version. + +*kdenetwork-3.3.2-r1 (26 May 2005) + + 26 May 2005; Gregorio Guidi <greg_g@gentoo.org> + +files/kdenetwork-3.3.2-kopete-msn.patch, + +files/kdenetwork-3.3.2-kwifimanager-configlocation.patch, + +kdenetwork-3.3.2-r1.ebuild: + Add patch to make kopete connect to msn (#93213). Add patch to fix bug #75907. + + 12 May 2005; Aron Griffis <agriffis@gentoo.org> + kdenetwork-3.4.0-r2.ebuild: + add ~ia64 + +*kdenetwork-3.4.0-r2 (11 May 2005) + + 11 May 2005; Gregorio Guidi <greg_g@gentoo.org> + +files/kdenetwork-3.4.0-kopete-tabbed-windows.patch, + +kdenetwork-3.4.0-r2.ebuild: + Add patch to fix crash in kopete chatwindow (#91423). + +*kdenetwork-3.4.0-r1 (03 Apr 2005) + + 03 Apr 2005; Gregorio Guidi <greg_g@gentoo.org> + +files/kdenetwork-3.4.0-kopete-logout.patch, + +files/kdenetwork-3.4.0-kopete-spaces.patch, +kdenetwork-3.4.0-r1.ebuild: + Add patches for bug #86446 (crash on logout) and for bug #87485 (handling of + names with spaces). + + 18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdenetwork-3.4.0.ebuild: + Added to ~ppc + +*kdenetwork-3.4.0 (14 Mar 2005) + + 14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> +kdenetwork-3.4.0.ebuild: + Ebuild for KDE 3.4 final. + + 12 Mar 2005; Hardave Riar <hardave@gentoo.org> kdenetwork-3.3.2.ebuild: + Marked ~mips. + +*kdenetwork-3.4.0_rc1 (27 Feb 2005) + + 27 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> + +kdenetwork-3.4.0_rc1.ebuild: + New version. + + 15 Feb 2005; Jason Wever <weeve@gentoo.org> kdenetwork-3.4.0_beta2.ebuild: + Added ~sparc keyword. + +*kdenetwork-3.4.0_beta2 (09 Feb 2005) + + 09 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> + +kdenetwork-3.4.0_beta2.ebuild: + Version bump. + + 02 Feb 2005; Heinrich Wendel <lanius@gentoo.org> + kdenetwork-3.4.0_beta1.ebuild: + mark ~amd64 + + 23 Jan 2005; Markus Rothe <corsair@gentoo.org> kdenetwork-3.3.2.ebuild: + Stable on ppc64; bug #78619 + +*kdenetwork-3.4.0_beta1 (14 Jan 2005) + + 14 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> + +kdenetwork-3.4.0_beta1.ebuild: + Introducing kde-3.4.0_beta1. + + 04 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdenetwork-3.3.2.ebuild: + Stable on hppa. + + 29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> + kdenetwork-3.3.2.ebuild: + Stable on alpha, bug 72750. + + 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : + Change encoding to UTF-8 for GLEP 31 compliance + + 28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> kdenetwork-3.3.2.ebuild: + Stable on amd64. + + 27 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.3.2.ebuild: + x86 stable + + 18 Dec 2004; Markus Rothe <corsair@gentoo.org> kdenetwork-3.3.1-r1.ebuild: + Stable on ppc64 + +*kdenetwork-3.3.2 (08 Dec 2004) + + 08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +kdenetwork-3.3.2.ebuild: + Version bump + + 05 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> + kdenetwork-3.3.1-r1.ebuild: + The wifi module doesn't compile if arts support is disabled. + + 06 Dec 2004; Jason Huebel <jhuebel@gentoo.org> kdenetwork-3.3.1-r1.ebuild: + stable on amd64 + + 17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> + kdenetwork-3.3.1-r1.ebuild: + Stable on alpha. + + 08 Nov 2004; Joseph Jezak <josejx@gentoo.org> kdenetwork-3.3.1-r1.ebuild: + Marked ppc stable. + +*kdenetwork-3.3.1-r1 (05 Nov 2004) + + 05 Nov 2004; Caleb Tennis <caleb@gentoo.org> +files/3.3.1-kget.diff, + +kdenetwork-3.3.1-r1.ebuild: + do a rev bump here, fixes a nasty kget crash + I'm going to keep sparc as stable, because the patch is pretty unobtrusive. + + 05 Nov 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.3.1.ebuild: + x86 stable + + 04 Nov 2004; Jason Wever <weeve@gentoo.org> kdenetwork-3.3.1.ebuild: + Stable on sparc wrt security bug #69936. + +*kdenetwork-3.3.1 (03 Nov 2004) + + 03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> + kdenetwork-3.3.1.ebuild: + ~alpha keyword. + + 12 Oct 2004; Caleb Tennis <caleb@gentoo.org> : + Version bump + + 04 Oct 2004; Guy Martin <gmsoft@gentoo.org> kdenetwork-3.3.0.ebuild: + Stable on hppa. + + 19 Sep 2004; Malcolm Lashley <malc@gentoo.org> kdenetwork-3.3.0.ebuild: + Stable on amd64 + + 14 Sep 2004; Jason Wever <weeve@gentoo.org> kdenetwork-3.3.0.ebuild: + Stable on sparc. + + 09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdenetwork-3.2.1.ebuild: + x86 stable, remove old version + + 02 Sep 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.3.0.ebuild, + files/3.3.0-kget.diff: + Patch to fix a crash (#62296) + + 30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> + kdenetwork-3.1.5.ebuild, kdenetwork-3.2.1.ebuild, kdenetwork-3.2.3.ebuild, + kdenetwork-3.3.0.ebuild: + Masked kdenetwork-3.3.0.ebuild stable for ppc + + 30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> + kdenetwork-3.1.5.ebuild, kdenetwork-3.2.1.ebuild, kdenetwork-3.2.3.ebuild: + Masked kdenetwork-3.2.3.ebuild stable for ppc + + 30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> + kdenetwork-3.1.5.ebuild, kdenetwork-3.2.1.ebuild: + Masked kdenetwork-3.2.1.ebuild stable for ppc + + 30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> + kdenetwork-3.1.5.ebuild: + Masked kdenetwork-3.1.5.ebuild stable for ppc + + 30 Aug 2004; Carsten Lohrke <carlo@gentoo.org> kdenetwork-3.3.0.ebuild: + block net-misc/ksambaplugin + + 25 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.3-r1.ebuild: + x86 stable + + 23 Aug 2004; Carsten Lohrke <carlo@gentoo.org> kdenetwork-3.3.0.ebuild: + jabber use flag is useless, since kdelibs depends on net-dns/libidn now + + 22 Aug 2004; Tom Gall <tgall@gentoo.org> kdenetwork-3.3.0.ebuild: + stable on ppc64, bug #58227 + +*kdenetwork-3.3.0 (19 Aug 2004) + + 19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.3.0.ebuild, + kdenetwork-3.3.0_beta2.ebuild: + 3.3.0 final + +*kdenetwork-3.3.0_rc2 (10 Aug 2004) + + 10 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.3.0_beta1.ebuild, + kdenetwork-3.3.0_rc2.ebuild: + remove _beta1, add _rc2 + + 08 Aug 2004; Guy Martin <gmsoft@gentoo.org> kdenetwork-3.2.3-r1.ebuild: + Stable on hppa. + +*kdenetwork-3.3.0_beta2 (23 Jul 2004) + + 23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +kdenetwork-3.3.0_beta2.ebuild: + new beta + +*kdenetwork-3.3.0_beta1 (08 Jul 2004) + + 08 Jul 2004; Caleb Tennis <caleb@gentoo.org> + -kdenetwork-3.3.0_alpha1.ebuild, +kdenetwork-3.3.0_beta1.ebuild: + New beta, remove alphas + + 07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> kdenetwork-3.2.2.ebuild: + Stable on alpha. + +*kdenetwork-3.2.3-r1 (28 Jun 2004) + + 28 Jun 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.3-r1.ebuild: + Add a patch for Yahoo brokenness (BUG #55193) + + 16 Jun 2004; Jason Wever <weeve@gentoo.org> kdenetwork-3.2.3.ebuild: + Re-added ~sparc keyword in relation to bug #54092. + + 16 Jun 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.3.ebuild, + kdenetwork-3.3.0_alpha1.ebuild: + Add jabber and ssl use flags with deps + +*kdenetwork-3.2.3 (10 Jun 2004) + + 10 Jun 2004; Caleb Tennis <caleb@gentoo.org> +kdenetwork-3.2.3.ebuild: + Version bump + + 01 Jun 2004; Travis Tilley <lv@gentoo.org> kdenetwork-3.2.2.ebuild: + stable on amd64 + +*kdenetwork-3.3.0_alpha1 (25 May 2004) + + 25 May 2004; Caleb Tennis <caleb@gentoo.org> + +kdenetwork-3.3.0_alpha1.ebuild: + 3.3alpha1 - hardmasked + + 24 May 2004; Guy Martin <gmsoft@gentoo.org> kdenetwork-3.2.2.ebuild: + Marked stable on hppa. + + 23 May 2004; Daniel Ostrow <dostrow@gentoo.org> kdenetwork-3.2.2.ebuild: + Stable on ppc. + + 17 May 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.2.ebuild: + Add wlan use flag support + + 15 May 2004; Jason Wever <weeve@gentoo.org> kdenetwork-3.2.2.ebuild: + Stable on sparc. + + 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> kdenetwork-3.2.0.ebuild, + kdenetwork-3.2.1.ebuild: + Add inherit eutils + + 20 Apr 2004; Caleb Tennis <caleb@gentoo.org> -kdenetwork-3.0.5b.ebuild: + remove old version + +*kdenetwork-3.2.2 (19 Apr 2004) + + 19 Apr 2004; Caleb Tennis <caleb@gentoo.org> +kdenetwork-3.2.2.ebuild: + Version bump + + 17 Apr 2004; Travis Tilley <lv@gentoo.org> kdenetwork-3.2.1.ebuild: + stable on amd64 + + 15 Mar 2004; Jason Wever <weeve@gentoo.org> kdenetwork-3.2.1.ebuild: + Marked stable on sparc. + + 12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.1.4.ebuild, + kdenetwork-3.2.1.ebuild: + x86 stable and version cleanup + +*kdenetwork-3.2.1 (09 Mar 2004) + + 09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.1.ebuild: + Version bump + +*kdenetwork-3.2.1 (09 Mar 2004) + + 09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.1.ebuild: + Version bump + + 28 Feb 2004; Jason Wever <weeve@gentoo.org> kdenetwork-3.1.5.ebuild: + Marked stable on sparc. + + 15 Feb 2004; Jason Wever <weeve@gentoo.org> kdenetwork-3.2.0.ebuild: + Marked stable on sparc. + + 10 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0.ebuild: + x86 stable + + 10 Feb 2004; Lars Weiler <pylon@gentoo.org> kdenetwork-3.2.0.ebuild: + Stable on ppc. + + 05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> kdenetwork-3.2.0.ebuild: + Marked ~ppc + + 04 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0.ebuild, + files/linuxwirelesswidget.cpp.diff: + Add a wifi detection patch + +*kdenetwork-3.2.0 (02 Feb 2004) + + 02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0_rc1.ebuild, + files/kdenetwork-3.2.0_rc1.patch: + New version, remove _rc + + 29 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdenetwork-3.1.5.ebuild: + stable on alpha and ia64 + + 23 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0_rc1.ebuild, + files/kdenetwork-3.2.0_rc1.patch: + A patch for compilation on amd64 + +*kdenetwork-3.2.0_rc1 (18 Jan 2004) + + 18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.0.4-r1.ebuild, + kdenetwork-3.1.2.ebuild, kdenetwork-3.2.0_beta1.ebuild, + kdenetwork-3.2.0_beta2.ebuild, kdenetwork-3.2.0_rc1.ebuild: + New version, removing old versions + + 16 Jan 2004; Martin Guy <gmsoft@gentoo.org> kdenetwork-3.1.5.ebuild: + Marked stable on hppa. + +*kdenetwork-3.1.5 (14 Jan 2004) + + 14 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.1.5.ebuild: + New version + + 13 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdenetwork-3.1.4.ebuild: + stable on alpha + + 04 Jan 2004; Jason Wever <weeve@gentoo.org> kdenetwork-3.2.0_beta2.ebuild: + Added ~sparc keyword. + + 27 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.1.4.ebuild, + kdenetwork-3.2.0_beta2.ebuild: + minor dep fixes + + 24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0_beta2.ebuild: + dependency fixes + +*kdenetwork-3.2.0_beta2 (02 Dec 2003) + + 02 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0_beta2.ebuild: + New beta version + + 29 Nov 2003; Brad House <brad_mssw@gentoo.org> kdenetwork-3.1.4.ebuild: + mark stable on amd64 + + 20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> kdenetwork-3.1.4.ebuild: + Marked ppc + +*kdenetwork-3.2.0_beta1 (01 Nov 2003) + + 01 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0_beta1.ebuild: + New beta version + + 04 Oct 2003; Brad House <brad_mssw@gentoo.org> kdenetwork-3.1.4.ebuild: + add ~amd64 flag + + 27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-2.2.2-r2.ebuild, + kdenetwork-2.2.2-r2.ebuild, kdenetwork-3.1.1-r1.ebuild, + kdenetwork-3.1.1-r1.ebuild, kdenetwork-3.1.3.ebuild, + kdenetwork-3.1.3.ebuild, files/kdenetwork-3.1.1-kmail-sig.diff: + removing stale versions + + 26 Sep 2003; Jason Wever <weeve@gentoo.org> kdenetwork-3.1.4.ebuild: + Added sparc keyword. + +*kdenetwork-3.2.0_alpha2 (25 Sep 2003) + + 25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0_alpha1.ebuild, + kdenetwork-3.2.0_alpha1.ebuild, kdenetwork-3.2.0_alpha2.ebuild: + new alpha version + + 25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.1.4.ebuild: + marking x86 stable + + 16 Sep 2003; Jason Wever <weeve@gentoo.org> kdenetwork-3.1.3.ebuild: + Marked stable for sparc. + +*kdenetwork-3.1.4 (16 Sep 2003) + + 16 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.1.4.ebuild: + New version + +*kdenetwork-3.2.0_alpha1 (15 Sep 2003) + + 15 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0_alpha1: + Version bump - add slp use flag support. + + 07 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.1.3.ebuild: + x86 stable + + 13 Aug 2003; Jason Wever <weeve@gentoo.org> kdenetwork-3.1.1-r1.ebuild: + Marked for sparc to fix repoman dep issues. + + 13 Aug 2003; Jason Wever <weeve@gentoo.org> kdenetwork-3.1.3.ebuild: + Added ~sparc to keywords. + +*kdenetwork-3.1.3 (29 Jul 2003) + + 29 Jul 2003; Paul de Vrieze <pauldv@gentoo.org> kdenetwork-3.1.3.ebuild: + Version bump + + 21 Jun 2003; Caleb Tennis <caleb@gentoo.org>: + Removing old ebuilds: 3.0.5a, 3.1, 3.1.1 + + 16 Jun 2003; Will Woods <wwoods@gentoo.org> kdenetwork-3.1.2.ebuild: + Marked stable for alpha + + 20 May 2003; Jason Wever <weeve@gentoo.org> kdenetwork-3.1.2.ebuild: + Changed ~sparc keyword to sparc. + +*kdenetwork-3.1.2 (19 May 2003) + + 19 May 2003; Dan Armak <danarmak@gentoo.org> kdenetwork-3.1.2.ebuild: + New version of KDE. + + 28 Apr 2003; Lars Weiler <pylon@gentoo.org> kdenetwork-3.1.1-r1.ebuild: + Set ppc in KEYWORDS + +*kdenetwork-3.1.1-r1 (19 Apr 2003) + + 19 Apr 2003; Dan Armak <danarmak@gentoo.org> Manifest, + kdenetwork-3.1.1-r1.ebuild, files/kdenetwork-3.1.1-kmail-sig.diff: + Added patch from kde cvs that fixes the kmail issue that caused gpg signatures + of messages with attachements to be broken. + +*kdenetwork-3.0.5b (08 Apr 2003) + + 08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdenetwork-3.0.5b.ebuild: + A security patch release fixing a kghostview vulnerability. See GLSA. + Also includes misc other fixes. + +*kdenetwork-3.1.1 (14 Mar 2003) + + 19 Mar 2003; Jason Wever <weeve@gentoo.org> kdenetwork-3.1.1.ebuild: + Changed ~sparc keyword to sparc. + + 14 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kdenetwork-3.1.1.ebuild: + version bump + + 28 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdenetwork-3.1.ebuild, + files/kdenetwork-3.1-libxml2-2.5.2.diff: fix for >=libxml2-2.5.2, bug + #15245 + + 15 Feb 2003; Jason Wever <weeve@gentoo.org> kdenetwork-3.1.ebuild: + Changed ~sparc keyword to sparc. + +*kdenetwork-3.1 (01 Feb 2003) + + 28 Feb 2003; Will Woods <wwoods@gentoo.org> kdenetwork-3.1.ebuild: + Added ~alpha to keywords + + 12 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdenetwork-2.2.2.ebuild, + kdenetwork-3.0.2.ebuild, kdenetwork-3.0.3.ebuild, kdenetwork-3.0.4.ebuild, + kdenetwork-3.1_rc6.ebuild: removed old ebuilds + +*kdenetwork-2.2.2-r2 (17 Jan 2003) + + 01 Feb 2003; Jack Morgan <jmorgan@gentoo.org> kdenetwork-3.1.ebuild: + added ~sparc to keywords + + 17 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdenetwork-2.2.2-r2.ebuild: + new version, fixes #12520 + + 08 Jan 2003; Mark Guertin <gerk@gentoo.org> kdenetwork-3.1_rc6.ebuild: + added ~ppc to keywords + +*kdenetwork-3.1_rc6 (05 Jan 2003) + + 05 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdenetwork-3.1_rc6.ebuild: + version bump + +*kdenetwork-3.0.5a (21 Dec 2002) + + 06 Jan 2003; Jason Wever <weeve@gentoo.org> kdenetwork-3.0.5a.ebuild: + Added ~sparc keyword + + 21 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdenetwork-3.0.5a.ebuild: + version bump + + 08 Dec 2002; Jack Morgan <jmorgan@gentoo.org> kdenetwork-3.1_rc5.ebuild : + Added sparc keyword + + 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords + + 04 Dec 2002; Olivier Reisch <doctomoe@gentoo.org> kdenetwork-3.1.ebuild: + Added ppc keyword + + 02 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdenetwork-3.1.ebuild: + added patch to compile on alpha + +*kdenetwork-3.0.4-r1 (14 Nov 2002) + + 14 Nov 2002; Hannes Mehnert <hannes@gentoo.org> kdenetwork-3.0.4-r1.ebuild: + this fixes security bug #10707, thanks to n2uro@aol.com (Samuel Greenfeld) + for submission + +*kdenetwork-3.1_rc3 (12 Nov 2002) + + 12 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog: + kde-3.1_rc3 + +*kdenetwork-3.1_rc2 (04 Nov 2002) + + 04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog: + kde-3.1_rc2 + + 24 Oct 2002; Hannes Mehnert <hannes@gentoo.org> kdenetwork-3.0.2.ebuild, + kdenetwork-3.0.3.ebuild, kdenetwork-3.0.4.ebuild, kdenetwork-3.1_beta1.ebuild, + kdenetwork-3.1_beta2.ebuild: added dependency on kdebase (closes #9402) + +*kdenetwork-3.0.4 (09 Oct 2002) + + 09 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog : + + KDE 3.0.4, the latest bugfix release. + +*kdenetwork-3.0.3 (19 Aug 2002) + + 19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog : + + New bugfix release. Enjoy! + +*kdenetwork-3.0.2 (03 Jul 2002) + + 01 Aug 2002; Mark Guertin <gerk@gentoo.org> kde-3.0.2.ebuild : + Added ppc to keywords + + 03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog : : : : : : : : : : : : + + New stability release. + +*kdenetwork-3.0.1.20020604 (4 Jun 2002) + + 4 Jun 2002; Dan Armak <danarmak@gentoo.org> Changelog : + + This is a snapshot of the KDE CVS's KDE_3_0_x branch from June 6th. + This branch contains only bugfixes to the 3.0 release (the 3.0.1 release + was also of this kind). + +*kdenetwork-3.0.1 (24 May 2002) + + 24 May 2002; Dan Armak <danarmak@gentoo.org> Changelog : + + Bugfix release (KDE 3.0.1). + +*kdenetwork-3.0.1 (14 May 2002) + + 14 May 2002; Bart Verwilst <verwilst@gentoo.org> Changelog : + + New bugfix-release.. Enjoy! + +*kdenetwork-3.0-r1 (11 May 2002) + + 11 May 2002; Dan Armak <danarmak@gentoo.org> Changelog : + + Added initscripts for lisa and reslisa, close bug #1230. + +*kdenetwork-3.0 (4 Apr 2002) + + 4 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog : + + KDE 3.0 ebuilds. Based on the well-tested kde3pre ebuild set. + +*kdenetwork-2.2.2-r1 (28 Mar 2002) + + 28 Mar 2002; Dan Armak <danarmak@gentoo.org> ChangeLog : + + Install reslisa suid root. Close bug #1231. Thanks to pardsbane for reporting. *kdenetwork-2.2.2 (1 Feb 2002) diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest index 28ef96d726dd..be076f5c623a 100644 --- a/kde-base/kdenetwork/Manifest +++ b/kde-base/kdenetwork/Manifest @@ -1,19 +1,39 @@ -MD5 e6811a9b5e680cf30978893e6c7a2caf kdenetwork-3.0.5b.ebuild 968 -MD5 2855066433f32ebe500a93ea3b1d366c kdenetwork-2.2.2-r2.ebuild 603 -MD5 3eae1afd41911bfee40a760b1bf8568a kdenetwork-3.0.5a.ebuild 967 -MD5 ce60f0025c07b1748b3b6254be3858c2 kdenetwork-3.1.ebuild 920 -MD5 95f4cb6f88741690f2faf0d451ac7b01 kdenetwork-3.1.1.ebuild 876 -MD5 7ee307959ba5ec560a0ad4044842f832 kdenetwork-3.0.4-r1.ebuild 1058 -MD5 7b0a87fb752fed738c52c3ce41a4a4eb ChangeLog 4874 -MD5 8cfc35635879b3b4fc158d2efa9ec0bb files/lisa 559 -MD5 86ce22554d0bf8df52bc6fe7425184a3 files/reslisa 570 -MD5 5eff7873bc0ddc7248a5c0a3d44ba2db files/digest-kdenetwork-2.2.2-r2 139 -MD5 3939e85ee43aba114cc3ece4194145b6 files/reslisa.conf 340 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 94476c75e583bcf4e21c7f3f4e9b75be ChangeLog 23212 +MD5 c6db44a9df98a9927235b28065adb065 files/digest-kdenetwork-3.3.2-r2 149 +MD5 7e1dab8dea5082d73c25c6ae6b4251b1 files/digest-kdenetwork-3.4.1-r1 149 +MD5 a4f0ff59ade2b98019bd0968a4615141 files/digest-kdenetwork-3.4.2 70 +MD5 c259b2aa6bede478d4afff87117e9685 files/digest-kdenetwork-3.4.3 70 +MD5 c1796dff01cbd770e451d9686766c581 files/digest-kdenetwork-3.5.0 70 +MD5 a3e74a75bc237f21ad90ded82284deba files/digest-kdenetwork-3.5.0_beta2 71 +MD5 759135b358d9f2f0d66de768f709cdc4 files/digest-kdenetwork-3.5.0_rc1 74 +MD5 16b903e400a8cf2d73f3c237799238db files/digest-kdenetwork-3.5_beta1 71 +MD5 2db2170b384350ce6c05cd23c0bb21c7 files/disable-meanwhile.diff 351 +MD5 cb87d2a81f7430f823e9173c3f478523 files/kdenetwork-3.3.2-kopete-msn.patch 34696 +MD5 e07566eb35cec7afdfa2e38edf7cdcd1 files/kdenetwork-3.3.2-kwifimanager-configlocation.patch 720 +MD5 e9d8998d39d625a80749a027a9a8e303 files/kdenetwork-3.4-configure.patch 5768 +MD5 18a84d8db7a6c95643f1de61e3c4c783 files/kdenetwork-3.5_beta1-gadu.patch 1876 +MD5 db3c7f3cc040e55e195767191491acaa files/kopete-3.5.0_rc1-fix.patch 709 +MD5 732cc856c1e48585781d79173f5d271b files/lisa 538 MD5 d97100af0cb95f733660b7a61492d71f files/lisa.conf 452 -MD5 450c5fbda500f395c2514d2fb8f6a5b4 files/kdenetwork-3.1-libxml2-2.5.2.diff 559 -MD5 c97042204651bd92a0d0ccff4d6d0467 files/digest-kdenetwork-3.0.5a 71 -MD5 f0c248642c03c33f830bdab6c2114aee files/digest-kdenetwork-3.0.5b 522 -MD5 fd9d0a9e3a15f685d5368343cae44daa files/digest-kdenetwork-3.0.4-r1 151 -MD5 fa71bfa7d91dfad1c95002f15bbefa6a files/kdenetwork-3.1-alpha.diff 533 -MD5 efb32a414366975251ba09b9bb40c1b1 files/digest-kdenetwork-3.1 68 -MD5 9ffa1c32d0e67edf1ea46483e02ceb91 files/digest-kdenetwork-3.1.1 70 +MD5 28c3ba792f8a0ce436216062cefa7908 files/reslisa 549 +MD5 3939e85ee43aba114cc3ece4194145b6 files/reslisa.conf 340 +MD5 426360bf289efe11a499f1fa89bb2f4b files/wireless-extensions-api.diff 528 +MD5 c7193df16ddf0b66963e907f864b3f56 kdenetwork-3.3.2-r2.ebuild 1642 +MD5 703982710ee8234b723875536043674f kdenetwork-3.4.1-r1.ebuild 1714 +MD5 f01a7eb66338a4264475bdd11347ac4b kdenetwork-3.4.2.ebuild 1794 +MD5 383d9694b2530580af3e9b966642a1a7 kdenetwork-3.4.3.ebuild 1760 +MD5 e51a0406a9fffcec777d684f05ef738f kdenetwork-3.5.0.ebuild 1655 +MD5 f5d41dc956a7a06750e6f3e81d18561b kdenetwork-3.5.0_beta2.ebuild 1654 +MD5 00b1aa1c21079fa6996ea866372457df kdenetwork-3.5.0_rc1.ebuild 1761 +MD5 ca35495beca57dcdee437d03007c0a86 kdenetwork-3.5_beta1.ebuild 1781 +MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDhubSntT9W3vfTuoRAh3MAJ9MKFlDOrtjZFEWZLS7qRv+nw+xVQCfRQsZ +Zjznu5c02ubvt5cMaGBMV+4= +=0w5e +-----END PGP SIGNATURE----- diff --git a/kde-base/kdenetwork/files/kdenetwork-3.3.2-kopete-msn.patch b/kde-base/kdenetwork/files/kdenetwork-3.3.2-kopete-msn.patch index bc8e7456e805..277b307ab2c7 100644 --- a/kde-base/kdenetwork/files/kdenetwork-3.3.2-kopete-msn.patch +++ b/kde-base/kdenetwork/files/kdenetwork-3.3.2-kopete-msn.patch @@ -1,771 +1,83 @@ -diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.am kdenetwork-3.3.2/kopete/protocols/msn/Makefile.am ---- kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.am 2004-06-25 11:10:14.000000000 +0200 -+++ kdenetwork-3.3.2/kopete/protocols/msn/Makefile.am 2005-05-22 19:35:27.000000000 +0200 +diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/Makefile.am kdenetwork-3.3.2-new/kopete/protocols/msn/Makefile.am +--- kdenetwork-3.3.2/kopete/protocols/msn/Makefile.am 2004-06-25 12:10:14.000000000 +0300 ++++ kdenetwork-3.3.2-new/kopete/protocols/msn/Makefile.am 2005-05-21 14:06:36.000000000 +0300 @@ -1,3 +1,4 @@ -+KDE_OPTIONS = nofinal ++KDE_OPTIONS = nofinal METASOURCES = AUTO SUBDIRS = ui . icons config AM_CPPFLAGS = -I$(srcdir)/ui \ -@@ -11,8 +12,8 @@ - CLEANFILES = dummy.cpp +@@ -12,7 +13,8 @@ libkopete_msn_shared_la_SOURCES = msnprotocol.cpp msnaccount.cpp msnaddcontactpage.cpp msncontact.cpp \ -- msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp \ + msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp \ - msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp -+ msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp sslloginhandler.cpp \ -+ msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp ++ msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp \ ++ sslloginhandler.cpp libkopete_msn_shared_la_LIBADD = ./ui/libkopetemsnui.la ../../libkopete/libkopete.la $(LIB_KIO) libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(all_libraries) -diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.3.2/kopete/protocols/msn/Makefile.in ---- kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in 2004-11-29 16:24:54.000000000 +0100 -+++ kdenetwork-3.3.2/kopete/protocols/msn/Makefile.in 2005-05-22 19:57:41.000000000 +0200 -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.9.1 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # KDE tags expanded automatically by am_edit - $Revision: 1.1 $ - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,9 +15,6 @@ - - @SET_MAKE@ - -- --SOURCES = $(kopete_msn_la_SOURCES) $(libkopete_msn_shared_la_SOURCES) -- - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ -@@ -25,6 +22,7 @@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../../.. -+ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 -@@ -41,97 +39,6 @@ - build_triplet = @build@ - host_triplet = @host@ - target_triplet = @target@ --subdir = kopete/protocols/msn --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" \ -- "$(DESTDIR)$(mydatadir)" "$(DESTDIR)$(servicedir)" --kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) --libLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) --kopete_msn_la_DEPENDENCIES = libkopete_msn_shared.la --am_kopete_msn_la_OBJECTS = dummy.lo --#>- kopete_msn_la_OBJECTS = $(am_kopete_msn_la_OBJECTS) --#>+ 1 --kopete_msn_la_OBJECTS = dummy.lo --am__DEPENDENCIES_1 = --libkopete_msn_shared_la_DEPENDENCIES = ./ui/libkopetemsnui.la \ -- ../../libkopete/libkopete.la $(am__DEPENDENCIES_1) --am_libkopete_msn_shared_la_OBJECTS = msnprotocol.lo msnaccount.lo \ -- msnaddcontactpage.lo msncontact.lo msnsocket.lo \ -- msnmessagemanager.lo msndebugrawcmddlg.lo msnnotifysocket.lo \ -- msnswitchboardsocket.lo msnfiletransfersocket.lo \ +diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/Makefile.in kdenetwork-3.3.2-new/kopete/protocols/msn/Makefile.in +--- kdenetwork-3.3.2/kopete/protocols/msn/Makefile.in 2004-11-29 17:24:54.000000000 +0200 ++++ kdenetwork-3.3.2-new/kopete/protocols/msn/Makefile.in 2005-05-21 14:21:28.000000000 +0300 +@@ -74,18 +74,15 @@ + msnaddcontactpage.lo msncontact.lo msnsocket.lo \ + msnmessagemanager.lo msndebugrawcmddlg.lo msnnotifysocket.lo \ + msnswitchboardsocket.lo msnfiletransfersocket.lo \ - msninvitation.lo msnp2p.lo sha1.lo --#>- libkopete_msn_shared_la_OBJECTS = \ --#>- $(am_libkopete_msn_shared_la_OBJECTS) ++ msninvitation.lo msnp2p.lo sha1.lo sslloginhandler.lo + #>- libkopete_msn_shared_la_OBJECTS = \ + #>- $(am_libkopete_msn_shared_la_OBJECTS) -#>+ 8 -libkopete_msn_shared_la_final_OBJECTS = libkopete_msn_shared_la.all_cpp.lo -libkopete_msn_shared_la_nofinal_OBJECTS = msnprotocol.lo msnaccount.lo \ -- msnaddcontactpage.lo msncontact.lo msnsocket.lo \ -- msnmessagemanager.lo msndebugrawcmddlg.lo msnnotifysocket.lo \ -- msnswitchboardsocket.lo msnfiletransfersocket.lo \ ++#>+ 5 ++libkopete_msn_shared_la_OBJECTS = msnprotocol.lo msnaccount.lo \ + msnaddcontactpage.lo msncontact.lo msnsocket.lo \ + msnmessagemanager.lo msndebugrawcmddlg.lo msnnotifysocket.lo \ + msnswitchboardsocket.lo msnfiletransfersocket.lo \ - msninvitation.lo msnp2p.lo sha1.lo -@KDE_USE_FINAL_FALSE@libkopete_msn_shared_la_OBJECTS = $(libkopete_msn_shared_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@libkopete_msn_shared_la_OBJECTS = $(libkopete_msn_shared_la_final_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --am__depfiles_maybe = depfiles --#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ --#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 2 --CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \ --#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ --#>- $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 3 --LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --CXXLD = $(CXX) --#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \ --#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --#>+ 2 --CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \ -- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = $(kopete_msn_la_SOURCES) $(libkopete_msn_shared_la_SOURCES) --DIST_SOURCES = $(kopete_msn_la_SOURCES) \ -- $(libkopete_msn_shared_la_SOURCES) --#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ --#>- html-recursive info-recursive install-data-recursive \ --#>- install-exec-recursive install-info-recursive \ --#>- install-recursive installcheck-recursive installdirs-recursive \ --#>- pdf-recursive ps-recursive uninstall-info-recursive \ --#>- uninstall-recursive --#>+ 6 --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-exec-recursive install-info-recursive \ -- install-recursive installcheck-recursive installdirs-recursive \ -- pdf-recursive ps-recursive uninstall-info-recursive \ -- uninstall-recursive nmcheck-recursive bcheck-recursive --mydataDATA_INSTALL = $(INSTALL_DATA) --serviceDATA_INSTALL = $(INSTALL_DATA) --DATA = $(mydata_DATA) $(service_DATA) --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --#>+ 1 --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - ACLOCAL = @ACLOCAL@ - AMDEP_FALSE = @AMDEP_FALSE@ - AMDEP_TRUE = @AMDEP_TRUE@ -@@ -320,8 +227,6 @@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ -@@ -407,7 +312,6 @@ - librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -@@ -428,6 +332,7 @@ ++ msninvitation.lo msnp2p.lo sha1.lo sslloginhandler.lo + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp + am__depfiles_maybe = depfiles +@@ -428,6 +425,7 @@ xdg_appsdir = @xdg_appsdir@ xdg_directorydir = @xdg_directorydir@ xdg_menudir = @xdg_menudir@ -+KDE_OPTIONS = nofinal ++KDE_OPTIONS = nofinal #>- METASOURCES = AUTO SUBDIRS = ui . icons config AM_CPPFLAGS = -I$(srcdir)/ui \ -@@ -435,125 +340,197 @@ - $(KOPETE_INCLUDES) \ - $(all_includes) - -+ - kde_module_LTLIBRARIES = kopete_msn.la - lib_LTLIBRARIES = libkopete_msn_shared.la -+ +@@ -440,7 +438,8 @@ CLEANFILES = dummy.cpp -+ libkopete_msn_shared_la_SOURCES = msnprotocol.cpp msnaccount.cpp msnaddcontactpage.cpp msncontact.cpp \ -- msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp \ + msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp \ - msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp -+ msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp sslloginhandler.cpp \ -+ msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp -+ ++ msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp \ ++ sslloginhandler.cpp libkopete_msn_shared_la_LIBADD = ./ui/libkopetemsnui.la ../../libkopete/libkopete.la $(LIB_KIO) #>- libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(all_libraries) - #>+ 1 - libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) -+ - kopete_msn_la_SOURCES = dummy.cpp - kopete_msn_la_LIBADD = libkopete_msn_shared.la -+ - #>- kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) - #>+ 1 - kopete_msn_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -module $(KDE_PLUGIN) $(all_libraries) -+ - service_DATA = kopete_msn.desktop - servicedir = $(kde_servicesdir) -+ - mydatadir = $(kde_datadir)/kopete_msn - mydata_DATA = msnchatui.rc -+subdir = kopete/protocols/msn -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) -+ -+kopete_msn_la_DEPENDENCIES = libkopete_msn_shared.la -+am_kopete_msn_la_OBJECTS = dummy.lo -+#>- kopete_msn_la_OBJECTS = $(am_kopete_msn_la_OBJECTS) -+#>+ 1 -+kopete_msn_la_OBJECTS = dummy.lo -+libkopete_msn_shared_la_DEPENDENCIES = ./ui/libkopetemsnui.la \ -+ ../../libkopete/libkopete.la -+am_libkopete_msn_shared_la_OBJECTS = msnprotocol.lo msnaccount.lo \ -+ msnaddcontactpage.lo msncontact.lo msnsocket.lo \ -+ msnmessagemanager.lo msndebugrawcmddlg.lo sslloginhandler.lo \ -+ msnnotifysocket.lo msnswitchboardsocket.lo \ -+ msnfiletransfersocket.lo msninvitation.lo msnp2p.lo sha1.lo -+#>- libkopete_msn_shared_la_OBJECTS = $(am_libkopete_msn_shared_la_OBJECTS) -+#>+ 5 -+libkopete_msn_shared_la_OBJECTS = msnprotocol.lo msnaccount.lo \ -+ msnaddcontactpage.lo msncontact.lo msnsocket.lo \ -+ msnmessagemanager.lo msndebugrawcmddlg.lo sslloginhandler.lo \ -+ msnnotifysocket.lo msnswitchboardsocket.lo \ -+ msnfiletransfersocket.lo msninvitation.lo msnp2p.lo sha1.lo -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -+am__depfiles_maybe = depfiles -+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo ./$(DEPDIR)/msnaccount.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msnaddcontactpage.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msncontact.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msndebugrawcmddlg.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msnfiletransfersocket.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msninvitation.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msnmessagemanager.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msnnotifysocket.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msnp2p.Plo ./$(DEPDIR)/msnprotocol.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msnsocket.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msnswitchboardsocket.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/sha1.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/sslloginhandler.Plo -+#>+ 13 -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo ./$(DEPDIR)/msnaccount.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msnaddcontactpage.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msncontact.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msndebugrawcmddlg.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msnfiletransfersocket.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msninvitation.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msnmessagemanager.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msnnotifysocket.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msnp2p.Plo ./$(DEPDIR)/msnprotocol.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msnsocket.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msnswitchboardsocket.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/sha1.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/sslloginhandler.Plo -+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+#>+ 2 -+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ -+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+#>- $(AM_CXXFLAGS) $(CXXFLAGS) -+#>+ 3 -+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -+CXXLD = $(CXX) -+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ -+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+#>+ 2 -+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(kopete_msn_la_SOURCES) \ -+ $(libkopete_msn_shared_la_SOURCES) -+DATA = $(mydata_DATA) $(service_DATA) -+ -+ -+#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+#>- ps-recursive install-info-recursive uninstall-info-recursive \ -+#>- all-recursive install-data-recursive install-exec-recursive \ -+#>- installdirs-recursive install-recursive uninstall-recursive \ -+#>- check-recursive installcheck-recursive -+#>+ 5 -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am TODO -+DIST_SUBDIRS = $(SUBDIRS) -+SOURCES = $(kopete_msn_la_SOURCES) $(libkopete_msn_shared_la_SOURCES) -+ - #>- all: all-recursive - #>+ 1 - all: docs-am all-recursive - - .SUFFIXES: - .SUFFIXES: .cpp .lo .o .obj --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) --#>- @for dep in $?; do \ --#>- case '$(am__configure_deps)' in \ --#>- *$$dep*) \ --#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ --#>- && exit 0; \ --#>- exit 1;; \ --#>- esac; \ --#>- done; \ --#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kopete/protocols/msn/Makefile'; \ -+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - #>- cd $(top_srcdir) && \ --#>- $(AUTOMAKE) --foreign kopete/protocols/msn/Makefile --#>+ 12 -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kopete/protocols/msn/Makefile'; \ -+#>- $(AUTOMAKE) --gnu kopete/protocols/msn/Makefile -+#>+ 3 - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kopete/protocols/msn/Makefile -+ $(AUTOMAKE) --gnu kopete/protocols/msn/Makefile - cd $(top_srcdir) && perl admin/am_edit kopete/protocols/msn/Makefile.in --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) - install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)" -+ $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) - @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \ - else :; fi; \ - done - - uninstall-kde_moduleLTLIBRARIES: - @$(NORMAL_UNINSTALL) -- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ -+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \ - done - - clean-kde_moduleLTLIBRARIES: - -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) - @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -+libLTLIBRARIES_INSTALL = $(INSTALL) - install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" -+ $(mkinstalldirs) $(DESTDIR)$(libdir) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ - else :; fi; \ - done - - uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) -- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ -+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ - done - - clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -@@ -569,7 +546,7 @@ - $(CXXLINK) -rpath $(libdir) $(libkopete_msn_shared_la_LDFLAGS) $(libkopete_msn_shared_la_OBJECTS) $(libkopete_msn_shared_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -588,27 +565,40 @@ +@@ -588,6 +587,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msnsocket.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msnswitchboardsocket.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sslloginhandler.Plo@am__quote@ .cpp.o: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCXX_TRUE@ fi - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - .cpp.obj: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCXX_TRUE@ fi - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .cpp.lo: --@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCXX_TRUE@ fi - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -619,39 +609,41 @@ - distclean-libtool: - -rm -f libtool - uninstall-info-am: -+mydataDATA_INSTALL = $(INSTALL_DATA) - install-mydataDATA: $(mydata_DATA) - @$(NORMAL_INSTALL) -- test -z "$(mydatadir)" || $(mkdir_p) "$(DESTDIR)$(mydatadir)" -+ $(mkinstalldirs) $(DESTDIR)$(mydatadir) - @list='$(mydata_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(mydataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mydatadir)/$$f'"; \ -- $(mydataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mydatadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(mydataDATA_INSTALL) $$d$$p $(DESTDIR)$(mydatadir)/$$f"; \ -+ $(mydataDATA_INSTALL) $$d$$p $(DESTDIR)$(mydatadir)/$$f; \ - done - - uninstall-mydataDATA: - @$(NORMAL_UNINSTALL) - @list='$(mydata_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(mydatadir)/$$f'"; \ -- rm -f "$(DESTDIR)$(mydatadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(mydatadir)/$$f"; \ -+ rm -f $(DESTDIR)$(mydatadir)/$$f; \ - done -+serviceDATA_INSTALL = $(INSTALL_DATA) - install-serviceDATA: $(service_DATA) - @$(NORMAL_INSTALL) -- test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)" -+ $(mkinstalldirs) $(DESTDIR)$(servicedir) - @list='$(service_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \ -- $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(serviceDATA_INSTALL) $$d$$p $(DESTDIR)$(servicedir)/$$f"; \ -+ $(serviceDATA_INSTALL) $$d$$p $(DESTDIR)$(servicedir)/$$f; \ - done - - uninstall-serviceDATA: - @$(NORMAL_UNINSTALL) - @list='$(service_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(servicedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(servicedir)/$$f"; \ -+ rm -f $(DESTDIR)$(servicedir)/$$f; \ - done - - # This directory's subdirectories are mostly independent; you can cd -@@ -713,6 +705,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -721,22 +721,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -746,11 +743,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -773,6 +769,12 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+#>+ 1 -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -@@ -786,7 +788,7 @@ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -+ $(mkinstalldirs) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ -@@ -801,17 +803,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(mkdir_p) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -821,9 +821,8 @@ - all-am: Makefile $(LTLIBRARIES) $(DATA) - installdirs: installdirs-recursive - installdirs-am: -- for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(mydatadir)" "$(DESTDIR)$(servicedir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(libdir) $(DESTDIR)$(mydatadir) $(DESTDIR)$(servicedir) -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -844,7 +843,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -853,11 +852,11 @@ - #>+ 1 - clean: kde-rpo-clean clean-recursive - --#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES \ --#>- clean-libLTLIBRARIES clean-libtool mostlyclean-am -+#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES \ -+#>- clean-libtool mostlyclean-am + @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@@ -856,7 +856,7 @@ + #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES \ + #>- clean-libLTLIBRARIES clean-libtool mostlyclean-am #>+ 2 -clean-am: clean-metasources clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES \ -- clean-libLTLIBRARIES clean-libtool mostlyclean-am -+clean-am: clean-metasources clean-closures clean-bcheck clean-generic clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES \ -+ clean-libtool mostlyclean-am ++clean-am: clean-metasources clean-closures clean-bcheck clean-generic clean-kde_moduleLTLIBRARIES \ + clean-libLTLIBRARIES clean-libtool mostlyclean-am distclean: distclean-recursive - -rm -rf ./$(DEPDIR) -@@ -869,8 +868,6 @@ - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: -@@ -915,23 +912,27 @@ - - uninstall-info: uninstall-info-recursive - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ -- clean clean-generic clean-kde_moduleLTLIBRARIES \ -- clean-libLTLIBRARIES clean-libtool clean-recursive ctags \ -- ctags-recursive distclean distclean-compile distclean-generic \ -- distclean-libtool distclean-recursive distclean-tags distdir \ -- dvi dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-exec install-exec-am \ -- install-info install-info-am install-kde_moduleLTLIBRARIES \ -- install-libLTLIBRARIES install-man install-mydataDATA \ -+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -+ clean-generic clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES \ -+ clean-libtool clean-recursive ctags ctags-recursive distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-recursive distclean-tags distdir dvi dvi-am \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive \ -+ install-kde_moduleLTLIBRARIES install-libLTLIBRARIES \ -+ install-man install-mydataDATA install-recursive \ - install-serviceDATA install-strip installcheck installcheck-am \ -- installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic maintainer-clean-recursive \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ -- tags tags-recursive uninstall uninstall-am uninstall-info-am \ -- uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \ -- uninstall-mydataDATA uninstall-serviceDATA -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -+ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ -+ tags-recursive uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-kde_moduleLTLIBRARIES \ -+ uninstall-libLTLIBRARIES uninstall-mydataDATA \ -+ uninstall-recursive uninstall-serviceDATA - - - dummy.cpp: $(srcdir)/Makefile.am -@@ -965,18 +966,18 @@ - mocs: msnmessagemanager.moc - - #>+ 3 --msnfiletransfersocket.moc: $(srcdir)/msnfiletransfersocket.h -- $(MOC) $(srcdir)/msnfiletransfersocket.h -o msnfiletransfersocket.moc -+msncontact.moc: $(srcdir)/msncontact.h -+ $(MOC) $(srcdir)/msncontact.h -o msncontact.moc - - #>+ 2 --mocs: msnfiletransfersocket.moc -+mocs: msncontact.moc - - #>+ 3 --msncontact.moc: $(srcdir)/msncontact.h -- $(MOC) $(srcdir)/msncontact.h -o msncontact.moc -+msnfiletransfersocket.moc: $(srcdir)/msnfiletransfersocket.h -+ $(MOC) $(srcdir)/msnfiletransfersocket.h -o msnfiletransfersocket.moc - - #>+ 2 --mocs: msncontact.moc -+mocs: msnfiletransfersocket.moc - - #>+ 3 - msnprotocol.moc: $(srcdir)/msnprotocol.h -@@ -986,6 +987,13 @@ +@@ -986,6 +986,13 @@ mocs: msnprotocol.moc #>+ 3 @@ -779,7 +91,7 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.3. msnaccount.moc: $(srcdir)/msnaccount.h $(MOC) $(srcdir)/msnaccount.h -o msnaccount.moc -@@ -1000,18 +1008,18 @@ +@@ -1000,18 +1007,18 @@ mocs: msnsocket.moc #>+ 3 @@ -804,43 +116,20 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.3. #>+ 3 msnp2p.moc: $(srcdir)/msnp2p.h -@@ -1038,10 +1046,10 @@ +@@ -1038,10 +1045,10 @@ #>+ 3 clean-metasources: - -rm -f msndebugrawcmddlg.moc msnmessagemanager.moc msnfiletransfersocket.moc msncontact.moc msnprotocol.moc msnaccount.moc msnsocket.moc msnnotifysocket.moc msnswitchboardsocket.moc msnp2p.moc msnaddcontactpage.moc -+ -rm -f msndebugrawcmddlg.moc msnmessagemanager.moc msncontact.moc msnfiletransfersocket.moc msnprotocol.moc sslloginhandler.moc msnaccount.moc msnsocket.moc msnswitchboardsocket.moc msnnotifysocket.moc msnp2p.moc msnaddcontactpage.moc ++ -rm -f msndebugrawcmddlg.moc msnmessagemanager.moc msnfiletransfersocket.moc msncontact.moc msnprotocol.moc sslloginhandler.moc msnaccount.moc msnsocket.moc msnswitchboardsocket.moc msnnotifysocket.moc msnp2p.moc msnaddcontactpage.moc #>+ 2 -KDE_DIST=kopete_msn.desktop msncontact.h msnp2p.h msnmessagemanager.h msnchatui.rc Changelog msnsocket.h ReleaseNotes msndebugrawcmddlg.h msnaccount.h msnfiletransfersocket.h sha1.h msninvitation.h Makefile.in msnswitchboardsocket.h msnprotocol.h msnnotifysocket.h msnaddcontactpage.h Makefile.am -+KDE_DIST=kopete_msn.desktop msncontact.h msnp2p.h msnmessagemanager.h msnchatui.rc Changelog msnsocket.h ReleaseNotes msndebugrawcmddlg.h msnaccount.h msnfiletransfersocket.h sha1.h sslloginhandler.h msninvitation.h Makefile.in msnswitchboardsocket.h msnprotocol.h msnnotifysocket.h msnaddcontactpage.h ++KDE_DIST=msndebugrawcmddlg.h kopete_msn.desktop msncontact.h msnaccount.h msnp2p.h msnfiletransfersocket.h sha1.h msnmessagemanager.h msnchatui.rc sslloginhandler.h msninvitation.h Makefile.in Changelog msnswitchboardsocket.h msnsocket.h msnprotocol.h msnnotifysocket.h ReleaseNotes msnaddcontactpage.h Makefile.am #>+ 3 clean-closures: -@@ -1050,19 +1058,10 @@ - #>+ 2 - docs-am: - --#>+ 15 -+#>+ 6 - force-reedit: -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kopete/protocols/msn/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kopete/protocols/msn/Makefile -+ cd $(top_srcdir) && \ -+ $(AUTOMAKE) --gnu kopete/protocols/msn/Makefile - cd $(top_srcdir) && perl admin/am_edit kopete/protocols/msn/Makefile.in - - -@@ -1088,37 +1087,21 @@ +@@ -1088,37 +1095,21 @@ done @@ -882,7 +171,7 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.3. #>+ 3 cvs-clean: -@@ -1128,7 +1111,7 @@ +@@ -1128,7 +1119,7 @@ kde-rpo-clean: -rm -f *.rpo @@ -891,7 +180,7 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.3. msnnotifysocket.lo: msnnotifysocket.moc msnprotocol.lo: msnprotocol.moc msncontact.o: msncontact.moc -@@ -1139,17 +1122,19 @@ +@@ -1139,17 +1130,19 @@ msnmessagemanager.lo: msnmessagemanager.moc msndebugrawcmddlg.o: msndebugrawcmddlg.moc msnsocket.lo: msnsocket.moc @@ -913,9 +202,9 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.3. msnaddcontactpage.lo: msnaddcontactpage.moc msnp2p.o: msnp2p.moc msnfiletransfersocket.lo: msnfiletransfersocket.moc -diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.cpp ---- kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp 2004-08-05 21:26:24.000000000 +0200 -+++ kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.cpp 2005-05-22 19:35:27.000000000 +0200 +diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.cpp kdenetwork-3.3.2-new/kopete/protocols/msn/msnnotifysocket.cpp +--- kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.cpp 2004-08-05 22:26:24.000000000 +0300 ++++ kdenetwork-3.3.2-new/kopete/protocols/msn/msnnotifysocket.cpp 2005-05-19 23:40:15.000000000 +0300 @@ -23,6 +23,7 @@ #include "msnnotifysocket.h" #include "msncontact.h" @@ -924,23 +213,26 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetw #include <qregexp.h> -@@ -47,6 +48,7 @@ +@@ -47,7 +48,8 @@ : MSNSocket( account ) { m_newstatus = MSNProtocol::protocol()->NLN; +- + m_sslLoginHandler=0l; - ++ m_isHotmailAccount=false; m_ping=false; -@@ -67,6 +69,7 @@ + +@@ -66,7 +68,7 @@ + MSNNotifySocket::~MSNNotifySocket() { - delete m_tmpMailFile; +- delete m_tmpMailFile; + delete m_sslLoginHandler; kdDebug(14140) << k_funcinfo << endl; } -@@ -246,7 +249,7 @@ +@@ -246,7 +248,7 @@ if ( cmd == "VER" ) { @@ -949,7 +241,7 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetw /* struct utsname utsBuf; uname ( &utsBuf ); -@@ -264,27 +267,16 @@ +@@ -264,26 +266,15 @@ { if( data.section( ' ', 1, 1 ) == "S" ) { @@ -980,17 +272,14 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetw - // This should force kio to download the page even is we are in the konqueror offline mode. [see bug #68483] - job->addMetaData("cache", "reload"); - QObject::connect( job, SIGNAL(result( KIO::Job *)), this, SLOT(slotAuthJobDone( KIO::Job *)) ); -- } + m_sslLoginHandler->login( data.section( ' ' , 2 , 2 ), m_account->accountId() , m_password ); -+ } + } else { - // Successful auth -@@ -569,77 +561,22 @@ - } +@@ -570,76 +561,20 @@ } -- + -void MSNNotifySocket::slotAuthJobDataReceived ( KIO::Job */*job*/,const QByteArray &data) +void MSNNotifySocket::sslLoginFailed() { @@ -998,7 +287,7 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetw -// kdDebug(14140) << "MSNNotifySocket::slotAuthJobDataReceived: " << data << endl; + disconnect(); } - +- -void MSNNotifySocket::slotAuthJobDone ( KIO::Job *job) +void MSNNotifySocket::sslLoginIncorrect() { @@ -1060,13 +349,13 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetw - - QRegExp rx(/*URL=http://memberservices.passport.net/memberservice.srf*/"\\?did=[0-9]*&(t=[0-9A-Za-z!$*]*&p=[0-9A-Za-z!$*]*)\""); - rx.search(m_authData); -+ m_badPassword = true; -+ disconnect(); -+} - +- - m_badPassword=true; //if this disconnect, that mean the password was bad - sendCommand("USR" , "TWN S " + rx.cap(1)); - } ++ m_badPassword = true; ++ disconnect(); ++} +void MSNNotifySocket::sslLoginSucceeded(QString a) +{ + sendCommand("USR" , "TWN S " + a); @@ -1075,9 +364,9 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetw } -diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.h kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.h ---- kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.h 2004-06-25 11:10:14.000000000 +0200 -+++ kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.h 2005-05-22 19:35:27.000000000 +0200 +diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.h kdenetwork-3.3.2-new/kopete/protocols/msn/msnnotifysocket.h +--- kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.h 2004-06-25 12:10:14.000000000 +0300 ++++ kdenetwork-3.3.2-new/kopete/protocols/msn/msnnotifysocket.h 2005-05-19 23:37:35.000000000 +0300 @@ -29,6 +29,7 @@ class MSNDispatchSocket; class MSNAccount; @@ -1086,11 +375,10 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.h kdenetwor #include <kio/job.h> -@@ -137,9 +138,9 @@ - void slotResetKeepAlive(); +@@ -138,8 +139,9 @@ + -- - void slotAuthJobDataReceived ( KIO::Job *, const QByteArray &data); - void slotAuthJobDone ( KIO::Job *); + void sslLoginFailed(); @@ -1099,7 +387,7 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.h kdenetwor private: -@@ -171,7 +172,7 @@ +@@ -171,7 +173,7 @@ QString m_kv; QString m_sid; QString m_loginTime; @@ -1108,9 +396,21 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.h kdenetwor QTimer *m_keepaliveTimer; -diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/sslloginhandler.cpp kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.cpp ---- kdenetwork-3.3.2.orig/kopete/protocols/msn/sslloginhandler.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.cpp 2005-05-22 19:35:27.000000000 +0200 +diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/msnsocket.cpp kdenetwork-3.3.2-new/kopete/protocols/msn/msnsocket.cpp +--- kdenetwork-3.3.2/kopete/protocols/msn/msnsocket.cpp 2004-10-03 10:43:34.000000000 +0300 ++++ kdenetwork-3.3.2-new/kopete/protocols/msn/msnsocket.cpp 2005-05-19 23:41:29.000000000 +0300 +@@ -133,7 +133,7 @@ + + void MSNSocket::slotSocketError( int error ) + { +- kdDebug( 14140 ) << k_funcinfo << "Error: " << error << endl; ++ kdWarning( 14140 ) << k_funcinfo << "Error: " << error << " (" << m_socket->errorString() << ")" << endl; + + QString errormsg = i18n( "There was an error while connecting to the MSN server.\nError message:\n" ); + if ( error == KSocketBase::LookupFailure ) +diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.cpp kdenetwork-3.3.2-new/kopete/protocols/msn/sslloginhandler.cpp +--- kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.cpp 1970-01-01 03:00:00.000000000 +0300 ++++ kdenetwork-3.3.2-new/kopete/protocols/msn/sslloginhandler.cpp 2005-05-19 18:10:06.000000000 +0300 @@ -0,0 +1,453 @@ +//Imported from KMess (2005-05-19) + @@ -1565,9 +865,9 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/sslloginhandler.cpp kdenetw + } +} + -diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/sslloginhandler.h kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.h ---- kdenetwork-3.3.2.orig/kopete/protocols/msn/sslloginhandler.h 1970-01-01 01:00:00.000000000 +0100 -+++ kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.h 2005-05-22 19:35:27.000000000 +0200 +diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.h kdenetwork-3.3.2-new/kopete/protocols/msn/sslloginhandler.h +--- kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.h 1970-01-01 03:00:00.000000000 +0300 ++++ kdenetwork-3.3.2-new/kopete/protocols/msn/sslloginhandler.h 2005-05-19 18:10:06.000000000 +0300 @@ -0,0 +1,96 @@ +//Imported from KMess - 2005-05-19 + diff --git a/kde-base/kdenetwork/files/lisa b/kde-base/kdenetwork/files/lisa index 3c5749f16743..f252b2b39257 100644 --- a/kde-base/kdenetwork/files/lisa +++ b/kde-base/kdenetwork/files/lisa @@ -1,24 +1,20 @@ #!/sbin/runscript -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/files/lisa,v 1.1 2002/05/13 07:59:56 danarmak Exp $ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/files/lisa,v 1.1.1.1 2005/11/30 10:13:34 chriswhite Exp $ depend() { use net } start() { - ebegin "Starting lisa" start-stop-daemon --start -x _KDEDIR_/bin/lisa -q -- $LISACONF 1>/dev/null eend $? "Failed to start lisa" - } stop() { - ebegin "Stopping lisa" start-stop-daemon --stop -x _KDEDIR_/bin/lisa -q eend $? "Failed to stop lisa" - } diff --git a/kde-base/kdenetwork/files/reslisa b/kde-base/kdenetwork/files/reslisa index 54c156230417..aad0850ffa63 100644 --- a/kde-base/kdenetwork/files/reslisa +++ b/kde-base/kdenetwork/files/reslisa @@ -1,24 +1,20 @@ #!/sbin/runscript -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/files/reslisa,v 1.1 2002/05/13 07:59:56 danarmak Exp $ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/files/reslisa,v 1.1.1.1 2005/11/30 10:13:34 chriswhite Exp $ depend() { use net } start() { - ebegin "Starting reslisa" start-stop-daemon --start -x _KDEDIR_/bin/reslisa -q -- 1>/dev/null eend $? "Failed to start reslisa" - } stop() { - ebegin "Stopping reslisa" start-stop-daemon --stop -x _KDEDIR_/bin/reslisa -q eend $? "Failed to stop reslisa" - } diff --git a/kde-base/kdenetwork/kdenetwork-3.3.2-r2.ebuild b/kde-base/kdenetwork/kdenetwork-3.3.2-r2.ebuild index 11f97484a135..a7ea84e59251 100644 --- a/kde-base/kdenetwork/kdenetwork-3.3.2-r2.ebuild +++ b/kde-base/kdenetwork/kdenetwork-3.3.2-r2.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.3.2-r2.ebuild,v 1.1 2005/07/21 14:13:29 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.3.2-r2.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $ inherit kde-dist eutils DESCRIPTION="KDE network apps: kopete, kppp, kget..." -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86" IUSE="slp samba wifi ssl" DEPEND="~kde-base/kdebase-${PV} diff --git a/kde-base/kdenetwork/kdenetwork-3.4.1-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.4.1-r1.ebuild index 6b4d23a75cb3..ee494dc6e7e3 100644 --- a/kde-base/kdenetwork/kdenetwork-3.4.1-r1.ebuild +++ b/kde-base/kdenetwork/kdenetwork-3.4.1-r1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.4.1-r1.ebuild,v 1.1 2005/07/21 14:13:29 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $ inherit kde-dist DESCRIPTION="KDE network apps: kopete, kppp, kget..." -KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc x86" +KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86" IUSE="rdesktop slp ssl wifi" DEPEND="~kde-base/kdebase-${PV} diff --git a/kde-base/kdenetwork/kdenetwork-3.4.2.ebuild b/kde-base/kdenetwork/kdenetwork-3.4.2.ebuild index 22ccfbff3baa..250a981ec432 100644 --- a/kde-base/kdenetwork/kdenetwork-3.4.2.ebuild +++ b/kde-base/kdenetwork/kdenetwork-3.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.4.2.ebuild,v 1.1 2005/07/28 13:03:19 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $ inherit kde-dist eutils diff --git a/kde-base/kdenetwork/kdenetwork-3.4.3.ebuild b/kde-base/kdenetwork/kdenetwork-3.4.3.ebuild index 5d8b8279be05..e6e9af681d5f 100644 --- a/kde-base/kdenetwork/kdenetwork-3.4.3.ebuild +++ b/kde-base/kdenetwork/kdenetwork-3.4.3.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.4.3.ebuild,v 1.1 2005/10/12 13:26:46 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $ inherit kde-dist eutils DESCRIPTION="KDE network apps: kopete, kppp, kget..." -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc ~x86" IUSE="rdesktop slp ssl wifi xmms" DEPEND="~kde-base/kdebase-${PV} diff --git a/kde-base/kdenetwork/kdenetwork-3.5.0.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.0.ebuild index 494198ef3b29..d115552651db 100644 --- a/kde-base/kdenetwork/kdenetwork-3.5.0.ebuild +++ b/kde-base/kdenetwork/kdenetwork-3.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.0.ebuild,v 1.1 2005/11/22 22:14:03 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $ inherit kde-dist eutils diff --git a/kde-base/kdenetwork/kdenetwork-3.5.0_beta2.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.0_beta2.ebuild index c3bf65dcec97..a54ccd281360 100644 --- a/kde-base/kdenetwork/kdenetwork-3.5.0_beta2.ebuild +++ b/kde-base/kdenetwork/kdenetwork-3.5.0_beta2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:41 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $ inherit kde-dist diff --git a/kde-base/kdenetwork/kdenetwork-3.5.0_rc1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.0_rc1.ebuild index c9e3beb95304..8d0ae0ac8bca 100644 --- a/kde-base/kdenetwork/kdenetwork-3.5.0_rc1.ebuild +++ b/kde-base/kdenetwork/kdenetwork-3.5.0_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:35:50 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $ inherit kde-dist eutils @@ -14,7 +14,7 @@ DEPEND="~kde-base/kdebase-${PV} dev-libs/libxml2 net-dns/libidn >=dev-libs/glib-2 - sametime? ( >=net-libs/meanwhile-0.4.2 ) + sametime? ( =net-libs/meanwhile-0.4* ) slp? ( net-libs/openslp ) wifi? ( net-wireless/wireless-tools ) xmms? ( media-sound/xmms )" diff --git a/kde-base/kdenetwork/kdenetwork-3.5_beta1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5_beta1.ebuild index 01b34edb89a1..2fa25ac2550f 100644 --- a/kde-base/kdenetwork/kdenetwork-3.5_beta1.ebuild +++ b/kde-base/kdenetwork/kdenetwork-3.5_beta1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5_beta1.ebuild,v 1.1 2005/09/21 17:24:56 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $ inherit kde-dist @@ -13,17 +13,19 @@ DEPEND="~kde-base/kdebase-${PV} dev-libs/libxslt dev-libs/libxml2 net-dns/libidn + >=dev-libs/glib-2 sametime? ( >=net-libs/meanwhile-0.4.2 ) slp? ( net-libs/openslp ) wifi? ( net-wireless/wireless-tools ) xmms? ( media-sound/xmms )" +# glib: for webcam support in Kopete. RDEPEND="${DEPEND} rdesktop? ( >=net-misc/rdesktop-1.4.1 ) dev-lang/perl ssl? ( app-crypt/qca-tls dev-perl/IO-Socket-SSL )" -# perl: for KSirc +# perl: for KSirc. # qca-tls: for Kopete jabber plugin. # IO-Socket-SSL: for SSL support in KSirc. diff --git a/kde-base/kdenetwork/metadata.xml b/kde-base/kdenetwork/metadata.xml index 1a4592f97a10..8d1e86a9cefb 100644 --- a/kde-base/kdenetwork/metadata.xml +++ b/kde-base/kdenetwork/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>kde-core</herd> +<herd>kde</herd> </pkgmetadata> |