app-text/lesspipe: Version bump

Signed-off-by: Martin Väth <mvath@google.com>

7 files changed, 118 insertions, 359 deletions

diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index f5327153..d5da64e9 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,2 +1 @@
-DIST lesspipe-1.83.tar.gz 115129 SHA512 c6418ac2bfc2dee9d32d56b0ea4a94954b1431db54fef8b67a9cf7d961cf4a23d87b2f41b2a4560d2333029c6d4ed5c6f399cb635f857bd43f1603993b5cb55d
-DIST lesspipe-1.84_alpha20190413.tar.gz 113872 SHA512 0b7b8f4ff81fb768f645302d20b9e7dd5d88a14ffa91cdf119e516b3db5e55a2d2c1f8ae5ef2dbe253da261a95a80f45cf3ad6b3667bd538ddcb45e3f87ccc44
+DIST lesspipe-1.84.tar.gz 119657 SHA512 f11ef23610f722d62ddf7e084b03967ed59d21af6ac207d4456f625c93c3c58c87ec5907cf6bca00ae5550dcddfc9b7f0be5de51f9ff81044fcff1f1cde81267
diff --git a/app-text/lesspipe/lesspipe-1.83-r3.ebuild b/app-text/lesspipe/lesspipe-1.83-r3.ebuild
deleted file mode 100644
index 54f3d5c7..00000000
--- a/app-text/lesspipe/lesspipe-1.83-r3.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wolfgang Friebel's preprocessor for sys-apps/less. Disable by appending colon"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-case ${PV} in
-9999*)
-	EGIT_REPO_URI="https://github.com/wofr06/${PN}.git"
-	#EGIT_BRANCH="master"
-	EGIT_BRANCH="lesspipe"
-	inherit git-r3
-	SRC_URI=""
-	KEYWORDS="";;
-*alpha*)
-	RESTRICT="mirror"
-	EGIT_COMMIT="87ac1d025ba3417d7703b3ca57d52da055b5b21e"
-	SRC_URI="https://github.com/vaeth/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
-esac
-inherit required-use-warn
-pkg_pretend() {
-	required-use-warn
-}
-
-IUSE="antiword cabextract catdoc +cpio +djvu dpkg +dvi2tty +elinks fastjar +ghostscript gpg +groff hdf5 +html2text id3v2 image isoinfo libplist +links +lynx lzip mp3info mp3info2 netcdf ooffice p7zip pdf pstotext rar rpm +rpm2targz unrar unrtf +unzip +w3m xlhtml"
-
-htmlmode="( || ( html2text links lynx elinks w3m ) )"
-REQUIRED_USE="!rpm2targz? ( rpm? ( cpio ) )
-	ooffice? ${htmlmode}
-	xlhtml? ${htmlmode}"
-REQUIRED_USE_WARN="
-	alpha? ( !catdoc !fastjar !id3v2 !libplist !mp3info !mp3info2 !netcdf
-		!ooffice !pstotext !rar )
-	amd64-fbsd? ( !antiword !catdoc !dpkg !elinks !fastjar !hdf5 !html2text
-		!id3v2 !lzip !mp3info !mp3info2 !netcdf !ooffice !p7zip !pstotext
-		!rar !rpm !unrtf !w3m !xlhtml )
-	arm? ( !antiword !catdoc !fastjar !html2text !id3v2 !mp3info
-		!ooffice !pstotext !rar !xlhtml )
-	arm64? ( !antiword !catdoc !dpkg !elinks !fastjar !html2text !id3v2
-		!mp3info !mp3info2 !netcdf !ooffice !pstotext !rar !unrtf !xlhtml )
-	hppa? ( !catdoc !fastjar !hdf5 !libplist !mp3info2 !netcdf
-		!ooffice !rar !w3m !xlhtml )
-	ia64? ( !antiword !catdoc !fastjar !id3v2 !libplist !mp3info !mp3info2
-		!netcdf !ooffice !pstotext !rar !xlhtml )
-	ppc64? ( !catdoc !fastjar !ooffice !xlhtml )
-	sparc? ( !catdoc !fastjar !id3v2 !libplist !mp3info2 !netcdf
-		!ooffice !pstotext )"
-
-BOTH_DEPEND="sys-apps/file
-	app-arch/xz-utils
-	app-arch/bzip2
-	dev-lang/perl
-	unzip? ( app-arch/unzip )
-	fastjar? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !hppa? ( !ia64?
-		( !ppc64? ( !sparc? ( app-arch/fastjar ) ) ) ) ) ) ) ) )
-	unrar? ( app-arch/unrar )
-	!unrar? (
-		rar? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !hppa? ( !ia64?
-			( app-text/o3read ) ) ) ) ) ) )
-	)
-	lzip? ( !amd64-fbsd? ( app-arch/lzip ) )
-	p7zip? ( !amd64-fbsd? ( app-arch/p7zip ) )
-	cpio? ( app-arch/cpio )
-	cabextract? ( app-arch/cabextract )
-	html2text? ( !amd64-fbsd? ( !arm? ( !arm64? ( app-text/html2text ) ) ) )
-	!html2text? (
-		links? ( www-client/links )
-		!links? (
-			lynx? ( www-client/lynx )
-			!lynx? (
-				elinks? ( !amd64-fbsd? ( !arm64? ( www-client/elinks ) ) )
-				!elinks? (
-					w3m? ( !amd64-fbsd? ( !hppa? ( www-client/w3m ) ) )
-				)
-			)
-		)
-	)
-	groff? ( sys-apps/groff )
-	rpm2targz? ( app-arch/rpm2targz )
-	!rpm2targz? (
-		rpm? ( !amd64-fbsd? ( app-arch/rpm ) )
-	)
-	antiword? ( !amd64-fbsd? ( !arm? ( !arm64? ( !ia64?
-		( app-text/antiword ) ) ) ) )
-	!antiword? (
-		catdoc? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !hppa? ( !ia64?
-			( !ppc64? ( !sparc? ( app-text/catdoc ) ) ) ) ) ) ) ) )
-	)
-	xlhtml? ( !amd64-fbsd? ( !arm? ( !arm64? ( !hppa? ( !ia64? ( !ppc64?
-		( app-text/xlhtml ) ) ) ) ) ) )
-	unrtf? ( !amd64-fbsd? ( !arm64? ( app-text/unrtf ) ) )
-	djvu? ( app-text/djvu )
-	dvi2tty? ( dev-tex/dvi2tty )
-	pstotext? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !ia64? ( !sparc?
-		( app-text/pstotext ) ) ) ) ) ) )
-	!pstotext? (
-		ghostscript? ( app-text/ghostscript-gpl )
-	)
-	gpg? ( app-crypt/gnupg )
-	pdf? ( app-text/poppler )
-	id3v2? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !ia64? ( !sparc?
-		( media-sound/id3v2 ) ) ) ) ) ) )
-	!id3v2? (
-		mp3info2? ( !alpha? ( !amd64-fbsd? ( !arm64? ( !hppa? ( !ia64?
-			( !sparc? ( dev-perl/MP3-Tag ) ) ) ) ) ) )
-		!mp3info2? (
-			mp3info? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !ia64?
-				( media-sound/mp3info ) ) ) ) ) )
-		)
-	)
-	image? ( virtual/imagemagick-tools )
-	isoinfo? ( || ( virtual/cdrtools app-cdr/dvd+rw-tools ) )
-	libplist? ( !alpha? ( !hppa? ( !ia64? ( !sparc?
-		( app-pda/libplist ) ) ) ) )
-	dpkg? ( !amd64-fbsd? ( !arm64? ( app-arch/dpkg ) ) )
-	hdf5? ( !amd64-fbsd? ( !hppa? ( sci-libs/hdf5 ) ) )
-	netcdf? ( !alpha? ( !amd64-fbsd? ( !arm64?  ( !hppa? ( !ia64? ( !sparc?
-		( sci-libs/netcdf ) ) ) ) ) ) )"
-DEPEND="${BOTH_DEPEND}"
-RDEPEND="${BOTH_DEPEND}
-	sys-apps/less
-	!<sys-apps/less-483-r1"
-
-ModifyStart() {
-	sedline=
-}
-
-Modify() {
-	if [ -z "${sedline:++}" ]
-	then	sedline='/^__END__$/,${'
-	else	sedline=${sedline}';'
-	fi
-	sedline=${sedline}'s/^\('${1}'[[:space:]][[:space:]]*\)[nNyY]/\1'${2:-Y}'/'
-}
-
-ModifyEnd() {
-	sedline=${sedline}'}'
-	sed -i -e "${sedline}" "${S}/configure" || die
-}
-
-ModifyY() {
-	local i
-	for i
-	do	Modify "${i}"
-	done
-}
-
-ModifyN() {
-	local i
-	for i
-	do	Modify "${i}" N
-	done
-}
-
-ModifyX() {
-	if [ ${?} -eq 0 ]
-	then	ModifyY "${@}"
-	else	ModifyN "${@}"
-	fi
-}
-
-ModifyU() {
-	local i
-	for i
-	do	use "${i}"; ModifyX "${i}"
-	done
-}
-
-Modify1() {
-	local i search
-	search=:
-	for i
-	do	${search} && use "${i}" && search=false; ModifyX "${i}"
-	done
-}
-
-src_prepare() {
-	printf 'h5dump\t\tN\nncdump\t\tN\n' >>"${S}/configure"
-	ModifyStart
-	ModifyY 'HILITE'
-	ModifyY 'LESS_ADVANCED_PREPROCESSOR'
-	ModifyY 'nm'
-	ModifyY 'iconv'
-	ModifyY 'bzip2'
-	ModifyY 'xz' 'lzma'
-	ModifyY 'perldoc'
-	ModifyU 'unzip' 'fastjar'
-	Modify1 'unrar' 'rar'
-	ModifyU 'lzip'
-	use p7zip; ModifyX '7za'
-	ModifyU 'cpio' 'cabextract' 'groff'
-	Modify1 'html2text' 'links' 'lynx' 'elinks' 'w3m'
-	use rpm2targz; ModifyX 'rpmunpack'
-	! use rpm2targz && use rpm; ModifyX 'rpm' 'rpm2cpio'
-	Modify1 'antiword' 'catdoc'
-	use xlhtml; ModifyX 'ppthtml' 'xlhtml'
-	ModifyU 'unrtf'
-	use ooffice; ModifyX 'o3tohtml'
-	use djvu; ModifyX 'djvutxt'
-	ModifyU 'dvi2tty'
-	ModifyU 'pstotext'
-	! use pstotext && use ghostscript; ModifyX 'ps2ascii'
-	ModifyU 'gpg'
-	use pdf; ModifyX 'pdftohtml' 'pdftotext'
-	Modify1 'id3v2' 'mp3info2' 'mp3info'
-	use image; ModifyX 'identify'
-	ModifyU 'isoinfo'
-	ModifyN 'dpkg'
-	ModifyN 'lsbom'
-	use libplist; ModifyX 'plutil'
-	use hdf5; ModifyX 'h5dump'
-	use netcdf; ModifyX 'ncdump'
-	ModifyEnd
-	printf '%s\n' 'LESS_ADVANCED_PREPROCESSOR=1' >70lesspipe || die
-	default
-}
-
-src_configure() {
-	./configure --fixed --prefix=/usr || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	doenvd 70lesspipe
-	dodir /usr/share/man/man1
-	default
-}
diff --git a/app-text/lesspipe/lesspipe-1.84_alpha20190413.ebuild b/app-text/lesspipe/lesspipe-1.84.ebuild
index 263f0f6b..39f24a8b 100644
--- a/app-text/lesspipe/lesspipe-1.84_alpha20190413.ebuild
+++ b/app-text/lesspipe/lesspipe-1.84.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Martin V\"ath
+# Copyright 1999-2020 Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 case ${PV} in
 9999*)
@@ -30,28 +30,27 @@ pkg_pretend() {
 	required-use-warn
 }
 
-IUSE="antiword brotli cabextract catdoc +cpio +djvu dpkg +dvi2tty +elinks fastjar +ghostscript gpg +groff hdf5 +html2text id3v2 image isoinfo libplist +links +lynx lz4 lzip mp3info mp3info2 netcdf ooffice p7zip pdf pstotext rar rpm +rpm2targz unrar unrtf +unzip +w3m xlhtml zstd"
+IUSE="antiword brotli cabextract catdoc +cpio +djvu dpkg +dvi2tty +elinks fastjar +ghostscript gpg +groff hdf5 +html2text id3v2 image isoinfo libplist libreoffice +links +lynx lz4 lzip mediainfo mp3info mp3info2 netcdf ooffice p7zip pandoc pdf pstotext rar rpm +rpm2targz unrar unrtf +unzip +w3m wv xlhtml zstd"
 
 htmlmode="( || ( html2text links lynx elinks w3m ) )"
 REQUIRED_USE="!rpm2targz? ( rpm? ( cpio ) )
 	ooffice? ${htmlmode}
 	xlhtml? ${htmlmode}"
 REQUIRED_USE_WARN="
-	alpha? ( !brotli !catdoc !fastjar !id3v2 !libplist !mp3info !mp3info2
-		!netcdf !ooffice !pstotext !rar !zstd )
-	amd64-fbsd? ( !antiword !catdoc !dpkg !elinks !fastjar !hdf5 !html2text
-		!id3v2 !lzip !mp3info !mp3info2 !netcdf !ooffice !p7zip !pstotext
-		!rar !rpm !unrtf !w3m !xlhtml !zstd )
-	arm? ( !antiword !brotli !catdoc !fastjar !html2text !id3v2 !mp3info
-		!ooffice !pstotext !rar !xlhtml )
+	alpha? ( !brotli !catdoc !fastjar !id3v2 !libplist !libreoffice !mediainfo
+		!mp3info !mp3info2 !netcdf !ooffice !pandoc !pstotext !rar !zstd )
+	arm? ( !antiword !brotli !catdoc !fastjar !html2text !id3v2 !mediainfo
+		!mp3info !ooffice !pandoc !pstotext !rar !xlhtml )
 	arm64? ( !antiword !catdoc !dpkg !elinks !fastjar !html2text !id3v2
-		!mp3info !mp3info2 !netcdf !ooffice !pstotext !rar !unrtf !xlhtml )
+		!mediainfo !mp3info !mp3info2 !netcdf !ooffice !pandoc !pstotext
+		!rar !unrtf !wv !xlhtml )
 	hppa? ( !catdoc !brotli !fastjar !hdf5 !libplist !mp3info2 !netcdf
 		!ooffice !rar !w3m !xlhtml !zstd )
-	ia64? ( !antiword !brotli !catdoc !fastjar !id3v2 !libplist !mp3info
-		!mp3info2 !netcdf !ooffice !pstotext !rar !xlhtml !zstd )
-	ppc? ( !brotli )
-	ppc64? ( !brotli !catdoc !fastjar !ooffice !xlhtml )
+	ia64? ( !antiword !brotli !catdoc !fastjar !id3v2 !libplist !libreoffice
+	!mp3info !mp3info2 !mediainfo !netcdf !ooffice !pandoc !pstotext !rar
+	!xlhtml !zstd )
+	ppc? ( !brotli !libreoffice !mediainfo !pandoc )
+	ppc64? ( !brotli !catdoc !fastjar !mediainfo !ooffice !pandoc !xlhtml )
 	sparc? ( !brotli !catdoc !fastjar !id3v2 !libplist !mp3info2 !netcdf
 		!ooffice !pstotext !zstd )"
 
@@ -62,76 +61,68 @@ BOTH_DEPEND="sys-apps/file
 	brotli? ( !alpha? ( !arm? ( !hppa? ( !ia64? ( !ppc? ( !ppc64?
 		( !sparc? ( >=app-arch/brotli-1 ) ) ) ) ) ) ) )
 	lz4? ( app-arch/lz4 )
-	zstd? ( !alpha? ( !amd64-fbsd? ( !hppa? ( !ia64? ( !sparc?
-		( app-arch/zstd ) ) ) ) ) )
+	zstd? ( !alpha? ( !hppa? ( !ia64? ( !sparc? ( app-arch/zstd ) ) ) ) )
 	unzip? ( app-arch/unzip )
-	fastjar? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !hppa? ( !ia64?
-		( !ppc64? ( !sparc? ( app-arch/fastjar ) ) ) ) ) ) ) ) )
+	fastjar? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64?
+		( !ppc64? ( !sparc? ( app-arch/fastjar ) ) ) ) ) ) ) )
 	unrar? ( app-arch/unrar )
 	!unrar? (
-		rar? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !hppa? ( !ia64?
+		rar? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64?
 			( app-text/o3read ) ) ) ) ) ) )
-	)
-	lzip? ( !amd64-fbsd? ( app-arch/lzip ) )
-	p7zip? ( !amd64-fbsd? ( app-arch/p7zip ) )
+	lzip? ( app-arch/lzip )
+	p7zip? ( app-arch/p7zip )
 	cpio? ( app-arch/cpio )
 	cabextract? ( app-arch/cabextract )
-	html2text? ( !amd64-fbsd? ( !arm? ( !arm64? ( app-text/html2text ) ) ) )
+	html2text? ( !arm? ( !arm64? ( app-text/html2text ) ) )
 	!html2text? (
 		links? ( www-client/links )
 		!links? (
 			lynx? ( www-client/lynx )
 			!lynx? (
-				elinks? ( !amd64-fbsd? ( !arm64? ( www-client/elinks ) ) )
+				elinks? ( !arm64? ( www-client/elinks ) )
 				!elinks? (
-					w3m? ( !amd64-fbsd? ( !hppa? ( www-client/w3m ) ) )
-				)
-			)
-		)
-	)
+					w3m? ( !hppa? ( www-client/w3m ) ) ) ) ) )
 	groff? ( sys-apps/groff )
 	rpm2targz? ( app-arch/rpm2targz )
-	!rpm2targz? (
-		rpm? ( !amd64-fbsd? ( app-arch/rpm ) )
-	)
-	antiword? ( !amd64-fbsd? ( !arm? ( !arm64? ( !ia64?
-		( app-text/antiword ) ) ) ) )
+	!rpm2targz? ( rpm? ( app-arch/rpm ) )
+	antiword? ( !arm? ( !arm64? ( !ia64? ( app-text/antiword ) ) ) )
 	!antiword? (
-		catdoc? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !hppa? ( !ia64?
+		catdoc? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64?
 			( !ppc64? ( !sparc? ( app-text/catdoc ) ) ) ) ) ) ) ) )
-	)
-	xlhtml? ( !amd64-fbsd? ( !arm? ( !arm64? ( !hppa? ( !ia64? ( !ppc64?
-		( app-text/xlhtml ) ) ) ) ) ) )
-	unrtf? ( !amd64-fbsd? ( !arm64? ( app-text/unrtf ) ) )
-	ooffice? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !hppa? ( !ia64? (
-		!ppc64? ( !sparc? ( app-text/o3read ) ) ) ) ) ) ) ) )
+	xlhtml? ( !arm? ( !arm64? ( !hppa? ( !ia64? ( !ppc64?
+		( app-text/xlhtml ) ) ) ) ) )
+	unrtf? ( !arm64? ( app-text/unrtf ) )
+	ooffice? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64? (
+		!ppc64? ( !sparc? ( app-text/o3read ) ) ) ) ) ) ) )
+	pandoc? ( !alpha? ( !arm? ( !arm64? ( !ia64? ( !ppc? (
+		!ppc64? ( app-text/pandoc ) ) ) ) ) ) )
+	libreoffice? ( !alpha? ( !ia64? ( !ppc? ( app-office/libreoffice ) ) ) )
 	djvu? ( app-text/djvu )
 	dvi2tty? ( dev-tex/dvi2tty )
-	pstotext? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !ia64? ( !sparc?
-		( app-text/pstotext ) ) ) ) ) ) )
-	!pstotext? (
-		ghostscript? ( app-text/ghostscript-gpl )
-	)
+	pstotext? ( !alpha? ( !arm? ( !arm64? ( !ia64? ( !sparc?
+		( app-text/pstotext ) ) ) ) ) )
+	!pstotext? ( ghostscript? ( app-text/ghostscript-gpl ) )
 	gpg? ( app-crypt/gnupg )
 	pdf? ( app-text/poppler )
-	id3v2? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !ia64? ( !sparc?
-		( media-sound/id3v2 ) ) ) ) ) ) )
+	id3v2? ( !alpha? ( !arm? ( !arm64? ( !ia64? ( !sparc?
+		( media-sound/id3v2 ) ) ) ) ) )
 	!id3v2? (
-		mp3info2? ( !alpha? ( !amd64-fbsd? ( !arm64? ( !hppa? ( !ia64?
-			( !sparc? ( dev-perl/MP3-Tag ) ) ) ) ) ) )
+		mp3info2? ( !alpha? ( !arm64? ( !hppa? ( !ia64?
+			( !sparc? ( dev-perl/MP3-Tag ) ) ) ) ) )
 		!mp3info2? (
-			mp3info? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !ia64?
-				( media-sound/mp3info ) ) ) ) ) )
-		)
-	)
+			mp3info? ( !alpha? ( !arm? ( !arm64? ( !ia64?
+				( media-sound/mp3info ) ) ) ) ) ) )
 	image? ( virtual/imagemagick-tools )
 	isoinfo? ( || ( virtual/cdrtools app-cdr/dvd+rw-tools ) )
 	libplist? ( !alpha? ( !hppa? ( !ia64? ( !sparc?
 		( app-pda/libplist ) ) ) ) )
-	dpkg? ( !amd64-fbsd? ( !arm64? ( app-arch/dpkg ) ) )
-	hdf5? ( !amd64-fbsd? ( !hppa? ( sci-libs/hdf5 ) ) )
-	netcdf? ( !alpha? ( !amd64-fbsd? ( !arm64?  ( !hppa? ( !ia64? ( !sparc?
-		( sci-libs/netcdf ) ) ) ) ) ) )"
+	dpkg? ( !arm64? ( app-arch/dpkg ) )
+	hdf5? ( !hppa? ( sci-libs/hdf5 ) )
+	netcdf? ( !alpha? ( !arm64?  ( !hppa? ( !ia64? ( !sparc?
+		( sci-libs/netcdf ) ) ) ) ) )
+	wv? ( !arm64? ( app-text/wv ) )
+	mediainfo? ( !alpha? ( !arm? ( !arm64? ( !ia64? ( !ppc? (
+		!ppc64? ( media-video/mediainfo ) ) ) ) ) ) )"
 DEPEND="${BOTH_DEPEND}"
 RDEPEND="${BOTH_DEPEND}
 	sys-apps/less
@@ -224,6 +215,10 @@ src_prepare() {
 	Modify1 'id3v2' 'mp3info2' 'mp3info'
 	use image; ModifyX 'identify'
 	ModifyU 'isoinfo'
+	ModifyU 'libreoffice'
+	ModifyU 'pandoc'
+	use wv; ModfiyX 'wvText'
+	ModifyU 'mediainfo'
 	ModifyN 'dpkg'
 	ModifyN 'lsbom'
 	use libplist; ModifyX 'plutil'
diff --git a/app-text/lesspipe/lesspipe-99999999.ebuild b/app-text/lesspipe/lesspipe-99999999.ebuild
index 263f0f6b..39f24a8b 100644
--- a/app-text/lesspipe/lesspipe-99999999.ebuild
+++ b/app-text/lesspipe/lesspipe-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Martin V\"ath
+# Copyright 1999-2020 Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 case ${PV} in
 9999*)
@@ -30,28 +30,27 @@ pkg_pretend() {
 	required-use-warn
 }
 
-IUSE="antiword brotli cabextract catdoc +cpio +djvu dpkg +dvi2tty +elinks fastjar +ghostscript gpg +groff hdf5 +html2text id3v2 image isoinfo libplist +links +lynx lz4 lzip mp3info mp3info2 netcdf ooffice p7zip pdf pstotext rar rpm +rpm2targz unrar unrtf +unzip +w3m xlhtml zstd"
+IUSE="antiword brotli cabextract catdoc +cpio +djvu dpkg +dvi2tty +elinks fastjar +ghostscript gpg +groff hdf5 +html2text id3v2 image isoinfo libplist libreoffice +links +lynx lz4 lzip mediainfo mp3info mp3info2 netcdf ooffice p7zip pandoc pdf pstotext rar rpm +rpm2targz unrar unrtf +unzip +w3m wv xlhtml zstd"
 
 htmlmode="( || ( html2text links lynx elinks w3m ) )"
 REQUIRED_USE="!rpm2targz? ( rpm? ( cpio ) )
 	ooffice? ${htmlmode}
 	xlhtml? ${htmlmode}"
 REQUIRED_USE_WARN="
-	alpha? ( !brotli !catdoc !fastjar !id3v2 !libplist !mp3info !mp3info2
-		!netcdf !ooffice !pstotext !rar !zstd )
-	amd64-fbsd? ( !antiword !catdoc !dpkg !elinks !fastjar !hdf5 !html2text
-		!id3v2 !lzip !mp3info !mp3info2 !netcdf !ooffice !p7zip !pstotext
-		!rar !rpm !unrtf !w3m !xlhtml !zstd )
-	arm? ( !antiword !brotli !catdoc !fastjar !html2text !id3v2 !mp3info
-		!ooffice !pstotext !rar !xlhtml )
+	alpha? ( !brotli !catdoc !fastjar !id3v2 !libplist !libreoffice !mediainfo
+		!mp3info !mp3info2 !netcdf !ooffice !pandoc !pstotext !rar !zstd )
+	arm? ( !antiword !brotli !catdoc !fastjar !html2text !id3v2 !mediainfo
+		!mp3info !ooffice !pandoc !pstotext !rar !xlhtml )
 	arm64? ( !antiword !catdoc !dpkg !elinks !fastjar !html2text !id3v2
-		!mp3info !mp3info2 !netcdf !ooffice !pstotext !rar !unrtf !xlhtml )
+		!mediainfo !mp3info !mp3info2 !netcdf !ooffice !pandoc !pstotext
+		!rar !unrtf !wv !xlhtml )
 	hppa? ( !catdoc !brotli !fastjar !hdf5 !libplist !mp3info2 !netcdf
 		!ooffice !rar !w3m !xlhtml !zstd )
-	ia64? ( !antiword !brotli !catdoc !fastjar !id3v2 !libplist !mp3info
-		!mp3info2 !netcdf !ooffice !pstotext !rar !xlhtml !zstd )
-	ppc? ( !brotli )
-	ppc64? ( !brotli !catdoc !fastjar !ooffice !xlhtml )
+	ia64? ( !antiword !brotli !catdoc !fastjar !id3v2 !libplist !libreoffice
+	!mp3info !mp3info2 !mediainfo !netcdf !ooffice !pandoc !pstotext !rar
+	!xlhtml !zstd )
+	ppc? ( !brotli !libreoffice !mediainfo !pandoc )
+	ppc64? ( !brotli !catdoc !fastjar !mediainfo !ooffice !pandoc !xlhtml )
 	sparc? ( !brotli !catdoc !fastjar !id3v2 !libplist !mp3info2 !netcdf
 		!ooffice !pstotext !zstd )"
 
@@ -62,76 +61,68 @@ BOTH_DEPEND="sys-apps/file
 	brotli? ( !alpha? ( !arm? ( !hppa? ( !ia64? ( !ppc? ( !ppc64?
 		( !sparc? ( >=app-arch/brotli-1 ) ) ) ) ) ) ) )
 	lz4? ( app-arch/lz4 )
-	zstd? ( !alpha? ( !amd64-fbsd? ( !hppa? ( !ia64? ( !sparc?
-		( app-arch/zstd ) ) ) ) ) )
+	zstd? ( !alpha? ( !hppa? ( !ia64? ( !sparc? ( app-arch/zstd ) ) ) ) )
 	unzip? ( app-arch/unzip )
-	fastjar? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !hppa? ( !ia64?
-		( !ppc64? ( !sparc? ( app-arch/fastjar ) ) ) ) ) ) ) ) )
+	fastjar? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64?
+		( !ppc64? ( !sparc? ( app-arch/fastjar ) ) ) ) ) ) ) )
 	unrar? ( app-arch/unrar )
 	!unrar? (
-		rar? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !hppa? ( !ia64?
+		rar? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64?
 			( app-text/o3read ) ) ) ) ) ) )
-	)
-	lzip? ( !amd64-fbsd? ( app-arch/lzip ) )
-	p7zip? ( !amd64-fbsd? ( app-arch/p7zip ) )
+	lzip? ( app-arch/lzip )
+	p7zip? ( app-arch/p7zip )
 	cpio? ( app-arch/cpio )
 	cabextract? ( app-arch/cabextract )
-	html2text? ( !amd64-fbsd? ( !arm? ( !arm64? ( app-text/html2text ) ) ) )
+	html2text? ( !arm? ( !arm64? ( app-text/html2text ) ) )
 	!html2text? (
 		links? ( www-client/links )
 		!links? (
 			lynx? ( www-client/lynx )
 			!lynx? (
-				elinks? ( !amd64-fbsd? ( !arm64? ( www-client/elinks ) ) )
+				elinks? ( !arm64? ( www-client/elinks ) )
 				!elinks? (
-					w3m? ( !amd64-fbsd? ( !hppa? ( www-client/w3m ) ) )
-				)
-			)
-		)
-	)
+					w3m? ( !hppa? ( www-client/w3m ) ) ) ) ) )
 	groff? ( sys-apps/groff )
 	rpm2targz? ( app-arch/rpm2targz )
-	!rpm2targz? (
-		rpm? ( !amd64-fbsd? ( app-arch/rpm ) )
-	)
-	antiword? ( !amd64-fbsd? ( !arm? ( !arm64? ( !ia64?
-		( app-text/antiword ) ) ) ) )
+	!rpm2targz? ( rpm? ( app-arch/rpm ) )
+	antiword? ( !arm? ( !arm64? ( !ia64? ( app-text/antiword ) ) ) )
 	!antiword? (
-		catdoc? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !hppa? ( !ia64?
+		catdoc? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64?
 			( !ppc64? ( !sparc? ( app-text/catdoc ) ) ) ) ) ) ) ) )
-	)
-	xlhtml? ( !amd64-fbsd? ( !arm? ( !arm64? ( !hppa? ( !ia64? ( !ppc64?
-		( app-text/xlhtml ) ) ) ) ) ) )
-	unrtf? ( !amd64-fbsd? ( !arm64? ( app-text/unrtf ) ) )
-	ooffice? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !hppa? ( !ia64? (
-		!ppc64? ( !sparc? ( app-text/o3read ) ) ) ) ) ) ) ) )
+	xlhtml? ( !arm? ( !arm64? ( !hppa? ( !ia64? ( !ppc64?
+		( app-text/xlhtml ) ) ) ) ) )
+	unrtf? ( !arm64? ( app-text/unrtf ) )
+	ooffice? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64? (
+		!ppc64? ( !sparc? ( app-text/o3read ) ) ) ) ) ) ) )
+	pandoc? ( !alpha? ( !arm? ( !arm64? ( !ia64? ( !ppc? (
+		!ppc64? ( app-text/pandoc ) ) ) ) ) ) )
+	libreoffice? ( !alpha? ( !ia64? ( !ppc? ( app-office/libreoffice ) ) ) )
 	djvu? ( app-text/djvu )
 	dvi2tty? ( dev-tex/dvi2tty )
-	pstotext? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !ia64? ( !sparc?
-		( app-text/pstotext ) ) ) ) ) ) )
-	!pstotext? (
-		ghostscript? ( app-text/ghostscript-gpl )
-	)
+	pstotext? ( !alpha? ( !arm? ( !arm64? ( !ia64? ( !sparc?
+		( app-text/pstotext ) ) ) ) ) )
+	!pstotext? ( ghostscript? ( app-text/ghostscript-gpl ) )
 	gpg? ( app-crypt/gnupg )
 	pdf? ( app-text/poppler )
-	id3v2? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !ia64? ( !sparc?
-		( media-sound/id3v2 ) ) ) ) ) ) )
+	id3v2? ( !alpha? ( !arm? ( !arm64? ( !ia64? ( !sparc?
+		( media-sound/id3v2 ) ) ) ) ) )
 	!id3v2? (
-		mp3info2? ( !alpha? ( !amd64-fbsd? ( !arm64? ( !hppa? ( !ia64?
-			( !sparc? ( dev-perl/MP3-Tag ) ) ) ) ) ) )
+		mp3info2? ( !alpha? ( !arm64? ( !hppa? ( !ia64?
+			( !sparc? ( dev-perl/MP3-Tag ) ) ) ) ) )
 		!mp3info2? (
-			mp3info? ( !alpha? ( !amd64-fbsd? ( !arm? ( !arm64? ( !ia64?
-				( media-sound/mp3info ) ) ) ) ) )
-		)
-	)
+			mp3info? ( !alpha? ( !arm? ( !arm64? ( !ia64?
+				( media-sound/mp3info ) ) ) ) ) ) )
 	image? ( virtual/imagemagick-tools )
 	isoinfo? ( || ( virtual/cdrtools app-cdr/dvd+rw-tools ) )
 	libplist? ( !alpha? ( !hppa? ( !ia64? ( !sparc?
 		( app-pda/libplist ) ) ) ) )
-	dpkg? ( !amd64-fbsd? ( !arm64? ( app-arch/dpkg ) ) )
-	hdf5? ( !amd64-fbsd? ( !hppa? ( sci-libs/hdf5 ) ) )
-	netcdf? ( !alpha? ( !amd64-fbsd? ( !arm64?  ( !hppa? ( !ia64? ( !sparc?
-		( sci-libs/netcdf ) ) ) ) ) ) )"
+	dpkg? ( !arm64? ( app-arch/dpkg ) )
+	hdf5? ( !hppa? ( sci-libs/hdf5 ) )
+	netcdf? ( !alpha? ( !arm64?  ( !hppa? ( !ia64? ( !sparc?
+		( sci-libs/netcdf ) ) ) ) ) )
+	wv? ( !arm64? ( app-text/wv ) )
+	mediainfo? ( !alpha? ( !arm? ( !arm64? ( !ia64? ( !ppc? (
+		!ppc64? ( media-video/mediainfo ) ) ) ) ) ) )"
 DEPEND="${BOTH_DEPEND}"
 RDEPEND="${BOTH_DEPEND}
 	sys-apps/less
@@ -224,6 +215,10 @@ src_prepare() {
 	Modify1 'id3v2' 'mp3info2' 'mp3info'
 	use image; ModifyX 'identify'
 	ModifyU 'isoinfo'
+	ModifyU 'libreoffice'
+	ModifyU 'pandoc'
+	use wv; ModfiyX 'wvText'
+	ModifyU 'mediainfo'
 	ModifyN 'dpkg'
 	ModifyN 'lsbom'
 	use libplist; ModifyX 'plutil'
diff --git a/app-text/lesspipe/metadata.xml b/app-text/lesspipe/metadata.xml
index b1e75e46..1a2cb165 100644
--- a/app-text/lesspipe/metadata.xml
+++ b/app-text/lesspipe/metadata.xml
@@ -31,16 +31,19 @@
 		<flag name="id3v2">Support mp3 files with media-sound/id3v2; this overrides mp3info2, mp3info</flag>
 		<flag name="image">Support image/jpg files</flag>
 		<flag name="isoinfo">Support CD/DVD-iso files</flag>
+		<flag name="libreoffice">Support msword and rtf conversion using app-office/libreoffice</flag>
 		<flag name="libplist">Support Apple Property List files</flag>
 		<flag name="links">Support html files with www-client/links; ignored if html2text is set; this overrides lynx, elinks, w3m</flag>
 		<flag name="lynx">Support html files with www-client/lynx; ignored if html2text or links is set; this overrides elinks, w3m</flag>
 		<flag name="lz4">Support lz4 files; requires app-arch/lz4</flag>
 		<flag name="lzip">Support lzip files</flag>
+		<flag name="mediainfo">Support media display using media-video/mediainfo</flag>
 		<flag name="mp3info">Support mp3 files with media-sound/mp3info; unused if id3v2 or mp3info2 is set</flag>
 		<flag name="mp3info2">Support mp3 files with dev-perl/MP3-Tag (mp3info2); ignored if id3v2 is set; this overrides mp3info</flag>
 		<flag name="netcdf">Support ncdump from sci-libs/netcdf</flag>
 		<flag name="ooffice">Support OpenOffice files</flag>
 		<flag name="p7zip">Support p7zip files</flag>
+		<flag name="pandoc">Support msword and rtf conversion using app-text/pandoc</flag>
 		<flag name="pdf">Support pdf files</flag>
 		<flag name="pstotext">Support ps files with app-text/pstotext; this overrides ghostscript</flag>
 		<flag name="rar">Support rar files with app-arch/rar; unused if unrar is set</flag>
@@ -50,6 +53,7 @@
 		<flag name="unrtf">Support rtf files with app-text/unrtf</flag>
 		<flag name="unzip">Support zip files with app-arch/unzip</flag>
 		<flag name="w3m">Support html files with www-client/w3m; ignored if html2text, links, lynx, or elinks is set</flag>
+		<flag name="wv">Support msword and rtf conversion using app-text/wv</flag>
 		<flag name="xlhtml">Support Excel and Powerpoint files with app-arch/xlhtml</flag>
 		<flag name="zstd">Support brotli files; requires app-arch/zstd</flag>
 	</use>
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 7eff19fa..aca43365 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -47,7 +47,7 @@ app-shells/zsh-autosuggestions 0.6.4_alpha20191215 99999999: Fish-like autosugge
 app-shells/zsh-syntax-highlighting 0.6.0 0.6.1_alpha20180411 99999999: Fish shell like syntax highlighting for zsh
 app-shells/zshrc-mv 5.3: A zshrc file initializing zsh specific interactive features
 app-text/ispell 3.3.02-r1 3.4.00: fast screen-oriented spelling checker
-app-text/lesspipe 1.83-r3 1.84_alpha20190413 99999999: Wolfgang Friebel's preprocessor for sys-apps/less. Disable by appending colon
+app-text/lesspipe 1.84 99999999: Wolfgang Friebel's preprocessor for sys-apps/less. Disable by appending colon
 app-text/mbtpdfasm 1.0.28-r1: Tool to assemble/merge, extract information from, and update the metadata in PDF
 app-text/podofo 0.9.6_p20180715-r1: PoDoFo is a C++ library to work with the PDF file format
 app-text/psjoin 0.3: concatenate postscript files. From new PostScript Utilities
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 04e215c9..af89d742 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -88,15 +88,18 @@ app-text/lesspipe:id3v2 - Support mp3 files with media-sound/id3v2; this overrid
 app-text/lesspipe:image - Support image/jpg files
 app-text/lesspipe:isoinfo - Support CD/DVD-iso files
 app-text/lesspipe:libplist - Support Apple Property List files
+app-text/lesspipe:libreoffice - Support msword and rtf conversion using app-office/libreoffice
 app-text/lesspipe:links - Support html files with www-client/links; ignored if html2text is set; this overrides lynx, elinks, w3m
 app-text/lesspipe:lynx - Support html files with www-client/lynx; ignored if html2text or links is set; this overrides elinks, w3m
 app-text/lesspipe:lz4 - Support lz4 files; requires app-arch/lz4
 app-text/lesspipe:lzip - Support lzip files
+app-text/lesspipe:mediainfo - Support media display using media-video/mediainfo
 app-text/lesspipe:mp3info - Support mp3 files with media-sound/mp3info; unused if id3v2 or mp3info2 is set
 app-text/lesspipe:mp3info2 - Support mp3 files with dev-perl/MP3-Tag (mp3info2); ignored if id3v2 is set; this overrides mp3info
 app-text/lesspipe:netcdf - Support ncdump from sci-libs/netcdf
 app-text/lesspipe:ooffice - Support OpenOffice files
 app-text/lesspipe:p7zip - Support p7zip files
+app-text/lesspipe:pandoc - Support msword and rtf conversion using app-text/pandoc
 app-text/lesspipe:pdf - Support pdf files
 app-text/lesspipe:pstotext - Support ps files with app-text/pstotext; this overrides ghostscript
 app-text/lesspipe:rar - Support rar files with app-arch/rar; unused if unrar is set
@@ -106,6 +109,7 @@ app-text/lesspipe:unrar - Support rar files with app-arch/unrar; this overrides
 app-text/lesspipe:unrtf - Support rtf files with app-text/unrtf
 app-text/lesspipe:unzip - Support zip files with app-arch/unzip
 app-text/lesspipe:w3m - Support html files with www-client/w3m; ignored if html2text, links, lynx, or elinks is set
+app-text/lesspipe:wv - Support msword and rtf conversion using app-text/wv
 app-text/lesspipe:xlhtml - Support Excel and Powerpoint files with app-arch/xlhtml
 app-text/lesspipe:zstd - Support brotli files; requires app-arch/zstd
 app-text/podofo:boost - Add support for boost