Block >=media-gfx/imagemagick-6.8 to prevent incompatible FindImageMagick.cmake from being installed wrt #465898

Package-Manager: portage-2.2.0_alpha172/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 20 insertions, 13 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index b21c29068826..3c3339ecae6e 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.233 2013/04/14 17:41:44 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.234 2013/04/15 21:02:55 ssuominen Exp $
+
+  15 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> cmake-2.8.9.ebuild,
+  cmake-2.8.10.2-r1.ebuild:
+  Block >=media-gfx/imagemagick-6.8 to prevent incompatible
+  FindImageMagick.cmake from being installed wrt #465898
 
 *cmake-2.8.10.2-r2 (14 Apr 2013)
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 52b1cb7faa37..2ff32e60e8a3 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -28,19 +28,19 @@ AUX cmake-2.8.9-more-no_host_paths.patch 4177 SHA256 376586fd32013150f75aed0b48e
 AUX cmake.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf WHIRLPOOL 088ae1f0a4f32ea872deaf1d4e8d21d6853d3cecb903ea8abfb06c85de8c200757c2cfb34ec25cd0d8ef2a3c12b3cc9472e9ef0b5ce3f702502100806e0e73fc
 DIST cmake-2.8.10.2.tar.gz 5768373 SHA256 ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1 SHA512 e79759f4429977bb4292c9dc8a9d216ca7c21dca5fefce1fa223d7847a1128c8a3a11e1b6adaac40b2f30e0d6f504508a2845f888a319acc29c2ef6beff55df2 WHIRLPOOL f7327282d352ec04afb6349abc74aa3205ceb57efcb013650f18025e36010a27ca28725cd06e29e7bc5ff3196a4c8abeafcb733fba9c6bcc02159a5c6b8e90eb
 DIST cmake-2.8.9.tar.gz 5658837 SHA256 dc3dcc7399be8636471975f955086cdf800739862c240858a98e89719e45e6f9 SHA512 d489fa1c720324d03d5fa6605ec5f39f99f98c2ba3f1754e9450fec35e4d9f9479638365ab813014fc648fe05096a519f387ee03f21b3b8b77088fde2857b6e0 WHIRLPOOL 69f0846b39b3e61f0f4774c702b74ed7445f67eeae8ae3e07f7d36c742966767eb9e39b2911c8e612ce0afdc4e24977f7afe2ebab3159d3096e1b2ba86b8247d
-EBUILD cmake-2.8.10.2-r1.ebuild 5011 SHA256 1319bcb3fe5db958b5c03c69e30b2936bd2f35e932156debb7b83e8e1811724b SHA512 9065e136f2b6faf0c876bc2ad0601918ec2a5585de60bd2baad2a53e29f3bb800728af669e84e46a3a126079d891b279234836f7291908e325795c953d253958 WHIRLPOOL 18ab26f800d38ab2f071a7ffe5aca1d1b64e1f32dcbd2c312ff18fafec4cf39a3742a27cfe51273d396c66eae9b9764dc6dc596606d2b1b18c5c94b601b38c47
+EBUILD cmake-2.8.10.2-r1.ebuild 5042 SHA256 a00cd5df083552863fc55ff6bacbb12649780df6260b2601c3ff304f163cdf2c SHA512 8578b70a80d440b4d4d90ab8c9cef34544ca1dc99ff2717d5ed6e38888bda45627fbf79858dfaa67858d0ba1466c74340f6d843a5fdfaee5eddf8893c10b8c30 WHIRLPOOL 61bacc1ad17ab2a2109b0fea592756ca6218086a090b45b02288cac3cefe6b7ed2ddfad79ffb78ab8298bad363bed660b3744c59b949f323edf2f3bd688c0af8
 EBUILD cmake-2.8.10.2-r2.ebuild 5029 SHA256 4d033b5a13eca24fe41a895435b93cca106aaa9da12aa570be71d158513bc435 SHA512 7324e8ed9caf5d4997a600cca0ada8b00c3ff743d9e9bbda8d7c8efa4e60ab0e7004c8904323e7a6f491abf8877e9e54d15095c55e23a59c404b5f381ce16335 WHIRLPOOL 6173740bffa8819e53371fc354b77097dc3f6098531ccc67a545b64867d5ed34ea86358ef8433d56119c90b628ceb58fc9437dfb5884c2086caf20a17afb2915
-EBUILD cmake-2.8.9.ebuild 4874 SHA256 0b541568e9aee2bb3e90bf146a9580465756d98cb2621b18b9ede47416ed4f13 SHA512 f8081821248816358cb78026d7766fd08d45e8e294e00033dfb8e08aaca027b21f9325d7c21895852ad5933a1ce2e09c8f17ea5c3c7568a6b51e690fb1697356 WHIRLPOOL de0726f1d2d09cc19042066e5a6216da9cd0811d02bb081dd688783b2e2bb6f945779b92d44cc205f94f5710fd3f5e9eda3f436386ec90f534e3ed0512a08749
-MISC ChangeLog 37901 SHA256 aaf220d079340e5a8fbc904d02d5277f29140255c04a5011f9a8fcf4dc8bfa28 SHA512 8894637919415d4a615404cf30ae6acc559632abc13f50762a83c7018bea155e0a68a40624b961237b06cfeab8e1e17eb7f92c2d9ee2ee394c40d367c791fe4c WHIRLPOOL e0755aeea8057eb63e8ffb7fa8f4330d171b02d929c9bd53866e40b52133b670cc28f379fa68a03c89d0408a13ef662ca1f059e4a7d9d3a92e4630f024f7ec35
+EBUILD cmake-2.8.9.ebuild 4905 SHA256 54ffb9e282db60e22538097272ac72be6caa92faab6029ce075fe50950244eab SHA512 1d86944107c13952ee90fa3affc0f3c109b92ad4e443d4700e583b4f8ca63743e94c7b289169afceebb2ba55dd89fcdf39f66eff69410f10d6b140aa48a11eb9 WHIRLPOOL 7e58275992ac62fe8b4cac75348a9f28f2fca9575c84e806402a53a6a561f2bb8fb4583bcf08c92577470cd9c0acdbf2de448acf187e4e83564348c822178164
+MISC ChangeLog 38120 SHA256 f334359724d739cb83cc0ccaa44dbc48925f035f5dbfd70236e42ff0959d3ef9 SHA512 c56bd3f7fd02bfccd9b439dcb9e094291295b604a1dfef626ce8015d851a0b88304e1d4556ef6b9e2b35174dd6353c690944cb643660e81f67b0dd053e989c48 WHIRLPOOL 4acb3cbf6f52a3155a82de63c39dc959c5cb8eb3cf82c2af7fe9e01357daa03b24123938ffae4480abad39f4a871e33a2343eb6475be1798c0a126fe0da5ec0c
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRauoxAAoJEMbwO6tnXQ0srj4IAMNe8Vs9HVqMrfC7Nj9behjN
-LNqmVhKYJeMBpiOGnzzC24A/EL/slRem+F79qR8EZ9ofZ+VM5iJ02+f7/QZ72EKX
-OzPwobZ9FS3jZ4j0FxGia0tJ8JxP+TIzCAsHz+aXxX7SmkB5FiJRPpEv/K8Luib1
-1pdNsIwjnvkEbr3in7olAd8SSyTCeKIn5mrCwSXmUmJjdYshdN8+fhF/9iQB1yq/
-gKH5qLoFcw878rIYXdwZddM60Bi5tHg2UkCLVkO9qG8ysfFI9HWE/bdaUekR7nRq
-Bgd0AkJ54W4jmG9iA9L5aUOOpN2Qila0XXEyfcDj4t/aEDyjijD9sQZgWxqvhjw=
-=s/TB
+iQEcBAEBCAAGBQJRbGrfAAoJEEdUh39IaPFNl80H/2M36MFG3YlM1ApY7tchVr5/
+IDLb6YhEC2/UyG+azO+Ob5ZyaChSny63hhwQUtMhBa2FY+13PUBHCFs9+TAJhscJ
+2IjSGUAbHyZjob+8d82/XPLMGrnncERBEalGI2RAw9Fi2/XyrFGVYjRxqlco6dw+
+AsmwvZotcFyZvVKr1fzLM96xxA4DhhLsD3/BWutn/lvcU1gjGN24VTu6SmljTLBs
+AI+aC+vv0fBVgeQKA9wi2pMZOaSHSU7nxb9OFTkqQiSOlkiImpI1Jc9wlr/IrUfb
+cVTqUMHiTX/Xa1TQWy0ng8k8uEga07ktRaKzX7oQ8D5j5VH6lQ/4VdLWNSnLO4o=
+=CX/4
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.10.2-r1.ebuild b/dev-util/cmake/cmake-2.8.10.2-r1.ebuild
index 84829be9cd57..3c8db01c74c2 100644
--- a/dev-util/cmake/cmake-2.8.10.2-r1.ebuild
+++ b/dev-util/cmake/cmake-2.8.10.2-r1.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/dev-util/cmake/cmake-2.8.10.2-r1.ebuild,v 1.4 2013/03/02 20:20:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.10.2-r1.ebuild,v 1.5 2013/04/15 21:02:55 ssuominen Exp $
 
 EAPI=4
 
@@ -17,6 +17,7 @@ SLOT="0"
 IUSE="emacs ncurses qt4 vim-syntax"
 
 DEPEND="
+	!>=media-gfx/imagemagick-6.8
 	>=app-arch/libarchive-2.8.0
 	>=dev-libs/expat-2.0.1
 	>=net-misc/curl-7.20.0-r1[ssl]
diff --git a/dev-util/cmake/cmake-2.8.9.ebuild b/dev-util/cmake/cmake-2.8.9.ebuild
index 44690e0bb7e9..f915b16a3cdd 100644
--- a/dev-util/cmake/cmake-2.8.9.ebuild
+++ b/dev-util/cmake/cmake-2.8.9.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/dev-util/cmake/cmake-2.8.9.ebuild,v 1.8 2013/03/02 20:20:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.9.ebuild,v 1.9 2013/04/15 21:02:55 ssuominen Exp $
 
 EAPI=4
 
@@ -19,6 +19,7 @@ SLOT="0"
 IUSE="emacs ncurses qt4 vim-syntax"
 
 DEPEND="
+	!>=media-gfx/imagemagick-6.8
 	>=app-arch/libarchive-2.8.0
 	>=net-misc/curl-7.20.0-r1[ssl]
 	>=dev-libs/expat-2.0.1