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 03385af3d101..50ea1cf7ad73 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.120 2006/09/11 08:09:32 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.121 2006/09/13 19:39:26 ferdy Exp $
+
+*git-1.4.2.1 (13 Sep 2006)
+
+  13 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.2.1.ebuild:
+  New upstream version.
 
   11 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org>
   +files/git-daemon.xinetd, git-1.4.2.ebuild:
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 21235bdfea5e..6a5708bb4728 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -20,14 +20,17 @@ SHA256 6a3503904204163775722e8a455e4ebaa8648f6d288340979387ad4eb55f4c0a files/gi
 DIST git-1.1.6.tar.bz2 478466 RMD160 c88fb437ff78955cc54256488c18125adfc6ddef SHA1 c1170da256d125912e8dc7c8e4f068b21e5fcb06 SHA256 87eedea8af9dec73ea9648e2983d20fe058003bf703f18f90125bafe398bf8af
 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.tar.bz2 787562 RMD160 698c60da58bc458edc70b71cddcbba723672eb04 SHA1 0139466a3f55b9a88e03f1a7dbfbf7cc8b5f3a2a SHA256 66f9df64e74a5d5abb2c8a0bde34c0f0c9b870d521138c668e83ed2c8f1a6747
 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.tar.bz2 283696 RMD160 5ad645091db320f6f84a105995cfb3cc075a9e0c SHA1 8899b67ce5aa90b59324b5b68dd218c9b6d73541 SHA256 3ff6af6f1753b0f57f0e8ed0c7dec2c12fcccf735c8f4ec919d41e70751d0bab
 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.tar.bz2 89813 RMD160 950c9fbca87f521b1ada3a2054d071ff5e10a864 SHA1 c07fde3ee0ce7d144b1b297c28806cdb24ebc1ae SHA256 765a2f3e91fea74b930086fafb974a9ba88a3a91cbfbf41082552661e534d500
 EBUILD git-1.1.6.ebuild 3137 RMD160 584d887c6e5cc38ebd6ca3dfbcef49b9e137f427 SHA1 fea6a0f5a17d07b02fcd632f4c7da0367de69bac SHA256 4694703db2a72d2c5ad323e61385757db6fd503312cb3a4367edf0ccdc2cb45a
 MD5 55400bb7b60d88d4be30abca34925de4 git-1.1.6.ebuild 3137
@@ -41,14 +44,18 @@ EBUILD git-1.4.1.1.ebuild 4373 RMD160 9704f5a33de58462e8ea308da761390860354445 S
 MD5 590f5e0276fc348cef7d704c9b41cb3e git-1.4.1.1.ebuild 4373
 RMD160 9704f5a33de58462e8ea308da761390860354445 git-1.4.1.1.ebuild 4373
 SHA256 bc709432963aa7a3e47922449ae4bd08f7213094cc886c92417ab6beee005f7a git-1.4.1.1.ebuild 4373
+EBUILD git-1.4.2.1.ebuild 4408 RMD160 30fb8e52ba698dc2d99fc079d421f29a7e6100a9 SHA1 ae79646900607ee479f3f89f63a95b67da1ff9f0 SHA256 733a59ff03d79d44d4b8cce21f581898a06844862d369b13c3f099cd047c8cfa
+MD5 d1be82b237376c76d5e748c9452c4e85 git-1.4.2.1.ebuild 4408
+RMD160 30fb8e52ba698dc2d99fc079d421f29a7e6100a9 git-1.4.2.1.ebuild 4408
+SHA256 733a59ff03d79d44d4b8cce21f581898a06844862d369b13c3f099cd047c8cfa git-1.4.2.1.ebuild 4408
 EBUILD git-1.4.2.ebuild 4406 RMD160 241cd446ee53a7453ed386f86b77a14a342438e8 SHA1 7f786b4e63bc3e14890273fc59cc4c86f8ca1dd4 SHA256 a6eef7bfcb8ca6eb071c9989158addfcd6d7293596627ccb4e65b2bc462ebe95
 MD5 758370e66e7a4c7e25b556a6c4ecb648 git-1.4.2.ebuild 4406
 RMD160 241cd446ee53a7453ed386f86b77a14a342438e8 git-1.4.2.ebuild 4406
 SHA256 a6eef7bfcb8ca6eb071c9989158addfcd6d7293596627ccb4e65b2bc462ebe95 git-1.4.2.ebuild 4406
-MISC ChangeLog 17668 RMD160 2b0013f16e2051f12180501208e858a0d076cb33 SHA1 31d72aac901f0430d0215912753c8a1e6d4e18d2 SHA256 51237904ea9591234a67e7e51b2da9a7cb817e7143ced96743df7e64d37a2007
-MD5 ed9ad92d7c20583fc66bee465e82ccdb ChangeLog 17668
-RMD160 2b0013f16e2051f12180501208e858a0d076cb33 ChangeLog 17668
-SHA256 51237904ea9591234a67e7e51b2da9a7cb817e7143ced96743df7e64d37a2007 ChangeLog 17668
+MISC ChangeLog 17795 RMD160 6fae16208f16d1d79d6b73546d7eaa6c16698174 SHA1 d341ff914d19f70f1296f0047b415dcff714c411 SHA256 19a9a582d038aa4aa87f6df96c3e76b44e0369d80d234b8b9e018da62cd75550
+MD5 23a11fc12faef4198f592d77c6098468 ChangeLog 17795
+RMD160 6fae16208f16d1d79d6b73546d7eaa6c16698174 ChangeLog 17795
+SHA256 19a9a582d038aa4aa87f6df96c3e76b44e0369d80d234b8b9e018da62cd75550 ChangeLog 17795
 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 aff142b5807a76854337bb5bf3560483 files/digest-git-1.4.2 747
 RMD160 2a40d692f6949d5546fd3be023b56c2522403b99 files/digest-git-1.4.2 747
 SHA256 13d20a98c29f79467010e648837345a690db28211c9e2f2278fa2c299ac7c061 files/digest-git-1.4.2 747
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFFBRnJViELBEf1JB0RAhgUAJ9G2RsspgfeQ/uE7rwcGLUFOLi62QCfY9BV
-y4kRlg0Mrq9XN64x3aNeMv0=
-=Pf/L
+iD8DBQFFCF6LViELBEf1JB0RAg4mAJsHQDVNtFs5+x6TXeQ/l8oY1ceAkgCfWb7L
+zqdNWT/vJAGdff6NT22ZAJY=
+=ZFt5
 -----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.4.2.1 b/dev-util/git/files/digest-git-1.4.2.1
new file mode 100644
index 000000000000..bf27255fa69f
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.4.2.1
@@ -0,0 +1,9 @@
+MD5 f37cd32f0ded29419ceb3d79c169acf5 git-1.4.2.1.tar.bz2 788009
+RMD160 87e08d45d27ccea9c5b55fab42089f08b73f33ed git-1.4.2.1.tar.bz2 788009
+SHA256 751469b75c2db3c551f0dedee78502d0f746031a2091d64cb69c06e8ca34cdaf git-1.4.2.1.tar.bz2 788009
+MD5 3eab7c8243236cbbf288d01e9195b8a0 git-htmldocs-1.4.2.1.tar.bz2 284106
+RMD160 f732ba75aab41a66809cb77736094188011a7f27 git-htmldocs-1.4.2.1.tar.bz2 284106
+SHA256 9205111032c68e45f000755c61077d6a99225c287d16f3ad4b21ccf72c22e5e7 git-htmldocs-1.4.2.1.tar.bz2 284106
+MD5 272014b78bd3566a6099f87a6859887f git-manpages-1.4.2.1.tar.bz2 90423
+RMD160 61c469d24caa25a535fe985aa3716280c73e1f5d git-manpages-1.4.2.1.tar.bz2 90423
+SHA256 86acc0acb5ed81acde3a995a826d208a66e6662f6182f3cdae76c2c5007e630b git-manpages-1.4.2.1.tar.bz2 90423
diff --git a/dev-util/git/git-1.4.2.1.ebuild b/dev-util/git/git-1.4.2.1.ebuild
new file mode 100644
index 000000000000..7e4e3b61c9aa
--- /dev/null
+++ b/dev-util/git/git-1.4.2.1.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.1.ebuild,v 1.1 2006/09/13 19:39:26 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/xinet.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
+}