gentoo resync : 25.11.2020

3 files changed, 2 insertions, 120 deletions

diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index 1e699386b85c..90466ac987a9 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,8 +1,6 @@
-DIST aircrack-ng-1.5.2.tar.gz 7138360 BLAKE2B cfc178d76273bb1cf6c34b1656a710d046a094f9c772a562f19ae783c30810cf7b6aa8668566ef6998af79090266771aeea8037b446eb0b9755b602ddcebc0d2 SHA512 72c249782dda3a875fbec98e4fe0e6044a6f123ebd36341a5f42733dfe6c26d96b5c74f67c0547b81c5dd5e2f52a6f475b424885f8e6fa21279ac539228038f5
 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.5.2.ebuild 2893 BLAKE2B a93ce214ad665bbf50e7d08bb1250731e2993437592fa6db39b1a207090ec4264e6f8b8b51d6a4f6f97b972250d0abb2afd5b23394899ae3075464939ef4a5ce SHA512 7797d00f2128120e5755a023903f6677c83face85d31053b71e9a11f73fcb2f64069464727aae58c6a234ad1fe673a987afe49c9271a191dd5cf0420b6f43572
-EBUILD aircrack-ng-1.6-r1.ebuild 2952 BLAKE2B fc5540b4faa82f0b88f279c32650d7eabc506e150960028d59786afcc2b9a0dda5198f12d9858bb029e6850f9a9e45f813269eb810d660dcf416ddce244b7496 SHA512 1554f875c73f68a25352437bbd11021c713e9174572cf8c6f88d3959cbbfeccf91920644054b6f207acd7903a0d06c37456273eca23de4114ae1ac7da2b26c56
+EBUILD aircrack-ng-1.6-r1.ebuild 2949 BLAKE2B bdfdcf2f7e46029d4e95770ae33406ab90e290621b808ac0508bc13ed3d4553e8d420e6977adaba74f7c2858efcf178742dd6cac2c8fd12e118bf93e91ffecc4 SHA512 1c7b2b1ab60ac617f61bf5b41da148b4ccaf63a46b01af459f420ebe026b5794b815d4b0bcfb0614e0d27816dbcd88035feead33320481ee28b02cab4c0ae0e4
 EBUILD aircrack-ng-1.6_p20200722.ebuild 3113 BLAKE2B fd379315b4a038fcfaf46b0d179c506fca602b83476eb3c16a2fe42a672a0ba63cae9555fc4c5ecdfaa1654d8c00cab10a142d6412a78d887280e6000cdcaa3f SHA512 5266db58d5dad326a7007382319ac83dd9c4bbae731bbee23216a763c3d7470916e7d424f5bcd2be2d02b432fb6d34edcabf6a70c63d1290df91c54e4dfe793e
 EBUILD aircrack-ng-9999.ebuild 2952 BLAKE2B fc5540b4faa82f0b88f279c32650d7eabc506e150960028d59786afcc2b9a0dda5198f12d9858bb029e6850f9a9e45f813269eb810d660dcf416ddce244b7496 SHA512 1554f875c73f68a25352437bbd11021c713e9174572cf8c6f88d3959cbbfeccf91920644054b6f207acd7903a0d06c37456273eca23de4114ae1ac7da2b26c56
 MISC metadata.xml 1024 BLAKE2B c7f31132d721d72f926098b5a85d4cab21ac4fdbd63e75c15485eb4dd62264061ab4173628e05ddde74523a0557fd905a6dc008305f26c7f65416f92b70a4f4b SHA512 e51a08063ed89d55ba02aef49d249fc18adb03026726230faddf661f55f709a37520c68e632ae2996955f837651309a6d83bdcbad775a540d0a2f1aeddbfee72
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
deleted file mode 100644
index bc429d293451..000000000000
--- a/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-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
-}
-
-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-r1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
index e6f82c3506c9..815680f34379 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"