[gentoo-commits] proj/kde:master commit in: kde-base/okular/

["Maciej Mrozowski" <reavertm@gentoo.org>]

commit:     e4549a256036395d5fe51ce5f93a996f698ae92c
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Mon May 26 21:49:27 2014 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Mon May 26 21:49:27 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e4549a25

[kde-base/okular] Handle kimgio generator under jpeg USE flag. Fixes bug 511416

Package-Manager: portage-2.2.10

---
 kde-base/okular/okular-4.13.49.9999.ebuild | 6 +++++-
 kde-base/okular/okular-4.9999.ebuild       | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/kde-base/okular/okular-4.13.49.9999.ebuild b/kde-base/okular/okular-4.13.49.9999.ebuild
index f785b8e..c16e1a6 100644
--- a/kde-base/okular/okular-4.13.49.9999.ebuild
+++ b/kde-base/okular/okular-4.13.49.9999.ebuild
@@ -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.9999.ebuild b/kde-base/okular/okular-4.9999.ebuild
index f785b8e..c16e1a6 100644
--- a/kde-base/okular/okular-4.9999.ebuild
+++ b/kde-base/okular/okular-4.9999.ebuild
@@ -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)