Fix parallel build, bug #236418, thank Walter Meinl for report.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo i686

4 files changed, 94 insertions, 4 deletions

diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index bb1ae5bec73a..76987455f7a2 100644
--- a/app-text/djvu/ChangeLog
+++ b/app-text/djvu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/djvu
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.78 2008/08/28 11:26:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.79 2008/09/14 17:59:35 pva Exp $
+
+  14 Sep 2008; Peter Volkov <pva@gentoo.org>
+  +files/djvu-3.5.21-parallel-build.patch, djvu-3.5.21.ebuild:
+  Fix parallel build, bug #236418, thank Walter Meinl for report.
 
   28 Aug 2008; Peter Volkov <pva@gentoo.org> djvu-3.5.21.ebuild:
   Enable parallel build and install, bug #236001, thank Diego Pettenò for
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index 7aac642e44b4..d0d83e38dda8 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,9 +1,10 @@
+AUX djvu-3.5.21-parallel-build.patch 2664 RMD160 82b42bc660a02f15f8f71e8ccb164fcc21221ebc SHA1 9b3632421fb3710f0e849530cec1fdfab5844a77 SHA256 074f9e76509976fbe72c1432c1794300501e3fee8e59d10143fb9c8dd13665fc
 AUX djvulibre-3.5.17-pthread-flag.patch 2419 RMD160 35f4c484e567ed7a7dcfb51559925ed49ad5db26 SHA1 2c028fd4bff1316a9278bc9047f6595ea3fc1e64 SHA256 e5bd52eba105c7792866f13f5abccf07daca220dc68ac045a4abc431c329805f
 DIST djvulibre-3.5.19.tar.gz 2380092 RMD160 2eb9b5df021bb7121a051d3256999da27dd3b682 SHA1 439977e03c8c35ca74eb5887993edb317923133f SHA256 57ffa154f45de309b352ce53aa6618af2f8639d1e330470c3c955241d44ccd78
 DIST djvulibre-3.5.20.tar.gz 2416958 RMD160 fb755064912586585656b9701b7d98bd3019c67b SHA1 88ec94512f3f7845b42c2585f75e07a9cf147380 SHA256 d937528e10c16831d8df31893ee24da8ec2bfd9e9170671c482a1b1abfc5efc3
 DIST djvulibre-3.5.21.tar.gz 2993718 RMD160 2163b784d705cc7b55bb3d9c9eb85edec44f28a7 SHA1 a6ef5cb1445baa333883754c703abd75cc5b34f6 SHA256 39f80c1810be22c5ea7f6a44bbb449c3e29902895dcff9da6a8440891a67b8b4
 EBUILD djvu-3.5.19.ebuild 3295 RMD160 85ad554d5a7c8dd8990f8f8408c3b3953eba8704 SHA1 965f1fc093303026bba9eaf4829e1438ed84f898 SHA256 8c50ba5e182e3ecd34ec9a002159c8365f1a9e4c4b9af3be3ffd58734f60f9ce
 EBUILD djvu-3.5.20-r1.ebuild 3529 RMD160 4b825dd7c68b98f50822eb93d699c378a8d64070 SHA1 0de6921d71beed554833cb06b0113a3eb1864cc7 SHA256 f71a61f4128e94ce75f520f4d9752cfcab91da6bceb4fd2f0409a8a0a1dbfc83
-EBUILD djvu-3.5.21.ebuild 3177 RMD160 4b01604e94b0d430ee60fde4279a1782a7ddc216 SHA1 6ec2ed79d4a96cfec6d887e9276e2d892e73b049 SHA256 50528276ddac7e90561f5e91c77e297627b46a011e772e414a984317c90cbc1e
-MISC ChangeLog 10240 RMD160 fbaf4d178ed702d728c7a7c310a8bb7a1dc01f2a SHA1 8e2de1131893f7367e691179f021d7bdcc4813a1 SHA256 39eeabf72bd65fb2a911e5fa6191db8ac02e2fdbbed7451e112536ea4b29e293
+EBUILD djvu-3.5.21.ebuild 3268 RMD160 52198d4b781a45157949c563eb5dab8e689e030a SHA1 d3ad088a4167d1e15945de6efb8e8b9bc94e3530 SHA256 63b441f7f430dae8e066a013e453157cfa9bb066355a77536a30b2d01bb6b3d4
+MISC ChangeLog 10415 RMD160 c89fab1d81042d04f4b2747b9d79dfce5d416683 SHA1 fa0936605a2457c7feb077064a21b0adb8ad2d14 SHA256 dde2f4e612328f8b2282858c0377374faf8c11fa6737f4deccd859a9d9e587b2
 MISC metadata.xml 865 RMD160 09cb90b4680856217c680e395e15957263c01472 SHA1 35e8a38a7dbed0d7f547cf21fa5bbb0133591e3d SHA256 13f4ad340f245deb6b5ba0d5ecfd5fe5aa408ff8ef9b2fe37a2f63ffc793c672
diff --git a/app-text/djvu/djvu-3.5.21.ebuild b/app-text/djvu/djvu-3.5.21.ebuild
index e6190143137e..6bc6ea186fcf 100644
--- a/app-text/djvu/djvu-3.5.21.ebuild
+++ b/app-text/djvu/djvu-3.5.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.21.ebuild,v 1.2 2008/08/28 11:26:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.21.ebuild,v 1.3 2008/09/14 17:59:35 pva Exp $
 
 EAPI=1
 inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs confutils
@@ -38,6 +38,13 @@ pkg_setup() {
 	confutils_use_depend_all nsplugin qt3
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-parallel-build.patch
+}
+
 src_compile() {
 	local I18N
 	if use nls; then
diff --git a/app-text/djvu/files/djvu-3.5.21-parallel-build.patch b/app-text/djvu/files/djvu-3.5.21-parallel-build.patch
new file mode 100644
index 000000000000..0d305058a558
--- /dev/null
+++ b/app-text/djvu/files/djvu-3.5.21-parallel-build.patch
@@ -0,0 +1,78 @@
+Author: Peter Volkov <pva@gentoo.org>
+Upstream: notified: https://sourceforge.net/tracker/?func=detail&atid=406585&aid=2110660&group_id=32953
+Reason: parallel build failes, bug #236418
+
+=== modified file 'i18n/cs/Makefile.in'
+--- i18n/cs/Makefile.in	2008-09-14 12:06:27 +0000
++++ i18n/cs/Makefile.in	2008-09-14 12:11:48 +0000
+@@ -98,6 +98,6 @@
+ 
+ .ts.qm:
+ 	if test ${LRELEASE} = ":" ; then : ; else \
+-	  echo TRANSLATIONS=tmp.ts > tmp.pro && \
+-	  cp $< tmp.ts && ${LRELEASE} tmp.pro && cp tmp.qm $@ && \
+-	  ${RM} tmp.qm tmp.ts tmp.pro ; fi
++	  echo TRANSLATIONS=$@.tmp.ts > $@.tmp.pro && \
++	  cp $< $@.tmp.ts && ${LRELEASE} $@.tmp.pro && cp $@.tmp.qm $@ && \
++	  ${RM} $@.tmp.qm $@.tmp.ts $@.tmp.pro ; fi
+
+=== modified file 'i18n/de/Makefile.in'
+--- i18n/de/Makefile.in	2008-09-14 12:06:27 +0000
++++ i18n/de/Makefile.in	2008-09-14 12:11:42 +0000
+@@ -65,7 +65,7 @@
+ 	done
+ 
+ # Install localized man pages
+-install-man:  FORCE ${NSDEJAVU1}
++install-man: FORCE ${NSDEJAVU1}
+ 	test ${LANGCODE} != dummy
+ 	-${INSTALL} -d ${man}
+ 	-for n in ${MANFILES} ; do \
+@@ -98,6 +98,6 @@
+ 
+ .ts.qm:
+ 	if test ${LRELEASE} = ":" ; then : ; else \
+-	  echo TRANSLATIONS=tmp.ts > tmp.pro && \
+-	  cp $< tmp.ts && ${LRELEASE} tmp.pro && cp tmp.qm $@ && \
+-	  ${RM} tmp.qm tmp.ts tmp.pro ; fi
++	  echo TRANSLATIONS=$@.tmp.ts > $@.tmp.pro && \
++	  cp $< $@.tmp.ts && ${LRELEASE} $@.tmp.pro && cp $@.tmp.qm $@ && \
++	  ${RM} $@.tmp.qm $@.tmp.ts $@.tmp.pro ; fi
+
+=== modified file 'i18n/fr/Makefile.in'
+--- i18n/fr/Makefile.in	2008-09-14 12:06:27 +0000
++++ i18n/fr/Makefile.in	2008-09-14 12:11:32 +0000
+@@ -98,6 +98,6 @@
+ 
+ .ts.qm:
+ 	if test ${LRELEASE} = ":" ; then : ; else \
+-	  echo TRANSLATIONS=tmp.ts > tmp.pro && \
+-	  cp $< tmp.ts && ${LRELEASE} tmp.pro && cp tmp.qm $@ && \
+-	  ${RM} tmp.qm tmp.ts tmp.pro ; fi
++	  echo TRANSLATIONS=$@.tmp.ts > $@.tmp.pro && \
++	  cp $< $@.tmp.ts && ${LRELEASE} $@.tmp.pro && cp $@.tmp.qm $@ && \
++	  ${RM} $@.tmp.qm $@.tmp.ts $@.tmp.pro ; fi
+
+=== modified file 'i18n/ja/Makefile.in'
+--- i18n/ja/Makefile.in	2008-09-14 12:06:27 +0000
++++ i18n/ja/Makefile.in	2008-09-14 15:41:54 +0000
+@@ -46,7 +46,7 @@
+ # (uncomment after translating nsdejavu.1.in)
+ NSDEJAVU1= nsdejavu.1
+ 
+-all: 
++all:
+ @GUI_YES@all: ${QMFILES} ${NSDEJAVU1}
+ 
+ @GUI_YES@install: install-qm
+@@ -99,6 +99,6 @@
+ 
+ .ts.qm:
+ 	if test ${LRELEASE} = ":" ; then : ; else \
+-	  echo TRANSLATIONS=tmp.ts > tmp.pro && \
+-	  cp $< tmp.ts && ${LRELEASE} tmp.pro && cp tmp.qm $@ && \
+-	  ${RM} tmp.qm tmp.ts tmp.pro ; fi
++	  echo TRANSLATIONS=$@.tmp.ts > $@.tmp.pro && \
++	  cp $< $@.tmp.ts && ${LRELEASE} $@.tmp.pro && cp $@.tmp.qm $@ && \
++	  ${RM} $@.tmp.qm $@.tmp.ts $@.tmp.pro ; fi
+