4 files changed, 32 insertions, 46 deletions
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index 5a2e7b591b58..526327fa546f 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -1,8 +1,7 @@
 AUX lnav-0.8.3-disable-tests.patch 673 BLAKE2B f966d6d2bb2f0a4e888b0a286c01d898cfa07c848d39f6d74c865dd489b4a4a3dd36f177873cf41d1f63ac6f4d25956fab54d4b932b170adc795bce4da1fd174 SHA512 fba61b037e01d4bc91101b24ff706b51f0fd3541756add7f7e3f4240a803c76eca808073423531a70c2700359fe36b360a79de3766a8fea7e2ef276db2ef4930
-DIST lnav-0.8.1.tar.gz 616105 BLAKE2B fe37599426c606ec186cd3feac5f9b1023d939a13a03f51a53f64db681c2c42a68152895d3afe17c02804d18735310d48d63338e301732fe3228465dd1d20b3b SHA512 b3514834f42ed647f40c501ad22b68a52755b0c8a558d29305c357b39e598c1386ec9e37d71e8b7e2b5833df41e5f7f398b50b84611d3e6accfb2feb2cdba952
-DIST lnav-0.8.2.tar.gz 693219 BLAKE2B b58133cc54e8c1cdbaa461bef96a87b7d991de2c6d8b626243181d42719ed16c7c10f26a86fafa9aa30cc8b52982af233deb387a19a8442b426462189ffc95c0 SHA512 75c7014e013567e9a0ee78e28a6648d756de7cba3c103b10ddb974c61066db3a1c2efbd14636cb3729bd7c6a4ab534d1999d44e127b8a6728d12bd5be23f30c4
+AUX lnav-0.8.4-disable-tests.patch 385 BLAKE2B b00a7e4af717a567bf9a7bbecc77500afc22ccab48caaa3781a3d786f4487bcedc59db06b01bfbdcf7871b08cc3b8841582341bec1d707ccf3c94e180a3e59f6 SHA512 f199ec2e9b9a87b8665705051c2a833b8643b18f4793f00587b27eebf0fd455e3d09cbe40613c4e87db58fb91d1f491893d6d9eae38d81de4bb96452e1fb8489
 DIST lnav-0.8.3.tar.gz 785911 BLAKE2B 47800f27de0ad585082abaa2af3139d79506bc74d86c175040792eeaa89268711d8fd4b3737412a3dc59a566bb880f9c9fa248e48d665d25f24e1f139f9a1375 SHA512 21d0229abf9b572dcc426b6a5e87b8c84f4eb0a7f37ed62d0c08b7bd7c88868a13262f9c78b6af3f3a492b5853b68c8cf8f09ca8d24e77aaa2f2ad0f0f128022
-EBUILD lnav-0.8.1.ebuild 715 BLAKE2B 867408f0093ba8f81cf1315675d8c04c0315d3715627401063b63787e6a42a87a14a43b6f18d200e885ba4c342338fb01e2b97fe3717a104993c149fdaf54053 SHA512 27fefba75e2149e09668f807e6978556b12842c8b20e2bad505ce382898a3deac21e74ab47604635cc289e85b6ee4552947d5e54460eade962e78bccb52752a0
-EBUILD lnav-0.8.2.ebuild 672 BLAKE2B 311c8148acc03de25836f0830b4bcd5db5969ccb562db3cabd14992064088590dc126082677a2a05cdf432f9e94ae41e48bc102901ffa291afc310c43822c363 SHA512 58bbf5568efc25df9be91dbc7a233e5b5ec47ed35a1688438f05ae3d489d5f3aa39223a9c49053dc2151ff1e5680a475a1489d738f0792e8106f1176b0c45c03
+DIST lnav-0.8.4.tar.gz 840718 BLAKE2B 3efa958bf8c8031a7c53db1a5277cf5cd17acfcc50583f0a9c5097ee7aa679bc3d9b8346e5fdecf91d053aba6ca320e5e9bcb827e0b0bf5c1a12d4d03c307b87 SHA512 79ef5712dbeea941f7d0a80652d25394ca4e278c983eef0b3ad9f22ddddb90dee13dc50ae475632673575ace795f793bbb8e14b85ac4df786b94743e7a7596fb
 EBUILD lnav-0.8.3.ebuild 774 BLAKE2B f34a27225f2ecd9716a27de2d231a8c25df5bb70aec763803980c2c54a573867265667eb2b0b84fc3aaca6d124f5fb6eccf1af4677c2fdb2699702a29c27fa43 SHA512 6fa91129af3860d4b47ebf342d633048aae4395558ea81173fbd86c5313b19eec3cf94addc9e131ce0f03c2b9a0a75c479ae314dabc29cd2a9237243ef8120fd
+EBUILD lnav-0.8.4.ebuild 777 BLAKE2B 4c6c25f873afbbddb8b29b9538301c1d271a0ccb89207e68b09a6e9a023531f3646534adf1fe1f1727fea864488cb0432e9f3e679748d8b23cb967a33bc378db SHA512 6b0c41b16a1fb4c7c5bc8de66474507ddc19f22f95d506fb63c5314672316d970cdf747b8d4adf461ec2a896d6a9edce38487829f119fcc35a79bf8d34f96b29
 MISC metadata.xml 332 BLAKE2B 2c99546c3e0f0ed5241279bcb00e56c7104b70b28991c50763ad3664d1d7ea2441a1b3f973c44f267c80dbc98eb3593579fa49092a0ed77d34d04503942338ac SHA512 38280dd0af700835f8fdb73eb9085f5c0a027ba9111377253a29f174bc63547f59ddb2025d35a72faeee7f1e9ee3c57f2411242df1c46c5d07d3a8b5211cf9b7
diff --git a/app-admin/lnav/files/lnav-0.8.4-disable-tests.patch b/app-admin/lnav/files/lnav-0.8.4-disable-tests.patch
new file mode 100644
index 000000000000..6b431c33b133
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.8.4-disable-tests.patch
@@ -0,0 +1,18 @@
+--- lnav-0.8.4/test/Makefile.am
++++ lnav-0.8.4/test/Makefile.am
+@@ -373,7 +373,6 @@
+ 	test_concise \
+ 	test_line_buffer2 \
+ 	test_line_buffer.sh \
+-	test_listview.sh \
+ 	test_meta.sh \
+ 	test_grep_proc.sh \
+ 	test_grep_proc2 \
+@@ -381,7 +380,6 @@
+ 	test_json_op.sh \
+ 	test_json_ptr_walk.sh \
+ 	test_log_accel \
+-	test_logfile.sh \
+ 	test_pcrepp \
+ 	test_reltime \
+ 	test_scripts.sh \
diff --git a/app-admin/lnav/lnav-0.8.2.ebuild b/app-admin/lnav/lnav-0.8.2.ebuild
deleted file mode 100644
index c7ce22bb4de3..000000000000
--- a/app-admin/lnav/lnav-0.8.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A curses-based tool for viewing and analyzing log files"
-HOMEPAGE="http://lnav.org"
-SRC_URI="https://github.com/tstack/lnav/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="unicode"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-db/sqlite:3
-	dev-libs/libpcre[cxx]
-	>=net-misc/curl-7.23.0
-	sys-libs/ncurses:0=[unicode?]
-	sys-libs/readline:0=
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with unicode ncursesw)
-}
diff --git a/app-admin/lnav/lnav-0.8.1.ebuild b/app-admin/lnav/lnav-0.8.4.ebuild
index c11649613fee..0d788cfb2991 100644
--- a/app-admin/lnav/lnav-0.8.1.ebuild
+++ b/app-admin/lnav/lnav-0.8.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs
+inherit toolchain-funcs autotools
 
 DESCRIPTION="A curses-based tool for viewing and analyzing log files"
 HOMEPAGE="http://lnav.org"
@@ -15,23 +15,25 @@ KEYWORDS="~amd64 ~x86"
 IUSE="unicode"
 
 RDEPEND="
-	app-arch/bzip2
+	app-arch/bzip2:0=
 	dev-db/sqlite:3
 	dev-libs/libpcre[cxx]
 	>=net-misc/curl-7.23.0
 	sys-libs/ncurses:0=[unicode?]
 	sys-libs/readline:0=
-	sys-libs/zlib"
+	sys-libs/zlib:0="
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS NEWS README )
+PATCHES=( "${FILESDIR}"/${P}-disable-tests.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf \
 		--disable-static \
 		$(use_with unicode ncursesw)
 }
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}