gentoo resync : 13.06.2020

5 files changed, 38 insertions, 83 deletions

diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index a8f6ef0bfa0c..d864f6fca792 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -1,6 +1,5 @@
-DIST ubertooth-2018-08-R1.tar.xz 701928 BLAKE2B 031d4178693a4c1734f72d5c7292ba58f0c74b9a57cc1841ecdec286d547994847dc7badabc3efce6eff9a34abe505d942b561bc3291b3cda0f29a42fa7dd340 SHA512 630707583b4fa0683d3f2a40e06697546897e603bd27842886897949ffeaff252d3b34040dee6b8b3319f9bed65eb706f57b885d7a6719fc9cb993e7c1d9c203
+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
-EBUILD ubertooth-2018.08.1.ebuild 2095 BLAKE2B 581851bcaa23c0b37bcfc1adb7f7125efbf701c8cfe83cb812703fc556e212e368329f3f48f2c6d900471ad128ceee0696642ee7d840f0e9cd4485cfc4b6b94a SHA512 cc3c2a20af082cc9dbdcb59b0054c1050b96447ea493bbc650c49d82154104652b41ff038788b6a69cff99c559d749818576174208e97fa478ffd49728645faa
-EBUILD ubertooth-2018.12.1.ebuild 2095 BLAKE2B 581851bcaa23c0b37bcfc1adb7f7125efbf701c8cfe83cb812703fc556e212e368329f3f48f2c6d900471ad128ceee0696642ee7d840f0e9cd4485cfc4b6b94a SHA512 cc3c2a20af082cc9dbdcb59b0054c1050b96447ea493bbc650c49d82154104652b41ff038788b6a69cff99c559d749818576174208e97fa478ffd49728645faa
-EBUILD ubertooth-9999.ebuild 2095 BLAKE2B 581851bcaa23c0b37bcfc1adb7f7125efbf701c8cfe83cb812703fc556e212e368329f3f48f2c6d900471ad128ceee0696642ee7d840f0e9cd4485cfc4b6b94a SHA512 cc3c2a20af082cc9dbdcb59b0054c1050b96447ea493bbc650c49d82154104652b41ff038788b6a69cff99c559d749818576174208e97fa478ffd49728645faa
+EBUILD ubertooth-2018.12.1.ebuild 2124 BLAKE2B 9355ad729ba26e38a14ef6a115477cc76df7c17fa4f64d992679b943da4b51d000dd4845d4246348abcfbe4f6f3457cd761f1c0a4b384b4dee8c5ca350cc65d8 SHA512 4fe0f94f43e03340bd7a0b6d0cd33ded3c2d9013d74f893158a74344d3c8e21a79dc0cd1003e827c89da3992e50aec319bf9487a4e3dd3a934470f58ea8151d8
+EBUILD ubertooth-9999.ebuild 2077 BLAKE2B 0955fc76aa31f91e02986c5c4b1379ea0beed4f8eaa9306feae2fc7e251bff7cbe79c46b121b1923cfeae247c3886244b7995e6c640852f917db638d1e60f4e2 SHA512 1f9e0ea4a0fed9a8e4c27a4f48496ca840103766cdada2799dec452304a88e41be3f68a4b59b4e9f0eb8ef9185c7f15b06a51cce8a1a5ed611190614d7a0a4eb
 MISC metadata.xml 562 BLAKE2B dea6d366f75fbf852510f4b7204d5b51f5d3e52ef0b55020fe3a67edc486ad757c4b388ed6de36611ba14084e985df57f7986c5cc4e17193a59c546608c6f92d SHA512 b266c4914480613ba2f64519152d73cb7c472755fbd378bd0e547d4e0cf2fe6069636e04bd64fd9c686ff42adcb126118936846d2cbc241f1cc081e28b390400
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
new file mode 100644
index 000000000000..b4f25e6b0b8c
--- /dev/null
+++ b/net-wireless/ubertooth/files/ubertooth-2018.12.1-gcc-10.patch
@@ -0,0 +1,23 @@
+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.08.1.ebuild b/net-wireless/ubertooth/ubertooth-2018.08.1.ebuild
deleted file mode 100644
index 845ee09d3793..000000000000
--- a/net-wireless/ubertooth/ubertooth-2018.08.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils 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
-
-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-utils_src_configure
-}
-
-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
-
-	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-2018.12.1.ebuild b/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild
index 845ee09d3793..32189828f352 100644
--- a/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild
+++ b/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils udev
+inherit cmake udev
 
 HOMEPAGE="http://ubertooth.sourceforge.net/"
 
@@ -34,6 +34,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
 
+PATCHES=( "${FILESDIR}"/"${P}"-gcc-10.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_BLUEZ=$(usex bluez)
@@ -47,11 +49,11 @@ src_configure() {
 			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	insinto /usr/share/${PN}
 	pushd "${WORKDIR}/${PN}-${MY_PV}" || die
diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-9999.ebuild
index 845ee09d3793..4a9603a7e8d4 100644
--- a/net-wireless/ubertooth/ubertooth-9999.ebuild
+++ b/net-wireless/ubertooth/ubertooth-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils udev
+inherit cmake udev
 
 HOMEPAGE="http://ubertooth.sourceforge.net/"
 
@@ -47,11 +47,11 @@ src_configure() {
 			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	insinto /usr/share/${PN}
 	pushd "${WORKDIR}/${PN}-${MY_PV}" || die