gentoo resync : 25.10.2021

3 files changed, 9 insertions, 35 deletions

diff --git a/net-wireless/crackle/Manifest b/net-wireless/crackle/Manifest
index 5f326e55c83e..3de92c9fe359 100644
--- a/net-wireless/crackle/Manifest
+++ b/net-wireless/crackle/Manifest
@@ -1,5 +1,4 @@
 AUX flags.patch 545 BLAKE2B 74c5fa412bf924efadc64ed8cd67ab92df7f141953caa08b65aa417aec217007e49d3ae62eda5a90b4bad6bcb632b9fa4f6c9e5e46468007daf197017d7afed4 SHA512 b229062f011559fce843bb5c47ae3b0cf03f30467ff51c3015d2ef39d61dc3625233625a869084f3e8bad8310332335817609fefb6cbcfcd78767158c50d158b
 DIST crackle-0.1.tgz 27015 BLAKE2B 90cf55c24afd2327f0400d5fa0418a7d6f73f5c81dfe04bd795b76bd6f437b1c9ce11a139c8e0076b3752e3c73d66d3610ea7421e08cbce9e77260551e27bc89 SHA512 e60341e1fae6a3212028714a7bdba2c8f65d4b92d3d670194954df0e11e1f69a1bb6a5bcbdd5c4db54774cfe60955d50fbd2bfaff5fa615bf253f57283cfa17b
-EBUILD crackle-0.1.ebuild 510 BLAKE2B d2546c02ba6bcbf172ccfd1c1a6c04a58f227a7e7b47b3543ec8fbf05f2b29c17c682de6d482fc8c4358074040fa2c28d614c36e061a2b94de27883f23db2f9b SHA512 05f3a4a530d0be4893448dc93294ffafeefb5e5162d14c1d14c44f42a8db4ede72857878ceb21138ae1542a35203bd628afe22f35077bd1270e085810bd9801f
-EBUILD crackle-9999.ebuild 626 BLAKE2B 1a2bab6a558be0bf77fbc48c80d86fbc8309f9094aedd69777827c5cfe29e6f1ed08705ec9d4ab4df184eed42835635cbcd68c4dddbe276dc8a7eb3c6d8abb1c SHA512 3bb3bbe35784f608f94373c72e1dabeef5751a448478d471d7d47399169b58f85b5f9d3a8c1f88be391ff6839d3244cbc19626307aaad62b6f5f255ff84e19d2
+EBUILD crackle-0.1-r1.ebuild 533 BLAKE2B 2c5faf0e910c4c27b99740eafbd33b32c515ad43966f4e511f33be25a4522d3939d6a0380c12c38b232a3ee55d12b2b3e46e07eaf12a99757ef7854372866ac9 SHA512 1857b1b84d419fbe258fa6237c9a9817fa9a5b8055bdb28070d515a080722cc2484ef00cf02f1d81263db3329c02879d3c61e646e5473db6eb46c035c5dfb7ed
 MISC metadata.xml 242 BLAKE2B 759698f297aa1433159cc8d44fc0f8e77e3b9d1e812a023acbd581f105ed1e9d69eb5117e3da5961fb59e9120af6e584b92b0ae554518a6c4cfc171ae16ad48e SHA512 f80486dfc128933ad7de3d0105385fad5cc3566b4f901c3faa58168fcfef2d2827c9599e5b4d1fd164ee61609a9ec20730c8e11fa1ae010ee5862e6e5510e5dc
diff --git a/net-wireless/crackle/crackle-0.1.ebuild b/net-wireless/crackle/crackle-0.1-r1.ebuild
index c7a694212e40..9bcfc7aa0696 100644
--- a/net-wireless/crackle/crackle-0.1.ebuild
+++ b/net-wireless/crackle/crackle-0.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch
+inherit toolchain-funcs
 
 DESCRIPTION="Crackle cracks BLE Encryption (AKA Bluetooth Smart)"
 HOMEPAGE="http://lacklustre.net/projects/crackle/"
@@ -12,15 +12,18 @@ SRC_URI="http://lacklustre.net/projects/crackle/${P}.tgz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="net-libs/libpcap"
 RDEPEND="${DEPEND}"
 
 RESTRICT="test"
 
-src_prepare() {
-	epatch "${FILESDIR}"/flags.patch
+PATCHES=(
+	${FILESDIR}"/flags.patch"
+)
+
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
diff --git a/net-wireless/crackle/crackle-9999.ebuild b/net-wireless/crackle/crackle-9999.ebuild
deleted file mode 100644
index 6e8816d85087..000000000000
--- a/net-wireless/crackle/crackle-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Crackle cracks BLE Encryption (AKA Bluetooth Smart)"
-HOMEPAGE="http://lacklustre.net/projects/crackle/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/mikeryan/crackle.git"
-	inherit git-r3
-else
-	SRC_URI="http://lacklustre.net/projects/crackle/${P}.tgz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-		test? ( dev-lang/perl )"
-
-src_install() {
-	DESTDIR="${ED}" PREFIX=/usr emake install
-}