[gentoo-commits] gentoo-x86 commit in app-misc/multimon: metadata.xml ChangeLog multimon-1.0-r2.ebuild

[gentoo-commits] gentoo-x86 commit in app-misc/multimon: metadata.xml ChangeLog multimon-1.0-r2.ebuild

[Justin Lecher (jlec)]

jlec        12/06/21 11:10:14

  Modified:             metadata.xml ChangeLog multimon-1.0-r2.ebuild
  Log:
  app-misc/multimon: Add fix for parallel build, #369713
  
  (Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  app-misc/multimon/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/multimon/metadata.xml?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/multimon/metadata.xml?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/multimon/metadata.xml?r1=1.3&r2=1.4

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/multimon/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml	23 Sep 2011 21:49:42 -0000	1.3
+++ metadata.xml	21 Jun 2012 11:10:13 -0000	1.4
@@ -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>



1.15                 app-misc/multimon/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/multimon/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/multimon/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/multimon/ChangeLog?r1=1.14&r2=1.15

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/multimon/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog	10 May 2012 15:15:51 -0000	1.14
+++ ChangeLog	21 Jun 2012 11:10:13 -0000	1.15
@@ -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



1.3                  app-misc/multimon/multimon-1.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/multimon/multimon-1.0-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/multimon/multimon-1.0-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/multimon/multimon-1.0-r2.ebuild?r1=1.2&r2=1.3

Index: multimon-1.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/multimon/multimon-1.0-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- multimon-1.0-r2.ebuild	1 Jun 2011 23:59:23 -0000	1.2
+++ multimon-1.0-r2.ebuild	21 Jun 2012 11:10:13 -0000	1.3
@@ -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 @@
 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() {