Fix building on HPPA (bug #438608).

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 25 insertions, 18 deletions

diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index fbdecccf835b..ff9c82beb9ad 100644
--- a/media-gfx/graphicsmagick/ChangeLog
+++ b/media-gfx/graphicsmagick/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/graphicsmagick
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.112 2013/07/21 13:06:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.113 2013/07/21 14:21:55 jer Exp $
+
+  21 Jul 2013; Jeroen Roovers <jer@gentoo.org> graphicsmagick-1.3.18.ebuild,
+  +files/graphicsmagick-1.3.18-powerpc.patch:
+  Fix building on HPPA (bug #438608).
 
   21 Jul 2013; Agostino Sarubbo <ago@gentoo.org> graphicsmagick-1.3.18.ebuild:
   Stable for amd64, wrt bug #477606
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 0890ce8aec31..104fdc3cfede 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,31 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX graphicsmagick-1.3.16-libpng14.patch 2540 SHA256 1c0db66018035a13fbfa2d61d3a71534350e52809e67888f07113663b82bf4c6 SHA512 aab31f92a3b41b60e42afd8d222c16a64d1a602e66b8f61efbadddc09a95aa32d9a5a20f535c784ffd58978da7b5f9580c85ee061e49b043e9dff8fb7a015379 WHIRLPOOL ce849fe5293714ea227c9620165431df97b7a3c51a94f8259617ccbddafa6dfb5268f30416258abaff1a5cd54b27aaf01c2b57b0d816c660d2aaab16946387fc
 AUX graphicsmagick-1.3.17-freetype.patch 1152 SHA256 be7a5b150c1962f843ffeec17fb623e2a8a8a340697f9c5b627280cbe1a3a885 SHA512 771fe683c0f672d5ee559abd796b8b29a24969717c43ee859675bcbd1e8bd9a1755236cc1862b43c61a4708e27c853b2dc91db64bf6e4e276aaa669ad4180b88 WHIRLPOOL 4c150994bae88f924e739cb33522d6c22428204a49540eff28636eb59d230beac1b50fe6f826c4ba45031d176b817e8d26ce51f32ef8a6f8464957f48e7e9a4a
 AUX graphicsmagick-1.3.18-freetype.patch 1164 SHA256 e30c296bd5810c31d89b8aee4d44e09bc47fa29dc6857fde073378516ba198c6 SHA512 16fd2817cf54f0b5ce4298eaef04f932c29c8643f6cd5d3e86dc1b07389c0b354fbac36798c76b71f5a059ba51ec3bff87ec68c1b0d17626fc6f9fcb25d48862 WHIRLPOOL 962e86ffc9658f81f5322e8f6bcb4b14cee6cfac46e66a351a36847ac201bda3ad3b4a50a816c6d14f572ca13d3aa7cec9f134a4ec91a9f0240f36672345f52f
+AUX graphicsmagick-1.3.18-powerpc.patch 343 SHA256 7e53424b9e2d7705bb00e1790a30cac85f643ed6043a89776cb54cc5405f0d82 SHA512 c1ed31538a7e19ef31fadd547cf77628fc89e354815e08c0934c14c3e5d1d0e228e8bba762f55463497490d9d621a01fb35be0b6fcc20287a4fdbb3e6764d9aa WHIRLPOOL c987dbd76effbd92bdac9ca9af2c8c3af57a5158e4e58aa61def4412ea72e1019ac5b8534f59e21b0dd5ac572b1f81226c2ceabbd240bc449335c9e91ff10432
 DIST GraphicsMagick-1.3.16.tar.xz 5550004 SHA256 df8ca4d79c0071662cdf125d08581a2c55910f9c5c3e2b885dd05271559dd4b0 SHA512 24f94cbfa5e92897973a51ce5ee231733483ab04b271432999a2485a2e4355c5b3bcd8017dbfd1fcdd3e4798750caba28e8e67cf533f367ac3f5f03867f620bc WHIRLPOOL 49b33ce9ffb438bd4a1445973e8f7a7724c1d6588dd6adefbe68a7ca4ed8c500e3a44695e0bc0a2744c8cb2ee714cb5aa5f0b6d2d90da1d252c2536dc39879be
 DIST GraphicsMagick-1.3.17.tar.xz 5403300 SHA256 25a80cb86ff9ba3d11972120be3f6c70c6c12168d2ef95c6f30899db3d74cc36 SHA512 8de9f886b9dd48e0337d00dddc42d954dd851d4c1a924c0a81ac98f569c3f047f438b71a5c8ebbd9bd8effd6b12911fbeeb0bc8d7c3c562c94c8919ca01a97bf WHIRLPOOL 718718f5c788c614450a68881ffbd506b5be0478b8d166075a635e9814c920012ceef96ccb5513559d0eb0a4564cf6e9f46bf72884404f9b0c7b4bfb08ca8af3
 DIST GraphicsMagick-1.3.18.tar.xz 5124436 SHA256 fd48eebe200793e6f62a2b7d96413c94a8967ab56295605513898e2c8524b0ab SHA512 c04dbca467d2ac94d9c47818c7087954ceb54a736fdd062be6d499319037f4bbca3a779542d8acad262b59cb599521f895177574a21975f496ba57061b64b960 WHIRLPOOL d3b396d1cf3691f4aec1387066a55e4105e220cba22ef690234cb8724e955cc5dd4e39c269fddf610d61249850499facaaa54d2150660ed8f5126554a27c11dc
 EBUILD graphicsmagick-1.3.16-r1.ebuild 3169 SHA256 9771f7ae8bf48dc18ba5ccd8080ec9316e89fb499461a060709f86b8a20530c0 SHA512 b2ab63f287bcdf4f4a4b41c807658ebac68cd7c133d0009c5fd6e0864646191d1df77505c75a660cc7ccd39b2944825305957d15a696bd0ee72a9b2c5ba86994 WHIRLPOOL 6758a2a6da77060e714e1b1edc87f91bdc4844eed8ad93a5618ecea23fe162d5ba27b33814a1e4cb271033dfde25882f0129be98cd8a872e9171c5c2ba8c545d
 EBUILD graphicsmagick-1.3.17.ebuild 3116 SHA256 b9ca412e1dcbb149394c9a250e2c72dbd99f1af5f1c2973bf4641727bb904ba6 SHA512 c6e171fd0ef825e9d220beb168a5a087aa1a038787b1a12a4d1d57a597f38e617fc8d9586d957f26e445d091d7f15befdbd4c6f82b2827f451f801e7837ec0e4 WHIRLPOOL 5e6df5d1d74f1b5c692b6b5c0b8c984050f8f72b19ff5279c7f8901cf9b682902acb8fa5ff9661afb0e643121b5663b8a6ab97e4d35531dec6f6310648c186a6
-EBUILD graphicsmagick-1.3.18.ebuild 3065 SHA256 10a4367e696eb10889f49f974a7eae8e9976cdec03190db780ee35cc744a9d00 SHA512 3d913db7e32ce3808778bef6360d97c0f6391136f5f2517f6ab6c835ae73083a42f414b2944dc53d1d0700133500c48a8e40d048d4f839e145d612084697b8a5 WHIRLPOOL bcf123a75eb502008858f0af8878b7afe88a085fdeb13617e1f9e625d9f8d40731b418ca793e14b86a118bfe13bdc07b311f91457a4fa99222465ab1f9acf618
-MISC ChangeLog 12435 SHA256 5975efbe450673b5fedc91162cf96368797d9d61c802bc36d5e392b1b6b3ace8 SHA512 4cd1ef12bfd0230376e068f2b9cb1cde97cdd6b604e389a7a6a9693c782367cb9469495a835f983977fd8d09d9d662148bc9085eebf958ee708f67ff926cc933 WHIRLPOOL 4caf8e9d2face9f1cfd58802280e1d284f04d63bc97dba5261a277dbeb26b83c6ea39711a173ccedce5ac771e8e7fcbd3c07f88eeeb29c19474e74323e0c72d2
+EBUILD graphicsmagick-1.3.18.ebuild 3114 SHA256 6db1bbf082f2789dde88b2dec95b5fc9bcd6c9526ecaa8bc97c771a45de1606a SHA512 e3afc1ee52a5cbc53031842aa69b8f2710ce8a07feff6e55c52b05f3dc58b3de8d0121031c4ae05feee2936117d9d12649f6d4b277fee78386a48e45cb2e170d WHIRLPOOL 73b644ffc91098201960e7c809858102f6ee988046140bf5e83b388928ddba16b7bdae6ef64c9608a3e8dc27d1a6a34181f1995f629d16f0024797a86c4bddaa
+MISC ChangeLog 12597 SHA256 c51d20008a04c60a59de480509a67367e68913fd3467445653e3e074de952a5a SHA512 f73c110612d745cf828e0dcb72b042e32531cd085ae3a8cee7f98236ed7d49a6408dd5326137a93e6f5f599dad13f9ff54d48007a60abac52b3146b1672426a2 WHIRLPOOL 269ba3ca0354abbc6d4a82994163bbebfd78cf14d74c0be80c626bcf93de00fbf9add4926dc38f8f8a2b413950618251cd14dc80b58038857dfe8e647658a54f
 MISC metadata.xml 948 SHA256 885686871e4c7d112c5fcbbe0a9056a286c5714985643844bb3a078175085ac6 SHA512 bd1485172b469c218f688d3352c5a00f16f651a3aedbc1db786aa524b6e7c1c237cce556a17d223c29ccff870601691ae7a0f54d01005c3541a3c67526ae65ee WHIRLPOOL 7f33793cca1f96fb4d65c8d1da2ea14901ed6614ff99655bad14e71963ecd0f3fdb6c216e8df301a6e462d04e3461031f0874e58b2b94d9271f659df902285dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR69zFAAoJELp701BxlEWfz4cQAMNs4nWCnPe9N/GzGNu1ObjO
-33zYwlSJuLk5fa6OuRyXaHMQZLjuS7IQQk8OfuOYyVa7zxl8EcoRByA10rGWxx6Y
-Ri7sI9hkOrK1HoRzCMs3w624Qef4fjmaeWCbNL9t7obHOVdJTccdaDxORPrv7D4G
-0ktXxWYSHWW8CpqkHznIsjKlLtn9AJ+kz/s3D33mzneI1wofF7SbvrHsv5cY3jrV
-NvD9s+cgtKYUM7nN4mzzPMCEBfBmkQn0WYN+Tw1BupssUtJfkc1R+a1KxeBDT04O
-0MKIuT0G9TDELMEkcuuIBReGWiK/YmpI5bv4cjP1qk870tw8wKVIn7wRQC/vMW0B
-4/9b7quNLv6Gh/QWKlrTqnoCgGYp352PcPLzja44rj/0mGsxZP5p1GzX9JO4qrTY
-CwY2EwgoRKaM9YfeG3NJl+aD5eZkzaRNlgKezAWJn3Cpa1i4/mwCXb5wQ/h3w5cZ
-0HI7ZiPqXCWfBODOkLxokb9UNxR0vS3WePKl27WnA95DcDfAHsKeBrv8yc3bK9vG
-dONjVrKuj+wDoc/d9YWJ2y5t4Pyjxrd71mA289V5/YAsTPdppabaRKgmK1tdfdYC
-969ILVdRbix8tsr8gbXLQ8iOGD6H5NlkG/SNS5Uphno6FH3v4h7q+ey2sn7kqTMz
-otHMyLpA9DDp4+YTIuCV
-=IPxJ
+iEYEAREIAAYFAlHr7oQACgkQVWmRsqeSphNzUgCdGTLAORA+TddxM3or8LCmcqQ6
+vB0Anj3U5CkWvQr9scNS+VtZQUc6DA53
+=n3xG
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-powerpc.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-powerpc.patch
new file mode 100644
index 000000000000..30a67fdc3e2d
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-powerpc.patch
@@ -0,0 +1,11 @@
+--- a/magick/studio.h
++++ b/magick/studio.h
+@@ -51,7 +51,7 @@
+   threads.  Most CPUs have cache lines of 32 or 64 bytes.  IBM Power CPUs have
+   cache lines of 128 bytes.
+ */
+-#if defined(MAGICK_TARGET_CPU) && (MAGICK_TARGET_CPU == powerpc)
++#ifdef __powerpc__
+ #  define MAGICK_CACHE_LINE_SIZE 128
+ #else
+ #  define MAGICK_CACHE_LINE_SIZE 64
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.18.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.18.ebuild
index e7617068d21a..27e0c1783585 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.18.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.18.ebuild,v 1.3 2013/07/21 13:06:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.18.ebuild,v 1.4 2013/07/21 14:21:55 jer Exp $
 
 EAPI=5
 inherit toolchain-funcs eutils
@@ -46,6 +46,7 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.3.18-freetype.patch
+	epatch "${FILESDIR}"/${PN}-1.3.18-powerpc.patch
 }
 
 src_configure() {