Install the gitweb stuff, as it's used by instaweb, and is also independantly useful, but does not lend itself to webapp-config very well.

Package-Manager: portage-2.1.4_rc4

4 files changed, 246 insertions, 5 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 86d171629943..aee543b456c7 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.234 2007/12/05 01:58:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.235 2007/12/06 02:05:03 robbat2 Exp $
+
+*git-1.5.3.7-r1 (06 Dec 2007)
+
+  06 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.3.7-r1.ebuild:
+  Install the gitweb stuff, as it's used by instaweb, and is also
+  independantly useful, but does not lend itself to webapp-config very well.
 
 *git-1.5.3.7 (05 Dec 2007)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index d57ab7266fe5..0e0f5ca89523 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -90,14 +90,18 @@ EBUILD git-1.5.3.6.ebuild 4903 RMD160 d90c28a8d4da0606ccff2ca997df480a2eef1bcb S
 MD5 2547bb2eadea2decba5f683194ce6749 git-1.5.3.6.ebuild 4903
 RMD160 d90c28a8d4da0606ccff2ca997df480a2eef1bcb git-1.5.3.6.ebuild 4903
 SHA256 d3206a1c7abf0ab726631caae3ad54fb2c3ba9ff86ff15cce4fd6689c621ce60 git-1.5.3.6.ebuild 4903
+EBUILD git-1.5.3.7-r1.ebuild 6208 RMD160 b708f2f72ac66caea3ed58a0d8cce81adbe2cad3 SHA1 fa1ddfd4f1d7102efa8b31f0005871e822bce7eb SHA256 3a30cc562b650e57a9daf2b688db53b213d7d22971516d904695b15b4186b316
+MD5 9041fe5fa7a26a486ae3ffeee7c40793 git-1.5.3.7-r1.ebuild 6208
+RMD160 b708f2f72ac66caea3ed58a0d8cce81adbe2cad3 git-1.5.3.7-r1.ebuild 6208
+SHA256 3a30cc562b650e57a9daf2b688db53b213d7d22971516d904695b15b4186b316 git-1.5.3.7-r1.ebuild 6208
 EBUILD git-1.5.3.7.ebuild 5638 RMD160 bb0663a8633b6a131520ef28924509b8565a06db SHA1 ae32ecd3ab24b0950d3f6f23de7c899268a3119e SHA256 a3695b3c783c57259d37f9d7609e94b89c74a917bf5bf692538cd2d0dbb9deef
 MD5 eaca026d391aac1c466638f3e39af2c3 git-1.5.3.7.ebuild 5638
 RMD160 bb0663a8633b6a131520ef28924509b8565a06db git-1.5.3.7.ebuild 5638
 SHA256 a3695b3c783c57259d37f9d7609e94b89c74a917bf5bf692538cd2d0dbb9deef git-1.5.3.7.ebuild 5638
-MISC ChangeLog 33672 RMD160 9538a2fff877c3a77dd43ad12b73209b528bfecd SHA1 92d7b51671e57ce2c0bb3f5e204f9baf629e8565 SHA256 07a97a03d4af71bc4b738baf1551ddaa9df47ec1e1cc20391b1add67e1896d17
-MD5 c68e2f8bbdddb2205b6df160f633e4ce ChangeLog 33672
-RMD160 9538a2fff877c3a77dd43ad12b73209b528bfecd ChangeLog 33672
-SHA256 07a97a03d4af71bc4b738baf1551ddaa9df47ec1e1cc20391b1add67e1896d17 ChangeLog 33672
+MISC ChangeLog 33924 RMD160 493f493a4940855f16d1586fb9c1a9371679a23f SHA1 3db94b2bf5080dacc7e641fe1580d96b0ee5e6f6 SHA256 665d0acb40ecf56ba8f188524c4ebc112bc4fc9712c95494e6d23a3056f13c38
+MD5 117f77151e68334f003cccb0f1663fb6 ChangeLog 33924
+RMD160 493f493a4940855f16d1586fb9c1a9371679a23f ChangeLog 33924
+SHA256 665d0acb40ecf56ba8f188524c4ebc112bc4fc9712c95494e6d23a3056f13c38 ChangeLog 33924
 MISC metadata.xml 1029 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 SHA1 88453257ccbedf4166357c262f49b0731cc45448 SHA256 2aa15da3001de8d8182ee9c8289cdefae84652b78ccc4cf35b2394f07edc352f
 MD5 c205afae129e41ba63cf04be7f56c7ab metadata.xml 1029
 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 metadata.xml 1029
@@ -132,3 +136,6 @@ SHA256 e273c5d3c6c88334e5f627b9e340e9f8f743c7f4ebbdb04d13ee9d375793d02f files/di
 MD5 2f894351f75a120bc4cf1f0fb96fff8b files/digest-git-1.5.3.7 771
 RMD160 ec677e428d602acb3c595ac0d7ba309bbb23e353 files/digest-git-1.5.3.7 771
 SHA256 58c658fd0f1660c20f6c637ff6c1aad20489ade95b1c2b4a0abaabd9d2feb858 files/digest-git-1.5.3.7 771
+MD5 2f894351f75a120bc4cf1f0fb96fff8b files/digest-git-1.5.3.7-r1 771
+RMD160 ec677e428d602acb3c595ac0d7ba309bbb23e353 files/digest-git-1.5.3.7-r1 771
+SHA256 58c658fd0f1660c20f6c637ff6c1aad20489ade95b1c2b4a0abaabd9d2feb858 files/digest-git-1.5.3.7-r1 771
diff --git a/dev-util/git/files/digest-git-1.5.3.7-r1 b/dev-util/git/files/digest-git-1.5.3.7-r1
new file mode 100644
index 000000000000..431f5f87d94a
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.5.3.7-r1
@@ -0,0 +1,9 @@
+MD5 a114cbf532ff627698a031a66d072173 git-1.5.3.7.tar.bz2 1361540
+RMD160 74bfccd50c895e22d10b9e25f481f00a20617077 git-1.5.3.7.tar.bz2 1361540
+SHA256 f4f03dd1a5255019c2d771a04b8a647509b4c6cf51728acc50e8f26d99e62fec git-1.5.3.7.tar.bz2 1361540
+MD5 e25249bfa66933f0381f28e2104c46a1 git-htmldocs-1.5.3.7.tar.bz2 549391
+RMD160 18d01c803fd529ac897ae249ce4e05193ee9850a git-htmldocs-1.5.3.7.tar.bz2 549391
+SHA256 e28c7e149e0f5adb66093af287dffe0caef83926ae08c6cdb6a2d35bc9148d04 git-htmldocs-1.5.3.7.tar.bz2 549391
+MD5 bc810162a466e63ee5819ff35e4fb343 git-manpages-1.5.3.7.tar.bz2 147932
+RMD160 fd4b45c221cbc63f580a32595c59eb52da1baa2f git-manpages-1.5.3.7.tar.bz2 147932
+SHA256 870e68ef57f4175152b9b8decc721d8cbc9850ed8eda73919fc9e060f3968ffa git-manpages-1.5.3.7.tar.bz2 147932
diff --git a/dev-util/git/git-1.5.3.7-r1.ebuild b/dev-util/git/git-1.5.3.7-r1.ebuild
new file mode 100644
index 000000000000..ca15941ac03c
--- /dev/null
+++ b/dev-util/git/git-1.5.3.7-r1.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.3.7-r1.ebuild,v 1.1 2007/12/06 02:05:03 robbat2 Exp $
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://git.or.cz/"
+SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
+		mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
+		doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk webdav"
+
+DEPEND="
+	!app-misc/git
+	dev-libs/openssl
+	sys-libs/zlib
+	dev-lang/perl
+	app-arch/cpio
+	tk?     ( dev-lang/tk )
+	curl?   ( net-misc/curl )
+	webdav? ( dev-libs/expat )
+	emacs?  ( virtual/emacs )"
+RDEPEND="${DEPEND}
+	cgi?	( virtual/perl-CGI )
+	perl?   ( dev-perl/Error )
+	gtk?    ( >=dev-python/pygtk-2.8 )"
+
+SITEFILE=72${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use mozsha1 ; then
+		myopts="${myopts} MOZILLA_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts="${myopts} PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+	else
+		myopts="${myopts} NO_CURL=YesPlease"
+		use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring."
+	fi
+
+	myopts="${myopts} WITH_SEND_EMAIL=YesPlease"
+
+	use iconv || myopts="${myopts} NO_ICONV=YesPlease"
+
+	export MY_MAKEOPTS=${myopts}
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+	cd "${S}"
+	unpack ${PN}-manpages-${DOC_VER}.tar.bz2
+	use doc && cd "${S}"/Documentation && unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-1.5.3-symlinks.patch
+
+	sed -i \
+		-e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \
+		-e "s:^\(LDFLAGS = \).*$:\1${LDFLAGS}:" \
+		-e "s:^\(CC = \).*$:\1$(tc-getCC):" \
+		-e "s:^\(AR = \).*$:\1$(tc-getAR):" \
+		-e 's:ln :ln -s :g' \
+		Makefile || die "sed failed"
+
+	exportmakeopts
+}
+
+src_compile() {
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed"
+	fi
+	if use cgi ; then
+		emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		prefix=/usr \
+		gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed"
+	fi
+}
+
+src_install() {
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \
+		die "make install failed"
+
+	use tk || rm "${D}"/usr/bin/git{k,-gui}
+
+	doman man?/*
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		einfo "Doing Documentation${d}"
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+
+	dobashcompletion contrib/completion/git-completion.bash ${PN}
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \
+			die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${D}"/"${SITELISP}"/${PN}/.nosearch
+	fi
+
+	if use gtk ; then
+		dobin "${S}"/contrib/gitview/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+		newbin "${S}"/contrib/blameview/blameview.perl blameview
+		newdoc "${S}"/contrib/blameview/README README.blameview
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	for i in continuous fast-import hg-to-git \
+		hooks remotes2config.sh vim stats \
+		workdir ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${D}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+	
+	if use cgi ; then
+		dodir /usr/share/${PN}/gitweb
+		insinto /usr/share/${PN}/gitweb
+		doins "${S}"/gitweb/gitweb.{cgi,css}
+		doins "${S}"/gitweb/git-{favicon,logo}.png
+		docinto /
+		# INSTALL discusses configuration issues, not just installation
+		dodoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+	fi
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+	fixlocalpod
+}
+
+src_test() {
+	cd "${S}"
+	has_version dev-util/subversion || \
+		MY_MAKEOPTS="${MY_MAKEOPTS} NO_SVN_TESTS=YesPlease"
+	has_version app-arch/unzip || \
+		rm "${S}"/t/t5000-tar-tree.sh
+	# Stupid CVS won't let some people commit as root
+	if has userpriv "${FEATURES}"; then
+		einfo "Enabling CVS tests as we have FEATURES=userpriv"
+	else
+		ewarn "Skipping CVS tests because CVS does not work as root!"
+		ewarn "You should retest with FEATURES=userpriv!"
+		for i in t9200-git-cvsexportcommit.sh t9600-cvsimport.sh ; do
+			rm "${S}"/t/${i} || die "Failed to remove ${i}"
+		done
+	fi
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
+}
+
+pkg_postinst() {
+	if use emacs ; then
+		elisp-site-regen
+		elog "GNU Emacs has built-in Git support in versions greater 22.1."
+		elog "You can disable the emacs USE flag for dev-util/git"
+		elog "if you are using such a version."
+	fi
+	elog "These additional scripts need some dependencies:"
+	elog "(These are also needed for FEATURES=test)"
+	echo
+	showpkgdeps git-archimport "dev-util/tla"
+	showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1"
+	showpkgdeps git-svnimport "dev-util/subversion(USE=perl)"
+	showpkgdeps git-svn \
+		"dev-util/subversion(USE=perl)" \
+		"dev-perl/libwww-perl" \
+		"dev-perl/TermReadKey"
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )"
+	showpkgdeps git-send-email "USE=perl"
+	showpkgdeps git-remote "USE=perl"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}