From 9dac65d4417e9fda91463a65a5ec375c89cb5778 Mon Sep 17 00:00:00 2001 From: Martin Väth Date: Mon, 22 Sep 2014 18:23:52 +0200 Subject: Bump less --- sys-apps/less/ChangeLog | 42 ++++++++-------- sys-apps/less/Manifest | 2 +- sys-apps/less/less-466.ebuild | 111 ------------------------------------------ sys-apps/less/less-468.ebuild | 111 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 135 insertions(+), 131 deletions(-) delete mode 100644 sys-apps/less/less-466.ebuild create mode 100644 sys-apps/less/less-468.ebuild (limited to 'sys-apps') diff --git a/sys-apps/less/ChangeLog b/sys-apps/less/ChangeLog index 2ba30bc1..6e3d0d79 100644 --- a/sys-apps/less/ChangeLog +++ b/sys-apps/less/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*less-468.ebuild (22 Sep 2014) + + 22 Sep 2014; Martin Väth : + Bump less version + *less-462-r1.ebuild (24 Dec 2013) 13 Sep 2014; Martin Väth : @@ -39,25 +44,25 @@ *less-459.ebuild (28 May 2013) 28 May 2013; Martin Väth : - Bump less version. + Bump less version *less-458.ebuild (05 Apr 2013) 05 Apr 2013; Martin Väth : - Bump less version. + Bump less version *less-457.ebuild (10 Dec 2012) 20 Feb 2013; Martin Väth : - Update code2color handling from main tree. + Update code2color handling from main tree 10 Dec 2012; Martin Väth : - Bump less version. + Bump less version *less-456.ebuild (09 Nov 2012) 09 Nov 2012; Martin Väth : - Bump less version. + Bump less version *less-452.ebuild (23 Oct 2012) @@ -70,17 +75,17 @@ Bump to EAPI=5 23 Jul 2012; Martin Väth : - Bump less version. Simplify doc install and pcre passing as in main tree. + Bump less version. Simplify doc install and pcre passing as in main tree *less-450.ebuild (16 Jul 2012) 16 Jul 2012; Martin Väth : - Bump less version. + Bump less version *less-449.ebuild (28 Jun 2012) 28 Jun 2012; Martin Väth : - Bump less version. + Bump less version *less-445-r1.ebuild (10 Nov 2011) @@ -91,7 +96,7 @@ Inherit base 02 Mar 2012; Martin Väth : - Change to github repository. + Change to github repository 31 Jan 2012; Martin Väth : Bump lesspipe.sh from tree @@ -106,7 +111,7 @@ *less-445.ebuild (28 Oct 2011) 28 Oct 2011; Martin Väth : - Bump less version. + Bump less version *less-444.ebuild (09 Jun 2011) @@ -119,39 +124,38 @@ -less-select-443.ebuild +less-443.ebuild Rename into less to avoid problems with portage hard-depending on less. In fact, less-select is just less with additional options which therefore - should be provided by a useflag. + should be provided by a useflag *less-select-443.ebuild (11 Apr 2011) 11 Apr 2011; Martin Väth : - Bump less version. Remove old ebuild. + Bump less version. Remove old ebuild *less-select-441.ebuild (28 Feb 2011) 29 Feb 2011; Martin Väth : - Bump less version. Remove old ebuild. + Bump less version. Remove old ebuild *less-select-440.ebuild (06 Jan 2011) 04 Jan 2011; Martin Väth : - Bump less version. Remove old ebuild. + Bump less version. Remove old ebuild *less-select-438.ebuild (01 Jan 2011) 04 Jan 2011; Martin Väth : - Bump to EAPI=4. + Bump to EAPI=4 01 Jan 2011; Martin Väth : : - Bump less version. Remove old ebuild. + Bump less version. Remove old ebuild *less-select-436-r1.ebuild (30 Mar 2010) 12 Jun 2010; Martin Väth : : - Remove unneeded files/less.envd. Remove arches which I never tested. + Remove unneeded files/less.envd. Remove arches which I never tested 30 Mar 2010; Martin Väth : : - -less-select-436.ebuild +less-select-436-r1.ebuild files/lesspipe.sh: - Update lesspipe.sh and related changes of sys-apps/less in portage tree. + Update lesspipe.sh and related changes of sys-apps/less in portage tree 22 Jul 2009; Martin Väth : : Version bump to less-select-436 diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index 66076f3f..fff19a2d 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-466.tar.gz 315462 SHA256 8305f5a06764ff094ed3428f94f29059541e2483eae201991f90823da6557212 SHA512 12f732ac37ba78e6df97d9674f42e00c6dcae74fdbf225c387542ab64f1613d09b7373097ac6ff1b598c02cbfaa8f5816dd2df5c6ed2d14d347c78994d89e4d4 WHIRLPOOL e91ba7d3b9175bd44f6787af50b9f2543e30ff385e6d390cc79f545591692811a88f319c88f364d72a4b5d9d814e53eab444c20624a58007661644b6a67f6490 +DIST less-468.tar.gz 315826 SHA256 48e8b5ccb10d02447415e3b95d2e86fa39efe7cad2f7c235136e67c6ef8566e8 SHA512 f5d2809d869167b7fd98aae9ece435c4834683041cb8e192cb214157c619e9a01c0fe45a0bcf7878025cf9b10dc243cf22033c94b7bdb27d9d3d7d95c54b178f WHIRLPOOL 442501da8ddb11815e7497d717b0dd7657b846658667dd3e862fa9aea7cdf032032eb42b999b406ef0500422726ae0165a53bdcbd8f32cec810243e5ebcef3b2 DIST less-select-2.6.tar.gz 26354 SHA256 df4ab8f17568cabd864358e5f0a765241f586b8c30341116a649db91db9048bf SHA512 d674e2bcbda2155bd3da862452a78f8aa410661b887ab1c28ac2b338bd602335bbaaebf4daaf3eba120400b2d58244c98e5a96d4d2c7b74fb5b12e2210dbb00d WHIRLPOOL 04a2df34bb0daf0b86044f887bf10a6af9d941314028b052f5dfe7c0dbd4e74ecb69f88eaf8c24dbad446e8de1bcc81401118df04e186887eba126362bbb32d5 diff --git a/sys-apps/less/less-466.ebuild b/sys-apps/less/less-466.ebuild deleted file mode 100644 index 78444c9c..00000000 --- a/sys-apps/less/less-466.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -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" - 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-468.ebuild b/sys-apps/less/less-468.ebuild new file mode 100644 index 00000000..78444c9c --- /dev/null +++ b/sys-apps/less/less-468.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +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" + 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-18-g5258