media-gfx/imagemagick: Version BUmp, fixes potential security problems, #534106; do not inject march, #533634; install some extra_dist files

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 51 insertions, 30 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 5d935a8f88fa..1f952bb04f50 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/imagemagick
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.578 2014/12/14 17:07:08 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.579 2015/01/04 12:02:41 jlec Exp $
+
+*imagemagick-6.9.0.3 (04 Jan 2015)
+
+  04 Jan 2015; Justin Lecher <jlec@gentoo.org> -imagemagick-6.9.0.0.ebuild,
+  +imagemagick-6.9.0.3.ebuild, metadata.xml:
+  Version BUmp, fixes potential security problems, #534106; do not inject
+  march, #533634; install some extra_dist files
 
   14 Dec 2014; Tim Harder <radhermit@gentoo.org>
   -imagemagick-6.8.8.10-r1.ebuild, -imagemagick-6.8.9.7.ebuild,
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index a77b3cc1f7fb..b955d631320a 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST ImageMagick-6.8.9-9.tar.xz 7891624 SHA256 a4cccc70179ff2c67550e063cdcb2e62907338ef3e68b45bb1c41931e515b3eb SHA512 c30067ae55e2905fdd23c70de83198b52937a5b87396b5b89d3324f19a77ac8f654f6bbeeb07d4dcef1b4d609e9f53e1d1dd70848aa1452b58a548a240f7a3a3 WHIRLPOOL 84430ea4551960afd0f6a85c6febf34fecb2fd60f89ed4e88d76562e65a47202b918d7419d4cd1925ccabd70d74dc949ee02d6955a3f77f2ccadecbfe0e9bdb6
-DIST ImageMagick-6.9.0-0.tar.xz 7893104 SHA256 12331c904c691cb128865fdc97e5f8a2654576f9b032e274b74dd7617aa1b9b6 SHA512 37f9d604d8998b780309a9083d4ee4a5bea4b6353ee3434717e52b1aeb95603ce0affecdd21292c62995cdcc048e62f1e20b422df35047ad549829fac4ef548b WHIRLPOOL 9b503d8849aaca3e277962a7a123d6e25e1e823ad58763ab9b4aa26110015c985fc50ad0dbe74cf9a94ca7f23fe5d0f15f22072d21db3a19fee831210bc4ce8c
+DIST ImageMagick-6.9.0-3.tar.xz 7898568 SHA256 f00452ba2c05c2df9624c62d7adb49ecf17140edd6e5f355cceca051dab1fb38 SHA512 0ff1ac91fa4330544cf6ba9ac8bfd48fce5a0a702b4578e1dcd23989c52c2287e1d6291c231591457a87652a59d908bade148e4e94676a887293671dfec99a4c WHIRLPOOL 0ca86ecb04a18aee95aa2990b73f0f87a7c800b028c45c6af5a906bc0b2f9a380b2ac52bf825cfda8396b4c8dc9b1768be7b46000b9bee9b6f4aaa1bf7d7dea8
 EBUILD imagemagick-6.8.9.9.ebuild 5061 SHA256 986b56a9a3bd288137018d7615ef7d3c2daa5747258216c98c173ca8bbb6c489 SHA512 3c113336719b027ee1583d67f4ef908ab98e14c93aa9261e4164e201fca61ba7f58d3eb59a921206118268de712773e63232299a91873d3053c78bc6df3b0e98 WHIRLPOOL edeed303f92392a1786f6065bf1373b7bc3bae904fc34d495eb27393271988e0420b76a2e7a78660c908103f100294a206a8fd61b62b0084fd156e2dbe6de653
-EBUILD imagemagick-6.9.0.0.ebuild 5075 SHA256 62b605e7a6c2a28a668ab37520e7201281a6e491a2cb8a7a67dd6d5b9e0b7433 SHA512 c1abba39b6e83f122a219777aaab5e04af5c12f2867b6a7f873673f49e4caa28bb8a751c6ffdffb6c1ad2d3cf89ef916b43bf7c9147b0c012e34fd73c67ebeeb WHIRLPOOL bf06d7983274c8c43dbcf4f84037b8e13737d1abf8bbea15f226b152b35d4a5c21d3d06816989ba376c21086e1b522e529d5a50ed64b58296b08d51de9b48dfd
-MISC ChangeLog 85674 SHA256 c13c38db80fbe0420049bc954850365afb7433fdff825d4928485a71223c9ba5 SHA512 e2e223bb61b3e5714f37e6a96026e500bb828d2847dca8902a10e1821f7e13fe9472db9cb07f57480d42c9fd4fc09379e1c4fa1fd4b2c82e5a1002729c97f6bf WHIRLPOOL 5c9079a5f58abb9b7f93ba7593477eb5fd3e6e55ba4f87ab31f3fe78a82c2ebea92639b4b26b05d279b0528943df33a317108ed1457eb3a3a1d619d5d6d13c12
-MISC metadata.xml 1050 SHA256 c7fad295a9ca9207454a88d9794902dd76f732f01a439d29f94372ce9ae4af7d SHA512 d502e1038cd08123b1a0d25dccee6a4134bd8fc768c228042b546c8ee226432430107f76b506e946eb5a9b358c13115e5c6e7a1c80f3fe5b4061885263b0dbd7 WHIRLPOOL 675922fbabfacc2660f9572b61a3cee8bb0967b0df0e6e211271399dcb6edc050246344e5251e6a4a4411f8671f3c625d07f3606531662ab5b278fdcff692010
+EBUILD imagemagick-6.9.0.3.ebuild 5152 SHA256 6d6272b555d88c145c726b1e4fb54301b0d991d635ccd7c9caa94de2bdf937cb SHA512 62b6d7c60415c49c36d82888f79fdf252100d67666114cddd3e034b1df54e40b37c929cb0ea4d44c9d5f75d7d9d0c76e19926db0772827baa54153696263cada WHIRLPOOL 189a2f1b0d3bce8b801997aab796a1b596d123c13582d1d36dc4c5d2b4d5ba5ec755eb8d85ff460aaf32a45c98386c585261fb6a3a8fc30af704e322e01a8120
+MISC ChangeLog 85949 SHA256 a8169a1055fcbaece1f52701989580b9a0d3dd01f03ac607797b7a8e9a7fbaf6 SHA512 6a3ff09ddc3608bf53c37e97c69edc4fc6c650ddbfab20978e5f06b418e32f389fa1da81836290f1401315126c63a9f846003ff1b90eab4783b2f666c80061ec WHIRLPOOL 263fdd73e2799d3993fdbab7a44b5716008a51b5089f7d0981265988a19c17d3c5934f5a5080c482cd727cbe6743abc9812177e54497113a22bf87b3d70b354d
+MISC metadata.xml 1049 SHA256 aa6c00be430056ff297b25bbb9ee0c64baa60d7d039e860e01b4cd7148f65fb5 SHA512 97a8a8ebdb3366cd81036185ac2e81ab5df22bb5dfd8f106c1361276e91c9069ae6dafee74b3fe08e6afc5ce5e65c8b10fe431f4294dd4fb3e32d66e0d2c8f44 WHIRLPOOL e45a43998a456485e1e236737b60ca25ed28f01848d771b4eaff586dc594c85838e7d5155b875dbf31766f2927fc6f9d651e8ccb91ac8cb3c522d4a388b44beb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJUjcPIAAoJEEqz6FtPBkyj10IH/2Ph4y1MsljN3U6z8KN2AHRp
-YrVPupLWQ8qDeselfLzoDInkXNHVnjKH+Ds1Mc1kWufhSV8ExSk6mxueWQ8y8q5Z
-KX2hG7Gwra2GUCTQAFPvo8y0roMaHQ7nxLAwNll8x1G6rjN04Mq5FdGDay7J9JlS
-68KmvXgY3EK5on+jAAUixqH9FVYBpAyt51fRXXezOk+v2BnZAEygg8r6mOyODyD4
-Nngu+XKEXLKzDUi0tY4GTC1dqrBCsh8SRHPX1bueJvmbTp5MSIB5SQaXcJdet8pU
-pAXdKmUP0/GHs7YHDSI2kK4H1DCZHT2Uo5lA4urmRewV8Yu+B3FtEmdVkJJeekY=
-=rgC9
+iQJ8BAEBCgBmBQJUqSyTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir12AQAJujmcq1a5OahHZrFKn9EXUH
+XvgmkzTt8s428tq1dT1bPJqsIgzBOTcVhH+3o8R+K3CjMvvG1BSkDJw+qk+8xhfI
+DE2MzTwFFQoJk+U8VJrO5o6KXpB02jFzDBm2yBaSxtEKoAf/Fig98U1C6yk/SHg6
+qCybGANu+YpcYS6x1zVhweJCb43KRFNrAoHloKzc+sSpzpD+BKI+JFKo4QF+rFit
+B+COo2Gl30zRd4jmTyTU5JztiQ13klC3dsziSHlbkmoZ68LPFu1q7Cyi3D2wpqo7
+vhUf6gswuyDisg2whjUVRX0/0hhPm2G+3Ahnhv41xF90aqxCm8gtF7cfYjtYXCL3
+/xJIzDWpIiO0ywB4vOkSJ8VuV0X8Pf6Eo6Nmh1yA2JIW5NVK21SKaT3BkYSv8lnT
+g8ca8XCLwgPZDfEZBHfvvCPyp88O/owW9kl/phaaxDfJ8z5Mp4NddGKboKNk1Jdp
+L12/uHQs6RwfejNQ41hI8Vx24nBaERJ6VEmHt8Ip3Ql6ig40t1t0df6PpgfDyp8/
+bdDXWM+gGKHDkD+oR38m9fhD8q8H9eeEAOOa27DDeIkA0yIAGc9dvsMrZD8oMuEC
+HEYPMiorfkyRblj0IYbnH7fAABaWr1+6CI3g5i2hu3aMuoV2tLORPo4HFRPqXrb9
++YPDFIN249KB/0Nsca8u
+=lXCE
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.9.0.0.ebuild b/media-gfx/imagemagick/imagemagick-6.9.0.3.ebuild
index 1ecc54d5ec80..a16e6f4ec2f5 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.0.0.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.0.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.9.0.0.ebuild,v 1.1 2014/12/14 17:06:00 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.9.0.3.ebuild,v 1.1 2015/01/04 12:02:41 jlec Exp $
 
 EAPI=5
+
 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
 
 MY_P=ImageMagick-$(replace_version_separator 3 '-')
@@ -19,7 +20,8 @@ IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig
 RESTRICT="perl? ( userpriv )"
 
 # Drop the libtool dep once libltdl goes stable.
-RDEPEND="|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
+RDEPEND="
+	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
 	autotrace? ( >=media-gfx/autotrace-0.31.1 )
 	bzip2? ( app-arch/bzip2 )
 	corefonts? ( media-fonts/corefonts )
@@ -138,7 +140,8 @@ src_configure() {
 		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) \
 		$(use_with wmf) \
 		$(use_with xml) \
-		--${openmp}-openmp
+		--${openmp}-openmp \
+		--with-gcc-arch=no-automagic
 }
 
 src_test() {
@@ -171,4 +174,7 @@ src_install() {
 		insinto /etc/sandbox.d
 		doins "${T}"/99${PN} #472766
 	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
 }
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index 9ea268abe98a..aef99b918509 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -3,16 +3,16 @@
 <pkgmetadata>
   <herd>graphics</herd>
   <use>
-    <flag name='autotrace'>Use <pkg>media-gfx/autotrace</pkg> to convert bitmaps into vector graphics</flag>
-    <flag name='corefonts'>Use <pkg>media-fonts/corefonts</pkg> which is required by some commands</flag> 
-    <flag name='fpx'>Enable <pkg>media-libs/libfpx</pkg> support</flag>
-    <flag name='hdri'>enable High Dynamic Range Images formats</flag>
-    <flag name='lqr'>Enable experimental liquid rescale support using <pkg>media-libs/liblqr</pkg></flag>
-    <flag name='opencl'>Enable OpenCL support</flag>
-    <flag name='pango'>Enable Pango support using <pkg>x11-libs/pango</pkg></flag>
-    <flag name='q32'>Set quantum depth value to 32</flag>
-    <flag name='q64'>Set quantum depth value to 64</flag>
-    <flag name='q8'>Set quantum depth value to 8</flag>
-    <flag name='webp'>Enable webp image format support using <pkg>media-libs/libwebp</pkg></flag>
+    <flag name="autotrace">Use <pkg>media-gfx/autotrace</pkg> to convert bitmaps into vector graphics</flag>
+    <flag name="corefonts">Use <pkg>media-fonts/corefonts</pkg> which is required by some commands</flag>
+    <flag name="fpx">Enable <pkg>media-libs/libfpx</pkg> support</flag>
+    <flag name="hdri">enable High Dynamic Range Images formats</flag>
+    <flag name="lqr">Enable experimental liquid rescale support using <pkg>media-libs/liblqr</pkg></flag>
+    <flag name="opencl">Enable OpenCL support</flag>
+    <flag name="pango">Enable Pango support using <pkg>x11-libs/pango</pkg></flag>
+    <flag name="q32">Set quantum depth value to 32</flag>
+    <flag name="q64">Set quantum depth value to 64</flag>
+    <flag name="q8">Set quantum depth value to 8</flag>
+    <flag name="webp">Enable webp image format support using <pkg>media-libs/libwebp</pkg></flag>
   </use>
 </pkgmetadata>