diff options
Diffstat (limited to 'sys-apps/less')
| -rw-r--r-- | sys-apps/less/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/less/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/less/files/lesspipe.sh | 10 | ||||
| -rw-r--r-- | sys-apps/less/less-445.ebuild (renamed from sys-apps/less/less-444.ebuild) | 16 |
4 files changed, 21 insertions, 14 deletions
diff --git a/sys-apps/less/ChangeLog b/sys-apps/less/ChangeLog index 258d812b..441f75f0 100644 --- a/sys-apps/less/ChangeLog +++ b/sys-apps/less/ChangeLog @@ -2,10 +2,15 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header $ +*less-445.ebuild (28 Oct 2011) + + 28 Oct 2011; Martin Väth <martin@mvath.de> + Bump less version. + *less-444.ebuild (09 Jun 2011) 09 Jun 2011; Martin Väth <martin@mvath.de> - Bump less version. Remove old ebuild. Fix some typos concering env.d + Bump less version. Remove old ebuild. Fix some typos concerning env.d *less-443.ebuild (06 Jun 2011) diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index a4f50b69..4a3f27c1 100644 --- a/sys-apps/less/Manifest +++ b/sys-apps/less/Manifest @@ -1,3 +1,3 @@ DIST code2color 199875 RMD160 378d340a20c3fe500f19116220d54816fe279225 SHA1 b30526dd52c747b8bd6dcf53cf5cc94824c47feb SHA256 ce63f148293a81b0fe5e072f33285f9bf4f1d832f64b23a2220519674a47091d -DIST less-444.tar.gz 307308 RMD160 3ae4bac91a786af638eb07a6b63c85c31db7c829 SHA1 2a10860360a98c07353bbd5b28ec7477af3ec8a4 SHA256 be64ad3e22d6d4aa19fe7024d998563a1ce1671ee3625f8851d26b16dedcdeeb +DIST less-445.tar.gz 307824 RMD160 dbd23a0a0890a89a42c71d6092f3545cb2bc529c SHA1 120c179ab5927bed4ebcda6541082889fed73311 SHA256 66254dbd8142a90821968df249b4e268f53997cb12755d2a7116174b1a35a8bd DIST less-select-patch-436.tar.gz 47383 RMD160 5ccbe853d1f6ce5940f283bd8265ce8b75e20363 SHA1 21f3f8b16be8cd0724820c167d6f685d236cec36 SHA256 bbdd0ee9241803b8de719c358090354bde63472d1df6db271a50be51bfc800f3 diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh index b656e306..4fc04ace 100644 --- a/sys-apps/less/files/lesspipe.sh +++ b/sys-apps/less/files/lesspipe.sh @@ -160,8 +160,12 @@ lesspipe() { *.flac) metaflac --list "$1" ;; *.torrent) torrentinfo "$1" || torrentinfo-console "$1" || ctorrent -x "$1" ;; *.bin|*.cue|*.raw) - # not all .bin/.raw files are cd images, so fall back to hexdump - cd-info --no-header --no-device-info "$1" || lesspipe_file "$1" + # not all .bin/.raw files are cd images #285507 + # fall back to lesspipe_file if .cue doesn't exist, or if + # cd-info failed to parse things sanely + [[ -e ${1%.*}.cue ]] \ + && cd-info --no-header --no-device-info "$1" \ + || lesspipe_file "$1" ;; *.iso) iso_info=$(isoinfo -d -i "$1") @@ -229,7 +233,7 @@ if [[ -z $1 ]] ; then elif [[ $1 == "-V" || $1 == "--version" ]] ; then Id="cvsid" cat <<-EOF - $Id: lesspipe.sh,v 1.45 2011/01/20 03:26:14 vapier Exp $ + $Id: lesspipe.sh,v 1.46 2011/10/09 19:19:07 vapier Exp $ Copyright 2001-2010 Gentoo Foundation Mike Frysinger <vapier@gentoo.org> (with plenty of ideas stolen from other projects/distros) diff --git a/sys-apps/less/less-444.ebuild b/sys-apps/less/less-445.ebuild index 40c6f73b..6dac5097 100644 --- a/sys-apps/less/less-444.ebuild +++ b/sys-apps/less/less-445.ebuild @@ -7,7 +7,7 @@ inherit eutils DESCRIPTION="Excellent text file viewer, optionally with additional selection feature" HOMEPAGE="http://www.greenwoodsoftware.com/less/" -PATCHVER=436 +PATCHVER="436" SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz http://www-zeuthen.desy.de/~friebel/unix/less/code2color less-select? ( http://www.mathematik.uni-wuerzburg.de/~vaeth/download/less-select-patch-${PATCHVER}.tar.gz )" @@ -42,15 +42,14 @@ src_prepare() { fi } -yesno() { use $1 && echo yes || echo no ; } src_configure() { - export ac_cv_lib_ncursesw_initscr=$(yesno unicode) - export ac_cv_lib_ncurses_initscr=$(yesno !unicode) + export ac_cv_lib_ncursesw_initscr=$(usex unicode) + export ac_cv_lib_ncurses_initscr=$(usex !unicode) econf || die } src_compile() { - default_src_compile + default if use less-select then ./lesskey -o less-normal-key.bin "${SELECTDIR}/less-normal-key.src" || die ./lesskey -o less-select-key.bin "${SELECTDIR}/less-select-key.src" || die @@ -59,14 +58,11 @@ src_compile() { src_install() { local a - default_src_install + default dobin code2color || die "dobin" newbin "${FILESDIR}"/lesspipe.sh lesspipe || die "newbin" dosym lesspipe /usr/bin/lesspipe.sh - - dodoc NEWS README* "${FILESDIR}"/README.Gentoo - if use original-gentoo then a="-R -M --shift 5" else a="-sFRiMX --shift 5" @@ -74,6 +70,8 @@ src_install() { printf '%s\n' 'LESSOPEN="|lesspipe.sh %s"' "LESS=\"${a}\"" >70less doenvd 70less + dodoc NEWS README* "${FILESDIR}"/README.Gentoo + if use less-select then dodoc "${SELECTDIR}"/README.less-select newbin "${SELECTDIR}/less-select" less-select |