gentoo auto-resync : 27:09:2022 - 15:10:20

7 files changed, 120 insertions, 80 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 725048064a17..78c8901bfc64 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index f7e5518bf0e7..eccab827985f 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -2,9 +2,9 @@ AUX goaccess.confd 306 BLAKE2B 27f5a4a26fdcc4aff21bd2bb2a462e4875462c5b9a6f452b1
 AUX goaccess.initd 372 BLAKE2B 8a232845fc9ba7f6e5e0481cad50fa04e58dd4113ceaad1612dff16ffe1e76db4e9f438e7a72debd531943e8fe54f311fb54e16513d31443a6f7446b546c476a SHA512 685843cbb7749cebdec22871f5a5db263040491c25c9c41986e31935d7e0c15887d0d456195228d5b89abc060af46ab0f52c27eecfe6db0e374fa32bfbd78b8f
 AUX goaccess.service 381 BLAKE2B ab4a4e2a35846f8bf7ed80539a7be38f2507ee25ecac63900a88dd625a0fd3a44dfcd6e7f60fb45186cc40063cd9cae95dd8a5ff366356209a2039cee2b2cd34 SHA512 3d5482bdf13c31116f53f0ba9af4aa282aba01f7e2b8916eb88067500be616ed6b3d107fdf2e079a0c78f75c8a894dd25e8866edcb02ff6e5bd268b802b46e7b
 AUX goaccess.tmpfile 40 BLAKE2B dd3595d9f1cca0c652a62fd19032d138aeeeb21523db4d05d2adff28ea8b65c16cca32c2e73b285ba15911470248868c200ce62307597e7e452ae8a9bc6e645a SHA512 47f95152cf575d74336340af898551a10c6ff9dcf197ca06ac799be77cc7fb69957c3277976f30cf0f10eee6c278abb1a823b9867f14aba9b6cb36d6a9b43700
-DIST goaccess-1.4.2.tar.gz 633162 BLAKE2B 4da268bb051114893b480e4eef18e007ccffb9b61ae49cc9a96622864716a44793f0895b5d27685e1b5e22c33f1bdd256dc148d26c7b6fefbd982a3f8fdf1960 SHA512 14bc5a08c2e6bb1db8d664a224b778603a358cf3a52a341a3a3e04e84337d0bb574892cb5005dc62098a8a6f0a834d1014479c29593714fdd6a87cedb3f3fb38
 DIST goaccess-1.6.2.tar.gz 658679 BLAKE2B 93aea3e4142ec2fa8ea4b1600bac4bcdf28f845904935c1b2e88e720e3ba342fd07f7f22ac05b8010932263e708ecdf6c516f901b690532a395e337494a69486 SHA512 5299df01fd06777bf85da12e4d4ec3b9eca866bbab6cac64f3d674b0b3ecc90dc4c28f5bc2c94064b7654d381aa873626e98ec9f26fc2b546380bb9e40077a85
-EBUILD goaccess-1.4.2-r1.ebuild 1140 BLAKE2B 2877e909e432af6a45c27832272820448195ad934fa4413a1a1745e1de617d21a788b7ea4d27c20dc2cfaaf585d653d62a482abab6e35c6d7cc7b27810948eff SHA512 afe67cb040bd1ef09d53d758492e481b4c2d7948893305f8fef2913a766e90a7f62c5341afcd560721e3312158dbd38a4005272af2cfe9f8d20e178805a60c7a
+DIST goaccess-1.6.3.tar.gz 658827 BLAKE2B 48378235a75c11e7392bcaca98c64689032e74377696cf6fd3e0e230dd35a2e0f78e5f4283da2c4693ec072942ae6be4d3dc27f91f23d8390f81a330d9955c93 SHA512 7890fc35700db9ce1d3c720607cce6008a3140a14d143fcdd02f11a79f5344a26c648c9b7e6316a21d3ff07f588815bcdfb33072b5e0a18c429e9bfdb8bf99f4
 EBUILD goaccess-1.6.2.ebuild 1768 BLAKE2B 5ad7b16fae6a737281d827e4132613f3f7068922bca2bf631725300f6215877ac19a3e25fb0b025a4ac9d5218f98be99f7eef610e762ef6caab0dee2031addcf SHA512 63512a225223f717935bd5860261ec7595d7242a31022336be348f88c0047e6b9a23f9c213fea9dc52d7e974d86be765837bd82e18356402afbe1887fa100989
-EBUILD goaccess-9999.ebuild 1140 BLAKE2B 2877e909e432af6a45c27832272820448195ad934fa4413a1a1745e1de617d21a788b7ea4d27c20dc2cfaaf585d653d62a482abab6e35c6d7cc7b27810948eff SHA512 afe67cb040bd1ef09d53d758492e481b4c2d7948893305f8fef2913a766e90a7f62c5341afcd560721e3312158dbd38a4005272af2cfe9f8d20e178805a60c7a
+EBUILD goaccess-1.6.3.ebuild 1708 BLAKE2B a99b4f5c179b78506836cef7a601f17aceb839d9fcfd97c07acc687a01c44d1cc2ac176b5cd78b33b8245b493bcf91505b4f3e0e359b2324e9e8a848bca46803 SHA512 da9f649abd865f3b9db71cc2f29cd0292e731ffd60646258eddad03d8479495e7880c078cffbe134df819be9dc7c71265f21ea23334ddee30b727fd3aef47f90
+EBUILD goaccess-9999.ebuild 1724 BLAKE2B 772175f973d0a8a59c985cc2c3b54f4178b8e510da7ea7453ebe7ce0e9171e0e07e437572dde1b7a01e6850339e825e7dc6aba4a8827813090705ef95d1dcaa0 SHA512 e83559f561225aa76b993487c68a454dfa862836afa4919dda83436902da4b9d5f59f5bb3d5caeeba6192bf98b981eaac62d2f3f41654f3d353ba284e753adfc
 MISC metadata.xml 968 BLAKE2B 9b84cc00a75dd00ea5563ef605475fdb6c4fae9ee303fe06d8a8f74a2c3db58794b468866fa0dc06080bcb1a20298969378c6ccfa16da5f9f0cf1582ca8272b8 SHA512 a2f894feb012129a86a85fe3a5c386b6f0fdbc6acc0fd76d53b5b0df90ce528f9ac438d4081ca54f0c05fa79796015d4e0b3429e5a68639b764d0a3f17dd1f05
diff --git a/net-analyzer/goaccess/goaccess-1.4.2-r1.ebuild b/net-analyzer/goaccess/goaccess-1.4.2-r1.ebuild
deleted file mode 100644
index 4f3beee63c9e..000000000000
--- a/net-analyzer/goaccess/goaccess-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-if [[ ${PV} = *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/allinurl/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://tar.goaccess.io/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
-fi
-
-DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal"
-HOMEPAGE="https://goaccess.io"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="debug geoip geoipv2 getline ssl unicode"
-REQUIRED_USE="geoipv2? ( geoip )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="sys-libs/ncurses:=[unicode(+)?]
-	geoip? (
-		!geoipv2? ( dev-libs/geoip )
-		geoipv2? ( dev-libs/libmaxminddb:0= )
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# Change path to GeoIP bases in config
-	sed -i -e s':/usr/local:/usr:' config/goaccess.conf || die "sed failed for goaccess.conf"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		"$(use_enable debug)" \
-		"$(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)")" \
-		"$(use_enable unicode utf8)" \
-		"$(use_with getline)" \
-		"$(use_with ssl openssl)"
-}
diff --git a/net-analyzer/goaccess/goaccess-1.6.3.ebuild b/net-analyzer/goaccess/goaccess-1.6.3.ebuild
new file mode 100644
index 000000000000..52788637826a
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-1.6.3.ebuild
@@ -0,0 +1,70 @@
+# 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-9999.ebuild b/net-analyzer/goaccess/goaccess-9999.ebuild
index 4f3beee63c9e..084f44d4032a 100644
--- a/net-analyzer/goaccess/goaccess-9999.ebuild
+++ b/net-analyzer/goaccess/goaccess-9999.ebuild
@@ -1,51 +1,72 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools
+EGIT_REPO_URI="https://github.com/allinurl/${PN}.git"
 
-if [[ ${PV} = *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/allinurl/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://tar.goaccess.io/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
-fi
+inherit autotools git-r3 optfeature systemd tmpfiles
 
-DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal"
+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 )"
 
-BDEPEND="virtual/pkgconfig"
-RDEPEND="sys-libs/ncurses:=[unicode(+)?]
+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=
-	)"
+	ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
 
-	# Change path to GeoIP bases in config
-	sed -i -e s':/usr/local:/usr:' config/goaccess.conf || die "sed failed for goaccess.conf"
+	# 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() {
-	econf \
-		"$(use_enable debug)" \
-		"$(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)")" \
-		"$(use_enable unicode utf8)" \
-		"$(use_with getline)" \
-		"$(use_with ssl openssl)"
+	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/netdata/Manifest b/net-analyzer/netdata/Manifest
index 540e25a6560b..3d28fc88ee4f 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -3,6 +3,6 @@ DIST netdata-1.36.0.tar.gz 24794657 BLAKE2B f3230f5c279a5a203f9245a1d74f254961ca
 DIST netdata-1.36.1.tar.gz 24795841 BLAKE2B e58ca0a4ffb48169833a412ca234e6d1771f5bc179010bd4ee5f597768e63c147e1d0dfd65f52579901ad42760a98de74be9417d6cf6b3a150683551399927ab SHA512 2ff01c816dbdd975450a7cebd292d9a1c6bf1822aa6efb56b846a90e5a01d1faac898e1a87b155fd6fa20f26d098e1d80042b12c0ff22b05260e14f3f552546d
 EBUILD netdata-1.35.1.ebuild 3915 BLAKE2B ed0582d4ef9d60aa1fe7867b11c26883b1bdf8bd4d628acc8621bf3c98e2eb81dddf4ad23931f0dfaa1f237d5d8739387a2f6ee50e8caac2b479254ee1d32f4d SHA512 4296a274877e0df4929128b2992e079aba92e3a5f7c47e632b47c29c5f97973dbf671397bdcb938511bf50331023588a5b5eb5ad23b48813dde2021f251e4870
 EBUILD netdata-1.36.0.ebuild 3915 BLAKE2B ed0582d4ef9d60aa1fe7867b11c26883b1bdf8bd4d628acc8621bf3c98e2eb81dddf4ad23931f0dfaa1f237d5d8739387a2f6ee50e8caac2b479254ee1d32f4d SHA512 4296a274877e0df4929128b2992e079aba92e3a5f7c47e632b47c29c5f97973dbf671397bdcb938511bf50331023588a5b5eb5ad23b48813dde2021f251e4870
-EBUILD netdata-1.36.1-r1.ebuild 3923 BLAKE2B d0bb987251d17d36c82608b7d321a54f29468d79340d6f406c60ab1cf8c91c01a5871d51d0964b5d63fe9a039932136b998bca7839ea07e3dd1409fb40300660 SHA512 d4bb01715f36f64d2d5f7606afbe38471cd99da1271da982a3e0bfcc75d58b96d5e7d55754ffaeb7660fbb966908e310203c8e8c3a36b9d695f34b0581d87609
+EBUILD netdata-1.36.1-r1.ebuild 3930 BLAKE2B c8ca57c0ed784e7a8d9ac6c8f7c76001a418003bd87307ba9d7f14a8415a4573a96f32018f5c35c8f648d3e5b9955f8c75c4f83aab707bd6e09f9619761a9ba2 SHA512 261c718e355e569a7caca714640821c9791bd8866fdd0af23eadfe47261b3ba9ade235ccf16da00a86780acce79e1870772cb82a4696572696b5933778689711
 EBUILD netdata-9999.ebuild 3923 BLAKE2B d0bb987251d17d36c82608b7d321a54f29468d79340d6f406c60ab1cf8c91c01a5871d51d0964b5d63fe9a039932136b998bca7839ea07e3dd1409fb40300660 SHA512 d4bb01715f36f64d2d5f7606afbe38471cd99da1271da982a3e0bfcc75d58b96d5e7d55754ffaeb7660fbb966908e310203c8e8c3a36b9d695f34b0581d87609
 MISC metadata.xml 1289 BLAKE2B 8c18928662fdfb9166a3dd147b73206d41b6038268121b23b464f5e8ff8cacf929ac6374aa8b54b63281599be21dd92c352ac229a0e0ff180a57b86faf020ea2 SHA512 e3a344e81572b366848b51022febaeb9f9f5df3555343757061370dc42757817b4b77de85a4f0efb6b52032461cb97edd4b9d41b44b9cec7681b06448f706484
diff --git a/net-analyzer/netdata/netdata-1.36.1-r1.ebuild b/net-analyzer/netdata/netdata-1.36.1-r1.ebuild
index 532e8e6f8fd3..555475886149 100644
--- a/net-analyzer/netdata/netdata-1.36.1-r1.ebuild
+++ b/net-analyzer/netdata/netdata-1.36.1-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-v${PV}"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Linux real time system monitoring, done right!"