gentoo auto-resync : 23:09:2022 - 11:29:49

3 files changed, 94 insertions, 0 deletions

diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index 38455a974a78..0bb4734f704b 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,8 +1,11 @@
+AUX apsw-3.39.3.0-test.patch 1470 BLAKE2B c5bbca0368089119a13e0b654865c47c2642d636f06caded6f99593813effec50e3ec2f05857ac08d0f65f5b62460be4eaa33e6b1c1d4375461068690315eda4 SHA512 5f1aee1a1f8549d60c3aa3209b3340e69ae45002966b3876721c1f75e1c42aeb413b5d0c1001920fcc3eec78489204e78d6cf8e02fb0393b0450f4e6c6b510fc
 AUX apsw-3.6.20.1-fix_tests.patch 340 BLAKE2B c70f404afaed26c92f60690820812fb0ccbe355f43384b4e0a931851c27348b04335aa4c25baf5b2662c85403ad2eb075ce049a724c297a46ea2f796845aebd8 SHA512 386cae12d949a6f4dd55dc7e3e1bc176c43c5001f10acc75261c92fbe14bb09c0e054dfa4087d285496dec4cbd4a9add5733742dbfa82c6e10ee1c8d0f43fb0a
 DIST apsw-3.38.5-r1.gh.tar.gz 338186 BLAKE2B 145e38d4057be498f85a655ad7a437ec19a895769f58505b4b99093be30e67498faf9572494009db8e20e6700fa5e514605af131d045a4e8bb41587b828f5a88 SHA512 58331ca2db993f87316a55075ee9c440d4bd6e985e8ca11079391bd9cc2a907271ffe5c21d66840e336cd9e6568f6134c8b8fa5d28bbc7c77a1dddd48e8b99b7
 DIST apsw-3.39.2.0.gh.tar.gz 345634 BLAKE2B 433455fdb0dbc6192bbb3ef47cc1d54faa310715b81312b999a84f90de61e5362e4af8d3a705816100381ae920283d84a50fb2e51308227eecf9de5b7166c4ac SHA512 4d3eb68d47cf8114e7823969277d0f42c4091632d4aeab61f66e91e99601b6a5286875515e860e27a2f736c943dad1657f5c47cbdd23a3d1479d3019bfd1c05b
 DIST apsw-3.39.2.1.gh.tar.gz 363389 BLAKE2B 001efa8904c724ec051ac18d80ce55ce646c12ea4a218536494fa0e5804781ccc6c66287575c21553c0a97f4a806a5c7ab671116667d0368c32f7e614fd32a2f SHA512 10f08320157be96ad409472b50480b1b1875ec88ccb00690851aaef5864aa2bfc8000fce10ef0f00b820cfd5cebad950f0e7bba432018524cb292a6738ff30e8
+DIST apsw-3.39.3.0.gh.tar.gz 364874 BLAKE2B e23ca9ce125b2097f2e859d19053405070a3a09e061d27a175d4a3b721c4b68ac220b0522ca4e49075b937ebafdef8ba0cc5b0adc1ea389ee7c0c195b9f0850a SHA512 f9977f4112f2a7b11c0b0ab3576eada7b816dd69c518a637fc0152ba8fc4d12330febdd91abaf00af9e26049041024b590a4d60a9f055bf49c3301c92a68b539
 EBUILD apsw-3.38.5_p1-r1.ebuild 1001 BLAKE2B 34e16dbb37cdac9e86a48591bd96e51b577114b1d306cf4d2935f93ef9efe1bdc55e1086d99d8f91f8a3e736bffeb46d256653d22fa092fff1d6ce3ee9ad8a98 SHA512 d5f9c67b0627695546facd78f000a9dea8ee2fa6e4d3a78ab7604ef21ca4a8c42cc1a07bf694cacde65d72bc6c07f91a702e97c111c26ed81795b660b964f697
 EBUILD apsw-3.39.2.0.ebuild 934 BLAKE2B 674fbc4a2e7b517059bfe6a8a5ce340cee9e68d14720c9d36c57ede504042031c8c13814b50fded7b1555cfc0ad7d57592586e0131af7b3ac26375966e46c8a1 SHA512 b3e9c2dd7093303a6cf0331ee27a8aea618b4ea7214d4e59a13b4e47f9385fe413e3279888ca43147d7ec62169bca8cd5a23468829d74e726a683dd84887f83c
 EBUILD apsw-3.39.2.1-r1.ebuild 888 BLAKE2B c5c1aae0c720c20938f1b11210a0fca49ff5bf39e534d1d317a1b547fc6856e7a89b0c3b4f792b9576235ea3ac80cb1a252b26979f9e167b00a1eb9d8c02ab73 SHA512 0bc0cff0edfd3d21aaa75f621ee7088ff9847abfe1d6313646a22cca4ae896d48682849d33dd8e8d2057ceae0ad3433ac198608bbc8e83edaa4c2afcc8b1f7ef
+EBUILD apsw-3.39.3.0.ebuild 1066 BLAKE2B 9af49911eaab00ce27a367483f856024a28ffe476e026c747199c671f870f93c16cd22cf0b46b36c6c24eba6992b58d3dc40073ed4286179b0099f188c02eb50 SHA512 28f71320f3a924c9d737298f4099865c50dd1eaf961b48e5d591cbe5623a0963dc5b80d6ed12371bdcf0c78bf738ca06578f4daba1941f1336d758e59b97c4a2
 MISC metadata.xml 700 BLAKE2B 258344a1602daf3e081fdb4c94eda8af6e231def3f02fb80d63691b47d0a503c9caad80893386ce7ef42d6be2985906f3fc5cfedfe5a1044aee04c493f3d0683 SHA512 de73b4eb06d0bcf4c81e544a98ad15231b006d62fe22f6bce7e38740b941b98297fa1a38b00060ff83ae9f3259c5020c7071469f2a3f0d9e4f8f0301cb942081
diff --git a/dev-python/apsw/apsw-3.39.3.0.ebuild b/dev-python/apsw/apsw-3.39.3.0.ebuild
new file mode 100644
index 000000000000..08791f688c61
--- /dev/null
+++ b/dev-python/apsw/apsw-3.39.3.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="
+	https://github.com/rogerbinns/apsw/
+	https://pypi.org/project/apsw/
+"
+SRC_URI="
+	https://github.com/rogerbinns/apsw/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	>=dev-db/sqlite-${PV%.*}:3
+"
+RDEPEND="
+	${DEPEND}
+"
+
+PATCHES=(
+	# upstream backport for test problem
+	# https://github.com/rogerbinns/apsw/commit/ce1604f15544cffd5403764f6508bbe63726b5e3
+	"${FILESDIR}"/${P}-test.patch
+)
+
+src_configure() {
+	cat >> setup.cfg <<-EOF || die
+		[build_ext]
+		use_system_sqlite_config=True
+	EOF
+}
+
+python_test() {
+	esetup.py build_test_extension
+	cd "${T}" || die
+	"${EPYTHON}" -m apsw.tests -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/apsw/files/apsw-3.39.3.0-test.patch b/dev-python/apsw/files/apsw-3.39.3.0-test.patch
new file mode 100644
index 000000000000..764fe4844bca
--- /dev/null
+++ b/dev-python/apsw/files/apsw-3.39.3.0-test.patch
@@ -0,0 +1,36 @@
+From a28713a9ebcc8d393beb270ca9fd5bf3b86a52bb Mon Sep 17 00:00:00 2001
+From: Roger Binns <rogerb@rogerbinns.com>
+Date: Thu, 22 Sep 2022 08:33:13 -0700
+Subject: [PATCH] Ensure uncompleted statement is present
+
+It turns out that under some circumstances Python hasattr
+is actually doing a getattr.  That means an incomplete statement
+needs to be present for the hasattr to not raise an exception.
+
+See #370
+---
+ apsw/tests.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/apsw/tests.py b/apsw/tests.py
+index bdaf70d..e9ad3c0 100644
+--- a/apsw/tests.py
++++ b/apsw/tests.py
+@@ -772,6 +772,7 @@ class APSW(unittest.TestCase):
+         c.execute("drop table foo; create table foo (%s)" % (", ".join(["[%s] %s" % (n, t) for n, t in cols]), ))
+         c.execute("insert into foo([x a space]) values(1)")
+         c.execute("create temp table two(fred banana); insert into two values(7); create temp view three as select fred as [a space] from two")
++        c.execute("select 3") # see issue #370
+         has_full=any(o=="ENABLE_COLUMN_METADATA" or o.startswith("ENABLE_COLUMN_METADATA=") for o in apsw.compile_options) if apsw.using_amalgamation else hasattr(c, "description_full")
+         for row in c.execute("select * from foo"):
+             self.assertEqual(cols, c.getdescription())
+@@ -8835,4 +8836,4 @@ if __name__ == '__main__':
+     del re
+     gc.collect()
+ 
+-    exit(exitcode)
+\ No newline at end of file
++    exit(exitcode)
+-- 
+2.37.3
+