From a253339b06e3fab60a8981209cf9f481ac453ab9 Mon Sep 17 00:00:00 2001 From: Martin Väth Date: Mon, 23 Jul 2012 19:04:56 +0200 Subject: Bump less. Use l10n eclass. Update checksums --- sys-apps/less/ChangeLog | 5 +++ sys-apps/less/Manifest | 4 +- sys-apps/less/less-450.ebuild | 99 ------------------------------------------- sys-apps/less/less-451.ebuild | 95 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 102 insertions(+), 101 deletions(-) delete mode 100644 sys-apps/less/less-450.ebuild create mode 100644 sys-apps/less/less-451.ebuild (limited to 'sys-apps') diff --git a/sys-apps/less/ChangeLog b/sys-apps/less/ChangeLog index 9be2cf2a..44da8655 100644 --- a/sys-apps/less/ChangeLog +++ b/sys-apps/less/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*less-451.ebuild (23 Jul 2012) + + 23 Jul 2012; Martin Väth + 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 diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index 2503bc0f..fce697f9 100644 --- a/sys-apps/less/Manifest +++ b/sys-apps/less/Manifest @@ -1,3 +1,3 @@ DIST code2color 199875 SHA256 ce63f148293a81b0fe5e072f33285f9bf4f1d832f64b23a2220519674a47091d SHA512 d9cf24434bf105a138ee82652867aedb83dfe6bfea14d20337f97cf9d37ff9f370a4a7dd58bc7eb69de0f3b944d47c7d7e075f50098b0966e753f42b1b35c22f WHIRLPOOL cdb748e04663a6a109310da454ff5a245e6562ec8cdae03a35ca93095e40511707662c4743dcd922049838cac646d930e6b2d2878f26c328916bb3c9c60c5e8c -DIST less-450.tar.gz 310123 SHA256 9d350ceeaa333e053049d63af8072a3c926edd86b54755f0a0d103045b925066 SHA512 77f9f087d0b7a2245457d3aa21b1295c2ef996fea58086abdf09860aedf4303c8c56d58454e2e1acce383b8dc6a96829f3fbf2ce5f610052bd21d9b2b9c1c295 WHIRLPOOL 0a1d7e79258f4136b3122b28dbe4f723a0536be4a065c0424e76b0a0d9425e92799d1f27ccc6b920bfb8acc7d59a3ee85b7fa40755358389d59fbd9bde8945ef -DIST less-select-2.2.tar.gz 25047 SHA256 b9a35194fd6c188a9aedc6835b233f0e8078df0e309e39067c893b8b1f73141f +DIST less-451.tar.gz 310144 SHA256 9fe8287c647afeafb4149c5dedaeacfd20971ed7c26c7553794bb750536b5f57 SHA512 6a9a0853e802306c9f6695e8a71f2bcfd38479c80a4f814852fd012caf4823f448d9f203ca52bc356f31aa368bf96e773938ee2be5ff20804dce3ee1a28bf42d WHIRLPOOL 4fe6ed7e814bcef467175b978827a9009094f4a5395ee746c74bb13f38830bf19aa4e54da60b80b68d61a92525f383749eb0c019e4eddf6b89d87d9df05bf43a +DIST less-select-2.2.tar.gz 25047 SHA256 b9a35194fd6c188a9aedc6835b233f0e8078df0e309e39067c893b8b1f73141f SHA512 5ce36fa4e404ae626f9c96ffcf58b9188e0f12c6db0321d3f0ed8fe47593951d072e1da53b874e80fc39041ae8aa85d06d646215d7ad63c611cb096ff5ca9136 WHIRLPOOL ec5341dbb4292f3e776e32ba996ef2efe2aa89438d4f0907efecdcf234d27b2b0e149d43ebd6dee089365c20f2a0796497e5cceebf3f25b846c14e8f0d9e762e diff --git a/sys-apps/less/less-450.ebuild b/sys-apps/less/less-450.ebuild deleted file mode 100644 index 6e7c0c20..00000000 --- a/sys-apps/less/less-450.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" - -inherit eutils - -DESCRIPTION="Excellent text file viewer, optionally with additional selection feature" -PATCHN="less-select" -PATCHV="2.2" -PATCHVER="436" -PATCHBALL="${PATCHN}-${PATCHV}.tar.gz" -HOMEPAGE="http://www.greenwoodsoftware.com/less/ https://github.com/vaeth/${PATCHN}" -SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz - less-select? ( http://github.com/vaeth/${PATCHN}/tarball/release-${PATCHV} -> ${PATCHBALL} ) - http://www-zeuthen.desy.de/~friebel/unix/less/code2color" - -LICENSE="|| ( GPL-3 BSD-2 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+less-select pcre original-gentoo unicode" - -DEPEND=">=app-misc/editor-wrapper-3 - >=sys-libs/ncurses-5.2 - pcre? ( dev-libs/libpcre )" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${P}.tar.gz - cp "${DISTDIR}"/code2color "${S}"/ - if use less-select - then unpack ${PATCHBALL} - cd *"${PATCHN}"-* - SELECTDIR=${PWD} - 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.patch - epatch_user -} - -src_configure() { - export ac_cv_lib_ncursesw_initscr=$(usex unicode) - export ac_cv_lib_ncurses_initscr=$(usex !unicode) - - local regex="posix" - use pcre && regex="pcre" - - econf \ - --with-regex=${regex} \ - --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 - - dobin code2color - newbin "${FILESDIR}"/lesspipe.sh lesspipe - dosym lesspipe /usr/bin/lesspipe.sh - 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 NEWS README* "${FILESDIR}"/README.Gentoo - - if use less-select - then newdoc "${SELECTDIR}"/README README.less-select - dobin "${SELECTDIR}/bin/"* - insinto /etc/less - # The first is required for less-select, the others are optional - doins select-key.bin normal-key.bin - newins "${SELECTDIR}/keys/less-select-key.src" select-key.src - newins "${SELECTDIR}/keys/less-normal-key.src" normal-key.src - fi -} - -pkg_postinst() { - einfo "lesspipe offers colorization options. Run 'lesspipe -h' for info." -} diff --git a/sys-apps/less/less-451.ebuild b/sys-apps/less/less-451.ebuild new file mode 100644 index 00000000..bc8894e6 --- /dev/null +++ b/sys-apps/less/less-451.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" + +inherit eutils + +DESCRIPTION="Excellent text file viewer, optionally with additional selection feature" +PATCHN="less-select" +PATCHV="2.2" +PATCHVER="436" +PATCHBALL="${PATCHN}-${PATCHV}.tar.gz" +HOMEPAGE="http://www.greenwoodsoftware.com/less/ https://github.com/vaeth/${PATCHN}" +SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz + less-select? ( http://github.com/vaeth/${PATCHN}/tarball/release-${PATCHV} -> ${PATCHBALL} ) + http://www-zeuthen.desy.de/~friebel/unix/less/code2color" + +LICENSE="|| ( GPL-3 BSD-2 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+less-select pcre original-gentoo unicode" + +DEPEND=">=app-misc/editor-wrapper-3 + >=sys-libs/ncurses-5.2 + pcre? ( dev-libs/libpcre )" +RDEPEND="${DEPEND}" + +src_unpack() { + unpack ${P}.tar.gz + cp "${DISTDIR}"/code2color "${S}"/ + if use less-select + then unpack ${PATCHBALL} + cd *"${PATCHN}"-* + SELECTDIR=${PWD} + 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.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 + + dobin code2color + newbin "${FILESDIR}"/lesspipe.sh lesspipe + dosym lesspipe /usr/bin/lesspipe.sh + 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 + # The first is required for less-select, the others are optional + doins select-key.bin normal-key.bin + newins "${SELECTDIR}/keys/less-select-key.src" select-key.src + newins "${SELECTDIR}/keys/less-normal-key.src" normal-key.src + fi +} + +pkg_postinst() { + einfo "lesspipe offers colorization options. Run 'lesspipe -h' for info." +} -- cgit v1.2.3-65-gdbad