gentoo resync : 30.06.2018

4 files changed, 13 insertions, 78 deletions

diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index cb16e6c3a530..08f3350ee954 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -1,4 +1,4 @@
 DIST ubertooth-2017-03-R2.tar.xz 676124 BLAKE2B 1f82c9a6b4b2fcec84d5f69862f843ee4920eb0e17e61940aba48e118fe290f67777eed4bd9826c420e218ab433b94630abaf8793c845d2e68ff5587e8b73fbc SHA512 4806a6ac664ec9b78964caeb47f87a60db8f664c529e6e58bc1e5db4d858eaaa1ae51f0293f4a5227a102e556caf1611e97f6675147af4bc34e23646049e8571
-EBUILD ubertooth-2017.03.2.ebuild 2750 BLAKE2B de33843b0372138359825263a699b7bfa11816135290fa0cd475ded9f12b11e5ded21940fb6d3c7584f904ebc9f6d5741de3f319072b28ac5eb758cd9923c2fe SHA512 5dd2d912e23465333d144553a78b31d825635843be895f90bd2b77b5ea1730432979dffb630a1b6aedb49b0a98770a055591cbab66954c84f3f8d7c70a22dc75
-EBUILD ubertooth-9999.ebuild 2750 BLAKE2B de33843b0372138359825263a699b7bfa11816135290fa0cd475ded9f12b11e5ded21940fb6d3c7584f904ebc9f6d5741de3f319072b28ac5eb758cd9923c2fe SHA512 5dd2d912e23465333d144553a78b31d825635843be895f90bd2b77b5ea1730432979dffb630a1b6aedb49b0a98770a055591cbab66954c84f3f8d7c70a22dc75
-MISC metadata.xml 630 BLAKE2B 1a6481604a89ac1ef37523a73a465696b4251a6ad1ec57c3c284c4e259f40af2f840f8fd80a5630330aa72e144d6a8229f4733d9e29960eaed236eb12f70e3e3 SHA512 3f2dd60418ac563c549840085be0977e2f928abf14373aedc556131a23069e0993352e2a8b99013ff4fbca886beecbee57a493e4987baea27e117678691709ae
+EBUILD ubertooth-2017.03.2-r1.ebuild 2111 BLAKE2B 9e58bdc705487144ae10cb7e8f64d5f5f4f1195e3b23f9d6f873f7a1017ceb85841a8da896eaafb83276a2d99010f8ea6fdf700148d50349e73cb61698cd8026 SHA512 cab20dac721a6bc7bcfca4d8467caad68382d154718b2607507f7d91e9b4f4cc9c351f43859c5a4c66e22d48220a6df1779426459dc4f9fee2706f8f5a2b9672
+EBUILD ubertooth-9999.ebuild 2111 BLAKE2B 9e58bdc705487144ae10cb7e8f64d5f5f4f1195e3b23f9d6f873f7a1017ceb85841a8da896eaafb83276a2d99010f8ea6fdf700148d50349e73cb61698cd8026 SHA512 cab20dac721a6bc7bcfca4d8467caad68382d154718b2607507f7d91e9b4f4cc9c351f43859c5a4c66e22d48220a6df1779426459dc4f9fee2706f8f5a2b9672
+MISC metadata.xml 562 BLAKE2B dea6d366f75fbf852510f4b7204d5b51f5d3e52ef0b55020fe3a67edc486ad757c4b388ed6de36611ba14084e985df57f7986c5cc4e17193a59c546608c6f92d SHA512 b266c4914480613ba2f64519152d73cb7c472755fbd378bd0e547d4e0cf2fe6069636e04bd64fd9c686ff42adcb126118936846d2cbc241f1cc081e28b390400
diff --git a/net-wireless/ubertooth/metadata.xml b/net-wireless/ubertooth/metadata.xml
index 181284625981..5a740733d13c 100644
--- a/net-wireless/ubertooth/metadata.xml
+++ b/net-wireless/ubertooth/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="bluez">use bluez to support clock following and scanning</flag>
-		<flag name="specan">Enable the ubertooth spectrum analyzer</flag>
 		<flag name="ubertooth1-firmware">Build/install ubertooth1-firmware</flag>
 	</use>
 	<upstream>
diff --git a/net-wireless/ubertooth/ubertooth-2017.03.2.ebuild b/net-wireless/ubertooth/ubertooth-2017.03.2-r1.ebuild
index de2e949b8cb6..1341a9478aa6 100644
--- a/net-wireless/ubertooth/ubertooth-2017.03.2.ebuild
+++ b/net-wireless/ubertooth/ubertooth-2017.03.2-r1.ebuild
@@ -1,28 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit multilib distutils-r1 cmake-utils udev
+inherit cmake-utils udev
 
 HOMEPAGE="http://ubertooth.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+bluez +specan static-libs +ubertooth1-firmware +udev"
-REQUIRED_USE="specan? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="+bluez static-libs +ubertooth1-firmware +udev"
+
 DEPEND="bluez? ( net-wireless/bluez:= )
 	>=net-libs/libbtbb-${PV}:=[static-libs?]
-	specan? ( ${PYTHON_DEPS} )
 	static-libs? ( dev-libs/libusb[static-libs] )
 	virtual/libusb:1="
 RDEPEND="${DEPEND}
-	specan? ( >=dev-qt/qtgui-4.7.2:4
-		>=dev-python/pyside-1.0.2[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.3[${PYTHON_USEDEP}] )
 	udev? ( virtual/udev )"
 
 MY_PV=${PV/\./-}
@@ -42,17 +35,8 @@ DESCRIPTION="open source wireless development platform suitable for Bluetooth ex
 #readd firmware building, but do it right
 #USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
 
-src_prepare() {
-	cmake-utils_src_prepare
-	if use specan; then
-		pushd python/specan_ui || die
-		distutils-r1_src_prepare
-		popd
-	fi
-}
-
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DUSE_BLUEZ=$(usex bluez)
 		-DBUILD_STATIC_LIB=$(usex static-libs)
 		-DINSTALL_UDEV_RULES=$(usex udev)
@@ -67,16 +51,6 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-
-	if use specan; then
-		pushd python/specan_ui || die
-		distutils-r1_src_compile
-		popd
-	fi
-}
-
 src_install() {
 	cmake-utils_src_install
 
@@ -91,12 +65,6 @@ src_install() {
 	fi
 	popd
 
-	if use specan; then
-		pushd python/specan_ui || die
-		distutils-r1_src_install
-		popd
-	fi
-
 	elog "Everyone can read from the ubertooth, but to talk to it"
 	elog "your user needs to be in the usb group."
 }
diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-9999.ebuild
index de2e949b8cb6..1341a9478aa6 100644
--- a/net-wireless/ubertooth/ubertooth-9999.ebuild
+++ b/net-wireless/ubertooth/ubertooth-9999.ebuild
@@ -1,28 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit multilib distutils-r1 cmake-utils udev
+inherit cmake-utils udev
 
 HOMEPAGE="http://ubertooth.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+bluez +specan static-libs +ubertooth1-firmware +udev"
-REQUIRED_USE="specan? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="+bluez static-libs +ubertooth1-firmware +udev"
+
 DEPEND="bluez? ( net-wireless/bluez:= )
 	>=net-libs/libbtbb-${PV}:=[static-libs?]
-	specan? ( ${PYTHON_DEPS} )
 	static-libs? ( dev-libs/libusb[static-libs] )
 	virtual/libusb:1="
 RDEPEND="${DEPEND}
-	specan? ( >=dev-qt/qtgui-4.7.2:4
-		>=dev-python/pyside-1.0.2[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.3[${PYTHON_USEDEP}] )
 	udev? ( virtual/udev )"
 
 MY_PV=${PV/\./-}
@@ -42,17 +35,8 @@ DESCRIPTION="open source wireless development platform suitable for Bluetooth ex
 #readd firmware building, but do it right
 #USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
 
-src_prepare() {
-	cmake-utils_src_prepare
-	if use specan; then
-		pushd python/specan_ui || die
-		distutils-r1_src_prepare
-		popd
-	fi
-}
-
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DUSE_BLUEZ=$(usex bluez)
 		-DBUILD_STATIC_LIB=$(usex static-libs)
 		-DINSTALL_UDEV_RULES=$(usex udev)
@@ -67,16 +51,6 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-
-	if use specan; then
-		pushd python/specan_ui || die
-		distutils-r1_src_compile
-		popd
-	fi
-}
-
 src_install() {
 	cmake-utils_src_install
 
@@ -91,12 +65,6 @@ src_install() {
 	fi
 	popd
 
-	if use specan; then
-		pushd python/specan_ui || die
-		distutils-r1_src_install
-		popd
-	fi
-
 	elog "Everyone can read from the ubertooth, but to talk to it"
 	elog "your user needs to be in the usb group."
 }