Major version bump. Fixes bugs 219839, 225601 for userpriv during testing, working subversion-1.5 support per bug 224185 and skips installing git-svn when USE=-subversion per bug 233550.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64

3 files changed, 307 insertions, 2 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index cf2ba9f18967..6a301a520f9b 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,13 @@
 # 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.290 2008/08/16 02:59:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.291 2008/08/24 02:19:35 robbat2 Exp $
+
+*git-1.6.0 (24 Aug 2008)
+
+  24 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.ebuild:
+  Major version bump. Fixes bugs 219839, 225601 for userpriv during testing,
+  working subversion-1.5 support per bug 224185 and skips installing git-svn
+  when USE=-subversion per bug 233550.
 
 *git-1.5.6.5 (16 Aug 2008)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index a3b88adf50eb..1b4ca15bf7a5 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -24,6 +24,7 @@ DIST git-1.5.6.2.tar.bz2 1739162 RMD160 8471104775895b7a24a76f4d08b5b5a61f94b91c
 DIST git-1.5.6.3.tar.bz2 1739562 RMD160 1803475a99a2802ea3701b65b0f4f1ab28b7fee8 SHA1 d1eddee4d4e78231f8eae96199e7f0b2e8f98096 SHA256 abe6d19c8a3bca97802e655ebb4c11c5f8c98d33ca87aa1b68df74f8a02815d1
 DIST git-1.5.6.4.tar.bz2 1740619 RMD160 40aff0b5b8213b04f7a2eb6de806cac0d66cbe57 SHA1 fa27ec07966ba52ed639aa8dcbf52fee58e98b1a SHA256 25ae4f93c14efd84c8dbce1598f182bc4bbfafdccb22bc7965b54473600aafd9
 DIST git-1.5.6.5.tar.bz2 1743402 RMD160 9f8762d3f9d3df18f49616561bf9404c878bcde2 SHA1 5961912d301ecd9945667642c6c2ff9c299242e7 SHA256 692901194603cc4fb4072d8f907487d867caef6b62161f50f0f44dbeb001066e
+DIST git-1.6.0.tar.bz2 1860591 RMD160 ae3a0d3a39592f7ca2c9908917eb433860b71c38 SHA1 873fbe7141042ed96e5aa3178cb159b5636f60ed SHA256 b8d71cd080c059f4e5d949b1fd6a5c42ca648562326b7dcc04d9f06a777142f0
 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
@@ -35,6 +36,7 @@ DIST git-htmldocs-1.5.6.2.tar.bz2 688654 RMD160 015b45c3bc234cd82b5594289be71144
 DIST git-htmldocs-1.5.6.3.tar.bz2 689311 RMD160 b2e7df2f34e1dd4f5561c162e0394ce53d2d0c99 SHA1 b7027541edf509656dff69723eaaa0940db56033 SHA256 68c1a41d3ecca0b233cd77adcde7c7cd8e9123fbff4e9e49a3ef9eb3b94a1404
 DIST git-htmldocs-1.5.6.4.tar.bz2 690297 RMD160 966b4b14d09496f8b50449fe4cb73ab509279a3c SHA1 118171fd0e52cbc8cc135364cf1836c9f923f931 SHA256 ca6d33bea9d204425a238315b5f6d42ad17db9be06f9cbc9cf1a05d2c555528e
 DIST git-htmldocs-1.5.6.5.tar.bz2 690327 RMD160 a04542bb10b642e34bb5c32c5e4dbb2f1efbe2ec SHA1 f193cdf1c5a53a379a4b58b1992650c1fb80f727 SHA256 c3c1dc28cb89efc0f63a0ece2be16f3b14abe515d31afbf00f6f8d08a17a2959
+DIST git-htmldocs-1.6.0.tar.bz2 704837 RMD160 7acb9b23946221a4d86e4f66fa3bf09b100ec603 SHA1 779f5145a66275444a67968c208cccb2296f739d SHA256 31fdd420327d39b6fe0ef8298b72b3b6cbdb4f35a3657abbe279f3c042dcc988
 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
@@ -46,6 +48,7 @@ DIST git-manpages-1.5.6.2.tar.bz2 214791 RMD160 dd1255985450047d204b4bedb7544019
 DIST git-manpages-1.5.6.3.tar.bz2 214954 RMD160 ce954a2fda5702e6c7933bb4a31303d5ba6b5ab0 SHA1 87229c8e722bb95040503ccbe546db281d3f5538 SHA256 c0de81a69353a6e96e6bd4aff0be127287f212a8cda62dbfd5c48c0b6ffc85bd
 DIST git-manpages-1.5.6.4.tar.bz2 214972 RMD160 c5ea3d3d5a3c63ea3f04dea332c685b2f3f8a3c9 SHA1 bf208517c6fff54dbcab1a221d24be85a38e2e24 SHA256 ecac874e85d88f7b8ddb976157ca5569931cb71e07a02b83a7f68c2e3a066555
 DIST git-manpages-1.5.6.5.tar.bz2 214901 RMD160 f4170769841471267090057f00650d69cd2fa908 SHA1 0707ca806c79f1a9573e867fe84e1d18a71a50e2 SHA256 3d6d0b39ffa854bb066acce796a9bd313e1d5ae5887fab117b9509c0b0e1734a
+DIST git-manpages-1.6.0.tar.bz2 221399 RMD160 9e8cbb5d6ebda82407df325ed19f1ced12860f65 SHA1 c7b4204cdf941681a09084641c8aea3c6ef34dec SHA256 d8092a55dfaf31e78aecd802129af4b51b86dedf4ad12a397f487d89b822ef81
 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
@@ -58,5 +61,6 @@ EBUILD git-1.5.6.2.ebuild 7950 RMD160 a3fce29f87c9e5b5d7de2c949008ec453b87c8aa S
 EBUILD git-1.5.6.3.ebuild 7950 RMD160 123f058ed009076b37ba91f1b37664e2bad0a7f1 SHA1 f86d5cbaa2f4c650ccc511635011f3754cd3003d SHA256 39e96d40c15ae480005c10530b31749df66dc5925c4ca6e077bdf7929d81523f
 EBUILD git-1.5.6.4.ebuild 7946 RMD160 ba3fe44b33da2ccf76897f93c9397b1eef698533 SHA1 e027d8b48b7bd065c017f1be088eed290e09656d SHA256 a77558850eef57610c1b8539dc8981c63917126e02aa90f55154bf279897b64a
 EBUILD git-1.5.6.5.ebuild 7950 RMD160 0e57468d01ce4fb0e5ab2da62dd1b1db5cc4ac01 SHA1 a8cb618ffda05f211cfee055b9843c894ef4f00c SHA256 b9c872e57dd4cca88eb91f3256de6dbc3f0da87f62e5f3297bd95067474b5334
-MISC ChangeLog 42881 RMD160 b92857a17e720368b829ba8b5a152b79cdf2e5c7 SHA1 38aea9d291a03933163a5505d46e034a620802d3 SHA256 352a959f8a663be55e9e663509aee5212132caab92cb763641ed8498e0504eb4
+EBUILD git-1.6.0.ebuild 8406 RMD160 413f3842f82e808225e977a5f3601e426ce6e1ad SHA1 9545d7ba4656832868f316b3cc2f6587ebd98294 SHA256 d0e5123d264659e724a8db23960696e46d0ce277ca5f0b2a8544486302d46e1a
+MISC ChangeLog 43173 RMD160 3fea2e376c3e67289354086dd2b88b06917ba083 SHA1 488f9df626d5393c3142c3473a62d0aac3ff187d SHA256 d2dc49a38aae29ebfacc64926d5c2dc3a2bf7b44acc89d70e2fdc83e5fce0808
 MISC metadata.xml 1480 RMD160 06494b78bc4f5da7c5b377e48e8a38e6a61e71b6 SHA1 382259eed96d57835f30304b751540bc8c4a807e SHA256 347f2853546bdfc23b5c17a5d3cd6449a6e533a39fd4647dae2a653d17694b5a
diff --git a/dev-util/git/git-1.6.0.ebuild b/dev-util/git/git-1.6.0.ebuild
new file mode 100644
index 000000000000..df5fd35addc8
--- /dev/null
+++ b/dev-util/git/git-1.6.0.ebuild
@@ -0,0 +1,294 @@
+# 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.6.0.ebuild,v 1.1 2008/08/24 02:19:35 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 subversion ; then
+		rm -f "${D}"/usr/libexec/git-core/git-svn \
+			"${D}"/usr/share/man/man1/git-svn.1*
+	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.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if ! has userpriv "${FEATURES}"; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		# Bug #225601 - t0004 is not suitable for root perm
+		# Bug #219839 - t1004 is not suitable for root perm
+		disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-util/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 0 ]] && \
+			built_with_use dev-util/cvs server && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	# 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
+}