Bug #282667: version bump.

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

3 files changed, 368 insertions, 2 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 6b35c167f368..a44cbc08c908 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.353 2009/07/30 00:35:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.354 2009/08/27 00:03:02 robbat2 Exp $
+
+*git-1.6.4.1 (27 Aug 2009)
+
+  27 Aug 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.4.1.ebuild:
+  Bug #282667: version bump.
 
   30 Jul 2009; Robin H. Johnson <robbat2@gentoo.org>
   -files/20080626-git-1.5.6.1-noperl.patch,
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index cbf53eb97518..d0abe94784a7 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -5,19 +5,23 @@ AUX git-daemon.xinetd 260 RMD160 5bfeca2541488bb955ca349474c1fa3e80913aef SHA1 8
 DIST git-1.6.3.1.tar.bz2 2056716 RMD160 711afae08753095c612670590d808de38de6d03c SHA1 1b6f6da17663b1031c723e516789aa9310f3ac71 SHA256 2ef617165f9af704b4948d0bd72a3055ade47eb8a5cf7a6caae8be0960646453
 DIST git-1.6.3.3.tar.bz2 2061691 RMD160 802ab3a44c27084ed199c77d0f8710da7a5793ec SHA1 200b49304696357ccf7a4837307348d681b7e04d SHA256 f94bc0d1fc861a12c7fb821b27a4e6a80901e84432cdb7894cb7a437d4c939ad
 DIST git-1.6.3.4.tar.bz2 2062592 RMD160 e6d77dc918664274fb495efdea709592edd2b7d0 SHA1 76d148e1b7137e9c8ce29bdaf2ba7de0f1a9a616 SHA256 a84ca6033674e185653eb72876767e9cb384f008cfb845f477d61a900d888eef
+DIST git-1.6.4.1.tar.bz2 2170221 RMD160 5579bb95aa5c09163a026b3c9dd3f13b9042f7f2 SHA1 1b1378d2a457d9bbccca92d7adb78a4afa5157c5 SHA256 cb38005bfea43dd647e371ff4ea9ceae43335bb8aec3358ecb789327ffad7f36
 DIST git-1.6.4.tar.bz2 2166226 RMD160 fc4dca08c69d23f3211306593ee689e4bb52303c SHA1 e6dd6b1fe937aa14866ce7d8672a50fb1956c41b SHA256 31d1346211df985288a21426bc3e820be817ead589ae32c7e545854480bc8185
 DIST git-htmldocs-1.6.3.1.tar.bz2 741913 RMD160 279b298feed72e0c0712c54061f5cbed3b9eb279 SHA1 4a6e77f7171b16878aa71765a3f947432e669214 SHA256 6376efa888075de5b319c1ebade8516b2fb0edea675cc7172dcbf139324800a1
 DIST git-htmldocs-1.6.3.3.tar.bz2 742321 RMD160 0ea1318aa4a1259bb00c45b03a84cd09f07114f4 SHA1 f6d5bec24edfd27bf91f0f0cc13cfcfd7ecd045f SHA256 b387dbbe281adbfe6aafb949b94970f753f2658220e998a8dd5258b8980443d4
 DIST git-htmldocs-1.6.3.4.tar.bz2 743064 RMD160 758777b01f19553e69630dfd6583fdc2c91a9463 SHA1 b36232082254515484e952caad75b8de8bb825b0 SHA256 af5cf3b339c447c1221ca5bf75f1707ad713f8b463ba8e9d71abc5aa3a1a1d6b
+DIST git-htmldocs-1.6.4.1.tar.bz2 756031 RMD160 68d1360e6ca943c0a77920aaeb1df64c267b4f8c SHA1 834a5d119426b72c510a8a45ed98d283a8876be1 SHA256 595f080a21b47e083f4009938c1fbe66903da749689dfc9f1ac0fd90970cec47
 DIST git-htmldocs-1.6.4.tar.bz2 753185 RMD160 dfb3edc5b5be7d7931721e7837e5d72a9a38a6cd SHA1 cf162b278a39fbe78c90f015ba3749d99b8ab7db SHA256 70a83b82d1900e4ca80608388a87b3aa9e066f9a29cef487db1c29de645e06b9
 DIST git-manpages-1.6.3.1.tar.bz2 244098 RMD160 7de9ac0607365c2fed0eae6c67fdd0f826d044f8 SHA1 e4dd5f5a08d5a9b09cfcd2ba62f3ce7f77479afc SHA256 00ec75ef5d71e933ca173aa96cf254943f7750d536146433c0566ade984744fe
 DIST git-manpages-1.6.3.3.tar.bz2 243822 RMD160 57ffb06cdb1d0daf59aeeed2408860cfb2208e35 SHA1 0153298e215ac6beb3c6073aa1c8bd0de9a1da3b SHA256 a05a18f448a327137e1d6b04175caaabcc9c88f8327290b8f82b69119db39330
 DIST git-manpages-1.6.3.4.tar.bz2 243454 RMD160 48b11821afcd34e383d5bca119e70a271a72ab4a SHA1 eb2884190214351f9cff962d90d28b8adb607372 SHA256 71c77710f884ea9aad510ab98da5e89a1983b845cfbd63b50133b82664742603
+DIST git-manpages-1.6.4.1.tar.bz2 248277 RMD160 be218ce5b78efb755c2cadc660821a3fe89acf48 SHA1 fdab7acc88d11510f9e44f44e101f3aa43920d8e SHA256 e6889443f362ca73ce0885d12de5763d1c632d656225f61b9750b2ec5ba2d1dc
 DIST git-manpages-1.6.4.tar.bz2 246610 RMD160 0b008edd9b120a82973a7caed380e2a13f4af478 SHA1 34c8afef3e03283585edb1093b517f697f18a47b SHA256 b7ed025920594dff4ab9dc959bbefd99fa4ce3ebadef81fc92aad4d66065b7d5
 EBUILD git-1.6.3.1.ebuild 9724 RMD160 6fddcdf02259023d7a4f67403a35e5909601962d SHA1 8090d2005f692080a415c57d361fb6b48eac8d19 SHA256 4655efe55cdd5d971484b7136b2caad0ec29b4cebe105e6654a6709f07d5678d
 EBUILD git-1.6.3.3.ebuild 9713 RMD160 d367039cbed3a1ec31c533346617015d6d69b26d SHA1 391c05e3ca74826b2fa9dc53b1ecf7cead379596 SHA256 32b7c69cb27067266afc364eb77518907ada751c466218bf7a649a2e82db5600
 EBUILD git-1.6.3.4.ebuild 9724 RMD160 a5cf211e25ca71511b80ad29a3e21968bea45312 SHA1 a4d42bd78026062229e202b0f109a77ea83b3d61 SHA256 5a8ecc65fb71765a9081036022918d453fa6869c83df2f9c7c8c405eca31a236
+EBUILD git-1.6.4.1.ebuild 9724 RMD160 794d7ddae75f98e954553224ab69cf333cfe970d SHA1 245cb8e49c961d1fe8d792f31bd1b5f6cb0cab93 SHA256 84095d9ef910ec29cccac545a4bea2d05d3384e66497558b389b6be87a28d760
 EBUILD git-1.6.4.ebuild 9722 RMD160 d48e5409837de2fe9f365031d977da4b0d05067a SHA1 d3100ab37dc1448ab99e6f86886947a6ed55d8fc SHA256 33ed0281eec8df57f0f598b7a20be07b66a795f5c8d846e6aeead29287ef1a80
 EBUILD git-9999.ebuild 9629 RMD160 2d406fe0e19369f9cf92b53374a95cbab9a25614 SHA1 b6370c0dbb237b408e329c60264418ad8e1e4ea1 SHA256 ed80bc83221d42cc7c6ddb9f5a186e0067827db8018e8b6e916d5ec9f3949aac
-MISC ChangeLog 54118 RMD160 cd639a06080407ccac21eacdd7410c6f0fdcd8da SHA1 d28d980b3c4a14e9320ec14cb196a7880a340238 SHA256 7c4006963ac8d4956dc4c1c2668d6c1e482d767edb488d3f61e492f88367e94f
+MISC ChangeLog 54250 RMD160 6bd27862ec504b09e6be57dcfde18035225657ff SHA1 dc43aa45d6b01e20a94e9e776e36141d60c112fb SHA256 cedfb7d3cbf34fd72bdb95a3bfc4f815d47b4963c1732fe578efe7d103dfa618
 MISC metadata.xml 1535 RMD160 1117b90f1e7550ce3a47f844ac17db78ed803cc3 SHA1 223d8e6b2faf20bf290d90d0d6322473daa49b0c SHA256 58d9f467528fee5c7062d0a2344a3b61ff0b8b7a0a84dffc9f56557f7eadd70b
diff --git a/dev-util/git/git-1.6.4.1.ebuild b/dev-util/git/git-1.6.4.1.ebuild
new file mode 100644
index 000000000000..b811beb6c44e
--- /dev/null
+++ b/dev-util/git/git-1.6.4.1.ebuild
@@ -0,0 +1,357 @@
+# 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.4.1.ebuild,v 1.1 2009/08/27 00:03:02 robbat2 Exp $
+
+EAPI=2
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion
+[ "$PV" == "9999" ] && inherit git
+
+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/"
+if [ "$PV" != "9999" ]; then
+	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 )"
+else
+	SRC_URI=""
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	!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="${CDEPEND}
+	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 dev-python/gtksourceview-python )"
+
+DEPEND="${CDEPEND}"
+
+# These are needed to build the docs
+if [ "$PV" == "9999" ]; then
+	DEPEND="${DEPEND}
+		doc?    (
+			app-text/asciidoc
+			app-text/xmlto
+			app-text/docbook2X
+		)"
+fi
+
+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() {
+	if [ "${PV}" != "9999" ]; then
+		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}"
+	else
+		git_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# Noperl is being merged to upstream as of 2009/04/05
+	#epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
+
+	# GetOpt-Long v2.38 is strict
+	# Merged in 1.6.3 final 2009/05/07
+	#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.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"
+
+	# Fix docbook2texi command
+	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+		Documentation/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{,-blame}.el \
+			|| die "emacs modules failed"
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi \
+			|| die "emake gitweb/gitweb.cgi failed"
+	fi
+
+	if [[ "$PV" == "9999" ]] && use doc; then
+		cd Documentation
+		git_emake man info html \
+			|| die "emake man html info failed"
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	doman man?/*.[157] Documentation/*.[157]
+
+	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
+
+		find "${D}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	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
+}