From 31f93f5566a85ee6c0d56a873ad9201d99607319 Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Tue, 22 Sep 2020 19:08:41 +0800
Subject: [PATCH] pypykatz: stable with all deps

---
 app-exploits/pypykatz/Manifest                |  1 -
 app-exploits/pypykatz/pypykatz-0.3.10.ebuild  | 27 -------------
 app-exploits/pypykatz/pypykatz-0.3.12.ebuild  |  2 +-
 dev-python/aiocmd/aiocmd-0.1.5.ebuild         |  4 +-
 dev-python/aiowinreg/aiowinreg-0.0.3.ebuild   |  4 +-
 dev-python/asciitree/asciitree-0.3.3.ebuild   |  2 +-
 dev-python/minidump/Manifest                  |  1 -
 dev-python/minidump/minidump-0.0.12.ebuild    | 21 ----------
 dev-python/minidump/minidump-0.0.13.ebuild    |  4 +-
 .../minikerberos/minikerberos-0.2.3.ebuild    |  5 +--
 dev-python/msldap/Manifest                    |  1 -
 dev-python/msldap/msldap-0.2.14.ebuild        | 39 -------------------
 dev-python/msldap/msldap-0.3.11-r1.ebuild     |  2 +-
 dev-python/winacl/Manifest                    |  1 -
 dev-python/winacl/winacl-0.0.2.ebuild         | 21 ----------
 dev-python/winacl/winacl-0.0.6.ebuild         |  2 +-
 dev-python/winsspi/winsspi-0.0.9.ebuild       |  5 +--
 .../base/package.accept_keywords/app-exploits |  1 -
 .../base/package.accept_keywords/dev-python   | 11 ------
 19 files changed, 14 insertions(+), 140 deletions(-)
 delete mode 100644 app-exploits/pypykatz/pypykatz-0.3.10.ebuild
 delete mode 100644 dev-python/minidump/minidump-0.0.12.ebuild
 delete mode 100644 dev-python/msldap/msldap-0.2.14.ebuild
 delete mode 100644 dev-python/winacl/winacl-0.0.2.ebuild

diff --git a/app-exploits/pypykatz/Manifest b/app-exploits/pypykatz/Manifest
index e1f9bac95..20c3c6fec 100644
--- a/app-exploits/pypykatz/Manifest
+++ b/app-exploits/pypykatz/Manifest
@@ -1,2 +1 @@
-DIST pypykatz-0.3.10.tar.gz 221932 BLAKE2B 9223ccaa85c3c29951f8d98cb0fb23b72ac55e5ec0f696a81bc9682aaae87b34e4488503ab8d819a0d5befc3650ad27e237a774c4371ca3d3e55c71e8892dd91 SHA512 25e555f5013efcf66df322905f2735fc4c253aebfb0fe45fa991edeb60b5724f0872fae9014384998cde10b142297d35789801fd2e81f397c67e5eb40baff5de
 DIST pypykatz-0.3.12.tar.gz 221921 BLAKE2B 546b839f42359b629595ec5d657d9d51728b902a304d7ffae0829605af175b608f4d0e61741af5bd1217a3daf9aafacd87ee35532e55ae12e73a85e0c5c9cbfc SHA512 7b74da5fa79937474b27b47ad2308fbeb89a8619846de0b4abc6d49f7af5ab9a5fe4dd59ec26029359ecfb44e2bc8041ab00ef31cfac11dc6241e2639c2a6bac
diff --git a/app-exploits/pypykatz/pypykatz-0.3.10.ebuild b/app-exploits/pypykatz/pypykatz-0.3.10.ebuild
deleted file mode 100644
index ccabe5969..000000000
--- a/app-exploits/pypykatz/pypykatz-0.3.10.ebuild
+++ /dev/null
@@ -1,27 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of Mimikatz"
-HOMEPAGE="https://github.com/skelsec/pypykatz"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/minidump-0.0.12[${PYTHON_USEDEP}]
-	>=dev-python/minikerberos-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/aiowinreg-0.0.3[${PYTHON_USEDEP}]
-	>=dev-python/msldap-0.2.13[${PYTHON_USEDEP}]
-	>=dev-python/winsspi-0.0.9[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-exploits/pypykatz/pypykatz-0.3.12.ebuild b/app-exploits/pypykatz/pypykatz-0.3.12.ebuild
index ccabe5969..06919b79d 100644
--- a/app-exploits/pypykatz/pypykatz-0.3.12.ebuild
+++ b/app-exploits/pypykatz/pypykatz-0.3.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/aiocmd/aiocmd-0.1.5.ebuild b/dev-python/aiocmd/aiocmd-0.1.5.ebuild
index e1e08c490..597d6c04c 100644
--- a/dev-python/aiocmd/aiocmd-0.1.5.ebuild
+++ b/dev-python/aiocmd/aiocmd-0.1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/aiowinreg/aiowinreg-0.0.3.ebuild b/dev-python/aiowinreg/aiowinreg-0.0.3.ebuild
index 968badab6..16e234f9e 100644
--- a/dev-python/aiowinreg/aiowinreg-0.0.3.ebuild
+++ b/dev-python/aiowinreg/aiowinreg-0.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/asciitree/asciitree-0.3.3.ebuild b/dev-python/asciitree/asciitree-0.3.3.ebuild
index 34677aa2a..fd754fb63 100644
--- a/dev-python/asciitree/asciitree-0.3.3.ebuild
+++ b/dev-python/asciitree/asciitree-0.3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/minidump/Manifest b/dev-python/minidump/Manifest
index a6eadbfc9..dcea13f4c 100644
--- a/dev-python/minidump/Manifest
+++ b/dev-python/minidump/Manifest
@@ -1,2 +1 @@
-DIST minidump-0.0.12.tar.gz 46418 BLAKE2B 5a67163599214d9dcf34e4c09af202ec7537796e5385bc3d00670232012ccab5181dc6b62a03753aceecc8ec58f683823e151c160ccc139c6a84cbf37d251e6e SHA512 dff4e2fadc61655529e323e748e50e19007a6092c0794206b7574d39c475b1ddeca42654048430ed7124727fd1fe0e0ffc0ed94ee8c7245a985f368ed26f99c9
 DIST minidump-0.0.13.tar.gz 47262 BLAKE2B 1c66b144b8b04e466a13965a296fdac3f43f886f7212cd7f2326b8b36b4e7b33ed24ba4aca357cf1ab83093cb62c15960f9319cac45014dfc0f01ce693fecf1a SHA512 980c6c5dc89a5a46acf65feedc2e0b03c726aefbf7b6fec380be1383f1461de34e6baae9fa0f3d07a4ad3b5e668e309785d91178a442387efeb5a0bb318e0a83
diff --git a/dev-python/minidump/minidump-0.0.12.ebuild b/dev-python/minidump/minidump-0.0.12.ebuild
deleted file mode 100644
index 18fc2b9c9..000000000
--- a/dev-python/minidump/minidump-0.0.12.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="parse Windows minidump file format"
-HOMEPAGE="https://github.com/skelsec/minidump"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/minidump/minidump-0.0.13.ebuild b/dev-python/minidump/minidump-0.0.13.ebuild
index 18fc2b9c9..69e3620fc 100644
--- a/dev-python/minidump/minidump-0.0.13.ebuild
+++ b/dev-python/minidump/minidump-0.0.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/minikerberos/minikerberos-0.2.3.ebuild b/dev-python/minikerberos/minikerberos-0.2.3.ebuild
index e2f695c85..979d8f8ab 100644
--- a/dev-python/minikerberos/minikerberos-0.2.3.ebuild
+++ b/dev-python/minikerberos/minikerberos-0.2.3.ebuild
@@ -13,10 +13,9 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/asn1crypto-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/asysocks-0.0.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/msldap/Manifest b/dev-python/msldap/Manifest
index 5e5468120..d656718c4 100644
--- a/dev-python/msldap/Manifest
+++ b/dev-python/msldap/Manifest
@@ -1,2 +1 @@
-DIST msldap-0.2.14.tar.gz 112258 BLAKE2B 82819ddec7d5161a2d2bdbf452a8df42eafd8870eba59dc3ca90e8b38b142f8238e482e55cd2eea01f56ab458bb22f05810baa80608fd78cd813891b968a7608 SHA512 64115c98d26cade8a54f2c233974214427e00555b716f52925868225335f6783eb2fe01aab31fce13e9c3f3432eb92c44a52d3edba9742dddea35565f8f4f232
 DIST msldap-0.3.11.tar.gz 125667 BLAKE2B f4eaedd26f1db9608d0c854e5a2a1fbfbc627288b174295b5d3cbe4b759fb6a46a1f1dc8cbd99a65480a1f07d298ce051cba3eed093a86c9cc5b6e398f342ba7 SHA512 1009a0ea456937b697fb289d81d727493c4bbe2aaed7cb88b364c436791c09c85e3caa905e920f12a328fffc71a51a0ed27354053123b7f5a1e1439ba652a851
diff --git a/dev-python/msldap/msldap-0.2.14.ebuild b/dev-python/msldap/msldap-0.2.14.ebuild
deleted file mode 100644
index 790acc67c..000000000
--- a/dev-python/msldap/msldap-0.2.14.ebuild
+++ /dev/null
@@ -1,39 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to play with MS LDAP"
-HOMEPAGE="https://github.com/skelsec/msldap"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-#FIXME: https://github.com/skelsec/msldap/issues/13
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-#'winsspi;platform_system=="Windows"',
-RDEPEND="
-	dev-python/asn1crypto[${PYTHON_USEDEP}]
-	dev-python/winsspi[${PYTHON_USEDEP}]
-	dev-python/aiocmd[${PYTHON_USEDEP}]
-	dev-python/asciitree[${PYTHON_USEDEP}]
-	dev-python/asysocks[${PYTHON_USEDEP}]
-	>=dev-python/winacl-0.0.2[${PYTHON_USEDEP}]
-	dev-python/prompt_toolkit[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare(){
-	#https://github.com/skelsec/msldap/issues/12
-	sed -i "s|prompt-toolkit<3.0.0|prompt-toolkit|g" setup.py
-	sed -i "s|minikerberos==0.2.1|minikerberos|g" setup.py
-	eapply_user
-}
diff --git a/dev-python/msldap/msldap-0.3.11-r1.ebuild b/dev-python/msldap/msldap-0.3.11-r1.ebuild
index d3b48d02b..ca167dec1 100644
--- a/dev-python/msldap/msldap-0.3.11-r1.ebuild
+++ b/dev-python/msldap/msldap-0.3.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 
 #'winsspi;platform_system=="Windows"',
diff --git a/dev-python/winacl/Manifest b/dev-python/winacl/Manifest
index 1554f74f5..b7d5cd74a 100644
--- a/dev-python/winacl/Manifest
+++ b/dev-python/winacl/Manifest
@@ -1,2 +1 @@
-DIST winacl-0.0.2.tar.gz 36498 BLAKE2B d450a0a692ad7b5c946559e8907fe5c7dd7ae88f51ec204686d36e6f1f5701e08f9bb0c0941385cc159da8b2b1f04baa6fb234fc4afb25a059c6092892ad8d48 SHA512 af11d1c2a655b2729560c1b6feef3333ff11318aefffd1d318a14e943aacdfb65008da0c9aa31da8ee2dddde7f138674876e1dadcdc82d39362a43668ea35be1
 DIST winacl-0.0.6.tar.gz 40257 BLAKE2B 40e1226ba9b4e89efe5738df211773cdacf3275f8e0acca00e232e90eb965c353cb429a04796d3ccb05618ea4db213ca6e3fe8120a42bd55ef9216fea4f6ca80 SHA512 2072af69c945a7018e12a041de0369ef3df8d5a2598b4a9600174fed94844e5cca5456d88ec3a1df02937e0b013754667008df2f2e2828889d8c70fafea41047
diff --git a/dev-python/winacl/winacl-0.0.2.ebuild b/dev-python/winacl/winacl-0.0.2.ebuild
deleted file mode 100644
index 6a5b5af10..000000000
--- a/dev-python/winacl/winacl-0.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="ACL/ACE/Security Descriptor manipulation library"
-HOMEPAGE="https://github.com/skelsec/winacl"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/winacl/winacl-0.0.6.ebuild b/dev-python/winacl/winacl-0.0.6.ebuild
index 6a5b5af10..732b709e8 100644
--- a/dev-python/winacl/winacl-0.0.6.ebuild
+++ b/dev-python/winacl/winacl-0.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/winsspi/winsspi-0.0.9.ebuild b/dev-python/winsspi/winsspi-0.0.9.ebuild
index 43a6f371d..e301cfaef 100644
--- a/dev-python/winsspi/winsspi-0.0.9.ebuild
+++ b/dev-python/winsspi/winsspi-0.0.9.ebuild
@@ -13,9 +13,8 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/minikerberos-0.2.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/profiles/pentoo/base/package.accept_keywords/app-exploits b/profiles/pentoo/base/package.accept_keywords/app-exploits
index 75c4df69f..49a6b3b4f 100644
--- a/profiles/pentoo/base/package.accept_keywords/app-exploits
+++ b/profiles/pentoo/base/package.accept_keywords/app-exploits
@@ -10,7 +10,6 @@ app-exploits/ROPgadget
 app-exploits/ropper
 app-exploits/routersploit
 app-exploits/powercat
-app-exploits/pypykatz
 app-exploits/the-backdoor-factory
 app-exploits/unix-privesc-check
 app-exploits/webshells
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-python b/profiles/pentoo/base/package.accept_keywords/dev-python
index 841e2d4c9..f3f1f64d8 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-python
+++ b/profiles/pentoo/base/package.accept_keywords/dev-python
@@ -452,17 +452,6 @@ dev-python/IP2Location
 # required by proton
 dev-python/playsound
 
-
-# required by pypykatz (argument)
-dev-python/minikerberos
-dev-python/winsspi
-dev-python/msldap
-dev-python/aiowinreg
-dev-python/asciitree
-dev-python/minidump
-dev-python/winacl
-dev-python/aiocmd
-
 #wifipumpkin3
 dev-python/isc_dhcp_leases
 dev-python/dnslib