amd64 stable wrt #387291 and force libpng >= 1.5 :0 to ensure gdlib-config is correct.

Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64

diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog
index 1407299c52b407248617d57d6027cc886472b8e3..d4efb3a41a87581d43887c27844fdd1103df3774 100644 (file)
--- a/media-libs/gd/ChangeLog
+++ b/media-libs/gd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/gd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.69 2011/10/16 13:07:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.70 2011/10/16 13:24:00 ssuominen Exp $
+
+  16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> gd-2.0.35-r3.ebuild:
+  amd64 stable wrt #387291 and force libpng >= 1.5 :0 to ensure gdlib-config is
+  correct.
 
   16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> gd-2.0.35-r3.ebuild:
   Upgrade libpng version sed.

diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 0b07e2b2e505207acb16ba39e7150146a669cbe4..a589ac306bd1c55ddd4808cf51a03e6015b43e20 100644 (file)
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -7,17 +7,17 @@ AUX gd-2.0.35-maxcolors.patch 348 RMD160 14ef5425229c5406c90beb4a8fade801cd1013b
 DIST gd-2.0.35.tar.bz2 1212730 RMD160 f452a2c333b2ba9b7b4c143983ec2af18a335516 SHA1 ccf34a610abff2dbf133a20c4d2a4aa94939018a SHA256 bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9
 EBUILD gd-2.0.35-r1.ebuild 1238 RMD160 47424c23f20db301c026d45a649793b270757722 SHA1 ca814a7bc69cc2c8804f812ae7d1386f2e08fbd0 SHA256 bba6e84fc0e5d7b2e9e287773c9397d5d0d6e00bd8ef619273e9e4a4f4077e5b
 EBUILD gd-2.0.35-r2.ebuild 1416 RMD160 3e048f308cc881702f2dea4bde0a6c5d45b96b82 SHA1 91fc8e4954cb0c3ad52cefb3c5c919331c90ea38 SHA256 832cd51c0c0cf61a2321811cc0186fc5c4d152adc970bf6c510f65597a69dd04
-EBUILD gd-2.0.35-r3.ebuild 2071 RMD160 67d71f80d7a6f1ac4a4f60d6e436fbb4a16706ec SHA1 cdf6b99c600454822103d50b022ceb16973434b4 SHA256 54230404cc6f87064004e2d78b6487c18e89b00de627b108a87e33611142313a
-MISC ChangeLog 14727 RMD160 cc8613eb08f3659bdc8a01673c4524acefad2128 SHA1 4ac8bbea0785546532bdb2d57eec81bd482dfaf1 SHA256 cb0134fe7d7f7f2e48cb82a418354bcec2bd5de588a4567976ff2c9be40c8fa0
+EBUILD gd-2.0.35-r3.ebuild 2072 RMD160 c85b8e403717dc381347e49aab43fd98a5c8f25f SHA1 e19bb3769379f137503c845d6894d2d241d495b3 SHA256 024a197bb8583d92dbbfd3768f477b11e427d6c1db1bd4ea7f564de120f7b8b1
+MISC ChangeLog 14894 RMD160 859c0db2a5b84aad5ff3e5a6474e0346c9479bb7 SHA1 05534f239eb3bca56ab5036b43298c2567ebb448 SHA256 75bf4f4bcafd1e94e0d5b888c5e3055cc7312757de591068c9f50aece7449b60
 MISC metadata.xml 1199 RMD160 d34c8a08b02ececd35c66c0c3594f326639ef8a5 SHA1 e52d9e8500558488eee80333fe2e112a23a519a5 SHA256 a670f3b0950512e392f25f290fc70b953c941cecdc6919cb38048bef2d46c843
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOmtbtAAoJEEdUh39IaPFNWzwH/3wFUAv1waBaB+HTDL4OPAR0
-JodkLbz2N5ox1JujjqJPdKShXrfUv0YM5P7Jxp0cbU3ZPW6aJJ++WcpI355SZUjc
-+3rHOmN2dx93UdQDs1F6ppLadb6XsbTJTvITo8Ad97lOSAPKn64o8GcW+S7XB6Er
-Qsyemyc6qmRkz7LQp/H3EWPnIfhZv9wSRy/Mun51KaCs/KGMAyj81nD7SOcsFZxG
-QdLZuaD1+glO/rXzn609AJcsu0+f67ApiOa0CZBg9PPL53pZP7Dd54xYCwsQR4z6
-3sFBn73v6Ou1apA6lqrLjrMUOHgVN6uulIi4+kZFNNzzIB6HFhd7Vrstypb5i1Y=
-=5pRw
+iQEcBAEBAgAGBQJOmtrmAAoJEEdUh39IaPFNWkAIAKPO+neqe2Tsx7BwAier8QBx
+VL95Xvcrxb7n1WCv3eL8bj7nbBk70ReYj7dBnmJycC3BDCLvZP3Dthnb6mg7nchn
+mR5Fuam2jgTm++89rryytoqiLce6OsTZ11RFd0Y40xcMYssc/r7NrLht8b002yiD
+uUBSf55Mn8Uft07zgWBQd1glKP0vXDCliIYa7B1DJBfg00B1qm+4oZbEdLcNDq25
+ssQc21vQNA3uHWozr9FS1F/gr7IAW2rI3XEj9Io9DAmGVHtotU2wJstlNWQj+PRY
+oAdZveNY/oJ0In9Pzl8HQglX+BA7JDw5SOOLhhp8cEbKkfhlizfVLUGFDZQbENs=
+=9BnV
 -----END PGP SIGNATURE-----

diff --git a/media-libs/gd/gd-2.0.35-r3.ebuild b/media-libs/gd/gd-2.0.35-r3.ebuild
index e8837bcfa8a0f0d4be3ec95350e53d2c82c173b5..33e7c5063a95118bdd5104527c81c7c4f03f3e36 100644 (file)
--- a/media-libs/gd/gd-2.0.35-r3.ebuild
+++ b/media-libs/gd/gd-2.0.35-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-r3.ebuild,v 1.3 2011/10/16 13:07:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild,v 1.4 2011/10/16 13:24:00 ssuominen Exp $
 
 EAPI="2"
 
@@ -12,12 +12,12 @@ SRC_URI="http://libgd.org/releases/${P}.tar.bz2"
 
 LICENSE="|| ( as-is BSD )"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="fontconfig jpeg png static-libs truetype xpm zlib"
 
 RDEPEND="fontconfig? ( media-libs/fontconfig )
        jpeg? ( virtual/jpeg )
-       png? ( >=media-libs/libpng-1.4 )
+       png? ( >=media-libs/libpng-1.5:0 )
        truetype? ( >=media-libs/freetype-2.1.5 )
        xpm? ( x11-libs/libXpm x11-libs/libXt )
        zlib? ( sys-libs/zlib )"