diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-09-19 22:04:41 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-09-19 22:04:41 +0000 |
| commit | 3a6cd1d3381da4364bc9c647dcb1341eaf5bf20e (patch) | |
| tree | a43001af11f56798fb4c5028788880642b3074b1 /media-libs | |
| parent | use patch from upstream -- no functional changes (diff) | |
| download | gentoo-2-3a6cd1d3381da4364bc9c647dcb1341eaf5bf20e.tar.gz gentoo-2-3a6cd1d3381da4364bc9c647dcb1341eaf5bf20e.tar.bz2 gentoo-2-3a6cd1d3381da4364bc9c647dcb1341eaf5bf20e.zip | |
Fix install error with urt subdir #337971 by Steve Kutnar and drop importinc dependencies with files #337984 by Andrew Evans.
(Portage version: 2.2_rc83/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/netpbm/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/netpbm/netpbm-10.51.00.ebuild | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog index 1524dc989607..ea9bb1177095 100644 --- a/media-libs/netpbm/ChangeLog +++ b/media-libs/netpbm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/netpbm # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.244 2010/09/18 14:03:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.245 2010/09/19 22:04:41 vapier Exp $ + + 19 Sep 2010; Mike Frysinger <vapier@gentoo.org> netpbm-10.51.00.ebuild: + Fix install error with urt subdir #337971 by Steve Kutnar and drop importinc + dependencies with files #337984 by Andrew Evans. *netpbm-10.51.00 (18 Sep 2010) diff --git a/media-libs/netpbm/netpbm-10.51.00.ebuild b/media-libs/netpbm/netpbm-10.51.00.ebuild index cf7d2dd07470..eb875b30504e 100644 --- a/media-libs/netpbm/netpbm-10.51.00.ebuild +++ b/media-libs/netpbm/netpbm-10.51.00.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/netpbm/netpbm-10.51.00.ebuild,v 1.1 2010/09/18 14:03:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.51.00.ebuild,v 1.2 2010/09/19 22:04:41 vapier Exp $ EAPI="3" @@ -82,7 +82,8 @@ src_prepare() { epatch "${FILESDIR}"/${P}-ppmtompeg-free.patch # make sure we use system urt - echo all: > urt/Makefile || die + sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die + rm -rf urt # take care of the importinc stuff ourselves by only doing it once # at the top level and having all subdirs use that one set #149843 @@ -90,6 +91,9 @@ src_prepare() { -e '/^importinc:/s|^|importinc:\nmanual_|' \ -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ common.mk || die + sed -i \ + -e '/%.c/s: importinc$::' \ + common.mk lib/Makefile lib/util/Makefile || die # avoid ugly depend.mk warnings touch $(find . -name Makefile | sed s:Makefile:depend.mk:g) |