gentoo resync : 31.05.2021

4 files changed, 2 insertions, 64 deletions

diff --git a/media-radio/js8call/Manifest b/media-radio/js8call/Manifest
index 259c13e02236..ca1b4533d2c9 100644
--- a/media-radio/js8call/Manifest
+++ b/media-radio/js8call/Manifest
@@ -1,5 +1,3 @@
-AUX js8call-2.2.0-hamlib-type.patch 463 BLAKE2B a34effb789b9113fcdee91f631dd8abec6e9fb1aea8317c1ef99dfb005e9ac266fe8b2c1be2cf83ba128f9f52a03206e4dc5c2458537ad2878c78f756b91a6a4 SHA512 426227025f7b7039890e2d22eeda218491de883150abbfe6066fd82f604da90c321a8ee6f7916ed08dcebee38c94d681280fc7824713b663bc2aaa09f538d8d4
 DIST js8call-2.2.0.tar.bz2 16249923 BLAKE2B 9bd3124bee7253f48adb0bea031f3c83c3e9487aac7208ce3dfc94208f4c861645bacd581bd44cde19ad3b3e3ac5f7f60993bece2d1fad0164afdae7b3bd290a SHA512 3e66ba0b9bb88b834b0e025b37a395008a058b87fb70c09887936fa18c192c501d127eff6e9ccf792863ccc932aa76feacc4be903ebe7ab2915298aed3689672
-EBUILD js8call-2.2.0-r1.ebuild 830 BLAKE2B c5e8dcbef4dcd3ae528c3db533438c285a228d4177349d2805107d519bec7bd2b39bf83032afa34a851c38df9862a5ac82712244a517d2e909ac7ce563d95f12 SHA512 d3c803be2278aa79625b0348a81f610b1ae533b7a91b295f03e1e78acf20a14f75d1e85c71d565c3c8b759696a3c44106598f80e046b0c7450389a1b4bb59b5a
-EBUILD js8call-2.2.0.ebuild 892 BLAKE2B 1125c60df60d5907ad5a5972064167245d072761c093772bcb9f3911ec97b4c454ecb8cdaa2e35c4164edea3dddf2300fcfcf284e92e5b97468836938c9fd726 SHA512 1b7fd8e7970256e5dfa319766e125b8abb71d3a4f23df1d6c07a7b19ed6367fc4a1ef51bd246560d3edfccade468d82ad04a0c84fe88370afb4aa1155b16f755
+EBUILD js8call-2.2.0-r1.ebuild 829 BLAKE2B 5d9c9c0e68977d12c3daa60f717fa8d07ac2210a2a57843d090d334bb46c176dcbd72b283d41cccf16750bd35a2d5c16283c8f8632b5e32aca649d8bf18ddf1a SHA512 2866eaade2152830f5d19889b491a5938c10a2e85254625e6d26bb041b0d114570d8425baa80dd5d27e0b1082f7d451fa75e5285311df876ce1e0346345a9fd3
 MISC metadata.xml 312 BLAKE2B 77446444162f6d430b7cd8c95ea0ff34da775e0a78d355b1e71a5a5e3c64c6f633b0339cdcd2055d3ea1fd5befa5d6655d02d2cb0fd55fd60a408efb33c6cf0a SHA512 caf176b301b2a0385c9c24d8ee1b68077d9cf49b5379f6530c27658450efa8fef6551a4d1492529bdde38e95bb4f5df5f9825c38865874514803e12ad37bc461
diff --git a/media-radio/js8call/files/js8call-2.2.0-hamlib-type.patch b/media-radio/js8call/files/js8call-2.2.0-hamlib-type.patch
deleted file mode 100644
index 54c5a8e0647f..000000000000
--- a/media-radio/js8call/files/js8call-2.2.0-hamlib-type.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/HamlibTransceiver.hpp	2020-06-27 19:35:04.514472802 -0400
-+++ b/HamlibTransceiver.hpp	2020-06-27 19:35:34.361368141 -0400
-@@ -12,17 +12,9 @@
- 
- extern "C"
- {
--#ifdef JS8_USE_HAMLIB_THREE
-   typedef struct rig RIG;
--#else
--  typedef struct s_rig RIG;
--#endif
-   struct rig_caps;
--#ifdef JS8_USE_HAMLIB_THREE
-   typedef int vfo_t;
--#else
--  typedef unsigned int vfo_t;
--#endif
- }
- 
- // hamlib transceiver and PTT mostly delegated directly to hamlib Rig class
diff --git a/media-radio/js8call/js8call-2.2.0-r1.ebuild b/media-radio/js8call/js8call-2.2.0-r1.ebuild
index 9537e009da38..08a55170fb78 100644
--- a/media-radio/js8call/js8call-2.2.0-r1.ebuild
+++ b/media-radio/js8call/js8call-2.2.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/widefido/js8call/get/v${PV}-ga.tar.bz2 -> ${P}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc"
 
 RDEPEND="dev-qt/qtcore:5
diff --git a/media-radio/js8call/js8call-2.2.0.ebuild b/media-radio/js8call/js8call-2.2.0.ebuild
deleted file mode 100644
index 298d01562ab6..000000000000
--- a/media-radio/js8call/js8call-2.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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
-}