gentoo resync : 03.03.2021

4 files changed, 7 insertions, 126 deletions

diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index 29181f871c9f..10c43a2d9887 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,6 +1,4 @@
-DIST aircrack-ng-1.6.tar.gz 7933308 BLAKE2B c4cacdc9b767789a7b2426857831c1f8166d3f2e11a71cffc1466f2d4006552dfe420a50e0085f3c74fbdc23770309bb81d49e0c5372b0e4a8fa5e294c16d942 SHA512 df65ec3032ff20dc4aae4921e6a9c330a51b5df89af02d4c6fbf691fcfade21658b1a2d5de286a7e729dc6fb740f6fd4e6b6f53649486ef64bc3d00d81a95bd5
 DIST aircrack-ng-1.6_p20200722.tar.gz 7602785 BLAKE2B 67426a8f1d683fa374e8aa3dfd78ec860f622127f37080f0b3acba6fd7e05088203a60a9c7fd6265835b7b52697fd7d2660a5efb79c3c72d7098a081dd83ecfe SHA512 dc7c80099bdcd6c68c5e06e4668453c0c594c66d57079ed77c27467e4d2307ca63ea9671966e06feb6b698020b683f6830d401701e4472acbf0edb4f22bb1f75
-EBUILD aircrack-ng-1.6-r1.ebuild 2947 BLAKE2B baca6a9291c6df6bea3e121469cba0acd4882d895420274694248867622e14337019c046f7a214d39dab517a4da33640ad51bebb9a055b87a164888c480d9987 SHA512 b7759a2135ca0dd25aaa31571839d531c31af0bfb4eccf15957786346742824cc6adbe62bd48b31ef880450054ea1183b13f80020059139984f7e81cf3138a2d
-EBUILD aircrack-ng-1.6_p20200722.ebuild 3111 BLAKE2B e3ab7cc5fd1dfb57a7a0521f3eecadd470274d710f446406bd6903384c2db5724e4184fefc34788844e7eb35191daf556b035c540d231f12fbe9c91067c72c7f SHA512 197ff62496da26fec9cf0d17b78d3e6c9c519ce69efe30e2e4263ed165393db0168915b76f7a2f66e9212d85c235ee47959cac1cff989552b1a9145c442d5802
-EBUILD aircrack-ng-9999.ebuild 2950 BLAKE2B 64e78847a3152bca42d634ff3470e12d71f6cba241530bdece6a7b699b5701807d290fd0bf2df294e816131bc1470cb5921b3e609c854080c6856a2929a85c5e SHA512 d9d96e595245e8c37db7d9ad4e6ca6c4a07619a52e2d88a32907a167a81224b89146db8c094c486797ab037995dfbb1c14d64c949ecc54a5daa6b7bbae45d0ab
+EBUILD aircrack-ng-1.6_p20200722.ebuild 3110 BLAKE2B efa0bb740ceff1f19f55121f2bf13979610a8f9d1b063c2becf456c34e1388fea347cf9b55ca9a72c9ec7a9ff743f4d0170e92be973d6ef8cf70a3c926e61872 SHA512 7196b4ba19e4058b5959292218df55f7ddb8884b23aeb3274464352d18d3fe25ec6f7c29b5502dfc2a445e4bd88635fe985d2d0742fad4a1a76ed52c2805e100
+EBUILD aircrack-ng-9999.ebuild 2952 BLAKE2B f2c4f3148ad4c22f9240c1810bc59a86c980922aa1e4f63820e8f2dac7ca6bb258e8429b297b9df9ff2762de3b8fb0c4e5aa6353586c01b5ebabbf46fa50608d SHA512 f07550ae05f8a9b120aa0f398ca24dba73c52f607a5c411ca41c12309d3af784ca576fe4e270aa5c5f1cded0ca7eaf0dffb94e5874a7c03078485d5ac282c36a
 MISC metadata.xml 1024 BLAKE2B c7f31132d721d72f926098b5a85d4cab21ac4fdbd63e75c15485eb4dd62264061ab4173628e05ddde74523a0557fd905a6dc008305f26c7f65416f92b70a4f4b SHA512 e51a08063ed89d55ba02aef49d249fc18adb03026726230faddf661f55f709a37520c68e632ae2996955f837651309a6d83bdcbad775a540d0a2f1aeddbfee72
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
deleted file mode 100644
index 372790061adb..000000000000
--- a/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-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
-	MY_PV=${PV/_/-}
-	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
-	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 libressl +netlink +pcre +sqlite +experimental"
-
-DEPEND="net-libs/libpcap
-	sys-apps/hwloc:0=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl: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}"
-PDEPEND="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/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild
index abc01130d0db..ccf1ddb41356 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.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=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_OPTIONAL=1
 
 inherit toolchain-funcs distutils-r1 flag-o-matic autotools
@@ -19,7 +19,7 @@ else
 	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"
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index 275c7f1c210d..082ab4ef6b53 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-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=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_OPTIONAL=1
 
 inherit toolchain-funcs distutils-r1 flag-o-matic autotools