Merge updates from master

13 files changed, 186 insertions, 4 deletions

diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass
index c2c69dbc7d6b..41aa3ef43da7 100644
--- a/eclass/unpacker.eclass
+++ b/eclass/unpacker.eclass
@@ -202,7 +202,7 @@ unpack_makeself() {
 				skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
 				(( skip++ ))
 				;;
-			2.1.4|2.1.5|2.1.6|2.2.0)
+			2.1.4|2.1.5|2.1.6|2.2.0|2.4.0)
 				skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
 				skip=$(head -n ${skip} "${src}" | wc -c)
 				exe="dd"
diff --git a/licenses/SDRplay b/licenses/SDRplay
new file mode 100644
index 000000000000..f1847779e1fb
--- /dev/null
+++ b/licenses/SDRplay
@@ -0,0 +1,39 @@
+SDRplay Limited
+END USER LICENCE AGREEMENT
+
+The SDRplay software (“Product”) you are about to install, run and/or use is licensed by SDRplay Limited, a company registered in England (No. 09035244), whose registered office is 6 Thornes Office Park, Monkton Road WAKEFIELD WF2 7AN UK(“SDRplay”), and is subject to the following licence terms (“Licence”).
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+By proceeding to install, run and/or use the Product, you confirm that you accept and agree to be bound by the terms of this Licence. If you do not agree to any of the terms of this Licence, SDRplay is unwilling to provide access to the Product to you and you should not proceed further and may not use the Product.
+
+1.  Licence To Use The Product.
+
+1.1          Grant of Licence.
+Subject to the terms and conditions of this License, SDRplay hereby grants to you a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable license to reproduce, publicly display, publicly perform, create Derivative works, incorporate in other products sublicense, and distribute the Product in Object form.
+
+
+1.2          Restrictions.  You may not:  modify, disassemble, decompile or reverse engineer the Product, except to the extent specifically authorised under applicable law notwithstanding contractual prohibition
+
+1.3. Redistribution. You may reproduce and distribute copies of the Product in any medium, without modifications, in Object form, provided that you meet the following conditions:
+1.  You must give any other recipients of the Product or Derivative Works a copy of this License; and
+2.  You must cause any modified files to carry prominent notices stating that You changed the files; and
+3.  Any Derivative Works that You distribute must include a readable statement that the Copyright in the Product is owned by and licensed by SDRplay. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the statement, provided that such additional attribution notices cannot be construed as modifying the License.
+
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+
+1.3          Open Source Software.  The Product may contain code, commonly referred to as open source software, which is distributed under any of the many known variations of open source licence terms, including terms which allow the free distribution and modification of the relevant software’s source code and/or which require all distributors to make such source code freely available upon request, including any contributions or modifications made by such distributor (collectively, “Open Source Software”). To the extent that the Product contains any Open Source Software, that element only is licensed to you pursuant to the relevant licence terms of the applicable third party licensor (“Open Source Licence Terms”) and not pursuant to this Licence, and you accept and agree to be bound by such terms. A copy of the Open Source Licence Terms will be made available upon request.
+
+2.            Confidentiality Obligations.  You acknowledge that the Product contains confidential, proprietary and trade secret information belonging to SDRplay and you agree to hold such information, and any other confidential or proprietary information of SDRplay (collectively, "Confidential Information") in strict confidence and agree not to disclose any Confidential Information to any third party. You will have no obligation to maintain the confidentiality of any information which: (a) is or becomes publicly available without breach of this Licence; (b) is rightfully received by you from a third party without an obligation of confidentiality and without breach of this Licence; (c) is required to be disclosed by law or regulation or by court order; or (d) has been approved for release by written permission of SDRplay.
+
+3.            Ownership.  You acknowledge and agree that SDRplay or its third party licensors (including in particular Mirics Limited) own all rights, title and interest in and to the Product and all modifications, enhancements and derivative works SDRplay may develop to or from the Product and any and all intellectual property rights in all of the foregoing. You agree not to use any of SDRplay’s or Mirics’ trademarks or other business names included in the Product for any purpose. You acknowledge that, except as expressly set out in this Licence, nothing in this Licence will give you rights in respect of any intellectual property rights owned by SDRplay or its licensors. All intellectual property rights and other rights of SDRplay and its licensors which are not expressly granted to you by this Licence are reserved.
+
+4.            Limited Warranty.  SDRplay warrants that the Product will, under normal operating conditions, operate substantially in accordance with SDRplay’ published specification for the Product. SDRplay does not represent or warrant that: (a) the use of the Product will be secure, timely, uninterrupted or error-free or compatible in combination with any other hardware, software, system or data; (b) the Product will meet your expectations; (c) errors or defects in the Product will be corrected; or that (d) the Product is free of viruses or other harmful components. SDRplay makes no representation and gives no warranty in respect of any Open Source Software component of the Product.
+
+Except as expressly set out in this Licence, no implied conditions, warranties or other terms, including any implied terms relating to satisfactory quality or fitness for any purpose, will apply to the Product and, to the maximum extent permitted by applicable law, are excluded by SDRplay.
+
+5.            SDRplay’ Liability.  Nothing in this Licence will limit or exclude SDRplay’ liability to you: (a) for death or personal injury caused by SDRplay’ negligence; (b) for fraud; (c) for breach of any obligations implied by section 12 of the Sale of Goods Act 1979 or section 2 of the Supply of Goods and Services Act 1982; or (d) for any other liability that may not, under applicable law, be limited or excluded. Subject to this, in no event will SDRplay be liable to you for any indirect or consequential losses, or for any loss of profit, revenue, contracts, data, goodwill or other similar losses, and any liability SDRplay does have for losses you suffer arising under or in connection with this Licence and/or the Product is strictly limited to losses that were reasonably foreseeable.
+
+6.            Data.    The Product may, without further notification, transmit the serial number of an SDRplay device using the Product to an SDRplay server. No personal information, including but not limited to information about the computer running the Product or its location will be gathered or transmitted as part of this process.
+
+7.            General.    You may not transfer or assign any or all of your rights and/or obligations under this Licence. All notices given by you to SDRplay must be given in writing to SDRplay’ registered office address. If SDRplay fails to enforce any of our rights, that does not result in a waiver of that right. If any provision of these terms and conditions is found to be unenforceable, all other provisions shall remain unaffected. The terms of this Licence may not be varied except with SDRplay’ express written consent. The terms of this Licence represent the entire agreement between you and SDRplay in relation to the subject matter of this Licence. The terms of this Licence shall be governed by English law and you agree that any claim you may have against SDRplay arising under or in connection with this Licence and/or the Product may only be dealt with by the English courts, provided that, if you are a consumer: (a) and you live in a part of the United Kingdom other than England, the applicable law of that part of the United Kingdom will govern and any claim may be brought by you before the courts there; or (b) you live in another member state of the European Union, any claim may be brought by you before the courts there.
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild
index 2286e8a9c6a1..e3d156e35ccd 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild
@@ -13,6 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+	KEYWORDS=""
 else
 	#SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"
 	#git clone git://git.osmocom.org/gr-osmosdr.git
@@ -24,7 +25,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd"
+IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
@@ -34,6 +35,7 @@ RDEPEND="${PYTHON_DEPS}
 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
+	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr )
 	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
@@ -56,6 +58,8 @@ src_configure() {
 		-DENABLE_RTL_TCP="$(usex rtlsdr)"
 		-DENABLE_SOAPY="$(usex soapy)"
 		-DENABLE_UHD="$(usex uhd)"
+		-DENABLE_SDRPLAY="$(usex sdrplay)"
+		-DENABLE_NONFREE="$(usex sdrplay)"
 	)
 
 	cmake-utils_src_configure
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index ffbeed261500..e3d156e35ccd 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -25,16 +25,17 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd"
+IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
 	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
-	bladerf? ( net-wireless/bladerf:= )
+	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
+	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr )
 	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
@@ -57,6 +58,8 @@ src_configure() {
 		-DENABLE_RTL_TCP="$(usex rtlsdr)"
 		-DENABLE_SOAPY="$(usex soapy)"
 		-DENABLE_UHD="$(usex uhd)"
+		-DENABLE_SDRPLAY="$(usex sdrplay)"
+		-DENABLE_NONFREE="$(usex sdrplay)"
 	)
 
 	cmake-utils_src_configure
diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
index 9dc2a893a658..2ffcfa21c90d 100644
--- a/net-wireless/gr-osmosdr/metadata.xml
+++ b/net-wireless/gr-osmosdr/metadata.xml
@@ -12,6 +12,7 @@
 	<flag name="iqbalance">Enable support for I/Q balancing using gr-iqbal</flag>
 	<flag name="mirisdr">Build with Mirics MSi2500 + MSi001 SDR support</flag>
 	<flag name="rtlsdr">Build with Realtek RTL2832U (rtlsdr) support</flag>
+	<flag name="sdrplay">Enable support for SDRplay devices through <pkg>net-wireless/sdrplay</pkg></flag>
 	<flag name="soapy">Build with SoapySDR support</flag>
 	<flag name="uhd">Build with Ettus Research USRP Hardware Driver support</flag>
 </use>
diff --git a/net-wireless/sdrplay/Manifest b/net-wireless/sdrplay/Manifest
new file mode 100644
index 000000000000..c4b3064aa0bc
--- /dev/null
+++ b/net-wireless/sdrplay/Manifest
@@ -0,0 +1 @@
+DIST SDRplay_RSP_API-Linux-2.13.1.run 326016 BLAKE2B 7eff1aa35190db1ead5b1d96994d24ae2301e3a765d6701756c6304a1719aa32125fedacf6a6859d89b89db5dd6956ec0e8c7e814dbd6242db5614a53e89efb3 SHA512 576be63e18084cf3e74bfb20592a44836f22fd9efe74ba9e27e5865a9ab755b26b3f2894cd8331ff876ab664d4e533d2bdbc629d552e75fcfbb3e9814dd140ce
diff --git a/net-wireless/sdrplay/metadata.xml b/net-wireless/sdrplay/metadata.xml
new file mode 100644
index 000000000000..5840601f180f
--- /dev/null
+++ b/net-wireless/sdrplay/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>idl0r@gentoo.org</email>
+		<name>Christian Ruppert</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-wireless/sdrplay/sdrplay-2.13.1.ebuild b/net-wireless/sdrplay/sdrplay-2.13.1.ebuild
new file mode 100644
index 000000000000..5528d10526f9
--- /dev/null
+++ b/net-wireless/sdrplay/sdrplay-2.13.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit versionator unpacker udev multilib-minimal
+
+MY_PV_1=$(get_major_version)
+MY_PV_12=$(get_version_component_range 1-2)
+
+DESCRIPTION="SDRplay API/HW driver for all RSPs"
+HOMEPAGE="https://www.sdrplay.com"
+SRC_URI="http://www.sdrplay.com/software/SDRplay_RSP_API-Linux-${PV}.run"
+
+LICENSE="SDRplay"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="usr/lib64/libmirsdrapi-rsp.so.${MY_PV_12}
+usr/lib32/libmirsdrapi-rsp.so.${MY_PV_12}"
+
+multilib_src_install_all() {
+	insinto /usr/include/
+	doins mirsdrapi-rsp.h
+
+	udev_dorules 66-mirics.rules
+	udev_reload
+}
+
+multilib_src_install() {
+	if [ "${MULTILIB_ABI_FLAG}" = "abi_x86_32" ]; then
+		dolib "${S}/i686/libmirsdrapi-rsp.so.${MY_PV_12}"
+	fi
+
+	if [ "${MULTILIB_ABI_FLAG}" = "abi_x86_64" ]; then
+		dolib "${S}/x86_64/libmirsdrapi-rsp.so.${MY_PV_12}"
+	fi
+
+	dosym libmirsdrapi-rsp.so.${MY_PV_12} "${EROOT}usr/$(get_libdir)/libmirsdrapi-rsp.so.${MY_PV_1}"
+	dosym libmirsdrapi-rsp.so.${MY_PV_1} "${EROOT}usr/$(get_libdir)/libmirsdrapi-rsp.so"
+}
diff --git a/net-wireless/soapysdrplay/Manifest b/net-wireless/soapysdrplay/Manifest
new file mode 100644
index 000000000000..a1d30e79c62b
--- /dev/null
+++ b/net-wireless/soapysdrplay/Manifest
@@ -0,0 +1 @@
+DIST soapysdrplay-0.1.0.tar.gz 11736 BLAKE2B 746e01092d094cedb6b15b9c11ec0b828e18cd3c814e46cbe5cb9473cfd494d8342ab9618d8c5d945429b2b62178b02b81c2b000e20c53a7cb027d4b2a25c789 SHA512 28382b4ac79e27a0b84ed6edb4abeca99b90222ad2890041e1585cac21177518ca3fcea0a3e14f8502091d47e7b2a223913dd77c53b6c0360f0f3875328613da
diff --git a/net-wireless/soapysdrplay/metadata.xml b/net-wireless/soapysdrplay/metadata.xml
new file mode 100644
index 000000000000..5840601f180f
--- /dev/null
+++ b/net-wireless/soapysdrplay/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>idl0r@gentoo.org</email>
+		<name>Christian Ruppert</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild b/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild
new file mode 100644
index 000000000000..bf8dafb5c49b
--- /dev/null
+++ b/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils
+
+DESCRIPTION="Soapy SDR plugin for SDRPlay"
+HOMEPAGE="https://github.com/pothosware/SoapySDRPlay"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay.git"
+	EGIT_CLONE_TYPE="shallow"
+	KEYWORDS=""
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapySDRPlay-soapy-sdrplay-"${PV}"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+
+IUSE=""
+REQUIRED_USE=""
+
+RDEPEND="net-wireless/soapysdr
+	net-wireless/sdrplay"
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapysdrplay/soapysdrplay-9999.ebuild b/net-wireless/soapysdrplay/soapysdrplay-9999.ebuild
new file mode 100644
index 000000000000..bf8dafb5c49b
--- /dev/null
+++ b/net-wireless/soapysdrplay/soapysdrplay-9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils
+
+DESCRIPTION="Soapy SDR plugin for SDRPlay"
+HOMEPAGE="https://github.com/pothosware/SoapySDRPlay"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay.git"
+	EGIT_CLONE_TYPE="shallow"
+	KEYWORDS=""
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapySDRPlay-soapy-sdrplay-"${PV}"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+
+IUSE=""
+REQUIRED_USE=""
+
+RDEPEND="net-wireless/soapysdr
+	net-wireless/sdrplay"
+DEPEND="${RDEPEND}"
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index b3a48f0e0b25..2f0a6dd1cd3a 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Christian Ruppert <idl0r@gentoo.org> (25 Aug 2018)
+# pre-built, no ARM support
+net-wireless/gr-osmosdr sdrplay
+
 # Tomáš Mózes <hydrapolic@gmail.com> (10 Aug 2018)
 # Needs dev-libs/libmaxminddb which isn't keyworded
 app-admin/syslog-ng geoip2