summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2008-07-05 16:18:36 +0000
committerMarkus Meier <maekke@gentoo.org>2008-07-05 16:18:36 +0000
commitada16a3646621ab721cb7fc746cc1f50d5c21a07 (patch)
treee2977cfc9be0cebd9a963a8f2d8a96915d851c3c /media-gfx
parentamd64/x86 stable, bug #230067 (diff)
downloadgentoo-2-ada16a3646621ab721cb7fc746cc1f50d5c21a07.tar.gz
gentoo-2-ada16a3646621ab721cb7fc746cc1f50d5c21a07.tar.bz2
gentoo-2-ada16a3646621ab721cb7fc746cc1f50d5c21a07.zip
remove openmp USE-flag, as it breaks imagemagick (bug #223825)
(Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc8 i686)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/imagemagick/ChangeLog5
-rw-r--r--media-gfx/imagemagick/imagemagick-6.4.2.0.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index a3fc87020e73..0e7f93296f9f 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-gfx/imagemagick
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.291 2008/07/04 15:13:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.292 2008/07/05 16:18:36 maekke Exp $
+
+ 05 Jul 2008; Markus Meier <maekke@gentoo.org> imagemagick-6.4.2.0.ebuild:
+ remove openmp USE-flag, as it breaks imagemagick (bug #223825)
04 Jul 2008; Jeroen Roovers <jer@gentoo.org> imagemagick-6.4.0.6.ebuild:
Stable for HPPA (bug #229877).
diff --git a/media-gfx/imagemagick/imagemagick-6.4.2.0.ebuild b/media-gfx/imagemagick/imagemagick-6.4.2.0.ebuild
index 9b56ceb63a2e..18f941a13902 100644
--- a/media-gfx/imagemagick/imagemagick-6.4.2.0.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.4.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.2.0.ebuild,v 1.1 2008/06/25 22:03:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.2.0.ebuild,v 1.2 2008/07/05 16:18:36 maekke Exp $
inherit eutils multilib perl-app
@@ -16,7 +16,7 @@ LICENSE="imagemagick"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="bzip2 djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms nocxx
- openexr openmp perl png q8 q32 svg tiff truetype X wmf xml zlib"
+ openexr perl png q8 q32 svg tiff truetype X wmf xml zlib"
RDEPEND="bzip2? ( app-arch/bzip2 )
djvu? ( app-text/djvu )
@@ -99,10 +99,10 @@ src_compile() {
--with-ltdl-lib=/usr/$(get_libdir) \
--with-threads \
--with-modules \
+ --disable-openmp \
$(use_with perl) \
--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
$(use_enable hdri) \
- $(use_enable openmp) \
$(use_with truetype windows-font-dir /usr/share/fonts/corefonts) \
$(use_with !nocxx magick-plus-plus) \
$(use_with bzip2 bzlib) \