From fc5392a49b2913b467ecf7b733ba24a6538b7eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Neumann?= Date: Mon, 1 Oct 2012 14:57:53 +0200 Subject: CGit update --- www-apps/cgit/Manifest | 8 ++-- www-apps/cgit/cgit-0.8.3.4.ebuild | 84 ---------------------------------- www-apps/cgit/cgit-9999.ebuild | 80 ++++++++++++++++++++++++++++++++ www-apps/cgit/files/cgitrc | 6 ++- www-apps/cgit/files/postinstall-en.txt | 30 ++++++++++++ 5 files changed, 118 insertions(+), 90 deletions(-) delete mode 100644 www-apps/cgit/cgit-0.8.3.4.ebuild create mode 100644 www-apps/cgit/cgit-9999.ebuild (limited to 'www-apps') diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest index 3c80816..6cfd87a 100644 --- a/www-apps/cgit/Manifest +++ b/www-apps/cgit/Manifest @@ -1,5 +1,3 @@ -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.4.tar.bz2 54832 RMD160 5abc4a5a6fd9c045c199601f1ef441b8503b7dc9 SHA1 25ec36d28628f61fb0784651f45fd0a4031b96af SHA256 9df3a84b40cefc468d41937a930635960ffb5fa12b88099c7a6b24ee4124e8a0 -DIST git-1.7.3.tar.bz2 2629734 RMD160 4b0f95b4d114f5b7a4eb61c0f73b2f9a533637a0 SHA1 32e231fd10b85265487f0c2cc50d6d889b71de78 SHA256 0035a4a7906f65812072457b65c609f24c66f31593d0ad372b7c18894a26b07d -EBUILD cgit-0.8.3.4.ebuild 1642 RMD160 0ee4dc0cf739cda5f2349616025a695e17c364b4 SHA1 4757f8263ad3a3c6cd45c7c70034f991ec181049 SHA256 2264f127f7ff8cffdba2d1fae995fdb1dc9bbe4b819a3fcc0a7a89a1bea55846 +AUX cgitrc 2514 SHA256 5a53e02e38382b46e3e0dea5efb3ab4ff8eccc8c6a26e7213ab2dee192236c48 SHA512 a7d5c7b1192fab6d5b673f7244993c7c48b0791f11c7352a433a8d30827c14294302db88b66228a9c2575613319d730ce114313a525f33214fae9efb740be0e4 WHIRLPOOL 0e6d41534b4236841285b9b2dbd091102af242c6e344b73e3330d384ca32ff28de83ad422fbc2b6cc0e6a8d35b570f13475ee93dad83755e2bf0f7c77171cb4f +AUX postinstall-en.txt 1844 SHA256 2bfadbe531386c9f2b9fd6b346c9542dd367f86f1ffc1be1a43d9aa182a0118b SHA512 40848a103f12cebe1572b51640abf8bb8c7cab58b6bcb95493498af61ee743abb987b59b6e5d6d9ff4eec5ba7d21cf2e5173ddbf4c51cd4210fdfa430da3aadc WHIRLPOOL d008d1fd56bd5410fe705cd38697dc66bf9e273052aea16a1ba2eaf91b0c2a400ac1d12abc9884cbce7481c5b2e0cab8a15c29489f8f97092f3655637e9b8f19 +EBUILD cgit-9999.ebuild 1684 SHA256 3d1c4961fb1d1c9b41f161e9db423446e29df87fbcca968be04e2ddc9b614ffa SHA512 431cb1c56b1f17b36645c839ca9e68e3711346565d8544777cd0b6c3c4849f8ff2077756da70da3b64223973860bb774cae5d551c2b0dc85817e958cae577e69 WHIRLPOOL 947018688a8e5544310ef944291c1a4c883bf5854d00a850f077ee7eb6e52c463c551fc6faef702c96223e0acd80c2249669dc92ae0d9653bac5dc36a1f4a036 diff --git a/www-apps/cgit/cgit-0.8.3.4.ebuild b/www-apps/cgit/cgit-0.8.3.4.ebuild deleted file mode 100644 index c7761bf..0000000 --- a/www-apps/cgit/cgit-0.8.3.4.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -WEBAPP_MANUAL_SLOT="yes" - -inherit webapp eutils - -[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" - -GIT_V="1.7.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" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -RDEPEND=" - dev-vcs/git - sys-libs/zlib - dev-libs/openssl - virtual/httpd-cgi -" -# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken -DEPEND="${RDEPEND} - !=app-text/asciidoc-8.5.1 ) -" - -pkg_setup() { - webapp_pkg_setup - enewuser "${PN}" -} - -src_prepare() { - rmdir git || die - mv "${WORKDIR}"/git-"${GIT_V}" git || die - - sed -i \ - -e "/^CACHE_ROOT =/s:/var/cache/cgit:${CGIT_CACHEDIR}:" \ - Makefile || die -} - -src_compile() { - emake || die - if use doc ; then - emake man-doc || die - fi -} - -src_install() { - webapp_src_preinst - - emake \ - CGIT_SCRIPT_PATH="${MY_CGIBINDIR}" \ - CGIT_DATA_PATH="${MY_HTDOCSDIR}" \ - DESTDIR="${D}" install || die - - insinto /etc - doins "${FILESDIR}"/cgitrc - - dodoc README - use doc && doman cgitrc.5 - - webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - webapp_src_install - - keepdir "${CGIT_CACHEDIR}" - fowners ${PN}:${PN} "${CGIT_CACHEDIR}" - fperms 700 "${CGIT_CACHEDIR}" -} - -pkg_postinst() { - ewarn "If you intend to run cgit using web server's user" - ewarn "you should change /var/cache/cgit/ permissions." -} diff --git a/www-apps/cgit/cgit-9999.ebuild b/www-apps/cgit/cgit-9999.ebuild new file mode 100644 index 0000000..04dccdb --- /dev/null +++ b/www-apps/cgit/cgit-9999.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-9999.ebuild,v 1.5 2012/06/01 04:30:38 zmedico Exp $ + +EAPI="4" + +WEBAPP_MANUAL_SLOT="yes" + +inherit webapp multilib user git-2 + +[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" + +GIT_V="1.7.4" + +DESCRIPTION="a fast web-interface for git repositories" +HOMEPAGE="http://hjemli.net/git/cgit/about/" +SRC_URI="" +EGIT_REPO_URI="git://git.necoro.eu/others/${PN}" +EGIT_BRANCH="sendfile" +EGIT_HAS_SUBMODULES="yes" +EGIT_PRUNE="yes" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="doc highlight" + +RDEPEND=" + dev-vcs/git + sys-libs/zlib + dev-libs/openssl + virtual/httpd-cgi + highlight? ( app-text/highlight ) +" +# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken +DEPEND="${RDEPEND} + !=app-text/asciidoc-8.5.1 ) +" + +pkg_setup() { + webapp_pkg_setup + enewuser "${PN}" +} + +src_compile() { + emake + use doc && emake doc-man +} + +src_install() { + webapp_src_preinst + + emake \ + prefix="${EPREFIX}"/usr \ + libdir="${EPREFIX}"/usr/$(get_libdir) \ + CGIT_SCRIPT_PATH="${MY_CGIBINDIR}" \ + CGIT_DATA_PATH="${MY_HTDOCSDIR}" \ + DESTDIR="${D}" install + + insinto /etc + doins "${FILESDIR}"/cgitrc + + dodoc README + use doc && doman cgitrc.5 + + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + webapp_src_install + + keepdir "${CGIT_CACHEDIR}" + #fowners ${PN}:${PN} "${CGIT_CACHEDIR}" + #fperms 700 "${CGIT_CACHEDIR}" +} + +pkg_postinst() { + webapp_pkg_postinst + ewarn "If you intend to run cgit using web server's user" + ewarn "you should change ${CGIT_CACHEDIR} permissions." +} diff --git a/www-apps/cgit/files/cgitrc b/www-apps/cgit/files/cgitrc index cbf6150..a3eba11 100644 --- a/www-apps/cgit/files/cgitrc +++ b/www-apps/cgit/files/cgitrc @@ -13,6 +13,10 @@ #enable-index-links=1 +# Enable ASCII art commit history graph on the log pages +#enable-commit-graph=1 + + # Show number of affected files per commit on the log pages #enable-log-filecount=1 @@ -53,7 +57,7 @@ ## List of common mimetypes ## -#mimetype.git=image/git +#mimetype.gif=image/gif #mimetype.html=text/html #mimetype.jpg=image/jpeg #mimetype.jpeg=image/jpeg diff --git a/www-apps/cgit/files/postinstall-en.txt b/www-apps/cgit/files/postinstall-en.txt index 94280c8..b164123 100644 --- a/www-apps/cgit/files/postinstall-en.txt +++ b/www-apps/cgit/files/postinstall-en.txt @@ -13,3 +13,33 @@ Then add "include=/etc/cgit-repos" in /etc/cgitrc. This way it's simpler and more convenient. You won't need to update your cgitrc every time you add a new repository. +=============================================================================== + Apache HowTo +=============================================================================== + +With a default apache vhost config you can now access your repository at +http:///cgi-bin/cgit.cgi/ + +If you wish to access your repository starting from the root and don't want +'cgi-bin/cgit.cgi' to be invisible, 2 things are needed. + +In your apache vhost configuration file for your domain, add the following +rewrite rules to your +/htdocs> section. + + RewriteEngine On + # Redirect all non-existant urls to cgit + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule ^.* /cgi-bin/cgit.cgi/$0 [L,PT] + + # Redirect the empty url to cgit + RewriteRule ^$ /cgi-bin/cgit.cgi/ [L,PT] + + +To make cgit create the correct URL's internally add to /etc/cgitrc (or your +local config file) +Enable virtual-root=/ + +After these rules, you can now access cgit via http:/// to get the +listing, and http:///repository to go directly to repository. -- cgit v1.2.3