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
commit72f5f426399984585581a3e2869fe37d04175a37 (patch)
tree7ba119e7cee29e080cc739fc2230d853d20a6ec7 /media-gfx/jpegoptim
parentSplitt out ccp4 libraries -- big thanks to dberkholz starting this project (diff)
downloadhistorical-72f5f426399984585581a3e2869fe37d04175a37.tar.gz
historical-72f5f426399984585581a3e2869fe37d04175a37.tar.bz2
historical-72f5f426399984585581a3e2869fe37d04175a37.zip
Fix install with high MAKEOPTS wrt #303263, thanks to Ian Abbott for reporting.
Package-Manager: portage-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/Manifest5
-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
4 files changed, 26 insertions, 5 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/Manifest b/media-gfx/jpegoptim/Manifest
index 5f4fc1fc4d58..bce05000f650 100644
--- a/media-gfx/jpegoptim/Manifest
+++ b/media-gfx/jpegoptim/Manifest
@@ -1,6 +1,7 @@
+AUX jpegoptim-1.2.3-parallel_make.patch 407 RMD160 317d25b50c2dec60b6c90a735d0c44d8ceb4a182 SHA1 ed386b34aba74cc10c2c8d6508dfbe133e37801b SHA256 ff61bcc25373352a07d5283ea35b1de8c30cb8db9e01d98ad97f8be4f3bbc885
DIST jpegoptim-1.2.2.tar.gz 59293 RMD160 f42d2b2bdf4cf3e54485bf11f3dd8d626fdf26fc SHA1 234a0e1dbfcb65366ba5d0c3563da7121e007ebc SHA256 08293cf2105fb0caaae0a069cfa226ab1357eda4e02cb499ffee679189a5f9d2
DIST jpegoptim-1.2.3.tar.gz 60062 RMD160 508df7347cb99a355939b35c01cfb4a4fbd1dced SHA1 ced7442282306345da077b7c7647ea53476000c3 SHA256 97cb369781e5f7db855f636636763c3069c4351685272295bf35f927aa08eecd
EBUILD jpegoptim-1.2.2.ebuild 658 RMD160 01456524de07ff8a18d123187aef093749615bc3 SHA1 64446c436887642242fca4214029e7606a0f6f77 SHA256 ff6464754c5c1b327ef8d486cc53d6cd5abe824573108842006ec17dbe3787e3
-EBUILD jpegoptim-1.2.3.ebuild 645 RMD160 a5262cbe35c6c761b8f53ac83ac13aa9501c8bce SHA1 ec8d024b514679d00c7a9358eb7e1e6240ff76ed SHA256 26e7b3eb4fcc6ec9398f8bb2fdac5bff6bbcac5940a452f60f621851a69e6d33
-MISC ChangeLog 1770 RMD160 7688c8901bde15fd4083badb7068ec4ff5f2bf26 SHA1 e365feda875706ea43ad6e8b2d1ac319cb8ddf5b SHA256 0469b220fe57ad68c0c9cbbe3652c977de2c40b9b7ae95904d4ecdbf4aa65c80
+EBUILD jpegoptim-1.2.3.ebuild 718 RMD160 30ea8b528edab399b1202b52c42fa99eda9cacf0 SHA1 e66b1ce958213c7d071a60939023753f360ec971 SHA256 e602992d70ba0f663553026a185c406351805b7518cd000a8cb5630b22899ae5
+MISC ChangeLog 1979 RMD160 4b9ddfed6deaa86022df615eb79376e7849c9eea SHA1 b44f98b09eaa40701ecfe6e1a9f147e757571b76 SHA256 2f384935a1c0529fa72244985cb9ebf6fd5c25daef917d97a2c25a45e279eec4
MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
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