new upstream version

Package-Manager: portage-2.0.53

4 files changed, 127 insertions, 5 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 73f46bf7ab64..40197dd1a50c 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.65 2006/01/20 07:37:45 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.66 2006/01/28 17:37:57 ferdy Exp $
+
+*git-1.1.5 (28 Jan 2006)
+
+  28 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.1.5.ebuild:
+  new upstream version
 
 *git-1.1.4 (20 Jan 2006)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index b054fb1836ad..8d211f9cff9f 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,13 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 975ead5e8d1f22be261a4f715c24f635 ChangeLog 10305
+MD5 0580e3ddc57fcbee96d5abc52155dd79 ChangeLog 10427
 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 7802209c7fb6646dd6c3a252a4e77db0 files/digest-git-1.1.3 194
 MD5 3283d637c9556057a122714d806af8d7 files/digest-git-1.1.4 194
+MD5 47dde3895987f6310e6a1543e752be25 files/digest-git-1.1.5 194
 MD5 5c96e23fef078682e648254d9197f618 files/git-daemon.confd 376
 MD5 ad6b9193f41375013fad4455bf1acda7 files/git-daemon.initd 526
 MD5 edebd592261315b29a6b903b414573d2 git-0.7.ebuild 1312
@@ -16,11 +17,12 @@ MD5 836fd3f0a31e670e7cdb6350d38f5323 git-0.99.9n.ebuild 3342
 MD5 ad6e42cb0d33b430c8f21c46aaf151a8 git-1.0.6.ebuild 3199
 MD5 680bc86005af5083ed24702cec5f3230 git-1.1.3.ebuild 3145
 MD5 a8df808e1bda18b6e1089f65acdad413 git-1.1.4.ebuild 3147
+MD5 8d5a98a1f11ac781158a9933571eb7ef git-1.1.5.ebuild 3145
 MD5 3526aab52e4319669bc1064d4d4ac83a metadata.xml 316
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD0JNaViELBEf1JB0RAim8AJ9E1zyBiyXaOux+Uz+gNsWBLbT3uACgg9yJ
-xHWDv2PA2Lx3oz37a1GoZaE=
-=3zUO
+iD8DBQFD26wJViELBEf1JB0RAgu1AJ93Lsh52WL7vd/+edAn6H/EuvH2dACfbPs2
+GM6V6f7WnzSQbL+NMTX2704=
+=1hdj
 -----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.1.5 b/dev-util/git/files/digest-git-1.1.5
new file mode 100644
index 000000000000..8ecd5e9357f9
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.1.5
@@ -0,0 +1,3 @@
+MD5 81a81d23b7bd4009b278670ff9a2e14d git-1.1.5.tar.bz2 478090
+MD5 da6c69b628433d2635ccb912d080628b git-html-1.1.5.tar.bz2 214774
+MD5 ac4a61234d37f271b96249bf83a6a05c git-man-1.1.5.tar.bz2 69008
diff --git a/dev-util/git/git-1.1.5.ebuild b/dev-util/git/git-1.1.5.ebuild
new file mode 100644
index 000000000000..45282818cc10
--- /dev/null
+++ b/dev-util/git/git-1.1.5.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.5.ebuild,v 1.1 2006/01/28 17:37:57 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 ~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
+}