diff --git a/net-analyzer/crackmapexec/Manifest b/net-analyzer/crackmapexec/Manifest
index 04d0e52be..9568ebc8d 100644
--- a/net-analyzer/crackmapexec/Manifest
+++ b/net-analyzer/crackmapexec/Manifest
@@ -1,3 +1 @@
-DIST crackmapexec-5.2.2.tar.gz 683818 BLAKE2B 1e4b49aa6cd76e74304f72cc782e599652ca2c058b9309c54c35f09553df8e95a646c48acc8c5987b28bf746271c042d76bd5a0f6d0c9e9520794043ae7ee07a SHA512 7120f82c4a4247bcd114fa33e9b4f5ce1007a2e93180563fa95d337ce4b127d13cb9f3a2b07005d5cbbbb1cc6d3f38f3214abdccb627cf455d451122bd2f2846
-DIST crackmapexec-5.3.0.tar.gz 702985 BLAKE2B a3127db25ef91cafe78ba7ce1472a503de1cfba9ee429c91dfd919878182765fa778aa5950489196edc48e100deb6b4e2aedbb0e78aeca0af18be36b45022a30 SHA512 7e1b82dcf76b1c8840d00bbdc7ba79a2df0bbb274f4e0b7ebb34c062c1ee7a18ad34f6132e35a905b8f8cc4dcddf519426d6febed31c7f357aab78ee0a351649
DIST crackmapexec-5.4.0.tar.gz 853853 BLAKE2B d324ce42e98631f6b7c72f8951d933cd5d49936346635ceeea4877151c547cd71724f83fca0cf8a04e1e94898c83adb153b55d15411682062206871ad0733ad4 SHA512 36be587970c988080fc44c6c86d446eda7594ce02b4bfb4a7c2864d885bfd999b202afdf4051d53af132f27abe1f2558a077af3322ad34427ae61bd279604358
diff --git a/net-analyzer/crackmapexec/crackmapexec-5.2.2.ebuild b/net-analyzer/crackmapexec/crackmapexec-5.2.2.ebuild
deleted file mode 100644
index 0bd627853..000000000
--- a/net-analyzer/crackmapexec/crackmapexec-5.2.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit python-utils-r1 distutils-r1
-
-DESCRIPTION="A swiss army knife for pentesting Windows/Active Directory environments"
-HOMEPAGE="https://github.com/byt3bl33d3r/CrackMapExec/releases"
-#SRC_URI="https://mirrors.neusoft.edu.cn/kali/pool/main/c/crackmapexec/crackmapexec_${PV}.orig.tar.xz"
-SRC_URI="https://github.com/byt3bl33d3r/CrackMapExec/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-SLOT="0"
-RESTRICT="test"
-
-#pyproject.toml, [tool.poetry.dependencies]
-RDEPEND="
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/requests-ntlm[${PYTHON_USEDEP}]
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/lsassy[${PYTHON_USEDEP}]
- dev-python/termcolor[${PYTHON_USEDEP}]
- dev-python/msgpack[${PYTHON_USEDEP}]
- >=dev-python/neo4j-4.1.1[${PYTHON_USEDEP}]
- dev-python/pylnk3[${PYTHON_USEDEP}]
- >=dev-python/pypsrp-0.5.0[${PYTHON_USEDEP}]
- >=dev-python/paramiko-2.7.2[${PYTHON_USEDEP}]
- dev-python/impacket[${PYTHON_USEDEP}]
- dev-python/xmltodict[${PYTHON_USEDEP}]
- dev-python/terminaltables[${PYTHON_USEDEP}]
- dev-python/aioconsole[${PYTHON_USEDEP}]
- dev-python/pywerview[${PYTHON_USEDEP}]
-"
-#BDEPEND="
-# test? (
-# dev-python/flake8[${PYTHON_USEDEP}]
-# )
-#"
-
-QA_FLAGS_IGNORED="usr/lib.*/python.*/site-packages/cme/data/mimipenguin/.*"
-QA_PRESTRIPPED="usr/lib.*/python.*/site-packages/cme/data/mimipenguin/.*"
-
-S="${WORKDIR}/CrackMapExec-${PV}"
-
-src_prepare() {
- default
- # exclude is not supported by pyproject2setuppy
- sed -i '/^exclude/,/^\]/d' pyproject.toml || die
-}
-
-#python_test() {
-# flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude cme/data/* || die "Tests fail with ${EPYTHON}"
-#}
-
-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"
-}
diff --git a/net-analyzer/crackmapexec/crackmapexec-5.3.0-r1.ebuild b/net-analyzer/crackmapexec/crackmapexec-5.3.0-r1.ebuild
deleted file mode 100644
index 35c65dea8..000000000
--- a/net-analyzer/crackmapexec/crackmapexec-5.3.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit python-utils-r1 distutils-r1
-
-DESCRIPTION="A swiss army knife for pentesting Windows/Active Directory environments"
-HOMEPAGE="https://github.com/byt3bl33d3r/CrackMapExec/releases"
-#SRC_URI="https://mirrors.neusoft.edu.cn/kali/pool/main/c/crackmapexec/crackmapexec_${PV}.orig.tar.xz"
-SRC_URI="https://github.com/byt3bl33d3r/CrackMapExec/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-SLOT="0"
-RESTRICT="test"
-
-#pyproject.toml, [tool.poetry.dependencies]
-RDEPEND="
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/requests-ntlm[${PYTHON_USEDEP}]
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/lsassy[${PYTHON_USEDEP}]
- dev-python/termcolor[${PYTHON_USEDEP}]
- dev-python/msgpack[${PYTHON_USEDEP}]
- >=dev-python/neo4j-4.1.1[${PYTHON_USEDEP}]
- dev-python/pylnk3[${PYTHON_USEDEP}]
- >=dev-python/pypsrp-0.5.0[${PYTHON_USEDEP}]
- >=dev-python/paramiko-2.7.2[${PYTHON_USEDEP}]
- dev-python/impacket[${PYTHON_USEDEP}]
- >=dev-python/dsinternals-1.2.4[${PYTHON_USEDEP}]
- dev-python/xmltodict[${PYTHON_USEDEP}]
- dev-python/terminaltables[${PYTHON_USEDEP}]
- dev-python/aioconsole[${PYTHON_USEDEP}]
- dev-python/pywerview[${PYTHON_USEDEP}]
- >=dev-python/aardwolf-0.0.8[${PYTHON_USEDEP}]
-"
-#BDEPEND="
-# test? (
-# dev-python/flake8[${PYTHON_USEDEP}]
-# )
-#"
-
-#QA_FLAGS_IGNORED="usr/lib.*/python.*/site-packages/cme/data/mimipenguin/.*"
-#QA_PRESTRIPPED="usr/lib.*/python.*/site-packages/cme/data/mimipenguin/.*"
-
-S="${WORKDIR}/CrackMapExec-${PV}"
-
-src_prepare() {
- default
- # exclude is not supported by pyproject2setuppy
- sed -i '/^exclude/,/^\]/d' pyproject.toml || die
-}
-
-#python_test() {
-# flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude cme/data/* || die "Tests fail with ${EPYTHON}"
-#}
-
-#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"
-#}
diff --git a/net-analyzer/crackmapexec/crackmapexec-5.4.0.ebuild b/net-analyzer/crackmapexec/crackmapexec-5.4.0.ebuild
index 9ab8429f4..f2a55c290 100644
--- a/net-analyzer/crackmapexec/crackmapexec-5.4.0.ebuild
+++ b/net-analyzer/crackmapexec/crackmapexec-5.4.0.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DISTUTILS_USE_PEP517=poetry
PYTHON_COMPAT=( python3_{10..12} )
-inherit python-utils-r1 distutils-r1
+inherit distutils-r1
DESCRIPTION="A swiss army knife for pentesting Windows/Active Directory environments"
HOMEPAGE="https://github.com/byt3bl33d3r/CrackMapExec/releases"
#SRC_URI="https://mirrors.neusoft.edu.cn/kali/pool/main/c/crackmapexec/crackmapexec_${PV}.orig.tar.xz"
SRC_URI="https://github.com/byt3bl33d3r/CrackMapExec/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/CrackMapExec-${PV}"
LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
SLOT="0"
+KEYWORDS="~amd64 ~x86"
RESTRICT="test"
#pyproject.toml, [tool.poetry.dependencies]
@@ -49,8 +49,6 @@ RDEPEND="
#QA_FLAGS_IGNORED="usr/lib.*/python.*/site-packages/cme/data/mimipenguin/.*"
#QA_PRESTRIPPED="usr/lib.*/python.*/site-packages/cme/data/mimipenguin/.*"
-S="${WORKDIR}/CrackMapExec-${PV}"
-
src_prepare() {
default
# exclude is not supported by pyproject2setuppy
@@ -58,7 +56,8 @@ src_prepare() {
}
#python_test() {
-# flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude cme/data/* || die "Tests fail with ${EPYTHON}"
+# flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude cme/data/* || \
+# die "Tests fail with ${EPYTHON}"
#}
#python_install() {
diff --git a/net-analyzer/crackmapexec/metadata.xml b/net-analyzer/crackmapexec/metadata.xml
index ace7c2d3a..81aa89f41 100644
--- a/net-analyzer/crackmapexec/metadata.xml
+++ b/net-analyzer/crackmapexec/metadata.xml
@@ -5,4 +5,7 @@
unknown@pentoo.ch
Author Unknown
+
+ byt3bl33d3r/CrackMapExec
+