Revision and version bump. Remove 1.5.0.6

(Portage version: 2.1.2.2)

6 files changed, 187 insertions, 11 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 8b6879d4d9d3..b2062270e2e1 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.176 2007/03/29 12:43:07 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.177 2007/04/04 10:43:02 ferdy Exp $
+
+*git-1.5.1 (04 Apr 2007)
+*git-1.5.0.7 (04 Apr 2007)
+
+  04 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.6.ebuild,
+  +git-1.5.0.7.ebuild, +git-1.5.1.ebuild:
+  Revision and version bump. Remove 1.5.0.6
 
 *git-1.5.0.6 (29 Mar 2007)
 
diff --git a/dev-util/git/files/digest-git-1.5.0.6 b/dev-util/git/files/digest-git-1.5.0.6
deleted file mode 100644
index 45ddd608ab59..000000000000
--- a/dev-util/git/files/digest-git-1.5.0.6
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 25a20a1c305e7791e5101424a048b6d2 git-1.5.0.6.tar.bz2 1052288
-RMD160 ad67f2b6495d1664248c15784eda17e46816285d git-1.5.0.6.tar.bz2 1052288
-SHA256 3a47a2940dabdb83495a7fcd32196844689eb154467d5bc9cf273c600e553264 git-1.5.0.6.tar.bz2 1052288
-MD5 8ddb85b573cd5a804aa322372ddbc571 git-htmldocs-1.5.0.6.tar.bz2 449334
-RMD160 37b44e000d1e23fc2eb2518831053900557d2de4 git-htmldocs-1.5.0.6.tar.bz2 449334
-SHA256 aa273393217ae4413204e494adb57588d0a6a881933f4bd1a7138b9ef6b33cda git-htmldocs-1.5.0.6.tar.bz2 449334
-MD5 f32dd471f102be4ff7ed7b273eee90c4 git-manpages-1.5.0.6.tar.bz2 126880
-RMD160 723a5ffe88ee4c2aa2dfebe7c7c263a2f32fdcd6 git-manpages-1.5.0.6.tar.bz2 126880
-SHA256 501a3ef4d56a342aaef10d04be5a105a1e466457d1f3196d64faa29ec4ddeb85 git-manpages-1.5.0.6.tar.bz2 126880
diff --git a/dev-util/git/files/digest-git-1.5.0.7 b/dev-util/git/files/digest-git-1.5.0.7
new file mode 100644
index 000000000000..f4d7cb06c147
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.5.0.7
@@ -0,0 +1,9 @@
+MD5 f3144aef04e479d54fbf47072ea58dc1 git-1.5.0.7.tar.bz2 1053367
+RMD160 c8ad03381005152d2513e0d12099d976ccad42a9 git-1.5.0.7.tar.bz2 1053367
+SHA256 6fae7d1de3f4ec2b04423d6af194bf75c9262785997c80fc4e1cd5e62b1b7ada git-1.5.0.7.tar.bz2 1053367
+MD5 3fcc9d2118a50fe20b721289260816a5 git-htmldocs-1.5.0.7.tar.bz2 450009
+RMD160 0292aa6e166b5ccc3dd89eaeb0b56ab9a98b25f8 git-htmldocs-1.5.0.7.tar.bz2 450009
+SHA256 9f9dd3beb5b267080a556239bb0a99b5d2ac396cdd15b38c932976a0ec24b823 git-htmldocs-1.5.0.7.tar.bz2 450009
+MD5 74f8792f0ceae63e8ec74fb14598b20d git-manpages-1.5.0.7.tar.bz2 126927
+RMD160 37028035ea1aca310c79bd079ae1d1e65ca9fe32 git-manpages-1.5.0.7.tar.bz2 126927
+SHA256 df6879361c0e671e3a228e3bd9954d9f712a7c74e9e151e4ca89bb6037d4dbba git-manpages-1.5.0.7.tar.bz2 126927
diff --git a/dev-util/git/files/digest-git-1.5.1 b/dev-util/git/files/digest-git-1.5.1
new file mode 100644
index 000000000000..7b7ed8349177
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.5.1
@@ -0,0 +1,9 @@
+MD5 d60eb458742b6da332f80f3bba68de8f git-1.5.1.tar.bz2 1116847
+RMD160 9acc58b4ae03e01b08bef014adc198168fc7eaa0 git-1.5.1.tar.bz2 1116847
+SHA256 e033d99b951f287548360799deb006d0f565193e3f24a60e63b3978164a6cb8b git-1.5.1.tar.bz2 1116847
+MD5 0da84ad3896cb81b53361817662bf33f git-htmldocs-1.5.1.tar.bz2 465654
+RMD160 e3aaf861db1534e89c594e94ae81e4731cb3b4e6 git-htmldocs-1.5.1.tar.bz2 465654
+SHA256 611643c1db52ce106dfc139465deae10dc2667d7c238365974bedb6e371a3cce git-htmldocs-1.5.1.tar.bz2 465654
+MD5 c09c1b68b9e7dee7b89781b8e0e10790 git-manpages-1.5.1.tar.bz2 131561
+RMD160 47825ae5708b5e5fd81dc6c297d89e084230e96a git-manpages-1.5.1.tar.bz2 131561
+SHA256 4b85b57e07828f0eac2c0fddb4ade4b8efcc0bfdaa7a090752a8d07f19c299ea git-manpages-1.5.1.tar.bz2 131561
diff --git a/dev-util/git/git-1.5.0.6.ebuild b/dev-util/git/git-1.5.0.7.ebuild
index ededd14fb12f..1e480136c90f 100644
--- a/dev-util/git/git-1.5.0.6.ebuild
+++ b/dev-util/git/git-1.5.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.0.6.ebuild,v 1.1 2007/03/29 12:43:07 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.0.7.ebuild,v 1.1 2007/04/04 10:43:02 ferdy Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
diff --git a/dev-util/git/git-1.5.1.ebuild b/dev-util/git/git-1.5.1.ebuild
new file mode 100644
index 000000000000..90b9cd5b4232
--- /dev/null
+++ b/dev-util/git/git-1.5.1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.1.ebuild,v 1.1 2007/04/04 10:43:02 ferdy Exp $
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker"
+HOMEPAGE="http://kernel.org/pub/software/scm/git/"
+SRC_URI="mirror://kernel/software/scm/git/${MY_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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="curl doc elibc_uclibc emacs gtk mozsha1 perl 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
+		perl? ( dev-perl/Error )
+		tk? ( dev-lang/tk )
+		gtk? ( >=dev-python/pygtk-2.6 )"
+
+S="${WORKDIR}/${MY_P}"
+
+# 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"
+
+	use elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease"
+
+	export MY_MAKEOPTS=${myopts}
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}"/${PN}-1.5.0-symlinks.patch
+
+	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):" \
+		-e 's:ln :ln -s :g' \
+		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
+	# Stupid CVS won't let some people commit as root
+	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
+	elog "These additional scripts need some dependencies:"
+	echo
+	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" "dev-perl/DBD-SQLite"
+	showpkgdeps git-instaweb "|| ( www-servers/lighttpd net-www/apache(SLOT=2) )"
+	showpkgdeps git-send-email "USE=perl"
+	showpkgdeps git-remote "USE=perl"
+	echo
+}
+
+pkg_postrm() {
+	# regenerate site-gentoo if we are merged USE=emacs and unmerged
+	# USE=-emacs
+	has_version virtual/emacs && elisp-site-regen
+}