www-apps/paperless-ngx version bump

2 files changed, 78 insertions, 54 deletions

diff --git a/www-apps/paperless-ngx/Manifest b/www-apps/paperless-ngx/Manifest
index 805c674..717a200 100644
--- a/www-apps/paperless-ngx/Manifest
+++ b/www-apps/paperless-ngx/Manifest
@@ -5,8 +5,8 @@ AUX paperless-webserver.service 496 BLAKE2B 5a818886de0dfa0bb724b9c7e9d64a2707f7
 AUX paperless-webserver.socket 240 BLAKE2B 127735356bdd1ac1a46d85e757299f13a2224596fbc9e41b20b8d70aa2bbd31e8f20f571c636e6421960f2e5250386422c10ef16e7cab373f5625c7a3d053db1 SHA512 860ca3e6f3f2358684be356dbc9d2e770a22363e8324dea4d9547e99c02f9e36708b62b9da32df1d838852ca2ae0092a6795a368e7704d53981de87e4dc24df8
 AUX paperless.target 215 BLAKE2B 95b67ebfc166b888ee5aea32c5565002ae451a10c0d0851df79eeabf3a6e900c7112d447ccbc170bca771bf33e07261aa05f32a25e742ded0b10e6f31ee78870 SHA512 ae3d1dcc8f056f303a0c628c1aabb60e0c93f4006352c5d05a5ee673238c56085ccd2d95ff53555767d9a31a639cd571a26083aab274237cb9f8563ce50c25d6
 AUX paperless.tmpfiles 349 BLAKE2B 4a59f0a0c6a4abad23cba01e216909f45a7064e93911b8ba3e3b394f52379e41898b8c9e1246ba034bc8d2fe6dc83f5cad926e265a17da7c7093d997cfe8b4f3 SHA512 63af6e4359d5fa7bfc3f3669263a36f5d3b5f60c95cf6579d7324bb2116647bb447968b1bab5916e831918344b963d1026116e8cdfb57bce8063ed5ba119c9ea
-DIST paperless-ngx-v1.17.4.tar.xz 16507140 BLAKE2B 34e67810dc9264cfcfec5a62557f5c102aedb82d8f31b27302e01675b84cb39cb22925339263cd8908e828d91b3469895732962e50c2b6bc62d266222b3072c4 SHA512 eb225244d51db0ba0db9fca259825ab542448f5f9904d2bf55ad581f16a9386696457593df2ad5eda6df5eefb296f0ee0c0f27e6fc0eff8956807aedf20e0094
 DIST paperless-ngx-v2.6.3.tar.xz 61884952 BLAKE2B 0c310116678a8b592ac6071f63c210f6798bb9f8ede6e0062bfbecfaf0c9fc5068ba74f0483019b2191c4aad467b704d459f6473d00eee8024285aa5f6e4955a SHA512 853c69ff39f74aac666f229a9ca7afe4dc83082f3bf7b9769021f8f270a8032ae39881b4ef6984c374dca43621ba9cfdb84254ad0510a8e1629c868a5ed5b3eb
-EBUILD paperless-ngx-1.17.4.ebuild 4849 BLAKE2B d8488abffb7a222e4d9cf2088c0aa4ef7b099cfd822033b419d6261abb312a02a866c28155b3443ca2836c71c25173b5ef0c947471b023f3fd74521b3f055e97 SHA512 8aed5b3c47a5cb5a896e404ddd50c86634c07b0afb637c24edd1985ef22903e5f568b27ff128d28db9e4b0d74316f61c1388fa601a4783c49af540ceac064ce5
+DIST paperless-ngx-v2.7.0.tar.xz 64494200 BLAKE2B be21264c0314149df939cad4ebe063cafcfc7c4f89abf12bf84b0d04286a2c2594b9d5828bad6f557b11b5ccc90705e880fd90f4a99699ed1c6227aa42a7411b SHA512 0a4d51cab209f82837fecf48a73bcb793ffd77ad5d325a1a18ba48040c149d743bbd2022534f776708b0e6ee4cca3942916ebaea603aaed60a46004c3214c2dd
 EBUILD paperless-ngx-2.6.3.ebuild 6362 BLAKE2B bc64f546099bcc255a2f2341b3abbfbede2a9af2884f1882934b0fc904174e6c2b746f34833493bedd14ebc9bcc3a7110ce70e3498fcb9d54613628f8516a529 SHA512 1ee5b7db0c978a8983f2fc8ebb0d9f313e3faa3a8bc8f231278c47f0facac60701ab424b94feb92a806105d563697a92cd8d06f08dd7f205bc07fd64b139b63f
+EBUILD paperless-ngx-2.7.0.ebuild 6363 BLAKE2B 97f0de7eb6acb5627b251719d6bcde4b28cdf832346c5e1b8da0a94e0c089a234d057f12e72f0a2f2cb29a95a55048711b24341a2052432123bdf7d4d74ef4a7 SHA512 cf190b12258f7dbee03ce0e6d2342a341d7d5a8bfbc1f7f8d8ce91dc6f16445d9eeb6202d52b4d11d8a7711edd9471a5d113a6f172b88f462d63a0e27c14c266
 MISC metadata.xml 851 BLAKE2B dfb395b418d92c0c7318c4862dfbce74a312222b3a2848334806c2f8063bb63947a4c0315c289f1db83987d5e7649483efb484944afd6963b3f74c1a488877f5 SHA512 e7622cfe74bee71e3698241cb234221d9d40c9a41eca4f8b3e5e3c7338940652f5c5652cd72a675339cc6620d777e858fe5310f29cf7f87f5585eb8742b58405
diff --git a/www-apps/paperless-ngx/paperless-ngx-1.17.4.ebuild b/www-apps/paperless-ngx/paperless-ngx-2.7.0.ebuild
index f695adb..7b9fd3b 100644
--- a/www-apps/paperless-ngx/paperless-ngx-1.17.4.ebuild
+++ b/www-apps/paperless-ngx/paperless-ngx-2.7.0.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit systemd
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit python-single-r1 systemd
 
 DESCRIPTION="Community supported paperless: scan, index and archive your physical documents"
 HOMEPAGE="https://github.com/paperless-ngx/paperless-ngx"
@@ -12,8 +15,11 @@ S="${WORKDIR}/${PN}"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="compression mysql +ocr postgres remote-redis +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
+IUSE="audit compression mysql +ocr postgres remote-redis +sqlite zxing"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( mysql postgres sqlite )
+"
 
 ACCT_DEPEND="
 	acct-group/paperless
@@ -21,68 +27,77 @@ ACCT_DEPEND="
 "
 EXTRA_DEPEND="
 	app-text/unpaper
-	dev-python/hiredis
-	dev-python/websockets
+	$(python_gen_cond_dep '
+		dev-python/hiredis[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]')
 "
 
 DEPEND="
 	${ACCT_DEPEND}
 	${EXTRA_DEPEND}
+	${PYTHON_DEPS}
 	app-text/poppler[utils]
-	dev-python/asgiref
-	dev-python/bleach
-	dev-python/celery
-	>=dev-python/channels-4.0
-	>=dev-python/channels-redis-4.0
-	dev-python/concurrent-log-handler
-	>=dev-python/dateparser-1.1
-	>=dev-python/django-4.1.9
-	<dev-python/django-5.0
-	dev-python/django-celery-results
-	dev-python/django-cors-headers
-	dev-python/django-extensions
-	>=dev-python/django-filter-23.1
-	dev-python/django-guardian
-	dev-python/django-redis
-	>=dev-python/djangorestframework-3.14
-	dev-python/djangorestframework-guardian
-	dev-python/filelock
-	dev-python/imap-tools
-	>=dev-python/inotifyrecursive-0.3
-	dev-python/langdetect
-	dev-python/nltk
-	dev-python/pathvalidate
-	dev-python/pdf2image
-	dev-python/pikepdf
-	dev-python/pillow
-	dev-python/python-dateutil
-	dev-python/python-dotenv
-	dev-python/python-gnupg
-	<dev-python/python-ipware-2.0.0
-	dev-python/python-magic
-	dev-python/pyzbar
-	dev-python/rapidfuzz
-	dev-python/redis
-	dev-python/reportlab
-	>=dev-python/scikit-learn-1.3
-	dev-python/tqdm
-	<dev-python/uvicorn-0.26.0
-	>=dev-python/watchdog-3.0
-	>=dev-python/whitenoise-6.5
-	>=dev-python/whoosh-2.7
-	media-gfx/imagemagick
+	$(python_gen_cond_dep '
+		dev-python/asgiref[${PYTHON_USEDEP}]
+		dev-python/bleach[${PYTHON_USEDEP}]
+		dev-python/celery[${PYTHON_USEDEP}]
+		>=dev-python/channels-4.0[${PYTHON_USEDEP}]
+		>=dev-python/channels-redis-4.0[${PYTHON_USEDEP}]
+		dev-python/concurrent-log-handler[${PYTHON_USEDEP}]
+		>=dev-python/dateparser-1.2[${PYTHON_USEDEP}]
+		>=dev-python/django-4.2.11[${PYTHON_USEDEP}]
+		<dev-python/django-5.0[${PYTHON_USEDEP}]
+		dev-python/django-allauth[${PYTHON_USEDEP}]
+		dev-python/django-celery-results[${PYTHON_USEDEP}]
+		dev-python/django-cors-headers[${PYTHON_USEDEP}]
+		dev-python/django-extensions[${PYTHON_USEDEP}]
+		>=dev-python/django-filter-24.1[${PYTHON_USEDEP}]
+		dev-python/django-guardian[${PYTHON_USEDEP}]
+		dev-python/django-multiselectfield[${PYTHON_USEDEP}]
+		dev-python/django-redis[${PYTHON_USEDEP}]
+		=dev-python/djangorestframework-3.14.0[${PYTHON_USEDEP}]
+		dev-python/djangorestframework-guardian[${PYTHON_USEDEP}]
+		dev-python/drf-writable-nested[${PYTHON_USEDEP}]
+		dev-python/filelock[${PYTHON_USEDEP}]
+		dev-python/imap-tools[${PYTHON_USEDEP}]
+		>=dev-python/inotifyrecursive-0.3[${PYTHON_USEDEP}]
+		dev-python/langdetect[${PYTHON_USEDEP}]
+		dev-python/nltk[${PYTHON_USEDEP}]
+		dev-python/pathvalidate[${PYTHON_USEDEP}]
+		dev-python/pdf2image[${PYTHON_USEDEP}]
+		dev-python/pikepdf[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/python-dotenv[${PYTHON_USEDEP}]
+		dev-python/python-gnupg[${PYTHON_USEDEP}]
+		>=dev-python/python-ipware-2.0.0[${PYTHON_USEDEP}]
+		dev-python/python-magic[${PYTHON_USEDEP}]
+		dev-python/pyzbar[${PYTHON_USEDEP}]
+		dev-python/rapidfuzz[${PYTHON_USEDEP}]
+		dev-python/redis[${PYTHON_USEDEP}]
+		>=dev-python/scikit-learn-1.4
+		dev-python/tqdm[${PYTHON_USEDEP}]
+		<dev-python/uvicorn-0.26.0[${PYTHON_USEDEP}]
+		>=dev-python/watchdog-4.0[${PYTHON_USEDEP}]
+		>=dev-python/whitenoise-6.6[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.7[${PYTHON_USEDEP}]')
+	media-gfx/imagemagick[xml]
 	media-gfx/optipng
 	media-libs/jbig2enc
 	www-servers/gunicorn
-	compression? ( dev-python/django-compression-middleware )
+	audit? ( $(python_gen_cond_dep '
+		dev-python/django-auditlog[${PYTHON_USEDEP}]') )
+	compression? ( $(python_gen_cond_dep '
+		dev-python/django-compression-middleware[${PYTHON_USEDEP}]') )
 	mysql? ( dev-python/mysqlclient )
-	ocr? ( >=app-text/OCRmyPDF-14.0 )
+	ocr? ( >=app-text/OCRmyPDF-15.4 )
 	postgres? ( dev-python/psycopg:2 )
 	!remote-redis? ( dev-db/redis )
+	zxing? ( media-libs/zxing-cpp[python,${PYTHON_SINGLE_USEDEP}] )
 "
 RDEPEND="${DEPEND}"
 # dev-python/tika
-# dev-python/zxing-cpp
+# dev-python/gotenberg-client
 
 DOCS=( docker/imagemagick-policy.xml )
 
@@ -97,7 +112,15 @@ src_prepare() {
 		-e "s|#PAPERLESS_CONVERT_TMPDIR=/var/tmp/paperless|PAPERLESS_CONVERT_TMPDIR=/var/lib/paperless/tmp|" \
 		-i "paperless.conf" || die "Cannot update paperless.conf"
 
-	echo -e "\n# Custom\nPAPERLESS_ENABLE_COMPRESSION=$(use compression && echo 1 || echo 0)" >> "paperless.conf"
+	cat >> "paperless.conf" <<- EOF
+
+	# Custom
+	PAPERLESS_BIND_ADDR=unix
+	PAPERLESS_PORT=/run/paperless.sock
+
+	PAPERLESS_ENABLE_COMPRESSION=$(use compression && echo true || echo false)
+	PAPERLESS_AUDIT_LOG_ENABLED=$(use audit && echo true || echo false)
+	EOF
 }
 
 src_install() {
@@ -105,6 +128,7 @@ src_install() {
 
 	# Install service files
 	systemd_newunit "${FILESDIR}"/paperless-webserver.service paperless-webserver.service
+	systemd_newunit "${FILESDIR}"/paperless-webserver.socket paperless-webserver.socket
 	systemd_newunit "${FILESDIR}"/paperless-scheduler.service paperless-scheduler.service
 	systemd_newunit "${FILESDIR}"/paperless-consumer.service paperless-consumer.service
 	systemd_newunit "${FILESDIR}"/paperless-task-queue.service paperless-task-queue.service