From 32e86fb27cbb095943dfaf64f728c458944869cb Mon Sep 17 00:00:00 2001 From: Martin Väth Date: Sun, 25 Nov 2012 18:29:59 +0100 Subject: Bump trickyfetch. Update eix. Update checksums --- app-portage/eix/eix-99999999.ebuild | 20 +++++++++++--- app-portage/trickyfetch/ChangeLog | 5 ++++ app-portage/trickyfetch/Manifest | 2 +- app-portage/trickyfetch/metadata.xml | 1 + app-portage/trickyfetch/trickyfetch-7.2.ebuild | 31 --------------------- app-portage/trickyfetch/trickyfetch-7.3.ebuild | 37 ++++++++++++++++++++++++++ profiles/use.local.desc | 1 + 7 files changed, 61 insertions(+), 36 deletions(-) delete mode 100644 app-portage/trickyfetch/trickyfetch-7.2.ebuild create mode 100644 app-portage/trickyfetch/trickyfetch-7.3.ebuild diff --git a/app-portage/eix/eix-99999999.ebuild b/app-portage/eix/eix-99999999.ebuild index 1bc35a18..6a3ce43a 100644 --- a/app-portage/eix/eix-99999999.ebuild +++ b/app-portage/eix/eix-99999999.ebuild @@ -29,10 +29,22 @@ DEPEND="${RDEPEND} sys-devel/gettext" pkg_setup() { - if has_version "<${CATEGORY}/${PN}-0.25.3"; then - local eixcache="${EROOT}/var/cache/${PN}" - ! test -f "${eixcache}" || rm -f -- "${eixcache}" - fi + local i j eixcache + for i in ${REPLACING_VERSIONS[*]} + do case ${i} in + 0.*) + j=${i#0.} + j=${j%%.*} + [ "${j}" -gt 25 ] && continue + [ "${j}" -eq 25 ] && { + j=${i#0.25.} + [ "${j%%.*}" -ge 3 ] && continue + } + eixcache=${EROOT}/var/cache/${PN} + test -f "${eixcache}" && rm -f -- "${eixcache}" + break;; + esac + done } src_prepare() { diff --git a/app-portage/trickyfetch/ChangeLog b/app-portage/trickyfetch/ChangeLog index 9954f475..c3c3ce9c 100644 --- a/app-portage/trickyfetch/ChangeLog +++ b/app-portage/trickyfetch/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*trickyfetch-7.3 (25 Nov 2012) + + 25 Nov 2012; Martin Väth + Version bump, remove old ebuild. Make getdelta support optional + *trickyfetch-7.2 (11 Nov 2012) 11 Nov 2012; Martin Väth diff --git a/app-portage/trickyfetch/Manifest b/app-portage/trickyfetch/Manifest index 637fe72d..86d63fbb 100644 --- a/app-portage/trickyfetch/Manifest +++ b/app-portage/trickyfetch/Manifest @@ -1 +1 @@ -DIST trickyfetch-7.2.tar.gz 9917 SHA256 13446bc3a53a97ad1604167b684ead7c642f1f8ef3a856a97a5acff161ebfec9 SHA512 1595cbaaa0d6a7920c72f8952037e80bef7650e9a6bf16e1ab17fab89be3786c91172493480a7e11e037aca4509108aeadfb8572a9e9e29a24cd51564d64d50e WHIRLPOOL 2e285e7426f90d7a3c053f2bde6dddf375c0eb7b63e75cc8dd4b79b1773255ff69a47cfc136ea3f302fd2c490a16e8031eeeca538aa1034926344cb6362c29a1 +DIST trickyfetch-7.3.tar.gz 10016 SHA256 6c59697993c874697ec184ac0063d2b93efb3f3706fa1f6226f0874b30f4dc0a SHA512 a73b6df2332e8890c6a20dde864ce93c39b871f5032ad093532e12d8d77069611f84df8c429df45a49d2fe7bb671d486775275f15c4efe2f1d637ff95c869cab WHIRLPOOL da611c51bee8b0c94f2b3c1d7202fa9e9c755334c85ecffa460f863ca5b7e0c41efc4c6647628e3532c1e1b6700de2febfad19964b3a994c77a0ff5e83d9233b diff --git a/app-portage/trickyfetch/metadata.xml b/app-portage/trickyfetch/metadata.xml index b2c2c7ac..a332b7a7 100644 --- a/app-portage/trickyfetch/metadata.xml +++ b/app-portage/trickyfetch/metadata.xml @@ -15,5 +15,6 @@ Pull in eix for quicker execution + Support getdelta diff --git a/app-portage/trickyfetch/trickyfetch-7.2.ebuild b/app-portage/trickyfetch/trickyfetch-7.2.ebuild deleted file mode 100644 index f2ee092e..00000000 --- a/app-portage/trickyfetch/trickyfetch-7.2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -RESTRICT="mirror" -inherit eutils vcs-snapshot - -DESCRIPTION="Plugin for FETCHCOMMAND to help organize and cleanup your DISTDIR" -HOMEPAGE="https://github.com/vaeth/trickyfetch/" -SRC_URI="http://github.com/vaeth/${PN}/tarball/release-${PV} -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+eix zsh-completion" - -RDEPEND="eix? ( app-portage/eix )" - -src_prepare() { - epatch_user -} - -src_install() { - dobin bin/* - if use zsh-completion - then insinto /usr/share/zsh/site-functions - doins zsh/_* - fi - dodoc README -} diff --git a/app-portage/trickyfetch/trickyfetch-7.3.ebuild b/app-portage/trickyfetch/trickyfetch-7.3.ebuild new file mode 100644 index 00000000..9c8a1947 --- /dev/null +++ b/app-portage/trickyfetch/trickyfetch-7.3.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +RESTRICT="mirror" +inherit eutils vcs-snapshot + +DESCRIPTION="Plugin for FETCHCOMMAND to help organize and cleanup your DISTDIR" +HOMEPAGE="https://github.com/vaeth/trickyfetch/" +SRC_URI="http://github.com/vaeth/${PN}/tarball/release-${PV} -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+eix getdelta zsh-completion" + +RDEPEND="eix? ( app-portage/eix ) +getdelta? ( app-portage/getdelta )" + +src_prepare() { + local use_getdelta=false + use getdelta && use_getdelta=: + sed -i -e \ + "s/^trickyfetch_getdelta=.*/trickyfetch_getdelta=${use_getdelta}/" \ + -- "${S}/bin/trickyfetch" + epatch_user +} + +src_install() { + dobin bin/* + if use zsh-completion + then insinto /usr/share/zsh/site-functions + doins zsh/_* + fi + dodoc README +} diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 9d7a49c7..d16c7a4f 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -15,6 +15,7 @@ app-portage/eix:tools - Create separate binary for script helper tools; useful i app-portage/logclean:eix - Pull in eix for quicker execution app-portage/portage-bashrc-mv:eix - Pull in >=app-portage/eix-0.25.6 for proper mask handling app-portage/trickyfetch:eix - Pull in eix for quicker execution +app-portage/trickyfetch:getdelta - Support getdelta app-portage/useflags:eix - Pull in eix for quicker execution app-shells/auto-fu-zsh:compile - Byte-compile to speed up app-shells/auto-fu-zsh:kill-line - Make Ctrl-D work correctly and in case of nonempty buffer work as kill-line resp. kill-whole-line -- cgit v1.2.3-65-gdbad