Merge pull request #2149 from blshkv/master

jadx

app-exploits/empire/empire-5.11.4.ebuild

@@ -32,7 +32,7 @@ RDEPEND="${PYTHON_DEPS}
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/zlib_wrapper[${PYTHON_USEDEP}]
 		dev-python/netifaces[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/jinja2[${PYTHON_USEDEP}]
 		dev-python/xlutils[${PYTHON_USEDEP}]
 		dev-python/pyparsing[${PYTHON_USEDEP}]
 		dev-python/pymysql[${PYTHON_USEDEP}]

app-exploits/empire/empire-5.11.5.ebuild

@@ -32,7 +32,7 @@ RDEPEND="${PYTHON_DEPS}
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/zlib_wrapper[${PYTHON_USEDEP}]
 		dev-python/netifaces[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/jinja2[${PYTHON_USEDEP}]
 		dev-python/xlutils[${PYTHON_USEDEP}]
 		dev-python/pyparsing[${PYTHON_USEDEP}]
 		dev-python/pymysql[${PYTHON_USEDEP}]

app-forensics/scap-security-guide/Manifest

@@ -1,2 +1 @@
-DIST scap-security-guide-0.1.50.tar.gz 9101036 BLAKE2B 083b239b01dd3a8fd9ebbf7f63abde7fee4e5c922d69cfdfa3a0e32c6525ea85995853e1fc6128b7dfbc939a1f5c4ecfb503bdb8f1fd5c61f6b238fcd522472a SHA512 679743f36dd83d802d9664e225c9de88bafe9ccb7c05784ab890cc65c1213a8b07b4ce622b2a61ddda20da56e3bf71a6f121a48a3e8de8c7ceac426f84a1877a
 DIST scap-security-guide-0.1.51.tar.gz 9170386 BLAKE2B 8efdfb856af8f1ed0481a30dce659de2cac9f8c1d63b1e1e52725b2862fb1d4f5a8cdfd8d9823e4cb0e5571b3f0a87b71fdb5178619bc122eb65a4e8b99f0dee SHA512 b1bfad54c9b26d3b5e6e15436c76a5adb9108fe52717487a21e22341327f090f4f2a511069b7f52ece66a3af586242b71034564a8707721af509401cf1c3bf6f

app-forensics/scap-security-guide/metadata.xml

@@ -35,4 +35,7 @@
 		<flag name="jinja2">If enabled, the jinja2 templating files will be cached into bytecode</flag>
 		<flag name="shellcheck">If enabled, shellcheck validation of bash fixes will be performed as part of the ctest tests</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">ComplianceAsCode/content</remote-id>
+	</upstream>
 </pkgmetadata>

app-forensics/scap-security-guide/scap-security-guide-0.1.51.ebuild

@@ -1,8 +1,9 @@
-# Copyright 1999-2020 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=setuptools
 PYTHON_COMPAT=( python3_{10..12} )
 
 SSG_PRODUCTS=(
@@ -17,6 +18,7 @@ inherit cmake python-single-r1
 DESCRIPTION="Security compliance content in SCAP, Bash, Ansible, and other formats"
 HOMEPAGE="https://www.open-scap.org/security-policies/scap-security-guide"
 SRC_URI="https://github.com/ComplianceAsCode/content/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/content-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -26,7 +28,8 @@ IUSE="${SSG_PRODUCTS[*]} centos +jinja2 shellcheck scientific-linux test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	shellcheck? ( test )"
 
-DEPEND="${PYTHON_DEPS}
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
 	app-forensics/openscap
 	dev-libs/expat
 	dev-libs/libxslt
@@ -38,15 +41,15 @@ DEPEND="${PYTHON_DEPS}
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/yamllint[${PYTHON_USEDEP}]
 	')
-	jinja2? ( $(python_gen_cond_dep 'dev-python/jinja[${PYTHON_USEDEP}]') )
+	jinja2? ( $(python_gen_cond_dep 'dev-python/jinja2[${PYTHON_USEDEP}]') )
 	test? (
 		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
 		shellcheck? (
 			|| ( dev-util/shellcheck-bin dev-util/shellcheck )
 		)
 	)"
 
-S="${WORKDIR}/content-${PV}"
+RESTRICT="!test? ( test )"
 
 pkg_setup() {
 	python-single-r1_pkg_setup

app-misc/gplaycli/gplaycli-3.29.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
@@ -15,12 +15,11 @@ SRC_URI="https://github.com/matlink/gplaycli/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	>=dev-python/matlink-gpapi-0.4.4.5[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/protobuf[${PYTHON_USEDEP}]
 	dev-python/pyaxmlparser[${PYTHON_USEDEP}]"
 
 PATCHES=( "${FILESDIR}/3.29-confpath.patch" )

app-misc/gplaycli/metadata.xml

@@ -5,4 +5,7 @@
 		<email>[email protected]</email>
 		<name>Author Unknown</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">matlink/gplaycli</remote-id>
+	</upstream>
 </pkgmetadata>

dev-python/fastapi/Manifest

@@ -1,2 +1 @@
-DIST fastapi-0.108.0.tar.gz 11417797 BLAKE2B 8374a1f621b0e1536ab78a9b0e24d8f9165566ff6f32148c4fd5d9c0188948ed95c675a39741d364054151c81b263401d844e0059c7a72c22ba195ee285c4fbf SHA512 96277f33fe54187d325a0d2851d7ddf7fb7430f5ecc2fa277570e36e852ec7cd80fdd7bdd74a6f072b8be85a0028e871d68166279fc844aa8b71b31768dbef59
 DIST fastapi-0.109.2.tar.gz 11720963 BLAKE2B c58170f38f86d089b1e8e9ea98c56ea8c7cfc2f3d92663b69c9ee5b2e5ed3cd28de2fa02a128cbe600f4e3c41851140542be1b13aaaea1b23f5295d4f949a5da SHA512 b6b26c41f9097112fc06f573b60e90af104834e5ab6115b681143b4d24ee22d4b4bf5dd4a0095cdd18a36a40a6d0d72a6a2dc2e5ab5bae16d98d085f2312a836

dev-python/fastapi/fastapi-0.109.2.ebuild

@@ -31,7 +31,7 @@ RDEPEND="
 	>=dev-python/anyio-3.7.1[${PYTHON_USEDEP}]
 all? (
 	>=dev-python/httpx-0.23.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.11.2[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 	>=dev-python/python-multipart-0.0.5[${PYTHON_USEDEP}]
 	>=dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]

dev-python/gpapi/gpapi-0.4.4-r1.ebuild

@@ -1,21 +1,20 @@
-# Copyright 1999-2020 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=setuptools
 PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Unofficial python api for google play"
 HOMEPAGE="https://github.com/NoMore201/googleplay-api"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 x86"
 SLOT="0"
-IUSE=""
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-3.5.1[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"

dev-python/gpapi/metadata.xml

@@ -5,4 +5,8 @@
 		<email>[email protected]</email>
 		<name>Author Unknown</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">NoMore201/googleplay-api</remote-id>
+		<remote-id type="pypi">gpapi</remote-id>
+	</upstream>
 </pkgmetadata>

dev-python/grpcio-testing/grpcio-testing-1.62.0.ebuild

@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-4.21.3[${PYTHON_USEDEP}]
+	<dev-python/protobuf-5[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-4.21.3[${PYTHON_USEDEP}]
 "
 BDEPEND="${RDEPEND}"

dev-python/grpcio-tools/grpcio-tools-1.62.0.ebuild

@@ -19,8 +19,8 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 RDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-4.21.3[${PYTHON_USEDEP}]
+	<dev-python/protobuf-5[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-4.21.3[${PYTHON_USEDEP}]
 "
 
 DEPEND="${RDEPEND}"

dev-python/grpcio-tools/grpcio-tools-1.65.2.ebuild

@@ -18,8 +18,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-5.26.1[${PYTHON_USEDEP}]
-	<dev-python/protobuf-python-6[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-5.26.1[${PYTHON_USEDEP}]
+	<dev-python/protobuf-6[${PYTHON_USEDEP}]
 "
 
 DEPEND="${RDEPEND}"

dev-python/grpcio/grpcio-1.62.0.ebuild

@@ -19,8 +19,8 @@ KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 RDEPEND="
 	>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
 	>=dev-libs/re2-0.2021.11.01:=
-	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-4.21.3[${PYTHON_USEDEP}]
+	<dev-python/protobuf-5[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-4.21.3[${PYTHON_USEDEP}]
 	net-dns/c-ares:=
 	sys-libs/zlib:=
 "

dev-python/grpcio/grpcio-1.65.2.ebuild

@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
-	>=dev-python/protobuf-python-5.26.1[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-5.26.1[${PYTHON_USEDEP}]
 	>=dev-libs/re2-0.2024.07.02:=
 	net-dns/c-ares:=
 	sys-libs/zlib:=