Handle kimgio generator under jpeg USE flag. Fixes bug 511416

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xB1E955DB

5 files changed, 35 insertions, 24 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/Manifest b/kde-base/okular/Manifest
index d20b5217b9e1..2187fc600a3b 100644
--- a/kde-base/okular/Manifest
+++ b/kde-base/okular/Manifest
@@ -4,25 +4,15 @@ Hash: SHA256
 DIST okular-4.12.5.tar.xz 1579464 SHA256 15eb67735f7d7dba48246fa1f5a5907d5e6d5b683b1c7020c01c9d401dc1395e SHA512 f4c834c64b823e54f95d7850b7e00dcd5cb74cfec001f964a61c6149e4fe255b13b1d07014d5b64f42118b4b7c986eedcdef1345627f32ecd82d50731e16654c WHIRLPOOL b85266b564f93ca5e1ed0dbb37e859d464c6a3f28cb8d1d12cd77ba29b86209e4297467a3e978003307c1a1ef3b37136e22a726ac4432beb6dbbddc8845acbcb
 DIST okular-4.13.0.tar.xz 1568500 SHA256 b7d1f168664c946e31a692cc71c9c5503cc16098eb37d7160362dd93dd201f2b SHA512 d4234bbbb18173968edf537eba8232d1c1a8a6f0fe4be99cea5e595882a124a9c0954d9fbabc74ea5b4983ad974505fec33d10589be9a6256688c3ad4a4fdd32 WHIRLPOOL 02d3a75efc0b4bcb8e351e23e658143d5be189cc798950f08febd214a8843a56de2a1563ea80dd2e00b57c1963db2065ce475601a90b9121c2ac4cd9f4126477
 DIST okular-4.13.1.tar.xz 1568388 SHA256 8a7d41e0b63d3862bfd932ebc3bf923278191e6286dddac140285b50fb81c351 SHA512 ba98df75cab0b4c0c4f0c2ca5cf2599b906fe378cdc7f715da7d4926c6da7fe8f32ebbd2addcfff697a0939ab30a16f98f0d28301f0aa15c28e8a9ad2fe3d64c WHIRLPOOL 1ba5fdabe441ae776ce85b2bf774df989cb9c436ed97a6f019440a708187f65c292f1fb27e8de4623c2143f653f4617a26e2542e48a2055fedf7fc43d811faa5
-EBUILD okular-4.12.5.ebuild 1461 SHA256 2b4c10bc4b16363b98175597d9fe057d9af0c380ed8701fd4541278b96675b4e SHA512 50083bb294af552d287ad07b593b064c09b1cd30471f027d599c8ba1c02e6fd709e19d482ab2140cd1cdb69c8d19b28c7924039febde3e4ee6a63857acb253b3 WHIRLPOOL 7448b2e922e1e937cc908072c49433792b05663c4ffe30a6e24f6eccb75b742e5f008547e35f71f80e1b6ec82ccd5bd7b1b0eadf41cd980851dfa9e3673808f4
-EBUILD okular-4.13.0.ebuild 1541 SHA256 59a206b6914cbaf859e542385f43a12b87a12b2fc0a3adcc4cf1c2544f8241df SHA512 a65520e9e0b3e4ba2f203078b5bc33ce189c9b061d32b75f4e9efe9e4879a1eacfb093fb6119fdd7bce325e67c22bac469ce80cf3bcedfd9a94358c7ce4f6aca WHIRLPOOL 0e194539c7d70987c5411f0a5b157b919f16b1d7489e1c0a582d0b366312ebfb44362077224622e3afd8d2493b35f6994175c2e1a50ec807e7a770938523d164
-EBUILD okular-4.13.1.ebuild 1542 SHA256 bee86687e8bdd0bee3da99cf1b017c97da59e5c238ef8c4f3059d5035c6ad749 SHA512 1752764e3bdc2bd78afde5067260320d339e110ddea4d93c180042e273f832f84c2f1a6f19b74a6fd8cc44544c4e67b0f00015cb49045a5f910dd5c7ce4e53f3 WHIRLPOOL 03ebc4dfb13e47968fe2cbef193872c52c78eb444746c8ed65bc4cc457287ae271caaf4bf4f6c1d8f5f0e771fd242416db534c1e54839c95819c01583d91bfa4
-MISC ChangeLog 31006 SHA256 230a09fa5365dec2175cac41a0bb4039a78ba43efbbddee70aa05067b44c9091 SHA512 d2303d2e6c6deaef5ae85292fd79664397e345e27d131d5bd2c1dc7f65d72c89f31a359b0d5f8f5a3313b8d76cce9dfc16e4139f3ae95f2396376f4133dda0d7 WHIRLPOOL 39680658903677e2e6e561a326bdeaf4f4c89026da8cad129963c55dc734350cfc534155fbf2852f165bfb175263c8f201465740e7b684422ddaa79c964f0cea
+EBUILD okular-4.12.5-r1.ebuild 1541 SHA256 ffe0c18eb361d8b264910cfc6637c1abf62eba10725bb6cc4ac78f8a8453b9d9 SHA512 6ea14e3c2fa978cfc9a9151a4c68ae11c8b0e6a63e8db9302056869a71e9288974d3633ae2d5bcb5b5266e376a50dbc72ea74a6bbcc2aef81ae03843c6565dea WHIRLPOOL 1013570eb338c0289fbdfc31627a9cc68e2e61f2a7b665277d9c808543113642b00f07731943dadddfe40c2731f8ba8e2aadace97d1cea289d648d9ca222eae3
+EBUILD okular-4.13.0-r1.ebuild 1620 SHA256 32508094a81118a3be5cc7a823e480a131f381fba0cec3b6bd24b9fd2d8396e0 SHA512 3f9336d764096cc00616d52638cedc41945392dcea25443fb01f768bf053fa7b987f4009d7ddac2998fd69a88994ae10ef348c2c63778bf395119f14f0cb81dd WHIRLPOOL 659968af2f51d0403ec5828e9d8408fc8e8a09e2b4d34dca141e284ff8be0e8bf7ca991aaf0ff2f5e46df619584e9e31a7b4245d32148ab3f7c5e0c8213422b5
+EBUILD okular-4.13.1-r1.ebuild 1621 SHA256 7615e7c88e577d10bf08849ccc41d37ff28bd3e92e285e19c587de14a8269487 SHA512 36b44ef44bbcc6c8922d0c3c8b368f5403217aea42d44d36f7aa41f923ceb2acb1e627a8d9dc4f363cb15dc9d3fd0506a0e6efdd9abbca00b01c4e31d8018f39 WHIRLPOOL be770aad564f80cce6262af545a46ac5c72d76528d46b066bc8cd5a4efcd1eaecd5db3304d5b2fe17bd290f14fc2d172794b4fea8a4a28a97072ed4c973416a9
+MISC ChangeLog 31377 SHA256 cf0e3249940b5a4cd14a4f0820b5b2252eacb0db2b268350a14362bb0e3b2f75 SHA512 f5d4f9e4b29ee0ea118208e998b32ad5129d4887410ed803d2ec1b4078b8dae76d147444c1bbd3651b1b5db30f3da92524693dd835539a91a9b89b311f9953a5 WHIRLPOOL 1863b245b283205bb6e915643fab58ae62682c2dc0e1855452e3f47d6b358a683286edf8b0ff948f80788f7bea927ac6481869459a45b151a4c3eef05a096fc9
 MISC metadata.xml 443 SHA256 0b90f19b2474dc077a5571b0941c1a19c2d77f2c1e29f60a604da2d06c705b1f SHA512 32a933129faec25b7a395b23c512cb23647d9e6652ddc7106a029c565aee1b127e7234076b20ea6002fee5d84f70a5e87e538b86c195b67997ee77628f1c2036 WHIRLPOOL 6b6f31442ed2335173c58e0136c57b006d671e778f9c878fd2325bade9587a6be572069611cfa988168faea56af7356c139682db02858f8cd52bf00f8792e9cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTclpVAAoJEGVpnaTzz9K95WMP/0AVgo9npIduFif6eu+tj1k+
-NI6ke5hzd4HlZld26qg6dc8vG2a7fFgMx8Xo0ItxFuzQQ2nQE3PaoyV0wx1W+U1I
-bh6zHPGJM1u3yuub7EiEN5eJHUwImtZ6ICVfiuzBXdYYwKbRy9XDib7iZ6G5OX+/
-zDagQH3we8pUvlAjl0iQLEcn3ElvgnOpf+1Qsu6CkKV5IMek2bLOYAELuZ/nrx4t
-AjEfBi7Y62QALGgu3z8A/5ZWF8QQ26vWN8xIIhWf5F6aDrLjBJP870HhXtRldCOR
-1zWxmNDMyGDh6G//Dp+BeR5mM1hHh/mYv9Z1lRAdwGqldFB880WW/EYwOFKq7Or0
-D0UeaudnZ+3pVIPEMa4yo3XsrdKniUEf9MqcrVax57JJY1URkzP3UpJZ3QFtKZa6
-z6ocul9qlNaVbvUEIMCoHmSai2mDI8Dz6CTkN/js718g1AAoSQ7RBtiVOaZzq8af
-YKnzrPEmgIR1cbsuWqNT4TaGt0ksyzN63MN7HJxf/4SIAA2v6BEDanaXejYMq4lq
-hxHsIt5k2HzOlxFn6BlnLP4aWN3htv+lK2y3gPFn5bjkAJpxaikenBUOhuf03oeM
-GpD7e/r4W57STygYnj/1G57vPmOLYQiWjnpDG3dek74/CV2K1fWLZ9FP9QWEQTEq
-xFPNok63MolXsbD96gry
-=bFwn
+iEYEAREIAAYFAlODtegACgkQFuHa/bHpVds+wwCgmWlW5tb7StP/bYWs85elahkB
+YJwAnjv/E5eA2rqQ9LcOJDTmnC9sRHe3
+=w1+M
 -----END PGP SIGNATURE-----
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)