diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-04-15 21:02:55 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-04-15 21:02:55 +0000 |
| commit | 7e71ec1456667760cc0d483925ba2d2e905e7649 (patch) | |
| tree | 7ee4436535df1dd1569b17ffe7809683b1b7f0cd /dev-util/cmake | |
| parent | Version bump. (diff) | |
| download | gentoo-2-7e71ec1456667760cc0d483925ba2d2e905e7649.tar.gz gentoo-2-7e71ec1456667760cc0d483925ba2d2e905e7649.tar.bz2 gentoo-2-7e71ec1456667760cc0d483925ba2d2e905e7649.zip | |
Block >=media-gfx/imagemagick-6.8 to prevent incompatible FindImageMagick.cmake from being installed wrt #465898
(Portage version: 2.2.0_alpha172/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'dev-util/cmake')
| -rw-r--r-- | dev-util/cmake/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-2.8.10.2-r1.ebuild | 3 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-2.8.9.ebuild | 3 |
3 files changed, 10 insertions, 3 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/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 |