gentoo auto-resync : 26:04:2023 - 00:13:39

4 files changed, 36 insertions, 71 deletions

diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index 5de04bb194d8..56dec93391b0 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,5 +1,4 @@
-AUX aircrack-ng-1.6-hwdata.patch 921 BLAKE2B 0cbe038a33745cfb9bf873ea34627281d4a5f30e7f36595ef85490d4a13d281235f7e6cf09af1f0d7fea10fefda4a4ba76bcd8f0175520fb6b314c191dcd998e SHA512 cb2bcb89185555e827f3bc28135ac0fd025f3c9a7e770c779c4feb3737ae6a975c55ce041e31cb4409a9339b730b42d453eb62b5576709a79e42737abe5ffd1b
 DIST aircrack-ng-1.7.tar.gz 7740634 BLAKE2B 4461af7b698d30c96e6f93494d5ee658bf8d7144d8b165e9b8aee1766a35dddded3bbb738237e1100dcf22167125aa7cf9149288bba1607fe778470b04596cb2 SHA512 3e6433cba1d6b122701245e8904480de9957dad033c1642cc45b30339e9391ffa21b39b2cc712bcba79bc2c2e26f2964be8f28a27081dc4bb323792cb7df2478
-EBUILD aircrack-ng-1.7-r2.ebuild 2636 BLAKE2B 0aa574475688a9995d87e7a2c3c2244bcf90e85a1d931a56bfe5d91a42db638d79e737a23d13f6fcefe7e9ac61e85450e95095b12aea69f3cdad67823c9e4e77 SHA512 3bc5998c8bd64847e2022851f2e984623b41e6a38178edf3fbe22c53cd70fc9a2f93e5686307b29fb91d16adc607e635d46742c0edd986253dbd4ff678fea1b0
-EBUILD aircrack-ng-9999.ebuild 2642 BLAKE2B 10565a1fdaa112789388df40630441a46612aa19440a7ada842368fa505fedfddd348910ee83b54020db69d7f7aba7abf50a609777edd6b84bf55ffe29455c8a SHA512 fac8af8db911fbe3458316e8424a6164d47b55868a254be3e3e514bd3f67f2c3d4f298eb87c40275274a788971b7d6eccf8ef70fd8ca826d30127e822ce9e73b
+EBUILD aircrack-ng-1.7-r3.ebuild 2447 BLAKE2B ac5e7fce80c2296322e99d62c52b77ce46e2235a5015142c010a9860ee9e62b976dca6ab6e05458b641cfc7b4ed657a4e73807f725b9eeb0e735f4b258a71536 SHA512 e8ce13bb6c16a692fde3215d5787034f6190bab10abd790a65d3e637631bb2cbf403de4a7617fa9dab514679068c74b17445561ce00245c905b0381eb440cdb0
+EBUILD aircrack-ng-9999.ebuild 2453 BLAKE2B 82e698a30574d54450e01c781669af7de43635920db078af71df9d1928ad2b075c48c157b9b78677bdb8b41aba8164b2ec1f09535bffa1d90aad9ac2b60b95e3 SHA512 3520fa2d10f0d40f6d8dccb80e84ace68bc7a00567a108353f376e56c6ac775b5e3cb7cf7c1096a1dc67eb350f2e2c074d2049e7cac61be25d047a2a3380d907
 MISC metadata.xml 1025 BLAKE2B 3ef3b53eb156de9ed98d8a6283b6950e6d2f184d1058139a94222b18d5695da805444d993d50d9fc9736c7035a3a20253679e06e5b64bb1c83f504aa4f0406b6 SHA512 bd9b04fb372175910512baba2320a91e9122dded0070f0498c82ae55716e4b5dc027ba7027086805ab9782283eb43ab0787e41a0a5b8c551e696511ac45bc291
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.7-r2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.7-r3.ebuild
index a4fe5c4ec493..6020f6024964 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.7-r2.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.7-r3.ebuild
@@ -3,12 +3,11 @@
 
 EAPI=8
 
-#this doesn't work because of multiple calls to distutils-r1_src_compile
-#DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_OPTIONAL=1
 
-inherit toolchain-funcs distutils-r1 flag-o-matic autotools
+inherit distutils-r1 autotools
 
 DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
 HOMEPAGE="http://www.aircrack-ng.org"
@@ -50,8 +49,8 @@ RDEPEND="${CDEPEND}
 		sys-apps/pciutils )
 	sys-apps/hwdata
 	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
-#BDEPEND="airdrop-ng? ( ${DISTUTILS_DEPS} )
-#		airgraph-ng? ( ${DISTUTILS_DEPS} )"
+BDEPEND="airdrop-ng? ( ${DISTUTILS_DEPS} )
+	airgraph-ng? ( ${DISTUTILS_DEPS} )"
 
 REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
 	airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
@@ -61,6 +60,9 @@ RESTRICT="!test? ( test )"
 src_prepare() {
 	default
 	eautoreconf
+	if use airgraph-ng || use airdrop-ng; then
+		distutils-r1_src_prepare
+	fi
 }
 
 src_configure() {
@@ -76,33 +78,27 @@ src_configure() {
 		$(use_with sqlite sqlite3)
 }
 
-src_compile() {
-	if [[ $($(tc-getCC) --version) == clang* ]] ; then
-		#https://bugs.gentoo.org/show_bug.cgi?id=472890
-		filter-flags -frecord-gcc-switches
-	fi
-
-	default
-
+python_compile() {
 	if use airgraph-ng; then
 		cd "${S}/scripts/airgraph-ng" || die
-		distutils-r1_src_compile
+		distutils-r1_python_compile
 	fi
 	if use airdrop-ng; then
 		cd "${S}/scripts/airdrop-ng" || die
+		distutils-r1_python_compile
+	fi
+}
+
+src_compile() {
+	default
+	if use airgraph-ng || use airdrop-ng; then
 		distutils-r1_src_compile
 	fi
 }
 
 src_install() {
 	default
-
-	if use airgraph-ng; then
-		cd "${S}/scripts/airgraph-ng" || die
-		distutils-r1_src_install
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng" || die
+	if use airgraph-ng || use airdrop-ng; then
 		distutils-r1_src_install
 	fi
 
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index 41428d7587ed..b66df597673b 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -3,12 +3,11 @@
 
 EAPI=8
 
-#this doesn't work because of multiple calls to distutils-r1_src_compile
-#DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_OPTIONAL=1
 
-inherit toolchain-funcs distutils-r1 flag-o-matic autotools
+inherit distutils-r1 autotools
 
 DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
 HOMEPAGE="http://www.aircrack-ng.org"
@@ -50,8 +49,8 @@ RDEPEND="${CDEPEND}
 		sys-apps/pciutils )
 	sys-apps/hwdata
 	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
-#BDEPEND="airdrop-ng? ( ${DISTUTILS_DEPS} )
-#		airgraph-ng? ( ${DISTUTILS_DEPS} )"
+BDEPEND="airdrop-ng? ( ${DISTUTILS_DEPS} )
+	airgraph-ng? ( ${DISTUTILS_DEPS} )"
 
 REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
 	airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
@@ -61,6 +60,9 @@ RESTRICT="!test? ( test )"
 src_prepare() {
 	default
 	eautoreconf
+	if use airgraph-ng || use airdrop-ng; then
+		distutils-r1_src_prepare
+	fi
 }
 
 src_configure() {
@@ -76,33 +78,27 @@ src_configure() {
 		$(use_with sqlite sqlite3)
 }
 
-src_compile() {
-	if [[ $($(tc-getCC) --version) == clang* ]] ; then
-		#https://bugs.gentoo.org/show_bug.cgi?id=472890
-		filter-flags -frecord-gcc-switches
-	fi
-
-	default
-
+python_compile() {
 	if use airgraph-ng; then
 		cd "${S}/scripts/airgraph-ng" || die
-		distutils-r1_src_compile
+		distutils-r1_python_compile
 	fi
 	if use airdrop-ng; then
 		cd "${S}/scripts/airdrop-ng" || die
+		distutils-r1_python_compile
+	fi
+}
+
+src_compile() {
+	default
+	if use airgraph-ng || use airdrop-ng; then
 		distutils-r1_src_compile
 	fi
 }
 
 src_install() {
 	default
-
-	if use airgraph-ng; then
-		cd "${S}/scripts/airgraph-ng" || die
-		distutils-r1_src_install
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng" || die
+	if use airgraph-ng || use airdrop-ng; then
 		distutils-r1_src_install
 	fi
 
diff --git a/net-wireless/aircrack-ng/files/aircrack-ng-1.6-hwdata.patch b/net-wireless/aircrack-ng/files/aircrack-ng-1.6-hwdata.patch
deleted file mode 100644
index bedc14f3ffc1..000000000000
--- a/net-wireless/aircrack-ng/files/aircrack-ng-1.6-hwdata.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f493d0ba1d2cd6c2fdd3c80fe20908c5a6a0001a Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 25 Nov 2021 12:28:07 -0500
-Subject: [PATCH] airodump-ng: look for oui.txt in /usr/share/hwdata
-
-This location is used by the hwdata package on various distros.
-
-https://github.com/vcrhonek/hwdata
-
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- src/airodump-ng/airodump-ng.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/airodump-ng/airodump-ng.c b/src/airodump-ng/airodump-ng.c
-index 63013450d..23171854e 100644
---- a/src/airodump-ng/airodump-ng.c
-+++ b/src/airodump-ng/airodump-ng.c
-@@ -102,6 +102,7 @@ static const char * OUI_PATHS[]
- 	   "/usr/share/aircrack-ng/airodump-ng-oui.txt",
- 	   "/var/lib/misc/oui.txt",
- 	   "/usr/share/misc/oui.txt",
-+	   "/usr/share/hwdata/oui.txt",
- 	   "/var/lib/ieee-data/oui.txt",
- 	   "/usr/share/ieee-data/oui.txt",
- 	   "/etc/manuf/oui.txt",