Version bump. Move slot to 3.5 to allow side by side installation with 4x version. Per bug #270939. (force due to not synced local cvs checkout)

(Portage version: 2.2_rc33/cvs/Linux i686, RepoMan options: --force)

3 files changed, 18 insertions, 7 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 5ae3bb668cf1..e22217260f1b 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.133 2009/05/25 20:23:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.134 2009/05/26 09:32:58 scarabeus Exp $
+
+*digikam-0.9.5 (26 May 2009)
+*digikam-0.9.4-r2 (26 May 2009)
+
+  26 May 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -digikam-0.9.4-r1.ebuild, +digikam-0.9.4-r2.ebuild,
+  -digikam-0.9.5_beta3.ebuild, +digikam-0.9.5.ebuild:
+  Version bump. Move slot to 3.5 to allow side by side installation with 4x
+  version. Per bug #270939.
 
   25 May 2009; Markus Meier <maekke@gentoo.org> digikam-0.9.4.ebuild:
   amd64 stable, bug #244230
diff --git a/media-gfx/digikam/digikam-0.9.4-r1.ebuild b/media-gfx/digikam/digikam-0.9.4-r2.ebuild
index 38afcdaffae3..481bbecaad74 100644
--- a/media-gfx/digikam/digikam-0.9.4-r1.ebuild
+++ b/media-gfx/digikam/digikam-0.9.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.4-r1.ebuild,v 1.2 2009/03/19 10:09:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.4-r2.ebuild,v 1.1 2009/05/26 09:32:58 scarabeus Exp $
 
 EAPI="1"
 
@@ -17,7 +17,7 @@ DESCRIPTION="A digital photo management application for KDE."
 HOMEPAGE="http://www.digikam.org/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 	doc? ( mirror://sourceforge/${PN}/${P_DOC}.tar.bz2 )"
-SLOT="0"
+SLOT="3.5"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="nfs doc"
@@ -35,6 +35,7 @@ DEPEND=">=dev-db/sqlite-3.5.9:3
 	!media-plugins/digikamimageplugins"
 
 RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:0
 	|| ( ( kde-base/kgamma:3.5 kde-base/kamera:3.5 )
 		kde-base/kdegraphics:3.5 )"
 
diff --git a/media-gfx/digikam/digikam-0.9.5_beta3.ebuild b/media-gfx/digikam/digikam-0.9.5.ebuild
index 52bb0fea3bf3..7f373661023a 100644
--- a/media-gfx/digikam/digikam-0.9.5_beta3.ebuild
+++ b/media-gfx/digikam/digikam-0.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.5_beta3.ebuild,v 1.2 2009/03/19 10:09:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.5.ebuild,v 1.1 2009/05/26 09:32:58 scarabeus Exp $
 
 EAPI="1"
 
@@ -17,7 +17,7 @@ DESCRIPTION="A digital photo management application for KDE."
 HOMEPAGE="http://www.digikam.org/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 	doc? ( mirror://sourceforge/${PN}/${P_DOC}.tar.bz2 )"
-SLOT="0"
+SLOT="3.5"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="nfs doc"
@@ -29,12 +29,13 @@ DEPEND=">=dev-db/sqlite-3.5.9:3
 	>=media-libs/lcms-1.14
 	>=media-libs/libpng-1.2
 	>=media-libs/jasper-1.7
-	>=media-libs/libkexiv2-0.1.8
-	>=media-libs/libkdcraw-0.1.7
+	>=media-libs/libkexiv2-0.1.9
+	>=media-libs/libkdcraw-0.1.9
 	media-libs/jasper
 	!media-plugins/digikamimageplugins"
 
 RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:0
 	|| ( ( kde-base/kgamma:3.5 kde-base/kamera:3.5 )
 		kde-base/kdegraphics:3.5 )"