Convert to EAPI1 and force correct slot of both jpeg and libpng

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

diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 5d017a5e2e3aca57d849d23d4b6d4d1e3d85be12..3caccbfdee5f3328fff6f7d922be2460d47097d3 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 1398 RMD160 dd9905b2c425abe1790043f5c7c3db12cfb99cfb SHA1 f0dc1982ec0056684afa96338a8aa095e306afa7 SHA256 993e9d654fe25c0ed3842ba6d1cc53743771ff7d5e20b4d6662ad18c1d97581f
+EBUILD gd-2.0.35-r1.ebuild 1415 RMD160 0c9def311c2245e151bcb7d1f64839657ed38f9e SHA1 100b384ae114bfd9d943bdfd2e1a5a5ca9e7eb86 SHA256 f9fcee82cfe8059de8bfd679af98f5c8e5659ed588606f746e15eff3311108a3
 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 bf2bd81a75cae29748ecfe980b49c7d028f3a65c..190f3ccb1a417e5ba0baadea50f63779679531ac 100644 (file)
--- a/media-libs/gd/gd-2.0.35-r1.ebuild
+++ b/media-libs/gd/gd-2.0.35-r1.ebuild
@@ -1,7 +1,8 @@
 # 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.10 2010/05/20 17:32:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild,v 1.11 2010/05/21 10:34:08 ssuominen Exp $
 
+EAPI=1
 inherit autotools
 
 DESCRIPTION="A graphics library for fast image creation"
@@ -14,8 +15,9 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~spar
 IUSE="fontconfig jpeg png truetype xpm"
 
 RDEPEND="fontconfig? ( media-libs/fontconfig )
-       jpeg? ( >=media-libs/jpeg-6b )
-       png? ( >=media-libs/libpng-1.2.5 sys-libs/zlib )
+       jpeg? ( >=media-libs/jpeg-6b:0 )
+       png? ( >=media-libs/libpng-1.2.43-r2:0
+               sys-libs/zlib )
        truetype? ( >=media-libs/freetype-2.1.5 )
        xpm? ( x11-libs/libXpm x11-libs/libXt )"
 DEPEND="${RDEPEND}"