From f64801e516c2d2d3e6bd993ad3b9f2d87fd7d80f Mon Sep 17 00:00:00 2001
From: Sergey Popov <admin@pinkbyte.ru>
Date: Mon, 27 Mar 2023 13:03:52 +0300
Subject: [PATCH] net-analyzer/lightsquid: bump EAPI to 8, migrate from
 user.eclass to acct/

---
 acct-user/lightsquid/lightsquid-0.ebuild      | 11 +++++++++++
 net-analyzer/lightsquid/Manifest              |  2 +-
 .../files/lightsquid-1.8-path-fix.patch       |  4 ++--
 net-analyzer/lightsquid/lightsquid-1.8.ebuild | 19 ++++++++-----------
 4 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100644 acct-user/lightsquid/lightsquid-0.ebuild

diff --git a/acct-user/lightsquid/lightsquid-0.ebuild b/acct-user/lightsquid/lightsquid-0.ebuild
new file mode 100644
index 0000000..a6e0538
--- /dev/null
+++ b/acct-user/lightsquid/lightsquid-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=750
+ACCT_USER_GROUPS=( squid )
+
+acct-user_add_deps
diff --git a/net-analyzer/lightsquid/Manifest b/net-analyzer/lightsquid/Manifest
index 5090391..e35699e 100644
--- a/net-analyzer/lightsquid/Manifest
+++ b/net-analyzer/lightsquid/Manifest
@@ -1 +1 @@
-DIST lightsquid-1.8.tgz 60868 SHA256 691ec0167f1d12f9a9038f734921c30b4578b57e5e627ce61e7d4107154be073 SHA512 7f4f9361896db386a3d95323349ab51f7eb3d367a7df275cd47168a826bfdaa39f1ef29b4ffad60fd5c604b59a8b788f4f3d0cb6ce6e363a0d6add1206a3cbae WHIRLPOOL 3e7f97e1afa7ed535fff7970837383d332412c55895355ed3da2ef72b58619d31ae42816f2d4dc2034663904df133d2c522a5b6f806b5e00a621512992b51a9a
+DIST lightsquid-1.8.tgz 60868 BLAKE2B 6d66a1b65aa7da0d8bf49aad63b6c16e69723281dc8652598a214decd90ed36299f75fb988e7b0c5954e5dbbd7877780a7fcc999eb6397a1668473ec500dfee1 SHA512 7f4f9361896db386a3d95323349ab51f7eb3d367a7df275cd47168a826bfdaa39f1ef29b4ffad60fd5c604b59a8b788f4f3d0cb6ce6e363a0d6add1206a3cbae
diff --git a/net-analyzer/lightsquid/files/lightsquid-1.8-path-fix.patch b/net-analyzer/lightsquid/files/lightsquid-1.8-path-fix.patch
index 4af8bb5..2a32962 100644
--- a/net-analyzer/lightsquid/files/lightsquid-1.8-path-fix.patch
+++ b/net-analyzer/lightsquid/files/lightsquid-1.8-path-fix.patch
@@ -1,5 +1,5 @@
---- lightparser.pl.orig	2013-12-25 13:06:21.375580481 +0400
-+++ lightparser.pl	2013-12-25 13:07:04.339580830 +0400
+--- a/lightparser.pl	2013-12-25 13:06:21.375580481 +0400
++++ b/lightparser.pl	2013-12-25 13:07:04.339580830 +0400
 @@ -32,11 +32,11 @@
  
  push (@INC,(fileparse($0))[1]);
diff --git a/net-analyzer/lightsquid/lightsquid-1.8.ebuild b/net-analyzer/lightsquid/lightsquid-1.8.ebuild
index f48b6d1..8f624f8 100644
--- a/net-analyzer/lightsquid/lightsquid-1.8.ebuild
+++ b/net-analyzer/lightsquid/lightsquid-1.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=7
+EAPI=8
 
-inherit eutils systemd user
+inherit tmpfiles
 
 DESCRIPTION="Lite and fast log analyzer for Squid"
 HOMEPAGE="http://lightsquid.sourceforge.net/"
@@ -14,15 +14,12 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="net-proxy/squid
+RDEPEND="acct-user/lightsquid
+	net-proxy/squid
 	dev-perl/GD[truetype]
 	dev-perl/CGI"
 DEPEND=""
 
-pkg_setup() {
-	enewuser lightsquid -1 -1 /var/lib/lightsquid squid
-}
-
 src_prepare() {
 	sed -i \
 		-e '/^$cfgpath/s:/var/www/html/lightsquid:/etc/lightsquid:' \
@@ -38,9 +35,9 @@ src_prepare() {
 		-e 's:common.pl:/usr/share/lightsquid/common.pl:' \
 		*.cgi || die
 
-	epatch "${FILESDIR}/${P}-path-fix.patch"
+	eapply "${FILESDIR}/${P}-path-fix.patch"
 
-	epatch_user
+	eapply_user
 }
 
 src_install() {
@@ -68,5 +65,5 @@ src_install() {
 	keepdir /var/lib/lightsquid
 	fowners lightsquid:squid /var/lib/lightsquid
 
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+	dotmpfiles "${FILESDIR}/${PN}.conf"
 }