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

8 files changed, 36 insertions, 23 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 )
diff --git a/app-office/odeskteam/ChangeLog b/app-office/odeskteam/ChangeLog
index 6694d1d2c7d1..74613209d1dc 100644
--- a/app-office/odeskteam/ChangeLog
+++ b/app-office/odeskteam/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/odeskteam
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/odeskteam/ChangeLog,v 1.7 2013/05/10 07:36:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/odeskteam/ChangeLog,v 1.8 2013/06/13 12:13:10 xmw Exp $
+
+  13 Jun 2013; Michael Weber <xmw@gentoo.org> odeskteam-3.6.1.ebuild:
+  Depend on SLOT=0 of media-libs/openjpeg (bug 440086)
 
   10 May 2013; Patrick Lauer <patrick@gentoo.org> odeskteam-3.6.1.ebuild:
   Fix inherit
diff --git a/app-office/odeskteam/Manifest b/app-office/odeskteam/Manifest
index 5b588c077cb8..38ab88318bc6 100644
--- a/app-office/odeskteam/Manifest
+++ b/app-office/odeskteam/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX odeskteam-3.6.1_desktop_file.patch 427 SHA256 297dc192fb9d770a7af08b253ddb33253d6232edef93b8c8d09a6e20db9677bf SHA512 1193306c3a18bfd45fc95d4a49192cfcd4ce34e0a6190afbf9266dcdeb312743d9b9e568c99462e825914a7990e37e64c9483ca4b3ed4a4ebfacb6122bf91d79 WHIRLPOOL f4d336443966c40510e7037fab57016d9084e304f6fd6540713373151dbb1720293622b5dc829f28375d46eed7896d5c278b07e6f64705dc756680aba4a04948
 DIST odeskteam-3.2.13-1-i686.pkg.tar.xz 896424 SHA256 cc2864955f7363c98facea01b3a355fb090ebaa97f36db8de7dceeddee7116a0 SHA512 42306a5f047a89e918b547b40d0298b12a3b028a6e9fb926f8b607e27b478c5480bf061087ee955df89aa0fd0b1004cf340b58d903f2937f63a95464f48ff956 WHIRLPOOL ddbe934aa00946dd166b7ca26e32b2d1d7209c3905af4799398df81d57d4bf7ad4d76d2f71e2992b370ee96e8b873f8691584bf5d43915f54fd7d10afde2b542
 DIST odeskteam-3.2.13-1-x86_64.pkg.tar.xz 901384 SHA256 839e17aa2bc58c211649c22a2c06a02805c127a393e123a99558af3ac20ce361 SHA512 65e1ddcc664a31068a4376068178e0ed775df07cce287a507716e1c78679ddc5ac213b567c7e88b29a63b9c911b812bc45a949bcbb09b4fe7ea8020c4d5ee42f WHIRLPOOL 432a4253c25cb064d140dc4232ca8225238dfe2c7c968bad50425a835f7a665ba0c62f09576f41bbc49d68e07f4c8358b4aa927da17fbf30d51f77902cffbb4a
 DIST odeskteam-3.6.1-1fc17.i386.rpm 1495558 SHA256 a2e3708a04f4441b8626a2608469c88a5993241e8baef13ff503a0ac627f76e9 SHA512 2fd2d5906a1ede4f1e014ad8c67b696e265f38765d5ec3d870aca797ab4471a5b6868adf8730dbdd14254421ca3b579f6d63b4688174e2d9f098f9e6b865be67 WHIRLPOOL 6a75262e42038707fe0659e3418b578ec253e9f85fab7c91176b6e5456e5d78863546f64c079fa53cc30e8c9ebb45388a6965ba468d9437ff24a5040a53e4df6
 DIST odeskteam-3.6.1-1fc17.x86_64.rpm 1545261 SHA256 1444234e08db33237f336817d32f6655c1a2c41b98f7e899919f2bdfca4577f3 SHA512 1dda4998597739977fc607e5da12fcbb1d6843235c911d9b7ea1b4696d293bcb6b4865a605256e13d512741ee46e5dbfc194363261facf3af90105a2656367a2 WHIRLPOOL 0e326c20e8baadba08ece0b37014f727b50feded614a56ce839fcca41df98852c83898fb12fd1672e9d1e4966262a6e8b9fcc651112a9d0a91b7a2fce5983be7
 EBUILD odeskteam-3.2.13.ebuild 1467 SHA256 d9a0f822dd05cbdca957bba33ed9aba8ba30d0788ce3cd018f727b8daaa14d81 SHA512 6fdd636ceb64501d92b52f36b10f3ed52414c7c2c817a67c3906f254190cadf1ba708ac98a2c63f9335b608ae5766287bc4dc8a50016cc70b40647e28e863ecf WHIRLPOOL e2ae94a13c4ae24371ba4a86027816caa720ce39a40ad20522f7903f174c52e13e6e4203edb9fbaa4aabfa098b2fe5c1a0306d81f540e7c326e25e243ee20251
-EBUILD odeskteam-3.6.1.ebuild 1490 SHA256 3c0920cd6ed7b2bdff4e6ce9c6b5216b8b86e15dd7d70208a20e3f1c3d278d19 SHA512 839a7bc3e80c548683fec70d7cc8620efb6be0311b0ea9043e061a7b64daac00a615117458a0b90d4a5b4be6bf25b215a520ddfb10817c77d4ff7ba1eb3914a9 WHIRLPOOL a9ebbbdac91fe3ee0323299faf3f79a0ef58c4ae0368c01cad7d77eb0e01032e2a1fca8fd20c3ac9cc5883576f51cd23e364d8ff8eb667d20f395cd112c70abe
-MISC ChangeLog 1142 SHA256 dc4565c010d3ada230dcf3bb8036e2e9cf71364c85964e441eca956c78b355f2 SHA512 b3bf60a1b1de22fde360efcb3932e35b81f564dde7eb5af9b438b7c7c6c1aefeff75766ccae3f443c27e0ac56a314c69f7b411740292afdc40ac194ecaf13969 WHIRLPOOL 219299e3e55db497eea1688e38795dff39430e57372b61a89ef6ce834435aa8d7e5c95d50149df359c82c97bebe8eafc0e85c40768ddf3844d821806204dd5e6
+EBUILD odeskteam-3.6.1.ebuild 1488 SHA256 d141e102316dabb640f8e9d1d1138d64d64ad715ecbded1fc37fbf425274a4e7 SHA512 f048135cf575ece9a5db5ece5d7616e5f9f03862a06aa1a7be1cdce9ff366630086c39d345abe122011a7c385f1be3edd6f71d549c0c85affe35a778028da92c WHIRLPOOL 60b03d9e070890b1911a405e442bddced739f8969fb6853b8b5a5d0826191c6371ff3f19ef1a58b7962ad9a1c8c75c98c54ace774df1b0e8cb043e0315a0e283
+MISC ChangeLog 1264 SHA256 88064bbd3d63459b63084e86287bc47c87c37eb0dd2c5c8af57859d71457254f SHA512 918803d9fec77e9bc77a3c02434bd46c19817c510197063dd0d46218ca2d067916b538fb458f2154fa489350bc53f18e95c84bfa990319ab00a10c25768cd3cb WHIRLPOOL 7812f575ae477600fb10cc612f6aa24a2aa265f82a5a663285c5cfdf2ee4a7d771fb82d47bdc7b62f25e4cd08528580fc85700036c4470b3a248b8c3d715eafb
 MISC metadata.xml 449 SHA256 634cf9ddffd2f19abccde3541fd0f2a3b69ac641ead61641d1529bb21be5f5df SHA512 03770b73e7553ed1e42c557aa06fbeb4e1d80655b60e7ca4a92d7d42a1f2d62f08dff6d92ec24c61f5e8b2bee4f743ae63b2e053f4cb91896ba9fd69289a012d WHIRLPOOL 8741b84dd5ae88e14c0d161372748d9c6fb70b77adcdf58e120db27306c3516015b036c8845bc1b802e6d48b429f9f247d8996575306b6540c79b9ab154d0668
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iF4EAREIAAYFAlG5t1oACgkQknrdDGLu8JBf+gD/a8f5t06P6eMQQ5Wq3dXRLiiB
+huTv3xNhjHM99zA67pMA/2ERkfO1oifosXtysD/B8TaiNgPZRQGKw1vBo1m/QknP
+=m7G1
+-----END PGP SIGNATURE-----
diff --git a/app-office/odeskteam/odeskteam-3.6.1.ebuild b/app-office/odeskteam/odeskteam-3.6.1.ebuild
index bf909f143c2c..06b943e65bfe 100644
--- a/app-office/odeskteam/odeskteam-3.6.1.ebuild
+++ b/app-office/odeskteam/odeskteam-3.6.1.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/odeskteam/odeskteam-3.6.1.ebuild,v 1.5 2013/05/10 07:36:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/odeskteam/odeskteam-3.6.1.ebuild,v 1.6 2013/06/13 12:13:10 xmw Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ RDEPEND=">=dev-libs/glib-2
 		 media-libs/fontconfig
 		 media-libs/freetype
 		 media-libs/libpng
-		 media-libs/openjpeg
+		 media-libs/openjpeg:0
 		 app-arch/bzip2
 		 dev-libs/expat
 		 dev-libs/libxml2