Fix parallel make (install) wrt #294820, thanks to Diego E. Pettenò for reporting.
authorSamuli Suominen <ssuominen@gentoo.org>
Tue, 2 Mar 2010 01:44:17 +0000 (01:44 +0000)
committerSamuli Suominen <ssuominen@gentoo.org>
Tue, 2 Mar 2010 01:44:17 +0000 (01:44 +0000)
Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

media-gfx/jpeginfo/ChangeLog
media-gfx/jpeginfo/Manifest
media-gfx/jpeginfo/files/jpeginfo-1.6.0-parallel_install.patch [new file with mode: 0644]
media-gfx/jpeginfo/jpeginfo-1.6.0.ebuild

index aa55cb7d3bce1e48c39f2b01a39967f7bd83d564..71b8634a266b3a019fd5ce74fc49d6770af7a9ae 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/jpeginfo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpeginfo/ChangeLog,v 1.18 2010/01/22 17:34:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpeginfo/ChangeLog,v 1.19 2010/03/02 01:44:17 ssuominen Exp $
+
+  02 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> jpeginfo-1.6.0.ebuild,
+  +files/jpeginfo-1.6.0-parallel_install.patch:
+  Fix parallel make (install) wrt #294820, thanks to Diego E. Pettenò for
+  reporting.
 
   22 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> jpeginfo-1.6.0.ebuild:
   Require SLOT="0" of media-libs/jpeg for headers.
index aba74c76148053f290b3e7c22c4ba375c5154a39..ba794e296991b64c8cc3b92876180270e005ffd2 100644 (file)
@@ -1,4 +1,5 @@
+AUX jpeginfo-1.6.0-parallel_install.patch 330 RMD160 f2c38182cffe3c460f7c4a17035f2c3f81f4d6d2 SHA1 f044562ccd74cebd5540b46f5218a07dfe0db592 SHA256 8bfc4d74c67b37e44b64e9890e10934f91d5e8142d4df52563945e04c0208219
 DIST jpeginfo-1.6.0.tar.gz 64772 RMD160 d33d03e126df90e611533d24d6a3f1fdde945c88 SHA1 198814d72020c967272b36c6b64711b66cdf6e01 SHA256 56dfc8efc54cb79047746cc98e94ca5f89c31645348f35a4053ed7e85d67bc3c
-EBUILD jpeginfo-1.6.0.ebuild 718 RMD160 2f22d68b526400bf6e94d52a16ce6102543dc1bb SHA1 1fe7ea8cccfa9b06f97cb5a937700595f52ef6ef SHA256 6bb7a3a67f20785881fe42bec2beeb0e212eea3da39de7c76d51bb6fa6800ae7
-MISC ChangeLog 2158 RMD160 d776921cd6d719c1f0a11f452884341860083292 SHA1 57f82a6b36cc35117c83ac189a51bb8828c29113 SHA256 b5e028e56bbb1c9732919365bd4787f08d92499922db1ae1230110e0a2f12d43
+EBUILD jpeginfo-1.6.0.ebuild 775 RMD160 e79a5ebe639adf702e1507d78403af1bba89b34d SHA1 11ada9b08978be9bbe11caff275250b7432c633e SHA256 7d37f71e6288270735c50c2c64290b2616b44c7195df255aaec63adf95c8e9d9
+MISC ChangeLog 2372 RMD160 9cf8962a44585a9789acf71f5c19983f2b7d78ea SHA1 b476c159cb9cc1c2f35a077ebf296d1e92285c09 SHA256 5e502f4ca3fb448dbaa9bb9c0d9987d33623a6300acb5788b7d7e7a660d7d328
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/media-gfx/jpeginfo/files/jpeginfo-1.6.0-parallel_install.patch b/media-gfx/jpeginfo/files/jpeginfo-1.6.0-parallel_install.patch
new file mode 100644 (file)
index 0000000..379e200
--- /dev/null
@@ -0,0 +1,11 @@
+--- Makefile.in
++++ Makefile.in
+@@ -79,7 +79,7 @@
+       groff -Tps -mandoc ./$(PKGNAME).1 >$(PKGNAME).ps
+       groff -Tascii -mandoc ./$(PKGNAME).1 | tee $(PKGNAME).prn | sed 's/.\b//g' >$(PKGNAME).txt
+ 
+-install.man:
++install.man: install.dirs
+       $(INSTALL) -m 644 $(PKGNAME).1 $(INSTALL_ROOT)/$(mandir)/man1/$(PKGNAME).1
+ 
+ install.dirs:
index 71fe5ad200ba565712698eafe6dc42630610cf42..0ded5a64e7f20268018bd2a4c4a918e3c04f6ff1 100644 (file)
@@ -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/jpeginfo/jpeginfo-1.6.0.ebuild,v 1.18 2010/01/22 17:34:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpeginfo/jpeginfo-1.6.0.ebuild,v 1.19 2010/03/02 01:44:17 ssuominen Exp $
 
 EAPI=2
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Prints information and tests integrity of JPEG/JFIF files."
 HOMEPAGE="http://www.cc.jyu.fi/~tjko/projects.html"
@@ -16,13 +16,16 @@ IUSE=""
 
 DEPEND=">=media-libs/jpeg-6b:0"
 
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-parallel_install.patch
+}
+
 src_configure() {
        tc-export CC
        econf
 }
 
 src_install() {
-       # bug #294820
-       emake -j1 INSTALL_ROOT="${D}" install || die
+       emake INSTALL_ROOT="${D}" install || die
        dodoc README
 }