From 39d6ecc7f0882f3c9fe825453bda88d91986710e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20V=C3=A4th?= Date: Fri, 8 Sep 2017 20:11:14 +0200 Subject: app-text/lesspipe: Add alpha, change live. Support brotli, lz4, zstd --- app-text/lesspipe/Manifest | 1 + app-text/lesspipe/lesspipe-1.84_alpha0.ebuild | 240 ++++++++++++++++++++++++++ app-text/lesspipe/lesspipe-99999999.ebuild | 44 +++-- app-text/lesspipe/metadata.xml | 3 + metadata/pkg_desc_index | 2 +- profiles/use.local.desc | 3 + 6 files changed, 277 insertions(+), 16 deletions(-) create mode 100644 app-text/lesspipe/lesspipe-1.84_alpha0.ebuild diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest index 956851d4..2e3d38b7 100644 --- a/app-text/lesspipe/Manifest +++ b/app-text/lesspipe/Manifest @@ -1 +1,2 @@ DIST lesspipe-1.83.tar.gz 115129 SHA256 d616f0d51852e60fb0d0801eec9c31b10e0acc6fdfdc62ec46ef7bfd60ce675e SHA512 c6418ac2bfc2dee9d32d56b0ea4a94954b1431db54fef8b67a9cf7d961cf4a23d87b2f41b2a4560d2333029c6d4ed5c6f399cb635f857bd43f1603993b5cb55d +DIST lesspipe-1.84_alpha0.tar.gz 113427 SHA256 e3c9dbb6cc6caf919f3b70d5168a8b0f2a7c4277d03d885a32607fa1ee132fa1 SHA512 00a2567cf26cf1e3a73eeaf70c7bf1c9eb8de163bfe785d498bc8787331a40861e7f6b97e43e05c37c3bce200226941e785ab7724d19dc90a23ddd2a8c6bf14b diff --git a/app-text/lesspipe/lesspipe-1.84_alpha0.ebuild b/app-text/lesspipe/lesspipe-1.84_alpha0.ebuild new file mode 100644 index 00000000..3c0cb8b1 --- /dev/null +++ b/app-text/lesspipe/lesspipe-1.84_alpha0.ebuild @@ -0,0 +1,240 @@ +# Copyright 2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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 ~sparc-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_REPO_URI="https://github.com/vaeth/${PN}.git" + EGIT_BRANCH="lesspipe" + inherit git-r3 + SRC_URI="" + KEYWORDS="";; +*alpha*) + RESTRICT="mirror" + EGIT_COMMIT="69383636d5e9aa63983d942887d04d6448cfeea9" + SRC_URI="https://github.com/vaeth/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${EGIT_COMMIT}";; +esac + +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" + +htmlmode="( || ( html2text links lynx elinks w3m ) )" +REQUIRED_USE="!rpm2targz? ( rpm? ( cpio ) ) + ooffice? ${htmlmode} + xlhtml? ${htmlmode} + amd64-fbsd? ( !antiword !catdoc !dpkg !elinks !fastjar !html2text + !id3v2 !lzip !mp3info !mp3info2 !ooffice !p7zip !pstotext + !rar !rpm !unrtf !w3m !xlhtml ) + alpha? ( !brotli !catdoc !fastjar !id3v2 !libplist !mp3info !mp3info2 + !netcdf !ooffice !pstotext !rar !zstd ) + arm? ( !antiword !brotli !catdoc !fastjar !html2text !id3v2 !mp3info + !ooffice !pstotext !rar !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 ) + sparc? ( !brotli !catdoc !fastjar !id3v2 !libplist !mp3info2 !netcdf + !ooffice !pstotext !zstd )" + +BOTH_DEPEND="sys-apps/file + app-arch/xz-utils + app-arch/bzip2 + dev-lang/perl + brotli? ( !alpha? ( !arm? ( !hppa? ( !ia64? ( !ppc? ( !ppc64? + ( !sparc? ( app-arch/brotli ) ) ) ) ) ) ) ) + lz4? ( app-arch/lz4 ) + zstd? ( !alpha? ( !hppa? ( !ia64? ( !sparc? ( app-arch/zstd ) ) ) ) ) + unzip? ( app-arch/unzip ) + fastjar? ( !amd64-fbsd? ( !alpha? ( !arm? ( !hppa? ( !ia64? ( !ppc64? + ( !sparc? ( app-arch/fastjar ) ) ) ) ) ) ) ) + unrar? ( app-arch/unrar ) + !unrar? ( + rar? ( !amd64-fbsd? ( !alpha? ( !arm? ( !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? ( app-text/html2text ) ) ) + !html2text? ( + links? ( www-client/links ) + !links? ( + lynx? ( www-client/lynx ) + !lynx? ( + elinks? ( !amd64-fbsd? ( 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? ( !ia64? ( app-text/antiword ) ) ) ) + !antiword? ( + catdoc? ( !amd64-fbsd? ( !alpha? ( !arm? ( !hppa? ( !ia64? ( !ppc64? + ( !sparc? ( app-text/catdoc ) ) ) ) ) ) ) ) + ) + xlhtml? ( !amd64-fbsd? ( !arm? ( !hppa? ( !ia64? ( !ppc64? + ( app-text/xlhtml ) ) ) ) ) ) + unrtf? ( !amd64-fbsd? ( app-text/unrtf ) ) + ooffice? ( !amd64-fbsd? ( !alpha? ( !arm? ( !hppa? ( !ia64? ( !ppc64? + ( !sparc? ( app-text/o3read ) ) ) ) ) ) ) ) + djvu? ( app-text/djvu ) + dvi2tty? ( dev-tex/dvi2tty ) + pstotext? ( !amd64-fbsd? ( !alpha? ( !arm? ( !ia64? ( !sparc? + ( app-text/pstotext ) ) ) ) ) ) + !pstotext? ( + ghostscript? ( app-text/ghostscript-gpl ) + ) + gpg? ( app-crypt/gnupg ) + pdf? ( app-text/poppler ) + id3v2? ( !amd64-fbsd? ( !alpha? ( !arm? ( !ia64? ( !sparc? + ( media-sound/id3v2 ) ) ) ) ) ) + !id3v2? ( + mp3info2? ( !amd64-fbsd? ( !alpha? ( !hppa? ( !ia64? ( !sparc? + ( dev-perl/MP3-Tag ) ) ) ) ) ) + !mp3info2? ( + mp3info? ( !amd64-fbsd? ( !alpha? ( !arm? ( !ia64? + ( media-sound/mp3info ) ) ) ) ) + ) + ) + image? ( || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) ) + isoinfo? ( || ( app-cdr/cdrtools app-cdr/dvd+rw-tools ) ) + libplist? ( !alpha? ( !hppa? ( !ia64? ( !sparc? ( app-pda/libplist ) ) ) ) ) + dpkg? ( !amd64-fbsd? ( app-arch/dpkg ) ) + hdf5? ( !hppa? ( sci-libs/hdf5 ) ) + netcdf? ( !alpha? ( !hppa? ( !ia64? ( !sparc? ( sci-libs/netcdf ) ) ) ) )" +DEPEND="${BOTH_DEPEND}" +RDEPEND="${BOTH_DEPEND} + sys-apps/less + !>"${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 'brotli' + ModifyU 'lz4' + ModifyU 'lzip' + ModifyU 'zstd' + 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 + eapply_user +} + +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-99999999.ebuild b/app-text/lesspipe/lesspipe-99999999.ebuild index ef19adbb..3c0cb8b1 100644 --- a/app-text/lesspipe/lesspipe-99999999.ebuild +++ b/app-text/lesspipe/lesspipe-99999999.ebuild @@ -13,15 +13,21 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s case ${PV} in 9999*) - EGIT_REPO_URI="https://github.com/wofr06/${PN}.git" - EGIT_BRANCH="master" + #EGIT_REPO_URI="https://github.com/wofr06/${PN}.git" + #EGIT_BRANCH="master" + EGIT_REPO_URI="https://github.com/vaeth/${PN}.git" + EGIT_BRANCH="lesspipe" inherit git-r3 SRC_URI="" - KEYWORDS="" -;; + KEYWORDS="";; +*alpha*) + RESTRICT="mirror" + EGIT_COMMIT="69383636d5e9aa63983d942887d04d6448cfeea9" + SRC_URI="https://github.com/vaeth/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${EGIT_COMMIT}";; esac -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" +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" htmlmode="( || ( html2text links lynx elinks w3m ) )" REQUIRED_USE="!rpm2targz? ( rpm? ( cpio ) ) @@ -30,22 +36,27 @@ REQUIRED_USE="!rpm2targz? ( rpm? ( cpio ) ) amd64-fbsd? ( !antiword !catdoc !dpkg !elinks !fastjar !html2text !id3v2 !lzip !mp3info !mp3info2 !ooffice !p7zip !pstotext !rar !rpm !unrtf !w3m !xlhtml ) - alpha? ( !catdoc !fastjar !id3v2 !libplist !mp3info !mp3info2 !netcdf - !ooffice !pstotext !rar ) - arm? ( !antiword !catdoc !fastjar !html2text !id3v2 !mp3info + alpha? ( !brotli !catdoc !fastjar !id3v2 !libplist !mp3info !mp3info2 + !netcdf !ooffice !pstotext !rar !zstd ) + arm? ( !antiword !brotli !catdoc !fastjar !html2text !id3v2 !mp3info !ooffice !pstotext !rar !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 )" + 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 ) + sparc? ( !brotli !catdoc !fastjar !id3v2 !libplist !mp3info2 !netcdf + !ooffice !pstotext !zstd )" BOTH_DEPEND="sys-apps/file app-arch/xz-utils app-arch/bzip2 dev-lang/perl + brotli? ( !alpha? ( !arm? ( !hppa? ( !ia64? ( !ppc? ( !ppc64? + ( !sparc? ( app-arch/brotli ) ) ) ) ) ) ) ) + lz4? ( app-arch/lz4 ) + zstd? ( !alpha? ( !hppa? ( !ia64? ( !sparc? ( app-arch/zstd ) ) ) ) ) unzip? ( app-arch/unzip ) fastjar? ( !amd64-fbsd? ( !alpha? ( !arm? ( !hppa? ( !ia64? ( !ppc64? ( !sparc? ( app-arch/fastjar ) ) ) ) ) ) ) ) @@ -182,7 +193,10 @@ src_prepare() { ModifyY 'perldoc' ModifyU 'unzip' 'fastjar' Modify1 'unrar' 'rar' + ModifyU 'brotli' + ModifyU 'lz4' ModifyU 'lzip' + ModifyU 'zstd' use p7zip; ModifyX '7za' ModifyU 'cpio' 'cabextract' 'groff' Modify1 'html2text' 'links' 'lynx' 'elinks' 'w3m' diff --git a/app-text/lesspipe/metadata.xml b/app-text/lesspipe/metadata.xml index 9775407a..b1e75e46 100644 --- a/app-text/lesspipe/metadata.xml +++ b/app-text/lesspipe/metadata.xml @@ -14,6 +14,7 @@ Support doc files with app-text/antiword; this overrides catdoc + Support brotli files; requires app-arch/brotli Support cabextract files Support doc files with app-text/catdoc; unused if antiword is set Support cpio files @@ -33,6 +34,7 @@ Support Apple Property List files Support html files with www-client/links; ignored if html2text is set; this overrides lynx, elinks, w3m Support html files with www-client/lynx; ignored if html2text or links is set; this overrides elinks, w3m + Support lz4 files; requires app-arch/lz4 Support lzip files Support mp3 files with media-sound/mp3info; unused if id3v2 or mp3info2 is set Support mp3 files with dev-perl/MP3-Tag (mp3info2); ignored if id3v2 is set; this overrides mp3info @@ -49,5 +51,6 @@ Support zip files with app-arch/unzip Support html files with www-client/w3m; ignored if html2text, links, lynx, or elinks is set Support Excel and Powerpoint files with app-arch/xlhtml + Support brotli files; requires app-arch/zstd diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index a6c031df..b4bf2a98 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -47,7 +47,7 @@ app-shells/termcolors-mv 4.4: 256colors sample script and dircolors configuratio app-shells/zsh-syntax-highlighting 0.6.0 99999999: Fish shell like syntax highlighting for zsh app-shells/zshrc-mv 3.10: 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 99999999: Wolfgang Friebel's preprocessor for sys-apps/less. Disable by appending colon +app-text/lesspipe 1.83 1.84_alpha0 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/psjoin 0.3: concatenate postscript files. From new PostScript Utilities app-text/recode 3.6_p20-r1: Convert files between various character sets diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 90e1c815..c0d2f26d 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -59,6 +59,7 @@ app-shells/schily-tools:system-star - Rely on app-arch/star for the match manpag app-shells/termcolors-mv:create - Install DIR_COLORS-create perl script app-shells/termcolors-mv:perl - Install 256colors perl script app-text/lesspipe:antiword - Support doc files with app-text/antiword; this overrides catdoc +app-text/lesspipe:brotli - Support brotli files; requires app-arch/brotli app-text/lesspipe:cabextract - Support cabextract files app-text/lesspipe:catdoc - Support doc files with app-text/catdoc; unused if antiword is set app-text/lesspipe:cpio - Support cpio files @@ -78,6 +79,7 @@ app-text/lesspipe:isoinfo - Support CD/DVD-iso files app-text/lesspipe:libplist - Support Apple Property List files 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: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 @@ -94,6 +96,7 @@ 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:xlhtml - Support Excel and Powerpoint files with app-arch/xlhtml +app-text/lesspipe:zstd - Support brotli files; requires app-arch/zstd app-text/stardict:advertisement - Enable stardict advertisements plugin app-text/stardict:cal - Enable calendar support using cal program app-text/stardict:canberra - Use libcanberra for sound playing -- cgit v1.2.3