Fix parallel make bugs (#279783).

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 101 insertions, 22 deletions

diff --git a/net-dialup/mgetty/ChangeLog b/net-dialup/mgetty/ChangeLog
index f7e233be1841..f1536e6491cd 100644
--- a/net-dialup/mgetty/ChangeLog
+++ b/net-dialup/mgetty/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/mgetty
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.96 2009/07/31 11:14:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.97 2009/08/22 08:51:39 mrness Exp $
+
+  22 Aug 2009; Alin Năstac <mrness@gentoo.org>
+  files/mgetty-1.1.36-qa-fixes.patch, mgetty-1.1.36-r3.ebuild:
+  Fix parallel make bugs (#279783).
 
   31 Jul 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   mgetty-1.1.36-r3.ebuild:
diff --git a/net-dialup/mgetty/files/mgetty-1.1.36-qa-fixes.patch b/net-dialup/mgetty/files/mgetty-1.1.36-qa-fixes.patch
index 43a7ca5bd8dc..c43a8724dc3f 100644
--- a/net-dialup/mgetty/files/mgetty-1.1.36-qa-fixes.patch
+++ b/net-dialup/mgetty/files/mgetty-1.1.36-qa-fixes.patch
@@ -1,3 +1,77 @@
+diff -Nru mgetty-1.1.36.orig/Makefile mgetty-1.1.36/Makefile
+--- mgetty-1.1.36.orig/Makefile	2009-08-22 10:37:19.000000000 +0200
++++ mgetty-1.1.36/Makefile	2009-08-22 10:43:31.000000000 +0200
+@@ -617,15 +617,15 @@
+ # fax spool directories
+ #
+ 	test -d $(spool) || \
+-		( mkdir $(spool) && chmod 755 $(spool) )
++		( ./mkidirs $(spool) && chmod 755 $(spool) )
+ 	test -d $(FAX_SPOOL) || \
+-		( mkdir $(FAX_SPOOL) && \
++		( ./mkidirs $(FAX_SPOOL) && \
+ 		  chown $(FAX_OUT_USER) $(FAX_SPOOL) && \
+ 		  chmod 755 $(FAX_SPOOL) )
+ 	test -d $(FAX_SPOOL_IN) || \
+-		( mkdir $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
++		( ./mkidirs $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
+ 	test -d $(FAX_SPOOL_OUT) || \
+-		  mkdir $(FAX_SPOOL_OUT)
++		  ./mkidirs $(FAX_SPOOL_OUT)
+ 	chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT)
+ 	chmod 755 $(FAX_SPOOL_OUT)
+ #
+diff -Nru mgetty-1.1.36.orig/doc/Makefile mgetty-1.1.36/doc/Makefile
+--- mgetty-1.1.36.orig/doc/Makefile	2009-08-22 09:25:53.000000000 +0200
++++ mgetty-1.1.36/doc/Makefile	2009-08-22 09:35:54.000000000 +0200
+@@ -63,7 +63,7 @@
+ 	      *.man *.[1-9] mgetty.texi
+ 
+ install: $(MANSRC) mgetty.info
+-	-mkdir `dirname $(MAN1DIR)` $(MAN1DIR) $(MAN4DIR) $(MAN5DIR) $(MAN8DIR) 2>/dev/null
++	mkdir -p $(MAN1DIR) $(MAN4DIR) $(MAN5DIR) $(MAN8DIR)
+ 	for i in $(MAN1PAGES) ; do \
+ 		$(INSTALL) -m 644 $$i $(MAN1DIR) ; \
+ 	done
+@@ -120,16 +120,16 @@
+ #
+ .SUFFIXES: .1in .4in .5in .8in .1 .4 .5 .8
+ 
+-.1in.1:
++.1in.1: ../sedscript
+ 	../sedscript <$< >$*.1
+ 
+-.4in.4:
++.4in.4: ../sedscript
+ 	../sedscript <$< >$*.4
+ 
+-.5in.5:
++.5in.5: ../sedscript
+ 	../sedscript <$< >$*.5
+ 
+-.8in.8:
++.8in.8: ../sedscript
+ 	../sedscript <$< >$*.8
+ 
+ #
+diff -Nru mgetty-1.1.36.orig/frontends/www/Makefile mgetty-1.1.36/frontends/www/Makefile
+--- mgetty-1.1.36.orig/frontends/www/Makefile	2006-02-22 18:25:32.000000000 +0100
++++ mgetty-1.1.36/frontends/www/Makefile	2009-08-22 09:39:03.000000000 +0200
+@@ -125,12 +125,12 @@
+ #
+ .SUFFIXES: .in .cgi .html
+ 
+-.in.cgi:
++.in.cgi: ../../sedscript
+ 	rm -f $*.cgi
+ 	../../sedscript <$< >$*.cgi
+ 	chmod +x $*.cgi
+ 
+-.in.html:
++.in.html: ../../sedscript
+ 	rm -f $*.html
+ 	../../sedscript <$< | \
+ 		sed -e "s!@CGI_HREF@!$(CGI_HREF)!" >$*.html
 diff -Nru mgetty-1.1.36.orig/fax/Makefile mgetty-1.1.36/fax/Makefile
 --- mgetty-1.1.36.orig/fax/Makefile	2006-02-22 19:25:30.000000000 +0200
 +++ mgetty-1.1.36/fax/Makefile	2007-09-14 23:02:58.000000000 +0300
diff --git a/net-dialup/mgetty/mgetty-1.1.36-r3.ebuild b/net-dialup/mgetty/mgetty-1.1.36-r3.ebuild
index 39cc969a1a2b..91321430fea6 100644
--- a/net-dialup/mgetty/mgetty-1.1.36-r3.ebuild
+++ b/net-dialup/mgetty/mgetty-1.1.36-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.36-r3.ebuild,v 1.3 2009/07/31 16:54:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.36-r3.ebuild,v 1.4 2009/08/22 08:51:39 mrness Exp $
 
 EAPI=1
 inherit toolchain-funcs flag-o-matic eutils
@@ -61,8 +61,7 @@ src_compile() {
 	use fidonet && append-flags "-DFIDO"
 	append-flags "-DAUTO_PPP"
 
-	# bug #279783
-	VARTEXFONTS="${T}"/fonts emake -j1 prefix=/usr \
+	VARTEXFONTS="${T}"/fonts emake prefix=/usr \
 		CC="$(tc-getCC)" \
 		CONFDIR=/etc/mgetty+sendfax \
 		CFLAGS="${CFLAGS}" \
@@ -71,24 +70,27 @@ src_compile() {
 }
 
 src_install () {
-	dodir /var/spool
+	# parallelization issue: vgetty-install target fails if install target
+	#                        isn't finished 
+	local targets
+	for targets in install "vgetty-install install-callback"; do
+		emake prefix="${D}/usr" \
+			INFODIR="${D}/usr/share/info" \
+			CONFDIR="${D}/etc/mgetty+sendfax" \
+			MAN1DIR="${D}/usr/share/man/man1" \
+			MAN4DIR="${D}/usr/share/man/man4" \
+			MAN5DIR="${D}/usr/share/man/man5" \
+			MAN8DIR="${D}/usr/share/man/man8" \
+			SBINDIR="${D}/usr/sbin" \
+			BINDIR="${D}/usr/bin" \
+			VOICE_DIR="${D}/var/spool/voice" \
+			PHONE_GROUP=fax \
+			PHONE_PERMS=755 \
+			spool="${D}/var/spool" \
+			${targets} || die "emake $targets failed."
+	done
+
 	keepdir /var/log/mgetty
-	dodir /usr/share/info
-
-	emake -j1 prefix="${D}/usr" \
-		INFODIR="${D}/usr/share/info" \
-		CONFDIR="${D}/etc/mgetty+sendfax" \
-		MAN1DIR="${D}/usr/share/man/man1" \
-		MAN4DIR="${D}/usr/share/man/man4" \
-		MAN5DIR="${D}/usr/share/man/man5" \
-		MAN8DIR="${D}/usr/share/man/man8" \
-		SBINDIR="${D}/usr/sbin" \
-		BINDIR="${D}/usr/bin" \
-		VOICE_DIR="${D}/var/spool/voice" \
-		PHONE_GROUP=fax \
-		PHONE_PERMS=755 \
-		spool="${D}/var/spool" \
-		install vgetty-install install-callback || die "make install failed."
 
 	#Install mgetty into /sbin (#119078)
 	dodir /sbin && \
@@ -97,7 +99,6 @@ src_install () {
 	#Don't install ct (#106337)
 	rm "${D}"/usr/bin/ct || die "failed to remove useless ct program"
 
-	cd "${S}"
 	dodoc BUGS ChangeLog README.1st Recommend THANKS TODO \
 		doc/*.txt doc/modems.db || die "dodoc failed."
 	doinfo doc/mgetty.info || die "doinfo failed."