Try libpng14-config and -lpng14 before falling back to libpng-config and -lpng. This...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog
index caded3be24c5241cf9732900bc3b11a32a42c88a..8d04f7fdebbcd1f45efbbe3d5fa2d4753e6524c0 100644 (file)
--- a/media-libs/gd/ChangeLog
+++ b/media-libs/gd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/gd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.62 2010/03/08 09:42:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.63 2010/05/20 17:32:11 ssuominen Exp $
+
+  20 May 2010; Samuli Suominen <ssuominen@gentoo.org> gd-2.0.35-r1.ebuild:
+  Try libpng14-config and -lpng14 before falling back to libpng-config and
+  -lpng. This is working around issues in "prefix" picking up
+  libpng12-config from host over libpng-config from "prefix".
 
   08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> gd-2.0.35-r1.ebuild,
   +files/gd-2.0.35-libpng14.patch:

diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 82fe97b2f3f650c6e6c122a29770e1f5ddd46964..5d017a5e2e3aca57d849d23d4b6d4d1e3d85be12 100644 (file)
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,6 +1,6 @@
 AUX gd-2.0.35-libpng14.patch 331 RMD160 109e44c20a8fb776f0b524802b0e932cfc85183c SHA1 aa41ec05d7a83b3e490f255024ace59801c81d0a SHA256 8558e5638f3762e5c416645683af63e5ad86ceb9dad747fcd6543ff50427b384
 AUX gd-2.0.35-maxcolors.patch 414 RMD160 6a6cefb35a49d69b8739d7406a909aa67f3a9904 SHA1 14c395c21e7ece6f182603774a1d65979c9eb10a SHA256 022a650d6d2e03281b94bf6665b0084c79d75ab499b7266c7d2cf620b260a15b
 DIST gd-2.0.35.tar.bz2 1212730 RMD160 f452a2c333b2ba9b7b4c143983ec2af18a335516 SHA1 ccf34a610abff2dbf133a20c4d2a4aa94939018a SHA256 bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9
-EBUILD gd-2.0.35-r1.ebuild 1238 RMD160 f9b37159864a20d23178a2a324819fb6f811536c SHA1 3a82f57f311a76cc268c5adc275517783fa1e2f3 SHA256 30afbc7d5289a929a23247e1c5da34238b130082aa854b6744ae573037e426ae
-MISC ChangeLog 13440 RMD160 f551aa2231bd31d7c31be7d8710d4701841479a6 SHA1 f9ebe7ff1317081fa5b7e78984e26c35e234ecc8 SHA256 a0df24eae7e44917dc58fd33628b478efb7d5fd606853db08246550fd13792aa
+EBUILD gd-2.0.35-r1.ebuild 1398 RMD160 dd9905b2c425abe1790043f5c7c3db12cfb99cfb SHA1 f0dc1982ec0056684afa96338a8aa095e306afa7 SHA256 993e9d654fe25c0ed3842ba6d1cc53743771ff7d5e20b4d6662ad18c1d97581f
+MISC ChangeLog 13715 RMD160 53c10344cf5a9c8ff674892bdea4712dbf635e2d SHA1 05fea9397251b58db76196aa3b3d13378bf89a51 SHA256 a2fad10f75fb181f9058c96a1b9a90d20b5932ad92f35b64296e19b7b18770dc
 MISC metadata.xml 1199 RMD160 d34c8a08b02ececd35c66c0c3594f326639ef8a5 SHA1 e52d9e8500558488eee80333fe2e112a23a519a5 SHA256 a670f3b0950512e392f25f290fc70b953c941cecdc6919cb38048bef2d46c843

diff --git a/media-libs/gd/gd-2.0.35-r1.ebuild b/media-libs/gd/gd-2.0.35-r1.ebuild
index 71ee7679d24bd98580a853245fa049d87dec50bb..bf2bd81a75cae29748ecfe980b49c7d028f3a65c 100644 (file)
--- a/media-libs/gd/gd-2.0.35-r1.ebuild
+++ b/media-libs/gd/gd-2.0.35-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-r1.ebuild,v 1.9 2010/03/08 20:14:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild,v 1.10 2010/05/20 17:32:11 ssuominen Exp $
 
 inherit autotools
 
@@ -26,6 +26,12 @@ src_unpack() {
        epatch "${FILESDIR}"/${P}-libpng14.patch \
                "${FILESDIR}"/${P}-maxcolors.patch
 
+       # Try libpng14 first, then fallback to plain libpng
+       sed -i \
+               -e 's/libpng12-config/libpng14-config/g' \
+               -e 's/-lpng12/-lpng14/' \
+               configure.ac || die
+
        eautoconf
        find . -type f -print0 | xargs -0 touch -r configure
 }