From 889f3d29623ba0ce74583ecfce1219111ba98e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20V=C3=A4th?= Date: Tue, 26 Sep 2017 21:09:09 +0200 Subject: sys-apps/less: Version bump --- metadata/pkg_desc_index | 2 +- sys-apps/less/Manifest | 7 ++-- sys-apps/less/less-497.ebuild | 89 ------------------------------------------- sys-apps/less/less-520.ebuild | 89 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+), 93 deletions(-) delete mode 100644 sys-apps/less/less-497.ebuild create mode 100644 sys-apps/less/less-520.ebuild diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index a2e6d22b..5808fad7 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -93,7 +93,7 @@ net-print/foo2zjs 20160722: Support for printing to ZjStream-based printers sci-mathematics/genius 1.0.21: Genius Mathematics Tool and the GEL Language sci-mathematics/reduce 20141130-r2: A general-purpose computer algebra system sys-apps/cpi 2.15: A wrapper for cp -i -a, making use of diff -sys-apps/less 487 497: Excellent text file viewer, optionally with additional selection feature +sys-apps/less 487 520: Excellent text file viewer, optionally with additional selection feature sys-apps/openrc-wrapper 2.2: Use openrc init scripts with systemd or other init systems sys-apps/paxopen 1.2: A wrapper script to set PAX kernel variables to an insecure/safe state sys-apps/schedule 7.5.4: script to schedule jobs in a multiuser multitasking environment diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index 6e0d3155..9b3b6da0 100644 --- a/sys-apps/less/Manifest +++ b/sys-apps/less/Manifest @@ -1,3 +1,4 @@ -DIST less-487.tar.gz 318488 SHA256 f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706 -DIST less-497.tar.gz 321341 SHA256 3a8260a485f85a8aada748559cc42d6e8261325fbcb7d32fff6e60ac837b3ff2 -DIST less-select-2.6.tar.gz 26354 SHA256 df4ab8f17568cabd864358e5f0a765241f586b8c30341116a649db91db9048bf +DIST less-487.tar.gz 318488 SHA256 f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706 SHA512 d31274fdada570fbc6706d7c52637d1accbd18ce947ec062e10b1624c251a8533c6638bc3a1d89d3c70a0c7b9c6d45740598bec9003f281d64c587b1f829125a +DIST less-520.tar.gz 337959 SHA256 7b89ea8e605c242f792594ca81dc89979f3537d8cce578f628329c748004908b SHA512 67b51f4734a3b5a7871509110f87bbd6d1fa3068ad2d524adaa07b8917ff18a962b706cf5d55cf9800a39f9e583f21d0249837841d3c999babaaf5aa2bc4ff9d +DIST less-select-2.6.tar.gz 26354 SHA256 df4ab8f17568cabd864358e5f0a765241f586b8c30341116a649db91db9048bf SHA512 d674e2bcbda2155bd3da862452a78f8aa410661b887ab1c28ac2b338bd602335bbaaebf4daaf3eba120400b2d58244c98e5a96d4d2c7b74fb5b12e2210dbb00d +DIST less-select-2.7.tar.gz 27802 SHA256 3e31ff26806d3fef4f2ea847c73a83a61c97920257e60816cb3c94637859e49d SHA512 4cf1ebcaf6928b4852642545196a5c3959f360ba27cebceee84a1848e3752e0f9dbaf8ef4649f2e41dd2e328703580612bcf398250d36dfc6d391a2724604a43 diff --git a/sys-apps/less/less-497.ebuild b/sys-apps/less/less-497.ebuild deleted file mode 100644 index ba5510a0..00000000 --- a/sys-apps/less/less-497.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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} )" - -LICENSE="|| ( GPL-3 BSD-2 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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" -IUSE="+lesspipe +less-select pcre original-gentoo source unicode" - -DEPEND=">=app-misc/editor-wrapper-3 - >=sys-libs/ncurses-5.2:0= - 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? ( app-text/lesspipe )" - -pkg_setup() { - if use source && ! use less-select - then ewarn 'ignoring USE=source without USE=less-select' - fi -} - -src_prepare() { - if use less-select - then eapply "${SELECTDIR}/patches/less-${PATCHVER}-select.patch" - "${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 - chmod a+x configure || die - eapply_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 b - default - - newbin "${FILESDIR}"/lesspipe.sh lesspipe - - if use original-gentoo - then a="-R -M --shift 5" - else a="-sFRiMX --shift 5" - fi - printf '%s\n' \ - 'LESSOPEN="|lesspipe'$(! use lesspipe || echo .sh)' %s"' \ - "LESS=\"${a}\"" \ - >70less || die - doenvd 70less - - 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 -} diff --git a/sys-apps/less/less-520.ebuild b/sys-apps/less/less-520.ebuild new file mode 100644 index 00000000..434bdcf9 --- /dev/null +++ b/sys-apps/less/less-520.ebuild @@ -0,0 +1,89 @@ +# Copyright 2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Excellent text file viewer, optionally with additional selection feature" +PATCHN="less-select" +PATCHV="2.7" +PATCHVER="520" +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} )" + +LICENSE="|| ( GPL-3 BSD-2 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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" +IUSE="+lesspipe +less-select pcre original-gentoo source unicode" + +DEPEND=">=app-misc/editor-wrapper-3 + >=sys-libs/ncurses-5.2:0= + 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? ( app-text/lesspipe )" + +pkg_setup() { + if use source && ! use less-select + then ewarn 'ignoring USE=source without USE=less-select' + fi +} + +src_prepare() { + if use less-select + then eapply "${SELECTDIR}/patches/less-${PATCHVER}-select.patch" + "${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 + chmod a+x configure || die + eapply_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 b + default + + newbin "${FILESDIR}"/lesspipe.sh lesspipe + + if use original-gentoo + then a="-R -M --shift 5" + else a="-sFRiMX --shift 5" + fi + printf '%s\n' \ + 'LESSOPEN="|lesspipe'$(! use lesspipe || echo .sh)' %s"' \ + "LESS=\"${a}\"" \ + >70less || die + doenvd 70less + + 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 +} -- cgit v1.2.3