Builds with dash (bug #526554). Drop old. Version bump

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x762053D5)

5 files changed, 33 insertions, 115 deletions

diff --git a/media-radio/flrig/ChangeLog b/media-radio/flrig/ChangeLog
index 7331b1a1f51e..11e496e4b118 100644
--- a/media-radio/flrig/ChangeLog
+++ b/media-radio/flrig/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-radio/flrig
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/flrig/ChangeLog,v 1.36 2014/10/10 11:07:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/flrig/ChangeLog,v 1.37 2014/12/13 13:19:46 tomjbe Exp $
+
+*flrig-1.3.18 (13 Dec 2014)
+
+  13 Dec 2014; Thomas Beierlein <tomjbe@gentoo.org> -flrig-1.3.15.ebuild,
+  flrig-1.3.16.ebuild, +flrig-1.3.18.ebuild, +files/fix-bashism.patch,
+  -files/vfprintf_bug.diff:
+  Builds with dash (bug #526554). Drop old. Version bump
 
   10 Oct 2014; Agostino Sarubbo <ago@gentoo.org> flrig-1.3.16.ebuild:
   Stable for x86, wrt bug #519468
diff --git a/media-radio/flrig/files/fix-bashism.patch b/media-radio/flrig/files/fix-bashism.patch
new file mode 100644
index 000000000000..53dac6b27d6c
--- /dev/null
+++ b/media-radio/flrig/files/fix-bashism.patch
@@ -0,0 +1,11 @@
+--- m4/fltk.m4.orig	2014-12-13 13:46:29.000000000 +0100
++++ m4/fltk.m4	2014-12-13 14:03:44.000000000 +0100
+@@ -38,7 +38,7 @@
+           FLTK_LIBS=`$FLTK_CONFIG --ldflags --use-images`
+           if test "x$target_mingw32" != "xyes"; then
+               if test "x$target_darwin" != "xyes"; then
+-                  if grep -q "lX11" <<< "$FLTK_LIBS"; then
++                  if echo "$FLTK_LIBS" | grep -q "lX11" ; then
+                       FLTK_LIBS="$FLTK_LIBS";
+                   else
+                       FLTK_LIBS="$FLTK_LIBS -lm -lX11";
diff --git a/media-radio/flrig/files/vfprintf_bug.diff b/media-radio/flrig/files/vfprintf_bug.diff
deleted file mode 100644
index 168a8af859b2..000000000000
--- a/media-radio/flrig/files/vfprintf_bug.diff
+++ /dev/null
@@ -1,112 +0,0 @@
-commit 224cde7b724f847f5f3018e22828308bf9355a7f
-Author: David Freese <w1hkj@w1hkj.com>
-Date:   Thu Aug 29 13:18:06 2013 -0500
-
-    vfprintf bug on 64 bit Linux systems
-    
-      * removed use of vfprintf in debug.cxx
-
-diff --git a/src/debug.cxx b/src/debug.cxx
-index d4dc4ac..1e64677 100644
---- a/src/debug.cxx
-+++ b/src/debug.cxx
-@@ -125,8 +125,9 @@ void debug::log(level_e level, const char* func, const char* srcf, int line, con
- 	va_start(args, format);
- 
- 	vsnprintf(sztemp, sizeof(sztemp), fmt, args);
-+
- 	estr.append(sztemp);
--	vfprintf(wfile, fmt, args);
-+	fprintf(wfile, "%s", sztemp);
- 
- 	va_end(args);
- 
-@@ -149,7 +150,7 @@ void debug::slog(level_e level, const char* func, const char* srcf, int line, co
- 
- 	vsnprintf(sztemp, sizeof(sztemp), fmt, args);
- 	estr.append(sztemp);
--	vfprintf(wfile, fmt, args);
-+	fprintf(wfile, "%s", sztemp);
- 	va_end(args);
- 
- 	fflush(wfile);
-@@ -157,7 +158,8 @@ void debug::slog(level_e level, const char* func, const char* srcf, int line, co
- 	if (tty) {
- 		if (level <= DEBUG_LEVEL && level >= QUIET_LEVEL) {
- 			va_start(args, format);
--			vfprintf(stderr, fmt, args);
-+			vsnprintf(sztemp, sizeof(sztemp), fmt, args);
-+			fprintf(wfile, "%s", sztemp);
- 			va_end(args);
- 		}
- 	}
-diff --git a/src/dialogs.cxx b/src/dialogs.cxx
-index 106fd40..aeeed3c 100644
---- a/src/dialogs.cxx
-+++ b/src/dialogs.cxx
-@@ -138,7 +138,7 @@ void init_port_combos()
- 	ssize_t len;
- 	struct dirent* dp;
- 
--	LOG_WARN("%s", "Searching /sys/class/tty/");
-+	LOG_INFO("%s", "Searching /sys/class/tty/");
- 
- 	while ((dp = readdir(sys))) {
- #  ifdef _DIRENT_HAVE_D_TYPE
-@@ -152,7 +152,7 @@ void init_port_combos()
- 			snprintf(ttyname, sizeof(ttyname), "/dev/%s", dp->d_name);
- 			if (stat(ttyname, &st) == -1 || !S_ISCHR(st.st_mode))
- 				continue;
--			LOG_WARN("Found serial port %s", ttyname);
-+			LOG_INFO("Found serial port %s", ttyname);
- 			add_combos(ttyname);
- 			ret = true;
- 		}
-diff --git a/src/rig.cxx b/src/rig.cxx
-index cd29649..c537719 100644
---- a/src/rig.cxx
-+++ b/src/rig.cxx
-@@ -286,21 +286,6 @@ int main (int argc, char *argv[])
- 		RigHomeDir = dirbuf;
- 	checkdirectories();
- 
--	progStatus.loadLastState();
--
--	if (progStatus.UIsize == small_ui)
--		mainwindow = Small_rig_window();
--	else
--		mainwindow = Wide_rig_window();
--
--	mainwindow->callback(exit_main);
--
--	progStatus.UI_laststate();
--
--	fntbrowser = new Font_Browser;
--	dlgMemoryDialog = Memory_Dialog();
--	dlgDisplayConfig = DisplayDialog();
--
- 	try {
- 		debug::start(string(RigHomeDir).append("debug_log.txt").c_str());
- 		time_t t = time(NULL);
-@@ -316,6 +301,21 @@ int main (int argc, char *argv[])
- 		exit(1);
- 	}
- 
-+	progStatus.loadLastState();
-+
-+	if (progStatus.UIsize == small_ui)
-+		mainwindow = Small_rig_window();
-+	else
-+		mainwindow = Wide_rig_window();
-+
-+	mainwindow->callback(exit_main);
-+
-+	progStatus.UI_laststate();
-+
-+	fntbrowser = new Font_Browser;
-+	dlgMemoryDialog = Memory_Dialog();
-+	dlgDisplayConfig = DisplayDialog();
-+
- 	Fl::lock();
- 
- #if defined(__WIN32__) && defined(PTW32_STATIC_LIB)
diff --git a/media-radio/flrig/flrig-1.3.16.ebuild b/media-radio/flrig/flrig-1.3.16.ebuild
index 6e8b3b8e863d..2602aa252d25 100644
--- a/media-radio/flrig/flrig-1.3.16.ebuild
+++ b/media-radio/flrig/flrig-1.3.16.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/flrig/flrig-1.3.16.ebuild,v 1.3 2014/10/10 11:07:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/flrig/flrig-1.3.16.ebuild,v 1.4 2014/12/13 13:19:46 tomjbe Exp $
 
 EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="Transceiver control program for Amateur Radio use"
 HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
@@ -20,6 +21,11 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
+src_prepare() {
+	epatch "${FILESDIR}"/fix-bashism.patch
+	eautoreconf
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 	nonfatal dodoc AUTHORS ChangeLog README
diff --git a/media-radio/flrig/flrig-1.3.15.ebuild b/media-radio/flrig/flrig-1.3.18.ebuild
index d6f4c8ec9d0c..c5b38884e0cb 100644
--- a/media-radio/flrig/flrig-1.3.15.ebuild
+++ b/media-radio/flrig/flrig-1.3.18.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/flrig/flrig-1.3.15.ebuild,v 1.1 2014/02/06 17:39:20 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/flrig/flrig-1.3.18.ebuild,v 1.1 2014/12/13 13:19:46 tomjbe Exp $
 
 EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="Transceiver control program for Amateur Radio use"
 HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
@@ -20,6 +21,11 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
+src_prepare() {
+	epatch "${FILESDIR}"/fix-bashism.patch
+	eautoreconf
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 	nonfatal dodoc AUTHORS ChangeLog README