Install gitview and git-svn. Fixes bug #137942, thanks to Nguyen Thai Ngoc Duy <pclouds@gentoo.org>.

(Portage version: 2.1-r1)

3 files changed, 164 insertions, 1 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 2c0d87b9f127..22220d08ae6e 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.98 2006/06/10 22:16:52 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.99 2006/06/27 13:34:25 ferdy Exp $
+
+*git-1.4.0-r1 (27 Jun 2006)
+
+  27 Jun 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.0-r1.ebuild:
+  Install gitview and git-svn. Fixes bug #137942, thanks to Nguyen Thai Ngoc
+  Duy <pclouds@gentoo.org>.
 
 *git-1.4.0 (10 Jun 2006)
 
diff --git a/dev-util/git/files/digest-git-1.4.0-r1 b/dev-util/git/files/digest-git-1.4.0-r1
new file mode 100644
index 000000000000..5823e7cdd1ad
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.4.0-r1
@@ -0,0 +1,9 @@
+MD5 923fa60aca74db3ce175c9a2c665f240 git-1.4.0.tar.bz2 717181
+RMD160 1010a0818efd5309f1a0ba1228f953f97d575038 git-1.4.0.tar.bz2 717181
+SHA256 abdb48005e7b2f8988498a6c6724e2e6f6162f30915f591be6586df57dd3f2fa git-1.4.0.tar.bz2 717181
+MD5 10e0736ed8bcb35d639caf6f86ea8b99 git-htmldocs-1.4.0.tar.bz2 262492
+RMD160 b98ce629edc28cf8933e0a6f4d59df07d68cf636 git-htmldocs-1.4.0.tar.bz2 262492
+SHA256 c8d8dffefe3dfc7ec190ee7502d20aa36f150ea633d5621b4a55156672a2ea97 git-htmldocs-1.4.0.tar.bz2 262492
+MD5 87900e25961bf7bab51a1efe9c335d10 git-manpages-1.4.0.tar.bz2 83698
+RMD160 6bfb8fa2e1ae34fd4576e84fee720a239323a65d git-manpages-1.4.0.tar.bz2 83698
+SHA256 f275b1a3fb1eab0368dbb704628e76a4c34a0724ddece1de11b2f53ee327d5d4 git-manpages-1.4.0.tar.bz2 83698
diff --git a/dev-util/git/git-1.4.0-r1.ebuild b/dev-util/git/git-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..dfa64c7290ee
--- /dev/null
+++ b/dev-util/git/git-1.4.0-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.4.0-r1.ebuild,v 1.1 2006/06/27 13:34:25 ferdy Exp $
+
+inherit python toolchain-funcs eutils elisp-common
+
+DOC_VER=${PV}
+
+DESCRIPTION="GIT - the stupid content tracker"
+HOMEPAGE="http://kernel.org/pub/software/scm/git/"
+SRC_URI="mirror://kernel/software/scm/git/${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 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="curl doc emacs gtk mozsha1 ppcsha1 webdav X"
+
+DEPEND="dev-libs/openssl
+		sys-libs/zlib
+		!app-misc/git
+		curl? ( net-misc/curl )
+		webdav? ( dev-libs/expat )"
+RDEPEND="${DEPEND}
+		dev-lang/perl
+		>=dev-lang/python-2.3
+		app-text/rcs
+		X? ( dev-lang/tk )
+		gtk? ( >=dev-python/pygtk-2.6 )"
+
+# 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"
+
+	# Older python versions need own subproccess.py
+	python_version
+	[[ ${PYVER} < 2.4 ]] && myopts="${myopts} WITH_OWN_SUBPROCESS_PY=YesPlease"
+
+	use elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease"
+
+	export MY_MAKEOPTS=${myopts}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	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):" \
+		Makefile || die "sed failed"
+
+	exportmakeopts
+}
+
+src_compile() {
+	emake ${MY_MAKEOPTS} prefix=/usr || die "make failed"
+	emake -C contrib/git-svn/ git-svn || die "make git-svn failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed"
+	fi
+}
+
+src_install() {
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || die "make install failed"
+
+	use X || rm "${D}"/usr/bin/gitk
+
+	doman "${WORKDIR}"/man?/*
+
+	dodoc README COPYING Documentation/SubmittingPatches
+	if use doc ; then
+		dodoc Documentation/technical/*
+		dodir /usr/share/doc/${PF}/html
+		cp -r "${WORKDIR}"/{*.html,howto} "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	if use emacs ; then
+		insinto "${SITELISP}"
+		doins contrib/emacs/{,vc-}git.el*
+		elisp-site-file-install "${FILESDIR}"/70git-gentoo.el
+	fi
+
+	if use gtk ; then
+		dobin contrib/gitview/gitview
+		use doc && dodoc contrib/gitview/gitview.txt
+	fi
+
+	dobin contrib/git-svn/git-svn
+	dodoc contrib/git-svn/git-svn.txt
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+}
+
+src_test() {
+	cd "${S}"
+	emake ${MY_MAKEOPTS} test || die "tests failed"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	einfo
+	einfo "If you want to import arch repositories into git, consider using the"
+	einfo "git-archimport command. You should install dev-util/tla before"
+	einfo
+	einfo "If you want to import cvs repositories into git, consider using the"
+	einfo "git-cvsimport command. You should install >=dev-util/cvsps-2.1 before"
+	einfo
+	einfo "If you want to import svn repositories into git, consider using the"
+	einfo "git-svnimport command. You should install dev-util/subversion before"
+	einfo
+	einfo "If you want to manage subversion repositories using git, consider"
+	einfo "using git-svn. You should install dev-util/subversion before"
+	einfo
+	einfo "If you want to import a quilt series into git, donsider using the"
+	einfo "git-quiltimport command. You should install dev-util/quilt before"
+	einfo
+	einfo "If you want to use the included CVS server you will need to install"
+	einfo "dev-perl/DBI and dev-perl/DBD-SQLite"
+	einfo
+}
+
+pkg_postrm() {
+	# regenerate site-gentoo if we are merged USE=emacs and unmerged
+	# USE=-emacs
+	has_version virtual/emacs && elisp-site-regen
+}