Version bump, fixing bugs #213549, #213543, #212131.

Package-Manager: portage-2.1.4.4

3 files changed, 235 insertions, 2 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index c4ecc5f62fcd..4d7f03cf4397 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.258 2008/02/27 02:19:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.259 2008/03/17 09:14:45 robbat2 Exp $
+
+*git-1.5.4.4 (17 Mar 2008)
+
+  17 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4.4.ebuild:
+  Version bump, fixing bugs #213549, #213543, #212131.
 
 *git-1.5.4.3 (27 Feb 2008)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 70c7b7029145..bcde1658b413 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -14,6 +14,7 @@ DIST git-1.5.3.7.tar.bz2 1361540 RMD160 74bfccd50c895e22d10b9e25f481f00a20617077
 DIST git-1.5.3.8.tar.bz2 1363259 RMD160 8e35e67cc94152c681849e14cb4aec86f1b316cf SHA1 acca91988e674c5976e15a290be65f2775296162 SHA256 f98c6b900c9f3b87a1fbbe0c5f466e9d981cb9f1d193066b6d371df4b8066b77
 DIST git-1.5.4.2.tar.bz2 1586823 RMD160 0cacc873033c953659b9971ec8b2dfbe11b040e3 SHA1 40e9ef9a4b6d144e41b2e01e03ae8a3c6bbe98e7 SHA256 56a3232b21fc206d845164890c4a2e1e96feaa520f6ba6e07f294c03541b3621
 DIST git-1.5.4.3.tar.bz2 1589678 RMD160 3b9660976dec3e355f0a93cd894d91f488771b63 SHA1 200597bf2e5bbdfa5d67ff04a0aa8ff0292ea210 SHA256 7c559e78642254aba821a18fec1c74088285f9e86fd06570f4c0e9a2cfcb3718
+DIST git-1.5.4.4.tar.bz2 1591657 RMD160 61954a5c26a0c79a303e476aa46263e2089f3584 SHA1 fdf2dbf3a01a71deb329cac63f23163114bc40c3 SHA256 69b3269a6b1ca26357e1e72c6be7f0ed742cd88d2042243c0bb9ba76e4acac99
 DIST git-1.5.4.tar.bz2 1583166 RMD160 7d49a13b19a15f6acd57aa3e8d9e7ac82b105ffd SHA1 0bde73f3093fcd54ff62f34be9c59a48ceee01af SHA256 c6f1cc44a3960ffa787d1e5902be0f1f928e7ff882f206d9ba554753d1bd8e5c
 DIST git-htmldocs-1.5.1.6.tar.bz2 489138 RMD160 eda63828bbb928699c9b3bb52876d7b7dc489ba7 SHA1 907749b4eba99c696589be750bc9432b9818954b SHA256 566928345f80850bdebb278d52591f017041d9de67b2cd561963065c847c6685
 DIST git-htmldocs-1.5.2.5.tar.bz2 505906 RMD160 000a0c5226866812766fc3c45bcafbc5fe35fb9a SHA1 974a1317078dc5159ef1eafb3937d3c651b4efbc SHA256 74f154b3d8f6dfc6582702f37197a37fd0f498f1ea7ef030d5ea0c999e8f9532
@@ -21,6 +22,7 @@ DIST git-htmldocs-1.5.3.7.tar.bz2 549391 RMD160 18d01c803fd529ac897ae249ce4e0519
 DIST git-htmldocs-1.5.3.8.tar.bz2 549444 RMD160 f4df777094158beea16bd2f0783ef846198e2c36 SHA1 d822887c45437daebf08c7cfe6e93a4ce5136fd3 SHA256 200a7231d6a594aeb5cb0c0e1cf25513c086f53b84170c7c5376199b2659b874
 DIST git-htmldocs-1.5.4.2.tar.bz2 610611 RMD160 ca52d3a5334cadd2a95c38306a284d4cf2ab292c SHA1 72851e2c342ec3c37d5660abf75fa6b800445990 SHA256 651482067d6424b8d5c40978897d965ddc95e4dcaa95940ef0a062291745ef28
 DIST git-htmldocs-1.5.4.3.tar.bz2 611814 RMD160 06261d4304a13debd3727e5233538148543aa5f7 SHA1 aad6c2b3d69f18f59f1dbdd2cc8baf7ea4a87002 SHA256 95ac1c91e484bf54c8f3ae52796f3fd0cd624c82eac844ce5198551f8431cfb8
+DIST git-htmldocs-1.5.4.4.tar.bz2 613201 RMD160 b3741aa29e2a8023b728c85ab3c806e90a206e5f SHA1 812850b20b67a2d8bf7aac8c3668b6086e9e1972 SHA256 3beea407b822d402e023d1f300ed9598b181ad4faa923926c163e32ab3436c48
 DIST git-htmldocs-1.5.4.tar.bz2 609896 RMD160 f55380837e99cd70a5a266f9e44bc5cf62809129 SHA1 14943152482d5ed454002c879460cd9ccdcf258c SHA256 4d3b633aab0de30da6126537b84ab1bd06dd45e963aaeb5590cc6e6414ec4c96
 DIST git-manpages-1.5.1.6.tar.bz2 133945 RMD160 ed047e78031882fb1d954ed9368127e4d0019da8 SHA1 f4eeb116aaeeabf329c9de8d49421af42e4a6f51 SHA256 22a06a220a915b3c1493462f0d902ea70d1dee25e0362984a1c896a73c721c4d
 DIST git-manpages-1.5.2.5.tar.bz2 139885 RMD160 6c5e3b1bdf22638adcd914349d307a1934ec8c22 SHA1 47a2f330581c9e4dcb5e8c25d7508c5e8d7d7997 SHA256 c793bc76451cee39b92d173d33e6e33f2b74c8b6b9ac74ecd23031d236722fc4
@@ -28,6 +30,7 @@ DIST git-manpages-1.5.3.7.tar.bz2 147932 RMD160 fd4b45c221cbc63f580a32595c59eb52
 DIST git-manpages-1.5.3.8.tar.bz2 147875 RMD160 c2a15b7a0742f14a70d0bf06d4d14fe9cf2b329b SHA1 15b9ece73c28897affb5da187835d19ff20e9962 SHA256 73a7cc2c0473694d454a6b7cb311ccdeb82f350bc8e652229d361592ea0a482f
 DIST git-manpages-1.5.4.2.tar.bz2 156266 RMD160 9f664f728333012fb92c41838c7538f1e81c7913 SHA1 ab9f6f08613e29f9fcbdd3faca7945795c9b1d47 SHA256 de402caac6fa798e2316b945338dfd3ed24a104e4b9dec9ef8813dcbde945503
 DIST git-manpages-1.5.4.3.tar.bz2 156741 RMD160 d2a8be59bf0c9b1c2b6da102cb146e93595e0268 SHA1 70ceb0024361ab1e64822fb4e0cd12eddc02431a SHA256 0c1a7f0b40c996d3bc6f6c8c6aef938c619148856651afef8d1a1ab57494ac23
+DIST git-manpages-1.5.4.4.tar.bz2 156980 RMD160 e423ce70b54767c804a473ada9d7fdbb546ba360 SHA1 6aeac3116d1dc4966fb469060331969eb24f3266 SHA256 709dad8f41e27bed1715ab162280aa49de126756bd15f3870558908baafde67a
 DIST git-manpages-1.5.4.tar.bz2 156304 RMD160 be7e3158924a254ebac7b161af7d27bacfe1079e SHA1 a34a846092ae9b3d23f0015ba86ecc4d52e096c8 SHA256 e86e4909b56cd56f79bb12c088c95f32df80e836c1fac7be800ddb6fbcb2aa8f
 EBUILD git-1.5.1.6.ebuild 4400 RMD160 c81b28b5efca8244c87cc5f0ac1923c03c9e5b1f SHA1 bb71d825a1c1eef4a5ba26958a7e4dd35b02d938 SHA256 8cbd6c76e3cc3a9e00a3accdb69dec8e134b99acf7cad1e39b243c6289559734
 EBUILD git-1.5.2.5.ebuild 4438 RMD160 914a23cd6611788be58938a41c6dce4592667bb9 SHA1 3f2c69b60ebf05426660150a61773b2019af7989 SHA256 86867bf441ada7577c1d852a22ffe89f5d3f2969dc24bd9291ae0eac66acb09b
@@ -35,6 +38,7 @@ EBUILD git-1.5.3.7-r1.ebuild 6371 RMD160 847ed38b63b34256ce17991dc6c4dbd34c20795
 EBUILD git-1.5.3.8.ebuild 6388 RMD160 a76f9cc851a04c6b898f7f34d85b5433e28cfe2a SHA1 d10fbe86d2825b563025c0014db93cbbfd57d47c SHA256 13dc2bf683b369d4b61016587072db9c6b6af54ff0aa32ff2a542ec968a42b84
 EBUILD git-1.5.4.2.ebuild 6456 RMD160 67839a8bc0b973305569c4b2a14489ccf9171c43 SHA1 c1e4ebe62bc94eee12b222ecc891b9aebbd09383 SHA256 ef53e4d404725c06a0326ae5b77539363d146ae6b2c1d7a38d00f190e0f65a61
 EBUILD git-1.5.4.3.ebuild 6458 RMD160 281145d4c0fac156ca62722b23ba602d1737955c SHA1 a8418ded18c3de325888fb42a3dcc2844a264f52 SHA256 e8d4a7cab34ff64b6d9995840e8ac278ba010d5c76d6cb409a4bc1920268856e
+EBUILD git-1.5.4.4.ebuild 6551 RMD160 c413e03d756db93c34b7d6ad8247ffd089a142a0 SHA1 d553c3a69e8a331e7e74d7c9d6865938f2d59cd0 SHA256 305e4980013ad88d89d4442fa7bb93b5b5542f75194802bacd87b9a419bee477
 EBUILD git-1.5.4.ebuild 6565 RMD160 17d6172114dcbbc24d390b93fc9598318e0b4906 SHA1 3a7b86bacacb291fccdde45b7cd1832bc7cdda35 SHA256 8ba59eba4f2377e33302bf9830657c68f3c6fec3b600e234a5b1a4b36e0bee15
-MISC ChangeLog 37725 RMD160 fdbc9d3216ea7c51e188177b3bac49d05964da4f SHA1 9c49e4f8ce3f238d4605fe54eca1573c2be54d3b SHA256 daa94a017f3df8a16d2794fe68b77a26551317539f838d4391732584602dfe95
+MISC ChangeLog 37883 RMD160 383eb56db27909d5ff4f15af69ee2bf1a4efea67 SHA1 cb5da61ffdd451b049fe39a3fbcda68de7e898fc SHA256 e28c17fb85ed21fb4fcf80061bc5bddee7dd3a89c70ba025d15532dc9faf826f
 MISC metadata.xml 1029 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 SHA1 88453257ccbedf4166357c262f49b0731cc45448 SHA256 2aa15da3001de8d8182ee9c8289cdefae84652b78ccc4cf35b2394f07edc352f
diff --git a/dev-util/git/git-1.5.4.4.ebuild b/dev-util/git/git-1.5.4.4.ebuild
new file mode 100644
index 000000000000..2b5d0acb3ef2
--- /dev/null
+++ b/dev-util/git/git-1.5.4.4.ebuild
@@ -0,0 +1,224 @@
+# 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.4.4.ebuild,v 1.1 2008/03/17 09:14:45 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"
+
+DEPEND="
+	!app-misc/git
+	dev-libs/openssl
+	sys-libs/zlib
+	dev-lang/perl
+	app-arch/cpio
+	tk?     ( dev-lang/tk )
+	curl?   ( net-misc/curl )
+	webdav? ( dev-libs/expat )
+	emacs?  ( virtual/emacs )"
+RDEPEND="${DEPEND}
+	cgi?    ( virtual/perl-CGI )
+	perl?   ( dev-perl/Error dev-perl/Authen-SASL dev-perl/Net-SMTP-SSL )
+	gtk?    ( >=dev-python/pygtk-2.8 )"
+
+SITEFILE=72${PN}-gentoo.el
+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 iconv || myopts="${myopts} NO_ICONV=YesPlease"
+	use tk || myopts="${myopts} NO_TCLTK=YesPlease"
+	use threads && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+
+	export MY_MAKEOPTS=${myopts}
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+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}"/${PN}-1.5.3-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
+	if 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
+
+	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 vim stats \
+		workdir convert-objects blameview ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${D}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use cgi ; then
+		dodir /usr/share/${PN}/gitweb
+		insinto /usr/share/${PN}/gitweb
+		doins "${S}"/gitweb/gitweb.{cgi,css}
+		doins "${S}"/gitweb/git-{favicon,logo}.png
+		docinto /
+		# INSTALL discusses configuration issues, not just installation
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+	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() {
+	has_version dev-util/subversion || \
+		MY_MAKEOPTS="${MY_MAKEOPTS} NO_SVN_TESTS=YesPlease"
+	has_version app-arch/unzip || \
+		mv -f "${S}"/t/t5000-tar-tree.sh{,.DISABLED}
+	if ! has userpriv "${FEATURES}"; then
+		ewarn "Skipping CVS tests because CVS does not work as root!"
+		ewarn "You should retest with FEATURES=userpriv!"
+		for i in t9200-git-cvsexportcommit.sh t9600-cvsimport.sh ; do
+			mv -f "${S}"/t/${i}{,.DISABLED}
+		done
+	fi
+	has_version dev-util/cvs && \
+		built_with_use dev-util/cvs server \
+		|| mv -f "${S}"/t/t9600-cvsimport.sh{,.DISABLED}
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
+}
+
+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
+	elog "These additional scripts need some dependencies:"
+	elog "(These are also needed for FEATURES=test)"
+	echo
+	showpkgdeps git-archimport "dev-util/tla"
+	showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1"
+	showpkgdeps git-svn \
+		"USE=perl" \
+		"dev-util/subversion(USE=perl)" \
+		"dev-perl/libwww-perl" \
+		"dev-perl/TermReadKey"
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache )"
+	showpkgdeps git-send-email "USE=perl"
+	showpkgdeps git-remote "USE=perl"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}