Fix error with USE=-hamlib (bug #419593). Thanks Ago

Package-Manager: portage-2.1.10.64/cvs/Linux x86_64

4 files changed, 56 insertions, 5 deletions

diff --git a/media-radio/tucnak2/ChangeLog b/media-radio/tucnak2/ChangeLog
index 0794f1f45870..27063c943722 100644
--- a/media-radio/tucnak2/ChangeLog
+++ b/media-radio/tucnak2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-radio/tucnak2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/ChangeLog,v 1.44 2012/05/03 03:48:56 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/ChangeLog,v 1.45 2012/06/04 15:45:33 tomjbe Exp $
+
+  04 Jun 2012; Thomas Beierlein <tomjbe@gentoo.org> tucnak2-2.48.ebuild,
+  +files/tucnak2-2.48-hamlib.diff:
+  Fix error with USE=-hamlib (bug #419593). Thanks Ago
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> tucnak2-2.44.ebuild,
   tucnak2-2.45.ebuild, tucnak2-2.46.ebuild, tucnak2-2.47.ebuild,
diff --git a/media-radio/tucnak2/Manifest b/media-radio/tucnak2/Manifest
index 9557fb423613..6e88dd718f5c 100644
--- a/media-radio/tucnak2/Manifest
+++ b/media-radio/tucnak2/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tucnak2-2.39-doc.diff 511 RMD160 0fbec4ee56c38ba89dc3eba8ff07dde35c4de081 SHA1 3a90e7f8567a2c030ab0ef8de5ce7ff2ae051505 SHA256 329b1ee35a1108a7739732f73c480d7ad3db024aca4a2561d4732ae291ba4c20
 AUX tucnak2-2.42-appname.diff 795 RMD160 71eab08568a0b2617715a918b71ff68d4a9f8b7d SHA1 55ec5da512e6cfc538166314fc69f8ddde2a6a06 SHA256 ce423961d9800c18c673c6f8928be4226c0904464712c9168a5e3f4bf3464635
 AUX tucnak2-2.47-doc.diff 509 RMD160 a0c105d5aa67ac0bc2b15363c93ab85dd5b73201 SHA1 cbfbb52f2a1bf9dccf98d8e25057c15fc1864060 SHA256 328fedce7577cfcfeccc885c27c1345d7bb97e45cb64cdbb8337d1332fadbbc0
 AUX tucnak2-2.48-doc.diff 520 RMD160 ba50fef3ab43499807feb51117b3bca0f7dcd829 SHA1 e3626cac6505eeb983f4c9c8ee4b48cd9f9b5522 SHA256 6943a505b22b14aea3f5a54e6a75cac60dcd30dd58c57ba4724d163c6de353da
+AUX tucnak2-2.48-hamlib.diff 971 RMD160 7c36635e129e108371818bef4ff745c8aaa8ae73 SHA1 1634b228b02d68da0375712e4afff47f29be1875 SHA256 484c64b94678d99401026f4011fd0697c4911b0ffabb8fb249a821df2537e8f5
 AUX tucnak2-libpng15.patch 2861 RMD160 8ddd31b7b5ddb4cfded4bd91e457884a8745a588 SHA1 c233c2558f75e7468747fdfce2a33597667db773 SHA256 78f13dfce6e2468d149691eca70f70c2d4f8b56f8680715868d000095504dbf5
 AUX tucnak2-soundwrapper.diff 463 RMD160 60367220e08724f81108463f52b25e7162180607 SHA1 82c58ee958445d972e87f029bcbd06ae05ae54ee SHA256 8f749c18a041c4899dece8784461fc6688de2f7f0147fdf1938c42c8620a6f99
 DIST tucnak2-2.44.tar.gz 2986548 RMD160 cc8caa9800264f2c4d2c5cdb65a9864d6cb54e01 SHA1 15fc269024044c8b05222a3c14e1b3f8d057c044 SHA256 b571e2de547fd18a4964ee8881cf9b73f1b5a1eba06a862da120f9c361df5465
@@ -13,6 +17,13 @@ EBUILD tucnak2-2.44.ebuild 2067 RMD160 cd47c3241c37edbb96fb1db6abd09ad6cb1cb270
 EBUILD tucnak2-2.45.ebuild 2030 RMD160 1ba1d7803a244afa5b0654415d5f6afa33f8f69a SHA1 19c1077eb8acca61a2fb894e86a0873dad58e388 SHA256 3d3d075c4ef634dcb081d1ffc826a6a379d90c5bf3b2598edda64e56d3118e06
 EBUILD tucnak2-2.46.ebuild 2070 RMD160 6fd8b4f7996549edab6ced875515f56bec42e0b0 SHA1 b6e615776a488d86651bf5c25d0f335fba59cf75 SHA256 f2d601c328e5be3373a17b742c9364820c63f5d44f40dd91af03804e664418c5
 EBUILD tucnak2-2.47.ebuild 1975 RMD160 7527a9558e471c66ad3b5ebd96073ee20ed7c4e5 SHA1 b0cdfcdc93df4787241777ed011719073121dd79 SHA256 350d60fa9040841dadaab708c033be5284d550f12261289a287c38d122ac491d
-EBUILD tucnak2-2.48.ebuild 1944 RMD160 d66dfc5cd6ae48d5a7e1936ed99cd212c1394e91 SHA1 8b13cce6c2b48954789f174c987634755d23f9c5 SHA256 5dbb4dc563bc4884c1c257ce9106b8eec208aaf18d2e9323ba698ddde932f0c9
-MISC ChangeLog 6911 RMD160 ca63bc2a9bf8166e11c587b8681e3f9c7b3fe2c7 SHA1 03d61c16eec00e9850c072e519a77a5323fee17c SHA256 0c87c7f664fe31912800f397a1dc182b7096502801df2d658b651f44306cdb71
+EBUILD tucnak2-2.48.ebuild 1979 RMD160 34f631e24eb348c5b73baab9edeaf02ef846193c SHA1 26671736861a60e184a1f4c49902dbb5da0eb946 SHA256 20890de9a1753b10fb0b336c574f0ba267a6d3cb678e73a35ecb90650a38f4cc
+MISC ChangeLog 7075 RMD160 aa583d4285e6e9420938279bc2fabf6a7dccf469 SHA1 681779024e29b0ffc41039b816c5c9648384c751 SHA256 9d8872d3949f9e82c28fb20055fa323976efbc3f6f87708e2f9da2d558159e9d
 MISC metadata.xml 455 RMD160 5af912d2f377ce90593eda79e21efda8c7899764 SHA1 085f76cb6623421218668d6c250d2fd3bc143c45 SHA256 704fe19b1544cd4ad036096ed3f8072573062c8db27ea94f09656125cd2e2663
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk/M2CgACgkQQe4uqXYgU9W4bACfYmn+XMAM/1IISbVFKhT6LW/m
+XTUAniIIGyylSvQIz9lHeMAjFy8N6THW
+=0yeO
+-----END PGP SIGNATURE-----
diff --git a/media-radio/tucnak2/files/tucnak2-2.48-hamlib.diff b/media-radio/tucnak2/files/tucnak2-2.48-hamlib.diff
new file mode 100644
index 000000000000..f0d573837a77
--- /dev/null
+++ b/media-radio/tucnak2/files/tucnak2-2.48-hamlib.diff
@@ -0,0 +1,35 @@
+# Fix forgotten #ifdef if hamlib not available
+--- src/rotar.c.orig	2012-03-13 14:35:34.000000000 +0100
++++ src/rotar.c	2012-06-04 17:26:54.000000000 +0200
+@@ -20,12 +20,13 @@
+ 
+ gpointer rot_hamlib_main(gpointer xxx);
+ 
++#ifdef HAVE_HAMLIB
+ static int rot_print_model_list(const struct rot_caps *caps, void *data)
+ {
+     log_addf("%-6d %-14s  %-20s  %s\n", caps->rot_model, caps->mfg_name, caps->model_name, caps->version);
+     return 1;  /* !=0, we want them all ! */
+ }
+-
++#endif
+ 
+ struct rotar *init_rotar(struct config_rotar *crot, int rotchar){
+     struct rotar *rot;
+@@ -117,13 +118,15 @@
+ }
+ 
+ void free_rotar(struct rotar *rot){
+-	if (rot->hl_thread){
++#ifdef HAVE_HAMLIB
++    if (rot->hl_thread){
+         rot->hl_thread_break = 1;
+         dbg("join hamlib rotar...\n");
+         g_thread_join(rot->hl_thread);
+         dbg("done\n");
+         rot->hl_thread=0;
+     }
++#endif
+     g_free(rot->desc);
+     g_free(rot->netid);
+     g_free(rot->rem_rotstr);
diff --git a/media-radio/tucnak2/tucnak2-2.48.ebuild b/media-radio/tucnak2/tucnak2-2.48.ebuild
index 19126892254f..25fafdfff7da 100644
--- a/media-radio/tucnak2/tucnak2-2.48.ebuild
+++ b/media-radio/tucnak2/tucnak2-2.48.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/tucnak2-2.48.ebuild,v 1.2 2012/05/03 03:48:56 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/tucnak2-2.48.ebuild,v 1.3 2012/06/04 15:45:33 tomjbe Exp $
 
 EAPI=4
 inherit eutils autotools
@@ -28,7 +28,8 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-doc.diff" \
-		"${FILESDIR}/${PN}-2.42-appname.diff"
+		"${FILESDIR}/${PN}-2.42-appname.diff" \
+		"${FILESDIR}/${P}-hamlib.diff"
 	eautoreconf
 }