11 files changed, 118 insertions, 294 deletions
diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index eb8acbb5ca8a..8bdf9d522260 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1,15 +1,6 @@
-AUX goaccess-0.6.1-CFLAGS.patch 436 BLAKE2B d1b0cc8c0839cbed066898fa6bd848bb3d840ba5aee3cd695689fff749a2486294364972ba7d2ed99e32d1893e25ac87085d6f606e6ee9aa3f417f441c899120 SHA512 f2cb3f242e4f4bea568d0fdf3baf9a7895144d9135c0a85e96ab123f7202ae27797f777f5786c6339bf9d38e737b1398ef72024ed8e3140c7ec43eab3abe833e
-AUX goaccess-0.6.1-tinfo.patch 1412 BLAKE2B 62009b728817853afa9652b316082aa90e1f40e8282ddb39a3f8306107bcb915ba384a8c001da56b863e9f73ed1e4ee46e43fab76b0630344e5db308d37340a1 SHA512 da2c113eccd0e011dbed740c77c80101375b6ab8b0545d733e4bb2c78a3abb71f1546333ca74140c2fdf65cd05b7c15be1298f0b9530bf0523f0d4478c2179ce
-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
-EBUILD goaccess-0.5-r1.ebuild 993 BLAKE2B 3738be02bbce91af9941e30c6002fdb0e63aa6a19d7399e17d8874e51e9183bedc3d2318bdea3cfd706edbfbe2046b8100fb9f9782aa1e104dbf87eb2c5fc106 SHA512 86244e84b7fe24fd199499ec9fcff2daae13d9d440e507dd1f5e554a63fc1fe747ee38dee5aa8993fad8d31c25ddbecb4050a364bfbcdc7b8591ce4a056211d1
-EBUILD goaccess-0.6.1.ebuild 929 BLAKE2B 984a4c379be10221391933f020cb32653e27e411c62b8294a16b1ec74fc1111a73f2e653c233a658b0d845fe923a5748fa9b520163772b7911739d978dc91077 SHA512 96a818290e67fc1a3c1f6833ed2a8f6abaf57cd9c2738fce5931d40e09c02fdcabbf128240921f9873491ec9c0b33bfb307a80645341f1e9931c7ea96a666829
-EBUILD goaccess-0.8.5.ebuild 1079 BLAKE2B 1fec28fd326ed8e15965441f4df58a64cc10c827167e3d56d729eb8a3400d69281fbbb44de5d5c71ee68db58da1b3fc6c16285293c3b50a4dea4732c8594fb4e SHA512 8d82dca54efa9b5759a095d4106f4e93db633238b653ee65f665e2002c009e9111b37762a15a9f3f6eaa9439a9e1aa76b175a61bfc3c90d7cab936108450e801
-EBUILD goaccess-0.9.ebuild 1088 BLAKE2B 5c36f8803e294c01a26d04bfeab9b8abafe865a8df9685a2396ef184e895dc3de7c1b144af0acc55d8338aaec32b6b6eadce9130602c5e7dbf32b6de43993007 SHA512 0b0c77a68152711e06e30b3a34492a3d095648213c84586c885a5fd69f4c61600ea47c3dfc9ce3ede7fd6f43a929d1de69b68fd60c9d0d32fa8ae0fb12f65ab5
-EBUILD goaccess-1.1.1.ebuild 1280 BLAKE2B 2f7ad866359f70511bd55fcfe7e6253551737759cf69e32b1f02289d66a4af37487db4245a270356f9d3595c8a675c2d91fa65477a87175b85ed9c4f8d81a8db SHA512 2b0784d5f6138c0582f502d37fa82a88c730d3a9589041189ffb54ee1172534c00f8ecf71ffc221e117e583f0b23318fcbd611ab768c65f3d3ded465d06fe012
+DIST goaccess-1.3.tar.gz 541374 BLAKE2B 55942e35d06f1467df9b80a3fc42211e867b08963a7334783c0279ba7b9e0fd8d6e197277bee780547a9b8f6264ae15844374604f6d7c1b3b57f57768c2b2019 SHA512 7ab8a42670c2009459eee6979cb14e32e7e776e89912077882652631d0ce6ff801fba46d91ab5c23af1229f000e220863e9b70336fcd9fe11521d0ae1fd3bde1
 EBUILD goaccess-1.2.ebuild 1398 BLAKE2B 8c819456c94145829b9509e8938790acd090831fb46efe02d32b6494eef9004f77fd264e36927cba70c2517a41e8fe6782b781d59643bda826fff747083a39ac SHA512 b08146d7354977cc33070b01807a5a0ce86a529bfe6002e2a900a4e263d562566477de61ca24ffcfaba9974deae93a525d2d930b0bf2725583440ab39fdc0d3e
-MISC metadata.xml 1285 BLAKE2B 7150db75d1e0efadca73a249c43e5edab081b08f3bf0076fb6f389cfbe61a8f8a3834e435a0ded45fa4510abe3e733980ef6df64a5efa81bde2fdd12960dee02 SHA512 78f3ef78c2b82a194eff376d6403eb4efea871bf43081310e59f3dcc03910cb9c8dab180c6adddd3356c7e5d6f6e13e3bfe062ed90421923de1793a4106e81e6
+EBUILD goaccess-1.3.ebuild 1514 BLAKE2B a0c9c26a6300fa49c3b99778b2e2fc246939d9d21229cf61107a3ea2be381ff972b6d1eee28b09d09d40d84f25db3e02bcd0e250c8318d6fe5981b4209dc081f SHA512 d9f9425bad510a2c454cb717e6ecf35e6342513288b14e8a80bf11f0bfa7889381af95f5f84c486a7bab8f1e4257306bc0a24b636999e461a36e00eabeb4e14f
+EBUILD goaccess-9999.ebuild 1462 BLAKE2B fe2a895d73c2ee02481cfce7883cafff413eede2717428c98cf581c1854ed10529b6c910c7ae1c096e091845d73a204075d745fa51f7721d223d2a938f402456 SHA512 572eaf67fbfeaafd8d3783a75400f179fc2687f94d4410a2091d9f264b795273775af810e60309cb9e82618b20c70f8ac7502b3b5bb996c5af727d5d40368e55
+MISC metadata.xml 1111 BLAKE2B bb28688ec15c422d544dc1aabb460a855687dffad74938643efc545c6c99b2369ab19db620dbaa047f0644b65ba355f4f0e42822400478a5f7d5fcf8960abd7f SHA512 30623dd40bc45ab6bb29f2413a62dd17c66565f9261c3f8b764b97e3b300078897b573b5ebae7f021408792da6d518c294955b8a1fb1dd58d000c4c5cfd0fb4a
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 909b38f5730b..000000000000
--- 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 76d6cbcbcf71..000000000000
--- 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 x"$USE_UTF8" = "xyes"; then
-+   AC_CHECK_LIB([ncursesw], [mvaddwstr], , [AC_MSG_ERROR([libncursesw5-dev is missing])])
-+   AC_SEARCH_LIBS([stdscr], [tinfow], ,[AC_MSG_ERROR([Cannot find a library providing stdscr])])
- else
--   AC_CHECK_LIB([ncurses], [refresh], [], [AC_MSG_ERROR([libncurses5-dev is missing])])
--   CFLAGS="-lncurses"
-+   AC_CHECK_LIB([ncurses], [refresh], , [AC_MSG_ERROR([libncurses5-dev is missing])])
-+   AC_SEARCH_LIBS([stdscr], [tinfo], ,[AC_MSG_ERROR([Cannot find a library providing stdscr])])
- fi
- 
- # pthread
- AC_CHECK_LIB([pthread], [pthread_create], [], [AC_MSG_ERROR([pthread is missing])])
--CFLAGS="-pthread"
- 
- # Checks for libraries.
- AC_CHECK_LIB([glib-2.0], [g_free], [], [AC_MSG_ERROR([glib-2.x is missing])])
diff --git a/net-analyzer/goaccess/goaccess-0.5-r1.ebuild b/net-analyzer/goaccess/goaccess-0.5-r1.ebuild
deleted file mode 100644
index efe48d4f17d3..000000000000
--- a/net-analyzer/goaccess/goaccess-0.5-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
-
-DESCRIPTION="A real-time Apache log analyzer and interactive viewer that runs in a terminal"
-HOMEPAGE="http://goaccess.prosoftcorp.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="geoip unicode"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-libs/ncurses:0=[unicode?]
-	geoip? ( dev-libs/geoip )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# respect CFLAGS, bug #451806
-	sed -i -e '/AM_CFLAGS/s/-g//' Makefile.am || die 'sed failed'
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# configure does not properly recognise '--disable-something'
-	local myeconfargs=(
-		$(usex geoip '--enable-geoip' '' '' '')
-		$(usex unicode '--enable-utf8' '' '' '')
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile CFLAGS="${CFLAGS}"
-}
diff --git a/net-analyzer/goaccess/goaccess-0.6.1.ebuild b/net-analyzer/goaccess/goaccess-0.6.1.ebuild
deleted file mode 100644
index 76e6117c2e5a..000000000000
--- a/net-analyzer/goaccess/goaccess-0.6.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
-
-DESCRIPTION="A real-time Apache log analyzer and interactive viewer that runs in a terminal"
-HOMEPAGE="http://goaccess.prosoftcorp.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="geoip unicode"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-libs/ncurses:0=[unicode?]
-	geoip? ( dev-libs/geoip )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-CFLAGS.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-)
-
-src_configure() {
-	# configure does not properly recognise '--disable-something'
-	local myeconfargs=(
-		$(usex geoip '--enable-geoip' '' '' '')
-		$(usex unicode '--enable-utf8' '' '' '')
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile CFLAGS="${CFLAGS}"
-}
diff --git a/net-analyzer/goaccess/goaccess-0.8.5.ebuild b/net-analyzer/goaccess/goaccess-0.8.5.ebuild
deleted file mode 100644
index 6e14a77788ec..000000000000
--- a/net-analyzer/goaccess/goaccess-0.8.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-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="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-
-IUSE="btree debug geoip bzip2 memhash unicode zlib"
-
-REQUIRED_USE="btree? ( !memhash )"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-libs/ncurses:0=[unicode?]
-	geoip? ( dev-libs/geoip )
-	btree? ( dev-db/tokyocabinet )
-	memhash? ( dev-db/tokyocabinet )
-	zlib? ( sys-libs/zlib )
-	bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Fix path to GeoIP bases in config
-	sed -e s':/usr/local:/usr:' -i config/goaccess.conf || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable geoip) \
-		$(use_enable bzip2 bzip) \
-		$(use_enable unicode utf8) \
-		$(use_enable zlib) \
-		$(use memhash && echo "--enable-tcb=memhash") \
-		$(use btree && echo "--enable-tcb=btree")
-
-	epatch_user
-}
diff --git a/net-analyzer/goaccess/goaccess-0.9.ebuild b/net-analyzer/goaccess/goaccess-0.9.ebuild
deleted file mode 100644
index 06d537e9023c..000000000000
--- a/net-analyzer/goaccess/goaccess-0.9.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-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="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-
-IUSE="btree debug geoip tokyocabinet unicode"
-
-REQUIRED_USE="btree? ( tokyocabinet )"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	geoip? ( dev-libs/geoip )
-	!tokyocabinet? ( dev-libs/glib:2 )
-	tokyocabinet? (
-		dev-db/tokyocabinet
-		btree? (
-			app-arch/bzip2
-			sys-libs/zlib
-		)
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch_user
-
-	# Fix path to GeoIP bases in config
-	sed -e s':/usr/local:/usr:' -i config/goaccess.conf || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable geoip) \
-		$(use_enable unicode utf8) \
-		$(use_enable tokyocabinet tcb) \
-		$(use_enable btree bzip) \
-		$(use_enable btree zlib) \
-		$(usex tokyocabinet "--enable-tcb=$(usex btree btree memhash)" '')
-}
diff --git a/net-analyzer/goaccess/goaccess-1.1.1.ebuild b/net-analyzer/goaccess/goaccess-1.1.1.ebuild
deleted file mode 100644
index a1184f2bb1ae..000000000000
--- a/net-analyzer/goaccess/goaccess-1.1.1.ebuild
+++ /dev/null
@@ -1,50 +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="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/goaccess-1.3.ebuild b/net-analyzer/goaccess/goaccess-1.3.ebuild
new file mode 100644
index 000000000000..a38a46ce6f72
--- /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-9999.ebuild b/net-analyzer/goaccess/goaccess-9999.ebuild
new file mode 100644
index 000000000000..a5512dc51d48
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-9999.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? (
+		!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 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)"
+}
diff --git a/net-analyzer/goaccess/metadata.xml b/net-analyzer/goaccess/metadata.xml
index f0fb091e2b59..708d4dfe667e 100644
--- a/net-analyzer/goaccess/metadata.xml
+++ b/net-analyzer/goaccess/metadata.xml
@@ -19,12 +19,9 @@
 		<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>
 	</use>
 	<upstream>
-		<doc>http://goaccess.io/faq</doc>
-		<bugs-to>mailto:goaccess@prosoftcorp.com</bugs-to>
 		<remote-id type="github">allinurl/goaccess</remote-id>
 	</upstream>
 </pkgmetadata>