diff --git a/net-analyzer/fierce/fierce-1.3.0-r1.ebuild b/net-analyzer/fierce/fierce-1.4.0-r1.ebuild similarity index 100% rename from net-analyzer/fierce/fierce-1.3.0-r1.ebuild rename to net-analyzer/fierce/fierce-1.4.0-r1.ebuild diff --git a/net-analyzer/fierce/fierce-1.4.0.ebuild b/net-analyzer/fierce/fierce-1.4.0.ebuild deleted file mode 120000 index a5a5c50c3..000000000 --- a/net-analyzer/fierce/fierce-1.4.0.ebuild +++ /dev/null @@ -1 +0,0 @@ -fierce-9999.ebuild \ No newline at end of file diff --git a/net-analyzer/fierce/fierce-9999.ebuild b/net-analyzer/fierce/fierce-9999.ebuild index f2b7dfb6e..1839b87d6 100644 --- a/net-analyzer/fierce/fierce-9999.ebuild +++ b/net-analyzer/fierce/fierce-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python3_{5,6} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit distutils-r1 if [[ ${PV} == "9999" ]] ; then diff --git a/pentoo/pentoo-proxies/pentoo-proxies-2019.2-r2.ebuild b/pentoo/pentoo-proxies/pentoo-proxies-2020.0.ebuild similarity index 75% rename from pentoo/pentoo-proxies/pentoo-proxies-2019.2-r2.ebuild rename to pentoo/pentoo-proxies/pentoo-proxies-2020.0.ebuild index 4b4d98cad..38a734443 100644 --- a/pentoo/pentoo-proxies/pentoo-proxies-2019.2-r2.ebuild +++ b/pentoo/pentoo-proxies/pentoo-proxies-2020.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ HOMEPAGE="http://www.pentoo.ch" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="java pentoo-extra pentoo-full" +IUSE="java pentoo-extra pentoo-full python_targets_python3_6" PDEPEND=" java? ( pentoo-extra? ( net-proxy/burpsuite ) @@ -19,7 +19,7 @@ java? ( pentoo-extra? ( net-proxy/burpsuite ) net-dns/dnscrypt-proxy net-misc/proxychains net-proxy/3proxy - net-proxy/mitmproxy + python_targets_python3_6? ( net-proxy/mitmproxy ) net-proxy/privoxy net-proxy/redsocks net-proxy/tsocks diff --git a/pentoo/zero-system/zero-system-2020.0-r3.ebuild b/pentoo/zero-system/zero-system-2020.0-r4.ebuild similarity index 97% rename from pentoo/zero-system/zero-system-2020.0-r3.ebuild rename to pentoo/zero-system/zero-system-2020.0-r4.ebuild index 2de3dcc6d..c73c1511f 100644 --- a/pentoo/zero-system/zero-system-2020.0-r3.ebuild +++ b/pentoo/zero-system/zero-system-2020.0-r4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2020 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=6 +EAPI=7 DESCRIPTION="The ZERO (Zoning & Emotional Range Omitted) System is a technology for interfacing the brain of the pilot with the mobile suit's computer." HOMEPAGE="http://www.pentoo.ch/" @@ -29,7 +29,6 @@ PDEPEND=" dev-vcs/mercurial app-arch/p7zip net-dns/dnsmasq - app-portage/overlint app-portage/repoman app-doc/pms dev-util/pkgcheck diff --git a/profiles/pentoo/base/package.accept_keywords/dev-python b/profiles/pentoo/base/package.accept_keywords/dev-python index 2f9648279..c2998e8e9 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-python +++ b/profiles/pentoo/base/package.accept_keywords/dev-python @@ -179,6 +179,8 @@ dev-python/vulndb #required by net-analyzer/recon-ng ~dev-python/mechanize-0.4.3 +~dev-python/flasgger-0.9.4 +~dev-python/rq-1.3.0 #wafwoof ~dev-python/pluginbase-0.5 diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby index 62de960f6..422d134f3 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-ruby +++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby @@ -166,6 +166,7 @@ dev-ruby/addressable =dev-ruby/ruby-progressbar-1.10* dev-ruby/memory_profiler dev-ruby/cms_scanner +~dev-ruby/public_suffix-4.0.3 dev-ruby/get_process_mem dev-ruby/sys-proctable dev-ruby/opt_parse_validator diff --git a/profiles/pentoo/base/package.accept_keywords/net-analyzer b/profiles/pentoo/base/package.accept_keywords/net-analyzer index 8d46b51bf..9a13593df 100644 --- a/profiles/pentoo/base/package.accept_keywords/net-analyzer +++ b/profiles/pentoo/base/package.accept_keywords/net-analyzer @@ -14,7 +14,7 @@ net-analyzer/dirhunt =net-analyzer/dnsrecon-0.9* net-analyzer/droopescan net-analyzer/ffuf -=net-analyzer/fierce-1.3* +=net-analyzer/fierce-1.4* net-analyzer/findomain net-analyzer/gobuster =net-analyzer/ike-scan-1.9* diff --git a/profiles/pentoo/zero-system/package.accept_keywords/media-libs b/profiles/pentoo/zero-system/package.accept_keywords/media-libs index ed2f24ed0..07c83203a 100644 --- a/profiles/pentoo/zero-system/package.accept_keywords/media-libs +++ b/profiles/pentoo/zero-system/package.accept_keywords/media-libs @@ -2,3 +2,4 @@ media-libs/chromaprint amd64 media-libs/xine-lib amd64 media-libs/mutagen amd64 media-libs/gegl amd64 +~media-libs/gexiv2-0.12.0 diff --git a/profiles/pentoo/zero-system/package.accept_keywords/sys-libs b/profiles/pentoo/zero-system/package.accept_keywords/sys-libs new file mode 100644 index 000000000..6d7aaad36 --- /dev/null +++ b/profiles/pentoo/zero-system/package.accept_keywords/sys-libs @@ -0,0 +1 @@ +~sys-libs/libcap-ng-0.7.9 diff --git a/profiles/pentoo/zero-system/package.use/dev-python b/profiles/pentoo/zero-system/package.use/dev-python index 8ad9ecc76..d91e5969a 100644 --- a/profiles/pentoo/zero-system/package.use/dev-python +++ b/profiles/pentoo/zero-system/package.use/dev-python @@ -1,9 +1,11 @@ -dev-python/pyserial python_targets_python3_7 -dev-python/PyQt5 python_targets_python3_7 -dev-python/numpy python_targets_python3_7 -dev-python/setuptools python_targets_python3_7 -dev-python/certifi python_targets_python3_7 -dev-python/PyQt5-sip python_targets_python3_7 -dev-python/dbus-python python_targets_python3_7 -dev-python/sip python_targets_python3_7 -dev-python/python_sqlparse python_targets_python3_7 +#dev-python/pyserial python_targets_python3_7 +#dev-python/PyQt5 python_targets_python3_7 +#dev-python/numpy python_targets_python3_7 +#dev-python/setuptools python_targets_python3_7 +#dev-python/certifi python_targets_python3_7 +#dev-python/PyQt5-sip python_targets_python3_7 +#dev-python/dbus-python python_targets_python3_7 +#dev-python/sip python_targets_python3_7 +#dev-python/python_sqlparse python_targets_python3_7 + +=dev-python/fido2-0.8.1 python_targets_python3_6