From 022d44a2ca0889aa5b3bb1c57ca4a9e624a15b1c Mon Sep 17 00:00:00 2001
From: Christoph Junghans <ottxor@gentoo.org>
Date: Tue, 5 Aug 2014 14:36:54 +0000
Subject: added prefix support (bug #518970)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586
---
 media-libs/gd/ChangeLog           |  5 ++++-
 media-libs/gd/Manifest            | 24 +++++++++---------------
 media-libs/gd/gd-2.0.35-r4.ebuild |  7 +++++--
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'media-libs/gd')

diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog
index f4b236016e7c..39f0e91c8727 100644
--- a/media-libs/gd/ChangeLog
+++ b/media-libs/gd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/gd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.95 2014/07/28 13:45:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.96 2014/08/05 14:36:46 ottxor Exp $
+
+  05 Aug 2014; Christoph Junghans <ottxor@gentoo.org> gd-2.0.35-r4.ebuild:
+  added prefix support (bug #518970)
 
   28 Jul 2014; Agostino Sarubbo <ago@gentoo.org> gd-2.0.35-r4.ebuild:
   Stable for ppc, wrt bug #512012
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 3e9c4695e7fa..5789df2c01be 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -7,23 +7,17 @@ AUX gd-2.0.35-libpng14.patch 347 SHA256 b9f5e121ae652e211c866e1982bc6c37303d43b2
 AUX gd-2.0.35-maxcolors.patch 348 SHA256 c5dbbc7c1acd9e602fea8bf893333ca6258e7801761b6c899c7da62cd88cbc3b SHA512 c6474c9b2c3ad80d1a0fc8a345c4dbe86c51a73db3534c690a5d5e255ac6f20b474537f4f84aa8f083fc475a57b4bf0916f2d3120e94066f7729113355ee6aad WHIRLPOOL cd110bcca79501834890d80e19623f8e40dc2ed9fd49aac7109a30cbc9a966347c40502decb922b737acaf5c16a83c64f29e2215498596a419998bb5e6afd8f7
 DIST gd-2.0.35.tar.bz2 1212730 SHA256 bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9 SHA512 eef8150adc040bed920155337211864a41ae3c4532e852ad443a3a3b9ffdc7fd3130698041b7b19b0b1207e78a80c263c6da26eba7208cdeeff78283c7d0d281 WHIRLPOOL 9eca23a184106652ef5c19ee3b5c18e23d742e21103c66907bf829910b95aa92eea7620c5579bf493c14730bc0327a4d662ffaf9bf9a5538127b8c10cc9c6b84
 EBUILD gd-2.0.35-r3.ebuild 2178 SHA256 ed123dac454522595faf717457793cab4b5ded7fb461612c0833863bef2313c9 SHA512 179fcb75f4d62e3b6fa025d5ed660698bf677628cd6f14b28a9626f3f79bb3afb18ac60765e46e8a07cc9c149d7c63583ada89bc14bc7cf0b4ef109262614432 WHIRLPOOL 0d419bf2fdd0e00a38d95079eeda90f4300a59f21cfaa2efa766d56a1545acbf81838937d7aabd520108bbf9e5db57f0e28330d3d903372bafad1a73b52a7e1d
-EBUILD gd-2.0.35-r4.ebuild 2466 SHA256 0a4a1eb10806a40be120b7f12a0d5200e04c489f235800c6e5aaad7697c40c2a SHA512 26ece9b988e592150483191a145529cc29c73ed8141a14f14a51ef14b09a5b5f725be2d4d0c2990052d0e7386af262cd9b5b1abc3cea71a5e00ef57dc49ba069 WHIRLPOOL eb48c1c58b938021b2a8ca58676f7108d9faf27ae996f63d2716d6d89a1c56f45c3f28c9a35758fd768a7c2c1800945ccdf58a669ab7eb3b2a1e76b4411eeec6
-MISC ChangeLog 18014 SHA256 778065d531a326ec2e7b7ac4cd535f93c38e62ea2aebadb8fadc8b57a26c5b26 SHA512 1b455d74b7045495c00bed6e25ea34dc577203e001eae30d9175c605585b5f29b1fd39c4b622cb138bbb1f0b2326754ba78a779903417925ef6ebff93fc8a172 WHIRLPOOL 3b0c2754803db9ad164bec1294e8ca366a9b55dd419a841775a64882e244fc3ad720edb267d56de2724b572674ddc523eea8cfa6984b48c0c54f052c982ce59b
+EBUILD gd-2.0.35-r4.ebuild 2702 SHA256 31b199a4e02f7227ad2053b4d86aa619adc70bceb3185e24f2055dfd6410e3a5 SHA512 e5d0e6d9f7658f7d23eb303f1c7b026def19dc417298a62fe655ddbee1f937f8a0b4976f3a71218f718c1b48afd49365e8c7e848e4f253ab89f346433825d969 WHIRLPOOL f4caff32aaed718bbdfe24180c12c9a2826b963fc3f5bf9291123e4db2223915c932b71077213cb45f16ece6bdeeff07350d6d73e5c012cf5318d66c9886bc55
+MISC ChangeLog 18130 SHA256 d4aecfb5a6d03dacf8946757111d503e1634045ff1db025f574b145bd6ca1fbf SHA512 c3a63cacd698f8486197bfe989fafa99586e30c41957117540ff2f1c92897a82d30745392dc00c51b1648f4b5f05c6cf886733b7723b2f7f1aa2ef44456fd0d1 WHIRLPOOL 48ef231f67355f09d95b95de1c29b01a27944345abb09d4df2c90347886cc957dfead913c285f2733f865e358eeb1e98bbdce287a0d4ce95b87ab7577d818a65
 MISC metadata.xml 1199 SHA256 a670f3b0950512e392f25f290fc70b953c941cecdc6919cb38048bef2d46c843 SHA512 0bc04bdefee2699a644ed91982fd68553ee9d57af8df531bd98793ae75a1caa7b696d3d2e5a9cd7f452933b9575ce4810ac8c1d2d9f0edba016a52c5ecaec3ee WHIRLPOOL 1ce9a8afa6a5ec1576753225d7a752c4532f1f3678994c1def34ecd4f0fe866b97111258680a4839ce3a84ae65fce5077192bad8b9d2adb942f89635a3bf491e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT1lPqAAoJELp701BxlEWf4MIP/A0oKsR/lxDMHrQ6IEF0VPCf
-z8c4O7+Fmn/VehKZdgBTqXm/qVG4UPyxkpgw5UQWo3ByJaP+PORWZF+bougUU8NX
-UjHfhhGoDChb9QafSaNBUEAGyZIMK/7GtCf/AJNEKDE0G0hth3JwIC+x+HFtGozX
-UOBNmZVwCx+bFX0ZoKIbbqM0D2/AX+SaY1sUoIrF+U6kE0sSqC2W54Zv5GdPV5Di
-2ynb+rNMKGVxxrWNOu61AUTa2oHFwJuOhhfe8vhMpm9m9waPliccT55FhuqAJJzq
-QKRP+1KT7s+mZnN2GjfnTXncOtKzVQwkVeS6VoYgEPI4yeNIjSW360XrMo8iu7VI
-UoebRqWy7FFSHi5IqTYz0/OKaZ+FBQYyUuWatyqtFNigekUXfSwsS7VC4weRYX16
-ws0SmsKVdCvgCKq1vC1ycGugEq31yVXjgpUREifwoNJc8oDWNKdJSXEdlUTG0onh
-I5PJRax+Hp8jvwUQNBh5GG/I2tolbsM8/MfNP7Szn4Hjziirkk73Aez4sMaE2hUn
-6Z8nqBQD1CaGxhC9Bw2/BWSO53oAVs0RjtK/5IzvxFhnXyiyJQ1JuxFlDTUrr2lc
-fJwznU+iX1H+jgOFUhFqp8gGO/HlwP0gW0p1oFqWEbq+478PyJ8cmqlfbiGjk5k3
-DlzoIsgNZkIEOYT0vfU8
-=zoWs
+iQEcBAEBCAAGBQJT4Ov/AAoJEOeBhlrCAAWGVZAH/3mkiwfbnLhHcAUp66Qyk1v0
+ITfZCVjVragoYFIyodee6B0eHQeSFJ3nZMINMGX8EnYKIcAce5hmRVy1GIjLVmHU
+u0Qa6Vevbts/Lpk4YxdigR182dRU500FrG3vvcOvTXWCwKQ2Fwr/IHyXx0OHG3m5
+519zae9i1uIUWSfJ+FVh5aI8PjUNxSRhMJLAzt9wEDCUNrCkxDOLvI7UlPbsxJ+V
+uPYP6oiSnphRRednAzF9mk21TB5alJoizvAFFud/pHJEWToMIVfMlA3MRIDWMFX8
+d1AZMT28O7vLIoFaXNEIDM6I7PAmaApdpxQ2t94rumkCxV3yKDNvzK9ACaOY2zQ=
+=EduH
 -----END PGP SIGNATURE-----
diff --git a/media-libs/gd/gd-2.0.35-r4.ebuild b/media-libs/gd/gd-2.0.35-r4.ebuild
index d57e80d4c142..7c7266285eaf 100644
--- a/media-libs/gd/gd-2.0.35-r4.ebuild
+++ b/media-libs/gd/gd-2.0.35-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild,v 1.7 2014/07/28 13:45:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild,v 1.8 2014/08/05 14:36:46 ottxor Exp $
 
 EAPI="5"
 
@@ -12,9 +12,12 @@ SRC_URI="http://libgd.org/releases/${P}.tar.bz2"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontconfig jpeg png static-libs truetype xpm zlib"
 
+#fontconfig has prefixed font paths, details see bug #518970
+REQUIRED_USE="prefix? ( fontconfig )"
+
 RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
 	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
-- 
cgit v1.2.3-65-gdbad