Version bump, also fixes bug #237210 for Emacs users.

Package-Manager: portage-2.2_rc27/cvs/Linux x86_64

3 files changed, 316 insertions, 2 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index e1df93e017ba..d865fb94bd26 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.325 2009/04/03 06:12:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.326 2009/04/03 06:15:09 robbat2 Exp $
+
+*git-1.6.2.2 (03 Apr 2009)
+
+  03 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.2.2.ebuild:
+  Version bump, also fixes bug #237210 for Emacs users.
 
   03 Apr 2009; Robin H. Johnson <robbat2@gentoo.org>
   files/20090305-git-1.6.2-noperl.patch:
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 6a8559d0d5c0..d8e4a19517b4 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -37,6 +37,7 @@ DIST git-1.6.1.1.tar.bz2 1972491 RMD160 ac7b553339ae2f2ca52de1cc351da64e1bebca4c
 DIST git-1.6.1.2.tar.bz2 1973153 RMD160 9a914c456f04a912755a1ccb886d4b179434f91a SHA1 27b9c73e5f04cfe949ae1dfa785c6ebb1cfa98fa SHA256 5b943fdfd8d347e59dda6c7547342ccdbc7c40aa1a24344e09bdce18dde8b4dd
 DIST git-1.6.1.3.tar.bz2 1973574 RMD160 a8ac0590084e27cc3ab9471cd6ebba18b3876c75 SHA1 552805bf9070d886be20782b3ddb5a4a824a41bc SHA256 aef4814634ac9ce8119fabc4bd1c363bb946f73ed34475a4baaad09a3fb23682
 DIST git-1.6.1.tar.bz2 1971286 RMD160 41798548551362611499fd2a525a42f5182b1d20 SHA1 4caeafd06a5482337052f142073be66f2a39134a SHA256 09d64bd88f6f432ddcb0f051a3ead2579f895a7f0dece702bc933ba21a434fe4
+DIST git-1.6.2.2.tar.bz2 2016513 RMD160 c48641c3b995222d2b70f85482e66d9f66bc1734 SHA1 c5edf42bb2d1e9cbb89a63712bfd567330573190 SHA256 7b440c1589de36e94b751cfb3b9d60d9a3131eeab8229e759a1fd0328ea36166
 DIST git-1.6.2.tar.bz2 2016213 RMD160 7e28be59954173666e26940ca66dd95f99cf029b SHA1 685b9e203786dd4bcd7672088bcac42e22930ee0 SHA256 ab7dc40240092aa2e72a8db7e0045893ca5fa07a936e9fa83b242248e3c9f635
 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
@@ -59,6 +60,7 @@ DIST git-htmldocs-1.6.1.1.tar.bz2 714757 RMD160 1931b5df8ff338f9d343a8bc23d7093e
 DIST git-htmldocs-1.6.1.2.tar.bz2 714986 RMD160 385abceae209a2bd5a06f67ba0080386db97114d SHA1 2532607649094fe3d242b8ddd14ed80c6f244276 SHA256 cb136674805e400fa4276836371a40722f5d36427c30a3d26010f7cd7a68e941
 DIST git-htmldocs-1.6.1.3.tar.bz2 715371 RMD160 208f26df5f9f25659898cdae9d88ace2a81a0bf2 SHA1 c728dc2928f40e63fb7d53a07bc59ebb568abf44 SHA256 de2c32e1e499963f267a6b8344aa98e1e679a67cd6d98aa6f1568dacc0e23e8d
 DIST git-htmldocs-1.6.1.tar.bz2 713909 RMD160 d592885906d0d7fa6283e9a40226f191a4052346 SHA1 c6cd28959ed6e2fbd892fe16adda1d31a3301ae8 SHA256 1e182bc5c4a5b6ab49d1db0690c9275a3e14e7b145b5a4badbeb374678c62f22
+DIST git-htmldocs-1.6.2.2.tar.bz2 730394 RMD160 71e189cc6b0ce212ad468664a6fba87f5a1618a4 SHA1 0daafac257a5aa9210d02303ee30f4334b197393 SHA256 96bb0e4ea6ab952e8860cf7f8eccf64d58139f9ede235064cd88777c2d1d1ed5
 DIST git-htmldocs-1.6.2.tar.bz2 727053 RMD160 a915884c94ac1cf2311389b32c410d12203b43e5 SHA1 4943d51bf49a574e1cefe3833ef6820964b40455 SHA256 e8847d1d2051db1ac1c8a9cf838584d52aad3ea999fb038fd76751ab14bf6a55
 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
@@ -81,6 +83,7 @@ DIST git-manpages-1.6.1.1.tar.bz2 231331 RMD160 3a641502738104bb3c5322643ab4c293
 DIST git-manpages-1.6.1.2.tar.bz2 231154 RMD160 d363cc4ad41a307d29b317efcdc95f5d03575839 SHA1 5f4d2b60984c4054629a17a01b10df552ee9478d SHA256 5262b8831283a19ea30e80446ca63ae103800c261276211f1deaeb15475a2244
 DIST git-manpages-1.6.1.3.tar.bz2 231623 RMD160 3db015f6bb0573730f7e0cf546d868e9cd961bab SHA1 581bd9917dd587c33a8c54c3cc678175f0489122 SHA256 ac3daa67b5f0a5bdf9c45dbf148c7f3c51e673f3a5460e00c55594a3cd51f1a4
 DIST git-manpages-1.6.1.tar.bz2 231011 RMD160 98f8af44e2b10898df0c4b599e0f88c0d57bda2c SHA1 fa2d94dc966484b14ae11d39d0d8336946a93001 SHA256 877b9648508cb57adc2f9059f8c72d05db2cc1a0286b225d1d18ab11f5c81242
+DIST git-manpages-1.6.2.2.tar.bz2 236466 RMD160 5719e66084aab0a9bb040b8859845091bab465ef SHA1 5748daa7da1839922f8651cd95b62cacca6328a4 SHA256 e6dc1cf2e2e2748314300c825a36ff808158d5d288b7d75009c40972a338f6f5
 DIST git-manpages-1.6.2.tar.bz2 236341 RMD160 b770b9e5bcc259735ae72412eda9b1ec9b587f08 SHA1 e621826b090cac60d28758eb9ec2c7ab4c0d63ba SHA256 13e7d352f9cac1f34d64b5deb006d0961941e43975a33f7d8507df58df1fe68e
 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
@@ -106,6 +109,7 @@ EBUILD git-1.6.1.1.ebuild 8605 RMD160 5ba0aacd6084de03f87f5bcb49e53bfd1e3b522c S
 EBUILD git-1.6.1.2.ebuild 8604 RMD160 d250ff4edad7746b3e06e6a2816e166a373ab1dd SHA1 4a7d76beb579e01ddec9cddf221a1e6a28ce2972 SHA256 730852698897267850b197548ef4c97d588d14f25e5c57cd6db8b726f9c2bd67
 EBUILD git-1.6.1.3.ebuild 8605 RMD160 a6478e8eb4afb5dfa6b4b8d99a7c4e97f5704e99 SHA1 8b0e0f5a4c7453cfd5bb5e9a1c78eb930d2c3b54 SHA256 7de1be388d359f7cb81a91f54cd343e04ae6f2ee188de7e142a07c5f64d85407
 EBUILD git-1.6.1.ebuild 8669 RMD160 260375314513971c695787b4da9c2b172419bdf2 SHA1 848d8e40359b93dd596e243899b675b6d8b82a16 SHA256 4f56c7055b75064ea7ea7248d0da213e2fe6a6e08cfb2c3e63ca6139238da5f1
+EBUILD git-1.6.2.2.ebuild 8509 RMD160 e595b7a5b6d619b217542fad544d3a3e3bc6332b SHA1 79bcabf53dc1e1afe9a07bd5b5d524cf84c87ce9 SHA256 d04f4d9e809c3bfd66a6939e0fc9e4892771a7256ba9a4efbc9ae4d88f440849
 EBUILD git-1.6.2.ebuild 8443 RMD160 0138c4f89eed7055664bb2a84d6e41bc1be60e2d SHA1 7bc2abe4a18f4150792724e6550817f2802ef48a SHA256 a2c7e4858f2bd21973d818d059023cfd2c98177a0bae2aa1c31fff1e7309ec13
-MISC ChangeLog 48919 RMD160 a5f8ad748e7844ecb1fff2c7da8707f7ae8f1d84 SHA1 27bc7eee0814fb52f80029c625e7c1c39dce03ce SHA256 42960fa58f10abcceda69da3dcfe48510de0dd2aa237db420c87a34f9924464f
+MISC ChangeLog 49078 RMD160 e19fe5008ef8863974e34ce5193eb43ffc89297a SHA1 36ad55d2c69d51ac2e46b8efb7513cf1635a6ec3 SHA256 b891cc664412046a268727d4164f073ce367b5dc7bbd15af953a10b51c71535b
 MISC metadata.xml 1535 RMD160 1117b90f1e7550ce3a47f844ac17db78ed803cc3 SHA1 223d8e6b2faf20bf290d90d0d6322473daa49b0c SHA256 58d9f467528fee5c7062d0a2344a3b61ff0b8b7a0a84dffc9f56557f7eadd70b
diff --git a/dev-util/git/git-1.6.2.2.ebuild b/dev-util/git/git-1.6.2.2.ebuild
new file mode 100644
index 000000000000..0d7cf561691a
--- /dev/null
+++ b/dev-util/git/git-1.6.2.2.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.2.2.ebuild,v 1.1 2009/04/03 06:15:09 robbat2 Exp $
+
+EAPI=2
+
+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://www.git-scm.com/"
+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"
+
+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[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	gtk?  ( >=dev-python/pygtk-2.8 )"
+
+SITEFILE=50${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
+	if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/subversion dso ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	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}"/20090305-git-1.6.2-noperl.patch
+
+	sed -i \
+		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC = \).*$:\1$(OPTCC):' \
+		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
+		Makefile || die "sed failed"
+}
+
+git_emake() {
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix=/usr \
+		htmldir=/usr/share/doc/${PF}/html \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git.el || die "emacs modules failed"
+	fi
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi || die "emake gitweb/gitweb.cgi failed"
+	fi
+}
+
+src_install() {
+	git_emake \
+		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/git.{el,elc} || die
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${D}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	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
+
+	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"
+	git_emake \
+		test || die "tests failed"
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use subversion && has_version dev-util/subversion && ! built_with_use --missing false 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-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}