gentoo resync : 15.01.2020

3 files changed, 71 insertions, 0 deletions

diff --git a/media-radio/js8call/Manifest b/media-radio/js8call/Manifest
index 1e773bf4aa84..e18da9e39eca 100644
--- a/media-radio/js8call/Manifest
+++ b/media-radio/js8call/Manifest
@@ -1,7 +1,10 @@
+AUX js8call-2.1.0-hamlib-type.patch 752 BLAKE2B b58e648597d467ff559d6ea77abef4fa31b3cc3bf14b72a2e66ba6cb839377c59ced2fad97c104cbd8b90acf09e477584baae6238d90524442d10409fb4a0e09 SHA512 ac65d9f6755d2fa2e5ca3593bf73c2d44716e6bbea29906d59e2a023bbe9821ad98a48e6f8d56eafdb5648884b0d1f9f23c05900e0ec67b5785cf65dcc98e899
 DIST js8call-1.0.0.tar.bz2 15923224 BLAKE2B 646fd869e6029d57dfd1d9762ede2407e18a18170088df65d1b16a581709065cf45edb23533b9c89193b01a85ec326638efc99202489db54455298a5033696de SHA512 64f24821c9ffd86123ede2baac46bcefd33b5dc5e0496cd44e594e79706ec2f3fdde5ce13c379addbf2bded3e392a1f0fc0f2df0298ce57a22e434a6ab6a1e7a
 DIST js8call-1.1.0.tar.bz2 15993553 BLAKE2B 3538f746b175d0623169d2a13b5c26b334561f604fa25c8dddc15ee2a41319df8bb4c0a905be6340d4d18d87bffd8bd4e9a4eb9ceec3310f33aa22005c0e1c19 SHA512 992408408888a59174811c30fcc07065bcb5e459c355955a59e638ca27da27c2c25df8fa7579ce1c322a76f12780c58821df9fc781cde2cb2b2851312d188787
 DIST js8call-2.0.0.tar.bz2 14434190 BLAKE2B 2d016c93175fe41cd4c24b57fc0a6c65ff5d5630aff68aac4e3e941570f315abe9f083f1686cb95e49d90ea41ac82752fcdd37041727e95820d34bcd0e82e2b1 SHA512 58566d4e6009339ef9a1459bdf2902748200b7a002c8be22067ec97eae16cc42465001e7084ebc00b1e406ae47fe45092226e1c6568253a1bbf95c65f040ab75
+DIST js8call-2.1.0.tar.bz2 14432328 BLAKE2B 3f48be58905cf05af8230b715956ecfec71fd792fafb029cba84c799e51bb1189e158c16ef05bd8959572778aad556a11b0896647a47cc1e6b10ddd48bd033cd SHA512 0edfbc8cbbe3df551d7dc97c7362100d2714e2d37934a053233ca8107247f7fdc67a36b59b1fe701154c9348f27171ddab9c21ffc763072d390431f9dd5382a0
 EBUILD js8call-1.0.0.ebuild 877 BLAKE2B c59f72323ba1e9a17890400ae0bf6134b6907a857c6bb89740bfbcac155e85458e808d34e352bffd9997a7e22aa256cafcc0ada12787e4f0b13b42ab9f30ebcc SHA512 a7941d4f677e003af0b7c7c3bfd63134f7fc5fa4bbb0b059ada6997918d9d1c5133391385e8e59fdc49d15d2c9cdc1bbdc13f4d63c6a8e1585b2c4cac289841a
 EBUILD js8call-1.1.0.ebuild 877 BLAKE2B c59f72323ba1e9a17890400ae0bf6134b6907a857c6bb89740bfbcac155e85458e808d34e352bffd9997a7e22aa256cafcc0ada12787e4f0b13b42ab9f30ebcc SHA512 a7941d4f677e003af0b7c7c3bfd63134f7fc5fa4bbb0b059ada6997918d9d1c5133391385e8e59fdc49d15d2c9cdc1bbdc13f4d63c6a8e1585b2c4cac289841a
 EBUILD js8call-2.0.0-r1.ebuild 881 BLAKE2B f2b37d220b6b7bac193df394ebc92c3c03c9b9dfa5cd0f51308a41362fa402577a7ca6d8c71c19717972f38eecac32292e39783cae824885e361a17c4ad470e8 SHA512 4836807736c2433d3e48ba50aa1adc07a6a6f6c3a43a947bc2fa0111aabde0366e4b3752066787676c2b47c3cb036bf191adc67d3683b8bf16381fca7d3c4c04
+EBUILD js8call-2.1.0.ebuild 936 BLAKE2B 23704d418b26b9f5cc02e5520a01ca67efbc5c5085067676544ed6beb18a87ccfc43b118769773d2035321ff90bfca4d432af3b98c2a4115ff5a6a00bdf734c7 SHA512 bc67a252baec3e06e00bbde9d388a4bae820012a9165d78dba56a0b82ff9db575c412d68722af07f33a20fb268811b86d6e1c3e62ee2de3173861eb40e72a289
 MISC metadata.xml 312 BLAKE2B 77446444162f6d430b7cd8c95ea0ff34da775e0a78d355b1e71a5a5e3c64c6f633b0339cdcd2055d3ea1fd5befa5d6655d02d2cb0fd55fd60a408efb33c6cf0a SHA512 caf176b301b2a0385c9c24d8ee1b68077d9cf49b5379f6530c27658450efa8fef6551a4d1492529bdde38e95bb4f5df5f9825c38865874514803e12ad37bc461
diff --git a/media-radio/js8call/files/js8call-2.1.0-hamlib-type.patch b/media-radio/js8call/files/js8call-2.1.0-hamlib-type.patch
new file mode 100644
index 000000000000..5fc71b7f2940
--- /dev/null
+++ b/media-radio/js8call/files/js8call-2.1.0-hamlib-type.patch
@@ -0,0 +1,27 @@
+From af2ed2b67665a4bb891ffa01d45043bb197f06bf Mon Sep 17 00:00:00 2001
+From: Richard Freeman <rich0@gentoo.org>
+Date: Sun, 22 Dec 2019 21:26:27 -0500
+Subject: [PATCH] Revert "Updated hamlib interface to use new unsigned int for
+ vfo_t"
+
+This reverts commit 7728483481975bfe1527eab657cf636c4c3b9181.
+---
+ HamlibTransceiver.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/HamlibTransceiver.hpp b/HamlibTransceiver.hpp
+index 509fe4e..c8c0f74 100644
+--- a/HamlibTransceiver.hpp
++++ b/HamlibTransceiver.hpp
+@@ -14,7 +14,7 @@ extern "C"
+ {
+   typedef struct rig RIG;
+   struct rig_caps;
+-  typedef unsigned int vfo_t;
++  typedef int vfo_t;
+ }
+ 
+ // hamlib transceiver and PTT mostly delegated directly to hamlib Rig class
+-- 
+2.24.1
+
diff --git a/media-radio/js8call/js8call-2.1.0.ebuild b/media-radio/js8call/js8call-2.1.0.ebuild
new file mode 100644
index 000000000000..d886436dd36d
--- /dev/null
+++ b/media-radio/js8call/js8call-2.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils vcs-snapshot
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Weak signal ham radio communication"
+HOMEPAGE="https://groups.io/g/js8call"
+SRC_URI="https://bitbucket.org/widefido/js8call/get/v${PV}-ga.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtserialport:5
+	dev-qt/qtprintsupport:5
+	virtual/libusb:1
+	media-libs/portaudio
+	sci-libs/fftw:3.0[threads,fortran]
+	virtual/fortran
+	app-text/asciidoc
+	<media-libs/hamlib-3.4
+	doc? ( dev-ruby/asciidoctor )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-hamlib-type.patch" )
+
+src_install() {
+	cmake-utils_src_install
+	rm "${D}"/usr/bin/rigctl{,d}-local || die
+	rm "${D}"/usr/share/doc/JS8Call -R || die
+}