Handle kimgio generator under jpeg USE flag. Fixes bug 511416

(Portage version: 2.2.10/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B1E955DB)

4 files changed, 28 insertions, 7 deletions

diff --git a/kde-base/okular/ChangeLog b/kde-base/okular/ChangeLog
index b6154caa5943..178b3173ff3e 100644
--- a/kde-base/okular/ChangeLog
+++ b/kde-base/okular/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/okular
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.249 2014/05/13 17:43:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.250 2014/05/26 21:44:29 reavertm Exp $
+
+*okular-4.12.5-r1 (26 May 2014)
+*okular-4.13.0-r1 (26 May 2014)
+*okular-4.13.1-r1 (26 May 2014)
+
+  26 May 2014; Maciej Mrozowski <reavertm@gentoo.org> +okular-4.12.5-r1.ebuild,
+  +okular-4.13.0-r1.ebuild, +okular-4.13.1-r1.ebuild, -okular-4.12.5.ebuild,
+  -okular-4.13.0.ebuild, -okular-4.13.1.ebuild:
+  Handle kimgio generator under jpeg USE flag. Fixes bug 511416
 
 *okular-4.13.1 (13 May 2014)
 
diff --git a/kde-base/okular/okular-4.12.5.ebuild b/kde-base/okular/okular-4.12.5-r1.ebuild
index 556af3d462d2..148c815b1d54 100644
--- a/kde-base/okular/okular-4.12.5.ebuild
+++ b/kde-base/okular/okular-4.12.5-r1.ebuild
@@ -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/kde-base/okular/okular-4.12.5.ebuild,v 1.5 2014/05/08 07:32:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.12.5-r1.ebuild,v 1.1 2014/05/26 21:44:29 reavertm Exp $
 
 EAPI=5
 
@@ -25,7 +25,10 @@ DEPEND="
 	crypt? ( app-crypt/qca:2 )
 	djvu? ( app-text/djvu )
 	ebook? ( app-text/ebook-tools )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? (
+		$(add_kdebase_dep libkexiv2)
+		virtual/jpeg:0
+	)
 	mobi? ( $(add_kdebase_dep kdegraphics-mobipocket) )
 	pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
 	postscript? ( app-text/libspectre )
@@ -40,6 +43,7 @@ src_configure() {
 		$(cmake-utils_use_with djvu DjVuLibre)
 		$(cmake-utils_use_with ebook EPub)
 		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with jpeg Kexiv2)
 		$(cmake-utils_use_with mobi QMobiPocket)
 		$(cmake-utils_use_with postscript LibSpectre)
 		$(cmake-utils_use_with pdf PopplerQt4)
diff --git a/kde-base/okular/okular-4.13.0.ebuild b/kde-base/okular/okular-4.13.0-r1.ebuild
index 7c36431b2dc7..a4645f3970ad 100644
--- a/kde-base/okular/okular-4.13.0.ebuild
+++ b/kde-base/okular/okular-4.13.0-r1.ebuild
@@ -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/kde-base/okular/okular-4.13.0.ebuild,v 1.2 2014/04/17 00:43:40 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.13.0-r1.ebuild,v 1.1 2014/05/26 21:44:29 reavertm Exp $
 
 EAPI=5
 
@@ -26,7 +26,10 @@ DEPEND="
 	djvu? ( app-text/djvu )
 	dpi? ( x11-libs/libkscreen )
 	ebook? ( app-text/ebook-tools )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? (
+		$(add_kdebase_dep libkexiv2)
+		virtual/jpeg:0
+	)
 	mobi? ( $(add_kdebase_dep kdegraphics-mobipocket) )
 	pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
 	postscript? ( app-text/libspectre )
@@ -42,6 +45,7 @@ src_configure() {
 		$(cmake-utils_use_with dpi LibKScreen)
 		$(cmake-utils_use_with ebook EPub)
 		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with jpeg Kexiv2)
 		$(cmake-utils_use_with mobi QMobiPocket)
 		$(cmake-utils_use_with postscript LibSpectre)
 		$(cmake-utils_use_with pdf PopplerQt4)
diff --git a/kde-base/okular/okular-4.13.1.ebuild b/kde-base/okular/okular-4.13.1-r1.ebuild
index 18fd92b35932..b976fdaecfc0 100644
--- a/kde-base/okular/okular-4.13.1.ebuild
+++ b/kde-base/okular/okular-4.13.1-r1.ebuild
@@ -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/kde-base/okular/okular-4.13.1.ebuild,v 1.1 2014/05/13 17:43:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.13.1-r1.ebuild,v 1.1 2014/05/26 21:44:29 reavertm Exp $
 
 EAPI=5
 
@@ -26,7 +26,10 @@ DEPEND="
 	djvu? ( app-text/djvu )
 	dpi? ( x11-libs/libkscreen )
 	ebook? ( app-text/ebook-tools )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? (
+		$(add_kdebase_dep libkexiv2)
+		virtual/jpeg:0
+	)
 	mobi? ( $(add_kdebase_dep kdegraphics-mobipocket) )
 	pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
 	postscript? ( app-text/libspectre )
@@ -42,6 +45,7 @@ src_configure() {
 		$(cmake-utils_use_with dpi LibKScreen)
 		$(cmake-utils_use_with ebook EPub)
 		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with jpeg Kexiv2)
 		$(cmake-utils_use_with mobi QMobiPocket)
 		$(cmake-utils_use_with postscript LibSpectre)
 		$(cmake-utils_use_with pdf PopplerQt4)