From: Samuli Suominen <ssuominen@gentoo.org>
Date: Mon, 8 Mar 2010 13:41:37 +0000 (+0000)
Subject: Drop redudant has_version, png_sig_cmp is already available in 1.2.x series
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cb334f6d11e2526aa07d1b1e38a9b3f3fd67fc9f;p=gentoo.git

Drop redudant has_version, png_sig_cmp is already available in 1.2.x series
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64
---

diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 9ee6f16f4aa0..b371224733fb 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -8,7 +8,7 @@ AUX openmotif-2.3.2-sanitise-paths.patch 734 RMD160 de091a0b8d232fc4507c9fc3b380
 AUX openmotif-2.3.2-solaris-2.11.patch 409 RMD160 78e04d1ea6985b663423058754b6d05fdacdf88d SHA1 dc19563eada1094f921d69d0415cdf643697e0a5 SHA256 cfd6f6dde2edd3907b3dc712d2df2096478b20ca4d4dc523b45058c50656a0b7
 DIST openmotif-2.3.0-manual.pdf.tgz 4195259 RMD160 45b1a17a653b01ccf0324e0bc70fd1ef5db5a395 SHA1 1d0f55928ad65ee321564ba962b1608cfd83bb96 SHA256 49692fd4d5441d2dbb5ca36199b209c8503452fda9b36e929d1aa3673bffaecb
 DIST openmotif-2.3.2.tar.gz 5941784 RMD160 2346a93fcec57b9c18b6657d1cc681b6001cba28 SHA1 c98ac1bf3640ce57da34a0704bdeb2b12011ae1f SHA256 f786f3724d33133e8c4b3c9b368c89d680e981ca1c0e8c3280f496976b390c7d
-EBUILD openmotif-2.3.2-r2.ebuild 5285 RMD160 9160d3a23d3ad984f92253d3f19ff3bb0bf13938 SHA1 aa8af20b6b2f76a85804ce1976aee3a3a91a2a64 SHA256 dcddb61a957c324278b40a6543d02be10f9278d213a6861e553ebb37012698e6
+EBUILD openmotif-2.3.2-r2.ebuild 5240 RMD160 1b78c30fc2bc4b23aa4f36006e6fa891ad41967b SHA1 f8b66563e0f5339883a7386398d5471fde4d0038 SHA256 cd662b97b37be225ccb7d13373f21edeb1f11ceb4e13f24ea70ba7f5b5a91fe4
 EBUILD openmotif-2.3.2.ebuild 4084 RMD160 7bb056c12a1856bd954b1bc614c812745dd8e4d9 SHA1 c4f85b4050c4bfea88ba4c0f5df156cb94848ad2 SHA256 f6aa28e3b4bb6104ad52d0d487b0083c96f1a871c3603c125b31d1a0f5562f0e
 MISC ChangeLog 34642 RMD160 738bc387824f40e861d2e0c2a9c9d61f2b7605c4 SHA1 6f6081a499fcb05f6ef79428605f399d9fe88a8e SHA256 4e717ac9a184cb1e853567da2b4c25378025bc0f2058732be7651dd050bce710
 MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb
diff --git a/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild b/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
index a0355556a25c..71ecce326319 100644
--- a/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.2-r2.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/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild,v 1.3 2010/03/08 12:00:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild,v 1.4 2010/03/08 13:41:37 ssuominen Exp $
 
 EAPI=3
 
@@ -95,8 +95,7 @@ src_prepare() {
 	# add X.Org vendor string to aliases for virtual bindings
 	echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
 
-	has_version ">=media-libs/libpng-1.4" && epatch \
-		"${FILESDIR}"/${P}-libpng14.patch
+	epatch "${FILESDIR}"/${P}-libpng14.patch
 
 	AT_M4DIR=. eautoreconf
 }