add patch from Sen. Santofimia, fix QA warn on 0.6.ebuild

(Portage version: 2.0.51.19)

6 files changed, 77 insertions, 8 deletions

diff --git a/media-radio/gmfsk/ChangeLog b/media-radio/gmfsk/ChangeLog
index 21c2aa8b603e..001c93cd42dd 100644
--- a/media-radio/gmfsk/ChangeLog
+++ b/media-radio/gmfsk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-radio/gmfsk
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/gmfsk/ChangeLog,v 1.2 2004/07/24 05:07:19 killsoft Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/gmfsk/ChangeLog,v 1.3 2005/03/07 06:12:35 killsoft Exp $
+
+  06 Mar 2005; Robb Romans <killsoft@gentoo.org>
+  +files/gmfsk-patch-mt63_dsp.h:
+  Add a patch from Francisco José Cañizares Santofimia,
+  obtained from Carl Makin, to enable compilation on certain
+  newer configurations. This may or may not be necessary
+  for your system, but shouldn't hurt anything.
 
   24 Jul 2004; Robb Romans <killsoft@gentoo.org> gmfsk-0.6.ebuild:
   Add docs
diff --git a/media-radio/gmfsk/Manifest b/media-radio/gmfsk/Manifest
index 5a8e50495f7a..7bff0cc8c4df 100644
--- a/media-radio/gmfsk/Manifest
+++ b/media-radio/gmfsk/Manifest
@@ -1,4 +1,8 @@
-MD5 3552a954235e853a6521f9fcb932d70b gmfsk-0.6.ebuild 827
-MD5 5f119731698bd682fc9fe66be22f71a0 ChangeLog 514
+MD5 a8d6e3f269dd00c7200c460aa17c793a ChangeLog.mine 819
+MD5 87174109077f80c4f30e360cf48d19c4 ChangeLog 730
 MD5 28d0c3bb6c80425620241cff231da8d3 metadata.xml 224
+MD5 ebe4b7324ece3ea177f4ff8d5c36f7d0 gmfsk-0.6-r1.ebuild 848
+MD5 8b97e1a4e9506d5e6ba74b723f495bb1 gmfsk-0.6.ebuild 731
+MD5 3b2985c7057b5000b272a85ad2fe5a77 files/digest-gmfsk-0.6-r1 61
+MD5 6f6f711166a2d339c81540d1ef9954af files/gmfsk-patch-mt63_dsp.h 800
 MD5 3b2985c7057b5000b272a85ad2fe5a77 files/digest-gmfsk-0.6 61
diff --git a/media-radio/gmfsk/files/digest-gmfsk-0.6-r1 b/media-radio/gmfsk/files/digest-gmfsk-0.6-r1
new file mode 100644
index 000000000000..3e5fe16eed08
--- /dev/null
+++ b/media-radio/gmfsk/files/digest-gmfsk-0.6-r1
@@ -0,0 +1 @@
+MD5 184840b31b85f6c4f86cdbe27f0644c8 gmfsk-0.6.tar.gz 540765
diff --git a/media-radio/gmfsk/files/gmfsk-patch-mt63_dsp.h b/media-radio/gmfsk/files/gmfsk-patch-mt63_dsp.h
new file mode 100644
index 000000000000..2fed48b35150
--- /dev/null
+++ b/media-radio/gmfsk/files/gmfsk-patch-mt63_dsp.h
@@ -0,0 +1,21 @@
+--- src/mt63/dsp.h.orig	Sat Sep 25 10:52:22 2004
++++ src/mt63/dsp.h	Sat Sep 25 10:58:58 2004
+@@ -555,15 +555,15 @@
+  inline void LowPass2(typeInp Inp, LowPass2elem &Elem,
+ 		typeW W1, typeW W2, typeW W5)
+ { double Sum, Diff;
+-  Sum=Elem.Mid+Elem.Out; Diff=Elem.Mid-Elem.Out; Elem.Mid+=W2*Inp-W1*Sum; Out+=W5*Diff; }
++  Sum=Elem.Mid+Elem.Out; Diff=Elem.Mid-Elem.Out; Elem.Mid+=W2*Inp-W1*Sum; Elem.Out+=W5*Diff; }
+ 
+ template <class typeInp>
+  inline void LowPass2(typeInp Inp, LowPass2elem &Elem, LowPass2weight &Weight)
+ { double Sum, Diff;
+   Sum=Elem.Mid+Elem.Out;
+   Diff=Elem.Mid-Elem.Out;
+-  Elem.Mid+=Weight.W2*Inp-Weigth.W1*Sum;
+-  Out+=Weight.W5*Diff; }
++  Elem.Mid+=Weight.W2*Inp-Weight.W1*Sum;
++  Elem.Out+=Weight.W5*Diff; }
+ 
+ /*
+ inline void LowPass2(float Inp, double &Mid, double &Out,
diff --git a/media-radio/gmfsk/gmfsk-0.6-r1.ebuild b/media-radio/gmfsk/gmfsk-0.6-r1.ebuild
new file mode 100644
index 000000000000..aabcc6621eca
--- /dev/null
+++ b/media-radio/gmfsk/gmfsk-0.6-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/gmfsk/gmfsk-0.6-r1.ebuild,v 1.1 2005/03/07 06:12:35 killsoft Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Gnome MFSK, RTTY, THROB, PSK31, MT63 and HELLSCHREIBER terminal"
+HOMEPAGE="http://gmfsk.connect.fi/index.html"
+SRC_URI="http://he.fi/pub/ham/unix/linux/hfmodems/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="doc"
+
+RDEPEND="virtual/libc
+	virtual/x11
+	gnome-base/gnome-libs
+	>=gnome-base/libgnomeui-2.0
+	gnome-extra/yelp
+	>=media-libs/hamlib-1.2.0
+	<sci-libs/fftw-3"
+
+DEPEND="${RDEPEND}
+	>=app-text/scrollkeeper-0.3.5
+	dev-util/pkgconfig
+	>=gnome-base/gconf-2.6"
+
+G2CONF="${G2CONF} --enable-hamlib"
+DOCS="AUTHORS COPYING COPYING-DOCS ChangeLog INSTALL NEWS README"
+
+src_unpack(){
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-patch-mt63_dsp.h || \
+		die "epatch failed"
+}
diff --git a/media-radio/gmfsk/gmfsk-0.6.ebuild b/media-radio/gmfsk/gmfsk-0.6.ebuild
index a2599390ec3c..154f7e653c6e 100644
--- a/media-radio/gmfsk/gmfsk-0.6.ebuild
+++ b/media-radio/gmfsk/gmfsk-0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/gmfsk/gmfsk-0.6.ebuild,v 1.5 2004/12/29 02:48:51 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/gmfsk/gmfsk-0.6.ebuild,v 1.6 2005/03/07 06:12:35 killsoft Exp $
 
 inherit gnome2
 
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="x86 ~ppc"
-IUSE=""
+IUSE="doc"
 
 RDEPEND="virtual/libc
 	virtual/x11
@@ -28,4 +28,3 @@ DEPEND="${RDEPEND}
 
 G2CONF="${G2CONF} --enable-hamlib"
 DOCS="AUTHORS COPYING COPYING-DOCS ChangeLog INSTALL NEWS README"
-