gentoo resync : 25.11.2020

4 files changed, 66 insertions, 73 deletions

diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index 45244eab08ae..8f0e961bfa2c 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1,6 +1,6 @@
-DIST goaccess-1.2.tar.gz 423103 BLAKE2B 87c527a52db9fa69d6e6a02ffbda64a6a32e6214ca6bc1f2654e1451fe5d73e7caa02cf1416c93c511bee329b7885e4914fb7dfd37562ef5347ea3912d030c14 SHA512 bc31ef1e4c92608635856fa73e69b58267c161a7e3c6f2e3ca8860b862ed1c47575b93943dd975a5f8503774ee90ee0649d380563639e30908d876416638f889
 DIST goaccess-1.3.tar.gz 541374 BLAKE2B 55942e35d06f1467df9b80a3fc42211e867b08963a7334783c0279ba7b9e0fd8d6e197277bee780547a9b8f6264ae15844374604f6d7c1b3b57f57768c2b2019 SHA512 7ab8a42670c2009459eee6979cb14e32e7e776e89912077882652631d0ce6ff801fba46d91ab5c23af1229f000e220863e9b70336fcd9fe11521d0ae1fd3bde1
-EBUILD goaccess-1.2.ebuild 1398 BLAKE2B 8c819456c94145829b9509e8938790acd090831fb46efe02d32b6494eef9004f77fd264e36927cba70c2517a41e8fe6782b781d59643bda826fff747083a39ac SHA512 b08146d7354977cc33070b01807a5a0ce86a529bfe6002e2a900a4e263d562566477de61ca24ffcfaba9974deae93a525d2d930b0bf2725583440ab39fdc0d3e
+DIST goaccess-1.4.2.tar.gz 633162 BLAKE2B 4da268bb051114893b480e4eef18e007ccffb9b61ae49cc9a96622864716a44793f0895b5d27685e1b5e22c33f1bdd256dc148d26c7b6fefbd982a3f8fdf1960 SHA512 14bc5a08c2e6bb1db8d664a224b778603a358cf3a52a341a3a3e04e84337d0bb574892cb5005dc62098a8a6f0a834d1014479c29593714fdd6a87cedb3f3fb38
 EBUILD goaccess-1.3.ebuild 1512 BLAKE2B dfb4a092095509a7e6a335a7568a3a8b48904ebf95aaa6671c42194a42ea68a17448f3555aadacf455b5ed85456a11990c83b403ebf52706337dda1f70128212 SHA512 310a8f624a6d3404e14bc8fd1ecdb157c993b9f69390e7ade4e7b0bab3a47c4cbdc27590bf196c64f48fb8ebc2cbfa5230d812ffe4cca2def6d71761c415d281
-EBUILD goaccess-9999.ebuild 1462 BLAKE2B fe2a895d73c2ee02481cfce7883cafff413eede2717428c98cf581c1854ed10529b6c910c7ae1c096e091845d73a204075d745fa51f7721d223d2a938f402456 SHA512 572eaf67fbfeaafd8d3783a75400f179fc2687f94d4410a2091d9f264b795273775af810e60309cb9e82618b20c70f8ac7502b3b5bb996c5af727d5d40368e55
+EBUILD goaccess-1.4.2.ebuild 1199 BLAKE2B 3a6b7e6320785613f5c7154d04a151b47246b011e3eb153dfd2ea026fdd040da0deb98fa5c79114afb1cd97a4943325d92066b8a19703f0c00514a702d9d30f3 SHA512 5a8e44e802859721e837de3744b3f4f07d8fdac4fe3af41829667ceedaf88a63a4cefe05dceb346eee28cf0a3c21e124f7c964450d6099503bf7a7f36a3405c3
+EBUILD goaccess-9999.ebuild 1199 BLAKE2B 3a6b7e6320785613f5c7154d04a151b47246b011e3eb153dfd2ea026fdd040da0deb98fa5c79114afb1cd97a4943325d92066b8a19703f0c00514a702d9d30f3 SHA512 5a8e44e802859721e837de3744b3f4f07d8fdac4fe3af41829667ceedaf88a63a4cefe05dceb346eee28cf0a3c21e124f7c964450d6099503bf7a7f36a3405c3
 MISC metadata.xml 1111 BLAKE2B bb28688ec15c422d544dc1aabb460a855687dffad74938643efc545c6c99b2369ab19db620dbaa047f0644b65ba355f4f0e42822400478a5f7d5fcf8960abd7f SHA512 30623dd40bc45ab6bb29f2413a62dd17c66565f9261c3f8b764b97e3b300078897b573b5ebae7f021408792da6d518c294955b8a1fb1dd58d000c4c5cfd0fb4a
diff --git a/net-analyzer/goaccess/goaccess-1.2.ebuild b/net-analyzer/goaccess/goaccess-1.2.ebuild
deleted file mode 100644
index fc4075601073..000000000000
--- 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"
-}
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 000000000000..e029cb0bf444
--- /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} = *9999* ]] ; 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)"
+}
diff --git a/net-analyzer/goaccess/goaccess-9999.ebuild b/net-analyzer/goaccess/goaccess-9999.ebuild
index a5512dc51d48..e029cb0bf444 100644
--- a/net-analyzer/goaccess/goaccess-9999.ebuild
+++ b/net-analyzer/goaccess/goaccess-9999.ebuild
@@ -1,21 +1,25 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 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
 
-inherit autotools git-r3
+if [[ ${PV} = *9999* ]] ; 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="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 +27,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 +44,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)"