public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-gfx/digikam: digikam-4.4.0-r1.ebuild ChangeLog
@ 2014-12-12 15:53 Mikle Kolyada (zlogene)
  0 siblings, 0 replies; 7+ messages in thread
From: Mikle Kolyada (zlogene) @ 2014-12-12 15:53 UTC (permalink / raw
  To: gentoo-commits

zlogene     14/12/12 15:53:12

  Modified:             digikam-4.4.0-r1.ebuild ChangeLog
  Log:
  amd64 stable wrt bug #517344
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xC42EB5D6)

Revision  Changes    Path
1.2                  media-gfx/digikam/digikam-4.4.0-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?r1=1.1&r2=1.2

Index: digikam-4.4.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- digikam-4.4.0-r1.ebuild	1 Dec 2014 12:27:16 -0000	1.1
+++ digikam-4.4.0-r1.ebuild	12 Dec 2014 15:53:12 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v 1.1 2014/12/01 12:27:16 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v 1.2 2014/12/12 15:53:12 zlogene Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@
 
 LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 SLOT="4"
 IUSE="addressbook debug doc gphoto2 mysql nepomuk semantic-desktop themedesigner +thumbnails video"
 



1.270                media-gfx/digikam/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?rev=1.270&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?rev=1.270&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?r1=1.269&r2=1.270

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- ChangeLog	1 Dec 2014 12:27:16 -0000	1.269
+++ ChangeLog	12 Dec 2014 15:53:12 -0000	1.270
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.269 2014/12/01 12:27:16 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.270 2014/12/12 15:53:12 zlogene Exp $
+
+  12 Dec 2014; Mikle Kolyada <zlogene@gentoo.org> digikam-4.4.0-r1.ebuild:
+  amd64 stable wrt bug #517344
 
 *digikam-4.4.0-r1 (01 Dec 2014)
 





^ permalink raw reply	[flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-gfx/digikam: digikam-4.4.0-r1.ebuild ChangeLog
@ 2015-02-14 14:38 Agostino Sarubbo (ago)
  0 siblings, 0 replies; 7+ messages in thread
From: Agostino Sarubbo (ago) @ 2015-02-14 14:38 UTC (permalink / raw
  To: gentoo-commits

ago         15/02/14 14:38:18

  Modified:             digikam-4.4.0-r1.ebuild ChangeLog
  Log:
  Stable for x86, wrt bug #517344
  
  (Portage version: 2.2.14/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 7194459F)

Revision  Changes    Path
1.8                  media-gfx/digikam/digikam-4.4.0-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?r1=1.7&r2=1.8

Index: digikam-4.4.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- digikam-4.4.0-r1.ebuild	21 Dec 2014 14:59:44 -0000	1.7
+++ digikam-4.4.0-r1.ebuild	14 Feb 2015 14:38:18 -0000	1.8
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v 1.7 2014/12/21 14:59:44 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v 1.8 2015/02/14 14:38:18 ago Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@
 
 LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="4"
 IUSE="addressbook debug doc gphoto2 mysql nepomuk semantic-desktop themedesigner +thumbnails video"
 



1.278                media-gfx/digikam/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?rev=1.278&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?rev=1.278&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?r1=1.277&r2=1.278

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -r1.277 -r1.278
--- ChangeLog	21 Dec 2014 21:46:01 -0000	1.277
+++ ChangeLog	14 Feb 2015 14:38:18 -0000	1.278
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/digikam
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.277 2014/12/21 21:46:01 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.278 2015/02/14 14:38:18 ago Exp $
+
+  14 Feb 2015; Agostino Sarubbo <ago@gentoo.org> digikam-4.4.0-r1.ebuild:
+  Stable for x86, wrt bug #517344
 
   21 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org> digikam-4.6.0.ebuild:
   Pin a minimum kde-apps/libkface version





^ permalink raw reply	[flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-gfx/digikam: digikam-4.4.0-r1.ebuild ChangeLog
@ 2014-12-17 23:03 Manuel Rueger (mrueg)
  0 siblings, 0 replies; 7+ messages in thread
From: Manuel Rueger (mrueg) @ 2014-12-17 23:03 UTC (permalink / raw
  To: gentoo-commits

mrueg       14/12/17 23:03:05

  Modified:             digikam-4.4.0-r1.ebuild ChangeLog
  Log:
  Add kde-applications dependency option.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key )

Revision  Changes    Path
1.6                  media-gfx/digikam/digikam-4.4.0-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?r1=1.5&r2=1.6

Index: digikam-4.4.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- digikam-4.4.0-r1.ebuild	13 Dec 2014 00:21:24 -0000	1.5
+++ digikam-4.4.0-r1.ebuild	17 Dec 2014 23:03:05 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v 1.5 2014/12/13 00:21:24 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v 1.6 2014/12/17 23:03:05 mrueg Exp $
 
 EAPI=5
 
@@ -45,7 +45,7 @@
 	media-libs/jasper
 	media-libs/lcms:2
 	media-libs/lensfun
-	>=media-libs/libkface-3.3.0
+	|| ( kde-apps/libkface:4 >=media-libs/libkface-3.3.0 )
 	media-libs/libkgeomap
 	media-libs/liblqr
 	>=media-libs/libpgf-6.12.27



1.274                media-gfx/digikam/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?rev=1.274&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?rev=1.274&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?r1=1.273&r2=1.274

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- ChangeLog	13 Dec 2014 00:21:24 -0000	1.273
+++ ChangeLog	17 Dec 2014 23:03:05 -0000	1.274
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.273 2014/12/13 00:21:24 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.274 2014/12/17 23:03:05 mrueg Exp $
+
+  17 Dec 2014; Manuel Rüger <mrueg@gentoo.org> digikam-4.4.0-r1.ebuild:
+  Add kde-applications dependency option.
 
   13 Dec 2014; Manuel Rüger <mrueg@gentoo.org> digikam-4.4.0-r1.ebuild:
   Fix typo in dependency.





^ permalink raw reply	[flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-gfx/digikam: digikam-4.4.0-r1.ebuild ChangeLog
@ 2014-12-13  0:21 Manuel Rueger (mrueg)
  0 siblings, 0 replies; 7+ messages in thread
From: Manuel Rueger (mrueg) @ 2014-12-13  0:21 UTC (permalink / raw
  To: gentoo-commits

mrueg       14/12/13 00:21:24

  Modified:             digikam-4.4.0-r1.ebuild ChangeLog
  Log:
  Fix typo in dependency.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key )

Revision  Changes    Path
1.5                  media-gfx/digikam/digikam-4.4.0-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?r1=1.4&r2=1.5

Index: digikam-4.4.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- digikam-4.4.0-r1.ebuild	12 Dec 2014 23:02:55 -0000	1.4
+++ digikam-4.4.0-r1.ebuild	13 Dec 2014 00:21:24 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v 1.4 2014/12/12 23:02:55 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v 1.5 2014/12/13 00:21:24 mrueg Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@
 CDEPEND="
 	|| (
 		(	kde-apps/kdebase-kioslaves:4
-			kde-apps/libkcdraw:4=
+			kde-apps/libkdcraw:4=
 			kde-apps/libkexiv2:4=
 			kde-apps/libkipi:4
 			kde-apps/marble:4=[plasma] )



1.273                media-gfx/digikam/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?rev=1.273&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?rev=1.273&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?r1=1.272&r2=1.273

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- ChangeLog	12 Dec 2014 23:02:55 -0000	1.272
+++ ChangeLog	13 Dec 2014 00:21:24 -0000	1.273
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.272 2014/12/12 23:02:55 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.273 2014/12/13 00:21:24 mrueg Exp $
+
+  13 Dec 2014; Manuel Rüger <mrueg@gentoo.org> digikam-4.4.0-r1.ebuild:
+  Fix typo in dependency.
 
   12 Dec 2014; Manuel Rüger <mrueg@gentoo.org> digikam-4.4.0-r1.ebuild:
   Whitespace





^ permalink raw reply	[flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-gfx/digikam: digikam-4.4.0-r1.ebuild ChangeLog
@ 2014-12-12 23:02 Manuel Rueger (mrueg)
  0 siblings, 0 replies; 7+ messages in thread
From: Manuel Rueger (mrueg) @ 2014-12-12 23:02 UTC (permalink / raw
  To: gentoo-commits

mrueg       14/12/12 23:02:55

  Modified:             digikam-4.4.0-r1.ebuild ChangeLog
  Log:
  Whitespace
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key )

Revision  Changes    Path
1.4                  media-gfx/digikam/digikam-4.4.0-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?r1=1.3&r2=1.4

Index: digikam-4.4.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- digikam-4.4.0-r1.ebuild	12 Dec 2014 23:01:41 -0000	1.3
+++ digikam-4.4.0-r1.ebuild	12 Dec 2014 23:02:55 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v 1.3 2014/12/12 23:01:41 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v 1.4 2014/12/12 23:02:55 mrueg Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@
 IUSE="addressbook debug doc gphoto2 mysql nepomuk semantic-desktop themedesigner +thumbnails video"
 
 CDEPEND="
-	|| ( 
+	|| (
 		(	kde-apps/kdebase-kioslaves:4
 			kde-apps/libkcdraw:4=
 			kde-apps/libkexiv2:4=



1.272                media-gfx/digikam/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?rev=1.272&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?rev=1.272&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?r1=1.271&r2=1.272

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- ChangeLog	12 Dec 2014 23:01:41 -0000	1.271
+++ ChangeLog	12 Dec 2014 23:02:55 -0000	1.272
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.271 2014/12/12 23:01:41 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.272 2014/12/12 23:02:55 mrueg Exp $
+
+  12 Dec 2014; Manuel Rüger <mrueg@gentoo.org> digikam-4.4.0-r1.ebuild:
+  Whitespace
 
   12 Dec 2014; Manuel Rüger <mrueg@gentoo.org> digikam-4.4.0-r1.ebuild:
   Add support for kde applications dependency.





^ permalink raw reply	[flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-gfx/digikam: digikam-4.4.0-r1.ebuild ChangeLog
@ 2014-12-12 23:01 Manuel Rueger (mrueg)
  0 siblings, 0 replies; 7+ messages in thread
From: Manuel Rueger (mrueg) @ 2014-12-12 23:01 UTC (permalink / raw
  To: gentoo-commits

mrueg       14/12/12 23:01:41

  Modified:             digikam-4.4.0-r1.ebuild ChangeLog
  Log:
  Add support for kde applications dependency.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key )

Revision  Changes    Path
1.3                  media-gfx/digikam/digikam-4.4.0-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?r1=1.2&r2=1.3

Index: digikam-4.4.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- digikam-4.4.0-r1.ebuild	12 Dec 2014 15:53:12 -0000	1.2
+++ digikam-4.4.0-r1.ebuild	12 Dec 2014 23:01:41 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v 1.2 2014/12/12 15:53:12 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v 1.3 2014/12/12 23:01:41 mrueg Exp $
 
 EAPI=5
 
@@ -30,11 +30,18 @@
 IUSE="addressbook debug doc gphoto2 mysql nepomuk semantic-desktop themedesigner +thumbnails video"
 
 CDEPEND="
-	$(add_kdebase_dep kdebase-kioslaves)
-	kde-base/libkdcraw:4=
-	kde-base/libkexiv2:4=
-	$(add_kdebase_dep libkipi)
-	kde-base/marble:4=[plasma]
+	|| ( 
+		(	kde-apps/kdebase-kioslaves:4
+			kde-apps/libkcdraw:4=
+			kde-apps/libkexiv2:4=
+			kde-apps/libkipi:4
+			kde-apps/marble:4=[plasma] )
+		( 	$(add_kdebase_dep kdebase-kioslaves)
+			kde-base/libkdcraw:4=
+			kde-base/libkexiv2:4=
+			$(add_kdebase_dep libkipi)
+			kde-base/marble:4=[plasma] )
+	)
 	media-libs/jasper
 	media-libs/lcms:2
 	media-libs/lensfun
@@ -62,10 +69,12 @@
 	)
 "
 RDEPEND="${CDEPEND}
-	$(add_kdebase_dep kreadconfig)
+	|| ( kde-apps/kreadconfig:4 $(add_kdebase_dep kreadconfig) )
 	media-plugins/kipi-plugins
 	video? (
 		|| (
+			kde-apps/ffmpegthumbs:4
+			kde-apps/mplayerthumbs:4
 			$(add_kdebase_dep mplayerthumbs)
 			$(add_kdebase_dep ffmpegthumbs)
 		)



1.271                media-gfx/digikam/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?rev=1.271&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?rev=1.271&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?r1=1.270&r2=1.271

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- ChangeLog	12 Dec 2014 15:53:12 -0000	1.270
+++ ChangeLog	12 Dec 2014 23:01:41 -0000	1.271
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.270 2014/12/12 15:53:12 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.271 2014/12/12 23:01:41 mrueg Exp $
+
+  12 Dec 2014; Manuel Rüger <mrueg@gentoo.org> digikam-4.4.0-r1.ebuild:
+  Add support for kde applications dependency.
 
   12 Dec 2014; Mikle Kolyada <zlogene@gentoo.org> digikam-4.4.0-r1.ebuild:
   amd64 stable wrt bug #517344





^ permalink raw reply	[flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-gfx/digikam: digikam-4.4.0-r1.ebuild ChangeLog
@ 2014-12-01 12:27 Michael Palimaka (kensington)
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka (kensington) @ 2014-12-01 12:27 UTC (permalink / raw
  To: gentoo-commits

kensington    14/12/01 12:27:16

  Modified:             ChangeLog
  Added:                digikam-4.4.0-r1.ebuild
  Log:
  Backport patch from upstream to solve a hang wrt bug #521992.
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

Revision  Changes    Path
1.269                media-gfx/digikam/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?rev=1.269&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?rev=1.269&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/ChangeLog?r1=1.268&r2=1.269

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- ChangeLog	30 Oct 2014 20:08:53 -0000	1.268
+++ ChangeLog	1 Dec 2014 12:27:16 -0000	1.269
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.268 2014/10/30 20:08:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.269 2014/12/01 12:27:16 kensington Exp $
+
+*digikam-4.4.0-r1 (01 Dec 2014)
+
+  01 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  +digikam-4.4.0-r1.ebuild, +files/digikam-4.4.0-hang.patch:
+  Backport patch from upstream to solve a hang wrt bug #521992.
 
   30 Oct 2014; Andreas K. Huettel <dilfridge@gentoo.org> digikam-4.2.0.ebuild:
   Fix lensfun dependency, bug 526092



1.1                  media-gfx/digikam/digikam-4.4.0-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild?rev=1.1&content-type=text/plain

Index: digikam-4.4.0-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v 1.1 2014/12/01 12:27:16 kensington Exp $

EAPI=5

KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga gl ha he hi hr hsb
hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru
rw se sk sl sq sr sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"

KDE_HANDBOOK="optional"
CMAKE_MIN_VERSION="2.8"
KDE_MINIMAL="4.10"

KDE_DOC_DIRS="doc-digikam doc-showfoto"

inherit kde4-base

MY_PV=${PV/_/-}
MY_P=${PN}-${MY_PV}

DESCRIPTION="Digital photo management application for KDE"
HOMEPAGE="http://www.digikam.org/"
SRC_URI="mirror://kde/stable/${PN}/${MY_P}.tar.bz2"

LICENSE="GPL-2
	handbook? ( FDL-1.2 )"
KEYWORDS="~amd64 ~x86"
SLOT="4"
IUSE="addressbook debug doc gphoto2 mysql nepomuk semantic-desktop themedesigner +thumbnails video"

CDEPEND="
	$(add_kdebase_dep kdebase-kioslaves)
	kde-base/libkdcraw:4=
	kde-base/libkexiv2:4=
	$(add_kdebase_dep libkipi)
	kde-base/marble:4=[plasma]
	media-libs/jasper
	media-libs/lcms:2
	media-libs/lensfun
	>=media-libs/libkface-3.3.0
	media-libs/libkgeomap
	media-libs/liblqr
	>=media-libs/libpgf-6.12.27
	media-libs/libpng:0=
	>=media-libs/opencv-2.4.9
	media-libs/tiff
	virtual/jpeg
	dev-qt/qtgui:4
	|| ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] )
	addressbook? ( $(add_kdebase_dep kdepimlibs) )
	gphoto2? ( media-libs/libgphoto2:= )
	mysql? ( virtual/mysql )
	nepomuk? (
		dev-libs/shared-desktop-ontologies
		dev-libs/soprano
		$(add_kdebase_dep kdelibs 'semantic-desktop(+)')
		$(add_kdebase_dep nepomuk-core)
	)
	semantic-desktop? (
		$(add_kdebase_dep baloo)
	)
"
RDEPEND="${CDEPEND}
	$(add_kdebase_dep kreadconfig)
	media-plugins/kipi-plugins
	video? (
		|| (
			$(add_kdebase_dep mplayerthumbs)
			$(add_kdebase_dep ffmpegthumbs)
		)
	)
"
DEPEND="${CDEPEND}
	dev-cpp/eigen:3
	dev-libs/boost
	sys-devel/gettext
	doc? ( app-doc/doxygen )
"

S="${WORKDIR}/${MY_P}/core"

RESTRICT=test
# bug 366505

PATCHES=(
	"${FILESDIR}/${P}-libkexiv2.patch"
	"${FILESDIR}/${P}-hang.patch"
)

src_prepare() {
	# just to make absolutely sure
	rm -rf "${WORKDIR}/${MY_P}/extra" || die

	# prepare the handbook
	mkdir doc-digikam doc-showfoto || die
	echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
	mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
	echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
	mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
	sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die

	# prepare the translations
	mv "${WORKDIR}/${MY_P}/po" po || die
	find po -name "*.po" -and -not -name "digikam.po" -exec rm {} +

	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
	echo "add_subdirectory( po )" >> CMakeLists.txt || die

	kde4-base_src_prepare

	if use handbook; then
		echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
		echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt
	fi
}

src_configure() {
	# LQR = only allows to choose between bundled/external
	local mycmakeargs=(
		-DENABLE_LCMS2=ON
		-DFORCED_UNBUNDLE=ON
		-DWITH_LQR=ON
		-DWITH_LENSFUN=ON
		$(cmake-utils_use_enable addressbook KDEPIMLIBSSUPPORT)
		-DWITH_MarbleWidget=ON
		$(cmake-utils_use_enable gphoto2 GPHOTO2)
		$(cmake-utils_use_with gphoto2)
		$(cmake-utils_use_with nepomuk Soprano)
		$(cmake-utils_use_enable themedesigner)
		$(cmake-utils_use_enable thumbnails THUMBS_DB)
		$(cmake-utils_use_enable mysql INTERNALMYSQL)
		$(cmake-utils_use_enable debug DEBUG_MESSAGES)
		$(cmake-utils_use_enable nepomuk NEPOMUKSUPPORT)
		$(cmake-utils_use_enable semantic-desktop BALOOSUPPORT)
	)

	kde4-base_src_configure
}

src_compile() {
	local mytargets="all"
	use doc && mytargets+=" doc"

	kde4-base_src_compile ${mytargets}
}

src_install() {
	kde4-base_src_install

	if use doc; then
		# install the api documentation
		insinto /usr/share/doc/${PF}/
		doins -r ${CMAKE_BUILD_DIR}/api/html
	fi
}

pkg_postinst() {
	kde4-base_pkg_postinst

	if use doc; then
		einfo "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
	fi
}





^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2015-02-14 14:43 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-12 15:53 [gentoo-commits] gentoo-x86 commit in media-gfx/digikam: digikam-4.4.0-r1.ebuild ChangeLog Mikle Kolyada (zlogene)
  -- strict thread matches above, loose matches on Subject: below --
2015-02-14 14:38 Agostino Sarubbo (ago)
2014-12-17 23:03 Manuel Rueger (mrueg)
2014-12-13  0:21 Manuel Rueger (mrueg)
2014-12-12 23:02 Manuel Rueger (mrueg)
2014-12-12 23:01 Manuel Rueger (mrueg)
2014-12-01 12:27 Michael Palimaka (kensington)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox