Add blocking on net-im/kopete for the releases outside of KDE release cycle.

(Portage version: 2.1_pre4-r1)

7 files changed, 31 insertions, 20 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 4febb629ec30..c9a5522e5fec 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kopete
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.48 2006/01/22 22:53:04 danarmak Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.49 2006/02/21 14:15:39 flameeyes Exp $
+
+  21 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> kopete-3.4.1.ebuild,
+  kopete-3.4.1-r1.ebuild, kopete-3.4.2.ebuild, kopete-3.4.3.ebuild,
+  kopete-3.5.0.ebuild, kopete-3.5.1.ebuild:
+  Add blocking on net-im/kopete for the releases outside of KDE release cycle.
 
 *kopete-3.5.1 (23 Jan 2006)
 
diff --git a/kde-base/kopete/kopete-3.4.1-r1.ebuild b/kde-base/kopete/kopete-3.4.1-r1.ebuild
index 560a3584471a..b746988519ff 100644
--- a/kde-base/kopete/kopete-3.4.1-r1.ebuild
+++ b/kde-base/kopete/kopete-3.4.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.4.1-r1.ebuild,v 1.6 2005/10/13 12:38:40 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.4.1-r1.ebuild,v 1.7 2006/02/21 14:15:39 flameeyes Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -13,7 +13,8 @@ HOMEPAGE="http://kopete.kde.org/"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="ssl"
 
-RDEPEND="ssl? ( app-crypt/qca-tls )"
+RDEPEND="ssl? ( app-crypt/qca-tls )
+	!net-im/kopete"
 
 # No meanwhile support. See bug 96778.
 PATCHES="$FILESDIR/disable-meanwhile.diff"
diff --git a/kde-base/kopete/kopete-3.4.1.ebuild b/kde-base/kopete/kopete-3.4.1.ebuild
index 7f66a43646a3..2a33bb28d426 100644
--- a/kde-base/kopete/kopete-3.4.1.ebuild
+++ b/kde-base/kopete/kopete-3.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.4.1.ebuild,v 1.8 2005/10/13 12:38:40 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.4.1.ebuild,v 1.9 2006/02/21 14:15:39 flameeyes Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -13,7 +13,8 @@ HOMEPAGE="http://kopete.kde.org/"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="ssl"
 
-RDEPEND="ssl? ( app-crypt/qca-tls )"
+RDEPEND="ssl? ( app-crypt/qca-tls )
+	!net-im/kopete"
 
 # No meanwhile support. See bug 96778.
 PATCHES="$FILESDIR/disable-meanwhile.diff"
diff --git a/kde-base/kopete/kopete-3.4.2.ebuild b/kde-base/kopete/kopete-3.4.2.ebuild
index d6e064c722dc..8bfa6b7feab1 100644
--- a/kde-base/kopete/kopete-3.4.2.ebuild
+++ b/kde-base/kopete/kopete-3.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.4.2.ebuild,v 1.4 2005/10/13 12:38:40 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.4.2.ebuild,v 1.5 2006/02/21 14:15:39 flameeyes Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -17,7 +17,8 @@ DEPEND="dev-libs/libxslt
 	dev-libs/libxml2
 	xmms? ( media-sound/xmms )"
 RDEPEND="$DEPEND
-	ssl? ( app-crypt/qca-tls )"
+	ssl? ( app-crypt/qca-tls )
+	!net-im/kopete"
 
 # No meanwhile support. See bug 96778.
 PATCHES="$FILESDIR/disable-meanwhile.diff"
diff --git a/kde-base/kopete/kopete-3.4.3.ebuild b/kde-base/kopete/kopete-3.4.3.ebuild
index fd72d749e492..e933194d7579 100644
--- a/kde-base/kopete/kopete-3.4.3.ebuild
+++ b/kde-base/kopete/kopete-3.4.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.4.3.ebuild,v 1.8 2005/12/10 20:15:10 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.4.3.ebuild,v 1.9 2006/02/21 14:15:39 flameeyes Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -17,7 +17,8 @@ DEPEND="dev-libs/libxslt
 	dev-libs/libxml2
 	xmms? ( media-sound/xmms )"
 RDEPEND="$DEPEND
-	ssl? ( app-crypt/qca-tls )"
+	ssl? ( app-crypt/qca-tls )
+	!net-im/kopete"
 
 # No meanwhile support. See bug 96778.
 PATCHES="$FILESDIR/disable-meanwhile.diff"
diff --git a/kde-base/kopete/kopete-3.5.0.ebuild b/kde-base/kopete/kopete-3.5.0.ebuild
index 6308173cf839..9d202643e0fd 100644
--- a/kde-base/kopete/kopete-3.5.0.ebuild
+++ b/kde-base/kopete/kopete-3.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.0.ebuild,v 1.4 2005/12/17 14:27:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.0.ebuild,v 1.5 2006/02/21 14:15:39 flameeyes Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -19,7 +19,8 @@ DEPEND="dev-libs/libxslt
 	sametime? ( =net-libs/meanwhile-0.4* )
 	xmms? ( media-sound/xmms )"
 RDEPEND="$DEPEND
-	ssl? ( app-crypt/qca-tls )"
+	ssl? ( app-crypt/qca-tls )
+	!net-im/kopete"
 
 src_compile() {
 	# External libgadu support - doesn't work, kopete requires a specific development snapshot of libgadu.
diff --git a/kde-base/kopete/kopete-3.5.1.ebuild b/kde-base/kopete/kopete-3.5.1.ebuild
index 93f271e20428..c4ae5a60876b 100644
--- a/kde-base/kopete/kopete-3.5.1.ebuild
+++ b/kde-base/kopete/kopete-3.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.1.ebuild,v 1.1 2006/01/22 22:53:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.1.ebuild,v 1.2 2006/02/21 14:15:39 flameeyes Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -19,7 +19,8 @@ DEPEND="dev-libs/libxslt
 	sametime? ( =net-libs/meanwhile-0.4* )
 	xmms? ( media-sound/xmms )"
 RDEPEND="$DEPEND
-	ssl? ( app-crypt/qca-tls )"
+	ssl? ( app-crypt/qca-tls )
+	!net-im/kopete"
 
 src_compile() {
 	# External libgadu support - doesn't work, kopete requires a specific development snapshot of libgadu.