diff options
author | Lance Albertson <ramereth@gentoo.org> | 2010-06-16 16:32:52 +0000 |
---|---|---|
committer | Lance Albertson <ramereth@gentoo.org> | 2010-06-16 16:32:52 +0000 |
commit | f1427d0df86e204d04deaa37afc6ca72a80945c5 (patch) | |
tree | 0215afcc8589dd3567529e2b1ec5684dd385be7f /www-apps/cgit | |
parent | stable x86, bug 322627 (diff) | |
download | gentoo-2-f1427d0df86e204d04deaa37afc6ca72a80945c5.tar.gz gentoo-2-f1427d0df86e204d04deaa37afc6ca72a80945c5.tar.bz2 gentoo-2-f1427d0df86e204d04deaa37afc6ca72a80945c5.zip |
Require newer app-text/asciidoc if doc is enabled (resolves #321117), ebuild cleanup
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'www-apps/cgit')
-rw-r--r-- | www-apps/cgit/ChangeLog | 7 | ||||
-rw-r--r-- | www-apps/cgit/cgit-0.8.3.1-r1.ebuild | 5 | ||||
-rw-r--r-- | www-apps/cgit/cgit-0.8.3.1.ebuild | 55 |
3 files changed, 9 insertions, 58 deletions
diff --git a/www-apps/cgit/ChangeLog b/www-apps/cgit/ChangeLog index dbe52aeaf7d8..5089c9e4d2e8 100644 --- a/www-apps/cgit/ChangeLog +++ b/www-apps/cgit/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-apps/cgit # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/ChangeLog,v 1.3 2010/03/17 16:48:17 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/ChangeLog,v 1.4 2010/06/16 16:32:52 ramereth Exp $ + + 16 Jun 2010; Lance Albertson <ramereth@gentoo.org> -cgit-0.8.3.1.ebuild, + cgit-0.8.3.1-r1.ebuild: + Require newer app-text/asciidoc if doc is enabled (resolves #321117), ebuild + cleanup 17 Mar 2010; Sebastian Pipping <sping@gentoo.org> cgit-0.8.3.1.ebuild, cgit-0.8.3.1-r1.ebuild: diff --git a/www-apps/cgit/cgit-0.8.3.1-r1.ebuild b/www-apps/cgit/cgit-0.8.3.1-r1.ebuild index b2397b4d734e..4dc7e7dad999 100644 --- a/www-apps/cgit/cgit-0.8.3.1-r1.ebuild +++ b/www-apps/cgit/cgit-0.8.3.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-0.8.3.1-r1.ebuild,v 1.2 2010/03/17 16:48:17 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-0.8.3.1-r1.ebuild,v 1.3 2010/06/16 16:32:52 ramereth Exp $ EAPI="2" @@ -22,7 +22,8 @@ RDEPEND="dev-vcs/git dev-libs/openssl cgi? ( virtual/httpd-cgi )" DEPEND="${RDEPEND} - doc? ( app-text/asciidoc )" + doc? ( app-text/docbook-xsl-stylesheets + >=app-text/asciidoc-8.5.1 )" src_prepare() { rmdir git diff --git a/www-apps/cgit/cgit-0.8.3.1.ebuild b/www-apps/cgit/cgit-0.8.3.1.ebuild deleted file mode 100644 index be0b85171b64..000000000000 --- a/www-apps/cgit/cgit-0.8.3.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-0.8.3.1.ebuild,v 1.2 2010/03/17 16:48:17 sping Exp $ - -EAPI="2" - -inherit webapp - -GIT_V="1.6.4.3" - -DESCRIPTION="a fast web-interface for git repositories" -HOMEPAGE="http://hjemli.net/git/cgit/about/" -SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.bz2 - http://hjemli.net/git/cgit/snapshot/${P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="+cgi" - -RDEPEND="dev-vcs/git - sys-libs/zlib - dev-libs/openssl - cgi? ( virtual/httpd-cgi )" -DEPEND="${RDEPEND} - app-text/asciidoc" - -src_prepare() { - rmdir git - mv "${WORKDIR}"/git-"${GIT_V}" git -} - -src_compile() { - emake || die "emake died" - emake man-doc || die "emake man-doc died" -} - -src_install() { - webapp_src_preinst - - mv cgit cgit.cgi - if use cgi -o use fastcgi ; then - cp cgit.cgi "${D}"/${MY_CGIBINDIR} - fi - insinto ${MY_HTDOCSDIR} - doins cgit.css cgit.png - insinto /etc - doins "${FILESDIR}"/cgitrc - dodir /var/cache/cgit - keepdir /var/cache/cgit - dodoc README - doman cgitrc.5 - - webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - webapp_src_install -} |