Respect CFLAGS (bug #554038).

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 86 insertions, 11 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 228cf67f44c5..12fc915b1d56 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.592 2015/07/05 04:01:57 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.593 2015/07/08 01:39:55 radhermit Exp $
+
+  08 Jul 2015; Tim Harder <radhermit@gentoo.org> imagemagick-6.9.1.7.ebuild,
+  +files/imagemagick-6.9.1.7-cflags.patch:
+  Respect CFLAGS (bug #554038).
 
 *imagemagick-6.9.1.7 (05 Jul 2015)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 2148cc34e82d..082f10ba6a55 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX imagemagick-6.9.1.7-cflags.patch 1513 SHA256 4dc594c98dfcee9424c53c06c31219415d67af3eee08b86d92382264fe68ceed SHA512 ef5293e33d2767aa408d779a1f08b660fd8d854fb611ad73de1ea1e47443f918bedcedb9778642a0ad4083cd687e8d963eb23aa6897d42101af9568fad414f3c WHIRLPOOL e77cdcf76d715d0a1441497711cd774a39e4f23664fa54b73954aff40f255a37b82b13186bdaa0a5a06b4ce7ae6e66b5c1f9952c10a2d82805a21b00a42ccd99
 DIST ImageMagick-6.9.0-3.tar.xz 7898568 SHA256 f00452ba2c05c2df9624c62d7adb49ecf17140edd6e5f355cceca051dab1fb38 SHA512 0ff1ac91fa4330544cf6ba9ac8bfd48fce5a0a702b4578e1dcd23989c52c2287e1d6291c231591457a87652a59d908bade148e4e94676a887293671dfec99a4c WHIRLPOOL 0ca86ecb04a18aee95aa2990b73f0f87a7c800b028c45c6af5a906bc0b2f9a380b2ac52bf825cfda8396b4c8dc9b1768be7b46000b9bee9b6f4aaa1bf7d7dea8
 DIST ImageMagick-6.9.1-4.tar.xz 7978216 SHA256 74973478058069ce44040ff76b61df713d70adcadfd207836cc0622cadf1e4bf SHA512 b3c8cc0882d3941053dd7052048f6839c268a2969637ba39067422dca9a2b0f442303d5ec647c6f1372723da5b59c30ee014902ad338d2157b75b8741526c698 WHIRLPOOL 0b3473bcfa43ae4fca0c084ea5bdff8c533e138f58ba782d79dd22d46e55a82b4cd8565fe0be5928a148eb969507e7d4b05764a8db08d8f5e862f00952772792
 DIST ImageMagick-6.9.1-7.tar.xz 8284892 SHA256 b610e5261c01664e19c91e513e21b3c2d76d583b497ee3c7cf2f20876d742328 SHA512 6eeef09b0e0297347e95c25c94305439e32e3e95a6f1c2e476a84911e8ca036c52634693a63cd28832c5dd0df14ca0c3ff41bad577f07bfe86c4085576350434 WHIRLPOOL 1751ac644916389292c306998df1c1d635d8acbaac23666a18b216b1b9867be39e7c1300a0f5d465ea3f3990af2dfac77efd8f23efca3f6f18e0beca439ceee5
 EBUILD imagemagick-6.9.0.3.ebuild 5143 SHA256 1fb20671ee6d05d11b90dd25642b14ad3b40a7377e55ea2e0aba63318c1f2693 SHA512 5df7ff759bd6b17290205787d48c39a9ff56cb4dff65d8cff6deb98b882ab5703fcde28075ef5ade61e17245aff217b2cd4f89ca46e7af9d5e839903936b31a3 WHIRLPOOL 0d373cdaf1e71aa7df1c622eb3ef9e13ab13c4d4354e63c89d8925fdff2122d89b92e966f1d10379a4171c292f840ae69580c1740b0304387ab0fb3c6b287d80
 EBUILD imagemagick-6.9.1.4.ebuild 5153 SHA256 6047b21bffd70ec66da9a19000413e6637cadc2c9e515aa58830c2ad0cec976f SHA512 533c77a0aa13417070bf09514c7933ab8c88177ee348e33c25b72d261a49a8b26e722c61dd9238ed49023e0dc1e5ae167cae7c5bcdf8af5adf02c02cc8543d65 WHIRLPOOL 7a5a99834f0b48887aeffade35fa4de810e67edbf3855598f927c3b0ccdd83d12c8ec66f4d5bc84a1921814f02f36bfb0a508efddbb1401392153707523f2a36
-EBUILD imagemagick-6.9.1.7.ebuild 5132 SHA256 e10316b52b5bcb547880271a94987600d7f37b37a5d5c3dd0d9fb11d0cfd8ad8 SHA512 a8a6ce246a143bb847bffd7de1339d35fe170f5257864c9b666e0e1d60c31648871a534f7d2df5935c10502f71f5d06fe2d7bc71f2500d74589f065b38cce4a0 WHIRLPOOL c0e1953a71acbbb789f6b3b83b3a639a7e788832914c73d47221ec1a25d78bccb33281def87e2d10b12c6fcb940978f9b8b904f900ba2ca4f56a7f6dbb054c09
-MISC ChangeLog 87366 SHA256 614a198b9b42336c5d4b5c60fa8e200a0f820dfa8e1f11ab7ff65e515a9fd1bf SHA512 f8e3d663e2095bebc7d1b4bf2b70f29187dc21118a31c4ddf55032b2c571ffcec6b9746bd1d5ad1e42b86b8d8e58f54eb6686d4980186638fd18287075a46bd8 WHIRLPOOL 4d55cb9945f1d288a73fd9c39ae19d02bebd44b97dc9827b3812e4ce006d0ce9ebf9fa61492b49022b0a93439323a41135397b0133bcf25a74feddd95f40ecf0
+EBUILD imagemagick-6.9.1.7.ebuild 5182 SHA256 bb2aa53425ad9417f2c350f69ace53857b97c2da60e40295ebe010eaf3b3c464 SHA512 04b5d26734b89c426454d8aa419c5c53fd86b4a01a16fee8c54a63f03708aaef2791b001134cb4d683001efd312e679fc270ef3b69159913be50365362eb5ad5 WHIRLPOOL 046573f610f045dfea24cc0495b27cf9ab4ca59911949a1389377897deb0fca17a31bc9e84e8af647748f7be32c88d586d641b2d7e9c70ba82ae8cbeff0e9872
+MISC ChangeLog 87519 SHA256 1fbaaeeb4ad472dd0d124b632079bee7cb484a3fc26f064a67c65febda51d909 SHA512 3f2d23bb6f236ce4b70f4cac4623506712ed467aa16b4b3a175046ec9d310309551d0f4f6983bf46293d91baec6f6ad7a593d049dd6d54c11c229ce8010f455e WHIRLPOOL 84300b00972544c2f3d516e2a8d6bb2213d4b78fdbd0f90472b3c15477e0f012de10a886d2c124ab3823aae63085dc201597c7f28f4c43402650eb73f26b5457
 MISC metadata.xml 1049 SHA256 aa6c00be430056ff297b25bbb9ee0c64baa60d7d039e860e01b4cd7148f65fb5 SHA512 97a8a8ebdb3366cd81036185ac2e81ab5df22bb5dfd8f106c1361276e91c9069ae6dafee74b3fe08e6afc5ce5e65c8b10fe431f4294dd4fb3e32d66e0d2c8f44 WHIRLPOOL e45a43998a456485e1e236737b60ca25ed28f01848d771b4eaff586dc594c85838e7d5155b875dbf31766f2927fc6f9d651e8ccb91ac8cb3c522d4a388b44beb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVmKw4AAoJEEqz6FtPBkyjIcgH/jOPcQUbk/IQkT6bGGm+XaHC
-O34uUaxiE+sxuoL6G1yW+HaPOWZ7xJ9yDcnV9BXGt1rjzzpIILKIXTls2ilOIc/f
-4vV/GRy9b+m1NMNJSpGt9RQfe/HQSR9KYB7FqmwFHhjx9VZwCehRr1BWMZXCNuJk
-h5rNlRWGMC+ZdgdbP4EDwypbARXx4Ejfv3/5unSvp4ZdKb+tF0bJDwAJEYKa2s1R
-XzmfJkjlVu/1+Jz3NNq7Y7g77Brf1JmJgnzTb517r6cnvB7r1MABUQR623tFnWCf
-PYLvFvYKUKsP0EX9EXvPknQV4Lef1Ex8B6YLhIWHH0T2T20yqzltF8xK2iLQ6zY=
-=wwo2
+iQEcBAEBCAAGBQJVnH9vAAoJEEqz6FtPBkyjP5kH/0ISnAlEpOG4+ZAwDQH9GKuc
+OEw7KHnzrPIciTA4pfxPN2jA31CS62WWicIs6OUC3XbjQHNrvMqOqqYDlK7Jrw0f
+5JBmSMNRuyzAPkIHsjX69sd6chw4mPULlE4b/+dtY4ZsRUEuPVs6Mtvd1UOR8T7j
+0sKUic6qDaIdNtovT8OLg6Vrhq0gmXcOwlNCTLoAnG5nXNqTQAEbRXk03dn9ZdyS
+kMb8wPlEct8kO+RMYKXV+UK3cRsuvNgDxId4q+K4MgHElN4/tnnvM/X61mcvlPaw
+xlm3OYNUiAMfF+P4JZzhzeuy08pdIdURw/Hu6GR/wiZBdwlt+nOAbvuLBZqpYeo=
+=GW9W
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/files/imagemagick-6.9.1.7-cflags.patch b/media-gfx/imagemagick/files/imagemagick-6.9.1.7-cflags.patch
new file mode 100644
index 000000000000..53609c0a61d8
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.9.1.7-cflags.patch
@@ -0,0 +1,68 @@
+https://github.com/ImageMagick/ImageMagick/issues/15
+
+--- ImageMagick-6.9.1-7/configure
++++ ImageMagick-6.9.1-7/configure
+@@ -35563,30 +35563,6 @@
+ fi
+ 
+ 
+-#
+-# Sanitize output variables (asthetic).
+-#
+-for variable in CFLAGS CPPFLAGS CXXFLAGS LDFLAGS PCFLAGS X_CFLAGS; do
+-  sanitize=''
+-  eval value=$`echo $variable`
+-  for component in $value
+-  do
+-    unique=yes
+-    for test_component in $sanitize
+-    do
+-      if test $component = $test_component; then
+-        unique=no
+-        break
+-      fi
+-    done
+-    if test $unique = yes; then
+-      sanitize="$sanitize $component"
+-    fi
+-  done
+-  sanitize=`echo $sanitize | sed -e 's/^ *//g'`
+-  eval ${variable}=\${sanitize}
+-done
+-
+ # Pass only user-provided LIBS as "global" libraries
+ LIBS=$USER_LIBS
+ 
+--- ImageMagick-6.9.1-7/configure.ac
++++ ImageMagick-6.9.1-7/configure.ac
+@@ -3706,30 +3706,6 @@
+ fi
+ AC_SUBST(MAGICK_DEP_LIBS)
+ 
+-#
+-# Sanitize output variables (asthetic).
+-#
+-for variable in CFLAGS CPPFLAGS CXXFLAGS LDFLAGS PCFLAGS X_CFLAGS; do
+-  sanitize=''
+-  eval value=$`echo $variable`
+-  for component in $value
+-  do
+-    unique=yes
+-    for test_component in $sanitize
+-    do
+-      if test $component = $test_component; then
+-        unique=no
+-        break
+-      fi
+-    done
+-    if test $unique = yes; then
+-      sanitize="$sanitize $component"
+-    fi
+-  done
+-  sanitize=`echo $sanitize | sed -e 's/^ *//g'`
+-  eval ${variable}=\${sanitize}
+-done
+-
+ # Pass only user-provided LIBS as "global" libraries
+ LIBS=$USER_LIBS
+ 
diff --git a/media-gfx/imagemagick/imagemagick-6.9.1.7.ebuild b/media-gfx/imagemagick/imagemagick-6.9.1.7.ebuild
index 3898e4c3eef3..036e6b774bca 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.1.7.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.1.7.ebuild
@@ -1,6 +1,6 @@
 # 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.1.7.ebuild,v 1.1 2015/07/05 04:01:57 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.9.1.7.ebuild,v 1.2 2015/07/08 01:39:55 radhermit Exp $
 
 EAPI=5
 
@@ -70,6 +70,8 @@ REQUIRED_USE="corefonts? ( truetype )
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.9.1.7-cflags.patch
+
 	epatch_user
 
 	elibtoolize # for Darwin modules