www-apps/paperless-ngx version bump and cleanup

3 files changed, 16 insertions, 172 deletions

diff --git a/www-apps/paperless-ngx/Manifest b/www-apps/paperless-ngx/Manifest
index 70b2f4c..2a5ee09 100644
--- a/www-apps/paperless-ngx/Manifest
+++ b/www-apps/paperless-ngx/Manifest
@@ -5,10 +5,8 @@ AUX paperless-webserver.service 406 BLAKE2B e1f00059be8e814f9ab67e18ef790665f3eb
 AUX paperless.conf.example 2577 BLAKE2B 4f786c02663300c3e8eb12a7702316621d917be4620ab2e89b33d246486bb78cdf2d6bd0ebaa830d8bedd815fe778c0edf9c8869b8e8b2b63d468ec527b7ce5e SHA512 8dd13bf9d63ca838285978e9dc1635dc45d21ae0cbb3f1ce402097f566cc1f74bce6635f1324714aacf85c6a20bc61bab76deb04081813ac207fffd421f8ee8f
 AUX paperless.target 215 BLAKE2B 95b67ebfc166b888ee5aea32c5565002ae451a10c0d0851df79eeabf3a6e900c7112d447ccbc170bca771bf33e07261aa05f32a25e742ded0b10e6f31ee78870 SHA512 ae3d1dcc8f056f303a0c628c1aabb60e0c93f4006352c5d05a5ee673238c56085ccd2d95ff53555767d9a31a639cd571a26083aab274237cb9f8563ce50c25d6
 AUX paperless.tmpfiles 349 BLAKE2B 4a59f0a0c6a4abad23cba01e216909f45a7064e93911b8ba3e3b394f52379e41898b8c9e1246ba034bc8d2fe6dc83f5cad926e265a17da7c7093d997cfe8b4f3 SHA512 63af6e4359d5fa7bfc3f3669263a36f5d3b5f60c95cf6579d7324bb2116647bb447968b1bab5916e831918344b963d1026116e8cdfb57bce8063ed5ba119c9ea
-DIST paperless-ngx-v1.12.2.tar.xz 16064564 BLAKE2B 2fbad657037336a4f05b577f73ac8f9a1e9bfe5eed3773d17c3ef6a74fca4c5bae9aca20be9dc02b3e0b425b1182f7c1e50a5df61bb70bfa960364b7c3c9e47f SHA512 75cdfb6aa2ddffac1d4e1860e31d8cc8a9344ecdd17b686da27bc9af1270dcdde34bcea3d45839043fd12048a9f39ce046fc7e3a2b44d18cc8d5af5d1addc0bf
-DIST paperless-ngx-v1.13.0.tar.xz 16206396 BLAKE2B 6ba1dee5834d6571055dd2227ea3b29fea7b5c1194037c62842f048dc1fc3f5fc201ec5180fb7f46001c07b745300a4b0cf622fabeb88e8c9676047579307a8a SHA512 e26b9006a8e4c3b192dbeb138582d2f16810905e1ef37e4e9f6526ad311d136aebe6577dbe675298ce3d5493e025087697f686556d5936d0ed5ba700402d3632
 DIST paperless-ngx-v1.14.5.tar.xz 16823852 BLAKE2B cf5540eb2487a3c3dfd6c86370027ac34c83487dc8b596ed7849e06cd90812362fb495f5bbc46636ea0443df56500edce09fd2d8e00cea90f51bbd8d6d7a174e SHA512 04a3b6b49c213b6e4e8285c21c6d29958b4b1692d6ec4054723c09b64a7bb3a8871db0eb27e819084c35e2ba1f35b6c1c709fb7fd514a591a486e868e56360a0
-EBUILD paperless-ngx-1.12.2.ebuild 4559 BLAKE2B 8e17fa9f5895c17f8908d015caa3acc1f11c1d1761256c331615b8cf8814f7434214120263f4ddb2d996206e201cf55a04ee926db62a37d1f4d914d516a0755f SHA512 3777865762bdfd75435d0c312f1bd5266fa40d1f1d853e3d398842684afe4437927b422d2b5611eef2a80756eb12dcb56600efef345e3fb4b76398a2bc4d8b19
-EBUILD paperless-ngx-1.13.0.ebuild 4848 BLAKE2B 2764a3dacc9ec26e6ced22099940be5ed89e07bf1e7a1bac4ed0f3316c10c5a2af98d39eff633c4cbe9c6c07be5df02097e4adab6b31a48ce0c3da7e27be21d6 SHA512 ea98e841a4b1a0c69b09fc6611e3dd62691234a1d39a257d4a15ec2c71ef3e9a3c03c0c1404919d216fe502653468b4b0f01f826e40989c236f9d842857663f0
+DIST paperless-ngx-v1.15.1.tar.xz 17180892 BLAKE2B ec5463d8584c37257c7537d5fc4fd097378a35e40625479b89bb706b6800f1b9d7e0c66112cf57b0c4b7c26a616e43cff22d70f1ebb5e53eb3abe52a41834042 SHA512 aefa72e0ea5d96209c5089bec452bd7158b478954ebdb219db0379259f4b12540c02a7ae20cb998b49910c579de34be3c9b7351378b87a6f42d07f2884892200
 EBUILD paperless-ngx-1.14.5.ebuild 4816 BLAKE2B 227fd3f6b1bf93bd263265b4be96c5aeb20b06d4085e0a8289203e593511072cbfe1ce869ab6681209ed5c10cce9bb72e32d9731eefbe4f5a06a025eecc62c7b SHA512 f4712133a6715238174048cf25ca39a37bd90ba4e1c40dd056ef6746c3e64bf380023a935658e0588897d5c8280e05548048df52346ba78c2225d313189eedd6
+EBUILD paperless-ngx-1.15.1.ebuild 4816 BLAKE2B 227fd3f6b1bf93bd263265b4be96c5aeb20b06d4085e0a8289203e593511072cbfe1ce869ab6681209ed5c10cce9bb72e32d9731eefbe4f5a06a025eecc62c7b SHA512 f4712133a6715238174048cf25ca39a37bd90ba4e1c40dd056ef6746c3e64bf380023a935658e0588897d5c8280e05548048df52346ba78c2225d313189eedd6
 MISC metadata.xml 659 BLAKE2B bc331f596aa68542a4e27ba044fdc7186eb524b0de650e4d719faff4c20a3ddf1903c7d780b05a58f61d120672d8d7882ac927338fcd048310e5cf78ee55966c SHA512 95fdd2bcd0ab9e144a8284c4047a2e8509fc68786d9304cd968956d4d74379f2f79496c08ca231fa6e6d527a1ecc565b30c3d12506942c7514876c3a397b7217
diff --git a/www-apps/paperless-ngx/paperless-ngx-1.12.2.ebuild b/www-apps/paperless-ngx/paperless-ngx-1.12.2.ebuild
deleted file mode 100644
index f0f3bcc..0000000
--- a/www-apps/paperless-ngx/paperless-ngx-1.12.2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit systemd
-
-DESCRIPTION="Community supported paperless: scan, index and archive your physical documents"
-HOMEPAGE="https://github.com/paperless-ngx/paperless-ngx"
-SRC_URI="https://github.com/paperless-ngx/paperless-ngx/releases/download/v${PV}/paperless-ngx-v${PV}.tar.xz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="mysql +ocr postgres remote-redis +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-ACCT_DEPEND="
-	acct-group/paperless
-	acct-user/paperless
-"
-EXTRA_DEPEND="
-	app-text/unpaper
-	dev-python/hiredis
-	dev-python/websockets
-"
-
-DEPEND="
-	${ACCT_DEPEND}
-	${EXTRA_DEPEND}
-	app-text/poppler[utils]
-	app-text/pdfminer
-	dev-python/asgiref
-	dev-python/bleach
-	dev-python/celery
-	>=dev-python/channels-3.0
-	<dev-python/channels-4.0
-	>=dev-python/channels-redis-3.4.1
-	<dev-python/channels-redis-4.0
-	dev-python/concurrent-log-handler
-	>=dev-python/dateparser-1.1
-	>=dev-python/django-4.1
-	dev-python/django-celery-results
-	dev-python/django-cors-headers
-	dev-python/django-extensions
-	>=dev-python/django-filter-22.1
-	dev-python/django-redis
-	>=dev-python/djangorestframework-3.14
-	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-9.3
-	dev-python/python-dateutil
-	dev-python/python-dotenv
-	dev-python/python-gnupg
-	dev-python/python-magic
-	dev-python/pyzbar
-	dev-python/rapidfuzz
-	dev-python/redis
-	dev-python/tqdm
-	dev-python/uvicorn
-	>=dev-python/watchdog-2.1
-	>=dev-python/whitenoise-6.2
-	>=dev-python/whoosh-2.7
-	media-gfx/imagemagick
-	media-gfx/optipng
-	media-libs/jbig2enc
-	>=sci-libs/scikit-learn-1.1
-	www-servers/gunicorn
-	mysql? ( dev-python/mysqlclient )
-	ocr? ( >=app-text/OCRmyPDF-14.0 )
-	postgres? ( dev-python/psycopg:2 )
-	!remote-redis? ( dev-db/redis )
-"
-RDEPEND="${DEPEND}"
-# dev-python/tika
-
-DOCS=( docker/imagemagick-policy.xml )
-
-src_prepare() {
-	default
-
-	sed \
-		-e "s|#PAPERLESS_CONSUMPTION_DIR=../consume|PAPERLESS_CONSUMPTION_DIR=/var/lib/paperless/consume|" \
-		-e "s|#PAPERLESS_DATA_DIR=../data|PAPERLESS_DATA_DIR=/var/lib/paperless/data|" \
-		-e "s|#PAPERLESS_MEDIA_ROOT=../media|PAPERLESS_MEDIA_ROOT=/var/lib/paperless/media|" \
-		-e "s|#PAPERLESS_STATICDIR=../static|PAPERLESS_STATICDIR=/usr/share/paperless/static|" \
-		-e "s|#PAPERLESS_CONVERT_TMPDIR=/var/tmp/paperless|PAPERLESS_CONVERT_TMPDIR=/var/lib/paperless/tmp|" \
-	-i "paperless.conf" || die "Cannot update paperless.conf"
-}
-
-src_install() {
-	einstalldocs
-
-	# Install service files
-	systemd_newunit "${FILESDIR}"/paperless-webserver.service paperless-webserver.service
-	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
-	systemd_newunit "${FILESDIR}"/paperless.target paperless.target
-	if use remote-redis; then
-		sed -e '/redis\.service/d' -i *.service "${D}$(systemd_get_systemunitdir)"/*.service
-	fi
-
-	# Install paperless files
-	insinto /usr/share/paperless
-	doins -r docs src static gunicorn.conf.py requirements.txt
-
-	insinto /etc
-	doins paperless.conf
-	fowners root:paperless /etc/paperless.conf
-	fperms 640 /etc/paperless.conf
-
-	insinto /usr/lib/tmpfiles.d
-	doins "${FILESDIR}"/paperless.tmpfiles
-	fperms 644 /usr/lib/tmpfiles.d/paperless.tmpfiles
-
-	# Set directories
-	for dir in data media tmp; do
-		keepdir /var/lib/paperless/${dir}
-		fowners paperless:paperless /var/lib/paperless/${dir}
-		case "${dir}" in
-		data) fperms 700 /var/lib/paperless/${dir} ;;
-		*)    fperms 750 /var/lib/paperless/${dir} ;;
-		esac
-	done
-
-	# Main executable
-	fperms 755 "/usr/share/paperless/src/manage.py"
-	dosym -r "/usr/share/paperless/src/manage.py" "/usr/bin/paperless-manage"
-}
-
-pkg_postinst() {
-	elog "To complete the installation of paperless, edit /etc/paperless.conf file and"
-	elog "* Create the database with"
-	elog ""
-	elog "sudo -u paperless paperless-manage migrate"
-	elog ""
-	elog "* Create a super user account with"
-	elog ""
-	elog "sudo -u paperless paperless-manage createsuperuser"
-	elog ""
-	elog "After each update of paperless, you should run migration with"
-	elog ""
-	elog "sudo -u paperless paperless-manage migrate"
-	elog ""
-	elog "Paperless services can be started together with"
-	elog ""
-	elog "sudo systemctl start paperless.target"
-}
diff --git a/www-apps/paperless-ngx/paperless-ngx-1.13.0.ebuild b/www-apps/paperless-ngx/paperless-ngx-1.15.1.ebuild
index 298bf38..eb7d11b 100644
--- a/www-apps/paperless-ngx/paperless-ngx-1.13.0.ebuild
+++ b/www-apps/paperless-ngx/paperless-ngx-1.15.1.ebuild
@@ -29,23 +29,22 @@ DEPEND="
 	${ACCT_DEPEND}
 	${EXTRA_DEPEND}
 	app-text/poppler[utils]
-	app-text/pdfminer
 	dev-python/asgiref
 	dev-python/bleach
 	dev-python/celery
-	>=dev-python/channels-3.0
-	<dev-python/channels-4.0
-	>=dev-python/channels-redis-3.4.1
-	<dev-python/channels-redis-4.0
+	>=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
+	>=dev-python/django-4.1.9
 	dev-python/django-celery-results
 	dev-python/django-cors-headers
 	dev-python/django-extensions
 	>=dev-python/django-filter-22.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
@@ -54,23 +53,25 @@ DEPEND="
 	dev-python/pathvalidate
 	dev-python/pdf2image
 	dev-python/pikepdf
-	>=dev-python/pillow-9.3
+	dev-python/pillow
 	dev-python/python-dateutil
 	dev-python/python-dotenv
 	dev-python/python-gnupg
+	dev-python/python-ipware
 	dev-python/python-magic
 	dev-python/pyzbar
 	dev-python/rapidfuzz
 	dev-python/redis
+	=dev-python/reportlab-3.6.12
 	dev-python/tqdm
 	dev-python/uvicorn
-	>=dev-python/watchdog-2.1
-	>=dev-python/whitenoise-6.2
+	>=dev-python/watchdog-2.2
+	>=dev-python/whitenoise-6.3
 	>=dev-python/whoosh-2.7
 	media-gfx/imagemagick
 	media-gfx/optipng
 	media-libs/jbig2enc
-	>=sci-libs/scikit-learn-1.1
+	>=sci-libs/scikit-learn-1.2
 	www-servers/gunicorn
 	compression? ( dev-python/django-compression-middleware )
 	mysql? ( dev-python/mysqlclient )
@@ -80,6 +81,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 # dev-python/tika
+# dev-python/zxing-cpp
 
 DOCS=( docker/imagemagick-policy.xml )
 
@@ -92,8 +94,7 @@ src_prepare() {
 		-e "s|#PAPERLESS_MEDIA_ROOT=../media|PAPERLESS_MEDIA_ROOT=/var/lib/paperless/media|" \
 		-e "s|#PAPERLESS_STATICDIR=../static|PAPERLESS_STATICDIR=/usr/share/paperless/static|" \
 		-e "s|#PAPERLESS_CONVERT_TMPDIR=/var/tmp/paperless|PAPERLESS_CONVERT_TMPDIR=/var/lib/paperless/tmp|" \
-		"${FILESDIR}/paperless.conf.example" > "paperless.conf" || die "Cannot update paperless.conf"
-		#-i "paperless.conf.example" || die "Cannot update paperless.conf"
+		-i "paperless.conf" || die "Cannot update paperless.conf"
 
 	echo -e "\n# Custom\nPAPERLESS_ENABLE_COMPRESSION=$(use compression && echo 1 || echo 0)" >> "paperless.conf"
 }
@@ -125,7 +126,7 @@ src_install() {
 	fperms 644 /usr/lib/tmpfiles.d/paperless.tmpfiles
 
 	# Set directories
-	for dir in data media tmp; do
+	for dir in consume data media tmp; do
 		keepdir /var/lib/paperless/${dir}
 		fowners paperless:paperless /var/lib/paperless/${dir}
 		case "${dir}" in