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

[Patrice Clement]

commit:     270b12c04e03b62b10656b50cf857901ca47f4d1
Author:     Vladimir Pavljuchenkov (SpiderX) <spiderx <AT> spiderx <DOT> dp <DOT> ua>
AuthorDate: Sun Oct 29 13:47:52 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Nov  5 15:37:44 2017 +0000
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 00000000000..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 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -17,6 +17,7 @@
 	</longdescription>
 	<use>
 		<flag name="btree">Enable Tokyo Cabinet's on-disk B+ Tree database backend</flag>
+		<flag name="geoipv2">Enable support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
 		<flag name="getline">Use GNU getline() to parse full line requests</flag>
 		<flag name="memhash">Enable Tokyo Cabinet's on-memory hash database backend</flag>
 		<flag name="tokyocabinet">Enable Tokyo Cabinet's on-memory hash database backend</flag>
@@ -25,6 +26,5 @@
 		<doc>http://goaccess.io/faq</doc>
 		<bugs-to>mailto:goaccess@×××××××××××.com</bugs-to>
 		<remote-id type="github">allinurl/goaccess</remote-id>
-		<remote-id type="sourceforge">goaccess</remote-id>
 	</upstream>
 </pkgmetadata>