diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2010-05-17 15:34:45 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2010-05-17 15:34:45 +0000 |
| commit | ede6fab28334dadaa5b68396687836b849ec950f (patch) | |
| tree | 495ddb3571e90f3b4e5c81173d369d28272f9ec7 /media-gfx | |
| parent | Rename USE flag qtmultimedia->multimedia, fix dependencies (diff) | |
| download | gentoo-2-ede6fab28334dadaa5b68396687836b849ec950f.tar.gz gentoo-2-ede6fab28334dadaa5b68396687836b849ec950f.tar.bz2 gentoo-2-ede6fab28334dadaa5b68396687836b849ec950f.zip | |
Import Gentoo Prefix modifications, as discussed with maintainer. bug 319869
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/imagemagick/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog index 303ede836fff..40f885aad3c6 100644 --- a/media-gfx/imagemagick/ChangeLog +++ b/media-gfx/imagemagick/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/imagemagick # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.395 2010/05/13 21:02:20 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.396 2010/05/17 15:34:45 darkside Exp $ + + 17 May 2010; Jeremy Olexa <darkside@gentoo.org> + imagemagick-6.6.1.7.ebuild: + Import Gentoo Prefix modifications, as discussed with maintainer. bug + 319869 13 May 2010; Joseph Jezak <josejx@gentoo.org> imagemagick-6.6.1.2.ebuild: Marked ppc stable for bug #319195. diff --git a/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild b/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild index 99e50d9795af..a14a7be65473 100644 --- a/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild,v 1.1 2010/05/10 18:51:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild,v 1.2 2010/05/17 15:34:45 darkside Exp $ EAPI=3 inherit multilib toolchain-funcs versionator @@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz" LICENSE="imagemagick" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="autotrace bzip2 cxx djvu fftw fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms lqr openexr openmp perl png q32 q8 raw static-libs svg tiff truetype wmf X xml zlib" @@ -78,6 +78,8 @@ src_configure() { if has_version =sys-devel/gcc-$(gcc-version)*[openmp] ; then openmp=enable fi + elif use openmp && has_version sys-devel/gcc-apple && version_is_at_least 4.2.1 $(gcc_version) ; then + openmp=enable fi econf \ @@ -135,7 +137,7 @@ src_install() { dodoc AUTHORS.txt ChangeLog NEWS.txt README.txt if use perl; then - find "${D}" -type f -name perllocal.pod -delete - find "${D}" -depth -mindepth 1 -type d -empty -delete + find "${ED}" -type f -name perllocal.pod -delete + find "${ED}" -depth -mindepth 1 -type d -empty -delete fi } |