From e15e60583ab7cb3bc011c7318297c04529ec09bf Mon Sep 17 00:00:00 2001 From: Martin Väth Date: Thu, 18 Feb 2016 19:38:43 +0100 Subject: app-admin/checksec: Fix USE=vanilla. Install provided manpage, completion --- app-admin/checksec/checksec-1.7.3.ebuild | 14 +++++++++----- app-admin/checksec/checksec-99999999.ebuild | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) (limited to 'app-admin/checksec') diff --git a/app-admin/checksec/checksec-1.7.3.ebuild b/app-admin/checksec/checksec-1.7.3.ebuild index c4cf0bec..3daae5d8 100644 --- a/app-admin/checksec/checksec-1.7.3.ebuild +++ b/app-admin/checksec/checksec-1.7.3.ebuild @@ -15,14 +15,12 @@ IUSE="vanilla" case ${PV} in 99999999*) - LIVE=: EGIT_REPO_URI="git://github.com/slimm609/${MY_PN}.git" inherit git-r3 PROPERTIES="live" KEYWORDS="" SRC_URI="";; *) - LIVE=false #RESTRICT="mirror" SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" @@ -33,10 +31,15 @@ esac DOCS=( ChangeLog README.md ) src_prepare() { - eapply "${FILESDIR}"/path.patch - if ! use vanilla - then sed -e '/--update/d' "${FILESDIR}/_${PN}" >_${PN} || die + local zshcomp + zshcomp=extras/zsh/_${PN} + test -f "${zshcomp}" || zshcomp=${FILESDIR}/_${PN} + if use vanilla + then cp "${zshcomp}" _${PN} || die + else sed -e '/--update/d' "${zshcomp}" >_${PN} || die + cp ${PN} ${PN}.vanilla sed -i -e '/--update.*)/,/;;/d' ${PN} || die + eapply "${FILESDIR}"/path.patch fi eapply_user } @@ -46,4 +49,5 @@ src_install() { insinto /usr/share/zsh/site-functions doins _${PN} einstalldocs + ! test -d extras/man || doman extras/man/* } diff --git a/app-admin/checksec/checksec-99999999.ebuild b/app-admin/checksec/checksec-99999999.ebuild index c4cf0bec..3daae5d8 100644 --- a/app-admin/checksec/checksec-99999999.ebuild +++ b/app-admin/checksec/checksec-99999999.ebuild @@ -15,14 +15,12 @@ IUSE="vanilla" case ${PV} in 99999999*) - LIVE=: EGIT_REPO_URI="git://github.com/slimm609/${MY_PN}.git" inherit git-r3 PROPERTIES="live" KEYWORDS="" SRC_URI="";; *) - LIVE=false #RESTRICT="mirror" SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" @@ -33,10 +31,15 @@ esac DOCS=( ChangeLog README.md ) src_prepare() { - eapply "${FILESDIR}"/path.patch - if ! use vanilla - then sed -e '/--update/d' "${FILESDIR}/_${PN}" >_${PN} || die + local zshcomp + zshcomp=extras/zsh/_${PN} + test -f "${zshcomp}" || zshcomp=${FILESDIR}/_${PN} + if use vanilla + then cp "${zshcomp}" _${PN} || die + else sed -e '/--update/d' "${zshcomp}" >_${PN} || die + cp ${PN} ${PN}.vanilla sed -i -e '/--update.*)/,/;;/d' ${PN} || die + eapply "${FILESDIR}"/path.patch fi eapply_user } @@ -46,4 +49,5 @@ src_install() { insinto /usr/share/zsh/site-functions doins _${PN} einstalldocs + ! test -d extras/man || doman extras/man/* } -- cgit v1.2.3-65-gdbad