From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 28 Feb 2015 22:27:07 +0000 (+0000)
Subject: Fix out-of-tree test builds #540376 by tka.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d05f2f9a5f3a2accaa522362fe05db6dcd96911b;p=gentoo.git

Fix out-of-tree test builds #540376 by tka.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200
---

diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog
index 50b5d7686aa0..717e372385c9 100644
--- a/media-libs/gd/ChangeLog
+++ b/media-libs/gd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/gd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.104 2015/02/16 14:38:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.105 2015/02/28 22:27:05 vapier Exp $
+
+  28 Feb 2015; Mike Frysinger <vapier@gentoo.org> +files/gd-2.1.1-headers.patch,
+  gd-2.1.1.ebuild:
+  Fix out-of-tree test builds #540376 by tka.
 
 *gd-2.1.1 (16 Feb 2015)
 
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 7ba0203a78e1..0a124f543e23 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -5,27 +5,28 @@ AUX gd-2.0.35-fontconfig.patch 606 SHA256 3c318c2b140092c69357bba69b8cf873459581
 AUX gd-2.0.35-libpng-pkg-config.patch 4240 SHA256 26c4f66f6e74de830ab5c7276502e66207f3e85ebb8f98bec9498f8fe1e9f232 SHA512 bfbaab96a5de1fccf320d2aeea11171a78dc2e54cd6fb03f2947faa75c0063d1a4a17eea31fbb19419c34f6c51b7742d2336ac08d017c0c09b435cdc013eb990 WHIRLPOOL 3632aebaae3066b7f6fd340d4b0da1ad0f308c6392ebd8f1ebee9498fb26ad075497f399c0c07c421be3d5d2ee8e8d7d7129f9787e9343511259b192affd9993
 AUX gd-2.0.35-libpng14.patch 347 SHA256 b9f5e121ae652e211c866e1982bc6c37303d43b2a3df420be7069ca5fbb04bc4 SHA512 3ef9e82c09244512b4761a2ab669ae864b822344febfe203fb121cb43b7f99a933c7d5b44aea8b2d8a638010f5280a3ed2ac9d1ea526b25ad6f3d26b2586ba3d WHIRLPOOL 96df4515905928773542c7e3f4e9c3acdccd397b4e832973f33c6d45ab135f8798e3118be04d452da31d0f42e07ae4322efd720d264076fbe81020288ee6425e
 AUX gd-2.0.35-maxcolors.patch 348 SHA256 c5dbbc7c1acd9e602fea8bf893333ca6258e7801761b6c899c7da62cd88cbc3b SHA512 c6474c9b2c3ad80d1a0fc8a345c4dbe86c51a73db3534c690a5d5e255ac6f20b474537f4f84aa8f083fc475a57b4bf0916f2d3120e94066f7729113355ee6aad WHIRLPOOL cd110bcca79501834890d80e19623f8e40dc2ed9fd49aac7109a30cbc9a966347c40502decb922b737acaf5c16a83c64f29e2215498596a419998bb5e6afd8f7
+AUX gd-2.1.1-headers.patch 806 SHA256 6d148f2322398204842b8e2b212130ab91fd3a2402e780b6de0cf5f943ccab7b SHA512 b82bdd717bf7fa2b774331b5ea376252020775132ed124bc4a58873dd3a78e250d4c22c740eff0b10483e102d1521227705a1d2fda476eb9e8388df17a30fc2e WHIRLPOOL b3a46e253b24a34298b94ae7a88fbb23da0e257a184782e20ea657c48935c4457fb302ee2a27c4527d55ec1a81d3e345947198ee8cb53cdc6629ad3a44ad8610
 DIST gd-2.0.35.tar.bz2 1212730 SHA256 bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9 SHA512 eef8150adc040bed920155337211864a41ae3c4532e852ad443a3a3b9ffdc7fd3130698041b7b19b0b1207e78a80c263c6da26eba7208cdeeff78283c7d0d281 WHIRLPOOL 9eca23a184106652ef5c19ee3b5c18e23d742e21103c66907bf829910b95aa92eea7620c5579bf493c14730bc0327a4d662ffaf9bf9a5538127b8c10cc9c6b84
 DIST libgd-2.1.1.tar.xz 2039132 SHA256 9ada1ed45594abc998ebc942cef12b032fbad672e73efc22bc9ff54f5df2b285 SHA512 48f444402a4b89e412870f9091b92eb26136c5c0d795722262ad973c7d4103476204a2de36133a2634b8f410d6bccdcf60afb829a74ac2fddfb96aff2cd2567b WHIRLPOOL a38cf1f060db35d247b54038e731484e6230cd8a9da263a8c4823aaf6b3ce455c0747bbbde60f131d85a48340e39a5c8d6273fa51366cbe2436530520211a238
 EBUILD gd-2.0.35-r3.ebuild 2178 SHA256 ed123dac454522595faf717457793cab4b5ded7fb461612c0833863bef2313c9 SHA512 179fcb75f4d62e3b6fa025d5ed660698bf677628cd6f14b28a9626f3f79bb3afb18ac60765e46e8a07cc9c149d7c63583ada89bc14bc7cf0b4ef109262614432 WHIRLPOOL 0d419bf2fdd0e00a38d95079eeda90f4300a59f21cfaa2efa766d56a1545acbf81838937d7aabd520108bbf9e5db57f0e28330d3d903372bafad1a73b52a7e1d
 EBUILD gd-2.0.35-r4.ebuild 3570 SHA256 2d004afb35d3c7b26a5dd7f23a5e8b9a25ff494531000e30b1a903ff59e94f8b SHA512 40b771ea46c64115069c84a04dfc027213230c4b97d2ed19331b1fd96efbaaae94ff2b5b16f2ffcb63c141baa60daf04cf48c3981b02e4c1f95fc944a83bc14a WHIRLPOOL d98f99188adc915b6adb251e751be80fb9d1ef7de4d2c680f83f5ee3add25b2b412a9dd46d4f2575446adc9738d0cd711259b572e183d51995c4d5fc6f284624
-EBUILD gd-2.1.1.ebuild 1881 SHA256 3d458b3d8ef7f8e71cf0019d71e14b59329fcf92fd4752981d11a8c6d3a7d7c1 SHA512 5be38821ba99ad2cf309860a35b8c2baf541a839f3f776cbda61bbc2edd05a4c7dcf7585f1d2fc1bcae7d1de776d9e7f80ebd5160acd6b154c1becc67161bef7 WHIRLPOOL f04626f344a48261495e950a96a7fa30e6106e418961ffcdbe98b95f7f74609fd6fbd5c4bee24deed5d2d362a723adf9d091fbe454d7f908afc183941ed040f4
-MISC ChangeLog 19080 SHA256 94ebbb88714739c0a63cf33fba0e89f2b0ff4f84fc2c53a7fc661fca19dc6e64 SHA512 7617055635323d946c3dfd47182ebd4c272d1657d267d8c5c2f1bd024548e8da0cd5f211c8886e3298406587e9a5a340e0f0edf06fa1922b3172fa90ad638255 WHIRLPOOL c3abebbda2e4cbad0acadc461d4efe8edc78e1719c696205b98467624d65bae885864bddea363aec4e369b1fa6ed2701df5438bd7cd51f36879cae9c1a3cc54d
+EBUILD gd-2.1.1.ebuild 1949 SHA256 eb8325fb01d4a683ac41ef2ae3064df670955115be6df571f335a9241190efc4 SHA512 a3ff81f149930cd96f3fa380832190eb3d1741cf05365cdd1b3badfc698510fbbb4d4f291f58d6ca778ded4f88b5d37d601d0c6f50013c046183dc7c0940ab4b WHIRLPOOL 1faff2a7e745a51d7d794540bc4738c8e60f90ee16efc435426977a3b3639712ece8fd8eb609cd2603d7f6e68900a7b1fb3c89c26fe13c69bb1e5d6512be479b
+MISC ChangeLog 19227 SHA256 2a9b20e620bf954da13e59108073ddff3f35d5ba79905b656e157e6a25e79929 SHA512 4fed16264b45e06c3f9cb76fc06ba619c5c9efdca2761b33c925860eef37c9ba7f2880f6717274fda75892d574cd08ae22e16e9280cc8cfc104cad861c6246bd WHIRLPOOL d52efc764292b7beea3aac818dec24cfcdc9eb0745c71f03b8d714ab218c5a6c1f8ecb44f74f435f808c20bfa5918449fd757fe25096d59d7531e1f7e63ceb08
 MISC metadata.xml 1330 SHA256 253cffa200afc7de82c73b567f70983ad127a416ae260314be3b4bb168d19778 SHA512 b2860495af33074135f7180f02be67042b511848159ab8adfa94058ec4872cc895452f92722085ae181aaf81f31f356c4415d2297f5c9159b259f66ac0a474a8 WHIRLPOOL 3925dbb379f80fdcfe64730d0bf98b8ab517f66e94f1025493bb1057fda01a80b48876a9fd7f5af3b47511c399d64438ccea8a0b74ccfe1b372edd25cee2d531
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU4gDRAAoJEPGu1DbS6WIATUkQAI56R7wTDzviYtd1UM2B9TOS
-Qu8wks7F132GZVuyN1e22lmjZq74tC2GMWS+xQo/2S467gKYRzwGv8Nz7D8xs1Qy
-28iLphoJ7mqK916ccoXBlbjmh56tJWY8cME78gxVR0kKkr3KdqnynQTaWW1gbNsX
-5FCoPzZF3e3wsaoz0H6AawL/Eg9lbo+h1ScaSfTjUmqnPV6Q2bys9O4O8r4Z1xNG
-vzhyzTs4XyrzC62gmLc/IGvJmJQQrz1/sVEe0a8+SRhehtCDfKCReqOvgGjPrWnj
-ZAWpt8R/SZ1/EihpXdTkR5Oofc4V8pz8Ds6eioKQsU5oNzWyChJEQCHtBmbXpdCu
-y2ppMM86EJ37s4lRMozW/oLzXCFjW9HTEFGQJeUZTlLD/gJY5W5MyRnZo7RWPNhb
-a5WUZh1ExclnhEZHeRgqzG0a33W8tCCAkUE2uEwTof7mO/WIz8jW3kyBiDa7EiBW
-+A7Bn8i8hgkvCNGqi39HmYZH5UR2k50WRZ49HVHX6qfS+vsbuKlfCzKwCWrnt2sq
-Ezt995pJbNYagexYtnffSHYK4V91R3X1jdLSre8OAbZ7AQfMF2Ok6FcA1RxGsRdl
-KJYuRbI8jVRkWejaM7YddDg/sV4Jzn838FQSPWuIQ/2xRVM5lptQ9kv8cOKqt4KD
-X8YEfFwAGg6A7eu+EuQ+
-=CMSz
+iQIcBAEBCAAGBQJU8kC7AAoJEPGu1DbS6WIA920QAJfAXXNOcqZA6mMFpFj84TTS
+YIiIVvj822wn4krw2Ao4b33i4azutC+inABHRwbKGutVekhv0IeIBEtl72P8ZqcW
+Gc1zJjojhXQUNXwGs5SNqmkHBs4+CFQGwLFZA7TtlPvmalJ2FMTwJEIYo9vW5jwi
+CF2o64PogCf8FboqcOjv9IIvmgwSvZWUBdC4o4i2d3oBlEXXJjQg86Eji3kO+I8q
+tqt+gO2UF/fSMEhDe5pOaRbRF2m2ETDc4nm2/hwZjLRn+LVzfzRAiw69MZIwPxXp
+B+LUXFag0ZW60jDXnSfgTVrL1kd9VOA+5OpTpZph2Ho4jMgQTZYgzeKJ/22dgVYq
+Uv116B10pYVa2Xwj4KGvrC7TMFQP2Lrq/hvXRyV78pIPviJ+JPe64elnGl/YOvKM
+q88U57xML5RHOd+ooxucM8T0i4l6nbU22k1SVypw5H6LtKSsLfEFknIwIVvFeKvL
+VtXDwWLPVNE+0qYHZfSoNjY+4WsPMgdS1LcI/Ru9Jh3xt+0qxNI98BZkcKh8SxKV
+fRk9tq9qVC/20eMrOTarMp1JeZqc5F8MDXZg+ftZgK+nPair9NEjksjeYb9+zN2n
+ery1R4alFN/ZOa2cgCDJHazG/sT64azmFMOfH3JedmbfDaOgPWufMga/bwhbekVx
+H591SJaDRcYpYYHJE6DP
+=/JUb
 -----END PGP SIGNATURE-----
diff --git a/media-libs/gd/files/gd-2.1.1-headers.patch b/media-libs/gd/files/gd-2.1.1-headers.patch
new file mode 100644
index 000000000000..089e52f8fff1
--- /dev/null
+++ b/media-libs/gd/files/gd-2.1.1-headers.patch
@@ -0,0 +1,30 @@
+From 92f5a4b113deca14e80c218e6bcd06835c3e059f Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 28 Feb 2015 17:17:52 -0500
+Subject: [PATCH] tests: fix header inclusion
+
+gdnametest uses string funcs, so pull in string.h.  It also can't pull
+in test_config.h directly as it breaks when building out of tree.  Use
+the -I paths to find it.
+
+URL: https://bugs.gentoo.org/540376
+
+diff --git a/tests/gdimagefile/gdnametest.c b/tests/gdimagefile/gdnametest.c
+index dd8f019..f2bb8a6 100644
+--- a/tests/gdimagefile/gdnametest.c
++++ b/tests/gdimagefile/gdnametest.c
+@@ -1,9 +1,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include "gd.h"
+ #include "gdtest.h"
+-#include "../test_config.h"
++#include "test_config.h"
+ 
+ #define WIDTH 60
+ #define HEIGHT 50
+-- 
+2.3.1
+
diff --git a/media-libs/gd/gd-2.1.1.ebuild b/media-libs/gd/gd-2.1.1.ebuild
index aba31835a8ef..6752014359ae 100644
--- a/media-libs/gd/gd-2.1.1.ebuild
+++ b/media-libs/gd/gd-2.1.1.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-libs/gd/gd-2.1.1.ebuild,v 1.1 2015/02/16 14:38:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.1.1.ebuild,v 1.2 2015/02/28 22:27:05 vapier Exp $
 
 EAPI="5"
 
@@ -29,6 +29,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/lib${P}"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-headers.patch" #540376
+}
+
 multilib_src_configure() {
 	# we aren't actually {en,dis}abling X here ... the configure
 	# script uses it just to add explicit -I/-L paths which we