gentoo resync : 10.11.2017

3 files changed, 57 insertions, 3 deletions

diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index b0ceda310a6f..8facfbc04a4e 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -5,11 +5,13 @@ 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
 EBUILD goaccess-0.5-r1.ebuild 993 SHA256 6242807d76d4f3fd4e9602d8b4b6b20436ce7024922f1a99094080124c49c5d7 SHA512 86244e84b7fe24fd199499ec9fcff2daae13d9d440e507dd1f5e554a63fc1fe747ee38dee5aa8993fad8d31c25ddbecb4050a364bfbcdc7b8591ce4a056211d1 WHIRLPOOL 74a92794bde82b26539fa21a38cc83763fb36f3bc6d9c809e697f6bc38526b1a8524d0bfd632205af18d7bcf24c176ba11893008a559b7204b8bc7c2b3c1aa8f
 EBUILD goaccess-0.6.1.ebuild 929 SHA256 ca4c02589345877bc092d8ba292047d17e419bc315ff74fc1a2199baa51f400e SHA512 96a818290e67fc1a3c1f6833ed2a8f6abaf57cd9c2738fce5931d40e09c02fdcabbf128240921f9873491ec9c0b33bfb307a80645341f1e9931c7ea96a666829 WHIRLPOOL ddb2d931aa49494fe05551f6890e9056586862b3c436ba9e4bbdc3c6989708c27c77d9a776383ea74eec73082146b126eafd399b3c0d2a8a65d4e0292449dfa3
 EBUILD goaccess-0.8.5.ebuild 1079 SHA256 9de337c985cdcdd60aac7b93b9fd917054478b93c8372cc01d52d0398771bb4b SHA512 8d82dca54efa9b5759a095d4106f4e93db633238b653ee65f665e2002c009e9111b37762a15a9f3f6eaa9439a9e1aa76b175a61bfc3c90d7cab936108450e801 WHIRLPOOL a6717f552240a33148aef3b9fd6f224923ce30fcd12dba2049d7bf49829dcc7fd98ec7d78a052fae25688a3d9a4db554bb11b140869526221dcfd6c6484dc712
 EBUILD goaccess-0.9.ebuild 1088 SHA256 21cd6a4eafb8bf18e37a25ad62e76aa26ae4d208e460a6c411bc576dc34fe3e7 SHA512 0b0c77a68152711e06e30b3a34492a3d095648213c84586c885a5fd69f4c61600ea47c3dfc9ce3ede7fd6f43a929d1de69b68fd60c9d0d32fa8ae0fb12f65ab5 WHIRLPOOL af8603399ecdb9874dbd3f77fa05a55fb20f88302d26e475c85e4bed86720b93910631d643e7ac668994d65425988739926114e3c855b69fd7de9632f8db36ca
 EBUILD goaccess-1.1.1.ebuild 1280 SHA256 58bbfa239bbc303ef0876b2d561ba2a3767b82d454b59f8cf12a366c5814266f SHA512 2b0784d5f6138c0582f502d37fa82a88c730d3a9589041189ffb54ee1172534c00f8ecf71ffc221e117e583f0b23318fcbd611ab768c65f3d3ded465d06fe012 WHIRLPOOL 7e43972da5803c6af6368e61f899d87ddbd6d3430baf35fa1678b3b619f40c0b39b40924b19d52bfb5fcd4ded52a2217c8fa87d426b160ce098a2b70c53b3d18
+EBUILD goaccess-1.2.ebuild 1398 SHA256 8eded6a05bddae06923f4f6f8427aaec7ec45735c9a3835fd42f8b8497549fff SHA512 b08146d7354977cc33070b01807a5a0ce86a529bfe6002e2a900a4e263d562566477de61ca24ffcfaba9974deae93a525d2d930b0bf2725583440ab39fdc0d3e WHIRLPOOL 17925183a55c713968df85abdb42b862bacf5311b8d43013c65fd813950d7875fabd838abc566181142986a74b1d0959c96842513f5a9861a6b44004bdcf76a8
 MISC ChangeLog 3215 SHA256 680b2130239c52031fd26a40fae69a41ee8c995c14d7f889b30f6ffe6d27abcc SHA512 3c3b227dbd37aa883ba31f59bcd1f303db5b0a0d6b1a0312c021a84d7319d625ca14c78300f2300ce80df26b215c1957b511ed7edcfa72c1812f7adb739ba42b WHIRLPOOL 68b69ed472aeaab5574487e66bb75308b97f93a27c9ca248a7e071914b12c31a64717b8ae8666b77a312a13f0ecca0e0f06c6eb2c64df5a536447cd79b190125
 MISC ChangeLog-2015 1856 SHA256 0ab8b3aa3beead809bfdb11f8961715576d82a6cc3afa8afab69afad37dc6337 SHA512 9d6fd1bae575336c647b43e9fb9d7ba0579247e3a8330eefb44877d4904ce3c278954230024fd6303d4e9c75a34a1f30c642830f4f1f5cc11cc6d9b948fa4eb7 WHIRLPOOL 17d267a62a328522d6bfb2edce5c2517e710ffb6d4b2bf5494fa3db5ad54962c227e8672478852b703af51f90069453153d0e6cf332df8c11dd1f51e51939a30
-MISC metadata.xml 1241 SHA256 40382963ad58d31a776c65c30b9bea6764eb2009bb2e6280240fa496a621e366 SHA512 57c94633b42e29c362a29aa665207db35adcb9017c9f30eefdea4b31fba2698b37230e00b08682fc718f548c45ee3ab9e244d2f8a4226e45a1d4df83f4533263 WHIRLPOOL 6dde172071f5586a1b87f1013ee1c5ffb30b32a53eb32130327122e43fe782aae87ed96368f18229c1716893a13d1d0a49b436d2d31ab827f737784af530d5f0
+MISC metadata.xml 1285 SHA256 28ba90ec96dcb213fde33b474842a428a27f3e62df4084ba4d990421bd0e0dba SHA512 78f3ef78c2b82a194eff376d6403eb4efea871bf43081310e59f3dcc03910cb9c8dab180c6adddd3356c7e5d6f6e13e3bfe062ed90421923de1793a4106e81e6 WHIRLPOOL 7bb095143cede14d78773c6a7038432b49bfac84fe26c56360e73d8cd1e855c0e29073a7a315d9db7555b1c3d59930915e16317c248720e94ba233c13a5dc16c
diff --git a/net-analyzer/goaccess/goaccess-1.2.ebuild b/net-analyzer/goaccess/goaccess-1.2.ebuild
new file mode 100644
index 000000000000..fc4075601073
--- /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 d71ec4559820..f0fb091e2b59 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@prosoftcorp.com</bugs-to>
 		<remote-id type="github">allinurl/goaccess</remote-id>
-		<remote-id type="sourceforge">goaccess</remote-id>
 	</upstream>
 </pkgmetadata>