From ef98e4de61b145f3b214e037fa4ec669851a895c Mon Sep 17 00:00:00 2001 From: sthen Date: Mon, 5 Dec 2022 12:00:35 +0000 Subject: [PATCH] remove py-sqlite2; it hasn't actually been used since around python 2.3 when it was integrated into python core as the "sqlite3" module; nmap's zenmap subpackage listed a dependency, but didn't really use this (the module is confusingly named; it is for sqlite3 not sqlite2!) --- databases/Makefile | 1 - databases/py-sqlite2/Makefile | 28 --------------------- databases/py-sqlite2/distinfo | 2 -- databases/py-sqlite2/patches/patch-setup_py | 26 ------------------- databases/py-sqlite2/pkg/DESCR | 2 -- databases/py-sqlite2/pkg/PLIST | 28 --------------------- devel/quirks/Makefile | 2 +- devel/quirks/files/Quirks.pm | 3 ++- 8 files changed, 3 insertions(+), 89 deletions(-) delete mode 100644 databases/py-sqlite2/Makefile delete mode 100644 databases/py-sqlite2/distinfo delete mode 100644 databases/py-sqlite2/patches/patch-setup_py delete mode 100644 databases/py-sqlite2/pkg/DESCR delete mode 100644 databases/py-sqlite2/pkg/PLIST diff --git a/databases/Makefile b/databases/Makefile index d3561d790f4..7c4ccd247bc 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -183,7 +183,6 @@ SUBDIR += py-redis,python3 SUBDIR += py-sql,python3 SUBDIR += py-sqlalchemy,python3 - SUBDIR += py-sqlite2 SUBDIR += py-sqlobject,python3 SUBDIR += py-sqlparse,python3 SUBDIR += py-whisper,python3 diff --git a/databases/py-sqlite2/Makefile b/databases/py-sqlite2/Makefile deleted file mode 100644 index 6f46b3f6f53..00000000000 --- a/databases/py-sqlite2/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -COMMENT = SQLite3 adapter for Python - -MODPY_EGG_VERSION = 2.8.3 - -DISTNAME = pysqlite-${MODPY_EGG_VERSION} -PKGNAME = py-sqlite2-${MODPY_EGG_VERSION} -CATEGORIES = databases devel -REVISION = 2 - -HOMEPAGE = https://github.com/ghaering/pysqlite/ - -MODPY_PI = Yes - -# BSD-like -PERMIT_PACKAGE = Yes - -WANTLIB += ${MODPY_WANTLIB} -WANTLIB += pthread sqlite3>=8.6 - -MODULES = lang/python -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2} - -do-test: fake - @cd ${WRKDIR} && \ - ${SETENV} PYTHONPATH=${WRKINST}${MODPY_SITEPKG} \ - ${MODPY_BIN} -c 'from pysqlite2 import test; test.test()' - -.include diff --git a/databases/py-sqlite2/distinfo b/databases/py-sqlite2/distinfo deleted file mode 100644 index 5cd08b47a7b..00000000000 --- a/databases/py-sqlite2/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (pysqlite-2.8.3.tar.gz) = F9MzWGPoz4OS7qca3TPas/ltBgZm/mirc4JGnTB/RJA= -SIZE (pysqlite-2.8.3.tar.gz) = 80567 diff --git a/databases/py-sqlite2/patches/patch-setup_py b/databases/py-sqlite2/patches/patch-setup_py deleted file mode 100644 index e40c37af908..00000000000 --- a/databases/py-sqlite2/patches/patch-setup_py +++ /dev/null @@ -1,26 +0,0 @@ -Index: setup.py ---- setup.py.orig -+++ setup.py -@@ -175,13 +175,6 @@ def get_setup_args(): - sys.stdout.write("Fatal error: PYSQLITE_VERSION could not be detected!\n") - sys.exit(1) - -- data_files = [("pysqlite2-doc", -- glob.glob("doc/*.html") \ -- + glob.glob("doc/*.txt") \ -- + glob.glob("doc/*.css")), -- ("pysqlite2-doc/code", -- glob.glob("doc/code/*.py"))] -- - py_modules = ["sqlite"] - setup_args = dict( - name = "pysqlite", -@@ -198,7 +191,7 @@ def get_setup_args(): - package_dir = {"pysqlite2": "lib"}, - packages = ["pysqlite2", "pysqlite2.test"], - scripts=[], -- data_files = data_files, -+ data_files = [], - - ext_modules = [Extension( name="pysqlite2._sqlite", - sources=sources, diff --git a/databases/py-sqlite2/pkg/DESCR b/databases/py-sqlite2/pkg/DESCR deleted file mode 100644 index 808164b9efb..00000000000 --- a/databases/py-sqlite2/pkg/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -PySQLite2 is a Python extension for SQLite 3.x that conforms to the Python -Database API Specification 2.0. diff --git a/databases/py-sqlite2/pkg/PLIST b/databases/py-sqlite2/pkg/PLIST deleted file mode 100644 index bd14f88ffae..00000000000 --- a/databases/py-sqlite2/pkg/PLIST +++ /dev/null @@ -1,28 +0,0 @@ -lib/python${MODPY_VERSION}/site-packages/pysqlite-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info -lib/python${MODPY_VERSION}/site-packages/pysqlite2/ -lib/python${MODPY_VERSION}/site-packages/pysqlite2/__init__.py -lib/python${MODPY_VERSION}/site-packages/pysqlite2/__init__.pyc -@so lib/python${MODPY_VERSION}/site-packages/pysqlite2/_sqlite.so -lib/python${MODPY_VERSION}/site-packages/pysqlite2/dbapi2.py -lib/python${MODPY_VERSION}/site-packages/pysqlite2/dbapi2.pyc -lib/python${MODPY_VERSION}/site-packages/pysqlite2/dump.py -lib/python${MODPY_VERSION}/site-packages/pysqlite2/dump.pyc -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/ -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/__init__.py -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/dbapi.py -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/dbapi.pyc -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/dump.py -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/dump.pyc -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/factory.py -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/factory.pyc -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/hooks.py -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/hooks.pyc -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/regression.py -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/regression.pyc -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/transactions.py -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/transactions.pyc -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/types.py -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/types.pyc -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/userfunctions.py -lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/userfunctions.pyc diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile index 3f6407dc352..eddfc674948 100644 --- a/devel/quirks/Makefile +++ b/devel/quirks/Makefile @@ -3,7 +3,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-6.83 +PKGNAME = quirks-6.84 PKG_ARCH = * MAINTAINER = Marc Espie diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm index 8459b6a9173..f0685216dde 100644 --- a/devel/quirks/files/Quirks.pm +++ b/devel/quirks/files/Quirks.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: Quirks.pm,v 1.1478 2022/12/05 00:13:40 jca Exp $ +# $OpenBSD: Quirks.pm,v 1.1479 2022/12/05 12:00:36 sthen Exp $ # # Copyright (c) 2009 Marc Espie # @@ -1766,6 +1766,7 @@ setup_obsolete_reason( 3 => 'spambayes', 31 => 'nmap-zenmap', 0 => 'uucpd', + 6 => 'py-sqlite2', ); # though it's not yet used, these should be pkgnames, so that eventually