Force meanwhile support to off. It was unpredictable, was missing a dep, and broke compilation with meanwhile >=0.4. Bug 96778.

(Portage version: 2.0.51.22-r1)

4 files changed, 24 insertions, 3 deletions

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 194bc049f1a9..645c406b2b9e 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.144 2005/06/29 20:43:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.145 2005/06/30 19:21:08 danarmak Exp $
+
+  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:
diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index c8c8c01211b4..1d7d1c28a54e 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -1,6 +1,6 @@
 MD5 71fccce18dbad84d8054b36d08c0ba2c kdenetwork-3.2.3.ebuild 1226
 MD5 aabfc9e6e712b64ae514eb7377fbd5fa kdenetwork-3.3.2-r1.ebuild 1453
-MD5 3ea24ae39e029451d1daf1fdb7201735 kdenetwork-3.4.1.ebuild 1394
+MD5 e129abd01d1888ec622dc1480b4e83d3 kdenetwork-3.4.1.ebuild 1497
 MD5 31dac3fbdeb3364fcce65b88012ce236 kdenetwork-3.4.0-r2.ebuild 1608
 MD5 fc193fdc9c2f4ed3191665ec65521aa6 kdenetwork-3.2.3-r1.ebuild 1305
 MD5 ef1e3eb9e3060247262db53c06c1e4af kdenetwork-3.3.2.ebuild 1217
@@ -19,6 +19,7 @@ MD5 8dae5eac25d478ebf23279132c4a0ead files/digest-kdenetwork-3.3.2-r1 70
 MD5 622d3497792334fa87e483e249da693d files/digest-kdenetwork-3.4.0-r1 70
 MD5 622d3497792334fa87e483e249da693d files/digest-kdenetwork-3.4.0-r2 70
 MD5 c72f00859a8536c527d040173f92d3f4 files/kdenetwork-3.4.0-kopete-logout.patch 20923
+MD5 2db2170b384350ce6c05cd23c0bb21c7 files/disable-meanwhile.diff 351
 MD5 a32555833318266feb7ea1f68742fdf7 files/yahoo-fix-connect-062404.patch 1139
 MD5 e07566eb35cec7afdfa2e38edf7cdcd1 files/kdenetwork-3.3.2-kwifimanager-configlocation.patch 720
 MD5 72eca9b8637e868d730399e0becc045d files/digest-kdenetwork-3.2.3 70
diff --git a/kde-base/kdenetwork/files/disable-meanwhile.diff b/kde-base/kdenetwork/files/disable-meanwhile.diff
new file mode 100644
index 000000000000..7ecb0e6dfff5
--- /dev/null
+++ b/kde-base/kdenetwork/files/disable-meanwhile.diff
@@ -0,0 +1,11 @@
+--- kopete/protocols/configure.in.in	2005-05-23 15:07:47.000000000 +0300
++++ kopete/protocols/configure.in.in	2005-06-30 21:51:09.000000000 +0300
+@@ -196,7 +196,7 @@
+ 	AC_MSG_RESULT([yes])
+ 	AC_SUBST(MEANWHILE_INCLUDES)
+ 	AC_SUBST(MEANWHILE_LIBS)
+-	COMPILE_MEANWHILE=true
++	COMPILE_MEANWHILE=
+ 	AC_SUBST(COMPILE_MEANWHILE)
+ ], [
+ 	AC_MSG_RESULT([no])
diff --git a/kde-base/kdenetwork/kdenetwork-3.4.1.ebuild b/kde-base/kdenetwork/kdenetwork-3.4.1.ebuild
index d976c494abc0..5a84a7205e5b 100644
--- a/kde-base/kdenetwork/kdenetwork-3.4.1.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.4.1.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.1.ebuild,v 1.4 2005/06/29 20:43:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.4.1.ebuild,v 1.5 2005/06/30 19:21:08 danarmak Exp $
 
 inherit kde-dist
 
@@ -24,6 +24,10 @@ RDEPEND="${DEPEND}
 
 PATCHES="$FILESDIR/wireless-extensions-api.diff" # In cvs, remove for 3.4.2
 
+# No meanwhile support in kopete. See bug 96778.
+PATCHES="$PATCHES $FILESDIR/disable-meanwhile.diff"
+
+
 src_compile() {
 	myconf="$(use_enable slp)"
 	use wifi || export DO_NOT_COMPILE="${DO_NOT_COMPILE} wifi"