diff options
| author |   Mark Wright <gienah@gentoo.org> | 2013-12-12 02:26:47 +0000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2013-12-12 02:26:47 +0000 |
| commit | a62a86f564f5f1c3129b2502d1522fe4f8a591d5 (patch) | |
| tree | 17290e3612ee59c264760d5ed148b9afd630f2c9 /dev-vcs | |
| parent | rm mask of dev-python/python-subunit (diff) | |
| download | gentoo-2-a62a86f564f5f1c3129b2502d1522fe4f8a591d5.tar.gz gentoo-2-a62a86f564f5f1c3129b2502d1522fe4f8a591d5.tar.bz2 gentoo-2-a62a86f564f5f1c3129b2502d1522fe4f8a591d5.zip | |
git-annex-5.20131130 ikiwiki dep conditional on doc use flag. install-mans wants ikiwiki. It returns 0 and builds the man pages without ikiwiki.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/git-annex/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-vcs/git-annex/git-annex-5.20131130.ebuild | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/dev-vcs/git-annex/ChangeLog b/dev-vcs/git-annex/ChangeLog index 0f3c90e957de..7d0a4a565675 100644 --- a/dev-vcs/git-annex/ChangeLog +++ b/dev-vcs/git-annex/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-vcs/git-annex # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.18 2013/12/11 13:26:21 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.19 2013/12/12 02:26:47 gienah Exp $ + + 12 Dec 2013; Mark Wright <gienah@gentoo.org> git-annex-5.20131130.ebuild: + git-annex-5.20131130 ikiwiki dep conditional on doc use flag. install-mans + wants ikiwiki. It returns 0 and builds the man pages without ikiwiki. *git-annex-5.20131130 (11 Dec 2013) diff --git a/dev-vcs/git-annex/git-annex-5.20131130.ebuild b/dev-vcs/git-annex/git-annex-5.20131130.ebuild index fa3886053efe..9e20953cd5ca 100644 --- a/dev-vcs/git-annex/git-annex-5.20131130.ebuild +++ b/dev-vcs/git-annex/git-annex-5.20131130.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-5.20131130.ebuild,v 1.1 2013/12/11 13:26:21 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-5.20131130.ebuild,v 1.2 2013/12/12 02:26:47 gienah Exp $ EAPI=5 @@ -19,6 +19,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux" IUSE="android +assistant +cryptohash +dbus +dns doc +feed +inotify +pairing +production +quvi +s3 +tdfa +testsuite +webapp +webdav +xmpp" +# hackport-args: --extra-dep='doc? ( www-apps/ikiwiki )' + RDEPEND="dev-vcs/git " DEPEND="${RDEPEND} @@ -47,13 +49,13 @@ DEPEND="${RDEPEND} dev-haskell/utf8-string dev-haskell/uuid >=dev-lang/ghc-7.4.1 - www-apps/ikiwiki android? ( dev-haskell/data-endian ) assistant? ( >=dev-haskell/stm-2.3 inotify? ( dev-haskell/hinotify ) ) cryptohash? ( >=dev-haskell/cryptohash-0.10.0 ) dbus? ( >=dev-haskell/dbus-0.10.3 ) dns? ( dev-haskell/dns ) + doc? ( www-apps/ikiwiki ) feed? ( dev-haskell/feed ) pairing? ( dev-haskell/network-info dev-haskell/network-multicast ) @@ -128,6 +130,7 @@ src_install() { haskell-cabal_src_install dosym git-annex /usr/bin/git-annex-shell # standard make install does more, than needed + # install-mans wants ikiwiki. It returns 0 and builds the man pages without ikiwiki. emake install-mans DESTDIR="${D}" PREFIX="${EPREFIX}/usr" use doc && emake install-docs DESTDIR="${D}" PREFIX="${EPREFIX}/usr" mv "${ED}"/usr/share/doc/{${PN},${PF}} |