add patch to tucnak2-2.20 to allow build, by Thomas Beierlein. bug 251195

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.8 x86_64

4 files changed, 43 insertions, 5 deletions

diff --git a/media-radio/tucnak2/ChangeLog b/media-radio/tucnak2/ChangeLog
index 367cd8a9ec7b..599ec4b43f08 100644
--- a/media-radio/tucnak2/ChangeLog
+++ b/media-radio/tucnak2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-radio/tucnak2
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/ChangeLog,v 1.4 2008/12/08 14:04:46 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/ChangeLog,v 1.5 2008/12/19 14:09:18 darkside Exp $
+
+  19 Dec 2008; Jeremy Olexa <darkside@gentoo.org>
+  +files/tucnak2-2.20-hamlib.diff, tucnak2-2.20.ebuild:
+  add patch to tucnak2-2.20 to allow build, by Thomas Beierlein. bug 251195
 
 *tucnak2-2.20 (08 Dec 2008)
 
diff --git a/media-radio/tucnak2/Manifest b/media-radio/tucnak2/Manifest
index 9288c7a559cf..72f0a2774434 100644
--- a/media-radio/tucnak2/Manifest
+++ b/media-radio/tucnak2/Manifest
@@ -2,11 +2,12 @@ AUX tucnak2-2.16-doc.diff 476 RMD160 13dd70e5df9cf94456594e6676c5d7268991ad66 SH
 AUX tucnak2-2.17-appname.diff 863 RMD160 a8fbe84c23fb70420a64789e625c494be2302cef SHA1 7062416d5e0714d94945cf597097c4215b634d11 SHA256 974102a539d8ddff99cb8088ec873030c92572557280f550ae8a09ebaf2fe00f
 AUX tucnak2-2.19-appname.diff 846 RMD160 2cf7b6004478d972f55f8257f720df4abc16477a SHA1 791986cb9effc2d731c8c192fd022b6b2c86e798 SHA256 f1ede96548e7817c0cd70e59ccd05ff1c535db51af7515dd6bb6fedb2b0a0711
 AUX tucnak2-2.19-doc.diff 504 RMD160 d07b252702d09f25cdc575b2f225693a22b8af99 SHA1 279b79e3178e0a23de0ffd5a7e41c29cc86ac052 SHA256 cfaa21bc1e4798c35db543f907c3a264a86a4c76ab1aa4148e2f66bc1485b82f
+AUX tucnak2-2.20-hamlib.diff 1178 RMD160 d70936a7229154c9dcc2c2e30d54a89dcd5ab2d0 SHA1 43d417b2136a91731aac731fd3550ad3dfd61139 SHA256 737768a83052976fddd481a6884df96a0d1238d68e8f7f217bc8ae533bd38762
 DIST tucnak2-2.18.tar.gz 2587739 RMD160 717a7b72c6e18d938512803fdffe1bc83f0eb752 SHA1 0d0f8892801748ce5bc54e6404479cf4ce894d8b SHA256 a2bf8454ed8fed896324f0dfcd6ba0db3e13dadbe210e8725c7d5e015f718fae
 DIST tucnak2-2.19.tar.gz 2594457 RMD160 04211e04663cfc6f7fa67823a7ecdd1c9f00e22e SHA1 fd5b1b969814c7fee52f3b92a81b0de84910c89d SHA256 eecd727bfea234bf37f087774ffbbbe75b880e6241ce4adbb1a5e9b2774dbf19
 DIST tucnak2-2.20.tar.gz 2601614 RMD160 5394d055851b540999ba3f6629f165ab1b124738 SHA1 d85515160a6cf0a04cf47d672ae0c57981a2e17e SHA256 855106fbbb92f780c101604a0531ae5571561d175216e4aa8aa1fbd61c1f857c
 EBUILD tucnak2-2.18.ebuild 1495 RMD160 190fec43b8f10108d1d3cca191a3ea037e592464 SHA1 0556c117a0f4cc3d7f1b183866754187db240413 SHA256 48aca0ba5309fc65abe7a73c630696eeb013a4c6f654c78f6ec9f43d46f88ec1
 EBUILD tucnak2-2.19.ebuild 1492 RMD160 c64a950107794d135f50a9316da63c07f7465d45 SHA1 eabb29fa5af3d0a540ad35537ace935eb923d5cf SHA256 57d2eb413814d8c3d8b941c14d40bb34a33cfa25ca9f280cb04f80ddab82163f
-EBUILD tucnak2-2.20.ebuild 1492 RMD160 6809fcee0148309d8116dffcf26022779b8de7b9 SHA1 1cc25e5ae76bb464872d2e8dd2a3d26e65c61891 SHA256 fc44009ceed8f012a4df71e9534ab3e2c71095777a127df22edcd3fdfb40b8e1
-MISC ChangeLog 1033 RMD160 a4a4a3498f0c9737eb4ea4c052addc6609e38093 SHA1 fc6b3d80e54dcc98dab7a51e5413eb75ec8045db SHA256 60e06ad99526461d72ac6442fc4f8ed3f1ac13095c9c2f3bc6e8f99ae99f3e64
+EBUILD tucnak2-2.20.ebuild 1533 RMD160 76bc90ec15c8b50d4f84a950ef98108952a8289e SHA1 558d4496cc2991674e979e8b2281b506b7786415 SHA256 b1c1c47f35a37cda3412dce6ce44d6fed8249aac99924ce2068c16947a786cb0
+MISC ChangeLog 1216 RMD160 85767c8db261cb133a88b7a8d79da7174e08bb6b SHA1 565586364033af9c4fb7487c68c0d074c0f00b0d SHA256 01cf23823a8b5885fc1467aff93fbeea3b597ed6a0871a5513d05b29b954d51c
 MISC metadata.xml 621 RMD160 e022a641e9d50b34cf33c82c7040b1ae6294c674 SHA1 ded22260393f0044d95fdd641b26eaeda4ad056c SHA256 622cb69f976f9dee2a4ec8c8885c6ff0211f75b9a098ddcc6950fb339d667005
diff --git a/media-radio/tucnak2/files/tucnak2-2.20-hamlib.diff b/media-radio/tucnak2/files/tucnak2-2.20-hamlib.diff
new file mode 100644
index 000000000000..2e95b54b934a
--- /dev/null
+++ b/media-radio/tucnak2/files/tucnak2-2.20-hamlib.diff
@@ -0,0 +1,32 @@
+--- src/menu.c.orig	2008-12-16 19:31:53.000000000 +0100
++++ src/menu.c	2008-12-16 19:32:12.000000000 +0100
+@@ -1224,7 +1224,9 @@
+     {CTEXT(T_AUDIO), "", CTEXT(T_HK_AUDIO), MENU_FUNC menu_ssbd, {NULL}, 0, 0},
+     {CTEXT(T_CW_CQ), ">", CTEXT(T_HK_CW_CQ), MENU_FUNC menu_cq_cw, {NULL}, 1, 0},
+     {CTEXT(T_SSB_CQ), ">", CTEXT(T_HK_SSB_CQ), MENU_FUNC menu_cq_ssb, {NULL}, 1, 0},
++#if HAVE_HAMLIB
+     {CTEXT(T_RIGOPTS), "", CTEXT(T_HK_RIGOPTS), MENU_FUNC menu_rig_opts, {NULL}, 0, 0},
++#endif
+     {CTEXT(T_AUTOSAVE), "", CTEXT(T_HK_AUTOSAVE), MENU_FUNC menu_autosave, {NULL}, 0, 0},
+     {CTEXT(T_NETWORK), "", CTEXT(T_HK_NETWORK), MENU_FUNC menu_network, {NULL}, 0, 0},
+     {CTEXT(T_MISCOPTS), "", CTEXT(T_HK_MISCOPTS), MENU_FUNC misc_opts, {NULL}, 0, 0},
+--- src/menu5.c.orig	2008-12-16 19:32:20.000000000 +0100
++++ src/menu5.c	2008-12-16 19:32:47.000000000 +0100
+@@ -485,6 +485,7 @@
+ 
+ /************************** rig ******************************/
+ 
++#if HAVE_HAMLIB
+ char rig_filename[MAX_STR_LEN];
+ char rig_model_str[EQSO_LEN];
+ /* choose manufacturer */
+@@ -711,8 +712,7 @@
+     d->items[++i].type = D_END;
+     do_dialog(d, getml(d, NULL));
+ }
+-
+-    
++#endif
+ 
+ 
+ 
diff --git a/media-radio/tucnak2/tucnak2-2.20.ebuild b/media-radio/tucnak2/tucnak2-2.20.ebuild
index 7199cfaac305..2e6ce8342019 100644
--- a/media-radio/tucnak2/tucnak2-2.20.ebuild
+++ b/media-radio/tucnak2/tucnak2-2.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/tucnak2-2.20.ebuild,v 1.1 2008/12/08 14:04:46 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/tucnak2-2.20.ebuild,v 1.2 2008/12/19 14:09:18 darkside Exp $
 
 inherit eutils autotools
 
@@ -28,7 +28,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-2.19-doc.diff" \
-		"${FILESDIR}/${PN}-2.19-appname.diff"
+		"${FILESDIR}/${PN}-2.19-appname.diff" \
+		"${FILESDIR}/${PN}-2.20-hamlib.diff"
 	eautoreconf
 }