Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.

Package-Manager: portage-2.1.4.4

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index d97e79d20fc51b3e1b6b5978de6548319b57a55b..aee07eeec59bc973117a0480f96a8acf335fc123 100644 (file)
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.108 2008/02/19 01:46:45 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.109 2008/02/19 01:49:57 ingmar Exp $
+
+  19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> digikam-0.9.2.ebuild,
+  digikam-0.9.3.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
 
   19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -digikam-0.9.1.ebuild,
   -digikam-0.9.3_beta2.ebuild, -digikam-0.9.3_rc1.ebuild:

diff --git a/media-gfx/digikam/digikam-0.9.2.ebuild b/media-gfx/digikam/digikam-0.9.2.ebuild
index f5e3385fa6c179c8fcf11ebd86d4c07443adcac0..b98c87d3ffa2a9fa1e84a6b027445674bc1ad8d4 100644 (file)
--- a/media-gfx/digikam/digikam-0.9.2.ebuild
+++ b/media-gfx/digikam/digikam-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.2.ebuild,v 1.8 2007/10/06 10:40:59 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.2.ebuild,v 1.9 2008/02/19 01:49:57 ingmar Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -33,7 +33,8 @@ DEPEND=">=media-libs/libgphoto2-2.2
        !media-plugins/digikamimageplugins"
 
 RDEPEND="${DEPEND}
-       || ( ( kde-base/kgamma kde-base/kamera ) kde-base/kdegraphics )"
+       || ( ( =kde-base/kgamma-3.5* =kde-base/kamera-3.5* )
+               =kde-base/kdegraphics-3.5* )"
 
 need-kde 3.5
 

diff --git a/media-gfx/digikam/digikam-0.9.3.ebuild b/media-gfx/digikam/digikam-0.9.3.ebuild
index 951d0d8171b9a00fb3f416261accf5e7d4bd8eea..2bf318f24de131a9e31cf6862d8aec0fb21f230a 100644 (file)
--- a/media-gfx/digikam/digikam-0.9.3.ebuild
+++ b/media-gfx/digikam/digikam-0.9.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.3.ebuild,v 1.2 2007/12/31 00:20:30 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.3.ebuild,v 1.3 2008/02/19 01:49:57 ingmar Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -34,7 +34,8 @@ DEPEND=">=media-libs/libgphoto2-2.2
        !media-plugins/digikamimageplugins"
 
 RDEPEND="${DEPEND}
-       || ( ( kde-base/kgamma kde-base/kamera ) kde-base/kdegraphics )"
+       || ( ( =kde-base/kgamma-3.5* =kde-base/kamera-3.5* )
+               =kde-base/kdegraphics-3.5* )"
 
 need-kde 3.5
 

diff --git a/media-gfx/kphotoalbum/ChangeLog b/media-gfx/kphotoalbum/ChangeLog
index 6f4b091d1ffa70818d71c8a1141fc29adaabec80..3377cb7ae7149ab63e9995b025b391ab3e7c0c89 100644 (file)
--- a/media-gfx/kphotoalbum/ChangeLog
+++ b/media-gfx/kphotoalbum/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/kphotoalbum
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.25 2008/02/19 01:43:07 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.26 2008/02/19 01:45:58 ingmar Exp $
+
+  19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kphotoalbum-3.1.0.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
 
   19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -kphotoalbum-3.0.ebuild,
   -kphotoalbum-3.0.2-r1.ebuild:

diff --git a/media-gfx/kphotoalbum/kphotoalbum-3.1.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-3.1.0.ebuild
index 703e40abbe1b820f0ee6248b0e094a9c5acc3c55..b675fdc6149888041c932b6ae5f6fe6bf7c69aa0 100644 (file)
--- a/media-gfx/kphotoalbum/kphotoalbum-3.1.0.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-3.1.0.ebuild,v 1.5 2008/02/10 01:18:18 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-3.1.0.ebuild,v 1.6 2008/02/19 01:45:58 ingmar Exp $
 
 inherit kde
 
@@ -22,7 +22,7 @@ for lang in ${LANGS}; do
        IUSE="${IUSE} linguas_${lang}"
 done
 
-DEPEND="arts? ( kde-base/arts )
+DEPEND="arts? ( =kde-base/arts-3.5* )
        exif? ( >=media-gfx/exiv2-0.15 )
        raw? ( >=media-libs/libkdcraw-0.1.1 )
        >=media-libs/jpeg-6b-r7

diff --git a/media-gfx/showimg/ChangeLog b/media-gfx/showimg/ChangeLog
index 9c521e48ab13544741494658c09a4ba4c174185a..05f98093f9b95a07afc2f881333f6eaca6849e36 100644 (file)
--- a/media-gfx/showimg/ChangeLog
+++ b/media-gfx/showimg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/showimg
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/ChangeLog,v 1.39 2007/07/21 22:27:40 philantrop Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/ChangeLog,v 1.40 2008/02/19 01:41:17 ingmar Exp $
+
+  19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> showimg-0.9.4.1.ebuild,
+  showimg-0.9.5.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
 
   21 Jul 2007; Wulf C. Krueger <philantrop@gentoo.org> showimg-0.9.5.ebuild:
   Corrected the USE flag handling. Fixes bug 185958.

diff --git a/media-gfx/showimg/showimg-0.9.4.1.ebuild b/media-gfx/showimg/showimg-0.9.4.1.ebuild
index c786c91ba1bbab07e61a1f6dde930d3f64432d3c..e096af57e94c7bd661b10179edaf98daab6e6957 100644 (file)
--- a/media-gfx/showimg/showimg-0.9.4.1.ebuild
+++ b/media-gfx/showimg/showimg-0.9.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/showimg-0.9.4.1.ebuild,v 1.6 2007/07/12 04:08:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/showimg-0.9.4.1.ebuild,v 1.7 2008/02/19 01:41:17 ingmar Exp $
 
 inherit kde
 
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ~sparc ~ppc amd64"
 IUSE=""
 
-DEPEND="|| ( kde-base/libkonq kde-base/kdebase )
+DEPEND="|| ( =kde-base/libkonq-3.5* =kde-base/kdebase-3.5* )
        media-libs/libkexif
        media-plugins/kipi-plugins"
 need-kde 3.1

diff --git a/media-gfx/showimg/showimg-0.9.5.ebuild b/media-gfx/showimg/showimg-0.9.5.ebuild
index 661760cb7fc637c43aa72068ba2232eca3765154..898c220ab7506663f190318ef7230e6d89d04a39 100644 (file)
--- a/media-gfx/showimg/showimg-0.9.5.ebuild
+++ b/media-gfx/showimg/showimg-0.9.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/showimg-0.9.5.ebuild,v 1.10 2007/07/21 22:27:40 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/showimg-0.9.5.ebuild,v 1.11 2008/02/19 01:41:17 ingmar Exp $
 
 inherit kde eutils
 
@@ -11,7 +11,6 @@ S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="ShowImg is a feature-rich image viewer for KDE  including an image management system."
 HOMEPAGE="http://www.jalix.org/projects/showimg/"
-#SRC_URI="http://www.jalix.org/projects/showimg/download/.0.9.5/distributions/SVN_info/${MY_P}.tar.bz2"
 SRC_URI="http://www.jalix.org/projects/showimg/download/${MY_PV}/${MY_P}.tar.bz2"
 
 SLOT="0"
@@ -19,7 +18,7 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="exif kipi mysql postgres"
 
-DEPEND="|| ( kde-base/libkonq kde-base/kdebase )
+DEPEND="|| ( =kde-base/libkonq-3.5* =kde-base/kdebase-3.5* )
        mysql? ( virtual/mysql )
        postgres? ( dev-db/libpq dev-libs/libpqxx )
        exif? ( media-libs/libkexif )

diff --git a/media-gfx/tgif/ChangeLog b/media-gfx/tgif/ChangeLog
index 60ad05c3f02d524fa939bb102e3105b306eab488..20ac290eb0c4ac0d8f44e784f2c2fc563d8862f1 100644 (file)
--- a/media-gfx/tgif/ChangeLog
+++ b/media-gfx/tgif/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/tgif
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tgif/ChangeLog,v 1.9 2008/01/15 18:28:03 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tgif/ChangeLog,v 1.10 2008/02/19 01:46:18 ingmar Exp $
+
+  19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> tgif-4.1.45.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
 
   15 Jan 2008; Fabian Groffen <grobian@gentoo.org> tgif-4.1.45.ebuild:
   Dropped ppc-macos keyword, see you in prefix

diff --git a/media-gfx/tgif/tgif-4.1.45.ebuild b/media-gfx/tgif/tgif-4.1.45.ebuild
index c73a6d8612ec046dcbe1324e178d6678426fd822..bcc59f8f40f81b341d543eb0aa1b5fc13050b70b 100644 (file)
--- a/media-gfx/tgif/tgif-4.1.45.ebuild
+++ b/media-gfx/tgif/tgif-4.1.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tgif/tgif-4.1.45.ebuild,v 1.2 2008/01/15 18:28:03 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tgif/tgif-4.1.45.ebuild,v 1.3 2008/02/19 01:46:18 ingmar Exp $
 
 inherit eutils toolchain-funcs
 
@@ -8,7 +8,7 @@ MY_P="${PN}-QPL-${PV}"
 
 DESCRIPTION="Tgif is an Xlib base 2-D drawing facility under X11."
 HOMEPAGE="http://bourbon.usc.edu/tgif/index.html"
-SRC_URI="ftp://bourbon.usc.edu/pub/tgif/${MY_P}.tar.gz"
+SRC_URI="ftp://bourbon.usc.edu/pub/${PN}/${MY_P}.tar.gz"
 
 LICENSE="QPL-1.0"
 SLOT="0"
@@ -18,7 +18,7 @@ IUSE="kde"
 DEPEND="x11-libs/libX11
        x11-proto/xproto"
 RDEPEND="${DEPEND}
-       kde? ( || ( kde-base/kdeprint kde-base/kdebase ) )"
+       kde? ( || ( =kde-base/kdeprint-3.5* =kde-base/kdebase-3.5* ) )"
 
 S=${WORKDIR}/${MY_P}