summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-02-02 20:51:22 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-02-02 20:51:22 +0000
commit0d0c9daef59889756dae4f07c77402c633f844d2 (patch)
treeadc88b95be854b346e4e283837e3c076b8710270 /media-gfx/jpegoptim
parentSplitt out ccp4 libraries -- big thanks to dberkholz starting this project (diff)
downloadgentoo-2-0d0c9daef59889756dae4f07c77402c633f844d2.tar.gz
gentoo-2-0d0c9daef59889756dae4f07c77402c633f844d2.tar.bz2
gentoo-2-0d0c9daef59889756dae4f07c77402c633f844d2.zip
Fix install with high MAKEOPTS wrt #303263, thanks to Ian Abbott for reporting.
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/jpegoptim')
-rw-r--r--media-gfx/jpegoptim/ChangeLog7
-rw-r--r--media-gfx/jpegoptim/files/jpegoptim-1.2.3-parallel_make.patch11
-rw-r--r--media-gfx/jpegoptim/jpegoptim-1.2.3.ebuild8
3 files changed, 23 insertions, 3 deletions
diff --git a/media-gfx/jpegoptim/ChangeLog b/media-gfx/jpegoptim/ChangeLog
index 01731759536e..74fdeb0b5995 100644
--- a/media-gfx/jpegoptim/ChangeLog
+++ b/media-gfx/jpegoptim/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/jpegoptim
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpegoptim/ChangeLog,v 1.13 2010/01/24 08:02:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpegoptim/ChangeLog,v 1.14 2010/02/02 20:51:21 ssuominen Exp $
+
+ 02 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+ jpegoptim-1.2.3.ebuild, +files/jpegoptim-1.2.3-parallel_make.patch:
+ Fix install with high MAKEOPTS wrt #303263, thanks to Ian Abbott for
+ reporting.
*jpegoptim-1.2.3 (24 Jan 2010)
diff --git a/media-gfx/jpegoptim/files/jpegoptim-1.2.3-parallel_make.patch b/media-gfx/jpegoptim/files/jpegoptim-1.2.3-parallel_make.patch
new file mode 100644
index 000000000000..5128033f6df3
--- /dev/null
+++ b/media-gfx/jpegoptim/files/jpegoptim-1.2.3-parallel_make.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2010-02-02 22:45:50.000000000 +0200
++++ Makefile.in 2010-02-02 22:46:33.000000000 +0200
+@@ -79,7 +79,7 @@
+ groff -Tps -mandoc ./$(PKGNAME).1 >$(PKGNAME).ps
+ groff -Tascii -mandoc ./$(PKGNAME).1 | tee $(PKGNAME).prn | sed 's/.//g' >$(PKGNAME).txt
+
+-install.man:
++install.man: install.dirs
+ $(INSTALL) -m 644 $(PKGNAME).1 $(INSTALL_ROOT)/$(mandir)/man1/$(PKGNAME).1
+
+ install.dirs:
diff --git a/media-gfx/jpegoptim/jpegoptim-1.2.3.ebuild b/media-gfx/jpegoptim/jpegoptim-1.2.3.ebuild
index 2f91a941efb3..4f4939848835 100644
--- a/media-gfx/jpegoptim/jpegoptim-1.2.3.ebuild
+++ b/media-gfx/jpegoptim/jpegoptim-1.2.3.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpegoptim/jpegoptim-1.2.3.ebuild,v 1.1 2010/01/24 08:02:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpegoptim/jpegoptim-1.2.3.ebuild,v 1.2 2010/02/02 20:51:21 ssuominen Exp $
EAPI=2
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
DESCRIPTION="JPEG file optimiser"
HOMEPAGE="http://www.kokkonen.net/tjko/projects.html"
@@ -16,6 +16,10 @@ IUSE=""
DEPEND="media-libs/jpeg:0"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-parallel_make.patch
+}
+
src_configure() {
tc-export CC
econf