Version bump per bug #231380.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc4-00103-g1beee8d x86_64

3 files changed, 291 insertions, 2 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index edc7826770fb..4bec926d151a 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.279 2008/06/26 21:42:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.280 2008/07/10 18:44:57 robbat2 Exp $
+
+*git-1.5.6.2 (10 Jul 2008)
+
+  10 Jul 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.6.2.ebuild:
+  Version bump per bug #231380.
 
 *git-1.5.6.1 (26 Jun 2008)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 184c393d3714..4d5eb2454e24 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -20,6 +20,7 @@ DIST git-1.5.4.5.tar.bz2 1597118 RMD160 7aef5f5284bf04efb5f03a8525f39b2498a0a1ef
 DIST git-1.5.5.3.tar.bz2 1677113 RMD160 943239f63ed024a1819fbe1f6d774b1c58081a6c SHA1 a679d56457b54d15c7ef0ed34396c11ff5d4758c SHA256 c0a5220e7c80dc791e2077ec238298c2ec30af4d8d0ed6d2fbd7ca808266dfc0
 DIST git-1.5.5.4.tar.bz2 1677894 RMD160 8341ad42ce92e8fc196266779c13db013a9dfa6d SHA1 7c4391fb4bc98a6c98e4cf891bf327bc5366e83b SHA256 0c052b8bbf5bbb787f17ac334dc839b2e6dce3a3158f0a5893d4b86e80de61a3
 DIST git-1.5.6.1.tar.bz2 1735514 RMD160 95f70e8025ac2cc978370d34bd1809f066bf82e7 SHA1 c7ddeeb3f78461815653bbaf59ed1156a9b0fa5f SHA256 076a61e899d5494251cfe4b29a231a7ff9175ed86d724fc5aa94256f506a6586
+DIST git-1.5.6.2.tar.bz2 1739162 RMD160 8471104775895b7a24a76f4d08b5b5a61f94b91c SHA1 c725c44d0cf198c74a239953891b60fbd9593611 SHA256 12305f224c17eb0a67bc4ba491e39830f82ff1c6617dad5af8c5ba9914cf042f
 DIST git-htmldocs-1.5.1.6.tar.bz2 489138 RMD160 eda63828bbb928699c9b3bb52876d7b7dc489ba7 SHA1 907749b4eba99c696589be750bc9432b9818954b SHA256 566928345f80850bdebb278d52591f017041d9de67b2cd561963065c847c6685
 DIST git-htmldocs-1.5.3.7.tar.bz2 549391 RMD160 18d01c803fd529ac897ae249ce4e05193ee9850a SHA1 926fb29604d69ce45ecf7b57d1b8feeb6c356f9b SHA256 e28c7e149e0f5adb66093af287dffe0caef83926ae08c6cdb6a2d35bc9148d04
 DIST git-htmldocs-1.5.3.8.tar.bz2 549444 RMD160 f4df777094158beea16bd2f0783ef846198e2c36 SHA1 d822887c45437daebf08c7cfe6e93a4ce5136fd3 SHA256 200a7231d6a594aeb5cb0c0e1cf25513c086f53b84170c7c5376199b2659b874
@@ -27,6 +28,7 @@ DIST git-htmldocs-1.5.4.5.tar.bz2 613736 RMD160 fe901c0a8da70e9066a944d36118b1ff
 DIST git-htmldocs-1.5.5.3.tar.bz2 643807 RMD160 32864d36243242d1ddbd346e177d0bcdf528d222 SHA1 6642972d4e600c1937e4ffc17f99ea11d22825c2 SHA256 b6fe9102239a64bf98ce754e74decf9e668a80cc962008c0c3eb6640d36e8ce6
 DIST git-htmldocs-1.5.5.4.tar.bz2 643840 RMD160 5c1e79aee962b584f377defdac4b703fee3a3ee6 SHA1 26d4bd19033583e8ba0a3ee6a33439154db81a4a SHA256 7cd63bee042afeb6508c4c66b3e8160cc09586d605fda948977259294d7a4c8c
 DIST git-htmldocs-1.5.6.1.tar.bz2 678559 RMD160 70a432e590306678235ff93c20097f8fb4f3bc61 SHA1 3af8649dd6d5b4c86b590229c891782ecf869eb4 SHA256 5ae41e1236f2e622c0cf807ea433989cbe79e38cd4f4e30e44f34a56887bb249
+DIST git-htmldocs-1.5.6.2.tar.bz2 688654 RMD160 015b45c3bc234cd82b5594289be71144432a5b42 SHA1 d7117b02788153e92a5d632403cc460cd90c0f95 SHA256 ab067c2e3dd5e13c306e82c5ce8f206405791f0bb83d7f103afce43a1ce96e5d
 DIST git-manpages-1.5.1.6.tar.bz2 133945 RMD160 ed047e78031882fb1d954ed9368127e4d0019da8 SHA1 f4eeb116aaeeabf329c9de8d49421af42e4a6f51 SHA256 22a06a220a915b3c1493462f0d902ea70d1dee25e0362984a1c896a73c721c4d
 DIST git-manpages-1.5.3.7.tar.bz2 147932 RMD160 fd4b45c221cbc63f580a32595c59eb52da1baa2f SHA1 7cc45f156298d0fbd4ead4a9b2096ed2143287b8 SHA256 870e68ef57f4175152b9b8decc721d8cbc9850ed8eda73919fc9e060f3968ffa
 DIST git-manpages-1.5.3.8.tar.bz2 147875 RMD160 c2a15b7a0742f14a70d0bf06d4d14fe9cf2b329b SHA1 15b9ece73c28897affb5da187835d19ff20e9962 SHA256 73a7cc2c0473694d454a6b7cb311ccdeb82f350bc8e652229d361592ea0a482f
@@ -34,6 +36,7 @@ DIST git-manpages-1.5.4.5.tar.bz2 157308 RMD160 75db043cca546bf73a1930816c6a13b0
 DIST git-manpages-1.5.5.3.tar.bz2 163895 RMD160 9572efd19a4b47338cee2ae4b2077c358fa5b004 SHA1 a1627c77b3b7df10c328f2a17816cdbb0571811e SHA256 770543b0ca871f72829f810d51f9e4d8b27659cbf4e73534fd09dfb5833f99de
 DIST git-manpages-1.5.5.4.tar.bz2 163922 RMD160 8aaae112ee6da27e3ed604c263ff6c33736ced92 SHA1 021064a30120b5041d82c2f2a2e96ce2e745ea33 SHA256 ab58825c06347534cfe2fe624834543503b6465392ec3786948d92d9b0e21207
 DIST git-manpages-1.5.6.1.tar.bz2 210612 RMD160 4205fe8ed7fba1ecfb7bf136d71e347f89fb43f6 SHA1 d9e4d24ee18fe4fa7079967d11aa1e8949b890b8 SHA256 b683fa111324fb04e4c187268bd66dcb5dbbe8ec88da34c52f515c5a12625008
+DIST git-manpages-1.5.6.2.tar.bz2 214791 RMD160 dd1255985450047d204b4bedb7544019634330b3 SHA1 50ca799b19bbd93071efe2bb7791793ad2681f47 SHA256 4a63bc8e10fb6e6bc2a7bed330444c19a7a7b172320560dec00e69f973408065
 EBUILD git-1.5.1.6.ebuild 4400 RMD160 c81b28b5efca8244c87cc5f0ac1923c03c9e5b1f SHA1 bb71d825a1c1eef4a5ba26958a7e4dd35b02d938 SHA256 8cbd6c76e3cc3a9e00a3accdb69dec8e134b99acf7cad1e39b243c6289559734
 EBUILD git-1.5.3.7-r1.ebuild 6371 RMD160 847ed38b63b34256ce17991dc6c4dbd34c207955 SHA1 d6edbbd1bcd150992f69eb2655e1ab5b4a925420 SHA256 7d881d0f76b68244aa0021e71beb8537197f2147aa464b5707c39217ec6be87c
 EBUILD git-1.5.3.8.ebuild 6388 RMD160 a76f9cc851a04c6b898f7f34d85b5433e28cfe2a SHA1 d10fbe86d2825b563025c0014db93cbbfd57d47c SHA256 13dc2bf683b369d4b61016587072db9c6b6af54ff0aa32ff2a542ec968a42b84
@@ -42,5 +45,6 @@ EBUILD git-1.5.5.3-r1.ebuild 7947 RMD160 9438201e4af6cf6cbdbc6ddc572efb6ca0abc61
 EBUILD git-1.5.5.3.ebuild 8181 RMD160 19a179aee6d3e0c2fed900877fd15b71a9764ce1 SHA1 afe96883de9a2a82dd8dbe72001bccab627e5565 SHA256 dc0c0436b031134e6273231bde0de131d6d50b7843967fcc2f61fdd71b5d20e4
 EBUILD git-1.5.5.4.ebuild 7952 RMD160 901dce6be5f9984f75732e89172cf7a85f61f2c3 SHA1 3aeb71f53b2802d3c31901dd52df69b39d4c2f63 SHA256 aedaea4274f329835ee287dcff1f09b67ded9490847e8720c4b40ca35ad8d5c9
 EBUILD git-1.5.6.1.ebuild 7950 RMD160 1d92183e32fb091fbebb96a99b970ad3f96f51c6 SHA1 c6e222360a6f38663f930d608bff16e6037f0f2a SHA256 a9afd76e05902636754d6cf1f55876d2c7ed413d8d7c95b64455c408881dca6c
-MISC ChangeLog 41638 RMD160 2dfd9227a0655afc5add75dea9ad48bc2d63cb14 SHA1 9a28717732583a146697cd491ebed27170c730f5 SHA256 38f15c33911d618e08dd406295861f9d443aefbfe4b14805d7dd80cfd9f16e2a
+EBUILD git-1.5.6.2.ebuild 7950 RMD160 a3fce29f87c9e5b5d7de2c949008ec453b87c8aa SHA1 0a8dbd7442c5e3a86de806cbc8e8d416d9107c79 SHA256 a4154c5d2647c29627578341792f5cafeec4e8b3b45bb9e9d994cb6fb0bd9202
+MISC ChangeLog 41773 RMD160 0bbc58724b342ddb1d6f73791a7458a229c1c109 SHA1 cb67160f91f25cd999513c92de1bddb7f607e1ad SHA256 283bd54fcb9d074dd8c30adddb556da79c5930d2b536faa2f363eb2c7327dbc9
 MISC metadata.xml 1029 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 SHA1 88453257ccbedf4166357c262f49b0731cc45448 SHA256 2aa15da3001de8d8182ee9c8289cdefae84652b78ccc4cf35b2394f07edc352f
diff --git a/dev-util/git/git-1.5.6.2.ebuild b/dev-util/git/git-1.5.6.2.ebuild
new file mode 100644
index 000000000000..5a1307b47788
--- /dev/null
+++ b/dev-util/git/git-1.5.6.2.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.6.2.ebuild,v 1.1 2008/07/10 18:44:57 robbat2 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, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://git.or.cz/"
+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 ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax"
+
+DEPEND="
+	!app-misc/git
+	dev-libs/openssl
+	sys-libs/zlib
+	app-arch/cpio
+	perl?   ( dev-lang/perl )
+	tk?     ( dev-lang/tk )
+	curl?   (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs?  ( virtual/emacs )"
+
+RDEPEND="${DEPEND}
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( virtual/perl-CGI )
+			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	gtk?  ( >=dev-python/pygtk-2.8 )"
+
+SITEFILE=72${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if ! use perl ; then
+		use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
+		use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
+		use subversion && ewarn "git-svn needs USE=perl, it won't work"
+	fi
+	if use webdav && ! use curl ; then
+		ewarn "USE=webdav needs USE=curl. Ignoring"
+	fi
+}
+
+# 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"
+	fi
+
+	use iconv || myopts="${myopts} NO_ICONV=YesPlease"
+	use tk || myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl || myopts="${myopts} NO_PERL=YesPlease"
+	use threads && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use subversion || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+	cd "${S}"
+	unpack ${PN}-manpages-${DOC_VER}.tar.bz2
+	use doc && cd "${S}"/Documentation && unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
+	cd "${S}"
+
+	epatch "${FILESDIR}"/20080626-git-1.5.6.1-noperl.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):" \
+		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
+	if use perl && use cgi ; then
+		emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		prefix=/usr \
+		gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed"
+	fi
+}
+
+src_install() {
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \
+		die "make install failed"
+
+	doman man?/*
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+
+	dobashcompletion contrib/completion/git-completion.bash ${PN}
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \
+			die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${D}"/"${SITELISP}"/${PN}/.nosearch
+	fi
+
+	if use gtk ; then
+		dobin "${S}"/contrib/gitview/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	dobin contrib/fast-import/git-p4
+	dodoc contrib/fast-import/git-p4.txt
+	newbin contrib/fast-import/import-tars.perl import-tars
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins contrib/vim/syntax/gitcommit.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# svnimport - use git-svn
+	# p4import - excluded because fast-import has a better one
+	# examples - these are stuff that is not used in Git anymore actually
+	# patches - stuff the Git guys made to go upstream to other places
+	for i in continuous fast-import hg-to-git \
+		hooks remotes2config.sh stats \
+		workdir convert-objects blameview ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${D}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		dodir /usr/share/${PN}/gitweb
+		insinto /usr/share/${PN}/gitweb
+		doins "${S}"/gitweb/gitweb.cgi
+		doins "${S}"/gitweb/gitweb.css
+		doins "${S}"/gitweb/git-{favicon,logo}.png
+
+		# Make sure it can run
+		fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+	fixlocalpod
+}
+
+src_test() {
+	local disabled=""
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9600-cvsimport.sh"
+	local tests_perl="t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	has_version app-arch/unzip || \
+		einfo "Disabling tar-tree tests" && \
+		disabled="${disabled} \
+					t5000-tar-tree.sh"
+
+	if ! has userpriv "${FEATURES}"; then
+		ewarn "Skipping CVS tests because CVS does not work as root!"
+		ewarn "You should retest with FEATURES=userpriv!"
+		disabled="${disabled} \
+					${tests_cvs}"
+	fi
+
+	use cvs && \
+		has_version dev-util/cvs && \
+		built_with_use dev-util/cvs server || \
+		einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])" && \
+		disabled="${disabled} \
+					${tests_cvs}"
+
+	use perl || \
+		einfo "Disabling tests that need Perl" && \
+		disabled="${disabled} \
+					${tests_perl}"
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+	cd "${S}"
+	# Now run the tests
+	einfo "Start test run"
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	if use emacs ; then
+		elisp-site-regen
+		elog "GNU Emacs has built-in Git support in versions greater 22.1."
+		elog "You can disable the emacs USE flag for dev-util/git"
+		elog "if you are using such a version."
+	fi
+	if use subversion && ! built_with_use dev-util/subversion perl ; then
+		ewarn "You must build dev-util/subversion with USE=perl"
+		ewarn "to get the full functionality of git-svn!"
+	fi
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-archimport "dev-util/tla"
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}