gentoo auto-resync : 09:04:2023 - 23:35:30

4 files changed, 2 insertions, 99 deletions

diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index ec3ba5551fe7..eca91f46858c 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -1,7 +1,4 @@
-AUX ubertooth-2018.12.1-gcc-10.patch 783 BLAKE2B e0d79ff3217de27b4c04c8e0427c5217753b739d6ce04ddcbb20bb2ce20f64d695fad4b969415bfd3b01232f4b08dcf6d5ec2b1096618e202c6a330903fac3e5 SHA512 4982db0ade9305520764801a9c4f7b3b2df070cfbc1549e766267136740f66fd392cbe8eeac28a5acd0f4196e9dbe3043a6707a07c770955a7b67a803bcbb70f
-DIST ubertooth-2018-12-R1.tar.xz 704208 BLAKE2B 7a17830a0ed417a737d78aa22c5a6a270a67b350a3a5e9a0aebabd4b38547d8d35551e061ea3d5260996f8fe1a366c75c8773d5e3a6abf37a0930f93200da3fc SHA512 409fdb403d6a3fa84b92757e0fd8672b1403ba3d24888fbde4d6d6923d8e0796914c20d38e2fc58909f81fcb8a0b6290bcf91282bb02354c310e6e91ad85e23b
 DIST ubertooth-2020-12-R1.tar.xz 763952 BLAKE2B 592c5fa689e0f944875bd777dedfd83394ebe5c9c65c1ac2c19006a949daeda8440dc102e537cf97b4547e0730df8f47d5c2a420d84d5dc770577b6039e16b28 SHA512 f127cae09d9b20dc34ffad080871f4505cbeccc1117e0e4e841ecf4a30f578d02b67b52786d7a82bdfc43d06562919008c076f8eb9befc7e4bd95def05a3864c
-EBUILD ubertooth-2018.12.1.ebuild 2121 BLAKE2B f76d7998e10f672897c463b15f703eba820258f8ae6b6891846495fdb745be299dd0f4c1e902f4c7ebab5ed2b0b0cc0466b031e2909402f6801cfd36d0feb423 SHA512 4f5d29bbb09e2485e589a27ebce1d552504c49330b62b53c83bdca6c25ca164cc78ec02d1d45d616d99583941870e33e24d13d87c67a50341206de4d0b4629cf
-EBUILD ubertooth-2020.12.1-r1.ebuild 2162 BLAKE2B 8e7be1c9a73ca44740fc0c0967a4328dfeccc1fa6b3bc928258f0322b76d433f0b0f3e5b24c40750fdb6409ccf7be430a6a821ec6e0682d31bdb347de39c4679 SHA512 540db40944ac870a5389cfe2842f2b6bf2ac7eaa9f27d7f3ceff21d90e13c33cdb28ac92c67051d67837d98623a2363410d076a692a1d0bae1cb39d7b1fd9f85
+EBUILD ubertooth-2020.12.1-r1.ebuild 2159 BLAKE2B 169d0e659c4944df05294bbf2aba9dc914b99cfc3368feddb95b20ac5af09896e0722bc082e5315b6782da663e841a5b774049b5942f1263dde4eaaf90c37c65 SHA512 5a8dc8563add675054c336d660478b4fc9508abe995cd74af2dc0fb33c97ddddd03f802469202e2b7d9f5285fbdfed0a5c5b6c9d5ca799d0bca1fd84d3e77e00
 EBUILD ubertooth-9999.ebuild 2162 BLAKE2B 8e7be1c9a73ca44740fc0c0967a4328dfeccc1fa6b3bc928258f0322b76d433f0b0f3e5b24c40750fdb6409ccf7be430a6a821ec6e0682d31bdb347de39c4679 SHA512 540db40944ac870a5389cfe2842f2b6bf2ac7eaa9f27d7f3ceff21d90e13c33cdb28ac92c67051d67837d98623a2363410d076a692a1d0bae1cb39d7b1fd9f85
 MISC metadata.xml 563 BLAKE2B e60e76c45d573b00a12adfc8b7398e04c63faf6ebd7430764c1fbfe1626e9fdd36d429d9fa6c7abcb425eda80f716fb653acd073f27cf8b60afa79e895f0d785 SHA512 6009ecd598e930adb2e657e906d86bfd2625f7c51ea6feba9bbda600dd8d3ba4f26eb33c20ffd9ef30192e027b95ed075e1279218a6cdb30c990785f7e5594a0
diff --git a/net-wireless/ubertooth/files/ubertooth-2018.12.1-gcc-10.patch b/net-wireless/ubertooth/files/ubertooth-2018.12.1-gcc-10.patch
deleted file mode 100644
index b4f25e6b0b8c..000000000000
--- a/net-wireless/ubertooth/files/ubertooth-2018.12.1-gcc-10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From abc1d87631c71fb5bf3be4b81327c66292d852ca Mon Sep 17 00:00:00 2001
-From: Jonas Stein <news@jonasstein.de>
-Date: Sat, 6 Jun 2020 21:11:38 +0200
-Subject: [PATCH] extern packet_counter_max to compile with gcc-10
-
-Fixes: https://github.com/greatscottgadgets/ubertooth/issues/408
----
- host/libubertooth/src/ubertooth_callback.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libubertooth/src/ubertooth_callback.c b/libubertooth/src/ubertooth_callback.c
-index a36e3512..adb9934f 100644
---- a/libubertooth/src/ubertooth_callback.c
-+++ b/libubertooth/src/ubertooth_callback.c
-@@ -27,7 +27,7 @@
- 
- #include "ubertooth_callback.h"
- 
--unsigned int packet_counter_max;
-+extern unsigned int packet_counter_max;
- 
- static int8_t cc2400_rssi_to_dbm( const int8_t rssi )
- {
diff --git a/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild b/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild
deleted file mode 100644
index d71069e391f4..000000000000
--- a/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake udev
-
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+bluez static-libs +ubertooth1-firmware +udev"
-
-DEPEND="bluez? ( net-wireless/bluez:= )
-	>=net-libs/libbtbb-${PV}:=[static-libs?]
-	static-libs? ( dev-libs/libusb[static-libs] )
-	virtual/libusb:1="
-RDEPEND="${DEPEND}
-	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
-	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
-
-PATCHES=( "${FILESDIR}"/"${P}"-gcc-10.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_BLUEZ=$(usex bluez)
-		-DBUILD_STATIC_LIB=$(usex static-libs)
-		-DINSTALL_UDEV_RULES=$(usex udev)
-		-DENABLE_PYTHON=false
-	)
-	if use udev; then
-		mycmakeargs+=(
-			-DUDEV_RULES_GROUP=usb
-			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
-		)
-	fi
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_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
-
-	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-2020.12.1-r1.ebuild b/net-wireless/ubertooth/ubertooth-2020.12.1-r1.ebuild
index 580e009cffa1..8e986934be2b 100644
--- a/net-wireless/ubertooth/ubertooth-2020.12.1-r1.ebuild
+++ b/net-wireless/ubertooth/ubertooth-2020.12.1-r1.ebuild
@@ -27,7 +27,7 @@ if [[ ${PV} == "9999" ]] ; then
 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"
+	KEYWORDS="amd64 arm x86"
 fi
 DESCRIPTION="open source wireless development platform suitable for Bluetooth experimentation"