Fix parallel build wrt #259115 by Mr. Anderson <walch.martin@web.de>

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 895192F9)

3 files changed, 94 insertions, 5 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 483b31dd8ac3..586c5d77090f 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.323 2012/11/14 17:13:09 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.324 2012/11/18 14:53:11 xarthisius Exp $
+
+  18 Nov 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/xscreensaver-5.20-parallel-build.patch, xscreensaver-5.20.ebuild:
+  Fix parallel build wrt #259115 by Mr. Anderson <walch.martin@web.de>
 
   14 Nov 2012; Andreas Schuerch <nativemad@gentoo.org>
   xscreensaver-5.20.ebuild:
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-parallel-build.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-parallel-build.patch
new file mode 100644
index 000000000000..f28d663b8465
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-parallel-build.patch
@@ -0,0 +1,86 @@
+Fix make[1]: warning: jobserver unavailable: using -j1.  Add `+' to parent make rule
+
+https://bugs.gentoo.org/show_bug.cgi?id=259115
+
+Patch written by Kacper Kowalik <xarthisius@gentoo.org>
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -19,8 +19,8 @@ TARFILES	= README README.hacking README.VMS INSTALL \
+ 
+ TAR		= tar
+ 
+-MAKE_SUBDIR  = for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@) || exit 5; done
+-MAKE_SUBDIR2 = for dir in $(SUBDIRS2);do (cd $$dir; $(MAKE) $@) || exit 5; done
++MAKE_SUBDIR  = for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit 5; done
++MAKE_SUBDIR2 = for dir in $(SUBDIRS2); do $(MAKE) -C $$dir $@ || exit 5; done
+ 
+ default::
+ 	@$(MAKE_SUBDIR)
+@@ -45,7 +45,7 @@ depend::
+ distdepend::
+ 	@$(MAKE) update_spec_version
+ 	@$(MAKE_SUBDIR2)
+-	@cd po ; $(MAKE) update-po
++	@$(MAKE) -C po update-po
+ 
+ TAGS:: tags
+ tags::
+@@ -284,7 +284,7 @@ test-tar::
+   chmod -R u+w .
+ 
+ dmg::
+-	cd OSX ; $(MAKE) release dmg
++	$(MAKE) -C OSX release dmg
+ 
+ www::
+ 	@								    \
+@@ -349,8 +349,7 @@ www::
+   cat $$TMP > download.html ;						    \
+   rm -f $$TMP ;								    \
+ 									    \
+-  (cd ..; $(MAKE) xscreensaver/changelog.html				    \
+-		  xscreensaver/screenshots/index.html );		    \
++  $(MAKE) -C ../ xscreensaver/changelog.html xscreensaver/screenshots/index.html; \
+   cvs diff -U0 changelog.html ;						    \
+   set +x ;								    \
+ 									    \
+--- a/driver/Makefile.in
++++ b/driver/Makefile.in
+@@ -732,8 +732,7 @@ $(UTILS_BIN)/yarandom.o:	$(UTILS_SRC)/yarandom.c
+ $(UTILS_BIN)/colorbars.o:	$(UTILS_SRC)/colorbars.c
+ 
+ $(SAVER_UTIL_OBJS):
+-	cd $(UTILS_BIN) ; \
+-	$(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
++	$(MAKE) -C $(UTILS_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+ 
+ # How we build object files in this directory.
+ .c.o:
+--- a/hacks/Makefile.in
++++ b/hacks/Makefile.in
+@@ -517,8 +517,7 @@ $(UTILS_BIN)/xdbe.o:		$(UTILS_SRC)/xdbe.c
+ $(UTILS_BIN)/textclient.o:	$(UTILS_SRC)/textclient.c
+ 
+ $(UTIL_OBJS):
+-	cd $(UTILS_BIN) ; \
+-	$(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
++	$(MAKE) -C $(UTILS_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+ 
+ # How we build object files in this directory.
+ .c.o:
+--- a/hacks/glx/Makefile.in
++++ b/hacks/glx/Makefile.in
+@@ -464,11 +464,10 @@ $(UTILS_BIN)/xshm.o:		$(UTILS_SRC)/xshm.c
+ $(UTILS_BIN)/textclient.o:	$(UTILS_SRC)/textclient.c
+ 
+ $(UTIL_OBJS):
+-	cd $(UTILS_BIN) ; \
+-	$(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
++	$(MAKE) -C $(UTILS_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+ 
+ $(HACK_BIN)/xlockmore.o: $(HACK_SRC)/xlockmore.c
+-	cd $(HACK_BIN)  ; $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)"
++	$(MAKE) -C $(HACK_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)"
+ 
+ 
+ # How we build object files in this directory.
diff --git a/x11-misc/xscreensaver/xscreensaver-5.20.ebuild b/x11-misc/xscreensaver/xscreensaver-5.20.ebuild
index 4da89fd6ba87..3d662f64c9b3 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.20.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.20.ebuild,v 1.7 2012/11/14 17:13:09 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.20.ebuild,v 1.8 2012/11/18 14:53:11 xarthisius Exp $
 
 EAPI=4
 inherit autotools eutils flag-o-matic multilib pam
@@ -58,8 +58,6 @@ DEPEND="${COMMON_DEPEND}
 
 REQUIRED_USE="gdm? ( new-login )"
 
-MAKEOPTS="${MAKEOPTS} -j1"
-
 src_prepare() {
 	if use new-login && ! use gdm; then #392967
 		sed -i \
@@ -74,7 +72,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-5.20-check-largefile-support.patch \
 		"${FILESDIR}"/${PN}-5.20-conf264.patch \
 		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
-		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch
+		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
+		"${FILESDIR}"/${PN}-5.20-parallel-build.patch
 
 	eautoconf
 	eautoheader