New upstream version

Package-Manager: portage-2.0.53

4 files changed, 128 insertions, 6 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 3d4003ef5a0f..0299619caa7b 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/git
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.58 2005/12/28 13:22:05 ferdy Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.59 2006/01/09 08:59:52 ferdy Exp $
+
+*git-1.1.0 (09 Jan 2006)
+
+  09 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.1.0.ebuild:
+  New upstream version
 
 *git-1.0.6 (28 Dec 2005)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 23b52b1b391d..2da3763ee67b 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,22 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 96bd8d5cf0c498466366a1c1fa703e97 ChangeLog 9111
+MD5 3beda77b259002356b6aeda10b797adb ChangeLog 9233
 MD5 8ebc37d29c321b95a3c0ae51ebee4d4d files/digest-git-0.7 59
 MD5 62316f61a79143fdaf1e9f747d1ddf03 files/digest-git-0.99.8a 69
 MD5 ede5785dc3531d89fe224f16c233e8d2 files/digest-git-0.99.9n 64
 MD5 9a11cbe923c58faff7973a8c5c028cd4 files/digest-git-1.0.6 194
+MD5 88167ba468fc8ed2d45539b9d2887e6c files/digest-git-1.1.0 194
 MD5 5c96e23fef078682e648254d9197f618 files/git-daemon.confd 376
 MD5 ad6b9193f41375013fad4455bf1acda7 files/git-daemon.initd 526
 MD5 edebd592261315b29a6b903b414573d2 git-0.7.ebuild 1312
 MD5 d35a0c0793dbfc65191588d2eca405d1 git-0.99.8a.ebuild 2835
 MD5 836fd3f0a31e670e7cdb6350d38f5323 git-0.99.9n.ebuild 3342
 MD5 ad6e42cb0d33b430c8f21c46aaf151a8 git-1.0.6.ebuild 3199
+MD5 9f90921f043c1b7179c3ec945c7a4faa git-1.1.0.ebuild 3151
 MD5 3526aab52e4319669bc1064d4d4ac83a metadata.xml 316
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDspGPViELBEf1JB0RAlGrAJ9eZvYCJzLT3nb5msFI53bL2p1PuACggzKa
-fqMHwx/X9ZQiXcv1tpOSpgA=
-=8E1F
+iD8DBQFDwiYaViELBEf1JB0RAu8eAKCAq/hpxOwWGi8uFxifwHzKA17QowCdFlhP
+8dt858GII5fpH1jfE1TgSLk=
+=3xcR
 -----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.1.0 b/dev-util/git/files/digest-git-1.1.0
new file mode 100644
index 000000000000..81b1fba07864
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.1.0
@@ -0,0 +1,3 @@
+MD5 a64303be08f0faec4737f619cbb63d5c git-1.1.0.tar.bz2 477526
+MD5 291a0ce11c38872ecb7108b2fd0c69d7 git-html-1.1.0.tar.bz2 202385
+MD5 44e34680b5f1eb0186599a56fffcdd14 git-man-1.1.0.tar.bz2 66316
diff --git a/dev-util/git/git-1.1.0.ebuild b/dev-util/git/git-1.1.0.ebuild
new file mode 100644
index 000000000000..361d0a99c973
--- /dev/null
+++ b/dev-util/git/git-1.1.0.ebuild
@@ -0,0 +1,112 @@
+# 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.1.0.ebuild,v 1.1 2006/01/09 08:59:52 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="http://kernel.org/pub/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 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="mozsha1 ppcsha1 doc curl tcltk gitsendemail 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
+		tcltk? ( dev-lang/tk )
+		dev-perl/String-ShellQuote
+		gitsendemail? ( dev-perl/Mail-Sendmail dev-perl/Email-Valid )"
+
+# 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
+
+	use gitsendemail && 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"
+
+	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 tcltk || 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
+}