media-radio/tucnak2: Version bump

svn path=/sunrise/; revision=7063

8 files changed, 60 insertions, 30 deletions

diff --git a/media-radio/tucnak2/ChangeLog b/media-radio/tucnak2/ChangeLog
index 71365d07f..0982eb963 100644
--- a/media-radio/tucnak2/ChangeLog
+++ b/media-radio/tucnak2/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Sep 2008; Thomas Beierlein (TomJBE) <tb@forth-ev.de>
+  -tucnak2-2.13.ebuild, -files/tucnak2-2.13-appname.diff,
+  -files/tucnak2-2.13-config.diff, -files/tucnak2-2.13-doc.diff,
+  +tucnak2-2.14.ebuild, +files/tucnak2-2.14-appname.diff,
+  +files/tucnak2-2.14-config.diff, +files/tucnak2-2.14-doc.diff,
+  metadata.xml:
+  Version bump
+
   31 Aug 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> metadata.xml:
   Remove global useflags from metadata.xml
 
diff --git a/media-radio/tucnak2/Manifest b/media-radio/tucnak2/Manifest
index 58a39e449..360ffd0d8 100644
--- a/media-radio/tucnak2/Manifest
+++ b/media-radio/tucnak2/Manifest
@@ -1,7 +1,7 @@
-AUX tucnak2-2.13-appname.diff 806 RMD160 aac0757f3f43e8a1d15d181fb85324d522a2e532 SHA1 7c5de44a16155dbad40bfee1624664fdb6f43469 SHA256 473fb39322558de6d6f5fadba2d297d2d33c504932420538c49b86064d9afe68
-AUX tucnak2-2.13-config.diff 2477 RMD160 dfbecdc8f90f48c851ee1d5635edfe436676e62c SHA1 11a444de0842cf37c4545eb37fa0e5ffa12043b6 SHA256 e8a656f41baee785b1b8b22856de1192fa694f3a3eeed19d0369a2330897b486
-AUX tucnak2-2.13-doc.diff 476 RMD160 13dd70e5df9cf94456594e6676c5d7268991ad66 SHA1 c416627e64f72187df7dcbb6749d5ae7dde69f16 SHA256 9e463ad9677f88584772991a40d7c856f4c70f7d6f7366f54fee485aa2417e28
-DIST tucnak2-2.13.tar.gz 2639024 RMD160 dcb29386d1229dc3ccef67246f0a79f3911e988a SHA1 2ea836a2e51114493696d39abe2561d17a8825f0 SHA256 7b7614352d03c12b33b9feca3bcc7be3c81892c675e9d85f302eee7d68f20e9e
-EBUILD tucnak2-2.13.ebuild 1354 RMD160 ffbd65ccd976bde7ecf7374e946d8ad858bd9d2b SHA1 aeccad6f124f6a12fd72c475397e34ac7cda5949 SHA256 ab83c5c4dce699c733cac843a87bfabab2c7f3e60b401facfb7075db7dd00d72
-MISC ChangeLog 1504 RMD160 d61d20e66d4b36dbc79c0a133a5eabafa2876e9d SHA1 161f7aac5d7e6917633299e63ee2455b2199c1c7 SHA256 a69aa29ea2581459fdf5e3b2e89023d43de10a1961aa5f86c4397bb4d581ec4e
-MISC metadata.xml 247 RMD160 9d34532c6494347616d04cb3039213ba75861143 SHA1 f3443b51b6c485247d8eb1110073d51db006a9b8 SHA256 39a93470f595ce378e0742b23d34104e8e447de7a233db305f24dbd91841aa7c
+AUX tucnak2-2.14-appname.diff 845 RMD160 c83637db52677d9330ff2149eb4a0e8a16e3d593 SHA1 2c93899d834fe23f7587aa33ee7ccb02c38d8874 SHA256 6ea955cebcce23a92526ee3b2da54c4b86311a76300026a69312c3db0c797508
+AUX tucnak2-2.14-config.diff 2987 RMD160 c2f55a0330ceaad7d3e22ea54fd4a967cc8f5451 SHA1 d59165dc88459cb4c8e843b1f1565d87fd87745f SHA256 b1a52b55513e47f46e2b8d6813e0d13c80a95beaec2e6a590c4861b3e37e6bec
+AUX tucnak2-2.14-doc.diff 476 RMD160 13dd70e5df9cf94456594e6676c5d7268991ad66 SHA1 c416627e64f72187df7dcbb6749d5ae7dde69f16 SHA256 9e463ad9677f88584772991a40d7c856f4c70f7d6f7366f54fee485aa2417e28
+DIST tucnak2-2.14.tar.gz 2580866 RMD160 a4a9c326005ba115344ed0baad41c783967f39b5 SHA1 b2e8afb53111843bbeb8df331a7a233586cdbebb SHA256 e320542b22b03ac098c2b896c91e0edb146c55fb79039bdb63ee712c5e11fd87
+EBUILD tucnak2-2.14.ebuild 1411 RMD160 823bd71583b87d2a454dd7d34fa43d87195c0e6e SHA1 20e738c3be8dccbb84c3566d3a7751fe18820a1f SHA256 54c680c574c2eb3d55c54c3ebfcd6a11dd699065753f165646b7db4e04b2ccff
+MISC ChangeLog 1840 RMD160 a815602552143c8d6b0a751c9211440aaf3477e0 SHA1 29fc5e1acb605a1d5de08bc1065e9e073c872051 SHA256 90f736c1a3d66d0f75be7c0bb2d0935506e42ba5b05331773439f7b511a2290f
+MISC metadata.xml 391 RMD160 22e7912a7d553ab7cf975979a92ededa635c9fe8 SHA1 5119aafa95ce5eb3db11c6858f5b1af2b4fec84d SHA256 7673503bb52f61a4e4c58463d1fd32196ad5ac54038af8a317b0ee0e1952862d
diff --git a/media-radio/tucnak2/files/tucnak2-2.13-appname.diff b/media-radio/tucnak2/files/tucnak2-2.13-appname.diff
deleted file mode 100644
index cbed66173..000000000
--- a/media-radio/tucnak2/files/tucnak2-2.13-appname.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/Makefile.am.orig	2008-08-12 20:39:03.000000000 +0200
-+++ src/Makefile.am	2008-08-12 20:39:23.000000000 +0200
-@@ -1,7 +1,7 @@
- #bin_PROGRAMS = tucnak soundwrapper stucnak
--bin_PROGRAMS = tucnak soundwrapper 
-+bin_PROGRAMS = tucnak2 soundwrapper 
- 
--tucnak_SOURCES = adif.c alsa.c bfu.c charsets.c codepage.h codepage.inc \
-+tucnak2_SOURCES = adif.c alsa.c bfu.c charsets.c codepage.h codepage.inc \
- 	control.c cor.c cor.h cor.inc \
- 	cwdaemon.c cwdb.c cwwindow.c davac4.c dsp.c dwdb.c dxc.c ebw.c edi.c \
- 	error.c fifo.c font.c font.inc gfx_png.c ghash.c \
-@@ -14,7 +14,7 @@
- 	ssbd.c stats.c subwin.c terminal.c threadpipe.c titlpage.c \
- 	ttys.c txts.c txts.h txts.inc uni_7b.inc wizz.c
- 
--tucnak_LDADD = @TUCNAK_LDADD@
-+tucnak2_LDADD = @TUCNAK_LDADD@
- 
- soundwrapper_SOURCES = soundwrapper.c	
- 
diff --git a/media-radio/tucnak2/files/tucnak2-2.14-appname.diff b/media-radio/tucnak2/files/tucnak2-2.14-appname.diff
new file mode 100644
index 000000000..4e4764a2b
--- /dev/null
+++ b/media-radio/tucnak2/files/tucnak2-2.14-appname.diff
@@ -0,0 +1,21 @@
+--- src/Makefile.am.orig	2008-09-03 13:35:33.000000000 +0200
++++ src/Makefile.am	2008-09-11 10:57:05.000000000 +0200
+@@ -1,7 +1,7 @@
+ #bin_PROGRAMS = tucnak soundwrapper stucnak
+-bin_PROGRAMS = tucnak soundwrapper 
++bin_PROGRAMS = tucnak2 soundwrapper 
+ 
+-tucnak_SOURCES = excdb.c adif.c alsa.c bfu.c charsets.c codepage.h codepage.inc \
++tucnak2_SOURCES = excdb.c adif.c alsa.c bfu.c charsets.c codepage.h codepage.inc \
+ 	control.c cor.c cor.h cor.inc \
+ 	cwdaemon.c cwdb.c cwwindow.c davac4.c dsp.c dwdb.c dxc.c ebw.c edi.c \
+ 	error.c fhs.c fifo.c font.c font.inc gfx_png.c ghash.c \
+@@ -14,7 +14,7 @@
+ 	ssbd.c stats.c subwin.c terminal.c threadpipe.c titlpage.c trig.c \
+ 	ttys.c txts.c txts.h txts.inc uni_7b.inc wizz.c zstring.c
+ 
+-tucnak_LDADD = @TUCNAK_LDADD@
++tucnak2_LDADD = @TUCNAK_LDADD@
+ 
+ soundwrapper_SOURCES = soundwrapper.c	
+ 
diff --git a/media-radio/tucnak2/files/tucnak2-2.13-config.diff b/media-radio/tucnak2/files/tucnak2-2.14-config.diff
index 4d9f3fdd4..14d45f7a7 100644
--- a/media-radio/tucnak2/files/tucnak2-2.13-config.diff
+++ b/media-radio/tucnak2/files/tucnak2-2.14-config.diff
@@ -88,3 +88,22 @@
  
  # check for library errors
  if test -n "$tucnak_mlibs$tucnak_olibs"; then
+@@ -299,6 +299,10 @@
+ fi
+ 
+ 
++AC_ARG_WITH([hamlib], AS_HELP_STRING([--without-hamlib], [Build without Hamlib support (default: test)]))
++tucnak_hamlib="no"
++
++if test "x$with_hamlib" != "xno"; then
+ # check for hamlib
+ tucnak_hamlib_ver=""
+ PKG_CHECK_MODULES(HAMLIB, 
+@@ -309,6 +313,7 @@
+         [ tucnak_olibs="$tucnak_olibs libhamlib"
+           tucnak_odebs="$tucnak_odebs libhamlib-dev" 
+           tucnak_hamlib="false" ])
++fi
+ 
+ # check for library errors
+ if test -n "$tucnak_mlibs$tucnak_olibs"; then
diff --git a/media-radio/tucnak2/files/tucnak2-2.13-doc.diff b/media-radio/tucnak2/files/tucnak2-2.14-doc.diff
index 5702be03a..5702be03a 100644
--- a/media-radio/tucnak2/files/tucnak2-2.13-doc.diff
+++ b/media-radio/tucnak2/files/tucnak2-2.14-doc.diff
diff --git a/media-radio/tucnak2/metadata.xml b/media-radio/tucnak2/metadata.xml
index 8ec10a7bf..6f8053689 100644
--- a/media-radio/tucnak2/metadata.xml
+++ b/media-radio/tucnak2/metadata.xml
@@ -4,5 +4,7 @@
 	<herd>maintainer-wanted</herd>
 	<use>
 		<flag name='ftdi'>Enable support for FTDI USB chips</flag>
+		<flag name='hamlib'>Enables support by the Hamlib amateur radio 
+		rig control library to get/set frequency and mode of the  ham radio</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-radio/tucnak2/tucnak2-2.13.ebuild b/media-radio/tucnak2/tucnak2-2.14.ebuild
index 7b4351d0c..cf35878e1 100644
--- a/media-radio/tucnak2/tucnak2-2.13.ebuild
+++ b/media-radio/tucnak2/tucnak2-2.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="alsa ftdi gpm"
+IUSE="alsa ftdi gpm hamlib"
 
 RDEPEND=">=dev-libs/glib-2
 	media-libs/libsndfile
@@ -19,6 +19,7 @@ RDEPEND=">=dev-libs/glib-2
 	alsa? ( media-libs/alsa-lib )
 	ftdi? ( dev-embedded/libftdi )
 	gpm? ( sys-libs/gpm )
+	hamlib? ( media-libs/hamlib )
 	>=media-libs/libpng-1.2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -35,7 +36,7 @@ src_unpack() {
 
 src_compile() {
 	econf $(use_with alsa) $(use_with ftdi) \
-		$(use_with gpm) --with-sdl
+		$(use_with gpm) $(use_with hamlib) --with-sdl
 	emake || die "emake failed"
 }