gentoo auto-resync : 25:04:2023 - 00:11:21

5 files changed, 23 insertions, 117 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 5ba0157ade26..be89062fd6e8 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index d2da84e062ee..d39405a9dbf4 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,7 +1,5 @@
 AUX aircrack-ng-1.6-hwdata.patch 921 BLAKE2B 0cbe038a33745cfb9bf873ea34627281d4a5f30e7f36595ef85490d4a13d281235f7e6cf09af1f0d7fea10fefda4a4ba76bcd8f0175520fb6b314c191dcd998e SHA512 cb2bcb89185555e827f3bc28135ac0fd025f3c9a7e770c779c4feb3737ae6a975c55ce041e31cb4409a9339b730b42d453eb62b5576709a79e42737abe5ffd1b
-DIST aircrack-ng-1.6_p20200722.tar.gz 7602785 BLAKE2B 67426a8f1d683fa374e8aa3dfd78ec860f622127f37080f0b3acba6fd7e05088203a60a9c7fd6265835b7b52697fd7d2660a5efb79c3c72d7098a081dd83ecfe SHA512 dc7c80099bdcd6c68c5e06e4668453c0c594c66d57079ed77c27467e4d2307ca63ea9671966e06feb6b698020b683f6830d401701e4472acbf0edb4f22bb1f75
 DIST aircrack-ng-1.7.tar.gz 7740634 BLAKE2B 4461af7b698d30c96e6f93494d5ee658bf8d7144d8b165e9b8aee1766a35dddded3bbb738237e1100dcf22167125aa7cf9149288bba1607fe778470b04596cb2 SHA512 3e6433cba1d6b122701245e8904480de9957dad033c1642cc45b30339e9391ffa21b39b2cc712bcba79bc2c2e26f2964be8f28a27081dc4bb323792cb7df2478
-EBUILD aircrack-ng-1.6_p20200722-r1.ebuild 2470 BLAKE2B 388214cd4e5ac60d36b1b6a79938e683be8920f7c8139b2ac197de87ee84aba17e846c63dc448ad60270bbf9a5c4a2549d3d058a9db5c381b81c1d484b72db2b SHA512 9a1b29035705a954cb66044283fca0bc99b9bbef3cc3be248cb713bed42721938d26c13fb9a93a447d334434438d4892bd3f05072f4e494d92ccbe6ef0bbbde8
-EBUILD aircrack-ng-1.7.ebuild 2305 BLAKE2B 180ff1ab543024a65ca9b4533d1711067485deb1320b0e44e2ee72d89c20e4d9cee7fa584b5b804bd27d98c8fcce8d9c263c2d3531984438f9407b9b53f4d751 SHA512 8642fa33eab9e7568934c0b4ae20d7b08ce66951ca236954994e69f656b13da3458975889cc7c1c983763205374892db3d98444521e4da376ae94b86e4ac4ebd
-EBUILD aircrack-ng-9999.ebuild 2308 BLAKE2B 5a613cd96c27b30c8ce612427051484ccdbbf85a0f9afb6c847dc7df42ca4a54a2f95d991d0bf624266cdc6815743dad74ec77e8146ca12c561f8c9c217d5d25 SHA512 44981c87e89ebddafdabaf913bacb7bd2ded7c10d3d3b580b88c541eb4091746505a997f8c1026ded7ae6963eeaeba04fdc2392ca67ae46f910946bd1afb7f6c
+EBUILD aircrack-ng-1.7-r1.ebuild 2522 BLAKE2B dcbd66c518df19ed012c447d924661f93771f7d69dd9071356bfb6a8a04f8d90b06e1a675b6d423b52fd5b5ee45c3e4481bdd1c15a1d715387a1720aba55a719 SHA512 54186625b110a21b4071ed6ce3eeefe1efe92ccc4ff30f026e3c09942bd78205b64eac72125154a1f179868a5784ea903705fe69d77f56634d6fb22697126f5b
+EBUILD aircrack-ng-9999.ebuild 2528 BLAKE2B 41d8c0e6625a39e395511a70ab6491ee325d5673c654a77c0629e1427631f78624f8aaca068618dcd293c36f68856eb214e1462846c9921419216f7338647b84 SHA512 a9f1d1534323cf27d3c2c37d15f4a3bca452c63e38752fe3d71187cfd98a7ee72662d6194a291c0ebf26223fedc44b7dc82f5883be270b7f81dbbee64a0d4c80
 MISC metadata.xml 1025 BLAKE2B 3ef3b53eb156de9ed98d8a6283b6950e6d2f184d1058139a94222b18d5695da805444d993d50d9fc9736c7035a3a20253679e06e5b64bb1c83f504aa4f0406b6 SHA512 bd9b04fb372175910512baba2320a91e9122dded0070f0498c82ae55716e4b5dc027ba7027086805ab9782283eb43ab0787e41a0a5b8c551e696511ac45bc291
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722-r1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722-r1.ebuild
deleted file mode 100644
index cf9da89cdc3f..000000000000
--- a/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-DISTUTILS_OPTIONAL=1
-
-inherit toolchain-funcs distutils-r1 flag-o-matic autotools
-
-DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
-HOMEPAGE="http://www.aircrack-ng.org"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
-else
-	#SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
-	COMMIT="5a02ac4818b30d2e87b3e18e497a5f9e5319394f"
-	SRC_URI="https://github.com/aircrack-ng/aircrack-ng/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+airdrop-ng +airgraph-ng +netlink +pcre +sqlite +experimental"
-
-DEPEND="net-libs/libpcap
-	sys-apps/hwloc:0=
-	dev-libs/openssl:0=
-	netlink? ( dev-libs/libnl:3 )
-	pcre? ( dev-libs/libpcre )
-	airdrop-ng? ( ${PYTHON_DEPS} )
-	airgraph-ng? ( ${PYTHON_DEPS} )
-	experimental? ( sys-libs/zlib )
-	sqlite? ( >=dev-db/sqlite-3.4 )"
-RDEPEND="${DEPEND}
-	kernel_linux? (
-		net-wireless/iw
-		net-wireless/wireless-tools
-		sys-apps/ethtool
-		sys-apps/usbutils
-		sys-apps/pciutils )
-	sys-apps/hwdata
-	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="
-	airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
-	airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/aircrack-ng-1.6-hwdata.patch"
-	)
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		STATIC_LIBDIR_NAME="$(get_libdir)" \
-		--disable-asan \
-		--enable-shared \
-		--disable-static \
-		--without-opt \
-		$(use_enable netlink libnl) \
-		$(use_with experimental) \
-		$(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
-
-	if use airgraph-ng; then
-		cd "${S}/scripts/airgraph-ng"
-		distutils-r1_src_compile
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng"
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-
-	if use airgraph-ng; then
-		cd "${S}/scripts/airgraph-ng"
-		distutils-r1_src_install
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng"
-		distutils-r1_src_install
-	fi
-
-	# we don't need aircrack-ng's oui updater, we have our own
-	rm "${ED}"/usr/sbin/airodump-ng-oui-update
-	find "${D}" -xtype f -name '*.la' -delete || die
-}
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.7.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.7-r1.ebuild
index 30d48e8ff2f3..be8363470a9a 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.7.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.7-r1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10} )
+#this doesn't work because of multiple calls to distutils-r1_src_compile
+#DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_OPTIONAL=1
 
 inherit toolchain-funcs distutils-r1 flag-o-matic autotools
@@ -23,7 +25,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="+airdrop-ng +airgraph-ng +netlink +pcre +sqlite +experimental"
+IUSE="+airdrop-ng +airgraph-ng +experimental +netlink +pcre +sqlite test"
 
 DEPEND="net-libs/libpcap
 	sys-apps/hwloc:0=
@@ -34,7 +36,8 @@ DEPEND="net-libs/libpcap
 	airdrop-ng? ( ${PYTHON_DEPS} )
 	airgraph-ng? ( ${PYTHON_DEPS} )
 	experimental? ( sys-libs/zlib )
-	sqlite? ( >=dev-db/sqlite-3.4 )"
+	sqlite? ( >=dev-db/sqlite-3.4:3 )
+	test? ( dev-tcltk/expect )"
 RDEPEND="${DEPEND}
 	kernel_linux? (
 		net-wireless/iw
@@ -44,11 +47,14 @@ RDEPEND="${DEPEND}
 		sys-apps/pciutils )
 	sys-apps/hwdata
 	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
+BDEPEND="${DISTUTILS_DEPS}"
 
 REQUIRED_USE="
 	airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
 	airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
 
+RESTRICT="!test? ( test )"
+
 src_prepare() {
 	default
 	eautoreconf
@@ -61,6 +67,7 @@ src_configure() {
 		--enable-shared \
 		--disable-static \
 		--without-opt \
+		--with-duma=no \
 		$(use_enable netlink libnl) \
 		$(use_with experimental) \
 		$(use_with sqlite sqlite3)
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index f159d65ad141..b8e12c8d8c8f 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10} )
+#this doesn't work because of multiple calls to distutils-r1_src_compile
+#DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_OPTIONAL=1
 
 inherit toolchain-funcs distutils-r1 flag-o-matic autotools
@@ -23,18 +25,19 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="+airdrop-ng +airgraph-ng +netlink +pcre +sqlite +experimental"
+IUSE="+airdrop-ng +airgraph-ng +experimental +netlink +pcre +sqlite test"
 
 DEPEND="net-libs/libpcap
 	sys-apps/hwloc:0=
 	dev-libs/libbsd
 	dev-libs/openssl:0=
 	netlink? ( dev-libs/libnl:3 )
-	pcre? ( dev-libs/libpcre )
+	pcre? ( dev-libs/libpcre2:= )
 	airdrop-ng? ( ${PYTHON_DEPS} )
 	airgraph-ng? ( ${PYTHON_DEPS} )
 	experimental? ( sys-libs/zlib )
-	sqlite? ( >=dev-db/sqlite-3.4 )"
+	sqlite? ( >=dev-db/sqlite-3.4:3 )
+	test? ( dev-tcltk/expect )"
 RDEPEND="${DEPEND}
 	kernel_linux? (
 		net-wireless/iw
@@ -44,11 +47,14 @@ RDEPEND="${DEPEND}
 		sys-apps/pciutils )
 	sys-apps/hwdata
 	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
+BDEPEND="${DISTUTILS_DEPS}"
 
 REQUIRED_USE="
 	airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
 	airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
 
+RESTRICT="!test? ( test )"
+
 src_prepare() {
 	default
 	eautoreconf
@@ -61,6 +67,7 @@ src_configure() {
 		--enable-shared \
 		--disable-static \
 		--without-opt \
+		--with-duma=no \
 		$(use_enable netlink libnl) \
 		$(use_with experimental) \
 		$(use_with sqlite sqlite3)