diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/less/ChangeLog | 3 | ||||
| -rw-r--r-- | sys-apps/less/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/less/less-445-r1.ebuild | 42 |
3 files changed, 24 insertions, 23 deletions
diff --git a/sys-apps/less/ChangeLog b/sys-apps/less/ChangeLog index a278cfbe..bd38ab92 100644 --- a/sys-apps/less/ChangeLog +++ b/sys-apps/less/ChangeLog @@ -4,6 +4,9 @@ *less-445-r1.ebuild (10 Nov 2011) + 02 Mar 2012; Martin Väth <martin@mvath.de> + Change to github repository. + 31 Jan 2012; Martin Väth <martin@mvath.de> Bump lesspipe.sh from tree diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index 4a3f27c1..bfb2f23a 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-445.tar.gz 307824 RMD160 dbd23a0a0890a89a42c71d6092f3545cb2bc529c SHA1 120c179ab5927bed4ebcda6541082889fed73311 SHA256 66254dbd8142a90821968df249b4e268f53997cb12755d2a7116174b1a35a8bd -DIST less-select-patch-436.tar.gz 47383 RMD160 5ccbe853d1f6ce5940f283bd8265ce8b75e20363 SHA1 21f3f8b16be8cd0724820c167d6f685d236cec36 SHA256 bbdd0ee9241803b8de719c358090354bde63472d1df6db271a50be51bfc800f3 +DIST less-select-2.2.tar.gz 25047 RMD160 24d5f18785ac6aa45b74e78c32d16d3ce5ad95df SHA1 c64825b034b8fa7d356ac3fd08fb45e605a05aa0 SHA256 b9a35194fd6c188a9aedc6835b233f0e8078df0e309e39067c893b8b1f73141f diff --git a/sys-apps/less/less-445-r1.ebuild b/sys-apps/less/less-445-r1.ebuild index 41256946..b9385c9c 100644 --- a/sys-apps/less/less-445-r1.ebuild +++ b/sys-apps/less/less-445-r1.ebuild @@ -6,43 +6,42 @@ EAPI="4" inherit eutils DESCRIPTION="Excellent text file viewer, optionally with additional selection feature" -HOMEPAGE="http://www.greenwoodsoftware.com/less/" +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 - 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 )" + 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 ~sparc-fbsd ~x86-fbsd" IUSE="+less-select pcre original-gentoo unicode" -RDEPEND=">=app-misc/editor-wrapper-3 +DEPEND=">=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2 pcre? ( dev-libs/libpcre )" -DEPEND="${RDEPEND}" - -SELECTDIR="${WORKDIR}/less-select-patch-${PATCHVER}" +RDEPEND="${DEPEND}" src_unpack() { unpack ${P}.tar.gz cp "${DISTDIR}"/code2color "${S}"/ if use less-select - then unpack "less-select-patch-${PATCHVER}.tar.gz" + then unpack ${PATCHBALL} + cd *"${PATCHN}"-* + SELECTDIR="${PWD}" fi } src_prepare() { epatch "${FILESDIR}"/code2color.patch if use less-select - then mv -- "${SELECTDIR}/INSTALL" "${SELECTDIR}/README.less-select" - if test -e "${SELECTDIR}/less-${PV}-select.patch" - then epatch "${SELECTDIR}/less-${PV}-select.patch" || die "Patch less-${PV}-select failed" - else epatch "${SELECTDIR}/less-${PATCHVER}-select.patch" || die "Patch less-${PATCHVER}-select failed" - fi + 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}/less-select" + "${SELECTDIR}/bin/less-select" || die fi } @@ -61,8 +60,8 @@ src_configure() { 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 + 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 } @@ -83,14 +82,13 @@ src_install() { dodoc NEWS README* "${FILESDIR}"/README.Gentoo if use less-select - then dodoc "${SELECTDIR}"/README.less-select - newbin "${SELECTDIR}/less-select" 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 - newins less-select-key.bin select-key.bin - newins less-normal-key.bin normal-key.bin - newins "${SELECTDIR}/less-select-key.src" select-key.src - newins "${SELECTDIR}/less-normal-key.src" normal-key.src + 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 } |