gentoo resync : 28.04.2021

5 files changed, 33 insertions, 33 deletions

diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 78fd34b8e548..8c76f82f3ce7 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,8 +1,8 @@
 DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0 SHA512 63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e
 DIST libbtbb-2018-12-R1.tar.gz 310437 BLAKE2B 8fec246e05c47df424840f159d97bbb8c6554b2ce72344b63602cb034eb712bf8ee9f280e7bbb5104dc0b9788818ea14cf53d09af0938b1bc1dcede5463b36ce SHA512 5c41bb4f0fdeedc1064de973daa4d396f73ff10b6e28266a43f029cbfa8a7f2db5e3b764410efb50ef79c56ba1fac0d242bb547c0a883d0dc3c06cc9e993332c
 DIST libbtbb-2020-12-R1.tar.gz 308434 BLAKE2B 0f802f3c5eef0c434d0468a72104cf63e6bf5f29467e1606d2892751cd8b4824639e3847c0b8305ace926667434e668d75b6d4544e8e026b07872bafbb09c90b SHA512 a3dc2c8d27e4b85aae4847ac39f871ecf800ebf911aacd01682da6c50b13f3247c7d683bce855f2cf59b56a29c661223a2c22e98a8d86e8edaccd57af282bac6
-EBUILD libbtbb-2018.08.1.ebuild 3479 BLAKE2B ea8e75095644069ee74ef72677aec429114e155ed50565ef71b8237695ae76e4ca750caf6b82df4eff7400ca7a37535dae011c296c7a88b2ef6c4ee168b5ae8a SHA512 9257591a151e4d3da471462cb75febe508eead5bf8b1981c5d75c6906a2228257a5659b45a4718b91c21ebcd0acf1092ee4c34aefa938367555be6ee4ee14add
-EBUILD libbtbb-2018.12.1.ebuild 3476 BLAKE2B 726593872c2381dc76737e00bd1dd53a32fe56ff042615d8625a297dd3e177a925a27b1cd217b16d62511f88d0fd0d6d594d772646d46c38d13ed9041d24cc84 SHA512 c6bb6dd0de2cd46d8d8860b9afe5f5f126f5ad94d86e00f67d89c60f6a62bac1915ee21489f3160b9f73362fdfb4904b2524309922a1951b5afb3fecb05ca1d1
-EBUILD libbtbb-2020.12.1.ebuild 3479 BLAKE2B 42bc145ff8e257e660d74c5dead6d263d45b42453c95c70d0ca66fbf5ee013011fa9c850f283c547c166c2ed69efe68c562a6cc25a8f6fb68c0662654502252b SHA512 73895c457512229eff996455028420fb3a3e8621891c8c8b0d5cb41c839549c8514a555c5f27441934f288e45277f1606699cb85d3fb76977d643e5a66fe0ec2
-EBUILD libbtbb-9999.ebuild 3479 BLAKE2B ea8e75095644069ee74ef72677aec429114e155ed50565ef71b8237695ae76e4ca750caf6b82df4eff7400ca7a37535dae011c296c7a88b2ef6c4ee168b5ae8a SHA512 9257591a151e4d3da471462cb75febe508eead5bf8b1981c5d75c6906a2228257a5659b45a4718b91c21ebcd0acf1092ee4c34aefa938367555be6ee4ee14add
+EBUILD libbtbb-2018.08.1.ebuild 3470 BLAKE2B 6084d483155c28553328fca02da898c9e37ff4a9d01b82c6aa86a75157c95b130d93a1384042f41cdeefe4e4a77e50dd391598ae50668903302f07a4ac75b109 SHA512 d24a516eb987b1d23812980e937856bba04f20f8dbcf9ab8980f528068d7b9aae2c9464f988f0d89e072b1c3bff27263095ca24428bf583549e479292c769617
+EBUILD libbtbb-2018.12.1.ebuild 3467 BLAKE2B 3a525773dac747916a2824a792ba82a7b536d02f437ad54df462ef025d87f485a4509705ce49c0af624ad108b32888019b083a321dc4ba30340551737ecea320 SHA512 98b8925a4b828464897d868682f1d3642c17761cbb17f1fd584df7141b2ee6f503e845463110c5aac507e62e63c86109b2287818ee14ee175949e7a5a3d8ea64
+EBUILD libbtbb-2020.12.1.ebuild 3404 BLAKE2B 0960f98c48cc5505ced0faf31ecc0d43f71db64cecad00737818a6202721e2bf323b531b892876ce5d28adb537f323366c9e2e393db7098f3b7c76176ca1096c SHA512 2812a860a5d8c70922efb2b91f55db79dd28913a3962c398698cdcf980b365f8430272fcfe528fa1c2600be1946a6033fc2504f735e9edf1f1df026682780791
+EBUILD libbtbb-9999.ebuild 3404 BLAKE2B 0960f98c48cc5505ced0faf31ecc0d43f71db64cecad00737818a6202721e2bf323b531b892876ce5d28adb537f323366c9e2e393db7098f3b7c76176ca1096c SHA512 2812a860a5d8c70922efb2b91f55db79dd28913a3962c398698cdcf980b365f8430272fcfe528fa1c2600be1946a6033fc2504f735e9edf1f1df026682780791
 MISC metadata.xml 504 BLAKE2B 60d141d4d1d3cba4986ccbd980ea1e5e38e055cbfa533e3fb0d1a1f06f7bd6b88c19c217ba9ba3a5f4127ede213256662a6165581047ebc9f0edb8f114cae4ef SHA512 bd75845c471382ed6720c72f4597fcfe7527788273b222c74ce8ffbeb5c37e65a500e9c51626c3d969037fa583af99708817dc4b66f51534abae445bcb3b5c65
diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
index a1587cd739a2..23524a6f4e36 100644
--- a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit multilib cmake-utils
+inherit cmake-utils
 
 DESCRIPTION="A library to decode Bluetooth baseband packets"
 HOMEPAGE="http://libbtbb.sourceforge.net/"
diff --git a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
index d3976d1260b1..f4a117ca3006 100644
--- a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit multilib cmake-utils
+inherit cmake-utils
 
 DESCRIPTION="A library to decode Bluetooth baseband packets"
 HOMEPAGE="http://libbtbb.sourceforge.net/"
diff --git a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
index 758b20c33cd9..edbf18eed8ff 100644
--- a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit multilib cmake-utils
+inherit cmake
 
 DESCRIPTION="A library to decode Bluetooth baseband packets"
 HOMEPAGE="http://libbtbb.sourceforge.net/"
@@ -47,7 +47,7 @@ which_plugins() {
 src_prepare() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if use wireshark-plugins; then
 		which_plugins
@@ -60,7 +60,7 @@ src_prepare() {
 				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
 			fi
 			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_prepare
+			cmake_src_prepare
 		done
 	fi
 }
@@ -73,7 +73,7 @@ src_configure() {
 		-DBUILD_STATIC_LIB=$(usex static-libs)
 		-DBUILD_ROOT="${ED}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	if use wireshark-plugins; then
 		for i in ${plugins}
@@ -87,7 +87,7 @@ src_configure() {
 			local mycmakeargs=(
 			-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
 			)
-			cmake-utils_src_configure
+			cmake_src_configure
 		done
 	fi
 }
@@ -95,7 +95,7 @@ src_configure() {
 src_compile() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use wireshark-plugins; then
 		for i in ${plugins}
@@ -106,7 +106,7 @@ src_compile() {
 				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
 			fi
 			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_compile
+			cmake_src_compile
 		done
 	fi
 }
@@ -114,7 +114,7 @@ src_compile() {
 src_test() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
-	cmake-utils_src_test
+	cmake_src_test
 
 	if use wireshark-plugins; then
 		for i in ${plugins}
@@ -125,7 +125,7 @@ src_test() {
 				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
 			fi
 			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_test
+			cmake_src_test
 		done
 	fi
 }
@@ -133,7 +133,7 @@ src_test() {
 src_install() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use wireshark-plugins; then
 		for i in ${plugins}
@@ -144,7 +144,7 @@ src_install() {
 				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
 			fi
 			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_install
+			cmake_src_install
 		done
 	fi
 }
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index a1587cd739a2..edbf18eed8ff 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit multilib cmake-utils
+inherit cmake
 
 DESCRIPTION="A library to decode Bluetooth baseband packets"
 HOMEPAGE="http://libbtbb.sourceforge.net/"
@@ -47,7 +47,7 @@ which_plugins() {
 src_prepare() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if use wireshark-plugins; then
 		which_plugins
@@ -60,7 +60,7 @@ src_prepare() {
 				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
 			fi
 			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_prepare
+			cmake_src_prepare
 		done
 	fi
 }
@@ -73,7 +73,7 @@ src_configure() {
 		-DBUILD_STATIC_LIB=$(usex static-libs)
 		-DBUILD_ROOT="${ED}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	if use wireshark-plugins; then
 		for i in ${plugins}
@@ -87,7 +87,7 @@ src_configure() {
 			local mycmakeargs=(
 			-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
 			)
-			cmake-utils_src_configure
+			cmake_src_configure
 		done
 	fi
 }
@@ -95,7 +95,7 @@ src_configure() {
 src_compile() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use wireshark-plugins; then
 		for i in ${plugins}
@@ -106,7 +106,7 @@ src_compile() {
 				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
 			fi
 			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_compile
+			cmake_src_compile
 		done
 	fi
 }
@@ -114,7 +114,7 @@ src_compile() {
 src_test() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
-	cmake-utils_src_test
+	cmake_src_test
 
 	if use wireshark-plugins; then
 		for i in ${plugins}
@@ -125,7 +125,7 @@ src_test() {
 				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
 			fi
 			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_test
+			cmake_src_test
 		done
 	fi
 }
@@ -133,7 +133,7 @@ src_test() {
 src_install() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use wireshark-plugins; then
 		for i in ${plugins}
@@ -144,7 +144,7 @@ src_install() {
 				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
 			fi
 			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_install
+			cmake_src_install
 		done
 	fi
 }