New upstream version.

Package-Manager: portage-2.1.1

4 files changed, 183 insertions, 8 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index a134fd69b33b..00d8180c33f1 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,11 @@
 # 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.124 2006/09/27 19:32:23 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.125 2006/09/30 10:40:25 ferdy Exp $
+
+*git-1.4.2.2 (30 Sep 2006)
+
+  30 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.2.2.ebuild:
+  New upstream version.
 
   27 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.2.ebuild:
   Remove git-1.4.2 since it has a buggy builtin-mv command.
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index dfcf7f49734b..62337e1b61cf 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -21,14 +21,17 @@ DIST git-1.1.6.tar.bz2 478466 RMD160 c88fb437ff78955cc54256488c18125adfc6ddef SH
 DIST git-1.4.0.tar.bz2 717181 RMD160 1010a0818efd5309f1a0ba1228f953f97d575038 SHA1 77745c27ffb2af6e4f43e0f800436799b633f1a2 SHA256 abdb48005e7b2f8988498a6c6724e2e6f6162f30915f591be6586df57dd3f2fa
 DIST git-1.4.1.1.tar.bz2 752419 RMD160 1e8c8cc2ee0685fb0ece9e0ee0720cb608140c05 SHA1 376a96ecf68cf90fa0b29fde700e5e947967531a SHA256 e4a9ef8403c3716f7494d4865ee6c3e862b93012df41522237ace91f68a6d6ce
 DIST git-1.4.2.1.tar.bz2 788009 RMD160 87e08d45d27ccea9c5b55fab42089f08b73f33ed SHA1 077311e500cec4fba417ae27319c4a500258c026 SHA256 751469b75c2db3c551f0dedee78502d0f746031a2091d64cb69c06e8ca34cdaf
+DIST git-1.4.2.2.tar.bz2 787691 RMD160 1073f390d8c25e25ce363b291059f5931fef42d9 SHA1 894c986bbb11b2e28500b2edf97387cfb040eb7a SHA256 0782e151821172addbfbd29a1f540acac8c9d8e2ac4018ae771ccdd4a51c6d6f
 DIST git-html-1.1.6.tar.bz2 214805 RMD160 4a4cb45ae7ec212a15c63e6f5554b52e14797d1a SHA1 6ad1937ee897d517357c2a506b04325ebe0f424d SHA256 ae097fdd46d236e4897dc16a6fdec897b77ebd4c2f9d69b5c97814704aa31eac
 DIST git-htmldocs-1.4.0.tar.bz2 262492 RMD160 b98ce629edc28cf8933e0a6f4d59df07d68cf636 SHA1 b9f9b535304b5dc5c9fd11d106a28680bf62d4b5 SHA256 c8d8dffefe3dfc7ec190ee7502d20aa36f150ea633d5621b4a55156672a2ea97
 DIST git-htmldocs-1.4.1.1.tar.bz2 263120 RMD160 4a50c2cec7ecd612690ee5dd0f7fbe69f11fe1bf SHA1 6a22f41064f1db29e69a65ad2177e9f6e18aea77 SHA256 8e4ccf995645fe08f7644b62535c4054515355942b5f3551fcbebd3f5ec36d1d
 DIST git-htmldocs-1.4.2.1.tar.bz2 284106 RMD160 f732ba75aab41a66809cb77736094188011a7f27 SHA1 11fdfedc0994204b67633cd976b0ff585a795be2 SHA256 9205111032c68e45f000755c61077d6a99225c287d16f3ad4b21ccf72c22e5e7
+DIST git-htmldocs-1.4.2.2.tar.bz2 283914 RMD160 a8ad7bead64dedfdafeda355dd1857bbcfb99144 SHA1 0abbb24ae153f5fb0609ae6451c847f2fb8dc871 SHA256 e3e9d111f1d3ce2b7cdef922bbfdb67fd826c20e425867b201fb320164487cbe
 DIST git-man-1.1.6.tar.bz2 69088 RMD160 4e8bc8067c903caa8ed9b9a6a04c89ab15483aab SHA1 d90dee09b0d52067fc4ebe8a1855d31ea0378815 SHA256 68042818e789b08a2f8c913c5d7deb5f6f41f6a5c9b989898a98eed61c6e5c72
 DIST git-manpages-1.4.0.tar.bz2 83698 RMD160 6bfb8fa2e1ae34fd4576e84fee720a239323a65d SHA1 bed6974f210dac70f85bf18f2e3c5f7097d0eeed SHA256 f275b1a3fb1eab0368dbb704628e76a4c34a0724ddece1de11b2f53ee327d5d4
 DIST git-manpages-1.4.1.1.tar.bz2 83956 RMD160 894b8717e9e4099f7aacb97a3673e81c09e23daf SHA1 c899fbdef72bdfdb29c03e3372ee736781d58289 SHA256 2b2759a15eb9432e972743846c7299518e542e99a23a7318c540f0086e746ee4
 DIST git-manpages-1.4.2.1.tar.bz2 90423 RMD160 61c469d24caa25a535fe985aa3716280c73e1f5d SHA1 df0a84c704ac2f533f9e69dec7ba5d65dfd66c13 SHA256 86acc0acb5ed81acde3a995a826d208a66e6662f6182f3cdae76c2c5007e630b
+DIST git-manpages-1.4.2.2.tar.bz2 90428 RMD160 c5e27d6055601a9564c5d9ac2c3f8ecaa7f41fed SHA1 97d640153ed2c4139f60b6a8a8125a0202ba0f3d SHA256 a1fb59e32fb4c79457435be979ca2ed9f93fedfee1c32014b307ec386776bf03
 EBUILD git-1.1.6.ebuild 3137 RMD160 584d887c6e5cc38ebd6ca3dfbcef49b9e137f427 SHA1 fea6a0f5a17d07b02fcd632f4c7da0367de69bac SHA256 4694703db2a72d2c5ad323e61385757db6fd503312cb3a4367edf0ccdc2cb45a
 MD5 55400bb7b60d88d4be30abca34925de4 git-1.1.6.ebuild 3137
 RMD160 584d887c6e5cc38ebd6ca3dfbcef49b9e137f427 git-1.1.6.ebuild 3137
@@ -45,10 +48,14 @@ EBUILD git-1.4.2.1.ebuild 4409 RMD160 138a091481fff919a0c02cf339a43b8d27954f74 S
 MD5 2825a5cc7e2845e36e0fd760a5ca542a git-1.4.2.1.ebuild 4409
 RMD160 138a091481fff919a0c02cf339a43b8d27954f74 git-1.4.2.1.ebuild 4409
 SHA256 15dc17470016e3364fd34074dc0cef885e1b031d9458a16da081c7eedf8a5db0 git-1.4.2.1.ebuild 4409
-MISC ChangeLog 18158 RMD160 6abda028486d2d43866eca0719a0e5b966defdc3 SHA1 26f91b9165ebadc4f72d1b98cceea63cb50f810e SHA256 4bfaa4254ee6a9c0a540fe373402408fefdf615777c307770d158c8d0ba33b2e
-MD5 7319663b8481dc755db5ac6e1a5c7f1f ChangeLog 18158
-RMD160 6abda028486d2d43866eca0719a0e5b966defdc3 ChangeLog 18158
-SHA256 4bfaa4254ee6a9c0a540fe373402408fefdf615777c307770d158c8d0ba33b2e ChangeLog 18158
+EBUILD git-1.4.2.2.ebuild 4409 RMD160 2ff41a169ece6d059d822785c2dda2d41447d3f3 SHA1 398db40b81ca76b3fa692bd0f54708cfda5bb5ca SHA256 ba30abf6c1f48fb4dd3e7c38c87888462c9065e2322cdaa1333301d72c4812d3
+MD5 f76d7a0bcddd57b5a145a21cbe040c8a git-1.4.2.2.ebuild 4409
+RMD160 2ff41a169ece6d059d822785c2dda2d41447d3f3 git-1.4.2.2.ebuild 4409
+SHA256 ba30abf6c1f48fb4dd3e7c38c87888462c9065e2322cdaa1333301d72c4812d3 git-1.4.2.2.ebuild 4409
+MISC ChangeLog 18285 RMD160 5882fca82c40549d51d415f12680f5b30a44c1b9 SHA1 31244c4ed2661c8bec0a1b31e263b37d7edd59b7 SHA256 e89f92f6e605b5cc65e32b050e08eed6989fbd2fa5a0b0dfe1124d2f5be49c72
+MD5 26161d1e4ae5843f0aa3daa02aed353e ChangeLog 18285
+RMD160 5882fca82c40549d51d415f12680f5b30a44c1b9 ChangeLog 18285
+SHA256 e89f92f6e605b5cc65e32b050e08eed6989fbd2fa5a0b0dfe1124d2f5be49c72 ChangeLog 18285
 MISC metadata.xml 255 RMD160 db414d29c445e388d486f826b368b5359b74f72d SHA1 0317bb4c83bba580ddb586efe8a929b85759d0d2 SHA256 45f65b01b99f13e87c53843765ab287065988ab80e675287cdcc81ce3e22f9a2
 MD5 c2a7223a6caa6908d13db012ce74b388 metadata.xml 255
 RMD160 db414d29c445e388d486f826b368b5359b74f72d metadata.xml 255
@@ -65,10 +72,13 @@ SHA256 c4659a8be91474f1005a6c0fec5ea794c5f406dd9b74ffe047ceef76517891a4 files/di
 MD5 8188cbf1f2173fb2b267076fbe536ae7 files/digest-git-1.4.2.1 765
 RMD160 36b3606ecc25fbaec988e1787a1b4160ba2fac23 files/digest-git-1.4.2.1 765
 SHA256 a78ea9114ba337fb764997c4b7c366a17ac240805ecb4a11ce8ee50a680059e6 files/digest-git-1.4.2.1 765
+MD5 1b609f51996982cc917e460afe40dec0 files/digest-git-1.4.2.2 765
+RMD160 b80c448ed91a89761eb104a26d60754fbe08cac6 files/digest-git-1.4.2.2 765
+SHA256 632b086b79fd9ef965beacd2fbadb1cbd71713e67e7d93149168f30751db64d9 files/digest-git-1.4.2.2 765
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFFGtHZViELBEf1JB0RAkYpAJ9JzagpF5lGWuI+spOPWqm/E91HqQCfaHVg
-diPaPlWlzIOWlLDoZwrJiaQ=
-=mxgN
+iD8DBQFFHkmrViELBEf1JB0RAkuGAJ93R6SCmbXQA9oQShzz7/Kys94C1ACcCHKv
+oVkt/bQkHdubKbkqUX9eXXk=
+=hR6g
 -----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.4.2.2 b/dev-util/git/files/digest-git-1.4.2.2
new file mode 100644
index 000000000000..0b549c14cec4
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.4.2.2
@@ -0,0 +1,9 @@
+MD5 9c8577e2e43fa08d68590928a4112547 git-1.4.2.2.tar.bz2 787691
+RMD160 1073f390d8c25e25ce363b291059f5931fef42d9 git-1.4.2.2.tar.bz2 787691
+SHA256 0782e151821172addbfbd29a1f540acac8c9d8e2ac4018ae771ccdd4a51c6d6f git-1.4.2.2.tar.bz2 787691
+MD5 a5e26352c5fce9e00d8385e480112070 git-htmldocs-1.4.2.2.tar.bz2 283914
+RMD160 a8ad7bead64dedfdafeda355dd1857bbcfb99144 git-htmldocs-1.4.2.2.tar.bz2 283914
+SHA256 e3e9d111f1d3ce2b7cdef922bbfdb67fd826c20e425867b201fb320164487cbe git-htmldocs-1.4.2.2.tar.bz2 283914
+MD5 62fb1a7aa0441e34facceb92d36046b8 git-manpages-1.4.2.2.tar.bz2 90428
+RMD160 c5e27d6055601a9564c5d9ac2c3f8ecaa7f41fed git-manpages-1.4.2.2.tar.bz2 90428
+SHA256 a1fb59e32fb4c79457435be979ca2ed9f93fedfee1c32014b307ec386776bf03 git-manpages-1.4.2.2.tar.bz2 90428
diff --git a/dev-util/git/git-1.4.2.2.ebuild b/dev-util/git/git-1.4.2.2.ebuild
new file mode 100644
index 000000000000..f86fdc94640f
--- /dev/null
+++ b/dev-util/git/git-1.4.2.2.ebuild
@@ -0,0 +1,151 @@
+# 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.2.2.ebuild,v 1.1 2006/09/30 10:40: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 ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="curl doc emacs gtk mozsha1 ppcsha1 tk webdav"
+
+DEPEND="dev-libs/openssl
+		sys-libs/zlib
+		!app-misc/git
+		curl? ( net-misc/curl )
+		webdav? ( dev-libs/expat )
+		emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}
+		dev-lang/perl
+		>=dev-lang/python-2.3
+		app-text/rcs
+		tk? ( 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} DESTDIR="${D}" prefix=/usr || die "make 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 tk || 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
+
+	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
+}
+
+src_test() {
+	cd "${S}"
+
+	has_version dev-util/subversion || \
+		MY_MAKEOPTS="${MY_MAKEOPTS} NO_SVN_TESTS=YesPlease"
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr 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 and dev-perl/libwww-perl."
+	einfo
+	einfo "If you want to import a quilt series into git, consider 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
+}