gentoo xmass resync : 25.12.2021

7 files changed, 4 insertions, 123 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 8e298c2fa2a3..f98ae0281d05 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 8cd8dafe7fd9..9664e93e1357 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,6 +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
 EBUILD aircrack-ng-1.6_p20200722-r1.ebuild 3107 BLAKE2B d36f436ec00410e1713ec869d5b3dc6b5fff239e536edc7adf1eb457ddc05dd08524af96759f9c5aaca34721135b50787b6e53698a54a1aa87e4e7460dc454d1 SHA512 7e22695d8f81aed26aa6741487cbdd96965042762507110d499f4ad4182b4bef62cbffa94a8a168b54565d765385d24ed7783efd39f283ed6644136ec5129ceb
-EBUILD aircrack-ng-1.6_p20200722.ebuild 3041 BLAKE2B 5d328c629911ce056e1fe69c5f26cc78be3eb1107dc0fffb1a2479e8ca70d485d7517fb45a9ca680e8d8d735c6a07c272729c4291f360911cefc4d14a0e85dbe SHA512 8021b4735879a2e161735570d0449e54f9c3edec40307ea991376c0b2cf37f6f8739fa83068a0bb25f957522bfa56ba0c983c68b2cd6f3b43957304cfc513554
 EBUILD aircrack-ng-9999.ebuild 2884 BLAKE2B ed54ac92d75c1c1b6c5f08de0730f7d65b53a7a4805edffae880de577b0c18dcdee132d7811affcc5091d3e0a042f521924f013141e43210e8982fa7ce1fcbd7 SHA512 556433bfc754a0578eef2ce61cf2dc5cb9866311e7f767b9d1b77fcc4a959581b4e66861191d06f4926990072fce31c860db30a955ba1100ce9f6f553441cfc9
 MISC metadata.xml 1025 BLAKE2B 3ef3b53eb156de9ed98d8a6283b6950e6d2f184d1058139a94222b18d5695da805444d993d50d9fc9736c7035a3a20253679e06e5b64bb1c83f504aa4f0406b6 SHA512 bd9b04fb372175910512baba2320a91e9122dded0070f0498c82ae55716e4b5dc027ba7027086805ab9782283eb43ab0787e41a0a5b8c551e696511ac45bc291
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild
deleted file mode 100644
index e3c69ec22df6..000000000000
--- a/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-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 kernel_linux kernel_FreeBSD +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/hwids
-	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="
-	airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
-	airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	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
-}
-
-pkg_postinst() {
-	# Message is (c) FreeBSD
-	# http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5
-	if use kernel_FreeBSD ; then
-		einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor"
-		einfo "mode of your wireless card.  So do not care about what the manpages say about"
-		einfo "airmon-ng, airodump-ng sets monitor mode automatically."
-		echo
-		einfo "To return from monitor mode, issue the following command:"
-		einfo "    ifconfig \${INTERFACE} -mediaopt monitor"
-		einfo
-		einfo "For aireplay-ng you need FreeBSD >= 7.0."
-	fi
-}
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index 7b8e548f3ea3..fa196461b0c8 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -7,5 +7,5 @@ AUX crda-libreg-link.patch 908 BLAKE2B 60d9307ba43235cbce089835ae7406313b9f68a90
 AUX crda-no-ldconfig.patch 748 BLAKE2B 1ef8aff911a5f4af14fb321782cfb40abc8a946dc80af95ec2c2d50e509f318d84be36190c5b899c882b6173617746600b04bf6d0c282a59c568c44e2f255d16 SHA512 faea7d4bfc0b1a4a674cb6c285975805985dc4211c43ca47da38102cb79a1d6d770aa6267e85d811998f9a13799335cfb6116f272ed40c4ecd6b3f813ca93a28
 AUX crda-no-werror.patch 916 BLAKE2B 2e7c79e14ae0ab05cbf032f104747eeea0df165197ba1ff8039fb14de43880894b03e59e14fe2d906b7f99c8d910cef701c1abcb68d9558cfd37d4455ce03501 SHA512 ab521bbc47826bb9356c8b96bee24f6e6d7f03a98036398627e840b89e7245329115664fc740d2b3c0d3a497ef638e3be3fa9d1e991a7e03a0753e078c8019e9
 DIST crda-4.14.tar.gz 72753 BLAKE2B 79e96bc41103eb221d841c74081c2abf507c46ae7790d5d8201dbc49260bc833630b95f74da5500817e07f1b4108713867071bd82ecc4c46d202d1e0ea865675 SHA512 0d52cf62589ec2debfd66de95b82b03a1c15048d8425cf5ef43c3e1f51ce1311a6d898fd5f69badcceb3181d35c836db197c6f070654dab351b01e96a1dd1053
-EBUILD crda-4.14.ebuild 2123 BLAKE2B 7a08275efc64f8baa19d33605946261486e9ebf35b05474b4bfc81eebe4f4b4ee3d61578a050f92a4ca1ed7885376e07f68a0cfb4b20df632f44ae1e3af4c15f SHA512 0b25b44f5329ebd5194b481d3965bfbfc71243b1fca14138439672826b0a353ebe2d11d407aff61642a021e2d45d06580864cf4e7b154f87f8aaf4cc84d042e5
+EBUILD crda-4.14.ebuild 2124 BLAKE2B 0b714d079444e9085eaa04d1868c5dbdb8607a5788bd76e75f3cb001bd98fa91a5df47a0c10806cff8c4de0c0c8c16bfb35ef33386430731a30d414bb4bd386a SHA512 a11c73ffe7b3ca5b8448117d876bf5b31ca1e187d9c7c7aa2c485afe33a6b13e4f2dfcd0bdc324211860653b9a10f46bd7bddb60664d89b4c5e5f605e04532e9
 MISC metadata.xml 342 BLAKE2B 88aa38f713696271570968796b27533c0a990225592a4b553c4d1ff50528bce6bc5c96ab43998950b1391c42051eac0b7ed32eeb9b01458e4112ddfca56fbab7 SHA512 1775a84638c2ccdd1171d073603c2f0fa2d1248c1b2584ac25c26dd2eba0dc3af2800740253ca2083f10c11ad8763c4614cf73cdb695142dc75be79ea1c03675
diff --git a/net-wireless/crda/crda-4.14.ebuild b/net-wireless/crda/crda-4.14.ebuild
index e67a2c2d0c3b..e74585491eaa 100644
--- a/net-wireless/crda/crda-4.14.ebuild
+++ b/net-wireless/crda/crda-4.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit toolchain-funcs python-any-r1 udev
 
 DESCRIPTION="Central Regulatory Domain Agent for wireless networks"
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index e339d33ecc5e..1a0efdd92dd5 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -8,6 +8,6 @@ DIST iwd-1.19.tar.xz 972652 BLAKE2B ff93a1e26ad6afd90d1c92865e2c26c0722b5f1e0a8b
 DIST iwd-1.20.tar.xz 973964 BLAKE2B 750368aec999b988aaaed34454a1a15a75fa9c37ce4523715156c1bc89e343aad62c0d0f0ef5f798a75b19a271175f05517e641f3e2a6e502d932da8e1cfff63 SHA512 1a272492d101bd6ec22df16d98895ce03aa8470b35a7b3c36e5431239e519f74fae81f8bee25e52ce7705459b42e37298778f671a39e98787ddb1b9881521847
 EBUILD iwd-1.18.ebuild 5067 BLAKE2B c7f171ba3bd4b71fb0904d5f81e4c51e22c91515ae2c7de67aee586335516524dc0f189c653d82f40127b4c38a0d69899f0934712b5b406d7a2f5b3750a2b39a SHA512 d7b995827494fc42f192ed74611bab0ade76a4257b221dbe1ead1fa688765b08681fbbc59eb6f01da5fddf1aeb309d663ebf0f066a87064a5bd04c969ec69f44
 EBUILD iwd-1.19.ebuild 4952 BLAKE2B 8e668cfabb652cc22680ddb19bb76a1025a291435927f363adf283c13f64aa36413714f6ef4533115c74735e17c03fcf6b7c494dd6136f65fa8092797e23bf50 SHA512 85e7abbb4049800be4f7579902e852a597b08ec5f295c5b4c450cf81eba9a7bee54d9df42231be0d79110f1a7bde5a35a3d57d3466a644898f28995fb576eb83
-EBUILD iwd-1.20.ebuild 4952 BLAKE2B a1bcc2795eefb70bc80fea73d98161b8db1ad536d323605d1a0f8dbfa95711d4a185d7765cb70fd2ab44679971f58e28e356db7eec821fba6c037c467ddeb01a SHA512 b56965841e8f5eb6f5bb11f1649f661f50d0aa329c4a2c89b559bd15b83cc09499d1cae09b41e3617a228f30007fd64d8fe0b3747e98690b83a6386df6d03c0d
+EBUILD iwd-1.20.ebuild 4946 BLAKE2B 79e2dc009afc7a81a8de7e6db2313a56bff420e4a3974d09fecd58a8f415c32c21889e77b193733080087a1646a5587a10f64d50d6a884f5d3ff98d750476e49 SHA512 45cb2cc5522594318186cf46c63c1be5c8431038fcf023ff868ea710e292f363c496b43f7c1b9b5412e4b4dfd1c24bd9f5ee7564b6da57d296fdb7bbcda1f7ee
 EBUILD iwd-9999.ebuild 4930 BLAKE2B ef4e6abb91312e52edc376f99664863d83ff87340a7a83e617b826d48fd85c8b70c95e0929a1c3461ec03bc45724ace0f287ce5b03cb381e6221b9414f38b93e SHA512 485aaca5116e7f13b5a76816bf0b98731c95f305b69e40ae717bad2da2760b8759eb2043c8f6888fa790854ed5f8b0039d920572af5e6396fd297aa2e2d06256
 MISC metadata.xml 844 BLAKE2B a0745226f5314cee29c405d53b5f03c1e2706518272a69443174123601c4b79ad5902e2f22575b46bed37c5d6ebebd1ad4cdcccbb7c40405c4d04f2b92bef17d SHA512 9997101871ad37981492b0a70150d091926ec2321f13d70d5f85f2ff5d360cc87970beb9575c2f78a909e6f3a91ef022fd7115db9ec0ec77d5d94363ed30d793
diff --git a/net-wireless/iwd/iwd-1.20.ebuild b/net-wireless/iwd/iwd-1.20.ebuild
index fc8912d9f284..cb041b9fb058 100644
--- a/net-wireless/iwd/iwd-1.20.ebuild
+++ b/net-wireless/iwd/iwd-1.20.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 	MYRST2MAN="RST2MAN=:"
 fi