New upstream version.

(Portage version: 2.0.54-r2)

4 files changed, 132 insertions, 69 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 33b45ea7613e..30b1bb1f485b 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.95 2006/05/14 10:56:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.96 2006/05/17 08:04:05 ferdy Exp $
+
+*git-1.3.3 (17 May 2006)
+
+  17 May 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.3.3.ebuild:
+  New upstream version.
 
   14 May 2006; Diego Pettenò <flameeyes@gentoo.org> git-1.3.2.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 10670206c77d..257d2c67f1d9 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,76 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX git-daemon.confd 376 RMD160 70cbd0b87cbd2ce6b494f07ead732f33f7ea623f SHA1 3a00fa3af96d83bec1589d7ef53eff01ea838ea1 SHA256 266045958a3a4072529f25208d1f84a178bbb10aa0b6fa19543f7a62f9a5e3fe size 376
+MD5 8cb5c012654dd17ea8fb5ead0fa85172 ChangeLog 14200
+MD5 8623111b91d1c7d14999e96d857384d9 files/digest-git-1.1.6 194
+MD5 84d4ff578de4ab1679708b38a45bc5a9 files/digest-git-1.2.4 194
+MD5 7a453ab63b1d3cb334fc936938036ac3 files/digest-git-1.2.6 194
+MD5 ef08d603f626491bac6c38dd89f684aa files/digest-git-1.3.1 194
+MD5 1f0979438349a5ed49c73b480c8e0910 files/digest-git-1.3.2 540
+MD5 13885e4e180b1279f0245d66ddba22f2 files/digest-git-1.3.3 194
 MD5 5c96e23fef078682e648254d9197f618 files/git-daemon.confd 376
-RMD160 70cbd0b87cbd2ce6b494f07ead732f33f7ea623f files/git-daemon.confd 376
-SHA256 266045958a3a4072529f25208d1f84a178bbb10aa0b6fa19543f7a62f9a5e3fe files/git-daemon.confd 376
-AUX git-daemon.initd 526 RMD160 1ee04d8a5636593b41d2864afbad076ee6d770aa SHA1 7f35b65575a880f10d4c2f355e3feca589ee6839 SHA256 8915a900a602df046f091154fed378cb4ab62983a6ab2857653933a02e6f86ec size 526
 MD5 ad6b9193f41375013fad4455bf1acda7 files/git-daemon.initd 526
-RMD160 1ee04d8a5636593b41d2864afbad076ee6d770aa files/git-daemon.initd 526
-SHA256 8915a900a602df046f091154fed378cb4ab62983a6ab2857653933a02e6f86ec files/git-daemon.initd 526
-DIST git-1.1.6.tar.bz2 478466 size 478466
-DIST git-1.2.4.tar.bz2 501293 size 501293
-DIST git-1.2.6.tar.bz2 501550 size 501550
-DIST git-1.3.1.tar.bz2 620670 size 620670
-DIST git-1.3.2.tar.bz2 622771 RMD160 385ab01cdd6b1d4ad45dca2a20025d925717f3cd SHA256 192487c3f4ca7f6f487a1382f5b80a723d39e8384670e66dbcc670ee98b51b57 size 622771
-DIST git-html-1.1.6.tar.bz2 214805 size 214805
-DIST git-html-1.2.4.tar.bz2 203114 size 203114
-DIST git-html-1.2.5.tar.bz2 206946 size 206946
-DIST git-html-1.3.1.tar.bz2 213157 size 213157
-DIST git-html-1.3.2.tar.bz2 216344 size 216344
-DIST git-man-1.1.6.tar.bz2 69088 size 69088
-DIST git-man-1.2.4.tar.bz2 74577 size 74577
-DIST git-man-1.2.5.tar.bz2 75972 size 75972
-DIST git-man-1.3.1.tar.bz2 79409 size 79409
-DIST git-man-1.3.2.tar.bz2 80062 RMD160 33fa1591262430deb7dad52889465725b7abe052 SHA256 e4546f870fb69534fccd67d73dc975f3dbe4483c475ff5bf98d8cfa3e873e8ed size 80062
-EBUILD git-1.1.6.ebuild 3145 RMD160 d1f603950fcdb7b13bf5e7cb25f9059db3fa3a9b SHA1 45b07ed60f37062ca7debf0b918d1c4aed967286 SHA256 41cae18dded68c7240142321c2fb0886baefb625a6a36eddb8fd028e4393e996 size 3145
 MD5 d706b2feec7dc3f145eb36492d0e8190 git-1.1.6.ebuild 3145
-RMD160 d1f603950fcdb7b13bf5e7cb25f9059db3fa3a9b git-1.1.6.ebuild 3145
-SHA256 41cae18dded68c7240142321c2fb0886baefb625a6a36eddb8fd028e4393e996 git-1.1.6.ebuild 3145
-EBUILD git-1.2.4.ebuild 3207 RMD160 1947d9984df695c7c044ff3f16958190c645676c SHA1 df7fb9f8256353834e54acfddeaaba028b8c5928 SHA256 e5b5cca9803d8075b1440abdbbc01f40c0db690f15ec8c88751d3c394088eaeb size 3207
 MD5 f027261e46d55cdae8b09d506fe6889e git-1.2.4.ebuild 3207
-RMD160 1947d9984df695c7c044ff3f16958190c645676c git-1.2.4.ebuild 3207
-SHA256 e5b5cca9803d8075b1440abdbbc01f40c0db690f15ec8c88751d3c394088eaeb git-1.2.4.ebuild 3207
-EBUILD git-1.2.6.ebuild 3201 RMD160 e3d1f6c40d02a45563be9133ca06156c2c7af1e3 SHA1 079be6a088ae47c89095dd7f1b6feca49e84d29a SHA256 5b3698f1782b4d62c9e958c12c1fba091cb02069af7b1aa2fc89c84fbeaa6025 size 3201
 MD5 085ba9af7e4364fa103c97e2be1d14b1 git-1.2.6.ebuild 3201
-RMD160 e3d1f6c40d02a45563be9133ca06156c2c7af1e3 git-1.2.6.ebuild 3201
-SHA256 5b3698f1782b4d62c9e958c12c1fba091cb02069af7b1aa2fc89c84fbeaa6025 git-1.2.6.ebuild 3201
-EBUILD git-1.3.1.ebuild 3203 RMD160 0fe74f9a87546ba192fc6be2f670e7c7ab867232 SHA1 0e3ccb840d6e631cddb2238e2f3a7c4fad390bb1 SHA256 5455a6d1c78376c3aafc22d2b8395f2fb04ceb65ab43758d64f0c6f68bc98338 size 3203
 MD5 d45899cfbef88c9ce8d046bb4af1bb7e git-1.3.1.ebuild 3203
-RMD160 0fe74f9a87546ba192fc6be2f670e7c7ab867232 git-1.3.1.ebuild 3203
-SHA256 5455a6d1c78376c3aafc22d2b8395f2fb04ceb65ab43758d64f0c6f68bc98338 git-1.3.1.ebuild 3203
-EBUILD git-1.3.2.ebuild 3217 RMD160 2eac9983b3a9aea999e7c78be727e3bc43a14406 SHA1 931fdf39749279c4b0c9bb61639a7166ad5c4ce9 SHA256 10bf81be016378ccf84e603c98ebe46e933209972cf7d54744c9e3b63bb6566c size 3217
 MD5 a40d1ba7e3f668ea33dbb4b5ad729697 git-1.3.2.ebuild 3217
-RMD160 2eac9983b3a9aea999e7c78be727e3bc43a14406 git-1.3.2.ebuild 3217
-SHA256 10bf81be016378ccf84e603c98ebe46e933209972cf7d54744c9e3b63bb6566c git-1.3.2.ebuild 3217
-MISC ChangeLog 14200 RMD160 654dbc01e1b7b12c1bbec4fd91db2e0d18e818ff SHA1 44e2ce0db563886aa3dc9afeec79db7a99bce990 SHA256 0f1bc0b0c410fa2946bb78dcc29cc1fa8638fb312b6b80202b7ce60b8d375477 size 14200
-MD5 8cb5c012654dd17ea8fb5ead0fa85172 ChangeLog 14200
-RMD160 654dbc01e1b7b12c1bbec4fd91db2e0d18e818ff ChangeLog 14200
-SHA256 0f1bc0b0c410fa2946bb78dcc29cc1fa8638fb312b6b80202b7ce60b8d375477 ChangeLog 14200
-MISC metadata.xml 316 RMD160 36226a2a56554857aeb7aa6224113a80050123dd SHA1 b2ca4259af67357aea808ee568fabbaa34fb2c28 SHA256 ac792195cc96be302d2a088d6cef6a60f8f9ecd9fe623e3c44be60fff6bdb634 size 316
+MD5 a40d1ba7e3f668ea33dbb4b5ad729697 git-1.3.3.ebuild 3217
 MD5 3526aab52e4319669bc1064d4d4ac83a metadata.xml 316
-RMD160 36226a2a56554857aeb7aa6224113a80050123dd metadata.xml 316
-SHA256 ac792195cc96be302d2a088d6cef6a60f8f9ecd9fe623e3c44be60fff6bdb634 metadata.xml 316
-MD5 8623111b91d1c7d14999e96d857384d9 files/digest-git-1.1.6 194
-RMD160 fbac2e5ffb4ef4e4aaa4db884b16e9fcbc579fdd files/digest-git-1.1.6 194
-SHA256 6f691c8710718b43a5034d3b31797c09722e443d11e109e943f751d223e9403a files/digest-git-1.1.6 194
-MD5 84d4ff578de4ab1679708b38a45bc5a9 files/digest-git-1.2.4 194
-RMD160 5064fd8bb0823ba55b78d609998ac98db99586fb files/digest-git-1.2.4 194
-SHA256 a8ed6fc4488464337753a035aaad2e2b18816d4245c18f3c02a04aeda8924761 files/digest-git-1.2.4 194
-MD5 7a453ab63b1d3cb334fc936938036ac3 files/digest-git-1.2.6 194
-RMD160 ed53dcb0c76b3a32173c483f351457ae8be3ea11 files/digest-git-1.2.6 194
-SHA256 8b34ce69c9cbca67f587e89c858d233b826a876331cf873e87f741399b172131 files/digest-git-1.2.6 194
-MD5 ef08d603f626491bac6c38dd89f684aa files/digest-git-1.3.1 194
-RMD160 2897e729fa6a24c4a7cbb8e87538f195553bfe35 files/digest-git-1.3.1 194
-SHA256 577dbcaffd8b2accee7cd2c3f36e90cacb1683adcc0c88d330345b45bb202303 files/digest-git-1.3.1 194
-MD5 1f0979438349a5ed49c73b480c8e0910 files/digest-git-1.3.2 540
-RMD160 2d1e07d615347518026f5c4ce855a415d0a58d01 files/digest-git-1.3.2 540
-SHA256 2590a657c8a4583ba685281e18422d0600c2e9116d36e85cfec3163f85fda8d6 files/digest-git-1.3.2 540
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEZwzoAiZjviIA2XgRAkfJAJ47Lr9ANx9odMsQ/f1F2vRfIDCxtACfdzHt
-OjY3RDLiR6cbVSlS1epPzho=
-=1aar
------END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.3.3 b/dev-util/git/files/digest-git-1.3.3
new file mode 100644
index 000000000000..e14134269704
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.3.3
@@ -0,0 +1,3 @@
+MD5 b4297c57969ee0740746261aaf493195 git-1.3.3.tar.bz2 623559
+MD5 eb34311d9fb3811d85bdcdc1e6f7604a git-html-1.3.3.tar.bz2 216532
+MD5 c23205afdad02be2c64172c026a77b4e git-man-1.3.3.tar.bz2 80305
diff --git a/dev-util/git/git-1.3.3.ebuild b/dev-util/git/git-1.3.3.ebuild
new file mode 100644
index 000000000000..22329fd8ecbf
--- /dev/null
+++ b/dev-util/git/git-1.3.3.ebuild
@@ -0,0 +1,115 @@
+# 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.3.3.ebuild,v 1.1 2006/05/17 08:04:05 ferdy Exp $
+
+inherit python toolchain-funcs eutils
+
+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://gentoo/${PN}-man-${DOC_VER}.tar.bz2
+		doc? ( mirror://gentoo/${PN}-html-${DOC_VER}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="mozsha1 ppcsha1 doc curl X webdav"
+
+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 )"
+
+# 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"
+}
+
+src_install() {
+	make ${MY_MAKEOPTS} DESTDIR=${D} prefix=/usr install || die "make install failed"
+
+	use X || rm ${D}/usr/bin/gitk
+
+	doman ${WORKDIR}/${PN}-man-${DOC_VER}/man?/*
+
+	dodoc README COPYING Documentation/SubmittingPatches
+	if use doc ; then
+		dodoc Documentation/technical/*
+		dodir /usr/share/doc/${PF}/html
+		cp -r ${WORKDIR}/${PN}-html-${DOC_VER}/* ${D}/usr/share/doc/${PF}/html
+	fi
+
+	newinitd "${FILESDIR}/git-daemon.initd" git-daemon
+	newconfd "${FILESDIR}/git-daemon.confd" git-daemon
+}
+
+src_test() {
+	cd ${S}
+	make ${MY_MAKEOPTS} test || die "tests failed"
+}
+
+pkg_postinst() {
+	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 use the included CVS server you will need to install"
+	einfo "dev-perl/DBI and dev-perl/DBD-SQLite"
+	einfo
+}