media-radio/fldigi: Fix -Werror=terminate problem (bug #622686) Tnx Toralf.

Furthermore fix homepage

Package-Manager: Portage-2.3.6, Repoman-2.3.2

diff --git a/media-radio/fldigi/files/fldigi-c++11.patch b/media-radio/fldigi/files/fldigi-c++11.patch
new file mode 100644 (file)
index 0000000..0ca08c4
--- /dev/null
+++ b/media-radio/fldigi/files/fldigi-c++11.patch
@@ -0,0 +1,41 @@
+#fix -Werror=terminate
+--- /src/soundcard/sound.cxx.orig      2017-06-28 12:58:41.682698479 +0000
++++ /src/soundcard/sound.cxx   2017-06-28 13:02:44.862055549 +0000
+@@ -143,7 +143,7 @@
+ #endif
+ }
+ 
+-SoundBase::~SoundBase()
++SoundBase::~SoundBase() throw (SndException)
+ {
+       delete [] wrt_buffer;
+ 
+@@ -1091,7 +1091,7 @@
+       memset(fbuf, 0, 2 * SND_BUF_LEN * sizeof(*fbuf));
+ }
+ 
+-SoundPort::~SoundPort()
++SoundPort::~SoundPort() throw (SndException)
+ {
+       Close();
+ 
+--- /src/include/sound.h.orig  2017-06-28 12:59:04.670899172 +0000
++++ /src/include/sound.h       2017-06-28 13:00:41.253335034 +0000
+@@ -119,7 +119,7 @@
+ 
+ public:
+       SoundBase();
+-      virtual ~SoundBase();
++      virtual ~SoundBase() throw (SndException);
+       virtual int     Open(int mode, int freq = 8000) = 0;
+       virtual void    Close(unsigned dir = UINT_MAX) = 0;
+       virtual void    Abort(unsigned dir = UINT_MAX) = 0;
+@@ -213,7 +213,7 @@
+ 
+ public:
+         SoundPort(const char *in_dev, const char *out_dev);
+-        ~SoundPort();
++        ~SoundPort() throw (SndException);
+       int             Open(int mode, int freq = 8000);
+       void            Close(unsigned dir = UINT_MAX);
+       void            Abort(unsigned dir = UINT_MAX);

diff --git a/media-radio/fldigi/fldigi-4.0.4-r1.ebuild b/media-radio/fldigi/fldigi-4.0.4-r1.ebuild
new file mode 100644 (file)
index 0000000..46fd4cc
--- /dev/null
+++ b/media-radio/fldigi/fldigi-4.0.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hamlib nls portaudio pulseaudio sndfile"
+
+RDEPEND="x11-libs/fltk:1[threads,xft]
+       media-libs/libsamplerate
+       media-libs/libpng:0
+       x11-misc/xdg-utils
+       dev-perl/RPC-XML
+       dev-perl/Term-ReadLine-Perl
+       hamlib? ( media-libs/hamlib )
+       portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+       pulseaudio? ( media-sound/pulseaudio )
+       sndfile? ( >=media-libs/libsndfile-1.0.10 )"
+DEPEND="${RDEPEND}
+       nls? ( sys-devel/gettext )
+       virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+       epatch "$FILESDIR"/$PN-c++11.patch
+}
+
+src_configure() {
+       econf $(use_with sndfile) \
+               $(use_with portaudio) \
+               $(use_with hamlib) \
+               $(use_enable nls) \
+               $(use_with pulseaudio) \
+               --without-asciidoc
+}

diff --git a/media-radio/fldigi/fldigi-4.0.5.ebuild b/media-radio/fldigi/fldigi-4.0.5.ebuild
index 7821860fabfcde2a1d32341b67bd5fb9aa6ab589..1610c05c209b6a89c2f3e649fd5ac7d128e560cb 100644 (file)
--- a/media-radio/fldigi/fldigi-4.0.5.ebuild
+++ b/media-radio/fldigi/fldigi-4.0.5.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=5
 
+inherit eutils
+
 DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
 HOMEPAGE="http://www.w1hkj.com"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -28,6 +30,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
+src_prepare() {
+       epatch "$FILESDIR"/$PN-c++11.patch
+}
+
 src_configure() {
        econf --with-sndfile \
                --with-portaudio \