Version bump.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x762053D5

4 files changed, 158 insertions, 5 deletions

diff --git a/media-radio/flrig/ChangeLog b/media-radio/flrig/ChangeLog
index 28aebd73a883..9bc335609dcd 100644
--- a/media-radio/flrig/ChangeLog
+++ b/media-radio/flrig/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-radio/flrig
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/flrig/ChangeLog,v 1.28 2013/07/15 06:01:19 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/flrig/ChangeLog,v 1.29 2013/09/03 08:45:57 tomjbe Exp $
+
+*flrig-1.3.13 (03 Sep 2013)
+
+  03 Sep 2013; Thomas Beierlein <tomjbe@gentoo.org> +flrig-1.3.13.ebuild,
+  +files/vfprintf_bug.diff:
+  Version bump
 
   15 Jul 2013; Thomas Beierlein <tomjbe@gentoo.org> -flrig-1.3.10.ebuild,
   -flrig-1.3.11.ebuild:
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index b47f7b928cda..b9c6fd8bfe04 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX vfprintf_bug.diff 3016 SHA256 0f3cc1735cb467364b243492866960c156e9c5c1282492ec98d9d5d7a9e00c50 SHA512 a7191afdb5a6e373b720b4c802fd0b4646e8b77d5f6b971a2ebac40a64e55af9e0e2bfc6c74a87a27d9f28c30f36543a4e42f5bcf88a325b9831487145a53dd1 WHIRLPOOL 2153b83931905377ac6ea413e9708f469cf82a77a59bd6772b532b97e0ac4dfdde57d4c98881551ca1f91645816179b50ac5a96a7df221f4a2aa1753126f7c6b
 DIST flrig-1.3.12.tar.gz 571812 SHA256 8a7c0f1d0dcc34e0c925334cdf23cc23b7be902d269e2ea0679d3191412cfbed SHA512 77d096b5890de14a23b2453bba82d4a055d065fd4a6a4c0c4244b7bff44fa9dac3429e06cb69a67a31ec2b5ed6563b4b925f2758bf450f462749cb77be1a131d WHIRLPOOL e9445e66435e8bde748aff28830c3e2f56fd780c43032ebeaf0dff2f06a260728663883a2622f263ae5b808bc893483adee932a5ea4758d883117a4f97b24651
+DIST flrig-1.3.13.tar.gz 578415 SHA256 c5238bc72dc04a2b2ba741e093672990ec9ceecc7bfc4137b76d9e01a89dfdbb SHA512 be2460237745cb35687a3a982ad3f286ffeae437d3189848e648e2d4b144faa8e5dadef0a7c89787be5f380e31ac68c773955cf00487b185010d71c8d9f14c28 WHIRLPOOL 68e7686c71368adbec11b55de490c8d28b80ebd5b49f81992c0d2aeb463945809665cd47b329750294649ec055cd7adcdb5a9f2383bfa5ac625516cc1652b66f
 EBUILD flrig-1.3.12.ebuild 654 SHA256 8a39b0910c8779f55b01bc7406c6da27703b56b126d25a8f6b332cc533d140c3 SHA512 626963fab17ba89b4d438087f8da883a7f5c4f36520825227a69bae0a57d218af3581a98f2f7ab10eae31f1c805c024e8d2a5213df7f46c32a7788b60e35a22f WHIRLPOOL ac3951b9aebb84ddae4d3b27bfb0c52fda049c68ca73a14e2bf3ab99d79b13bc46bfccca289da2827389e846fcd25034673ade2a59e2ffea8990156249939323
-MISC ChangeLog 3651 SHA256 f3931494af0bf4d29dc946f6ca6094986e659585b6ff0960ffa7804a9339bd7d SHA512 d4e31f3213084a20b24d52c10d98ba94200b14496ecb994cf396eb3a090e6f05a702c6228f5ef1094abef8732fb3c2aaccf4de1aa0bbdd8da7130ae1b12ac44c WHIRLPOOL 8dace01aca0e42ae6ed5075c621dc3405298f29b70152471b0f8b1dedf5b6def16bfa5729037a564c06e56da25f241ae985890f3602b1f04ec2960d47d169536
+EBUILD flrig-1.3.13.ebuild 734 SHA256 d34a0c6147a173e616f607e8d0e540e18e6c5e18ef6d229819979c6564f6992f SHA512 009b326d10119e56f856c0bf22c26414c7ad6bc8ffd927bc938a4055bfe32d7128a193f161216087bda86f77de5015742823bc0de02d29dfc45fd6b2a78bc2d1 WHIRLPOOL 3257d1506a84db93fbb80afd68341c2a4e3a556e351721e10ab215c878f25f78ad1508c16b7056892ce16f08e3be2417f21844e7e7c820906e386470ee4b40af
+MISC ChangeLog 3798 SHA256 29ade30f643ce445c9fb979d516f28243bc0689db2ba16e36f98414affe6f988 SHA512 122a181d812d1afd5b8371acb131c97c64213ce1151bdecf590f50d5ad56277428c96c39ab805e508c4394c66bfc3e9d57c783313afebd0a1bace821e2f31c98 WHIRLPOOL 1dae5daa3505867eb3f087266d7c719351feda7e9572c2831d79ceca12e33d8f31e9c4939a692a50c29302d86cfa4a7448dd4def91933db7e4645b6b9cca6b94
 MISC metadata.xml 236 SHA256 c19d776cfd72a8a5833ea6d4c6a59f906f624aa5fd758527c2171d806a9f9096 SHA512 f95348dda4493774aa5123c211b9f7d2b2f8a7d18feea8e31d5b72e73afcc6617a5f4a7648698b0e3726f31ddaddec9545239d27f39c13a149906033c06827b1 WHIRLPOOL ad9eb3edb0f6cf0d91c23ac3d18489aa427468c6bb577f4bf3ce7be1ee87379ad154cbb8f370637f8105bfc02380de2063b6b4d0a5a61e1f5c9b2faf7303b0d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHjkEIACgkQQe4uqXYgU9VsbACfdRhrIrXHL6tkY9pTXP+42x0I
-+AkAnikGVam0uu4hRdVyZCeS5aalU/76
-=eSeh
+iEYEAREIAAYFAlIlocYACgkQQe4uqXYgU9V22QCfe0w6owjTQ8tA6kHa2wpfsT18
+9o8Ani+4R0PPQEaj09pf3o+I25ESnqrY
+=1sGM
 -----END PGP SIGNATURE-----
diff --git a/media-radio/flrig/files/vfprintf_bug.diff b/media-radio/flrig/files/vfprintf_bug.diff
new file mode 100644
index 000000000000..168a8af859b2
--- /dev/null
+++ b/media-radio/flrig/files/vfprintf_bug.diff
@@ -0,0 +1,112 @@
+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.13.ebuild b/media-radio/flrig/flrig-1.3.13.ebuild
new file mode 100644
index 000000000000..edf129a51fa6
--- /dev/null
+++ b/media-radio/flrig/flrig-1.3.13.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/flrig/flrig-1.3.13.ebuild,v 1.1 2013/09/03 08:45:57 tomjbe Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Transceiver control program for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
+SRC_URI="http://www.w1hkj.com/downloads/flrig/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/fltk:1
+	x11-misc/xdg-utils"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch "${FILESDIR}"/vfprintf_bug.diff
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	nonfatal dodoc AUTHORS ChangeLog README
+}