From 8ec9ef174478388597a47d1f0b1ec08885d98b30 Mon Sep 17 00:00:00 2001
From: Anton Bolshakov <blshkv@pentoo.ch>
Date: Wed, 17 Mar 2021 22:04:17 +0800
Subject: [PATCH] crackmapexec-5.1.6.ebuild

---
 net-analyzer/crackmapexec/Manifest            |  2 +-
 ...5.1.4.ebuild => crackmapexec-5.1.6.ebuild} | 26 ++++++++++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)
 rename net-analyzer/crackmapexec/{crackmapexec-5.1.4.ebuild => crackmapexec-5.1.6.ebuild} (75%)

diff --git a/net-analyzer/crackmapexec/Manifest b/net-analyzer/crackmapexec/Manifest
index 62fa7d2c1..57867a043 100644
--- a/net-analyzer/crackmapexec/Manifest
+++ b/net-analyzer/crackmapexec/Manifest
@@ -1,2 +1,2 @@
-DIST crackmapexec_5.1.4.orig.tar.xz 11065172 BLAKE2B e7cf7a18cfe31baf1203d67d0ddb2ac56d9837dbd53186ec45e11b590e930b2d5b145efb5249593038b9ab1304cfb74ad15c4ec2dd9cd52250908ef253b6c4c9 SHA512 0b45e9951ebe684fc76d307494eece0e4a2991fc5b5e51ac29a7d849f1139cb42aff938b2f33791cc81b97904d40b53238254f0a7d08b9841ebcaeac5049f663
 DIST crackmapexec_5.1.5.orig.tar.xz 11065968 BLAKE2B e54ad8c60c2dd536396decd057201412393fb20387d12ca1219fccb4eebed6434cefc7ecced6ce6ea66f4dde68e9bb433237c461ed548d12a0c298518b75e6ca SHA512 d8588421ae178f0776eebe9408cc8b4064fa139cc0648d12961ab3c1b7660d8a5361ee51c676deb7811b195a9eb6ae623cbbc28f222dd975fb49096a161092b0
+DIST crackmapexec_5.1.6.orig.tar.xz 11067336 BLAKE2B 28faf14feb2afb102acd79a30d0b1a9bb0792ff53d6d6274be2162afbd447132a9b6e4cecafdbab7aade2b6e687a0d09c5d8bc5dd1776180282ea5b63a209ca1 SHA512 f08ccde568dd200a637da69a914a0b8aa548c4044d5317b75d8900f023cb95843dd8d9f4f5c7366d006d1b94efb43a5ca7a58efeb7751e947cd48a1762b842ca
diff --git a/net-analyzer/crackmapexec/crackmapexec-5.1.4.ebuild b/net-analyzer/crackmapexec/crackmapexec-5.1.6.ebuild
similarity index 75%
rename from net-analyzer/crackmapexec/crackmapexec-5.1.4.ebuild
rename to net-analyzer/crackmapexec/crackmapexec-5.1.6.ebuild
index 901d51777..9c2ed1734 100644
--- a/net-analyzer/crackmapexec/crackmapexec-5.1.4.ebuild
+++ b/net-analyzer/crackmapexec/crackmapexec-5.1.6.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-#pypsrp depends on dev-python/requests-credssp/python3.7 only
+#pypsrp depends on dev-python/requests-credssp, no x86, python3.9
 PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
+inherit python-utils-r1 distutils-r1 
 
 DESCRIPTION="A swiss army knife for pentesting Windows/Active Directory environments"
 HOMEPAGE="https://github.com/byt3bl33d3r/CrackMapExec/releases"
@@ -19,7 +19,6 @@ SLOT="0"
 
 #pyproject.toml, [tool.poetry.dependencies]
 RDEPEND="
-	dev-python/gevent[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/requests-ntlm[${PYTHON_USEDEP}]
 	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
@@ -42,15 +41,28 @@ QA_PRESTRIPPED="usr/lib.*/python.*/site-packages/cme/data/mimipenguin/.*"
 
 PATCHES=(
 	#thirdparty: https://github.com/byt3bl33d3r/CrackMapExec/issues/361
-	"${FILESDIR}/5.1.4-remove_thirdparty.patch"
+#	"${FILESDIR}/5.1.4-remove_thirdparty.patch"
 	#almost debian patch, bs4 -> beautifulsoup4
 	"${FILESDIR}/5.1.4-setup.py.patch"
 	)
 
 S="${WORKDIR}"
 
-src_install() {
-	distutils-r1_src_install
+src_prepare() {
+        default
+}
+
+#src_install() {
+#	distutils-r1_src_install
+
+python_install() {
+	distutils-r1_python_install
 	insinto /etc/revdep-rebuild
 	doins "${FILESDIR}"/50${PN}
+
+	python_optimize "./cme/modules/"
+	insinto "$(python_get_sitedir)/cme/data/"
+	doins "./cme/data/cme.conf"
+	insinto "$(python_get_sitedir)/cme/"
+	doins -r "./cme/modules"
 }