diff --git a/dev-python/pefile/pefile-2016.3.28.ebuild b/dev-python/pefile/pefile-2016.3.28.ebuild index 95c7f0eeb..6a79c1771 100644 --- a/dev-python/pefile/pefile-2016.3.28.ebuild +++ b/dev-python/pefile/pefile-2016.3.28.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) MY_P=${P/_p/-} inherit distutils-r1 eutils @@ -13,7 +12,6 @@ DESCRIPTION="Module to read and work with Portable Executable (PE) files" HOMEPAGE="https://github.com/erocarrera/pefile" SRC_URI="https://github.com/erocarrera/pefile/files/192316/${P}.tar.gz" - LICENSE="MIT" SLOT="0" KEYWORDS="~x86 ~amd64" diff --git a/net-wireless/wifi-pumpkin/wifi-pumpkin-0.8.5.ebuild b/net-wireless/wifi-pumpkin/wifi-pumpkin-0.8.5.ebuild index 9c0b331d1..536492e35 100644 --- a/net-wireless/wifi-pumpkin/wifi-pumpkin-0.8.5.ebuild +++ b/net-wireless/wifi-pumpkin/wifi-pumpkin-0.8.5.ebuild @@ -23,7 +23,6 @@ RDEPEND="${PYTHON_DEPS} net-wireless/rfkill dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/twisted-web[${PYTHON_USEDEP}] - net-analyzer/scapy[${PYTHON_USEDEP}] dev-python/beautifulsoup:4[${PYTHON_USEDEP}] dev-python/python-nmap[${PYTHON_USEDEP}] dev-python/netaddr[${PYTHON_USEDEP}] @@ -42,7 +41,8 @@ RDEPEND="${PYTHON_DEPS} dev-python/hyperframe[${PYTHON_USEDEP}] dev-python/h2[${PYTHON_USEDEP}] =net-proxy/mitmproxy-0.11*[${PYTHON_USEDEP}] - dev-python/scapy_http[${PYTHON_USEDEP}] + virtual/python-scapy[${PYTHON_USEDEP}] + dev-python/scapy-http[${PYTHON_USEDEP}] dev-python/service_identity[${PYTHON_USEDEP}] plugins? ( net-dns/dnsmasq diff --git a/profiles/pentoo/base/package.use/net-wireless b/profiles/pentoo/base/package.use/net-wireless index ec5069047..a29171b8b 100644 --- a/profiles/pentoo/base/package.use/net-wireless +++ b/profiles/pentoo/base/package.use/net-wireless @@ -12,4 +12,5 @@ net-wireless/wpa_supplicant ap eap-sim uncommon-eap-types tdls p2p wps net-wireless/soapysdr bladerf hackrf rtlsdr uhd ~net-wireless/wifi-pumpkin-0.8.5 -python_targets_python3_4 -python_targets_python3_5 -dev-python/scapy_http -python_targets_python3_4 -python_targets_python3_5 +dev-python/scapy-http -python_targets_python3_4 -python_targets_python3_5 +virtual/python-scapy -python_targets_python3_4 -python_targets_python3_5