empire: 3.5.2 bump and make stable

app-exploits/empire/Manifest

@@ -1,2 +1,3 @@
 DIST empire-3.3.4.tar.gz 10142378 BLAKE2B cf9b76e030bb9a2f298584e1b78d5ea296e2ce7f03b6ce76eee69d21a9790db12d2cd150a039b62cd7ffd3bf7d9c3d102a555e6c910023a583a4192406138edd SHA512 9b0fbdc72dec75700618339a8cbb73efb8cbf75348e2bbf75f7dcfb35d85917368e1d5e64bdf13928fb031503a9d9b1e51e51bfe7925fab15a3c3c015064f0c5
 DIST empire-3.4.0.tar.gz 10297644 BLAKE2B 711c6974fc1be7659382c3a190e0fc430196ac054a0fccf5aa4746c50cd5ed2464ceb29564cd37bc7cbccb83790afeefa98c8a5091bfc26844f7fb8d91838fe1 SHA512 ebacaa806e83194c32872ff7b0a89a43f7cf7fe2c52ae1566ec939f836700ba59e2e3370613959d95190adb8360fea8200722308aa58f941ee8102cf4a57c132
+DIST empire-3.5.2.tar.gz 10389505 BLAKE2B 6a59b262b2afa6905df37e05cd6f05fe7d88757ddabd44629676f11fcc29e7e6f7cffadc0c5adf097b21b2e91edfcfb49b3b6ef37520e636610110bcfa0f1f1c SHA512 9e4bf65f82b68d17165b3543c7b8bf4b7b26e400b3b1642f74e085722b4e44e6473014b650bbd19c4193ee4b89af9797b89fc15d696a0c2c5152f6ea6d85c76d

app-exploits/empire/empire-3.5.2.ebuild

@@ -0,0 +1,130 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+#https://github.com/BC-SECURITY/Empire/issues/196 python3.8
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils python-single-r1
+
+DESCRIPTION="A post-exploitation framework"
+HOMEPAGE="https://github.com/BC-SECURITY/Empire"
+SRC_URI="https://github.com/BC-SECURITY/Empire/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+LICENSE="BSD"
+SLOT="0"
+IUSE="powershell java"
+REQUIRED_USE="powershell? ( !x86 )"
+
+# waiting for the upstream
+# https://bugs.gentoo.org/684734
+# do we need Poetry?
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/urllib3[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-iptools[${PYTHON_MULTI_USEDEP}]
+		dev-python/pydispatcher[${PYTHON_MULTI_USEDEP}]
+		dev-python/flask[${PYTHON_MULTI_USEDEP}]
+		dev-python/macholib[${PYTHON_MULTI_USEDEP}]
+		dev-python/dropbox-sdk[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyinstaller[${PYTHON_MULTI_USEDEP}]
+		dev-python/zlib_wrapper[${PYTHON_MULTI_USEDEP}]
+		dev-python/netifaces[${PYTHON_MULTI_USEDEP}]
+		dev-python/m2crypto[${PYTHON_MULTI_USEDEP}]
+		dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyminifier[${PYTHON_MULTI_USEDEP}]
+		dev-python/xlutils[${PYTHON_MULTI_USEDEP}]
+		dev-python/pefile[${PYTHON_MULTI_USEDEP}]
+		dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
+		dev-python/bcrypt[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyparsing[${PYTHON_MULTI_USEDEP}]
+		dev-python/flask-socketio[${PYTHON_MULTI_USEDEP}]
+	')
+	powershell? (
+		!x86? ( app-shells/pwsh-bin ) )
+	java? (
+		|| ( virtual/jre:* virtual/jdk:* ) )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/Empire-${PV}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang "${S}"
+	default
+}
+
+#https://github.com/BC-SECURITY/Empire/issues/39
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r data/ lib/ plugins/ setup/ empire
+
+	python_optimize "${D}/usr/share/${PN}/lib"
+
+	make_wrapper $PN \
+		"${PYTHON} /usr/share/${PN}/empire" \
+		"/usr/share/${PN}"
+
+	dodoc README.md Dockerfile changelog
+}
+
+pkg_config() {
+	local _yesno_ask
+	local _em_home="${EROOT}/usr/share/${PN}"
+
+	pushd "${_em_home}" >/dev/null || die
+
+	if [ -f "${_em_home}/data/empire.db" ]; then
+		ewarn "Drop old database "${_em_home}/data/empire.db" for new configuring ..."
+		read -r -p " [>] Are you sure? [y/N] " _yesno_ask
+
+		if [[ ${_yesno_ask,,} =~ ^(yes|y)$ ]]; then
+			rm -f data/empire.db > /dev/null 2>&1 || die
+		else
+			return
+		fi
+	fi
+
+	ebegin "Press ENTER to create password for database or Control-C to abort now"
+	python3 setup/setup_database.py
+	eend ${?} || die
+
+	if [ -f "${_em_home}/data/empire-chain.pem" ] || [ -f "${_em_home}/data/empire-priv.key" ]; then
+		ewarn "Drop old ${_em_home}/data/empire-chain.pem and generate new cert ..."
+		read -r -p " [>] Are you sure? [y/N] " _yesno_ask
+
+		if [[ ${_yesno_ask,,} =~ ^(yes|y)$ ]]; then
+			rm -f data/{empire-chain.pem,empire-priv.key} > /dev/null 2>&1 || die
+		else
+			return
+		fi
+	fi
+
+	openssl req -newkey rsa:2048 -new -nodes -x509 \
+		-subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=www.pentoo.ch" \
+		-keyout data/empire-priv.key \
+		-out data/empire-chain.pem || die
+
+	popd >/dev/null || die
+}
+
+pkg_postinst() {
+	ewarn "\nWarning. This software does not support system-wide installation"
+	ewarn "See the following bug report for more details:"
+	ewarn "https://github.com/BC-SECURITY/Empire/issues/39"
+	ewarn
+	ewarn "You need to run it from /usr/share/${PN} directory under 'root' account"
+	ewarn "\nPlease configure your installation before using:"
+	ewarn "    emerge --config \"=${CATEGORY}/${PF}\"\n"
+}

app-shells/pwsh-bin/pwsh-bin-7.0.3.ebuild

@@ -14,7 +14,7 @@ SRC_URI="
 "
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 
 QA_PREBUILT="*"
 

dev-python/altgraph/altgraph-0.17.ebuild

@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 

dev-python/dropbox-sdk/dropbox-sdk-10.1.1.ebuild

@@ -14,15 +14,12 @@ SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND=">=dev-python/requests-2.16.2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-#test?    'pytest-runner',
-#    'pytest',
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}-python-${PV}"
 

dev-python/flask-socketio/Manifest

@@ -0,0 +1 @@
+DIST Flask-SocketIO-4.3.1.tar.gz 15071 BLAKE2B 9931eb5b4e4c475d90fe94f2a7b9e77ee689c5c04efada0f02a1ce7abb7a5e590ec365b8b765aaf6089d7e8b00d15d85904dc01e711f72158de5982afbe1aee8 SHA512 3db754cdd742bccac2362911db0aae6e832f32396e086c2effddc66cc28a1fc362f8b915d9c19d45b1c72968e7f1abb4226c84b17ba707cfaf85faa2762f596c

dev-python/flask-socketio/flask-socketio-4.3.1.ebuild

@@ -0,0 +1,26 @@
+# 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
+
+MY_PN="Flask-SocketIO"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Socket.IO integration for Flask applications"
+HOMEPAGE="https://github.com/miguelgrinberg/Flask-SocketIO/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}]
+	dev-python/socketio-client[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"

dev-python/macholib/macholib-1.14.ebuild

@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/altgraph[${PYTHON_USEDEP}]"

dev-python/pefile/pefile-2019.4.18.ebuild

@@ -9,7 +9,7 @@ inherit distutils-r1
 DESCRIPTION="Module to read and work with Portable Executable (PE) files"
 HOMEPAGE="https://github.com/erocarrera/pefile"
 SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE=""

dev-python/pydispatcher/pydispatcher-2.0.5.ebuild

@@ -15,11 +15,11 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc examples"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
+DEPEND="${RDEPEND}"
 
 python_compile_all() {
 	if use doc; then

dev-python/pyinstaller/pyinstaller-3.6-r1.ebuild

@@ -19,7 +19,7 @@ else
 	MY_PN="PyInstaller"
 	MY_P="${MY_PN}-${PV}"
 	SRC_URI="https://github.com/pyinstaller/pyinstaller/releases/download/v${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 
 	S="${WORKDIR}/${MY_P}"
 fi

dev-python/pyminifier/pyminifier-2.1.ebuild

@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND=""

dev-python/pyminifier/pyminifier-2.1_p20150625.ebuild

@@ -20,7 +20,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"

dev-python/python-iptools/python-iptools-0.7.0.ebuild

@@ -13,9 +13,8 @@ SRC_URI="https://github.com/bd808/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"

dev-python/zlib_wrapper/zlib_wrapper-0.1.3.ebuild

@@ -9,11 +9,10 @@ inherit distutils-r1
 DESCRIPTION="Wrapper around zlib with custom header crc32."
 HOMEPAGE="https://github.com/killswitch-GUI/zlib_wrapper"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND=""

profiles/pentoo/base/package.accept_keywords/dev-python

@@ -137,9 +137,6 @@ dev-python/pyasn1
 ~dev-python/versioneer-0.16
 ~dev-python/subprocess32-3.2.7
 
-#required for vail
-=dev-python/pefile-2019*
-
 #required by net-analyzer/recon-ng
 ~dev-python/mechanize-0.4.3
 ~dev-python/flasgger-0.9.4
@@ -259,20 +256,10 @@ dev-python/pylnk3
 ~dev-python/selenium-3.141.0
 
 # required by net-analyzer/empire
-~dev-python/xlutils-2.0.0
-~dev-python/xlwt-1.3.0
-~dev-python/xlrd-1.2.0
-=dev-python/dropbox-sdk-10.1*
+#~dev-python/xlutils-2.0.0
 #broken https://bugs.gentoo.org/684734
 #~dev-python/pydispatcher-2.1.2
-=dev-python/pydispatcher-2.0*
 ~net-analyzer/empire-2.5
-~dev-python/altgraph-0.17
-dev-python/macholib
-dev-python/pyminifier
-~dev-python/zlib_wrapper-0.1.3
-#pentoo
-dev-python/python-iptools
 
 #required by qark
 ~dev-python/javalang-0.12.0

profiles/pentoo/base/package.keywords/dev-python

@@ -1,2 +1,5 @@
 ~dev-python/pyside2-5.15.1 amd64 x86
 ~dev-python/shiboken2-5.15.1 amd64 x86
+
+#empire
+~dev-python/xlutils-2.0.0 amd64 x86