diff options
| author |   Alex Alexander <wired@gentoo.org> | 2010-03-14 14:56:01 +0000 |
|---|---|---|
| committer | Alex Alexander <wired@gentoo.org> | 2010-03-14 14:56:01 +0000 |
| commit | d6a962240fde4bfc6445735616e8ad2f7829246a (patch) | |
| tree | fd0297e538dbcd8421056debf711c5d0a9efa721 /www-client | |
| parent | Fix building with libpng14 wrt #309303 by Peter Alfredsen. (diff) | |
| download | gentoo-2-d6a962240fde4bfc6445735616e8ad2f7829246a.tar.gz gentoo-2-d6a962240fde4bfc6445735616e8ad2f7829246a.tar.bz2 gentoo-2-d6a962240fde4bfc6445735616e8ad2f7829246a.zip | |
[www-client/uzbl] makefile patch applied upstream in experimental branch, don't try to patch again
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/uzbl/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/uzbl/uzbl-9999.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog index 8f550afb1f0f..2a2ac82489c4 100644 --- a/www-client/uzbl/ChangeLog +++ b/www-client/uzbl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/uzbl # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.21 2010/03/14 14:37:35 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.22 2010/03/14 14:56:01 wired Exp $ + + 14 Mar 2010; Alex Alexander <wired@gentoo.org> uzbl-9999.ebuild: + makefile patch applied upstream in experimental branch, don't try to patch + again *uzbl-2010.02.02-r1 (14 Mar 2010) diff --git a/www-client/uzbl/uzbl-9999.ebuild b/www-client/uzbl/uzbl-9999.ebuild index f9deec990bf9..868330340fad 100644 --- a/www-client/uzbl/uzbl-9999.ebuild +++ b/www-client/uzbl/uzbl-9999.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/www-client/uzbl/uzbl-9999.ebuild,v 1.10 2010/03/14 14:37:35 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.11 2010/03/14 14:56:01 wired Exp $ EAPI="2" @@ -84,8 +84,8 @@ pkg_setup() { src_prepare() { git_src_prepare - # patch Makefile for DOCDIR - epatch "${FILESDIR}"/"${PN}"-makefile-docdir.patch + # patch Makefile for DOCDIR - already applied in experimental branch + use experimental || epatch "${FILESDIR}"/"${PN}"-makefile-docdir.patch # remove -ggdb sed -i "s/-ggdb //g" Makefile || |