Import ubuntu fixes and improvements

(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, signed Manifest commit with key 1191738E)

2 files changed, 56 insertions, 1 deletions

diff --git a/app-misc/multimon/ChangeLog b/app-misc/multimon/ChangeLog
index bb2da76b96d1..2ee628da59f0 100644
--- a/app-misc/multimon/ChangeLog
+++ b/app-misc/multimon/ChangeLog
@@ -1,6 +1,11 @@
 # 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.18 2012/11/21 13:19:59 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/multimon/ChangeLog,v 1.19 2012/12/16 09:40:26 lu_zero Exp $
+
+*multimon-1.0-r3 (16 Dec 2012)
+
+  16 Dec 2012; Luca Barbato <lu_zero@gentoo.org> +multimon-1.0-r3.ebuild:
+  Import ubuntu fixes and improvements
 
   21 Nov 2012; Michael Palimaka <kensington@gentoo.org> -multimon-1.0.ebuild:
   Remove old.
diff --git a/app-misc/multimon/multimon-1.0-r3.ebuild b/app-misc/multimon/multimon-1.0-r3.ebuild
new file mode 100644
index 000000000000..89de010ba4ae
--- /dev/null
+++ b/app-misc/multimon/multimon-1.0-r3.ebuild
@@ -0,0 +1,50 @@
+# 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-r3.ebuild,v 1.1 2012/12/16 09:40:26 lu_zero Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Decoding digital transmission codes"
+HOMEPAGE="http://www.baycom.org/~tom/ham/linux/multimon.html"
+SRC_URI="http://www.baycom.org/~tom/ham/linux/multimon.tar.gz
+		 http://dev.gentoo.org/~lu_zero/distfiles/${P}-ubuntu.patch.xz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+S=${WORKDIR}/multimon
+
+src_prepare() {
+	epatch \
+		"${WORKDIR}"/${P}-ubuntu.patch \
+		"${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 CFLAGS="${CFLAGS}" CC=$(tc-getCC)
+}
+
+src_install() {
+	mv gen multimon-gen
+	dobin multimon-gen mkcostab multimon
+	doman multimon.1 multimon-gen.1
+}
+
+pkg_postinst() {
+	ewarn "The gen command has been renamed to multimon-gen to avoid conflicts"
+	ewarn "with dev-ruby/gen (#247156)"
+}