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

["David Seifert" <soap@gentoo.org>]

commit:     1259a7141ff4d6d56b1f2792f049a6c79c20f45d
Author:     Vladimir Pavljuchenkov (SpiderX) <spiderx <AT> spiderx <DOT> dp <DOT> ua>
AuthorDate: Sun Jan 15 18:20:00 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 18:07:42 2017 +0000
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 00000000..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 @@
 	<maintainer type="person">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
-		<description>Proxy maintainer</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>GoAccess is an open source real-time web log analyzer and 
-interactive viewer that runs in a terminal in *nix systems. It provides fast and valuable
-HTTP statistics for system administrators that require a visual server report on the fly.
+	<longdescription lang="en">
+	GoAccess is an open source real-time web log
+	analyzer and interactive viewer that runs in a terminal in *nix systems.
+	It provides fast and valuable HTTP statistics for system administrators
+	that require a visual server report on the fly.
 	</longdescription>
 	<use>
 		<flag name="btree">Enable Tokyo Cabinet's on-disk B+ Tree database backend</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>
 	</use>
 	<upstream>
-		<changelog>https://github.com/allinurl/goaccess/blob/master/ChangeLog</changelog>
 		<doc>http://goaccess.io/faq</doc>
 		<bugs-to>mailto:goaccess@prosoftcorp.com</bugs-to>
-		<remote-id type="sourceforge">goaccess</remote-id>
+		<remote-id type="github">allinurl/goaccess</remote-id>
 	</upstream>
 </pkgmetadata>