New upstream version.

Package-Manager: portage-2.1.1-r2

4 files changed, 187 insertions, 8 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 18427da31d1c..60ae22aa16cd 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.148 2006/12/07 15:36:19 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.149 2006/12/20 21:46:04 ferdy Exp $
+
+*git-1.4.4.3 (20 Dec 2006)
+
+  20 Dec 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.4.3.ebuild:
+  New upstream version.
 
 *git-1.4.4.2 (07 Dec 2006)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 4fdf91fa6db4..fa5227c89c9c 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -21,14 +21,17 @@ DIST git-1.4.1.1.tar.bz2 752419 RMD160 1e8c8cc2ee0685fb0ece9e0ee0720cb608140c05
 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.2.tar.bz2 887999 RMD160 8b1892f630eadbe88223b338b4cce7118afbedcf SHA1 3cfaacef9be08470619b83ce467d72fd6db5da53 SHA256 907138a7537ff8cef5a9bb258cbba3e32fa46b240f66cd16d5bf530e081ac6b9
+DIST git-1.4.4.3.tar.bz2 888091 RMD160 06184ee7e16c12687b4a644c38d23ff7732e4c54 SHA1 d41b8e62b2c0b5f3ea994bed4618a44cbcfb319e SHA256 5485e66a811f8a047124f1358ded268916fcf07ecccb9345f429b4ea8b76603e
 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.2.tar.bz2 325578 RMD160 0c9c1ffb89e25566002f0af5c6c5d829081a5dc0 SHA1 2e20d59a9e6e7d5050dd0aad5b75072552d76f77 SHA256 c1b2b32816122dfe47a588cba50aaa823f307e5d4935ed6c80261762bfa44b6a
+DIST git-htmldocs-1.4.4.3.tar.bz2 325744 RMD160 52c8f9088ca969255ff93f719563b65f43a59a9f SHA1 1ab02de5bae511f07b19c6048626160d99ff145c SHA256 cca1f7dec9dd063d78920e4d2f7a9a47fa57cfd883b872883b60795541c2c585
 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.2.tar.bz2 104745 RMD160 b55d9da2ecf3862495408e4b01a9d3f1f2d51c36 SHA1 c677a30c5d10d77455ec7fd95ff98e8c155be616 SHA256 e4685c50c8e79bb7166ae63578f70933b518dd5850d27cfa331fae3c0032aa16
+DIST git-manpages-1.4.4.3.tar.bz2 104756 RMD160 b10969ec6702606ea348d9a6fe05831e28fbcc00 SHA1 decdee44cca3f89843a290402c30422dde9edfa1 SHA256 7f11c3f55a86fc7e445e6bf97d049564e586902bb53e48c6048b7ce0ad90675e
 EBUILD git-1.4.1.1.ebuild 4357 RMD160 741099499ec1a318cdeda9c30b0df2f4b85681d7 SHA1 7821e58d71dfca386d65650778bb8ee3f02d955a SHA256 9725d2544544ca5b708a3b04d5a3845ed73a8cf1b59f4fc111670075b8a0fa3e
 MD5 30fe00de7349add84335eb4bad62baf4 git-1.4.1.1.ebuild 4357
 RMD160 741099499ec1a318cdeda9c30b0df2f4b85681d7 git-1.4.1.1.ebuild 4357
@@ -45,10 +48,14 @@ EBUILD git-1.4.4.2.ebuild 4187 RMD160 68f99867041776629f6ee7b2330eb8229e2057bc S
 MD5 e9eb032dd980ff458a184644051e329c git-1.4.4.2.ebuild 4187
 RMD160 68f99867041776629f6ee7b2330eb8229e2057bc git-1.4.4.2.ebuild 4187
 SHA256 dee0804a9b5e80b6ac7bd67f0e3be23fcd2c1ad8f940848838d227a4abb4243c git-1.4.4.2.ebuild 4187
-MISC ChangeLog 21599 RMD160 f63cf81dc6b8b4b25267901abeb7f2be07621f02 SHA1 fb7b4abf308611caae72065738440b48d43d4939 SHA256 159c1cbfda9231fda77473e1d7a86bde015bca4ab6aeabbaad6079a33b243b75
-MD5 6b50985d89aa1e49de83f652d298289a ChangeLog 21599
-RMD160 f63cf81dc6b8b4b25267901abeb7f2be07621f02 ChangeLog 21599
-SHA256 159c1cbfda9231fda77473e1d7a86bde015bca4ab6aeabbaad6079a33b243b75 ChangeLog 21599
+EBUILD git-1.4.4.3.ebuild 4187 RMD160 3fe297c0d511546419298ff4ecde1e6d67b853bf SHA1 c3c7a4d68fc41e064a680fcd53cae0c19b141103 SHA256 afa51be9a5585a2af0656b049c013c35c34fe6156764911961005d8fb9499216
+MD5 d3fb98246c6bc66ae095ffbdb46e1866 git-1.4.4.3.ebuild 4187
+RMD160 3fe297c0d511546419298ff4ecde1e6d67b853bf git-1.4.4.3.ebuild 4187
+SHA256 afa51be9a5585a2af0656b049c013c35c34fe6156764911961005d8fb9499216 git-1.4.4.3.ebuild 4187
+MISC ChangeLog 21726 RMD160 a5d9458593a169271fe8eede5dbf013804317a01 SHA1 ca88097ee6c84e80640b29f52f67e7a2148a3fc4 SHA256 9695f82deb729c87326c20f023f5802494d120adbbcb81c682d79af476e7d2bb
+MD5 db1677cbc1951b82d64addee44a34c90 ChangeLog 21726
+RMD160 a5d9458593a169271fe8eede5dbf013804317a01 ChangeLog 21726
+SHA256 9695f82deb729c87326c20f023f5802494d120adbbcb81c682d79af476e7d2bb ChangeLog 21726
 MISC metadata.xml 253 RMD160 e09bab6a5a422f501b8e07a3983c5790e00ac92a SHA1 7c2340e011ce57927ff31d7e3397ef4bb1c7ad27 SHA256 1f2e9f9f57e781c296ac5c39c54eabf82a47b7facd0698b296bc76f50799432c
 MD5 22c5a3ad567fa12332dab8687b9c2d1c metadata.xml 253
 RMD160 e09bab6a5a422f501b8e07a3983c5790e00ac92a metadata.xml 253
@@ -65,10 +72,13 @@ SHA256 69b0b0cbe7604d63e6dc3f42e40a965c0cecb824c900b368427f6c2d0deb4550 files/di
 MD5 5f5def2549715648cd6eaa40def50f27 files/digest-git-1.4.4.2 768
 RMD160 1bbaefc7c933c818cf750b6d0193ddfd4c3b3874 files/digest-git-1.4.4.2 768
 SHA256 3d3ed95e816af39d540012a87a6048a4786554ee4256852c51bbcd390eac3c17 files/digest-git-1.4.4.2 768
+MD5 beefd1f4ff4f54bfe0888fbce5026ffa files/digest-git-1.4.4.3 768
+RMD160 c0337f2dc4c1f48d7438d007a73a7fcb0ef199f0 files/digest-git-1.4.4.3 768
+SHA256 666f5fe026723735f156653f2565168d6c3f902e176d9c009a4c75ae992e475b files/digest-git-1.4.4.3 768
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFFhlC7ViELBEf1JB0RAhTfAJ9/rOoB5IbjJrsud1kSECSpgTPOIwCfVsAP
-AbaiRNQtH26h1yLcvMKzmPs=
-=+66W
+iD8DBQFFia8vViELBEf1JB0RAtgmAJ9bC9TYlz8bsCPWMmBhSApwD+pTXgCfcgTK
+efYd2U+OjlfcTCTdHpqfOuM=
+=Mbp5
 -----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.4.4.3 b/dev-util/git/files/digest-git-1.4.4.3
new file mode 100644
index 000000000000..407c2b0b36ac
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.4.4.3
@@ -0,0 +1,9 @@
+MD5 a4c2c27f7ea3137a5be7edaecfb9db21 git-1.4.4.3.tar.bz2 888091
+RMD160 06184ee7e16c12687b4a644c38d23ff7732e4c54 git-1.4.4.3.tar.bz2 888091
+SHA256 5485e66a811f8a047124f1358ded268916fcf07ecccb9345f429b4ea8b76603e git-1.4.4.3.tar.bz2 888091
+MD5 e59ee4eb1c66857c480749e9aba4f8a5 git-htmldocs-1.4.4.3.tar.bz2 325744
+RMD160 52c8f9088ca969255ff93f719563b65f43a59a9f git-htmldocs-1.4.4.3.tar.bz2 325744
+SHA256 cca1f7dec9dd063d78920e4d2f7a9a47fa57cfd883b872883b60795541c2c585 git-htmldocs-1.4.4.3.tar.bz2 325744
+MD5 007a5d3a5d3787b2538c03b14b4466bb git-manpages-1.4.4.3.tar.bz2 104756
+RMD160 b10969ec6702606ea348d9a6fe05831e28fbcc00 git-manpages-1.4.4.3.tar.bz2 104756
+SHA256 7f11c3f55a86fc7e445e6bf97d049564e586902bb53e48c6048b7ce0ad90675e git-manpages-1.4.4.3.tar.bz2 104756
diff --git a/dev-util/git/git-1.4.4.3.ebuild b/dev-util/git/git-1.4.4.3.ebuild
new file mode 100644
index 000000000000..7f0d20564438
--- /dev/null
+++ b/dev-util/git/git-1.4.4.3.ebuild
@@ -0,0 +1,155 @@
+# 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.3.ebuild,v 1.1 2006/12/20 21:46:04 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
+	use amd64 && \
+		rm "${S}"/t/t9200-git-cvsexportcommit.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
+}