Import Gentoo Prefix modifications, as discussed with maintainer. bug 319869

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 303ede836fff71516bdb8ff7ee4e15c589f9e9da..40f885aad3c6cf46e741291e4d36268b1f17d035 100644 (file)
--- 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/Manifest b/media-gfx/imagemagick/Manifest
index fcb20febfe9d2b83a877f9a94b4d1c292b64fcb5..ad1260aa242e287ad836141459b13a8a494ada9a 100644 (file)
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST ImageMagick-6.5.8-8.tar.bz2 8711782 RMD160 1417878f2adae344f840807710e7f9485d5945ce SHA1 15212833489826f7d2d919d1442309d6dc504402 SHA256 3a81e6c6759f6266dd18e8bb6c6c6791d5af8871e2dc2e50fb9c9362f3e689eb
 DIST ImageMagick-6.6.1-2.tar.xz 6231544 RMD160 8c87f76764356640a86dcaf4c5eb9d2caf94c243 SHA1 c57d80607a4a4b90e10e718f95cde380915169a7 SHA256 e510045d6aca949092f696b6b4e2994cf22693408f067e4ae9a00f66c414910a
 DIST ImageMagick-6.6.1-7.tar.xz 6253476 RMD160 4e033f901a939e34e010f3cfa34d7f605813c69b SHA1 294a18dc2d57209dd2e4aff8ad505734df0885e8 SHA256 fd48aa25a1afa1de307ce4376f4aa8b42be9301792d7702bde8651a9a0c893c8
 EBUILD imagemagick-6.5.8.8.ebuild 5033 RMD160 cd0a072e0dcd2919afaf55914bc1f8cbd8425db0 SHA1 079ca007a664f8fa808a40bc984af18053455d52 SHA256 aefcfb8c162ea10f0d4e79e4a558d1a4a0036375f6ccf7d71ad8885d451166aa
 EBUILD imagemagick-6.6.1.2.ebuild 3837 RMD160 95c307bde7b69bec6c9cfa64e3d0e7d77dbc159d SHA1 e2e9c5a8fbca0f4e2d771439d4be130b576bc04a SHA256 cce2cce2faed64f0f839b31e07f5bcf95a91f41ef584cbba654ad47837f18856
-EBUILD imagemagick-6.6.1.7.ebuild 3842 RMD160 bf3fbaca95b6d6e54d84db4d584761c81f75237f SHA1 85ab1d35a4079baf64724901fe6b211fe6bbef95 SHA256 205dd8e405fca08f7706ea0faaacc9fa11dc593c777ad1ee42df81fca9b39eab
-MISC ChangeLog 59043 RMD160 11e54990037a370f422ae83803413b57bb303866 SHA1 207f3d699cedad11245601b64fd650694702a5dc SHA256 2dee73d2022ebb3fc1835998861a76735ba7e04a6df9d12a3d08d9f91d140514
+EBUILD imagemagick-6.6.1.7.ebuild 4071 RMD160 98facc4e2e5cf1ca31e60e5988deb2b44e08767a SHA1 a5a54b270c9887252874e485bd5119ee84da2b56 SHA256 785e1af786fe85e4db14f696856dfdfd7e5bdd76d0f858df31ac433e86521005
+MISC ChangeLog 59207 RMD160 adcf75d2da7f82b1f0a36ab91562ae89d990417f SHA1 9e5a42cd1233f8cd87deed5f3102b8189e23d686 SHA256 71572b4ce6912004c436415e8bb41b14c919a634d964a96c2c7bb885305af0a4
 MISC metadata.xml 813 RMD160 1a299d749c40a81c6255e74b055d51bb2574947d SHA1 28be5abfb85ef530e3ec5a84678e914175435ed4 SHA256 53592450b5a53784153fc95d665dee08392968adab41bd3032ad759778bde31b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvsaLIACgkQcsIHjyDViGRAowCcD6WcjHh/Vs2daUApo/NmRpmr
-klgAn3fxy7WJniANFW+ymWcZICCsQEmg
-=QMAP
------END PGP SIGNATURE-----

diff --git a/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild b/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild
index 99e50d9795afdbf73117d8c075ed3737fdb2ec02..a14a7be6547389b4fe791889fbaac23e79ecb235 100644 (file)
--- 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
 }