Drop redudant has_version, works also with libpng12

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

diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 4a3d76a4c19f7266f3bbeef4ac845052de14d0b6..bf6af70d8fb6b582b8ba63e3ab5d36445a26c58a 100644 (file)
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,7 +1,7 @@
 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 1288 RMD160 65056df89b9261c9dd1595279cf622c54dcc248f SHA1 02b32e7c6ffdb77665f7325c2d70a3284b5a5864 SHA256 328e2a25bd8e22cfbcfe534867d5eb3cdcf79897688e6edfc6d2e41d728a1b4c
+EBUILD gd-2.0.35-r1.ebuild 1238 RMD160 f9b37159864a20d23178a2a324819fb6f811536c SHA1 3a82f57f311a76cc268c5adc275517783fa1e2f3 SHA256 30afbc7d5289a929a23247e1c5da34238b130082aa854b6744ae573037e426ae
 EBUILD gd-2.0.35.ebuild 1129 RMD160 f636fe590034636f7c88ccad2e8122e98017a87a SHA1 a71d19b9c2bec4324cdb7a1d049003a9c559f513 SHA256 832f7e2baae6f569c0553f62938d05eae8d193d42ee9f9bbe5f2466ee3aa7621
 MISC ChangeLog 13440 RMD160 f551aa2231bd31d7c31be7d8710d4701841479a6 SHA1 f9ebe7ff1317081fa5b7e78984e26c35e234ecc8 SHA256 a0df24eae7e44917dc58fd33628b478efb7d5fd606853db08246550fd13792aa
 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 866924b1f3e931be86912c67a99bc63789e8e424..71ee7679d24bd98580a853245fa049d87dec50bb 100644 (file)
--- a/media-libs/gd/gd-2.0.35-r1.ebuild
+++ b/media-libs/gd/gd-2.0.35-r1.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/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 @@ DEPEND="${RDEPEND}"
 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
 }