Depend on SLOT=0 of media-libs/openjpeg (bug 440086)

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

5 files changed, 18 insertions, 18 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index 0f703a980c02..4bdba5354d3b 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/calligra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.89 2013/06/06 23:06:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.90 2013/06/13 12:08:18 xmw Exp $
+
+  13 Jun 2013; Michael Weber <xmw@gentoo.org> calligra-2.6.3.ebuild,
+  calligra-2.6.4.ebuild, calligra-9999.ebuild:
+  Depend on SLOT=0 of media-libs/openjpeg (bug 440086)
 
 *calligra-2.6.4 (06 Jun 2013)
 
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 1f35b1786be9..3aa687735f13 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -3,19 +3,15 @@ Hash: SHA256
 
 DIST calligra-2.6.3.tar.bz2 126545368 SHA256 72479e23098f221bc6b5dff92fc62906897061f1009223a632e513fa3b60bfef SHA512 55da2f4552ee68bbf6494fb6ec9abc0958cff762719b1ba5a172793a5cff5283ec63a965f26fe0347ccb1ea71cc4ceb4d70edd72b058d7bfd316421595b48cb5 WHIRLPOOL 5281272864a7c30f518bb91e0a53ce24780e3e91efe9aa5d7c5ee83dc0b577816e40c27d67968987ab805eb60e6cbcef9c3c765d2026969f37083dba6caac59c
 DIST calligra-2.6.4.tar.bz2 126965216 SHA256 228376399fd9aef0e4c3d647070540aafcaa2647610ea341cc0093502be8ec69 SHA512 edcee53532f4ad1b74360ca9d8978b5ea3fed3aa88934b4cd68fcf01a3d43f3651152d1bea9300363be51031f02793562c6d49e4ab87b4fd619ffd49c5bd6b95 WHIRLPOOL bcf49880007a58f1c0199ac21d853e0112cd9287de4aa9303c8776efdbe9e58c2b541d68bb5af55380becae34d75538ba21f1fe0c8d87b2169c4e46f03cf6104
-EBUILD calligra-2.6.3.ebuild 6598 SHA256 21c3f141d9e71880c728ed8d5cad1318ae7bfdddd19cd6198ac721868a151c2c SHA512 a44f1122b148d15e362ae19aa95c02b1fc7d226a0aecb973766a95fa5421f68794b4fc2555f3fdce14142f191c2020cb1d9d9fbcba28f12325af72be0724ce61 WHIRLPOOL 1edf25b4101f3b4dbbacaf9665f80dd3406a10750a8a0b44e36b27ac700f8d739acf4d3f681e2ad3c55fb131057d4e32ec81e847b4d3fbac8db147eab954311c
-EBUILD calligra-2.6.4.ebuild 6601 SHA256 ca0e38783b9d77e34f480f5b1a424b4784505ce09990b7eec5d595654ff373a6 SHA512 6828dd67e3d1700fe6fa7e6cc9b5e18ddf4097e8a77c8c3efc69700493afb28bbc39f4e31fe77fd315755247ba5b643883377cd19e3eb489a246aeacf7425106 WHIRLPOOL 535b18c287447572facc0028a50a08f6bd60acac7aac3d24fa2ea7bc926fd6a0776edef678f43c69d7dc9ae776a7e24136f25122577d493303c50854ef06e14a
-EBUILD calligra-9999.ebuild 6607 SHA256 11ca08c4fa1f4ef8931248dc8c088ce38f1a14fe4043d0f4366d91f431ce5fc4 SHA512 3845bcfcd0388b9975d7f573b769920ca3a7cb989492c4f4cd673dcba6267b195a594ea59c02b59996fe800517b7f994395b7bc628c17b450a53d89d1909cbe7 WHIRLPOOL 8a722d82c53c35afefd44dd9edab4fb95b4160e7b1afc7b7c567293e8d18833d5cf45fd69c8d2991285bbc789e926272328b1f96f3f03db241af201275285776
-MISC ChangeLog 15587 SHA256 eebbb673a0d5f456d69be2c8ffeb7592637c9200968567df460d87b93b97d4ae SHA512 6f88b920cb4a2455ba535f8fc31e9298000256c1e8534ebf5e44a993034bbfe2b7fb5498b756894993c99c6c8a8f3b7d0d0551e05e020775de0a2a5679fcf361 WHIRLPOOL 46eef482fd7118a9afc4fed705847b2cf1aa62f168e6359e46a484567c0a32fdc99459aea5a04b00c872055f22b7c1ec6671f4c10bba5583c9d511da01dc47fb
+EBUILD calligra-2.6.3.ebuild 6600 SHA256 a3b239e19364abfee7e4b543122d19defd33571d09188c6572382e74d923cc7b SHA512 b820713f949888375762996d514a5e2931f8efaf4cd686a943ebcebd4c1ef34aa878399442fbbda8d06b524b8e86e40928c3e7bd96a2afce0d436d7b0268971e WHIRLPOOL fe53c6ae6a4a09b111657b27faac54793c16c66e2581905048dc2b75606376d0d924ad7f1fac26ce33a6ada8f2830f2632a8e72ec9908f3c48306507e6f77d7a
+EBUILD calligra-2.6.4.ebuild 6602 SHA256 1906954c5939fa6bd401d77849fcc79aabed8a8b587a0d1ab1d94afab018e5af SHA512 5f4815d8f121ede0707bdfe49b6662a49d89540d8217ae6f19624c963e24623f830318460185b9dbf3a8d1bbeed7325cb98ba4ccc570f7b7b2f16fcc4f7eedfe WHIRLPOOL 2ec23a918f1f836a733f7bd8e9727f9ff2ba0aa0700ca33beff360f6e36cf55362389d882d50b612a045a97441eed079f6002d326d93441fc90bb678e039caf1
+EBUILD calligra-9999.ebuild 6602 SHA256 14d795dd54e0b6ab7a1f1d852fc93356773040a650eae05f073af087f217ce8d SHA512 1943e2c0e88fe132392fa8f1cf172bebf1020d184cf0b7167f233f069a484be1d5785b7804679830871564ea52ae4883d27b98b88d6d48fe9d4f3a3150153c6e WHIRLPOOL 91d9a33a728caba98dd63683e93231edb0e3fc76edc789860990e40122aab0a2edb4b4b8a4938c5bf7a11d266cb32cd67133930bed4ba37bfbe046e69ca27b67
+MISC ChangeLog 15758 SHA256 c2601d7c07cfa3e12c0565df3730a5931885677c7426a053c1d98df2fa615828 SHA512 1f583651792a81b63e2d76369297837ea2c2ae4d9dfb3063b238fa9491b9ad4db7719fd622e29ad547bdb8703526f516325757c7a7ef0056926b267b23d52f17 WHIRLPOOL 5c8ad4e2973322eee1389d3b64fe304504a210191f4e1c4f03368f46c5a9a590c0bebe26d5783f1ecce6fe65e7e2a95b330ed40f167171030debc81df21e04e5
 MISC metadata.xml 1466 SHA256 98b54f594a8ccb798746be3f384be9857d99083e7573eab6f1c653874cf3e894 SHA512 06352ab873f12a6e0b3d44b4cb491b7ba2a1e12b671a1dc77e88efdead7c54f51f6adbe0faaa466487be50307320e03b260c50e848605fdd4e83fa174ed2e775 WHIRLPOOL 978e11c29c82bff2b8e281c386eefd8d044eb9b5fc8e7ba33a296507b62ed0bd15135c324e343207323f8d58b5a2b7a7a933aee75af52ab9af45c16f15c164ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRsRXrAAoJEO+t9ga+3I3algkIALxWCeizEye0+3mGLtm3658t
-mAqCF7AaDVU0wxNY9AcKkIJRqPUYE0HWNc4TUIKV1VGXn7XKbFlk/IyKGX9y8jRX
-GU9kureWViZhR3FMyYfbh0WOx9dGt85tC0AU0kRMtYuadQeRDOLxEt92lFoGu1zS
-vkiU/NUCVeZb6QErp9Vh6bg5JL6f/4VHrxUayqJ5EkVVk08sxa+4F8PBriXB/qFK
-UZY7HJzYNcae5zzifbKqQ1vazGJDRV/3uV0tvG8OSSft7FlX+26vOzj/anfAs7bv
-xA4eyZYALC7SBBth0rtuSrEEkTuHWKPV98J+H0D8CgKEBb1F1xWSLImGi2Pw6YQ=
-=UCzf
+iF4EAREIAAYFAlG5tkIACgkQknrdDGLu8JCcOQD/YEuEAqzK8R0Cc5TA68NW5OuY
+dWCG3Y4qk3eiJwF9HjYA/i1O4zpwljnoXeccpuwSfkQowBXA6XUi8GRUC3KMYipb
+=sxCi
 -----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-2.6.3.ebuild b/app-office/calligra/calligra-2.6.3.ebuild
index 8a672422e3c0..25e37c3a7435 100644
--- a/app-office/calligra/calligra-2.6.3.ebuild
+++ b/app-office/calligra/calligra-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.6.3.ebuild,v 1.6 2013/06/05 10:38:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.6.3.ebuild,v 1.7 2013/06/13 12:08:18 xmw Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -99,7 +99,7 @@ RDEPEND="
 	gsf? ( gnome-extra/libgsf )
 	gsl? ( sci-libs/gsl )
 	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
+	jpeg2k? ( media-libs/openjpeg:0 )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
 	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop(+)') )
 	lcms? ( media-libs/lcms:2 )
diff --git a/app-office/calligra/calligra-2.6.4.ebuild b/app-office/calligra/calligra-2.6.4.ebuild
index 0863567d4c07..ef37aae1172a 100644
--- a/app-office/calligra/calligra-2.6.4.ebuild
+++ b/app-office/calligra/calligra-2.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.6.4.ebuild,v 1.1 2013/06/06 23:06:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.6.4.ebuild,v 1.2 2013/06/13 12:08:18 xmw Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -99,7 +99,7 @@ RDEPEND="
 	gsf? ( gnome-extra/libgsf )
 	gsl? ( sci-libs/gsl )
 	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
+	jpeg2k? ( media-libs/openjpeg:0 )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
 	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop(+)') )
 	lcms? ( media-libs/lcms:2 )
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index fa17db394c88..fda4cecbd9ab 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.37 2013/05/30 11:56:02 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.38 2013/06/13 12:08:18 xmw Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -99,7 +99,7 @@ RDEPEND="
 	gsf? ( gnome-extra/libgsf )
 	gsl? ( sci-libs/gsl )
 	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
+	jpeg2k? ( media-libs/openjpeg:0 )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
 	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop(+)') )
 	lcms? ( media-libs/lcms:2 )