[gentoo-commits] gentoo-x86 commit in media-libs/gd: gd-2.0.35-r1.ebuild

[gentoo-commits] gentoo-x86 commit in media-libs/gd: gd-2.0.35-r1.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    10/03/08 20:14:28

  Modified:             gd-2.0.35-r1.ebuild
  Log:
  Drop redudant has_version, works also with libpng12
  (Portage version: 2.2_rc65/cvs/Linux x86_64)

Revision  Changes    Path
1.9                  media-libs/gd/gd-2.0.35-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild?r1=1.8&r2=1.9

Index: gd-2.0.35-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gd-2.0.35-r1.ebuild	8 Mar 2010 09:42:43 -0000	1.8
+++ gd-2.0.35-r1.ebuild	8 Mar 2010 20:14:28 -0000	1.9
@@ -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.8 2010/03/08 09:42:43 ssuominen Exp $
+# $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 $
 
 inherit autotools
 
@@ -23,11 +23,9 @@
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-libpng14.patch \
+		"${FILESDIR}"/${P}-maxcolors.patch
 
-	has_version ">=media-libs/libpng-1.4" && epatch \
-		"${FILESDIR}"/${P}-libpng14.patch
-
-	epatch "${FILESDIR}"/${P}-maxcolors.patch
 	eautoconf
 	find . -type f -print0 | xargs -0 touch -r configure
 }

[gentoo-commits] gentoo-x86 commit in media-libs/gd: gd-2.0.35-r1.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    10/05/21 10:34:09

  Modified:             gd-2.0.35-r1.ebuild
  Log:
  Convert to EAPI1 and force correct slot of both jpeg and libpng
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.11                 media-libs/gd/gd-2.0.35-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild?r1=1.10&r2=1.11

Index: gd-2.0.35-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gd-2.0.35-r1.ebuild	20 May 2010 17:32:11 -0000	1.10
+++ gd-2.0.35-r1.ebuild	21 May 2010 10:34:08 -0000	1.11
@@ -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 @@
 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}"