New upstream version

Package-Manager: portage-2.1.3.9

4 files changed, 196 insertions, 8 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index e7be8df59fab..96b4a63086f7 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.225 2007/09/28 12:31:22 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.226 2007/09/30 12:01:34 ferdy Exp $
+
+*git-1.5.3.3 (30 Sep 2007)
+
+  30 Sep 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3.3.ebuild:
+  New upstream version
 
   28 Sep 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.3.ebuild:
   Remove 1.5.3
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index f6d705f9d196..f9c6296982c3 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -32,12 +32,15 @@ SHA256 6a3503904204163775722e8a455e4ebaa8648f6d288340979387ad4eb55f4c0a files/gi
 DIST git-1.5.1.6.tar.bz2 1130713 RMD160 20279c817da53d3bc6d5f58121bfe73e8a25e8a1 SHA1 c1e34ce6a6a9a81bb16f158ef84b4576e6be1b0c SHA256 4429ca98c0789b0f564cdbf76e8e8ad4db928b7c7ac94f116e4a0729e4253a21
 DIST git-1.5.2.5.tar.bz2 1192416 RMD160 e4d7165521e1fbe35feab48bbf54ca08ffe571b5 SHA1 5c145b98dbd7b8695e8dcc18ca661454775c869b SHA256 b0b8016a77ed2ef1ab33cf5b82d960025bdbaaf9142c2fb0a01558e8ad017fb9
 DIST git-1.5.3.2.tar.bz2 1344171 RMD160 ef5436d8e95080415dc968c45b2e8f480a1d66c7 SHA1 7e28fd6b0cc2c9c4e6afc9b2dc79c4f804db86f3 SHA256 e39b5492f3982a4f935e48294c775ddd0e63fdd2ba75b675f882479d29329d45
+DIST git-1.5.3.3.tar.bz2 1347290 RMD160 d47a9adc4069b26888fe7ddd63b4e45d272ca49e SHA1 59f5630db147e0a8fdde3604daf280bde68900cd SHA256 e064142312d340feb6b09426e5c7ee4ec15ff3404350ed3275f159bbe5826ea6
 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
 DIST git-htmldocs-1.5.3.2.tar.bz2 537124 RMD160 e2d0423ab2eaa11fbb61365445ace3d1427c76dc SHA1 f60ff1733938ae110a01bee0fd8daccfd2cf897c SHA256 c424e7b43d753b50e07e836d569233a545eacae5485b7dc562b492676db516c6
+DIST git-htmldocs-1.5.3.3.tar.bz2 541175 RMD160 02e26a8f1a84fdff3808285fada3a49dbff1af85 SHA1 ac185fdfc7af459f104de426b5b977c5749b177b SHA256 ad86390dfef6c44ab777bd2d7394770aa12008c7f1f9e1d1368b2f7b17fc24bc
 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
 DIST git-manpages-1.5.3.2.tar.bz2 147283 RMD160 9d8d9ae79f50b838f22a82ed71ee831ebc83ce98 SHA1 26fd2eedd5803afdf7ccc5bedd31306eea05d95e SHA256 b6c6c444e8c1a7f4d5b3a1307739f583cf90e58f4ddfb8156005958f087e904f
+DIST git-manpages-1.5.3.3.tar.bz2 147278 RMD160 3f8c51922b01aeb9aa518c86611b528a8d389868 SHA1 df14dd849c3f4d00170a207f2fa087c9a765291f SHA256 fe57dc04e6e9c7ea3e6b28d04c355740b73639aa880d6b1dd64c71d009942410
 EBUILD git-1.5.1.6.ebuild 4415 RMD160 7c5e1759aa8f269a2a6c3ae8503cfa47c79ee66a SHA1 fcf556d35c0162eb74cbf28cca088ff6d8d642f7 SHA256 7970963a050b0a407375c8943408489ef51f995561d34c6d67596ba435b4eff3
 MD5 4c6ba2ac3142c57509ae3405ab1784d4 git-1.5.1.6.ebuild 4415
 RMD160 7c5e1759aa8f269a2a6c3ae8503cfa47c79ee66a git-1.5.1.6.ebuild 4415
@@ -50,10 +53,14 @@ EBUILD git-1.5.3.2.ebuild 4428 RMD160 6924c121dfdaf58dc6c56742b6ebb9603228019e S
 MD5 9dbd1204a0dcf1445493dd666ae0cde5 git-1.5.3.2.ebuild 4428
 RMD160 6924c121dfdaf58dc6c56742b6ebb9603228019e git-1.5.3.2.ebuild 4428
 SHA256 7cfa610ddfb07d3e1f9930c318d31f7a53733c33c06c46a3a35bc3a5237c637b git-1.5.3.2.ebuild 4428
-MISC ChangeLog 31998 RMD160 5d132b3e1d7513e7c8d370b8a923776ae6e2ccda SHA1 ef39241a896ce5782de89c821b7087e08ad399c0 SHA256 0b1ad06996aa5609e97e9f73ca3086b5cdcdd01fea472479b66e8b6f040db150
-MD5 a0ac75a35f47b180c040f242e24d6359 ChangeLog 31998
-RMD160 5d132b3e1d7513e7c8d370b8a923776ae6e2ccda ChangeLog 31998
-SHA256 0b1ad06996aa5609e97e9f73ca3086b5cdcdd01fea472479b66e8b6f040db150 ChangeLog 31998
+EBUILD git-1.5.3.3.ebuild 4428 RMD160 c5f025632a25043c038643c5a5f2c93270395efb SHA1 2d19e9959c6796e3ee389ef73b5ceebc69bbbff4 SHA256 51490261315f1775d798b1be5d3c141ba0230997ef7a51cbecd6b0deeed5c951
+MD5 bd89018f4ccca0591cb538fd28d67487 git-1.5.3.3.ebuild 4428
+RMD160 c5f025632a25043c038643c5a5f2c93270395efb git-1.5.3.3.ebuild 4428
+SHA256 51490261315f1775d798b1be5d3c141ba0230997ef7a51cbecd6b0deeed5c951 git-1.5.3.3.ebuild 4428
+MISC ChangeLog 32124 RMD160 bf74568bc7d68d71232443f20a0f3459498f370d SHA1 a5e31ca10f7fedaa12ebaf7de79f049d72ba473f SHA256 d086529744302ce913ec74a5779a0b55409296b52fa9d4372cea34ecfea463e6
+MD5 d4242101af25942f8cb3a089a02d6ec9 ChangeLog 32124
+RMD160 bf74568bc7d68d71232443f20a0f3459498f370d ChangeLog 32124
+SHA256 d086529744302ce913ec74a5779a0b55409296b52fa9d4372cea34ecfea463e6 ChangeLog 32124
 MISC metadata.xml 1029 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 SHA1 88453257ccbedf4166357c262f49b0731cc45448 SHA256 2aa15da3001de8d8182ee9c8289cdefae84652b78ccc4cf35b2394f07edc352f
 MD5 c205afae129e41ba63cf04be7f56c7ab metadata.xml 1029
 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 metadata.xml 1029
@@ -67,10 +74,13 @@ SHA256 90cff61fb313217b7cc600adb70c46789882d898f1ddd8e378e54ae7dc3bdae7 files/di
 MD5 dc55082a57dd68127735b0bbad6e10ec files/digest-git-1.5.3.2 771
 RMD160 eadd468c29b62ee34683b7feaff9056988d556a1 files/digest-git-1.5.3.2 771
 SHA256 6fc2d60518112a009528d040478ab64a2441c52dd2412b3dd308185f5ac8501b files/digest-git-1.5.3.2 771
+MD5 a33cbd611b6eac99c6d48f7e9f5f4ddf files/digest-git-1.5.3.3 771
+RMD160 6f43c135e124038245d0ff19139c1e6129c8dff6 files/digest-git-1.5.3.3 771
+SHA256 fdc6cb8052b3b33a382383c4b57099edecad881653b7e62379f8d5c4bf94b6ed files/digest-git-1.5.3.3 771
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFG/PQ9ViELBEf1JB0RAsBLAJ0Y6hI21FAJMiXAXea9tAoq12RM5gCfaJqq
-7DMS32JovKxwhn+Fo8boxHU=
-=vsVU
+iD8DBQFG/5ApViELBEf1JB0RAkgNAJ4rkHgFUENn+Q7EQmgMmjnkc0OWxQCeJ+2g
+df3wKZtzDDTxux2zn3nH86w=
+=mPAL
 -----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.5.3.3 b/dev-util/git/files/digest-git-1.5.3.3
new file mode 100644
index 000000000000..d5fbf2e0d5ef
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.5.3.3
@@ -0,0 +1,9 @@
+MD5 49ab93f99a11925789602da3ac87feed git-1.5.3.3.tar.bz2 1347290
+RMD160 d47a9adc4069b26888fe7ddd63b4e45d272ca49e git-1.5.3.3.tar.bz2 1347290
+SHA256 e064142312d340feb6b09426e5c7ee4ec15ff3404350ed3275f159bbe5826ea6 git-1.5.3.3.tar.bz2 1347290
+MD5 10aebc1687b922aafded70960f790959 git-htmldocs-1.5.3.3.tar.bz2 541175
+RMD160 02e26a8f1a84fdff3808285fada3a49dbff1af85 git-htmldocs-1.5.3.3.tar.bz2 541175
+SHA256 ad86390dfef6c44ab777bd2d7394770aa12008c7f1f9e1d1368b2f7b17fc24bc git-htmldocs-1.5.3.3.tar.bz2 541175
+MD5 f5cb572ef8504561cbaf86400d7f0279 git-manpages-1.5.3.3.tar.bz2 147278
+RMD160 3f8c51922b01aeb9aa518c86611b528a8d389868 git-manpages-1.5.3.3.tar.bz2 147278
+SHA256 fe57dc04e6e9c7ea3e6b28d04c355740b73639aa880d6b1dd64c71d009942410 git-manpages-1.5.3.3.tar.bz2 147278
diff --git a/dev-util/git/git-1.5.3.3.ebuild b/dev-util/git/git-1.5.3.3.ebuild
new file mode 100644
index 000000000000..fc5d2a107e67
--- /dev/null
+++ b/dev-util/git/git-1.5.3.3.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.3.3.ebuild,v 1.1 2007/09/30 12:01:34 ferdy 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 ~x86 ~x86-fbsd"
+IUSE="curl doc elibc_uclibc emacs gtk mozsha1 perl ppcsha1 tk webdav"
+
+DEPEND="
+	!app-misc/git
+	dev-libs/openssl
+	sys-libs/zlib
+	dev-lang/perl
+	tk?     ( dev-lang/tk )
+	curl?   ( net-misc/curl )
+	webdav? ( dev-libs/expat )
+	emacs?  ( virtual/emacs )"
+RDEPEND="${DEPEND}
+	perl?   ( dev-perl/Error )
+	gtk?    ( >=dev-python/pygtk-2.8 )"
+
+SITEFILE=71${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 elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease"
+
+	export MY_MAKEOPTS=${myopts}
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+src_unpack() {
+	unpack ${A}
+	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
+}
+
+src_install() {
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \
+		die "make install failed"
+
+	use tk || rm "${D}"/usr/bin/git{k,-gui}
+
+	doman "${WORKDIR}"/man?/*
+
+	dodoc README COPYING Documentation/SubmittingPatches
+	if use doc ; then
+		dodoc Documentation/technical/*
+		dodir /usr/share/doc/${PF}/html
+		cp -r "${WORKDIR}"/{*.html,howto} "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	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}"
+	fi
+
+	if use gtk ; then
+		dobin contrib/gitview/gitview
+		use doc && dodoc contrib/gitview/gitview.txt
+	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() {
+	cd "${S}"
+	has_version dev-util/subversion || \
+		MY_MAKEOPTS="${MY_MAKEOPTS} NO_SVN_TESTS=YesPlease"
+	has_version app-arch/unzip || \
+		rm "${S}"/t/t5000-tar-tree.sh
+	# Stupid CVS won't let some people commit as root
+	rm "${S}"/t/t9200-git-cvsexportcommit.sh
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-archimport "dev-util/tla"
+	showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1"
+	showpkgdeps git-svnimport "dev-util/subversion(USE=perl)"
+	showpkgdeps git-svn \
+		"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(SLOT=2) )"
+	showpkgdeps git-send-email "USE=perl"
+	showpkgdeps git-remote "USE=perl"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}