4 files changed, 118 insertions, 2 deletions
diff --git a/app-misc/multimon/ChangeLog b/app-misc/multimon/ChangeLog
index 70b09b529ab1..c807d84c9ef3 100644
--- a/app-misc/multimon/ChangeLog
+++ b/app-misc/multimon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/multimon
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/multimon/ChangeLog,v 1.11 2009/09/23 16:05:55 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/multimon/ChangeLog,v 1.12 2010/10/20 04:25:33 jer Exp $
+
+*multimon-1.0-r2 (20 Oct 2010)
+
+  20 Oct 2010; Jeroen Roovers <jer@gentoo.org> +multimon-1.0-r2.ebuild,
+  +files/multimon-1.0-flags.patch, +files/multimon-1.0-includes.patch:
+  Respect LDFLAGS (bug #337700), CC. Fix compiler warnings.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> multimon-1.0.ebuild,
   multimon-1.0-r1.ebuild:
diff --git a/app-misc/multimon/files/multimon-1.0-flags.patch b/app-misc/multimon/files/multimon-1.0-flags.patch
new file mode 100644
index 000000000000..232cb4e15ac2
--- /dev/null
+++ b/app-misc/multimon/files/multimon-1.0-flags.patch
@@ -0,0 +1,46 @@
+--- Makefile.orig	1997-12-08 17:56:05.000000000 +0100
++++ Makefile	2010-10-20 06:16:56.000000000 +0200
+@@ -8,7 +8,7 @@
+ else
+ CFLAGS		+=-O3 -DSUN_AUDIO -DARCH_SPARC
+ endif
+-LDFLAGSX	=-lX11 -L/usr/X11R6/lib -R/usr/X11R6/lib -lsocket -lnsl
++LIBSX	=-lX11 -L/usr/X11R6/lib -R/usr/X11R6/lib -lsocket -lnsl
+ else
+ ifeq ($(DEBUG),y)
+ CFLAGS		+=-g -O -m486 -malign-loops=2 -malign-jumps=2 \
+@@ -17,7 +17,7 @@
+ CFLAGS		+=-O3 -m486 -malign-loops=2 -malign-jumps=2 \
+ 		  -malign-functions=2 -DARCH_I386
+ endif
+-LDFLAGSX	=-lX11 -L/usr/X11R6/lib
++LIBSX	=-lX11 -L/usr/X11R6/lib
+ endif
+ 
+ 
+@@ -28,7 +28,7 @@
+ 
+ AS		=as
+ LD		=ld
+-LDFLAGS		=-lm
++LIBS		=-lm
+ HOSTCC		=gcc
+ CC		=gcc
+ MAKE		=make
+@@ -67,13 +67,13 @@
+ 		$(MKDIR) $(BINDIR)
+ 
+ $(BINDIR)/multimon:	$(OBJ_L2) $(OBJ_L1) $(OBJ_MISC)
+-			$(CC) $^ $(LDFLAGS) $(LDFLAGSX) -o $@
++			$(CC) $(LDFLAGS) $^ $(LIBS) $(LIBSX) -o $@
+ 
+ $(BINDIR)/gen:		$(OBJ_GEN)
+-			$(CC) $^ $(LDFLAGS) -o $@
++			$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+ $(BINDIR)/mkcostab:	$(BINDIR)/mkcostab.o
+-			$(CC) $^ $(LDFLAGS) -o $@
++			$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+ costabi.c costabf.c:	$(BINDIR)/mkcostab
+ 			$(BINDIR)/mkcostab
diff --git a/app-misc/multimon/files/multimon-1.0-includes.patch b/app-misc/multimon/files/multimon-1.0-includes.patch
new file mode 100644
index 000000000000..940841382d00
--- /dev/null
+++ b/app-misc/multimon/files/multimon-1.0-includes.patch
@@ -0,0 +1,20 @@
+--- mkcostab.c.orig	1997-12-08 17:56:06.000000000 +0100
++++ mkcostab.c	2010-10-20 06:20:08.000000000 +0200
+@@ -23,6 +23,7 @@
+ 
+ #include <math.h>
+ #include <stdio.h>
++#include <stdlib.h> /* exit() */
+ 
+ /* ---------------------------------------------------------------------- */
+ 
+--- xdisplay.c.orig	1997-12-08 17:56:06.000000000 +0100
++++ xdisplay.c	2010-10-20 06:19:37.000000000 +0200
+@@ -36,6 +36,7 @@
+ #include <X11/X.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
++#include <stdlib.h> /* abort() exit() */
+ 
+ /* ---------------------------------------------------------------------- */
+ 
diff --git a/app-misc/multimon/multimon-1.0-r2.ebuild b/app-misc/multimon/multimon-1.0-r2.ebuild
new file mode 100644
index 000000000000..7812d0db4d03
--- /dev/null
+++ b/app-misc/multimon/multimon-1.0-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 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.1 2010/10/20 04:25:33 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+S=${WORKDIR}/multimon
+SRC_URI="http://www.baycom.org/~tom/ham/linux/multimon.tar.gz"
+HOMEPAGE="http://www.baycom.org/~tom/ham/linux/multimon.html"
+DESCRIPTION="Multimon decodes digital transmission codes using OSS"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-flags.patch \
+		"${FILESDIR}"/${P}-includes.patch
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CC=$(tc-getCC) || die
+}
+
+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
+}
+
+pkg_postinst() {
+	ewarn "The gen command has been renamed to multimon-gen to avoid conflicts"
+	ewarn "with dev-ruby/gen (#247156)"
+}