app-misc/multimon: Add fix for parallel build, #369713

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

4 files changed, 97 insertions, 16 deletions

diff --git a/app-misc/multimon/ChangeLog b/app-misc/multimon/ChangeLog
index 79363aaff8c7..1da0f48f1704 100644
--- a/app-misc/multimon/ChangeLog
+++ b/app-misc/multimon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/multimon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/multimon/ChangeLog,v 1.14 2012/05/10 15:15:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/multimon/ChangeLog,v 1.15 2012/06/21 11:10:13 jlec Exp $
+
+  21 Jun 2012; Justin Lecher <jlec@gentoo.org> multimon-1.0-r2.ebuild,
+  +files/multimon-1.0-prll.patch, metadata.xml:
+  Add fix for parallel build, #369713
 
   10 May 2012; Agostino Sarubbo <ago@gentoo.org> -multimon-1.0-r1.ebuild:
   Remove old
diff --git a/app-misc/multimon/files/multimon-1.0-prll.patch b/app-misc/multimon/files/multimon-1.0-prll.patch
new file mode 100644
index 000000000000..0664bea9e9c1
--- /dev/null
+++ b/app-misc/multimon/files/multimon-1.0-prll.patch
@@ -0,0 +1,75 @@
+ Makefile |   35 ++++++++++++++++-------------------
+ 1 files changed, 16 insertions(+), 19 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 74453f2..28a3b7d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -37,15 +37,15 @@ AR		=ar
+ STRIP		=strip
+ MKDIR		=mkdir
+ 
+-all:		$(BINDIR) $(BINDIR)/multimon $(BINDIR)/gen
++all:		 multimon gen
+ 
+-$(BINDIR)/%.s:	%.c
++%.s:	%.c
+ 		$(CC) $(CFLAGS) -S -o $@ $<
+ 
+-$(BINDIR)/%.o:	$(BINDIR)/%.s
++%.o:	%.s
+ 		$(AS) -c -o $@ $<
+ 
+-$(BINDIR)/%.o:	%.c
++%.o:	%.c
+ 		$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ SRC_L2		=hdlc.c pocsag.c
+@@ -57,26 +57,23 @@ SRC_MISC	=unixinput.c costabf.c xdisplay.c
+ 
+ SRC_GEN		=gen.c gen_dtmf.c gen_sin.c gen_zvei.c gen_hdlc.c costabi.c
+ 
+-OBJ_L2		=$(SRC_L2:%.c=$(BINDIR)/%.o)
+-OBJ_L1		=$(SRC_L1:%.c=$(BINDIR)/%.o)
+-OBJ_MISC	=$(SRC_MISC:%.c=$(BINDIR)/%.o)
++OBJ_L2		=$(SRC_L2:%.c=%.o)
++OBJ_L1		=$(SRC_L1:%.c=%.o)
++OBJ_MISC	=$(SRC_MISC:%.c=%.o)
+ 
+-OBJ_GEN		=$(SRC_GEN:%.c=$(BINDIR)/%.o)
++OBJ_GEN		=$(SRC_GEN:%.c=%.o)
+ 
+-$(BINDIR):
+-		$(MKDIR) $(BINDIR)
+-
+-$(BINDIR)/multimon:	$(OBJ_L2) $(OBJ_L1) $(OBJ_MISC)
++multimon:	$(OBJ_L2) $(OBJ_L1) $(OBJ_MISC)
+ 			$(CC) $(LDFLAGS) $^ $(LIBS) $(LIBSX) -o $@
+ 
+-$(BINDIR)/gen:		$(OBJ_GEN)
++gen:		$(OBJ_GEN)
+ 			$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+-$(BINDIR)/mkcostab:	$(BINDIR)/mkcostab.o
++mkcostab:	mkcostab.o
+ 			$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+-costabi.c costabf.c:	$(BINDIR)/mkcostab
+-			$(BINDIR)/mkcostab
++costabi.c costabf.c:	mkcostab
++			./mkcostab
+ 
+ clean:
+ 		$(RM) -f core `find . -name '*.[oas]' -print`
+@@ -85,8 +82,8 @@ clean:
+ 
+ 
+ depend dep:
+-		$(CPP) -M $(CFLAGS) $(SRC_MISC) $(SRC_L1) $(SRC_L2) $(SRC_GEN) mkcostab.c > $(BINDIR)/.depend
++		$(CPP) -M $(CFLAGS) $(SRC_MISC) $(SRC_L1) $(SRC_L2) $(SRC_GEN) mkcostab.c > .depend
+ 
+-ifeq ($(BINDIR)/.depend,$(wildcard $(BINDIR)/.depend))
+-include $(BINDIR)/.depend
++ifeq (.depend,$(wildcard .depend))
++include .depend
+ endif
diff --git a/app-misc/multimon/metadata.xml b/app-misc/multimon/metadata.xml
index d9cd2cad66c2..91f4e72fb544 100644
--- a/app-misc/multimon/metadata.xml
+++ b/app-misc/multimon/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/multimon/multimon-1.0-r2.ebuild b/app-misc/multimon/multimon-1.0-r2.ebuild
index b1d8a4f0b313..7495966ff0e2 100644
--- a/app-misc/multimon/multimon-1.0-r2.ebuild
+++ b/app-misc/multimon/multimon-1.0-r2.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/multimon/multimon-1.0-r2.ebuild,v 1.2 2011/06/01 23:59:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/multimon/multimon-1.0-r2.ebuild,v 1.3 2012/06/21 11:10:13 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils toolchain-funcs
 
-S=${WORKDIR}/multimon
-SRC_URI="http://www.baycom.org/~tom/ham/linux/multimon.tar.gz"
+DESCRIPTION="Decoding digital transmission codes"
 HOMEPAGE="http://www.baycom.org/~tom/ham/linux/multimon.html"
-DESCRIPTION="Multimon decodes digital transmission codes using OSS"
+SRC_URI="http://www.baycom.org/~tom/ham/linux/multimon.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -17,26 +16,29 @@ KEYWORDS="~ppc ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
-
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
+S=${WORKDIR}/multimon
+
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-flags.patch \
+		"${FILESDIR}"/${P}-prll.patch \
 		"${FILESDIR}"/${P}-includes.patch
+	sed \
+		-e '/^$(BINDIR)\//s:$: $(BINDIR):g' \
+		-i Makefile || die
 }
 
 src_compile() {
 	# bug #369713
-	emake -j1 CFLAGS="${CFLAGS}" CC=$(tc-getCC) || die
+	emake CFLAGS="${CFLAGS}" CC=$(tc-getCC)
 }
 
 src_install() {
-	local myarch
-	myarch=`uname -m`
-	mv bin-${myarch}/gen bin-${myarch}/multimon-gen
-	dobin bin-${myarch}/multimon-gen bin-${myarch}/mkcostab bin-${myarch}/multimon
+	mv gen multimon-gen
+	dobin multimon-gen mkcostab multimon
 }
 
 pkg_postinst() {