Require newer app-text/asciidoc if doc is enabled (resolves #321117), ebuild cleanup

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 21 insertions, 61 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/Manifest b/www-apps/cgit/Manifest
index 44357b16e3ed..e367ca7e1205 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -1,8 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cgitrc 2432 RMD160 2f1f7487f969824ac4f7c0696ceaf752dd74df90 SHA1 79feeaafcfc22ebfeec7e907c1ae204389d4c1f4 SHA256 3511a73f62962c1cdb12549e4015111910300060edf8938a6b94a34c0fc72262
 AUX postinstall-en.txt 659 RMD160 3b52b26751dc66759a78d23abff0a4762624aea3 SHA1 5b3b7077e1d0fb710afb829b8720f0f9a2ad7849 SHA256 1e1ddd6048719a55c7b854fc64f9e488e61dbf32e0d1d21a16592474ce914751
 DIST cgit-0.8.3.1.tar.bz2 54767 RMD160 9df4fd06644b0642d2cf00afeb89d6a49cd17df7 SHA1 bc84001880cdb4b646b048dc8227e771469d754e SHA256 4b466f33dcaf585eaa798de13a130ae6fa348b902eff18abcc9f7619cf298fd2
 DIST git-1.6.4.3.tar.bz2 2172892 RMD160 4cb8708336e4e7cdf855ade5621a99ae7363fd30 SHA1 961ae8028609dfa95daf80fe33d24cf342f03454 SHA256 36db53f6d8d656c94fbfacc555e8d550a2381414585e6f7f6da0662dc717c138
-EBUILD cgit-0.8.3.1-r1.ebuild 1235 RMD160 3df60eb47d2d688a0243ebe22576774ca647083d SHA1 c451cb8a9f8c8bd57fdea6e6c353ffc98ab92af5 SHA256 e7b3e5dd04324a73bd6cbded086ac01ddfb2c6a1874199c0aa655aa510182f64
-EBUILD cgit-0.8.3.1.ebuild 1184 RMD160 06be9bf614d8413b3beaf0de1213d79c886eb506 SHA1 5595dd7cbfa4ca9e66f519768c52cef73e54d17a SHA256 c7cf29c42afa78f37373ece2e484e0a4963453acb900ebdbdfbe6a27a68ba919
-MISC ChangeLog 771 RMD160 d0eaa80b1ebe6987d547e553e7b4fcf5dc56c42c SHA1 0a0d3e6d2f0a72d23d17d12131066b5c26dde586 SHA256 962ee64d28cd3ada10a3d0e45b650d7743ff267f73154c2b24abffccf04d168a
+EBUILD cgit-0.8.3.1-r1.ebuild 1281 RMD160 3ba26c6ddb11b928a61823c23833aaabc2688f88 SHA1 1cef598f6bfdb0f65d35732852351fcdae44b9c8 SHA256 3ed528e9c4705f613edebe546f9f84fc9ff093341b105620d9b5eb1945d53224
+MISC ChangeLog 965 RMD160 fe1b6e0581afde387567745cf82f7114edab3c78 SHA1 532fd273e44cd0d056f26588b6fd04fad25d1900 SHA256 a7a9df1b7e050ff72c9412e4bec24cf432fd955db516e65eba6ddb7f33211cf8
 MISC metadata.xml 453 RMD160 f809bcc7c679d9e22db739c83324b7c8d64eb5bb SHA1 3618c828304423698771f05bcd43ad59ad860676 SHA256 0b508c183120b5fcace6a6d9f3ef1799b899dfdef8150639c207ab0179f406ab
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iD8DBQFMGPyoQW+hXSf0t0IRAo7VAJ4mpSuIWlpNxAHx2JwX9/EKii4yMQCdElYl
+1SNCupC1VSI9Nh0F6orqbSY=
+=40hi
+-----END PGP SIGNATURE-----
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
-}