New upstream version.

Package-Manager: portage-2.1.1-r2

4 files changed, 185 insertions, 8 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 9cd79265119a..24df258469dc 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.146 2006/11/16 11:13:28 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.147 2006/11/26 14:01:48 ferdy Exp $
+
+*git-1.4.4.1 (26 Nov 2006)
+
+  26 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.4.1.ebuild:
+  New upstream version.
 
   16 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.4.ebuild:
   Remove tar-tree tests if we don't have unzip installed.
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index f2049dcbb199..41e703457bbc 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -20,14 +20,17 @@ SHA256 6a3503904204163775722e8a455e4ebaa8648f6d288340979387ad4eb55f4c0a files/gi
 DIST git-1.4.1.1.tar.bz2 752419 RMD160 1e8c8cc2ee0685fb0ece9e0ee0720cb608140c05 SHA1 376a96ecf68cf90fa0b29fde700e5e947967531a SHA256 e4a9ef8403c3716f7494d4865ee6c3e862b93012df41522237ace91f68a6d6ce
 DIST git-1.4.2.4.tar.bz2 787793 RMD160 03664bb1c98c7d9dc8c6f1dfa56149d807fd5164 SHA1 ff80a407cbad5b759adaecf434b37b293a167096 SHA256 1efbbee0e3e8704b25ef6fbc9519ba6f94a21aee48a231b986408627a4017632
 DIST git-1.4.3.5.tar.bz2 859712 RMD160 076514f909a901f18f01151a1839b6cac03d1e1e SHA1 1cd03ee2744dfd7a2c31269f0002b72b75d08ad1 SHA256 8ab38be18a8221d2181a09b17dd98d4e29e33d897be7c6d9ee31495dc5756409
+DIST git-1.4.4.1.tar.bz2 887843 RMD160 0968b31537a9f4a57929cec0f1b6093f91650d9b SHA1 98c29ecb536ca88f52acef79122dca243327266a SHA256 007742a1eab7ef0aed78af4e701c5b877e6b0fe31aa56f2811d3e2fa74549a24
 DIST git-1.4.4.tar.bz2 886549 RMD160 99352e32da5b79928d85e3176cc5abe5013ba474 SHA1 9a08d1a94570dc92c3caa0369a3f5c8ac02096e0 SHA256 ae878e93dbade210601b47fe56a7a36c84ae8a28457c5f415626f829e511fe17
 DIST git-htmldocs-1.4.1.1.tar.bz2 263120 RMD160 4a50c2cec7ecd612690ee5dd0f7fbe69f11fe1bf SHA1 6a22f41064f1db29e69a65ad2177e9f6e18aea77 SHA256 8e4ccf995645fe08f7644b62535c4054515355942b5f3551fcbebd3f5ec36d1d
 DIST git-htmldocs-1.4.2.4.tar.bz2 283907 RMD160 6aaa9e601cc16d4e45176e58fbbc87a332afb243 SHA1 e05b2ef0a5354b8c6ff4d043d620e0b229cda7a9 SHA256 90f3ad4bced74bbadfc6f02a1c3d222a6bcf13d940b9aef368b7cbae083c1f86
 DIST git-htmldocs-1.4.3.5.tar.bz2 306180 RMD160 8880c493ed1ff3ae361200dbfba0c7156542b908 SHA1 972a00c65e2778f9eb4f31b23c02347cbe71cde8 SHA256 b4674fe2013dc95b21b94f8b327d0c74017b5075fa991665c2e4cbb736b7fbc9
+DIST git-htmldocs-1.4.4.1.tar.bz2 325170 RMD160 6ce7262ca2238b4d5183fd76d2e976633895f555 SHA1 d7a6c348dbe224724ab4033f99136df1561e2a45 SHA256 c1c05d2b52c15b0d70e13d6e0a80c5da8b65642d10a456828733e13f7881b990
 DIST git-htmldocs-1.4.4.tar.bz2 321241 RMD160 225fb4067857e4e242783d314ab4ab1c31970470 SHA1 fb427fc6570649703d26300068d6f631adbead27 SHA256 d73d3fb7093d2a2ed60be4c24389324ce153b7f6c26de0fbf9611a804561d2ba
 DIST git-manpages-1.4.1.1.tar.bz2 83956 RMD160 894b8717e9e4099f7aacb97a3673e81c09e23daf SHA1 c899fbdef72bdfdb29c03e3372ee736781d58289 SHA256 2b2759a15eb9432e972743846c7299518e542e99a23a7318c540f0086e746ee4
 DIST git-manpages-1.4.2.4.tar.bz2 90375 RMD160 0b3d486d04a5a64aab273c75823c603f307fcd02 SHA1 961b3981f074663ec64bbbc5b82fdab0c45b7919 SHA256 6e0520fd779225e79957871d981ddfc9e93f157374de88f654d4f20958557518
 DIST git-manpages-1.4.3.5.tar.bz2 98349 RMD160 14628c3cd19d717e6544eecefe84989aca6fdd2c SHA1 40945f3749a0c371c356bd4890bbafcfca4318c4 SHA256 43fa90b9bd11723a3750dab74c5960ffb102feb04ceac9c6e74239e7e678a0c9
+DIST git-manpages-1.4.4.1.tar.bz2 104684 RMD160 fb1e9b7ed8bc40e67dd4a1ea412b11baa240a87d SHA1 04f4d2fead7a664d2d83c2d2a5d5be5941d9d2e6 SHA256 933420fed531bbb13ea9116e7c7cb6735da76347025de9af602e358ff6744e4a
 DIST git-manpages-1.4.4.tar.bz2 103893 RMD160 51e717edb8ab53239b098f2ea47ddbedd24a806c SHA1 1ef1bb6554cd8b6ef629ae5d8d0b078e72c185c5 SHA256 549ad09b5a70bf059a1a0d994778aabfef17e02433dc019585d48c0343f73c06
 EBUILD git-1.4.1.1.ebuild 4357 RMD160 741099499ec1a318cdeda9c30b0df2f4b85681d7 SHA1 7821e58d71dfca386d65650778bb8ee3f02d955a SHA256 9725d2544544ca5b708a3b04d5a3845ed73a8cf1b59f4fc111670075b8a0fa3e
 MD5 30fe00de7349add84335eb4bad62baf4 git-1.4.1.1.ebuild 4357
@@ -41,14 +44,18 @@ EBUILD git-1.4.3.5.ebuild 4063 RMD160 cb5c81faec35cd78f6b32cbc4881ae03fc5a0e25 S
 MD5 104f2d15f980593041d41fa295b622c5 git-1.4.3.5.ebuild 4063
 RMD160 cb5c81faec35cd78f6b32cbc4881ae03fc5a0e25 git-1.4.3.5.ebuild 4063
 SHA256 c394377d6fc5ad39917da0af5f22cbae720941fccd610677bc07617f360ab89f git-1.4.3.5.ebuild 4063
+EBUILD git-1.4.4.1.ebuild 4128 RMD160 8f952face2ea389ac0d56e10fed49d2d43258f4e SHA1 56d6b2a0426e7f71ddcf4e2a0d91398bd268d41d SHA256 84b5ebf6b9eea6c6153454979a411282388c3cdd6d6d163aa364b96af983bb0a
+MD5 96ad0b0782691d8c81469aef6e131c47 git-1.4.4.1.ebuild 4128
+RMD160 8f952face2ea389ac0d56e10fed49d2d43258f4e git-1.4.4.1.ebuild 4128
+SHA256 84b5ebf6b9eea6c6153454979a411282388c3cdd6d6d163aa364b96af983bb0a git-1.4.4.1.ebuild 4128
 EBUILD git-1.4.4.ebuild 4126 RMD160 ce64e41caf59f3d42977429191f079c38b9ce53a SHA1 1a463c9d462af510e698e9d114f8aff94c22c063 SHA256 c0f888c9d0a9d754a7b231cae77ee13a9079b537f849f9658b7a730730d90218
 MD5 116d7cdd9fbf540cf8a1987d2ff3834f git-1.4.4.ebuild 4126
 RMD160 ce64e41caf59f3d42977429191f079c38b9ce53a git-1.4.4.ebuild 4126
 SHA256 c0f888c9d0a9d754a7b231cae77ee13a9079b537f849f9658b7a730730d90218 git-1.4.4.ebuild 4126
-MISC ChangeLog 21263 RMD160 f4c4038ab5649a144eb9c3fea6a4abff7f22044b SHA1 f3a7def91e36fe271b66e954c2791e99536dd1e5 SHA256 d531b4ad045ad370b1f7b3ef8ab33cab82cb488344a7a06443c9043b97893068
-MD5 a70a583d0171dac39f897a2d9b05e86f ChangeLog 21263
-RMD160 f4c4038ab5649a144eb9c3fea6a4abff7f22044b ChangeLog 21263
-SHA256 d531b4ad045ad370b1f7b3ef8ab33cab82cb488344a7a06443c9043b97893068 ChangeLog 21263
+MISC ChangeLog 21390 RMD160 5c273435634ed598b7b3d7b0aab3c7f8c3b4baaf SHA1 a7c5a4ecf6eebf48dd36255bb6876acc932eeb75 SHA256 4bf56a1c9b7ea0fe89c3e1062bfc5dfd42bb2fec9f930627a6b455889fb331e8
+MD5 37a9d72af132856196d40b3b6ab4b047 ChangeLog 21390
+RMD160 5c273435634ed598b7b3d7b0aab3c7f8c3b4baaf ChangeLog 21390
+SHA256 4bf56a1c9b7ea0fe89c3e1062bfc5dfd42bb2fec9f930627a6b455889fb331e8 ChangeLog 21390
 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 69b0b0cbe7604d63e6dc3f42e40a965c0cecb824c900b368427f6c2d0deb4550 files/di
 MD5 d35887562c659a5784d8b3c2bbc100a0 files/digest-git-1.4.4 750
 RMD160 9b7ab3e463046e19055fcc888ef859be1e39c680 files/digest-git-1.4.4 750
 SHA256 6a661680ca0cde949ec1bd585cd5637c75627429f41fa2c2f232dbee9cd3c638 files/digest-git-1.4.4 750
+MD5 84e652112ca10f26b34e22f712b93155 files/digest-git-1.4.4.1 768
+RMD160 d45ff7823a1a50ed6d763dd31cd08818dd0d392c files/digest-git-1.4.4.1 768
+SHA256 3a6eeddb9af8f2d6c8b875c63d0c87c162d7487542e5ed38123039ae480eb98c files/digest-git-1.4.4.1 768
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFFXEfkViELBEf1JB0RAhEjAJ9VjLkrD8dxiQsmtH1cdphe+lzJLACePa1Q
-Mzy+d2csgzARteUhQu2qBdw=
-=lQcb
+iD8DBQFFaZ7GViELBEf1JB0RAlDTAJ0fSbfI/2sAfOpJ66z9BjJDRdAmPACeMpu5
+wn0iQdSQUQmcCCmV0NK8SJk=
+=ky88
 -----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.4.4.1 b/dev-util/git/files/digest-git-1.4.4.1
new file mode 100644
index 000000000000..bd8351e7fde5
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.4.4.1
@@ -0,0 +1,9 @@
+MD5 504521167df43146e1f5d69aa5c5e023 git-1.4.4.1.tar.bz2 887843
+RMD160 0968b31537a9f4a57929cec0f1b6093f91650d9b git-1.4.4.1.tar.bz2 887843
+SHA256 007742a1eab7ef0aed78af4e701c5b877e6b0fe31aa56f2811d3e2fa74549a24 git-1.4.4.1.tar.bz2 887843
+MD5 a14bf7f608303de95fc81b74097949bb git-htmldocs-1.4.4.1.tar.bz2 325170
+RMD160 6ce7262ca2238b4d5183fd76d2e976633895f555 git-htmldocs-1.4.4.1.tar.bz2 325170
+SHA256 c1c05d2b52c15b0d70e13d6e0a80c5da8b65642d10a456828733e13f7881b990 git-htmldocs-1.4.4.1.tar.bz2 325170
+MD5 3573e8bb863fa1d74a83aa1d47ba601c git-manpages-1.4.4.1.tar.bz2 104684
+RMD160 fb1e9b7ed8bc40e67dd4a1ea412b11baa240a87d git-manpages-1.4.4.1.tar.bz2 104684
+SHA256 933420fed531bbb13ea9116e7c7cb6735da76347025de9af602e358ff6744e4a git-manpages-1.4.4.1.tar.bz2 104684
diff --git a/dev-util/git/git-1.4.4.1.ebuild b/dev-util/git/git-1.4.4.1.ebuild
new file mode 100644
index 000000000000..98ce8b69813d
--- /dev/null
+++ b/dev-util/git/git-1.4.4.1.ebuild
@@ -0,0 +1,153 @@
+# 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.4.1.ebuild,v 1.1 2006/11/26 14:01:48 ferdy Exp $
+
+inherit python toolchain-funcs eutils elisp-common perl-module bash-completion
+
+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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="curl doc elibc_uclibc 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}
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	einfo "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+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
+
+	dobashcompletion contrib/completion/git-completion.bash ${PN}
+
+	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
+
+	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
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	einfo "These additional scripts need some dependencies:"
+	einfo
+	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"
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-cvsserver "dev-perl/DBI" "dep-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
+}