[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/

2023-12-03 Thread Yixun Lan
commit: e2d4a726b1fe2d5909e936bf4e5945df11fa54ac
Author: Michael Vetter  iodoru  org>
AuthorDate: Thu Nov  2 08:39:14 2023 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Mon Dec  4 02:53:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2d4a726

net-analyzer/goaccess: add 1.8.1

Closes: https://github.com/gentoo/gentoo/pull/33642
Signed-off-by: Michael Vetter  iodoru.org>
Signed-off-by: Yixun Lan  gentoo.org>

 net-analyzer/goaccess/Manifest  |  1 +
 net-analyzer/goaccess/goaccess-1.8.1.ebuild | 71 +
 2 files changed, 72 insertions(+)

diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index ab6247131ab4..4fe953157e67 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/net-analyzer/goaccess/goaccess-1.8.1.ebuild 
b/net-analyzer/goaccess/goaccess-1.8.1.ebuild
new file mode 100644
index ..483e675fa316
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-1.8.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# shellcheck disable=SC2207
+
+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=(
+   $(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
+}



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/

2023-07-14 Thread Joonas Niilola
commit: be69cb93261ed892a9da62dbd496e52833f07049
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Jul 14 06:48:46 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jul 14 06:50:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be69cb93

net-analyzer/goaccess: IncorrectCopyright

Signed-off-by: Joonas Niilola  gentoo.org>

 net-analyzer/goaccess/goaccess-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/goaccess/goaccess-.ebuild 
b/net-analyzer/goaccess/goaccess-.ebuild
index 5c94a8b48569..f865c1c79c2b 100644
--- a/net-analyzer/goaccess/goaccess-.ebuild
+++ b/net-analyzer/goaccess/goaccess-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # shellcheck disable=SC2207



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/

2023-07-14 Thread Joonas Niilola
commit: 5e2dbaf11a7fc7b6dfb00b632f6e8a8697f3d2d5
Author: Vladimir Pavljuchenkov (SpiderX)  spiderx  dp 
 ua>
AuthorDate: Sun Oct  2 14:41:54 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jul 14 06:50:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e2dbaf1

net-analyzer/goaccess: add 1.7.2

Signed-off-by: Vladimir Pavljuchenkov  spiderx.dp.ua>
Closes: https://github.com/gentoo/gentoo/pull/27576
Signed-off-by: Joonas Niilola  gentoo.org>

 net-analyzer/goaccess/Manifest |  1 +
 ...{goaccess-.ebuild => goaccess-1.7.2.ebuild} | 25 +++---
 net-analyzer/goaccess/goaccess-.ebuild | 15 +++--
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index ab98ee0af107..ab6247131ab4 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1 +1,2 @@
 DIST goaccess-1.6.3.tar.gz 658827 BLAKE2B 
48378235a75c11e7392bcaca98c64689032e74377696cf6fd3e0e230dd35a2e0f78e5f4283da2c4693ec072942ae6be4d3dc27f91f23d8390f81a330d9955c93
 SHA512 
7890fc35700db9ce1d3c720607cce6008a3140a14d143fcdd02f11a79f5344a26c648c9b7e6316a21d3ff07f588815bcdfb33072b5e0a18c429e9bfdb8bf99f4
+DIST goaccess-1.7.2.tar.gz 679321 BLAKE2B 
a423553fcbac76eb1358bffda9ec413da48241f9702d01872cede4999fa2baef60758f48ad621986789ddf2f514ca77ac72a4d367469ec493d792dea01c3f957
 SHA512 
0e057c9d49d5a9189af0b8f12e867d4402326ca0d2f562771b4d2c73fcfc2e5d79a826465ee56e03e036fbcddb7c6171005cd06ba28a2c25fc1683fe37bd59a7

diff --git a/net-analyzer/goaccess/goaccess-.ebuild 
b/net-analyzer/goaccess/goaccess-1.7.2.ebuild
similarity index 79%
copy from net-analyzer/goaccess/goaccess-.ebuild
copy to net-analyzer/goaccess/goaccess-1.7.2.ebuild
index 084f44d4032a..483e675fa316 100644
--- a/net-analyzer/goaccess/goaccess-.ebuild
+++ b/net-analyzer/goaccess/goaccess-1.7.2.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+# shellcheck disable=SC2207
 
-EGIT_REPO_URI="https://github.com/allinurl/${PN}.git;
+EAPI=8
 
-inherit autotools git-r3 optfeature systemd tmpfiles
+inherit autotools optfeature systemd tmpfiles
 
 DESCRIPTION="A real-time web log analyzer and interactive viewer in a terminal"
 HOMEPAGE="https://goaccess.io;
-SRC_URI=""
+SRC_URI="https://tar.goaccess.io/${P}.tar.gz;
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="debug geoip geoipv2 getline ssl unicode"
 REQUIRED_USE="geoipv2? ( geoip )"
 
@@ -43,13 +43,12 @@ src_prepare() {
 }
 
 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
+   local 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[@]}"
 }

diff --git a/net-analyzer/goaccess/goaccess-.ebuild 
b/net-analyzer/goaccess/goaccess-.ebuild
index 084f44d4032a..5c94a8b48569 100644
--- a/net-analyzer/goaccess/goaccess-.ebuild
+++ b/net-analyzer/goaccess/goaccess-.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# shellcheck disable=SC2207
+
 EAPI=8
 
 EGIT_REPO_URI="https://github.com/allinurl/${PN}.git;
@@ -43,13 +45,12 @@ src_prepare() {
 }
 
 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
+   local 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[@]}"
 }



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/

2023-02-15 Thread Sam James
commit: e5379db591178accbb2b43edcd8826143f4237e4
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 16 04:17:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 16 04:17:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5379db5

net-analyzer/goaccess: drop 1.6.2

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/goaccess/Manifest  |  1 -
 net-analyzer/goaccess/goaccess-1.6.2.ebuild | 71 -
 2 files changed, 72 deletions(-)

diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index b0c9c3f7aa23..ab98ee0af107 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1,2 +1 @@
-DIST goaccess-1.6.2.tar.gz 658679 BLAKE2B 
93aea3e4142ec2fa8ea4b1600bac4bcdf28f845904935c1b2e88e720e3ba342fd07f7f22ac05b8010932263e708ecdf6c516f901b690532a395e337494a69486
 SHA512 
5299df01fd06777bf85da12e4d4ec3b9eca866bbab6cac64f3d674b0b3ecc90dc4c28f5bc2c94064b7654d381aa873626e98ec9f26fc2b546380bb9e40077a85
 DIST goaccess-1.6.3.tar.gz 658827 BLAKE2B 
48378235a75c11e7392bcaca98c64689032e74377696cf6fd3e0e230dd35a2e0f78e5f4283da2c4693ec072942ae6be4d3dc27f91f23d8390f81a330d9955c93
 SHA512 
7890fc35700db9ce1d3c720607cce6008a3140a14d143fcdd02f11a79f5344a26c648c9b7e6316a21d3ff07f588815bcdfb33072b5e0a18c429e9bfdb8bf99f4

diff --git a/net-analyzer/goaccess/goaccess-1.6.2.ebuild 
b/net-analyzer/goaccess/goaccess-1.6.2.ebuild
deleted file mode 100644
index 5f4eccc43e10..
--- a/net-analyzer/goaccess/goaccess-1.6.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools 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 ~amd64-linux"
-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() {
-   econf \
-   "$(use_enable debug)" \
-   "$(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)")" \
-   "$(use_enable unicode utf8)" \
-   "$(use_with getline)" \
-   "$(use_with ssl openssl)"
-}
-
-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() {
-   if ! has_version net-misc/geoipupdate ; then
-   einfo "You should consider to install net-misc/geoipupdate"
-   einfo "to be able to use GeoIP databases"
-   fi
-
-   tmpfiles_process goaccess.conf
-}



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/

2022-08-17 Thread Joonas Niilola
commit: d9fd9185d789958c51591c87dd18324984ac226b
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Aug 17 16:41:40 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 17 16:43:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9fd9185

net-analyzer/goaccess: add a missing dep on 1.6.2 for acct-group/go...

Signed-off-by: Joonas Niilola  gentoo.org>

 net-analyzer/goaccess/goaccess-1.6.2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/goaccess/goaccess-1.6.2.ebuild 
b/net-analyzer/goaccess/goaccess-1.6.2.ebuild
index 036459cecdb8..5f4eccc43e10 100644
--- a/net-analyzer/goaccess/goaccess-1.6.2.ebuild
+++ b/net-analyzer/goaccess/goaccess-1.6.2.ebuild
@@ -15,7 +15,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="debug geoip geoipv2 getline ssl unicode"
 REQUIRED_USE="geoipv2? ( geoip )"
 
-RDEPEND="acct-user/goaccess
+RDEPEND="acct-group/goaccess
+   acct-user/goaccess
sys-libs/ncurses:=[unicode(+)?]
geoip? (
!geoipv2? ( dev-libs/geoip )



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/, net-analyzer/goaccess/files/

2022-08-17 Thread Joonas Niilola
commit: 0140b6a984244cf0ca79878be814e8c7811ae059
Author: Vladimir Pavljuchenkov (SpiderX)  spiderx  dp 
 ua>
AuthorDate: Mon Aug  1 07:23:06 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 17 16:43:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0140b6a9

net-analyzer/goaccess: version bump to 1.6.2

Closes: https://bugs.gentoo.org/842240

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Vladimir Pavljuchenkov  spiderx.dp.ua>
Closes: https://github.com/gentoo/gentoo/pull/26693
Signed-off-by: Joonas Niilola  gentoo.org>

 net-analyzer/goaccess/Manifest   |  1 +
 net-analyzer/goaccess/files/goaccess.confd   |  8 
 net-analyzer/goaccess/files/goaccess.initd   | 14 ++
 net-analyzer/goaccess/files/goaccess.service | 15 ++
 net-analyzer/goaccess/files/goaccess.tmpfile |  1 +
 net-analyzer/goaccess/goaccess-1.6.2.ebuild  | 70 
 6 files changed, 109 insertions(+)

diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index 8449602d0ea3..66d5ef3979d3 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1 +1,2 @@
 DIST goaccess-1.4.2.tar.gz 633162 BLAKE2B 
4da268bb051114893b480e4eef18e007ccffb9b61ae49cc9a96622864716a44793f0895b5d27685e1b5e22c33f1bdd256dc148d26c7b6fefbd982a3f8fdf1960
 SHA512 
14bc5a08c2e6bb1db8d664a224b778603a358cf3a52a341a3a3e04e84337d0bb574892cb5005dc62098a8a6f0a834d1014479c29593714fdd6a87cedb3f3fb38
+DIST goaccess-1.6.2.tar.gz 658679 BLAKE2B 
93aea3e4142ec2fa8ea4b1600bac4bcdf28f845904935c1b2e88e720e3ba342fd07f7f22ac05b8010932263e708ecdf6c516f901b690532a395e337494a69486
 SHA512 
5299df01fd06777bf85da12e4d4ec3b9eca866bbab6cac64f3d674b0b3ecc90dc4c28f5bc2c94064b7654d381aa873626e98ec9f26fc2b546380bb9e40077a85

diff --git a/net-analyzer/goaccess/files/goaccess.confd 
b/net-analyzer/goaccess/files/goaccess.confd
new file mode 100644
index ..4ff75a1a4ff6
--- /dev/null
+++ b/net-analyzer/goaccess/files/goaccess.confd
@@ -0,0 +1,8 @@
+# Config file for /etc/init.d/goaccess
+
+# Various options.
+# run `goaccess --help` for valid cmdline options
+OPTS="--user-name=goaccess --pid-file=/run/goaccess/goaccess.pid -o 
/var/lib/goaccess/goaccess.html -l /var/log/goaccess/goaccess.log"
+
+# GoAccess config file
+#CONFIG="/etc/goaccess/goaccess.conf"

diff --git a/net-analyzer/goaccess/files/goaccess.initd 
b/net-analyzer/goaccess/files/goaccess.initd
new file mode 100644
index ..be0059588396
--- /dev/null
+++ b/net-analyzer/goaccess/files/goaccess.initd
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/goaccess"
+name="GoAccess"
+description="Real-time web log analyzer"
+config="${CONFIG:-/etc/goaccess/goaccess.conf}"
+command_args="--real-time-html --daemonize -p $config ${OPTS}"
+start_stop_daemon_args="-q"
+
+depend() {
+   need net
+}

diff --git a/net-analyzer/goaccess/files/goaccess.service 
b/net-analyzer/goaccess/files/goaccess.service
new file mode 100644
index ..8fab5f9b7c56
--- /dev/null
+++ b/net-analyzer/goaccess/files/goaccess.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Real-time web log analyzer
+After=network.target
+
+[Service]
+Type=simple
+User=root
+Group=root
+Restart=always
+ExecStart=/usr/bin/goaccess --real-time-html --daemonize -p 
/etc/goaccess/goaccess.conf --user-name=goaccess -o 
/var/lib/goaccess/goaccess.html -l /var/log/goaccess/goaccess.log
+StandardOutput=null
+StandardError=null
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-analyzer/goaccess/files/goaccess.tmpfile 
b/net-analyzer/goaccess/files/goaccess.tmpfile
new file mode 100644
index ..caee9853
--- /dev/null
+++ b/net-analyzer/goaccess/files/goaccess.tmpfile
@@ -0,0 +1 @@
+d  /run/goaccess   0755goaccessgoaccess

diff --git a/net-analyzer/goaccess/goaccess-1.6.2.ebuild 
b/net-analyzer/goaccess/goaccess-1.6.2.ebuild
new file mode 100644
index ..036459cecdb8
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-1.6.2.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 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 ~amd64-linux"
+IUSE="debug geoip geoipv2 getline ssl unicode"
+REQUIRED_USE="geoipv2? ( geoip )"
+
+RDEPEND="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 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/

2021-07-17 Thread David Seifert
commit: acf9affd916390086b95539fef758d6ccaeafc4b
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jul 17 21:30:19 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jul 17 21:30:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf9affd

net-analyzer/goaccess: Add sys-libs/ncurses[unicode(+)]

Signed-off-by: David Seifert  gentoo.org>

 .../goaccess/{goaccess-1.4.2.ebuild => goaccess-1.4.2-r1.ebuild}| 2 +-
 net-analyzer/goaccess/goaccess-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/goaccess/goaccess-1.4.2.ebuild 
b/net-analyzer/goaccess/goaccess-1.4.2-r1.ebuild
similarity index 96%
rename from net-analyzer/goaccess/goaccess-1.4.2.ebuild
rename to net-analyzer/goaccess/goaccess-1.4.2-r1.ebuild
index 21f627fb297..4f3beee63c9 100644
--- a/net-analyzer/goaccess/goaccess-1.4.2.ebuild
+++ b/net-analyzer/goaccess/goaccess-1.4.2-r1.ebuild
@@ -22,7 +22,7 @@ IUSE="debug geoip geoipv2 getline ssl unicode"
 REQUIRED_USE="geoipv2? ( geoip )"
 
 BDEPEND="virtual/pkgconfig"
-RDEPEND="sys-libs/ncurses:0=[unicode?]
+RDEPEND="sys-libs/ncurses:=[unicode(+)?]
geoip? (
!geoipv2? ( dev-libs/geoip )
geoipv2? ( dev-libs/libmaxminddb:0= )

diff --git a/net-analyzer/goaccess/goaccess-.ebuild 
b/net-analyzer/goaccess/goaccess-.ebuild
index 21f627fb297..4f3beee63c9 100644
--- a/net-analyzer/goaccess/goaccess-.ebuild
+++ b/net-analyzer/goaccess/goaccess-.ebuild
@@ -22,7 +22,7 @@ IUSE="debug geoip geoipv2 getline ssl unicode"
 REQUIRED_USE="geoipv2? ( geoip )"
 
 BDEPEND="virtual/pkgconfig"
-RDEPEND="sys-libs/ncurses:0=[unicode?]
+RDEPEND="sys-libs/ncurses:=[unicode(+)?]
geoip? (
!geoipv2? ( dev-libs/geoip )
geoipv2? ( dev-libs/libmaxminddb:0= )



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/

2021-04-30 Thread Mikle Kolyada
commit: be90711a46d0c8117833aff1f8c36605b99ea72b
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Apr 30 18:40:58 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Apr 30 18:40:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be90711a

net-analyzer/goaccess: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-analyzer/goaccess/goaccess-1.4.2.ebuild | 7 +++
 net-analyzer/goaccess/goaccess-.ebuild  | 7 +++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/goaccess/goaccess-1.4.2.ebuild 
b/net-analyzer/goaccess/goaccess-1.4.2.ebuild
index e029cb0bf44..21f627fb297 100644
--- a/net-analyzer/goaccess/goaccess-1.4.2.ebuild
+++ b/net-analyzer/goaccess/goaccess-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ HOMEPAGE="https://goaccess.io;
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="debug geoip geoipv2 getline libressl ssl unicode"
+IUSE="debug geoip geoipv2 getline ssl unicode"
 REQUIRED_USE="geoipv2? ( geoip )"
 
 BDEPEND="virtual/pkgconfig"
@@ -28,8 +28,7 @@ RDEPEND="sys-libs/ncurses:0=[unicode?]
geoipv2? ( dev-libs/libmaxminddb:0= )
)
ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
)"
 DEPEND="${RDEPEND}"
 

diff --git a/net-analyzer/goaccess/goaccess-.ebuild 
b/net-analyzer/goaccess/goaccess-.ebuild
index e029cb0bf44..21f627fb297 100644
--- a/net-analyzer/goaccess/goaccess-.ebuild
+++ b/net-analyzer/goaccess/goaccess-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ HOMEPAGE="https://goaccess.io;
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="debug geoip geoipv2 getline libressl ssl unicode"
+IUSE="debug geoip geoipv2 getline ssl unicode"
 REQUIRED_USE="geoipv2? ( geoip )"
 
 BDEPEND="virtual/pkgconfig"
@@ -28,8 +28,7 @@ RDEPEND="sys-libs/ncurses:0=[unicode?]
geoipv2? ( dev-libs/libmaxminddb:0= )
)
ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
)"
 DEPEND="${RDEPEND}"
 



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/

2021-01-02 Thread David Seifert
commit: e0b79049beee77671372a3f763dd4b49ed2376d1
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Jan  2 21:55:04 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jan  2 21:55:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b79049

net-analyzer/goaccess: Remove unused flags from metadata

Signed-off-by: Jakov Smolic  sartura.hr>
Closes: https://github.com/gentoo/gentoo/pull/18916
Signed-off-by: David Seifert  gentoo.org>

 net-analyzer/goaccess/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net-analyzer/goaccess/metadata.xml 
b/net-analyzer/goaccess/metadata.xml
index 708d4dfe667..43a4da78f81 100644
--- a/net-analyzer/goaccess/metadata.xml
+++ b/net-analyzer/goaccess/metadata.xml
@@ -16,10 +16,8 @@
that require a visual server report on the fly.


-   Enable Tokyo Cabinet's on-disk B+ Tree 
database backend
Enable support for GeoIP2 through 
dev-libs/libmaxminddb
Use GNU getline() to parse full line 
requests
-   Enable Tokyo Cabinet's on-memory hash 
database backend


allinurl/goaccess



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/

2021-01-02 Thread David Seifert
commit: 8bc8cfaf3e934b9588b5044b8b6b6a1de879f3e3
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Jan  2 21:43:42 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jan  2 21:43:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bc8cfaf

net-analyzer/goaccess: Remove old

Closes: https://github.com/gentoo/gentoo/pull/18915
Bug: https://bugs.gentoo.org/739160
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 net-analyzer/goaccess/Manifest|  1 -
 net-analyzer/goaccess/goaccess-1.3.ebuild | 55 ---
 2 files changed, 56 deletions(-)

diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index 4c995483202..8449602d0ea 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1,2 +1 @@
-DIST goaccess-1.3.tar.gz 541374 BLAKE2B 
55942e35d06f1467df9b80a3fc42211e867b08963a7334783c0279ba7b9e0fd8d6e197277bee780547a9b8f6264ae15844374604f6d7c1b3b57f57768c2b2019
 SHA512 
7ab8a42670c2009459eee6979cb14e32e7e776e89912077882652631d0ce6ff801fba46d91ab5c23af1229f000e220863e9b70336fcd9fe11521d0ae1fd3bde1
 DIST goaccess-1.4.2.tar.gz 633162 BLAKE2B 
4da268bb051114893b480e4eef18e007ccffb9b61ae49cc9a96622864716a44793f0895b5d27685e1b5e22c33f1bdd256dc148d26c7b6fefbd982a3f8fdf1960
 SHA512 
14bc5a08c2e6bb1db8d664a224b778603a358cf3a52a341a3a3e04e84337d0bb574892cb5005dc62098a8a6f0a834d1014479c29593714fdd6a87cedb3f3fb38

diff --git a/net-analyzer/goaccess/goaccess-1.3.ebuild 
b/net-analyzer/goaccess/goaccess-1.3.ebuild
deleted file mode 100644
index 5d70b028d3d..000
--- a/net-analyzer/goaccess/goaccess-1.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in 
a terminal"
-HOMEPAGE="https://goaccess.io;
-SRC_URI="https://tar.goaccess.io/${P}.tar.gz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="btree bzip2 debug geoip geoipv2 getline libressl tokyocabinet ssl 
unicode zlib"
-REQUIRED_USE="btree? ( tokyocabinet ) bzip2? ( btree ) geoipv2? ( geoip ) 
zlib? ( btree )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="sys-libs/ncurses:0=[unicode?]
-   geoip? (
-   !geoipv2? ( dev-libs/geoip )
-   geoipv2? ( dev-libs/libmaxminddb:0= )
-   )
-   !tokyocabinet? ( dev-libs/glib:2 )
-   tokyocabinet? (
-   dev-db/tokyocabinet[bzip2?,zlib?]
-   btree? (
-   bzip2? ( app-arch/bzip2 )
-   zlib? ( sys-libs/zlib )
-   )
-   )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-   econf \
-   "$(use_enable bzip2 bzip)" \
-   "$(use_enable zlib)" \
-   "$(use_enable debug)" \
-   "$(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)")" \
-   "$(use_enable tokyocabinet tcb "$(usex btree btree memhash)")" \
-   "$(use_enable unicode utf8)" \
-   "$(use_with getline)" \
-   "$(use_with ssl openssl)"
-}
-
-pkg_preinst() {
-   # Change path to GeoIP bases in config
-   sed -e s':/usr/local:/usr:' -i "${ED}"/etc/goaccess/goaccess.conf || 
die "sed failed for goaccess.conf"
-}
-
-pkg_postinst() {
-   ewarn "Upstream moved config to /etc/goaccess/goaccess.conf"
-}



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/

2020-11-20 Thread Joonas Niilola
commit: de22be8e98db72dfed6adcc4265789d79bf42c23
Author: Michael Seifert  digitalernachschub  de>
AuthorDate: Tue Nov 17 07:10:03 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Nov 20 12:05:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de22be8e

net-analyzer/goaccess: Removed version 1.2.

Signed-off-by: Michael Seifert  digitalernachschub.de>
Closes: https://github.com/gentoo/gentoo/pull/18293
Signed-off-by: Joonas Niilola  gentoo.org>

 net-analyzer/goaccess/Manifest|  1 -
 net-analyzer/goaccess/goaccess-1.2.ebuild | 52 ---
 2 files changed, 53 deletions(-)

diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index 5176113fe6b..4c995483202 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1,3 +1,2 @@
-DIST goaccess-1.2.tar.gz 423103 BLAKE2B 
87c527a52db9fa69d6e6a02ffbda64a6a32e6214ca6bc1f2654e1451fe5d73e7caa02cf1416c93c511bee329b7885e4914fb7dfd37562ef5347ea3912d030c14
 SHA512 
bc31ef1e4c92608635856fa73e69b58267c161a7e3c6f2e3ca8860b862ed1c47575b93943dd975a5f8503774ee90ee0649d380563639e30908d876416638f889
 DIST goaccess-1.3.tar.gz 541374 BLAKE2B 
55942e35d06f1467df9b80a3fc42211e867b08963a7334783c0279ba7b9e0fd8d6e197277bee780547a9b8f6264ae15844374604f6d7c1b3b57f57768c2b2019
 SHA512 
7ab8a42670c2009459eee6979cb14e32e7e776e89912077882652631d0ce6ff801fba46d91ab5c23af1229f000e220863e9b70336fcd9fe11521d0ae1fd3bde1
 DIST goaccess-1.4.2.tar.gz 633162 BLAKE2B 
4da268bb051114893b480e4eef18e007ccffb9b61ae49cc9a96622864716a44793f0895b5d27685e1b5e22c33f1bdd256dc148d26c7b6fefbd982a3f8fdf1960
 SHA512 
14bc5a08c2e6bb1db8d664a224b778603a358cf3a52a341a3a3e04e84337d0bb574892cb5005dc62098a8a6f0a834d1014479c29593714fdd6a87cedb3f3fb38

diff --git a/net-analyzer/goaccess/goaccess-1.2.ebuild 
b/net-analyzer/goaccess/goaccess-1.2.ebuild
deleted file mode 100644
index fc407560107..000
--- a/net-analyzer/goaccess/goaccess-1.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in 
a terminal"
-HOMEPAGE="https://goaccess.io;
-SRC_URI="https://tar.goaccess.io/${P}.tar.gz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="btree bzip2 debug geoip geoipv2 getline libressl tokyocabinet ssl 
unicode zlib"
-
-RDEPEND="sys-libs/ncurses:0=[unicode?]
-   geoip? (
-   !geoipv2? ( dev-libs/geoip )
-   geoipv2? ( dev-libs/libmaxminddb:0= )
-   )
-   !tokyocabinet? ( dev-libs/glib:2 )
-   tokyocabinet? (
-   dev-db/tokyocabinet[bzip2?,zlib?]
-   btree? (
-   bzip2? ( app-arch/bzip2 )
-   zlib? ( sys-libs/zlib )
-   )
-   )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-REQUIRED_USE="btree? ( tokyocabinet ) bzip2? ( btree ) geoipv2? ( geoip ) 
zlib? ( btree )"
-
-src_configure() {
-   econf \
-   $(use_enable bzip2 bzip) \
-   $(use_enable zlib) \
-   $(use_enable debug) \
-   $(use_enable geoip geoip $(usex geoipv2 mmdb legacy)) \
-   $(use_enable tokyocabinet tcb $(usex btree btree memhash)) \
-   $(use_enable unicode utf8) \
-   $(use_with getline) \
-   $(use_with ssl openssl)
-}
-
-pkg_preinst() {
-   # Change path to GeoIP bases in config
-   sed -e s':/usr/local:/usr:' -i "${ED%/}"/etc/goaccess.conf || die "sed 
failed for goaccess.conf"
-}



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/

2020-11-20 Thread Joonas Niilola
commit: 355e9d60f0ea52ae7acfd91e52a617eadabeda85
Author: Michael Seifert  digitalernachschub  de>
AuthorDate: Tue Nov 17 07:05:55 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Nov 20 12:05:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=355e9d60

net-analyzer/goaccess: Bumped to version 1.4.2.

Closes: https://bugs.gentoo.org/754996
Signed-off-by: Michael Seifert  digitalernachschub.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 net-analyzer/goaccess/Manifest  |  1 +
 net-analyzer/goaccess/goaccess-1.4.2.ebuild | 52 +
 2 files changed, 53 insertions(+)

diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index 39e75605233..5176113fe6b 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1,2 +1,3 @@
 DIST goaccess-1.2.tar.gz 423103 BLAKE2B 
87c527a52db9fa69d6e6a02ffbda64a6a32e6214ca6bc1f2654e1451fe5d73e7caa02cf1416c93c511bee329b7885e4914fb7dfd37562ef5347ea3912d030c14
 SHA512 
bc31ef1e4c92608635856fa73e69b58267c161a7e3c6f2e3ca8860b862ed1c47575b93943dd975a5f8503774ee90ee0649d380563639e30908d876416638f889
 DIST goaccess-1.3.tar.gz 541374 BLAKE2B 
55942e35d06f1467df9b80a3fc42211e867b08963a7334783c0279ba7b9e0fd8d6e197277bee780547a9b8f6264ae15844374604f6d7c1b3b57f57768c2b2019
 SHA512 
7ab8a42670c2009459eee6979cb14e32e7e776e89912077882652631d0ce6ff801fba46d91ab5c23af1229f000e220863e9b70336fcd9fe11521d0ae1fd3bde1
+DIST goaccess-1.4.2.tar.gz 633162 BLAKE2B 
4da268bb051114893b480e4eef18e007ccffb9b61ae49cc9a96622864716a44793f0895b5d27685e1b5e22c33f1bdd256dc148d26c7b6fefbd982a3f8fdf1960
 SHA512 
14bc5a08c2e6bb1db8d664a224b778603a358cf3a52a341a3a3e04e84337d0bb574892cb5005dc62098a8a6f0a834d1014479c29593714fdd6a87cedb3f3fb38

diff --git a/net-analyzer/goaccess/goaccess-1.4.2.ebuild 
b/net-analyzer/goaccess/goaccess-1.4.2.ebuild
new file mode 100644
index 000..e029cb0bf44
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-1.4.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+if [[ ${PV} = ** ]] ; 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 libressl ssl unicode"
+REQUIRED_USE="geoipv2? ( geoip )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="sys-libs/ncurses:0=[unicode?]
+   geoip? (
+   !geoipv2? ( dev-libs/geoip )
+   geoipv2? ( dev-libs/libmaxminddb:0= )
+   )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl: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)"
+}



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/

2020-11-20 Thread Joonas Niilola
commit: 8a2f89c70d80e1bd31d6f6432bed47d4782e7ce3
Author: Michael Seifert  digitalernachschub  de>
AuthorDate: Tue Nov 17 07:03:55 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Nov 20 12:04:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a2f89c7

net-analyzer/goaccess: Adjusted SRC_URI and EGIT_REPO_URI in -

The variables are set conditionally based on PV, so that the live ebuild can
simply be renamed to create a versioned ebuild.

Signed-off-by: Michael Seifert  digitalernachschub.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 net-analyzer/goaccess/goaccess-.ebuild | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/goaccess/goaccess-.ebuild 
b/net-analyzer/goaccess/goaccess-.ebuild
index 54c48bd6e78..e029cb0bf44 100644
--- a/net-analyzer/goaccess/goaccess-.ebuild
+++ b/net-analyzer/goaccess/goaccess-.ebuild
@@ -3,17 +3,21 @@
 
 EAPI=7
 
-EGIT_REPO_URI="https://github.com/allinurl/${PN}.git;
+inherit autotools
 
-inherit autotools git-r3
+if [[ ${PV} = ** ]] ; 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;
-SRC_URI=""
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="debug geoip geoipv2 getline libressl ssl unicode"
 REQUIRED_USE="geoipv2? ( geoip )"
 



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/

2020-11-20 Thread Joonas Niilola
commit: f51c2e50d5484c188220c35632572014947b79bf
Author: Michael Seifert  digitalernachschub  de>
AuthorDate: Tue Nov 17 06:59:42 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Nov 20 12:03:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f51c2e50

net-analyzer/goaccess: Removed dependency & USE flag in live ebuild

The dependency on TokyoCabinet was replaced starting with v1.4 [1]. That also
means that the bzip2, zlib, and btree USE flags are now obsolete.

[1] 
https://github.com/allinurl/goaccess/blob/d374abfaffea9d5fc99931e01d78b970ef99d0dd/ChangeLog#L129

Signed-off-by: Michael Seifert  digitalernachschub.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 net-analyzer/goaccess/goaccess-.ebuild | 17 +++--
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/net-analyzer/goaccess/goaccess-.ebuild 
b/net-analyzer/goaccess/goaccess-.ebuild
index a5512dc51d4..54c48bd6e78 100644
--- a/net-analyzer/goaccess/goaccess-.ebuild
+++ b/net-analyzer/goaccess/goaccess-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,8 +14,8 @@ SRC_URI=""
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="btree bzip2 debug geoip geoipv2 getline libressl tokyocabinet ssl 
unicode zlib"
-REQUIRED_USE="btree? ( tokyocabinet ) bzip2? ( btree ) geoipv2? ( geoip ) 
zlib? ( btree )"
+IUSE="debug geoip geoipv2 getline libressl ssl unicode"
+REQUIRED_USE="geoipv2? ( geoip )"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="sys-libs/ncurses:0=[unicode?]
@@ -23,14 +23,6 @@ RDEPEND="sys-libs/ncurses:0=[unicode?]
!geoipv2? ( dev-libs/geoip )
geoipv2? ( dev-libs/libmaxminddb:0= )
)
-   !tokyocabinet? ( dev-libs/glib:2 )
-   tokyocabinet? (
-   dev-db/tokyocabinet[bzip2?,zlib?]
-   btree? (
-   bzip2? ( app-arch/bzip2 )
-   zlib? ( sys-libs/zlib )
-   )
-   )
ssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
@@ -48,11 +40,8 @@ src_prepare() {
 
 src_configure() {
econf \
-   "$(use_enable bzip2 bzip)" \
-   "$(use_enable zlib)" \
"$(use_enable debug)" \
"$(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)")" \
-   "$(use_enable tokyocabinet tcb "$(usex btree btree memhash)")" \
"$(use_enable unicode utf8)" \
"$(use_with getline)" \
"$(use_with ssl openssl)"



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/, net-analyzer/goaccess/files/

2018-12-04 Thread Patrice Clement
commit: be89232ad6c497237520fd9f386344641ace8535
Author: Vladimir Pavljuchenkov (SpiderX)  spiderx  dp 
 ua>
AuthorDate: Sun Dec  2 11:05:06 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Dec  4 22:52:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be89232a

net-analyzer/goaccess: drop old ebuilds.

Signed-off-by: Vladimir Pavljuchenkov  spiderx.dp.ua>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/10538
Signed-off-by: Patrice Clement  gentoo.org>

 net-analyzer/goaccess/Manifest |  5 ---
 .../goaccess/files/goaccess-0.6.1-CFLAGS.patch | 10 -
 .../goaccess/files/goaccess-0.6.1-tinfo.patch  | 32 -
 net-analyzer/goaccess/goaccess-0.5-r1.ebuild   | 44 --
 net-analyzer/goaccess/goaccess-0.6.1.ebuild| 43 --
 net-analyzer/goaccess/goaccess-0.8.5.ebuild| 47 ---
 net-analyzer/goaccess/goaccess-0.9.ebuild  | 52 --
 net-analyzer/goaccess/goaccess-1.1.1.ebuild| 50 -
 net-analyzer/goaccess/metadata.xml |  3 --
 9 files changed, 286 deletions(-)

diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index 8085c37d3ab..d0134881f40 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1,6 +1 @@
-DIST goaccess-0.5.tar.gz 127068 BLAKE2B 
0c06668b5be47920273126f47645000d4ea87f7af7946d7e6b3302e609309e534f40195239d7205486840c28e268306a77eeec53884325777999ef70cfcd5a2b
 SHA512 
24c59efca896e24f89aae5f12391398b8649822a5e07ee035a1c265a8987d1ba493155db12b7189c9d637891c81da6414919c9f9f6795831234810f021bb3999
-DIST goaccess-0.6.1.tar.gz 150264 BLAKE2B 
9d3d3db8d58e1060d53a5ac2a2e577c24e91640508086622e7c20c88524370308d84b5f4bc21101999fe38a036a990c9712dc74e4ded41410f295881ae0ddde9
 SHA512 
67712e4af16c6e039ca46f6f8d8302a58be1e0cfd0c76930068c03a9989c35b58b61f7b1e6a9e79cbb978c8f492b80782b8c7b894abc2e067f0a520e2981f98b
-DIST goaccess-0.8.5.tar.gz 189006 BLAKE2B 
85faefd62a87a10c703c3bc287e97ba34fcc58b3ff0ea2aa8ad8b92cbf9f968b91d2261b3702efb16aa8344f53f550f5c4c2a7e29edf8f66a10fd5ff3f2c1471
 SHA512 
736ae69d0c3bbbaf1d06b287c2d600aae1a72255361c9bb40d1c74986932a771c2b401126e75f22ad4be72f6dc053efd262c40ad40cd62efc57c4461d5481c63
-DIST goaccess-0.9.tar.gz 213119 BLAKE2B 
447b0301921b069a1234aa7fb69b2bf1b9f5e8974657796b45c202bcc378d8fee07b3e46e5d1bf7f5f5ca6ba8031b27f670360b67d94e2cb5018a05ad71d3156
 SHA512 
c25703fa31dd673bdb3463e3c5055ba3452f1fdb452c63114663d9dfb28b95ddb4cd89b03fd4a9fdbabd0efebc2e3ab35238fd15bc46727f794d04ba77fc072c
-DIST goaccess-1.1.1.tar.gz 412635 BLAKE2B 
947ecd91d74216de61aadadd2317b9bf4b32eab96181e79eb21844e5cd0887f005f139d5fafd4e59c9a18b2faa0c13f40d267f4b2b174a3bc57c7280d892f7d2
 SHA512 
5ceb21754721603fa6422436fcac158bf3ea0ec54680851ceb6616a3385a2ad1ce38670b3cea62e14178e71c32999260fefbc29a82b115b1a1a30010879184d2
 DIST goaccess-1.2.tar.gz 423103 BLAKE2B 
87c527a52db9fa69d6e6a02ffbda64a6a32e6214ca6bc1f2654e1451fe5d73e7caa02cf1416c93c511bee329b7885e4914fb7dfd37562ef5347ea3912d030c14
 SHA512 
bc31ef1e4c92608635856fa73e69b58267c161a7e3c6f2e3ca8860b862ed1c47575b93943dd975a5f8503774ee90ee0649d380563639e30908d876416638f889

diff --git a/net-analyzer/goaccess/files/goaccess-0.6.1-CFLAGS.patch 
b/net-analyzer/goaccess/files/goaccess-0.6.1-CFLAGS.patch
deleted file mode 100644
index 909b38f5730..000
--- a/net-analyzer/goaccess/files/goaccess-0.6.1-CFLAGS.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 a/Makefile.am
-+++ b/Makefile.am
-@@ -2,6 +2,6 @@
- bin_PROGRAMS = goaccess
- goaccess_SOURCES = output.c output.h settings.c settings.h error.c error.h 
xmalloc.c xmalloc.h commons.c commons.h goaccess.c parser.c parser.h ui.c ui.h 
util.c util.h gdashboard.c gdashboard.h gdns.c gdns.h gmenu.c gmenu.h goaccess.h
- 
--AM_CFLAGS = -g -Wall @GLIB2_CFLAGS@
-+AM_CFLAGS = -Wall @GLIB2_CFLAGS@
- goaccess_LDADD = -lm
- dist_man_MANS = goaccess.1

diff --git a/net-analyzer/goaccess/files/goaccess-0.6.1-tinfo.patch 
b/net-analyzer/goaccess/files/goaccess-0.6.1-tinfo.patch
deleted file mode 100644
index 76d6cbcbcf7..000
--- a/net-analyzer/goaccess/files/goaccess-0.6.1-tinfo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
 a/configure.ac
-+++ b/configure.ac
-@@ -19,22 +19,20 @@
- AC_ARG_ENABLE(geoip,--enable-geoip Enable GeoIP country lookup, 
USE_GEOIP="yes")
- AC_ARG_ENABLE(utf8,--enable-utf8 Enable UTF-8 support for wide characters, 
USE_UTF8="yes")
- 
--if test "$USE_GEOIP" = "yes"; then
--   AC_CHECK_LIB([GeoIP], [GeoIP_new], [], [AC_MSG_ERROR([libgeoip-dev is 
missing])])
--   CFLAGS="-lGeoIP"
-+if test x"$USE_GEOIP" = "xyes"; then
-+   AC_CHECK_LIB([GeoIP], [GeoIP_new], , [AC_MSG_ERROR([libgeoip-dev is 
missing])])
- fi
- 
--if test "$USE_UTF8" = "yes"; then
--   AC_CHECK_LIB([ncursesw], [mvaddwstr], [], [AC_MSG_ERROR([libncursesw5-dev 
is missing])])
--   CFLAGS="-lncursesw"
-+if test 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/

2018-12-04 Thread Patrice Clement
commit: 9d8358f52e1923d57e7809ea628f3fa373e1f921
Author: Vladimir Pavljuchenkov (SpiderX)  spiderx  dp 
 ua>
AuthorDate: Sun Dec  2 11:07:00 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Dec  4 22:52:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d8358f5

net-analyzer/goaccess: version bump to 1.3, moved to EAPI 7, live ebuild.

Signed-off-by: Vladimir Pavljuchenkov  spiderx.dp.ua>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Patrice Clement  gentoo.org>

 net-analyzer/goaccess/Manifest |  1 +
 net-analyzer/goaccess/goaccess-1.3.ebuild  | 55 
 net-analyzer/goaccess/goaccess-.ebuild | 59 ++
 3 files changed, 115 insertions(+)

diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index d0134881f40..39e75605233 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1 +1,2 @@
 DIST goaccess-1.2.tar.gz 423103 BLAKE2B 
87c527a52db9fa69d6e6a02ffbda64a6a32e6214ca6bc1f2654e1451fe5d73e7caa02cf1416c93c511bee329b7885e4914fb7dfd37562ef5347ea3912d030c14
 SHA512 
bc31ef1e4c92608635856fa73e69b58267c161a7e3c6f2e3ca8860b862ed1c47575b93943dd975a5f8503774ee90ee0649d380563639e30908d876416638f889
+DIST goaccess-1.3.tar.gz 541374 BLAKE2B 
55942e35d06f1467df9b80a3fc42211e867b08963a7334783c0279ba7b9e0fd8d6e197277bee780547a9b8f6264ae15844374604f6d7c1b3b57f57768c2b2019
 SHA512 
7ab8a42670c2009459eee6979cb14e32e7e776e89912077882652631d0ce6ff801fba46d91ab5c23af1229f000e220863e9b70336fcd9fe11521d0ae1fd3bde1

diff --git a/net-analyzer/goaccess/goaccess-1.3.ebuild 
b/net-analyzer/goaccess/goaccess-1.3.ebuild
new file mode 100644
index 000..a38a46ce6f7
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-1.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in 
a terminal"
+HOMEPAGE="https://goaccess.io;
+SRC_URI="https://tar.goaccess.io/${P}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="btree bzip2 debug geoip geoipv2 getline libressl tokyocabinet ssl 
unicode zlib"
+REQUIRED_USE="btree? ( tokyocabinet ) bzip2? ( btree ) geoipv2? ( geoip ) 
zlib? ( btree )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="sys-libs/ncurses:0=[unicode?]
+   geoip? (
+   !geoipv2? ( dev-libs/geoip )
+   geoipv2? ( dev-libs/libmaxminddb:0= )
+   )
+   !tokyocabinet? ( dev-libs/glib:2 )
+   tokyocabinet? (
+   dev-db/tokyocabinet[bzip2?,zlib?]
+   btree? (
+   bzip2? ( app-arch/bzip2 )
+   zlib? ( sys-libs/zlib )
+   )
+   )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+   econf \
+   "$(use_enable bzip2 bzip)" \
+   "$(use_enable zlib)" \
+   "$(use_enable debug)" \
+   "$(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)")" \
+   "$(use_enable tokyocabinet tcb "$(usex btree btree memhash)")" \
+   "$(use_enable unicode utf8)" \
+   "$(use_with getline)" \
+   "$(use_with ssl openssl)"
+}
+
+pkg_preinst() {
+   # Change path to GeoIP bases in config
+   sed -e s':/usr/local:/usr:' -i "${ED%/}"/etc/goaccess/goaccess.conf || 
die "sed failed for goaccess.conf"
+}
+
+pkg_postinst() {
+   ewarn "Upstream moved config to /etc/goaccess/goaccess.conf"
+}

diff --git a/net-analyzer/goaccess/goaccess-.ebuild 
b/net-analyzer/goaccess/goaccess-.ebuild
new file mode 100644
index 000..a5512dc51d4
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/allinurl/${PN}.git;
+
+inherit autotools git-r3
+
+DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in 
a terminal"
+HOMEPAGE="https://goaccess.io;
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="btree bzip2 debug geoip geoipv2 getline libressl tokyocabinet ssl 
unicode zlib"
+REQUIRED_USE="btree? ( tokyocabinet ) bzip2? ( btree ) geoipv2? ( geoip ) 
zlib? ( btree )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="sys-libs/ncurses:0=[unicode?]
+   geoip? (
+   !geoipv2? ( dev-libs/geoip )
+   geoipv2? ( dev-libs/libmaxminddb:0= )
+   )
+   !tokyocabinet? ( dev-libs/glib:2 )
+   tokyocabinet? (
+   dev-db/tokyocabinet[bzip2?,zlib?]
+   btree? (
+   bzip2? ( app-arch/bzip2 )
+   zlib? ( sys-libs/zlib )
+   )
+   )
+   ssl? (
+

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/

2017-11-05 Thread Patrice Clement
commit: 270b12c04e03b62b10656b50cf857901ca47f4d1
Author: Vladimir Pavljuchenkov (SpiderX)  spiderx  dp 
 ua>
AuthorDate: Sun Oct 29 13:47:52 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Nov  5 15:37:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=270b12c0

net-analyzer/goaccess: version bump to 1.2.

1. Added geoipv2 USE-flag to support MaxMind's GeoIP.
2. Updated REQUIRED_USE.

Package-Manager: Portage-2.3.8, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/6064

 net-analyzer/goaccess/Manifest|  1 +
 net-analyzer/goaccess/goaccess-1.2.ebuild | 52 +++
 net-analyzer/goaccess/metadata.xml|  4 +--
 3 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index 52e7eca97bd..48b392b7755 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -3,3 +3,4 @@ DIST goaccess-0.6.1.tar.gz 150264 SHA256 
f414664769c884cdda33c92e6df1069fb8a1750
 DIST goaccess-0.8.5.tar.gz 189006 SHA256 
a4c6b6b98875059409b2a7528d5e7662536591b1949461cb03d88ea1360c3a88 SHA512 
736ae69d0c3bbbaf1d06b287c2d600aae1a72255361c9bb40d1c74986932a771c2b401126e75f22ad4be72f6dc053efd262c40ad40cd62efc57c4461d5481c63
 WHIRLPOOL 
fc2328e558135ca277f8ab52a922a726b3994c47f41fdff2a3110197c4430cb2fd928928d2fba124825a8a127b03ac8551799b0d16b9b2d655ec8a324af56216
 DIST goaccess-0.9.tar.gz 213119 SHA256 
49d8ec4ca2b2ff2e848f278c6eed4a541082cfbf781540140ca16d58735f27fa SHA512 
c25703fa31dd673bdb3463e3c5055ba3452f1fdb452c63114663d9dfb28b95ddb4cd89b03fd4a9fdbabd0efebc2e3ab35238fd15bc46727f794d04ba77fc072c
 WHIRLPOOL 
58b95d5b8a60b49afb423b85040acb2a163452cd21c65a7f44f2c35e53017b28461089fea7edf5f45dc8169f4d92b21bc62d958d9b66d518d2739a5f7d867855
 DIST goaccess-1.1.1.tar.gz 412635 SHA256 
4c73147037b350081d66e912a07fb2f0a60484fad1090a76fb6fc24ee086b6d3 SHA512 
5ceb21754721603fa6422436fcac158bf3ea0ec54680851ceb6616a3385a2ad1ce38670b3cea62e14178e71c32999260fefbc29a82b115b1a1a30010879184d2
 WHIRLPOOL 
8b2d7177ae242bd4cc19d9672d819b6e60316ba0932164254bf21a2c297f7bfb77669d9c289d47d9bd3d854dd440391877bbab956aecd271e5fc8e83cfcd3a27
+DIST goaccess-1.2.tar.gz 423103 SHA256 
6ba9f66540ea58fc2c17f175265f9ed76d74a8432eeac1182b74ebf4f2cd3414 SHA512 
bc31ef1e4c92608635856fa73e69b58267c161a7e3c6f2e3ca8860b862ed1c47575b93943dd975a5f8503774ee90ee0649d380563639e30908d876416638f889
 WHIRLPOOL 
bced8eb90cfda573fc872e392486f86c75eeb5667b7a012d995321dbc730d2ca425f6a310bc5ac987c1eea05c459f4056e32243c3d46586db7db190b960ae44b

diff --git a/net-analyzer/goaccess/goaccess-1.2.ebuild 
b/net-analyzer/goaccess/goaccess-1.2.ebuild
new file mode 100644
index 000..fc407560107
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-1.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in 
a terminal"
+HOMEPAGE="https://goaccess.io;
+SRC_URI="https://tar.goaccess.io/${P}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="btree bzip2 debug geoip geoipv2 getline libressl tokyocabinet ssl 
unicode zlib"
+
+RDEPEND="sys-libs/ncurses:0=[unicode?]
+   geoip? (
+   !geoipv2? ( dev-libs/geoip )
+   geoipv2? ( dev-libs/libmaxminddb:0= )
+   )
+   !tokyocabinet? ( dev-libs/glib:2 )
+   tokyocabinet? (
+   dev-db/tokyocabinet[bzip2?,zlib?]
+   btree? (
+   bzip2? ( app-arch/bzip2 )
+   zlib? ( sys-libs/zlib )
+   )
+   )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+REQUIRED_USE="btree? ( tokyocabinet ) bzip2? ( btree ) geoipv2? ( geoip ) 
zlib? ( btree )"
+
+src_configure() {
+   econf \
+   $(use_enable bzip2 bzip) \
+   $(use_enable zlib) \
+   $(use_enable debug) \
+   $(use_enable geoip geoip $(usex geoipv2 mmdb legacy)) \
+   $(use_enable tokyocabinet tcb $(usex btree btree memhash)) \
+   $(use_enable unicode utf8) \
+   $(use_with getline) \
+   $(use_with ssl openssl)
+}
+
+pkg_preinst() {
+   # Change path to GeoIP bases in config
+   sed -e s':/usr/local:/usr:' -i "${ED%/}"/etc/goaccess.conf || die "sed 
failed for goaccess.conf"
+}

diff --git a/net-analyzer/goaccess/metadata.xml 
b/net-analyzer/goaccess/metadata.xml
index d71ec455982..f0fb091e2b5 100644
--- a/net-analyzer/goaccess/metadata.xml
+++ b/net-analyzer/goaccess/metadata.xml
@@ -1,4 +1,4 @@
-
+
 http://www.gentoo.org/dtd/metadata.dtd;>
 

@@ -17,6 +17,7 @@


Enable Tokyo Cabinet's on-disk B+ Tree 
database backend
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/

2017-01-16 Thread David Seifert
commit: 1259a7141ff4d6d56b1f2792f049a6c79c20f45d
Author: Vladimir Pavljuchenkov (SpiderX)  spiderx  dp 
 ua>
AuthorDate: Sun Jan 15 18:20:00 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Jan 16 18:07:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1259a714

net-analyzer/goaccess: bump to 1.1.1

1. Added bzip2, getline, libressl, ssl, zlib USE-flags with corresponding 
support in ebuild.
2. Fixed RDEPEND for ncurses, openssl, tokyocabinet.
3. Updated REQUIRED_USE.
4. Modified src_configure section.
5. Use ${ED%/} instead of ${D}.

Gentoo-Bug: https://bugs.gentoo.org/559200

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/3435

 net-analyzer/goaccess/Manifest  |  1 +
 net-analyzer/goaccess/goaccess-1.1.1.ebuild | 51 +
 net-analyzer/goaccess/metadata.xml  | 13 
 3 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index 703d84e..52e7eca 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -2,3 +2,4 @@ DIST goaccess-0.5.tar.gz 127068 SHA256 
beabad8267099d693cf2f0a6f533ecf5b5bdcc829
 DIST goaccess-0.6.1.tar.gz 150264 SHA256 
f414664769c884cdda33c92e6df1069fb8a1750d19955122b3f030614d414afa SHA512 
67712e4af16c6e039ca46f6f8d8302a58be1e0cfd0c76930068c03a9989c35b58b61f7b1e6a9e79cbb978c8f492b80782b8c7b894abc2e067f0a520e2981f98b
 WHIRLPOOL 
efa017b3951a7cbb80a041a63eef8cf13035be62d92be7da3df55a5ee7bc4d4b10e570023d488fad993a96c0da9c7bdb122009cf1e52e9c9e6a112e6e10c3420
 DIST goaccess-0.8.5.tar.gz 189006 SHA256 
a4c6b6b98875059409b2a7528d5e7662536591b1949461cb03d88ea1360c3a88 SHA512 
736ae69d0c3bbbaf1d06b287c2d600aae1a72255361c9bb40d1c74986932a771c2b401126e75f22ad4be72f6dc053efd262c40ad40cd62efc57c4461d5481c63
 WHIRLPOOL 
fc2328e558135ca277f8ab52a922a726b3994c47f41fdff2a3110197c4430cb2fd928928d2fba124825a8a127b03ac8551799b0d16b9b2d655ec8a324af56216
 DIST goaccess-0.9.tar.gz 213119 SHA256 
49d8ec4ca2b2ff2e848f278c6eed4a541082cfbf781540140ca16d58735f27fa SHA512 
c25703fa31dd673bdb3463e3c5055ba3452f1fdb452c63114663d9dfb28b95ddb4cd89b03fd4a9fdbabd0efebc2e3ab35238fd15bc46727f794d04ba77fc072c
 WHIRLPOOL 
58b95d5b8a60b49afb423b85040acb2a163452cd21c65a7f44f2c35e53017b28461089fea7edf5f45dc8169f4d92b21bc62d958d9b66d518d2739a5f7d867855
+DIST goaccess-1.1.1.tar.gz 412635 SHA256 
4c73147037b350081d66e912a07fb2f0a60484fad1090a76fb6fc24ee086b6d3 SHA512 
5ceb21754721603fa6422436fcac158bf3ea0ec54680851ceb6616a3385a2ad1ce38670b3cea62e14178e71c32999260fefbc29a82b115b1a1a30010879184d2
 WHIRLPOOL 
8b2d7177ae242bd4cc19d9672d819b6e60316ba0932164254bf21a2c297f7bfb77669d9c289d47d9bd3d854dd440391877bbab956aecd271e5fc8e83cfcd3a27

diff --git a/net-analyzer/goaccess/goaccess-1.1.1.ebuild 
b/net-analyzer/goaccess/goaccess-1.1.1.ebuild
new file mode 100644
index ..28c284b
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-1.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in 
a terminal"
+HOMEPAGE="http://goaccess.io;
+SRC_URI="http://tar.goaccess.io/${P}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="btree bzip2 debug geoip getline libressl ssl tokyocabinet unicode zlib"
+
+RDEPEND="
+   sys-libs/ncurses:0=[unicode?]
+   geoip? ( dev-libs/geoip )
+   !tokyocabinet? ( dev-libs/glib:2 )
+   tokyocabinet? (
+   dev-db/tokyocabinet[bzip2?,zlib?]
+   btree? (
+   bzip2? ( app-arch/bzip2 )
+   zlib? ( sys-libs/zlib )
+   )
+   )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+REQUIRED_USE="btree? ( tokyocabinet ) bzip2? ( btree ) zlib? ( btree )"
+
+src_configure() {
+   econf \
+   $(use_enable bzip2 bzip) \
+   $(use_enable zlib) \
+   $(use_enable debug) \
+   $(use_enable geoip) \
+   $(use_enable tokyocabinet tcb $(usex btree btree memhash)) \
+   $(use_enable unicode utf8) \
+   $(use_with getline) \
+   $(use_with ssl openssl)
+}
+
+pkg_preinst() {
+   # Change path to GeoIP bases in config
+   sed -e s':/usr/local:/usr:' -i "${ED%/}"/etc/goaccess.conf || die "sed 
failed for goaccess.conf"
+}

diff --git a/net-analyzer/goaccess/metadata.xml 
b/net-analyzer/goaccess/metadata.xml
index 51d6d6e..9bb61d3 100644
--- a/net-analyzer/goaccess/metadata.xml
+++ b/net-analyzer/goaccess/metadata.xml
@@ -4,25 +4,26 @@

spid...@spiderx.dp.ua
Vladimir Pavljuchenkov
-   Proxy maintainer



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/goaccess/

2017-01-16 Thread David Seifert
commit: 64dbab7d014c2055e65abceb698e5f01e7ddbceb
Author: David Seifert  gentoo  org>
AuthorDate: Mon Jan 16 18:07:21 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Jan 16 18:07:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64dbab7d

net-analyzer/goaccess: Add missing subslot operator

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-analyzer/goaccess/goaccess-0.5-r1.ebuild | 4 ++--
 net-analyzer/goaccess/goaccess-0.6.1.ebuild  | 4 ++--
 net-analyzer/goaccess/goaccess-0.8.5.ebuild  | 4 ++--
 net-analyzer/goaccess/goaccess-0.9.ebuild| 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/goaccess/goaccess-0.5-r1.ebuild 
b/net-analyzer/goaccess/goaccess-0.5-r1.ebuild
index c650fbc..25d49a4 100644
--- a/net-analyzer/goaccess/goaccess-0.5-r1.ebuild
+++ b/net-analyzer/goaccess/goaccess-0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ IUSE="geoip unicode"
 
 RDEPEND="
dev-libs/glib:2
-   sys-libs/ncurses[unicode?]
+   sys-libs/ncurses:0=[unicode?]
geoip? ( dev-libs/geoip )
 "
 DEPEND="${RDEPEND}

diff --git a/net-analyzer/goaccess/goaccess-0.6.1.ebuild 
b/net-analyzer/goaccess/goaccess-0.6.1.ebuild
index 58d2202..477b938 100644
--- a/net-analyzer/goaccess/goaccess-0.6.1.ebuild
+++ b/net-analyzer/goaccess/goaccess-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ IUSE="geoip unicode"
 
 RDEPEND="
dev-libs/glib:2
-   sys-libs/ncurses[unicode?]
+   sys-libs/ncurses:0=[unicode?]
geoip? ( dev-libs/geoip )
 "
 DEPEND="${RDEPEND}

diff --git a/net-analyzer/goaccess/goaccess-0.8.5.ebuild 
b/net-analyzer/goaccess/goaccess-0.8.5.ebuild
index 4cbfbfd..12392c9 100644
--- a/net-analyzer/goaccess/goaccess-0.8.5.ebuild
+++ b/net-analyzer/goaccess/goaccess-0.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ REQUIRED_USE="btree? ( !memhash )"
 
 RDEPEND="
dev-libs/glib:2
-   sys-libs/ncurses[unicode?]
+   sys-libs/ncurses:0=[unicode?]
geoip? ( dev-libs/geoip )
btree? ( dev-db/tokyocabinet )
memhash? ( dev-db/tokyocabinet )

diff --git a/net-analyzer/goaccess/goaccess-0.9.ebuild 
b/net-analyzer/goaccess/goaccess-0.9.ebuild
index ea4dafe..f9e77ac 100644
--- a/net-analyzer/goaccess/goaccess-0.9.ebuild
+++ b/net-analyzer/goaccess/goaccess-0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ IUSE="btree debug geoip tokyocabinet unicode"
 REQUIRED_USE="btree? ( tokyocabinet )"
 
 RDEPEND="
-   sys-libs/ncurses[unicode?]
+   sys-libs/ncurses:0=[unicode?]
geoip? ( dev-libs/geoip )
!tokyocabinet? ( dev-libs/glib:2 )
tokyocabinet? (