[gentoo-commits] gentoo-x86 commit in media-gfx/fontforge: fontforge-20090923.ebuild

[gentoo-commits] gentoo-x86 commit in media-gfx/fontforge: fontforge-20090923.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    10/10/29 11:32:04

  Modified:             fontforge-20090923.ebuild
  Log:
  drop ugly has_version and epatch combo
  
  (Portage version: 2.2.0_alpha1/cvs/Linux x86_64)

Revision  Changes    Path
1.12                 media-gfx/fontforge/fontforge-20090923.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fontforge/fontforge-20090923.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fontforge/fontforge-20090923.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fontforge/fontforge-20090923.ebuild?r1=1.11&r2=1.12

Index: fontforge-20090923.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20090923.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fontforge-20090923.ebuild	3 Jul 2010 21:46:36 -0000	1.11
+++ fontforge-20090923.ebuild	29 Oct 2010 11:32:04 -0000	1.12
@@ -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-gfx/fontforge/fontforge-20090923.ebuild,v 1.11 2010/07/03 21:46:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20090923.ebuild,v 1.12 2010/10/29 11:32:04 ssuominen Exp $
 
 # Some notes for maintainers this package:
 # 1. README-unix: freetype headers are required to make use of truetype debugger
@@ -32,7 +32,7 @@
 
 RDEPEND="gif? ( >=media-libs/giflib-4.1.0-r1 )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	png? ( >=media-libs/libpng-1.2.4 )
+	png? ( >=media-libs/libpng-1.4 )
 	python? ( dev-lang/python )
 	tiff? ( >=media-libs/tiff-3.5.7-r1 )
 	truetype? ( >=media-libs/freetype-2.1.4 )
@@ -60,10 +60,7 @@
 src_prepare() {
 	epatch "${FILESDIR}"/fontforge-desktop.patch
 	epatch "${FILESDIR}"/${P}-configure.patch
-
-	# info_ptr->trans_alpha might be no-go with libpng12
-	has_version ">=media-libs/libpng-1.4" && epatch \
-		"${FILESDIR}"/${P}-libpng14.patch
+	epatch "${FILESDIR}"/${P}-libpng14.patch
 
 	eautoconf
 	if use doc; then