From ea6c4ce874031214acb90d7e5c79cb997dbc0940 Mon Sep 17 00:00:00 2001 From: Martin Väth Date: Wed, 2 Sep 2015 22:29:38 +0200 Subject: Bump less --- sys-apps/less/ChangeLog | 5 ++ sys-apps/less/Manifest | 2 +- sys-apps/less/files/lesspipe.sh | 2 +- sys-apps/less/less-479.ebuild | 112 ---------------------------------------- sys-apps/less/less-481.ebuild | 112 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 119 insertions(+), 114 deletions(-) delete mode 100644 sys-apps/less/less-479.ebuild create mode 100644 sys-apps/less/less-481.ebuild diff --git a/sys-apps/less/ChangeLog b/sys-apps/less/ChangeLog index ffbe46ae..2c3027ba 100644 --- a/sys-apps/less/ChangeLog +++ b/sys-apps/less/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*less-481.ebuild (02 Aug 2015) + + 02 Aug 2015; Martin Väth : + Bump less version + *less-479.ebuild (11 Jul 2015) 11 Jul 2015; Martin Väth : diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index 93cf3bdf..002809e8 100644 --- a/sys-apps/less/Manifest +++ b/sys-apps/less/Manifest @@ -1,3 +1,3 @@ DIST code2color-0.2 200711 SHA256 2365c9009b1cc3c30430b88775ec402164df105fd12364871d05dcaed20be954 SHA512 c0ab9f411d5a106c81334343e3c4a63b67d27b95e2d128145e3ac1ee46cd6c228c61796cf96e51826e69b3e465e7bdaa81b1a48cad934c23b310f2ea2ebd8e75 WHIRLPOOL d0207e84a5849c554b1dfc5882ab46d8afc411c7d26e912235ec05565880e6ed0db8449133502234a01ae8f59feae211486b6a523e37859d8404f72fff9b8f93 -DIST less-479.tar.gz 316484 SHA256 5bf06cb30ee2a2bd1f79f39aa91e46444e7cb19b48c95c4992fa63cfe4527a80 SHA512 56ecfd3c4e586a926e609dabb278eea1554a4a70a1d1d675cea2e9d69ae764f646b25eab197032db6aa571c22a3550ec11a3a7ef556e0d4523092c7a5daaa030 WHIRLPOOL 9b667e1267cd079cbde0a97379495f8f6034be73e0211cb5cae24509671d582fd2e930aa7dd150a1872184eea0e53f5c7fd9decfe4dc1ee38af3b94f3158fd67 +DIST less-481.tar.gz 316622 SHA256 3fa38f2cf5e9e040bb44fffaa6c76a84506e379e47f5a04686ab78102090dda5 SHA512 29995757ac416ed6770cf6e82e6fe325bd1d61d51666d80c4fe72b2b4217b0b1d706d337d89ed54bdc4d83d57f3e2c0166e642b20ef2ad194e52aad630b3e717 WHIRLPOOL e5c8b22d7d1149feafdad0130e00aa5564e818a845c3b4e2b6d151e851dd64ff390fdad01ee79580fe6ab92defc11930d3f3e0ca0d189d2882419444a3d7028c DIST less-select-2.6.tar.gz 26354 SHA256 df4ab8f17568cabd864358e5f0a765241f586b8c30341116a649db91db9048bf SHA512 d674e2bcbda2155bd3da862452a78f8aa410661b887ab1c28ac2b338bd602335bbaaebf4daaf3eba120400b2d58244c98e5a96d4d2c7b74fb5b12e2210dbb00d WHIRLPOOL 04a2df34bb0daf0b86044f887bf10a6af9d941314028b052f5dfe7c0dbd4e74ecb69f88eaf8c24dbad446e8de1bcc81401118df04e186887eba126362bbb32d5 diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh index 3675b7be..6edaa3ce 100644 --- a/sys-apps/less/files/lesspipe.sh +++ b/sys-apps/less/files/lesspipe.sh @@ -236,7 +236,7 @@ if [[ -z $1 ]] ; then elif [[ $1 == "-V" || $1 == "--version" ]] ; then Id="cvsid" cat <<-EOF - $Id: lesspipe.sh,v 1.54 2013/12/31 02:25:30 vapier Exp $ + $Id$ Copyright 2001-2013 Gentoo Foundation Mike Frysinger (with plenty of ideas stolen from other projects/distros) diff --git a/sys-apps/less/less-479.ebuild b/sys-apps/less/less-479.ebuild deleted file mode 100644 index ddbb26ff..00000000 --- a/sys-apps/less/less-479.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils - -CODE2COLOR_PV="0.2" -CODE2COLOR_P="code2color-${CODE2COLOR_PV}" -DESCRIPTION="Excellent text file viewer, optionally with additional selection feature" -PATCHN="less-select" -PATCHV="2.6" -PATCHVER="466" -PATCHRUMP="${PATCHN}-${PATCHV}" -PATCHBALL="${PATCHRUMP}.tar.gz" -SELECTDIR="${WORKDIR}/${PATCHRUMP}" -HOMEPAGE="http://www.greenwoodsoftware.com/less/ https://github.com/vaeth/${PATCHN}" -SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz - less-select? ( https://github.com/vaeth/${PATCHN}/archive/v${PATCHV}.tar.gz -> ${PATCHBALL} ) - http://www-zeuthen.desy.de/~friebel/unix/less/code2color -> ${CODE2COLOR_P}" - -LICENSE="|| ( GPL-3 BSD-2 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+lesspipe +less-select pcre original-gentoo source unicode" - -DEPEND=">=app-misc/editor-wrapper-3 - >=sys-libs/ncurses-5.2 - pcre? ( dev-libs/libpcre )" -RDEPEND="${DEPEND} - less-select? ( dev-lang/perl - || ( >=dev-lang/perl-5.10.1 >=virtual/perl-File-Temp-0.19 ) - )" -PDEPEND="lesspipe? ( sys-apps/lesspipe )" - -pkg_setup() { - if use source && ! use less-select - then ewarn 'ignoring USE=source without USE=less-select' - fi -} - -src_unpack() { - unpack ${P}.tar.gz - cp "${DISTDIR}/${CODE2COLOR_P}" "${S}"/code2color || die - if use less-select - then unpack ${PATCHBALL} - fi -} - -src_prepare() { - if use less-select - then epatch "${SELECTDIR}/patches/less-${PATCHVER}-select.patch" || die - "${SELECTDIR}"/after-patch || die "${SELECTDIR}/after-patch failed" - sed -i -e 's|\([^a-zA-Z]\)/etc/less-select-key.bin|\1'"${EPREFIX}"'/etc/less/select-key.bin|g' \ - "${SELECTDIR}/bin/less-select" || die - fi - epatch "${FILESDIR}/${CODE2COLOR_P}.patch" - chmod a+x configure || die - epatch_user -} - -src_configure() { - export ac_cv_lib_ncursesw_initscr=$(usex unicode) - export ac_cv_lib_ncurses_initscr=$(usex !unicode) - econf \ - --with-regex=$(usex pcre pcre posix) \ - --with-editor="${EPREFIX}"/usr/libexec/editor -} - -src_compile() { - default - if use less-select - then ./lesskey -o normal-key.bin "${SELECTDIR}/keys/less-normal-key.src" || die - ./lesskey -o select-key.bin "${SELECTDIR}/keys/less-select-key.src" || die - fi -} - -src_install() { - local a - default - - if ! use lesspipe - then dobin code2color - newbin "${FILESDIR}"/lesspipe.sh lesspipe - dosym lesspipe /usr/bin/lesspipe.sh - fi - if use original-gentoo - then a="-R -M --shift 5" - else a="-sFRiMX --shift 5" - fi - printf '%s\n' 'LESSOPEN="|lesspipe.sh %s"' "LESS=\"${a}\"" >70less - doenvd 70less - - dodoc "${FILESDIR}"/README.Gentoo - - if use less-select - then newdoc "${SELECTDIR}"/README README.less-select - dobin "${SELECTDIR}/bin/"* - insinto /etc/less - doins select-key.bin normal-key.bin - if use source - then newins "${SELECTDIR}/keys/less-select-key.src" select-key.src - newins "${SELECTDIR}/keys/less-normal-key.src" normal-key.src - fi - fi -} - -pkg_postinst() { - use lesspipe || \ - elog "lesspipe offers colorization options. Run 'lesspipe -h' for info." -} diff --git a/sys-apps/less/less-481.ebuild b/sys-apps/less/less-481.ebuild new file mode 100644 index 00000000..ddbb26ff --- /dev/null +++ b/sys-apps/less/less-481.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils + +CODE2COLOR_PV="0.2" +CODE2COLOR_P="code2color-${CODE2COLOR_PV}" +DESCRIPTION="Excellent text file viewer, optionally with additional selection feature" +PATCHN="less-select" +PATCHV="2.6" +PATCHVER="466" +PATCHRUMP="${PATCHN}-${PATCHV}" +PATCHBALL="${PATCHRUMP}.tar.gz" +SELECTDIR="${WORKDIR}/${PATCHRUMP}" +HOMEPAGE="http://www.greenwoodsoftware.com/less/ https://github.com/vaeth/${PATCHN}" +SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz + less-select? ( https://github.com/vaeth/${PATCHN}/archive/v${PATCHV}.tar.gz -> ${PATCHBALL} ) + http://www-zeuthen.desy.de/~friebel/unix/less/code2color -> ${CODE2COLOR_P}" + +LICENSE="|| ( GPL-3 BSD-2 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+lesspipe +less-select pcre original-gentoo source unicode" + +DEPEND=">=app-misc/editor-wrapper-3 + >=sys-libs/ncurses-5.2 + pcre? ( dev-libs/libpcre )" +RDEPEND="${DEPEND} + less-select? ( dev-lang/perl + || ( >=dev-lang/perl-5.10.1 >=virtual/perl-File-Temp-0.19 ) + )" +PDEPEND="lesspipe? ( sys-apps/lesspipe )" + +pkg_setup() { + if use source && ! use less-select + then ewarn 'ignoring USE=source without USE=less-select' + fi +} + +src_unpack() { + unpack ${P}.tar.gz + cp "${DISTDIR}/${CODE2COLOR_P}" "${S}"/code2color || die + if use less-select + then unpack ${PATCHBALL} + fi +} + +src_prepare() { + if use less-select + then epatch "${SELECTDIR}/patches/less-${PATCHVER}-select.patch" || die + "${SELECTDIR}"/after-patch || die "${SELECTDIR}/after-patch failed" + sed -i -e 's|\([^a-zA-Z]\)/etc/less-select-key.bin|\1'"${EPREFIX}"'/etc/less/select-key.bin|g' \ + "${SELECTDIR}/bin/less-select" || die + fi + epatch "${FILESDIR}/${CODE2COLOR_P}.patch" + chmod a+x configure || die + epatch_user +} + +src_configure() { + export ac_cv_lib_ncursesw_initscr=$(usex unicode) + export ac_cv_lib_ncurses_initscr=$(usex !unicode) + econf \ + --with-regex=$(usex pcre pcre posix) \ + --with-editor="${EPREFIX}"/usr/libexec/editor +} + +src_compile() { + default + if use less-select + then ./lesskey -o normal-key.bin "${SELECTDIR}/keys/less-normal-key.src" || die + ./lesskey -o select-key.bin "${SELECTDIR}/keys/less-select-key.src" || die + fi +} + +src_install() { + local a + default + + if ! use lesspipe + then dobin code2color + newbin "${FILESDIR}"/lesspipe.sh lesspipe + dosym lesspipe /usr/bin/lesspipe.sh + fi + if use original-gentoo + then a="-R -M --shift 5" + else a="-sFRiMX --shift 5" + fi + printf '%s\n' 'LESSOPEN="|lesspipe.sh %s"' "LESS=\"${a}\"" >70less + doenvd 70less + + dodoc "${FILESDIR}"/README.Gentoo + + if use less-select + then newdoc "${SELECTDIR}"/README README.less-select + dobin "${SELECTDIR}/bin/"* + insinto /etc/less + doins select-key.bin normal-key.bin + if use source + then newins "${SELECTDIR}/keys/less-select-key.src" select-key.src + newins "${SELECTDIR}/keys/less-normal-key.src" normal-key.src + fi + fi +} + +pkg_postinst() { + use lesspipe || \ + elog "lesspipe offers colorization options. Run 'lesspipe -h' for info." +} -- cgit v1.2.3-65-gdbad