diff options
| author |   Martin Väth <martin@mvath.de> | 2014-08-29 20:39:57 +0200 |
|---|---|---|
| committer | Martin Väth <martin@mvath.de> | 2015-10-11 10:49:13 +0200 |
| commit | 31d01eab50d18dc2cdafcbadd79f0204f9edff18 (patch) | |
| tree | 281c5b4fe8f7d12b3b2f4b80e67604b476c44630 /app-shells/zsh/zsh-99999999.ebuild | |
| parent | Bump noscript (diff) | |
| download | mv-31d01eab50d18dc2cdafcbadd79f0204f9edff18.tar.gz mv-31d01eab50d18dc2cdafcbadd79f0204f9edff18.tar.bz2 mv-31d01eab50d18dc2cdafcbadd79f0204f9edff18.zip | |
Bump find_cruft, squashmount, zsh
Diffstat (limited to 'app-shells/zsh/zsh-99999999.ebuild')
| -rw-r--r-- | app-shells/zsh/zsh-99999999.ebuild | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/app-shells/zsh/zsh-99999999.ebuild b/app-shells/zsh/zsh-99999999.ebuild index 3ac7616c..9df1f948 100644 --- a/app-shells/zsh/zsh-99999999.ebuild +++ b/app-shells/zsh/zsh-99999999.ebuild @@ -46,17 +46,16 @@ case ${PV} in # Please let me know if you have an arch where "colcrt" (or at least "col") # is provided by a different package. DEPEND="app-text/yodl - run-help? ( - dev-lang/perl - sys-apps/man - sys-apps/util-linux - )" + dev-lang/perl + sys-apps/man + sys-apps/util-linux" PROPERTIES="live" LIVE=:;; *) SRC_URI="${ZSH_URI} doc? ( ${ZSH_DOC_URI} )" - KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + #KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" DEPEND="" LIVE=false;; esac @@ -73,9 +72,7 @@ do case ${curr} in esac IUSE+=" completion_${curr}" done -IUSE+=" debug doc examples gdbm maildir pcre" -${LIVE} && IUSE+=" +run-help" -IUSE+=" static unicode" +IUSE+=" debug doc examples gdbm maildir pcre static unicode" RDEPEND=" >=sys-libs/ncurses-5.1 @@ -122,9 +119,9 @@ zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/." src_prepare() { # fix zshall problem with soelim - ln -s Doc man1 - mv Doc/zshall.1 Doc/zshall.1.soelim - soelim Doc/zshall.1.soelim > Doc/zshall.1 + ln -s Doc man1 || die + mv Doc/zshall.1 Doc/zshall.1.soelim || die + soelim Doc/zshall.1.soelim > Doc/zshall.1 || die epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff @@ -169,11 +166,6 @@ src_configure() { --enable-zsh-secure-free \ --enable-zsh-hash-debug" fi - if ! ${LIVE} || use run-help ; then - myconf+=" --enable-runhelpdir=\"${EPREFIX}/usr/share/zsh/${PVPATH}/help\"" - else - myconf+=" --disable-runhelpdir" - fi if [[ ${CHOST} == *-darwin* ]]; then myconf+=" --enable-libs=-liconv" @@ -284,8 +276,7 @@ src_install() { if use doc ; then pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null dohtml -r Doc/* - insinto /usr/share/doc/${PF} - doins Doc/zsh.{dvi,pdf} + dodoc Doc/zsh.{dvi,pdf} popd >/dev/null fi |