added blocking dep on kde-base/akregator, the new split ebuild from 3.4, and its mother package, kdepim.

6 files changed, 28 insertions, 18 deletions

diff --git a/net-www/akregator/ChangeLog b/net-www/akregator/ChangeLog
index 8631d4b65b36..ed31da8729f7 100644
--- a/net-www/akregator/ChangeLog
+++ b/net-www/akregator/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/akregator
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/akregator/ChangeLog,v 1.9 2004/11/29 00:25:27 motaboy Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/akregator/ChangeLog,v 1.10 2005/01/14 23:06:08 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> akregator-1.0_beta3.ebuild,
+  akregator-1.0_beta6.ebuild, akregator-1.0_beta7.ebuild,
+  akregator-1.0_beta8.ebuild:
+  Added blocking dep on new version in kde-base, which is the split package
+  from KDE 3.4, and on kdepim from 3.4, which includes it. Eventually there'll
+  be a move instruction from this package to that.
 
 *akregator-1.0_beta8 (29 Nov 2004)
 
diff --git a/net-www/akregator/Manifest b/net-www/akregator/Manifest
index 09936d22c9be..b658426f8c88 100644
--- a/net-www/akregator/Manifest
+++ b/net-www/akregator/Manifest
@@ -1,9 +1,9 @@
-MD5 b9340d16dce6627fd35712a957f27b5a akregator-1.0_beta8.ebuild 444
-MD5 763e0d7abd146ee59ce086c4ae28958a akregator-1.0_beta3.ebuild 458
-MD5 07702c555a9878747ecc593047c65136 akregator-1.0_beta7.ebuild 445
-MD5 4503b41bcc161a6e9ffc583506801484 ChangeLog 1365
+MD5 5a78ebe9c00927ef35353505127bb1e8 akregator-1.0_beta8.ebuild 505
+MD5 3d28b779570a80c14c3df911608f67cc akregator-1.0_beta3.ebuild 523
+MD5 1e26a48753dd26cf48a702511f2a6384 akregator-1.0_beta7.ebuild 506
+MD5 8cb7558b29b901a6991c94ba1b9bd04e ChangeLog 1737
 MD5 847999e7e4c4132a3a719821758026d0 metadata.xml 226
-MD5 e589d0b5867e53b7567710d2f34c56c2 akregator-1.0_beta6.ebuild 445
+MD5 5d1f61bf121959230886820e970726a4 akregator-1.0_beta6.ebuild 506
 MD5 b71858bbf72fba1cf7f3f58bf099df62 files/digest-akregator-1.0_beta3 72
 MD5 ba05c1117508b614b339bb01eecd8732 files/digest-akregator-1.0_beta6 71
 MD5 c22ead7f8aba13b14371ea01e66aa03a files/digest-akregator-1.0_beta7 71
diff --git a/net-www/akregator/akregator-1.0_beta3.ebuild b/net-www/akregator/akregator-1.0_beta3.ebuild
index 34b0ef124d42..984b9cf566f9 100644
--- a/net-www/akregator/akregator-1.0_beta3.ebuild
+++ b/net-www/akregator/akregator-1.0_beta3.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/akregator/akregator-1.0_beta3.ebuild,v 1.6 2004/08/19 10:55:32 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/akregator/akregator-1.0_beta3.ebuild,v 1.7 2005/01/14 23:06:08 danarmak Exp $
 
 inherit kde
 
 DESCRIPTION="KDE RSS aggregator."
 SRC_URI="http://akregator.upnet.ru/akregator-1.0_beta3.tar.bz2"
 HOMEPAGE="http://akregator.upnet.ru/"
-
+DEPEND="!kde-base/akregator !>=kde-base/kdepim-3.4.0_alpha1"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
 
 IUSE=""
 SLOT="0"
 
-need-kde 3.2
\ No newline at end of file
+need-kde 3.2
+
diff --git a/net-www/akregator/akregator-1.0_beta6.ebuild b/net-www/akregator/akregator-1.0_beta6.ebuild
index 7ad6be812c5d..81d98c3594db 100644
--- a/net-www/akregator/akregator-1.0_beta6.ebuild
+++ b/net-www/akregator/akregator-1.0_beta6.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/akregator/akregator-1.0_beta6.ebuild,v 1.1 2004/08/30 13:53:14 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/akregator/akregator-1.0_beta6.ebuild,v 1.2 2005/01/14 23:06:08 danarmak Exp $
 
 inherit kde
 
 DESCRIPTION="KDE RSS aggregator."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://akregator.sf.net/"
+DEPEND="!kde-base/akregator !>=kde-base/kdepim-3.4.0_alpha1"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
diff --git a/net-www/akregator/akregator-1.0_beta7.ebuild b/net-www/akregator/akregator-1.0_beta7.ebuild
index ce0205b886b9..f44f803fdbfb 100644
--- a/net-www/akregator/akregator-1.0_beta7.ebuild
+++ b/net-www/akregator/akregator-1.0_beta7.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/akregator/akregator-1.0_beta7.ebuild,v 1.1 2004/10/16 05:44:06 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/akregator/akregator-1.0_beta7.ebuild,v 1.2 2005/01/14 23:06:08 danarmak Exp $
 
 inherit kde
 
 DESCRIPTION="KDE RSS aggregator."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://akregator.sf.net/"
+DEPEND="!kde-base/akregator !>=kde-base/kdepim-3.4.0_alpha1"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
diff --git a/net-www/akregator/akregator-1.0_beta8.ebuild b/net-www/akregator/akregator-1.0_beta8.ebuild
index 0dd287a9a27b..a1edcb039147 100644
--- a/net-www/akregator/akregator-1.0_beta8.ebuild
+++ b/net-www/akregator/akregator-1.0_beta8.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/akregator/akregator-1.0_beta8.ebuild,v 1.1 2004/11/29 00:25:27 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/akregator/akregator-1.0_beta8.ebuild,v 1.2 2005/01/14 23:06:08 danarmak Exp $
 
 inherit kde
 
 DESCRIPTION="KDE RSS aggregator."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://akregator.sf.net/"
-
+DEPEND="!kde-base/akregator !>=kde-base/kdepim-3.4.0_alpha1"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc"