Version bump to version 1.4.1. No gitweb installed as of yet.

Package-Manager: portage-2.1.1_pre2-r1

4 files changed, 187 insertions, 5 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 5c68af7bae73..7bf197238793 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.100 2006/06/28 17:37:22 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.101 2006/07/02 14:01:09 flameeyes Exp $
+
+*git-1.4.1 (02 Jul 2006)
+
+  02 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> +git-1.4.1.ebuild:
+  Version bump to version 1.4.1. No gitweb installed as of yet.
 
   28 Jun 2006; Fabian Groffen <grobian@gentoo.org> git-1.4.0-r1.ebuild:
   Marked ~ppc-macos
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 0a4443af45f4..5fbd63ab20d6 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 70git-gentoo.el 88 RMD160 fe9b87bdbe14141580745063092a5d08924f23fd SHA1 332f9cbf5a1dbb176e54646fa23aa140aee917f7 SHA256 7589206de5ea91e912e0332f7dc503689d348cb752e17ba84a724987c4bbe04a
 MD5 626503da08b9af48199596c83d6f49b3 files/70git-gentoo.el 88
 RMD160 fe9b87bdbe14141580745063092a5d08924f23fd files/70git-gentoo.el 88
@@ -14,14 +17,17 @@ DIST git-1.1.6.tar.bz2 478466 RMD160 c88fb437ff78955cc54256488c18125adfc6ddef SH
 DIST git-1.2.4.tar.bz2 501293 RMD160 c804a9339bfe13efdf4deea3e7be41c44bbc21cc SHA1 883cbf66ab7f631e099e3dae6c0caf80e1c8c703 SHA256 755b946a294d06d5a098eb9362612597aaabdc506ff8d65260dd4e9d34092a37
 DIST git-1.3.3.tar.bz2 623559 RMD160 6d46164ddc05653076aa566287da469a415359bb SHA1 295acc9d1292d8c8f98f9e291b39e440cb6c442d SHA256 44acb56ef73247175968c731eb4d08cf56865fb9bd84dab09e94a0b2cd99f8f0
 DIST git-1.4.0.tar.bz2 717181 RMD160 1010a0818efd5309f1a0ba1228f953f97d575038 SHA1 77745c27ffb2af6e4f43e0f800436799b633f1a2 SHA256 abdb48005e7b2f8988498a6c6724e2e6f6162f30915f591be6586df57dd3f2fa
+DIST git-1.4.1.tar.bz2 752929 RMD160 4eb93156ed3c6efec2cd7f1081005491ccf89502 SHA1 efac9c930143504daeff6fc1273dfddbee646ab7 SHA256 f9adef149a28e1a5b58a585aa68f9bf5d358b519b2c5d854731de8f634bab028
 DIST git-html-1.1.6.tar.bz2 214805 RMD160 4a4cb45ae7ec212a15c63e6f5554b52e14797d1a SHA1 6ad1937ee897d517357c2a506b04325ebe0f424d SHA256 ae097fdd46d236e4897dc16a6fdec897b77ebd4c2f9d69b5c97814704aa31eac
 DIST git-html-1.2.4.tar.bz2 203114 RMD160 7b721fb0ce390f35fab231a52e9aa38cd7566de9 SHA1 98d51f11287a1aa0eb1d8aaa5ed5c12a793fdc93 SHA256 ef117a23966b0cc1d36e2d6b5bf0c12c15d28ca32bce7944636acb829a37ab1a
 DIST git-html-1.3.3.tar.bz2 216532 RMD160 9011b25399c38dee312288b9d4385485bf5a8053 SHA1 c4829d86fd84f66f9f306279c8584a886dd193ac SHA256 46df206de0f83beba964a79e22e3697ea0784a0cdc0b2cb466b0f0fef8b99980
 DIST git-htmldocs-1.4.0.tar.bz2 262492 RMD160 b98ce629edc28cf8933e0a6f4d59df07d68cf636 SHA1 b9f9b535304b5dc5c9fd11d106a28680bf62d4b5 SHA256 c8d8dffefe3dfc7ec190ee7502d20aa36f150ea633d5621b4a55156672a2ea97
+DIST git-htmldocs-1.4.1.tar.bz2 263145 RMD160 a4ef9fa7981f7555cd1bb5bf464fc285ccca5391 SHA1 ba6ad0eb3a9d98c87b2099c68fcb185f11a797d8 SHA256 27877133e66f22e616b37c62aad3fbaa97457d7e9628c48eeec8a10bba6eeaa8
 DIST git-man-1.1.6.tar.bz2 69088 RMD160 4e8bc8067c903caa8ed9b9a6a04c89ab15483aab SHA1 d90dee09b0d52067fc4ebe8a1855d31ea0378815 SHA256 68042818e789b08a2f8c913c5d7deb5f6f41f6a5c9b989898a98eed61c6e5c72
 DIST git-man-1.2.4.tar.bz2 74577 RMD160 a9cfadc61474fe8398933ac158064da38e3881b1 SHA1 74f9ab50f480ad7db0e1cf01402c4528c3c9fa0b SHA256 85e5706b1a551e988a6dc0dbafb27b9651388ad781a3d1b256e8a11dc533aeb3
 DIST git-man-1.3.3.tar.bz2 80305 RMD160 5160f22045ce203d35b585b84003988fb8ace3ca SHA1 3b0c2330fde00ace4de00e93f2e264344325344b SHA256 d68ab285813f1e14a898bb509405fa3f82788aa6a848d0ff8dc70ef928513185
 DIST git-manpages-1.4.0.tar.bz2 83698 RMD160 6bfb8fa2e1ae34fd4576e84fee720a239323a65d SHA1 bed6974f210dac70f85bf18f2e3c5f7097d0eeed SHA256 f275b1a3fb1eab0368dbb704628e76a4c34a0724ddece1de11b2f53ee327d5d4
+DIST git-manpages-1.4.1.tar.bz2 83968 RMD160 a0fa8eb80120c1da11638a4700f4685e5bccd41a SHA1 e9ca40a87da4bcf93418bd1c4ac55d0f86342f31 SHA256 a406ac88362ec4c43d5528f09e778b362fbd0e277f887c9043d133d038204ab4
 EBUILD git-1.1.6.ebuild 3145 RMD160 d1f603950fcdb7b13bf5e7cb25f9059db3fa3a9b SHA1 45b07ed60f37062ca7debf0b918d1c4aed967286 SHA256 41cae18dded68c7240142321c2fb0886baefb625a6a36eddb8fd028e4393e996
 MD5 d706b2feec7dc3f145eb36492d0e8190 git-1.1.6.ebuild 3145
 RMD160 d1f603950fcdb7b13bf5e7cb25f9059db3fa3a9b git-1.1.6.ebuild 3145
@@ -42,10 +48,14 @@ EBUILD git-1.4.0.ebuild 3826 RMD160 b8b3b39564f4f380be980116d8d9f850f0996877 SHA
 MD5 f38ef3bbbbb2dc617f4378b4494ab75e git-1.4.0.ebuild 3826
 RMD160 b8b3b39564f4f380be980116d8d9f850f0996877 git-1.4.0.ebuild 3826
 SHA256 1e9182eb29262087d2024882bb87f37ab256e857b459e12f956d7028d26be8b8 git-1.4.0.ebuild 3826
-MISC ChangeLog 15092 RMD160 7030f20efbf4db654ac3b606cafa7f6e6b457ff5 SHA1 e64ad93e56aaf73ef01e81469dd976147e11cba7 SHA256 d8f60a43dd884dbf1a58d758eb1868066571471b9a892b4b5280c674bd4eba8d
-MD5 ea324c0733d9d667f5dae8c280215b78 ChangeLog 15092
-RMD160 7030f20efbf4db654ac3b606cafa7f6e6b457ff5 ChangeLog 15092
-SHA256 d8f60a43dd884dbf1a58d758eb1868066571471b9a892b4b5280c674bd4eba8d ChangeLog 15092
+EBUILD git-1.4.1.ebuild 4314 RMD160 8777357c52439424f87332dcf266277faa007850 SHA1 c34aface0c29e68ab873317be16dcf7ffc603882 SHA256 d4f90a6dbf322d5c75fdb76ec502b73553c036e2263570ccb704b36f0c3353ee
+MD5 f5a9dace6db28a8c84313c4396b8cf57 git-1.4.1.ebuild 4314
+RMD160 8777357c52439424f87332dcf266277faa007850 git-1.4.1.ebuild 4314
+SHA256 d4f90a6dbf322d5c75fdb76ec502b73553c036e2263570ccb704b36f0c3353ee git-1.4.1.ebuild 4314
+MISC ChangeLog 15257 RMD160 caeb4fcf290224eb64a61c76dbb872534f728757 SHA1 a2c580092cd0fdacec32eb3c21724ff007785b6e SHA256 89e9e28a852abd9a1a0f5a831ff79401c5c3718fa1c261043c7671f4fddfc81d
+MD5 320b7230c215f93a1ffc339d831d8260 ChangeLog 15257
+RMD160 caeb4fcf290224eb64a61c76dbb872534f728757 ChangeLog 15257
+SHA256 89e9e28a852abd9a1a0f5a831ff79401c5c3718fa1c261043c7671f4fddfc81d ChangeLog 15257
 MISC metadata.xml 255 RMD160 db414d29c445e388d486f826b368b5359b74f72d SHA1 0317bb4c83bba580ddb586efe8a929b85759d0d2 SHA256 45f65b01b99f13e87c53843765ab287065988ab80e675287cdcc81ce3e22f9a2
 MD5 c2a7223a6caa6908d13db012ce74b388 metadata.xml 255
 RMD160 db414d29c445e388d486f826b368b5359b74f72d metadata.xml 255
@@ -65,3 +75,13 @@ SHA256 e3f751c0ad994c4f8b7d2b93d6628b1ba94ba03dc34252ff58a59ad5285ebc37 files/di
 MD5 35a2e70f5779dac88ed463374151c14e files/digest-git-1.4.0-r1 747
 RMD160 36c511ba4963f5bc211b46878fa36344f42f2551 files/digest-git-1.4.0-r1 747
 SHA256 e3f751c0ad994c4f8b7d2b93d6628b1ba94ba03dc34252ff58a59ad5285ebc37 files/digest-git-1.4.0-r1 747
+MD5 8776a24e63c24ea43dc9d23096fd2d0f files/digest-git-1.4.1 747
+RMD160 7a7a0ae1b7ad2bbec1ddc35acda27bb6565c8044 files/digest-git-1.4.1 747
+SHA256 1bde7a8504e6d20b4b04e7959532633efe5f75b6273b60f7ccc86345e8f6058b files/digest-git-1.4.1 747
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEp9G1AiZjviIA2XgRAsnIAJ9jJYbBsj5nuy4EJpP2oRoMInL3FQCgmcmA
+P2Lxqf7u1STQtwkLRy8gm5M=
+=Nw2P
+-----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.4.1 b/dev-util/git/files/digest-git-1.4.1
new file mode 100644
index 000000000000..c3fec4897ca1
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.4.1
@@ -0,0 +1,9 @@
+MD5 e8f5324ed90a7337f3983db1ec95b666 git-1.4.1.tar.bz2 752929
+RMD160 4eb93156ed3c6efec2cd7f1081005491ccf89502 git-1.4.1.tar.bz2 752929
+SHA256 f9adef149a28e1a5b58a585aa68f9bf5d358b519b2c5d854731de8f634bab028 git-1.4.1.tar.bz2 752929
+MD5 5e20d82a55273a622301d59420128471 git-htmldocs-1.4.1.tar.bz2 263145
+RMD160 a4ef9fa7981f7555cd1bb5bf464fc285ccca5391 git-htmldocs-1.4.1.tar.bz2 263145
+SHA256 27877133e66f22e616b37c62aad3fbaa97457d7e9628c48eeec8a10bba6eeaa8 git-htmldocs-1.4.1.tar.bz2 263145
+MD5 ebead05e2dfec6950eb18447f92b5ccd git-manpages-1.4.1.tar.bz2 83968
+RMD160 a0fa8eb80120c1da11638a4700f4685e5bccd41a git-manpages-1.4.1.tar.bz2 83968
+SHA256 a406ac88362ec4c43d5528f09e778b362fbd0e277f887c9043d133d038204ab4 git-manpages-1.4.1.tar.bz2 83968
diff --git a/dev-util/git/git-1.4.1.ebuild b/dev-util/git/git-1.4.1.ebuild
new file mode 100644
index 000000000000..fba42fbcf25a
--- /dev/null
+++ b/dev-util/git/git-1.4.1.ebuild
@@ -0,0 +1,148 @@
+# 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.1.ebuild,v 1.1 2006/07/02 14:01:09 flameeyes Exp $
+
+inherit python toolchain-funcs eutils elisp-common
+
+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 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="curl doc emacs gtk mozsha1 ppcsha1 webdav X"
+
+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 )
+		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}
+}
+
+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"
+	emake -C contrib/git-svn/ git-svn || die "make git-svn 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 X || 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
+
+	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
+
+	dobin contrib/git-svn/git-svn
+	dodoc contrib/git-svn/git-svn.txt
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+}
+
+src_test() {
+	cd "${S}"
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	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 manage subversion repositories using git, consider"
+	einfo "using git-svn. You should install dev-util/subversion before"
+	einfo
+	einfo "If you want to import a quilt series into git, donsider using the"
+	einfo "git-quiltimport command. You should install dev-util/quilt 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
+}
+
+pkg_postrm() {
+	# regenerate site-gentoo if we are merged USE=emacs and unmerged
+	# USE=-emacs
+	has_version virtual/emacs && elisp-site-regen
+}