gentoo resync : 02.03.2018

3 files changed, 1 insertions, 106 deletions

diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index 0aebd2b2aba0..cb16e6c3a530 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -1,6 +1,4 @@
-DIST ubertooth-2015-10-R1.tar.xz 1716840 BLAKE2B 53b02ce7548da7133762ff40e2c4422ae52f13ee0647ee714950d060a5846f82c3de07fdb99b28ed9b406ef17d565e47da3d31a8e2f08d00fbd485f8c09b9ead SHA512 ad7229c9509db4b4230ec28d1c16200f0780dd7ce55224528ced6d8969f342a79b7317b69e7b9e49d03e93f973203801f4f703dd80dc115400366b0984c965b1
 DIST ubertooth-2017-03-R2.tar.xz 676124 BLAKE2B 1f82c9a6b4b2fcec84d5f69862f843ee4920eb0e17e61940aba48e118fe290f67777eed4bd9826c420e218ab433b94630abaf8793c845d2e68ff5587e8b73fbc SHA512 4806a6ac664ec9b78964caeb47f87a60db8f664c529e6e58bc1e5db4d858eaaa1ae51f0293f4a5227a102e556caf1611e97f6675147af4bc34e23646049e8571
-EBUILD ubertooth-2015.10.1.ebuild 2744 BLAKE2B b031f1293c6fe33e782f85f8f747627fd06f26db3c1b7f30720b7567a18c3a39afb9d20dec39842dc6943f6af3dbd72016c30e67ac12f6ef44d6264a79710502 SHA512 be81b6a91cc9f43cb0a9e49a98e8ba38ca52c9575004960740a43312b88e67a430d21a3e817591e4d9b354ad1f957fd5b5eacd21f8ff5509e8097ecc03d349b8
 EBUILD ubertooth-2017.03.2.ebuild 2750 BLAKE2B de33843b0372138359825263a699b7bfa11816135290fa0cd475ded9f12b11e5ded21940fb6d3c7584f904ebc9f6d5741de3f319072b28ac5eb758cd9923c2fe SHA512 5dd2d912e23465333d144553a78b31d825635843be895f90bd2b77b5ea1730432979dffb630a1b6aedb49b0a98770a055591cbab66954c84f3f8d7c70a22dc75
 EBUILD ubertooth-9999.ebuild 2750 BLAKE2B de33843b0372138359825263a699b7bfa11816135290fa0cd475ded9f12b11e5ded21940fb6d3c7584f904ebc9f6d5741de3f319072b28ac5eb758cd9923c2fe SHA512 5dd2d912e23465333d144553a78b31d825635843be895f90bd2b77b5ea1730432979dffb630a1b6aedb49b0a98770a055591cbab66954c84f3f8d7c70a22dc75
-MISC metadata.xml 703 BLAKE2B d604d820b566eb24f07b73c6dfb47d3febd1235f78c265eb9d548a8f8b3b15fb742cb5638b12979bb7617251ff68e51c387b05ce553ac5fd95698a4131603778 SHA512 096fa42e835b67207456abd509df5b935f89724ab69348f1a780884c4a34adaa16c531dc815f7f3e797a52eba60683fdbf3abd26283c68df85513c0f5db38f5b
+MISC metadata.xml 630 BLAKE2B 1a6481604a89ac1ef37523a73a465696b4251a6ad1ec57c3c284c4e259f40af2f840f8fd80a5630330aa72e144d6a8229f4733d9e29960eaed236eb12f70e3e3 SHA512 3f2dd60418ac563c549840085be0977e2f928abf14373aedc556131a23069e0993352e2a8b99013ff4fbca886beecbee57a493e4987baea27e117678691709ae
diff --git a/net-wireless/ubertooth/metadata.xml b/net-wireless/ubertooth/metadata.xml
index 87fa75f2f10b..181284625981 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="pcap">Use libpcap for packet capture and read/write</flag>
 		<flag name="specan">Enable the ubertooth spectrum analyzer</flag>
 		<flag name="ubertooth1-firmware">Build/install ubertooth1-firmware</flag>
 	</use>
diff --git a/net-wireless/ubertooth/ubertooth-2015.10.1.ebuild b/net-wireless/ubertooth/ubertooth-2015.10.1.ebuild
deleted file mode 100644
index b63eb786a125..000000000000
--- a/net-wireless/ubertooth/ubertooth-2015.10.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit multilib distutils-r1 cmake-utils udev
-
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+bluez +specan +pcap +ubertooth1-firmware +udev"
-REQUIRED_USE="	specan? ( ${PYTHON_REQUIRED_USE} )"
-DEPEND="bluez? ( net-wireless/bluez:= )
-	>=net-libs/libbtbb-${PV}:=
-	pcap? ( net-libs/libbtbb[pcap] )
-	specan? ( ${PYTHON_DEPS} )
-	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/\./-}
-MY_PV=${MY_PV/./-R}
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
-	inherit git-r3
-	KEYWORDS=""
-	S="${WORKDIR}/${P}/host"
-else
-	S="${WORKDIR}/${PN}-${MY_PV}/host"
-	SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-DESCRIPTION="open source wireless development platform suitable for Bluetooth experimentation"
-
-#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=(
-		$(cmake-utils_use_enable bluez USE_BLUEZ)
-		$(cmake-utils_use pcap USE_PCAP)
-		$(cmake-utils_use_enable udev INSTALL_UDEV_RULES)
-		-DDISABLE_PYTHON=true
-	)
-	if use udev; then
-		mycmakeargs+=(
-			-DUDEV_RULES_GROUP=usb
-			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
-		)
-	fi
-	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
-
-	insinto /usr/share/${PN}
-	pushd "${WORKDIR}/${PN}-${MY_PV}" || die
-	if [[ ${PV} == "9999" ]] ; then
-		ewarn "Firmware isn't available for git releases, we assume you are already"
-		ewarn "on the latest and/or can build your own."
-	else
-		use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu
-		use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rx_only.dfu ${PN}-one-${PV}-bluetooth_rx_only.dfu
-	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."
-}