summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-10-25 19:06:16 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-10-25 19:06:16 +0000
commit8a13c038524e48d84190ee5b32cc59c62f09b6e0 (patch)
tree149350f64522063e0a9680058c6e6f82a45ff0ef /dev-libs/DirectFB
parentAutomated update of use.local.desc (diff)
downloadhistorical-8a13c038524e48d84190ee5b32cc59c62f09b6e0.tar.gz
historical-8a13c038524e48d84190ee5b32cc59c62f09b6e0.tar.bz2
historical-8a13c038524e48d84190ee5b32cc59c62f09b6e0.zip
Get rid of ugly has_version and epatch combination
Package-Manager: portage-2.2.0_alpha1/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/DirectFB')
-rw-r--r--dev-libs/DirectFB/DirectFB-1.4.3.ebuild9
-rw-r--r--dev-libs/DirectFB/Manifest2
2 files changed, 4 insertions, 7 deletions
diff --git a/dev-libs/DirectFB/DirectFB-1.4.3.ebuild b/dev-libs/DirectFB/DirectFB-1.4.3.ebuild
index 970e6b8f76e9..bd0fa99fdbb6 100644
--- a/dev-libs/DirectFB/DirectFB-1.4.3.ebuild
+++ b/dev-libs/DirectFB/DirectFB-1.4.3.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/dev-libs/DirectFB/DirectFB-1.4.3.ebuild,v 1.10 2010/09/13 19:05:14 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-1.4.3.ebuild,v 1.11 2010/10/25 19:06:16 ssuominen Exp $
inherit eutils toolchain-funcs
@@ -35,7 +35,7 @@ IUSE="debug fbcon gif jpeg mmx png sdl sse sysfs truetype v4l v4l2 X zlib ${IUV}
RDEPEND="sdl? ( media-libs/libsdl )
gif? ( media-libs/giflib )
- png? ( media-libs/libpng )
+ png? ( >=media-libs/libpng-1.4 )
jpeg? ( media-libs/jpeg )
sysfs? ( sys-fs/sysfsutils )
zlib? ( sys-libs/zlib )
@@ -50,10 +50,7 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-1.2.7-CFLAGS.patch
epatch "${FILESDIR}"/${PN}-1.2.0-headers.patch
epatch "${FILESDIR}"/${PN}-1.1.1-pkgconfig.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
# Avoid invoking `ld` directly #300779
find -name Makefile.in -exec sed -i \
diff --git a/dev-libs/DirectFB/Manifest b/dev-libs/DirectFB/Manifest
index 01ff4cb344eb..42b5f3561c9e 100644
--- a/dev-libs/DirectFB/Manifest
+++ b/dev-libs/DirectFB/Manifest
@@ -4,7 +4,7 @@ AUX DirectFB-1.2.7-CFLAGS.patch 430 RMD160 814bb14c60732dab762303e8a6d356bc59950
AUX DirectFB-1.4.3-libpng14.patch 1904 RMD160 c42b7be4ad69f5f3cccfb0517455df43b63a0365 SHA1 c2afe436c3d974a62922348e70647fa087a15991 SHA256 ed36a732e87686bcc0b326aa5bf3effdd2068bfc6856a5f701140578a7eaa49b
DIST DirectFB-1.4.3.tar.gz 2898215 RMD160 9dfedcebe7fa59a821754a51308d8927269b5276 SHA1 935ef75b4a9f682e41fc68c887d72dca1fe32875 SHA256 1435aae4f0eb70252dc25ee50e51aecfdc4527f2651db5f35b34eb833fa7e978
DIST DirectFB-1.4.5.tar.gz 2918611 RMD160 e7090993caab2cfef7ae95df6d14983bb345e2de SHA1 be251588a84380b9e93977bfd2d718a9cf1ee1c4 SHA256 c7e2d735f45af0018064f43c64defaeb068e6953002cc8a18b027d16cf411971
-EBUILD DirectFB-1.4.3.ebuild 4698 RMD160 3d86dc1a18d6a45dee16372171180f661f2e1be6 SHA1 422945d0da05a801e76aca45d8fe26c46987a312 SHA256 71697ae4af8245ae4c9698e5c4a66ff4bb0700f61ca3e78aed4ec97edfde6791
+EBUILD DirectFB-1.4.3.ebuild 4604 RMD160 801c6cdbe3966bcf8a60266188b6ad67d562dc4d SHA1 25b38ffd2b2bd495e2033d4e9b9a754794cceeef SHA256 61425bdc6d10ee3019cd2cb523cdf90b0cc20531450762d4adf767163d7b8315
EBUILD DirectFB-1.4.5.ebuild 4011 RMD160 8c82f6c50a84a0a85b03ff7aab11a68e86957aba SHA1 990188ab22c7906e1b54c6f06baa5582160e8a43 SHA256 17752d554b4e1710f308c94e942dcbf8d4ca96d57e1a23eec87cbd803fd9e8ff
MISC ChangeLog 15130 RMD160 3847963faa7e8ab5a40a93c686f67e90bd814017 SHA1 64be8f67b72d45fe2218e5fcb27c9703a56cb294 SHA256 b0094b5209f5bf91de48c565565c7de1db831c815af0467e8945ae5bc85f2e6a
MISC metadata.xml 792 RMD160 832b71c835f2fb6eda2f61225311fee11e90cbd0 SHA1 26fbe52ad3fd80753ac7140c21b4dc5fcb08a8e7 SHA256 4e35266c2828c450c1d2f93780154d361317a8fbafda46b791aaeccddcbeb48e