5 files changed, 9 insertions, 84 deletions
diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index 102eadedb703..5a6159fdac85 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1,12 +1,10 @@
 AUX goaccess.confd 306 BLAKE2B 27f5a4a26fdcc4aff21bd2bb2a462e4875462c5b9a6f452b1d1acf0e1673eb95e429c8ff3ba258343905252e7428008c71fd8fbfc5f6abb7e4847471db4cf32d SHA512 fd77d490b3f08c38c01c34dfd050624bc3770ab0bf3d32b4cb226c152889ea8693b78af41a9ced4437d8961f621291ac7a0317a9f246f06b28ae79f25d4d5e4e
-AUX goaccess.initd 372 BLAKE2B 8a232845fc9ba7f6e5e0481cad50fa04e58dd4113ceaad1612dff16ffe1e76db4e9f438e7a72debd531943e8fe54f311fb54e16513d31443a6f7446b546c476a SHA512 685843cbb7749cebdec22871f5a5db263040491c25c9c41986e31935d7e0c15887d0d456195228d5b89abc060af46ab0f52c27eecfe6db0e374fa32bfbd78b8f
+AUX goaccess.initd 414 BLAKE2B 976843bc5fb3d2c75958dccab7f7d06ff49b97445fb7b02490d06f58164b50dde2d893e8b554017c86f23461023360a3127dd9f0f348aa0be945dd022cb33112 SHA512 d8c04e2fad46dfec673a4bf44560720cfbd31e7c7ab5c1658f4e3571e5fc17c01237a92b14c3bca59ced8aaad7a9af8dd52ca74782eac97fef4ce487e9e23a88
 AUX goaccess.service 381 BLAKE2B ab4a4e2a35846f8bf7ed80539a7be38f2507ee25ecac63900a88dd625a0fd3a44dfcd6e7f60fb45186cc40063cd9cae95dd8a5ff366356209a2039cee2b2cd34 SHA512 3d5482bdf13c31116f53f0ba9af4aa282aba01f7e2b8916eb88067500be616ed6b3d107fdf2e079a0c78f75c8a894dd25e8866edcb02ff6e5bd268b802b46e7b
 AUX goaccess.tmpfile 40 BLAKE2B dd3595d9f1cca0c652a62fd19032d138aeeeb21523db4d05d2adff28ea8b65c16cca32c2e73b285ba15911470248868c200ce62307597e7e452ae8a9bc6e645a SHA512 47f95152cf575d74336340af898551a10c6ff9dcf197ca06ac799be77cc7fb69957c3277976f30cf0f10eee6c278abb1a823b9867f14aba9b6cb36d6a9b43700
-DIST goaccess-1.6.3.tar.gz 658827 BLAKE2B 48378235a75c11e7392bcaca98c64689032e74377696cf6fd3e0e230dd35a2e0f78e5f4283da2c4693ec072942ae6be4d3dc27f91f23d8390f81a330d9955c93 SHA512 7890fc35700db9ce1d3c720607cce6008a3140a14d143fcdd02f11a79f5344a26c648c9b7e6316a21d3ff07f588815bcdfb33072b5e0a18c429e9bfdb8bf99f4
-DIST goaccess-1.7.2.tar.gz 679321 BLAKE2B a423553fcbac76eb1358bffda9ec413da48241f9702d01872cede4999fa2baef60758f48ad621986789ddf2f514ca77ac72a4d367469ec493d792dea01c3f957 SHA512 0e057c9d49d5a9189af0b8f12e867d4402326ca0d2f562771b4d2c73fcfc2e5d79a826465ee56e03e036fbcddb7c6171005cd06ba28a2c25fc1683fe37bd59a7
 DIST goaccess-1.8.1.tar.gz 740177 BLAKE2B cc1f17c72adeeaf50d3b6c7bef47a044a3bbf06fb44d73da9b1ae68ea71d8e276dbe02c6a89cf0a72f3327e817e8d59235f788d29aeb7c7c889bacf81b64292a SHA512 96f0b73f13cfb77ad57748bce7d8791f8486bfd5ce47420d1c0016826a4deb9ab2d2742f4afd5d8b0eed003f9b596aae51f232fa71bf47f823b6ff8119f91354
-EBUILD goaccess-1.6.3.ebuild 1708 BLAKE2B a99b4f5c179b78506836cef7a601f17aceb839d9fcfd97c07acc687a01c44d1cc2ac176b5cd78b33b8245b493bcf91505b4f3e0e359b2324e9e8a848bca46803 SHA512 da9f649abd865f3b9db71cc2f29cd0292e731ffd60646258eddad03d8479495e7880c078cffbe134df819be9dc7c71265f21ea23334ddee30b727fd3aef47f90
-EBUILD goaccess-1.7.2.ebuild 1720 BLAKE2B f26124290f2d3fa96cfc2d728437c1e806cb5a201c0ae5c894d8e88d7c15f850322f3855878daa08687ef18fcf87004b07ede550536dac1f7f43c575c9aa9c7b SHA512 062088ffffb615ddb7799015bd0ba9af1469758181f701b1f44609f94a1aa94486f745c6003a4c1d5ec2c5490ba96a35c2d0b089066f32ba7b1a0c2e6deca8a0
+DIST goaccess-1.9.3.tar.gz 821878 BLAKE2B 99a3a0f9b73a24bb871df2eb16be44dfefbe8fdcd9f10aec66beca98bae65a8b98085c58168c35407f53cf599cf33bc930247f7f7241742ca7750ef68236992e SHA512 6f838d006bec65819d42115b9ce6edb3d839c1bbb609353163960361684ae67c5ecb859e5c9e19eb3233aac4e97c18bdd4d19e1919b05695b3dfef3ca5e7a192
 EBUILD goaccess-1.8.1.ebuild 1720 BLAKE2B f26124290f2d3fa96cfc2d728437c1e806cb5a201c0ae5c894d8e88d7c15f850322f3855878daa08687ef18fcf87004b07ede550536dac1f7f43c575c9aa9c7b SHA512 062088ffffb615ddb7799015bd0ba9af1469758181f701b1f44609f94a1aa94486f745c6003a4c1d5ec2c5490ba96a35c2d0b089066f32ba7b1a0c2e6deca8a0
-EBUILD goaccess-9999.ebuild 1736 BLAKE2B b2ee7fdeba32f061bac8d49d833c91800babdb0f608ed9e459e6d9f4d3eb9a2355a08fca59a5f7056303c4287c06a49e2490936ffa57933ffb3e9ab8dba8e95d SHA512 a559c2a02c18122318f85573c7e41125ea8b59dc9240cee42a033ac8e0df7b36eefb53f5f79c387232ef4aadeb9ae4612071362ed5d69e00c3e43817c306c51b
+EBUILD goaccess-1.9.3.ebuild 1696 BLAKE2B 77aece7c7e30fe297057a93fa497ff934801e686524a5e36365c97fa38bae5f67bee8d63f479b1d47b4a5486606fb38ca5c6c4bd320fd6e55bd73be8948c1884 SHA512 3af141fa5831f37ade9362b1a7bca0195d8aacf2d2af9902b87b5b2b3e4a9e5d3d0584b8745a70ff94b85c77b75e4b6f355738cfb3df9c6d74ba630b56f6f129
+EBUILD goaccess-9999.ebuild 1713 BLAKE2B 9115fd6dcf2cb4d16e4813c26dc888d74ef67c77d9270c67eeb40da329ef7b2a36d96e18800c88658c291e125c3e3394bc6583000d3e822a2a822fbca10fe326 SHA512 0269660e6dd72efbfbad8bf71697c2adf9bc2fdb6802ed32046bc966aba0f541a97a4adb57c1f0e8f024c22d025b27de1fc0eae4ac4f99777a1a66b459c56336
 MISC metadata.xml 968 BLAKE2B 9b84cc00a75dd00ea5563ef605475fdb6c4fae9ee303fe06d8a8f74a2c3db58794b468866fa0dc06080bcb1a20298969378c6ccfa16da5f9f0cf1582ca8272b8 SHA512 a2f894feb012129a86a85fe3a5c386b6f0fdbc6acc0fd76d53b5b0df90ce528f9ac438d4081ca54f0c05fa79796015d4e0b3429e5a68639b764d0a3f17dd1f05
diff --git a/net-analyzer/goaccess/files/goaccess.initd b/net-analyzer/goaccess/files/goaccess.initd
index be0059588396..bd782952cfb4 100644
--- a/net-analyzer/goaccess/files/goaccess.initd
+++ b/net-analyzer/goaccess/files/goaccess.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/bin/goaccess"
@@ -7,6 +7,7 @@ name="GoAccess"
 description="Real-time web log analyzer"
 config="${CONFIG:-/etc/goaccess/goaccess.conf}"
 command_args="--real-time-html --daemonize -p $config ${OPTS}"
+pidfile="/run/goaccess/${RC_SVCNAME}.pid"
 start_stop_daemon_args="-q"
 
 depend() {
diff --git a/net-analyzer/goaccess/goaccess-1.6.3.ebuild b/net-analyzer/goaccess/goaccess-1.6.3.ebuild
deleted file mode 100644
index 52788637826a..000000000000
--- a/net-analyzer/goaccess/goaccess-1.6.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools optfeature systemd tmpfiles
-
-DESCRIPTION="A real-time web log analyzer and interactive viewer in a terminal"
-HOMEPAGE="https://goaccess.io"
-SRC_URI="https://tar.goaccess.io/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug geoip geoipv2 getline ssl unicode"
-REQUIRED_USE="geoipv2? ( geoip )"
-
-RDEPEND="acct-group/goaccess
-	acct-user/goaccess
-	sys-libs/ncurses:=[unicode(+)?]
-	geoip? (
-		!geoipv2? ( dev-libs/geoip )
-		geoipv2? ( dev-libs/libmaxminddb:0= )
-	)
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Enable log-format, define log file and db path,
-	# change path to GeoIP bases in config
-	sed -i  -e '/log-format COMBINED/s/#//' \
-		-e '/log-file/s/#//' \
-		-e '/db-path/s|tmp|var/lib/goaccess|' \
-		-e '/geoip-database/s|local/||' config/goaccess.conf \
-		|| die "sed failed for goaccess.conf"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=()
-	readarray -t myeconfargs < <(
-		use_enable debug
-		use_enable geoip geoip "$(usex geoipv2 mmdb legacy)"
-		use_enable unicode utf8
-		use_with getline
-		use_with ssl openssl
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/goaccess.initd goaccess
-	newconfd "${FILESDIR}"/goaccess.confd goaccess
-	systemd_dounit "${FILESDIR}"/goaccess.service
-	newtmpfiles "${FILESDIR}"/goaccess.tmpfile goaccess.conf
-
-	diropts -o goaccess -g goaccess -m 0700
-	keepdir /var/lib/goaccess/db /var/log/goaccess
-}
-
-pkg_postinst() {
-	optfeature "update GeoIP databases" net-misc/geoipupdate
-	tmpfiles_process goaccess.conf
-}
diff --git a/net-analyzer/goaccess/goaccess-1.7.2.ebuild b/net-analyzer/goaccess/goaccess-1.9.3.ebuild
index 483e675fa316..cd8029868ed2 100644
--- a/net-analyzer/goaccess/goaccess-1.7.2.ebuild
+++ b/net-analyzer/goaccess/goaccess-1.9.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # shellcheck disable=SC2207
 
 EAPI=8
 
-inherit autotools optfeature systemd tmpfiles
+inherit optfeature systemd tmpfiles
 
 DESCRIPTION="A real-time web log analyzer and interactive viewer in a terminal"
 HOMEPAGE="https://goaccess.io"
@@ -38,8 +38,6 @@ src_prepare() {
 		-e '/db-path/s|tmp|var/lib/goaccess|' \
 		-e '/geoip-database/s|local/||' config/goaccess.conf \
 		|| die "sed failed for goaccess.conf"
-
-	eautoreconf
 }
 
 src_configure() {
diff --git a/net-analyzer/goaccess/goaccess-9999.ebuild b/net-analyzer/goaccess/goaccess-9999.ebuild
index f865c1c79c2b..58691f5c27b8 100644
--- a/net-analyzer/goaccess/goaccess-9999.ebuild
+++ b/net-analyzer/goaccess/goaccess-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # shellcheck disable=SC2207
@@ -11,11 +11,9 @@ inherit autotools git-r3 optfeature systemd tmpfiles
 
 DESCRIPTION="A real-time web log analyzer and interactive viewer in a terminal"
 HOMEPAGE="https://goaccess.io"
-SRC_URI=""
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="debug geoip geoipv2 getline ssl unicode"
 REQUIRED_USE="geoipv2? ( geoip )"