gentoo auto-resync : 01:05:2023 - 17:20:35

6 files changed, 74 insertions, 48 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index dc2130c7679e..69c76eb66cb4 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index 0f4ef64fcdda..9c225c019a5c 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1,4 +1,3 @@
 DIST cachelib-0.10.2.gh.tar.gz 29249 BLAKE2B 2f15e59f1f3ff2dfabed4076e0e47888d16421b7e94cbe13903a39641d903e044c6879aec3a7ad1673e0bb19d7b668d69316bee9b8f8bb4176125de93bc547df SHA512 7168703bdca228982216c65cd1a765d727813e47a0522d5e84258251b8aebde4d6d561850f97232b4e6c054fe09487e35a251b3992682145ef49c5ff1212488b
 EBUILD cachelib-0.10.2-r1.ebuild 970 BLAKE2B 7f0206f872b155fcbd2c789feb2224fd5f3cd575e1f0903f603b600fd54f2ab5f355bb924253de3cf74998c62f4074c14cc8447c4404129275fca6da423fdbdc SHA512 3ebeda2501e3fac91b38e726c296499e1365bcefe86e6fa5ad8a967065d96d843d5510ba9ecba79d0ee14145ca72585efaf7fb1b90c27f4ecd523193e2921f6a
-EBUILD cachelib-0.10.2.ebuild 970 BLAKE2B 01f013c8fa78e21de3ed0049515cd7e89b0f6677ffcf85ff10f59460e17ac4e6911c2b909ae9d55ca970811d8a6184202dc7ebd42d913ab2dd3985cdd4135202 SHA512 edd3c6655ffe0e4b3a18c40fa33f6c3513b67bc16dbc7c28b8f53035300dffd796681f2177aa21eb654bbdceb184c35ca08c806146847a1ee982c6da657c0300
 MISC metadata.xml 510 BLAKE2B 456e0e3b13e50fe5fa9fb866ca2a20a63c180a55691d3cc5e63cea2d16e9e98c61d4f0f5d043f8cf73c2fa80f68eb1b29f182b5bec04356fe1c5965799ea4d7f SHA512 caef760fc497745b37e82a3603d360eb3ca173d1c6d1ee47d8cc358c28db2683446e5ce67a60e267f509e6f7688c9ee3aa5c499539752c014f0830af9896d3c6
diff --git a/dev-python/cachelib/cachelib-0.10.2.ebuild b/dev-python/cachelib/cachelib-0.10.2.ebuild
deleted file mode 100644
index eba993bc1c7b..000000000000
--- a/dev-python/cachelib/cachelib-0.10.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
-HOMEPAGE="
-	https://pypi.org/project/cachelib/
-	https://github.com/pallets-eco/cachelib/
-"
-SRC_URI="
-	https://github.com/pallets-eco/cachelib/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pylibmc[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		dev-python/redis[${PYTHON_USEDEP}]
-		net-misc/memcached
-		www-servers/uwsgi[python,${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# bug #818523
-	tests/test_redis_cache.py
-	# requires some test server running
-	# (these tests require dev-python/boto3)
-	tests/test_dynamodb_cache.py
-)
diff --git a/dev-python/pyGPG/Manifest b/dev-python/pyGPG/Manifest
index 15ff2a0ad8b6..522c289a2265 100644
--- a/dev-python/pyGPG/Manifest
+++ b/dev-python/pyGPG/Manifest
@@ -1,4 +1,6 @@
 DIST pyGPG-0.2.tar.gz 15439 BLAKE2B 92c82b8b23c279461a872f118c636fa9cdae3f44910fc34a357983b0b4afea2a7b13c6400499a0fdbb4365357ade64294642178ca07a79ab3b7df89e60146e73 SHA512 93d892a57a27b254bfdc9778b73d341dfec654c2104c578014628df78c43beaf93eafb571ac544d52f334e63f6e5b8c0cfad7c8a0d585ee7211e8649efce8c67
+DIST pyGPG-0.2_p20220808.gh.tar.gz 31955 BLAKE2B ae671b7bf685b1072364dbfcf79bca8fa2dadd034fbdf7a721d7a2cfec44e8d8ffa22b08c14414c8774422b6a62af8d511bd31bd15bd68d89632cde031ec0906 SHA512 85c8d67e71e91cfb26b1e0087889d7cd4fccae9ddcffcd3e3f9d208da7fd352c3273c580e3b7c284c5ab4c2a53c56f4530e5587dc22869098a408a1dfcd1e257
 EBUILD pyGPG-0.2-r1.ebuild 1112 BLAKE2B dca46b2d5c8e440eb6df37f6c113af181185d9b0e8474301ffe6bb05b09c3d67299ac63ba7b22f1511f8c5538c2b5889d044928a51d2d1de829e910a6ec7f50b SHA512 8870481c0e65f4bf0cd9130134fb8a432cff247e1e3217e2574e3ffaff371ff8331b2733f90dcf5c3afbcab5ceda9c2ae9550595d6361416a4bb72f63ce5afa4
-EBUILD pyGPG-9999.ebuild 1150 BLAKE2B 06c1f80b5cea59eaec3fdba755c61ecf83c6782ce1a54642ce8f351b07a372b60c4f2133a466170b53b8b03bf463406d96288c4f4700db954bdac3b76bda2e7b SHA512 3fc4636f4a530719596f3dbc16e8600bb386b6017f125fb55fd211f35517b0d2d5fdeef64efc88226e7e9d73db618919569ce27d434a1749c2029740621fd684
+EBUILD pyGPG-0.2_p20220808.ebuild 1594 BLAKE2B c12bb0c6ea350e5deb24ddca51d0ba9e5201fbb626a49aafdae399a68395199092ebf1cc73c01a06dc18ba0e401454f48e2c5bc2f172d5a6e60dfc6cd80bfe0b SHA512 19881e78c5a585672ee54a916458c4d824a63d1e52ece5226ea2a94487ca009b789b046942a86db9a038254d16d1266593f033a11f0307eee1d0901390523c7a
+EBUILD pyGPG-9999.ebuild 1594 BLAKE2B c12bb0c6ea350e5deb24ddca51d0ba9e5201fbb626a49aafdae399a68395199092ebf1cc73c01a06dc18ba0e401454f48e2c5bc2f172d5a6e60dfc6cd80bfe0b SHA512 19881e78c5a585672ee54a916458c4d824a63d1e52ece5226ea2a94487ca009b789b046942a86db9a038254d16d1266593f033a11f0307eee1d0901390523c7a
 MISC metadata.xml 567 BLAKE2B e0c99fa711e08f9ae227c71f685083871aed97c2b8e07ea67e02bd9685f0b1c05a7cb5cca4b9b7405b3c6af49659bb7d79bad1128a3696d7b918c9ff93ccd13a SHA512 ce22011a182f373d6507ddc8eb2658d0f0e74e5f2d281a6dc4326b5c04a34320ccb294c4606da641c1a24d0563a612931cb4a1acdda61db02a723b4111d89b77
diff --git a/dev-python/pyGPG/pyGPG-0.2_p20220808.ebuild b/dev-python/pyGPG/pyGPG-0.2_p20220808.ebuild
new file mode 100644
index 000000000000..6749e63d1904
--- /dev/null
+++ b/dev-python/pyGPG/pyGPG-0.2_p20220808.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dol-sen/pyGPG.git"
+	EGIT_BRANCH="master"
+elif [[ ${PV} == *_p* ]] ; then
+	MY_COMMIT="eb44ec69978044809325a0a9c8972d1d4f573b47"
+	SRC_URI="https://github.com/dol-sen/pyGPG/archive/${MY_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+	S="${WORKDIR}"/${PN}-${MY_COMMIT}
+else
+	SRC_URI="https://dev.gentoo.org/~dolsen/releases/pyGPG/${P}.tar.gz"
+fi
+
+DESCRIPTION="A python interface wrapper for gnupg's gpg command"
+HOMEPAGE="https://github.com/dol-sen/pyGPG"
+
+LICENSE="BSD"
+SLOT="0"
+if [[ ${PV} != *9999 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+RDEPEND="app-crypt/gnupg"
+
+EPYTEST_DESELECT=(
+	# Expired keys
+	test/pyGPG/test_gpg.py::test_listkeys2
+	test/pyGPG/test_gpg.py::test_listkey2
+	test/pyGPG/test_gpg.py::test_listkey
+	test/pyGPG/test_gpg.py::test_fingerprint2
+)
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	elog "This is experimental software."
+	elog "The APIs it installs should be considered unstable"
+	elog "and are subject to change."
+	elog
+	elog "Please file any enhancement requests, or bugs"
+	elog "at https://github.com/dol-sen/pyGPG/issues"
+	elog "I am also on IRC @ #gentoo-ci of the Libera.Chat network"
+	elog
+	ewarn "There may be some Python 3 compatibility issues still."
+	ewarn "Please help debug/fix/report them in github or bugzilla."
+}
diff --git a/dev-python/pyGPG/pyGPG-9999.ebuild b/dev-python/pyGPG/pyGPG-9999.ebuild
index 337db049369c..6749e63d1904 100644
--- a/dev-python/pyGPG/pyGPG-9999.ebuild
+++ b/dev-python/pyGPG/pyGPG-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
@@ -12,9 +12,12 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dol-sen/pyGPG.git"
 	EGIT_BRANCH="master"
+elif [[ ${PV} == *_p* ]] ; then
+	MY_COMMIT="eb44ec69978044809325a0a9c8972d1d4f573b47"
+	SRC_URI="https://github.com/dol-sen/pyGPG/archive/${MY_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+	S="${WORKDIR}"/${PN}-${MY_COMMIT}
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/pyGPG/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="A python interface wrapper for gnupg's gpg command"
@@ -22,9 +25,20 @@ HOMEPAGE="https://github.com/dol-sen/pyGPG"
 
 LICENSE="BSD"
 SLOT="0"
+if [[ ${PV} != *9999 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
 
 RDEPEND="app-crypt/gnupg"
 
+EPYTEST_DESELECT=(
+	# Expired keys
+	test/pyGPG/test_gpg.py::test_listkeys2
+	test/pyGPG/test_gpg.py::test_listkey2
+	test/pyGPG/test_gpg.py::test_listkey
+	test/pyGPG/test_gpg.py::test_fingerprint2
+)
+
 distutils_enable_tests pytest
 
 pkg_postinst() {