New upstream version, remove a buggy one.

Package-Manager: portage-2.1.1

4 files changed, 184 insertions, 8 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index ee728c106cc3..361035d9ea05 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.136 2006/10/21 13:22:09 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.137 2006/10/21 23:09:35 ferdy Exp $
+
+*git-1.4.3.1 (21 Oct 2006)
+
+  21 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.ebuild,
+  +git-1.4.3.1.ebuild:
+  New upstream version, remove a buggy one.
 
   21 Oct 2006; <nixnut@gentoo.org> git-1.4.2.4.ebuild:
   Stable on ppc wrt bug 151669
diff --git a/dev-util/git/files/digest-git-1.4.3.1 b/dev-util/git/files/digest-git-1.4.3.1
new file mode 100644
index 000000000000..f5234281b995
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.4.3.1
@@ -0,0 +1,9 @@
+MD5 8e810337f9ce908acd5cffc31d4dab21 git-1.4.3.1.tar.bz2 859292
+RMD160 0256ba4df5f1ac654ee782b11cf168dcb0308a27 git-1.4.3.1.tar.bz2 859292
+SHA256 47e49261f0d4e8733de3f90d6be8b445fae0634b125a433c8110039bf485349a git-1.4.3.1.tar.bz2 859292
+MD5 0bf4ddade81d032f51c922150b654e16 git-htmldocs-1.4.3.1.tar.bz2 301586
+RMD160 d2e8a93c593f25b73c2bab173163e7364361d8e1 git-htmldocs-1.4.3.1.tar.bz2 301586
+SHA256 f9376688169ee331913b2130134de39972d7aaa47135017112b9abff72304cb3 git-htmldocs-1.4.3.1.tar.bz2 301586
+MD5 733509686ef995671909bc3725b10d8b git-manpages-1.4.3.1.tar.bz2 96649
+RMD160 b1eba204ea72c2a673678ec453ca1eb46f5d5e2e git-manpages-1.4.3.1.tar.bz2 96649
+SHA256 378a698fab917e3bccb1b1f842a11dead60e9201dee7f0cca9b80e19754a9ed2 git-manpages-1.4.3.1.tar.bz2 96649
diff --git a/dev-util/git/git-1.4.3.1.ebuild b/dev-util/git/git-1.4.3.1.ebuild
new file mode 100644
index 000000000000..d5087b971599
--- /dev/null
+++ b/dev-util/git/git-1.4.3.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.4.3.1.ebuild,v 1.1 2006/10/21 23:09:36 ferdy Exp $
+
+inherit python toolchain-funcs eutils elisp-common perl-module
+
+DOC_VER=${PV}
+
+DESCRIPTION="GIT - the stupid content tracker"
+HOMEPAGE="http://kernel.org/pub/software/scm/git/"
+SRC_URI="mirror://kernel/software/scm/git/${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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="curl doc elibc_uclibc emacs gtk mozsha1 ppcsha1 tk webdav"
+
+DEPEND="dev-libs/openssl
+		sys-libs/zlib
+		!app-misc/git
+		curl? ( net-misc/curl )
+		webdav? ( dev-libs/expat )
+		emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}
+		dev-lang/perl
+		>=dev-lang/python-2.3
+		app-text/rcs
+		tk? ( dev-lang/tk )
+		gtk? ( >=dev-python/pygtk-2.6 )"
+
+# 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"
+
+	# Older python versions need own subproccess.py
+	python_version
+	[[ ${PYVER} < 2.4 ]] && myopts="${myopts} WITH_OWN_SUBPROCESS_PY=YesPlease"
+
+	use elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease"
+
+	export MY_MAKEOPTS=${myopts}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	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
+}
+
+src_install() {
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || die "make install failed"
+
+	use tk || rm "${D}"/usr/bin/gitk
+
+	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
+
+	if use emacs ; then
+		insinto "${SITELISP}"
+		doins contrib/emacs/{,vc-}git.el*
+		elisp-site-file-install "${FILESDIR}"/70git-gentoo.el
+	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"
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	einfo
+	einfo "If you want to import arch repositories into git, consider using the"
+	einfo "git-archimport command. You should install dev-util/tla before."
+	einfo
+	einfo "If you want to import cvs repositories into git, consider using the"
+	einfo "git-cvsimport command. You should install >=dev-util/cvsps-2.1 before."
+	einfo
+	einfo "If you want to import svn repositories into git, consider using the"
+	einfo "git-svnimport command. You should install dev-util/subversion before."
+	einfo
+	einfo "If you want to manage subversion repositories using git, consider"
+	einfo "using git-svn. You should install dev-util/subversion and dev-perl/libwww-perl."
+	einfo
+	einfo "If you want to import a quilt series into git, consider using the"
+	einfo "git-quiltimport command. You should install dev-util/quilt before."
+	einfo
+	einfo "If you want to use the included CVS server you will need to install"
+	einfo "dev-perl/DBI and dev-perl/DBD-SQLite."
+	einfo
+}
+
+pkg_postrm() {
+	# regenerate site-gentoo if we are merged USE=emacs and unmerged
+	# USE=-emacs
+	has_version virtual/emacs && elisp-site-regen
+}
diff --git a/dev-util/stgit/Manifest b/dev-util/stgit/Manifest
index ea5a4b09a04a..e52d35ab53e2 100644
--- a/dev-util/stgit/Manifest
+++ b/dev-util/stgit/Manifest
@@ -2,14 +2,19 @@
 Hash: SHA1
 
 DIST stgit-0.10.tar.gz 83839 RMD160 da5fcd0f39c49bb0c662244f805694769191be3e SHA1 9162b2a9bd48893017646470ed666a35b7f17653 SHA256 5917511eab59ce8e88068b0868bf43b2d53ddb98ee6d22588785cd24d530ac8d
+DIST stgit-0.11.tar.gz 90207 RMD160 c9d4f444a91b3775c25fb7c15c353e7736e99cb5 SHA1 fd07b192716b622de41e282c6658a88cccba6771 SHA256 63dbc3619345e733101ec096ccf90e02f8e0b3436ded161ba3e02a45415ac1ba
 EBUILD stgit-0.10.ebuild 725 RMD160 079593dbcffe8ed294bfa9a7103489c4fc25cfee SHA1 112c3a97ce6978952f3e6aabea65aa651abce8d7 SHA256 00cc5aae20b42b7dd14fe402f58883ac252827d8e05d7cd4cea382a74f902809
 MD5 8703837114ee2eab4d8b384711874804 stgit-0.10.ebuild 725
 RMD160 079593dbcffe8ed294bfa9a7103489c4fc25cfee stgit-0.10.ebuild 725
 SHA256 00cc5aae20b42b7dd14fe402f58883ac252827d8e05d7cd4cea382a74f902809 stgit-0.10.ebuild 725
-MISC ChangeLog 2326 RMD160 846196f574594bc42c6442b55badb38594cdbf30 SHA1 4b3418fe3b0a7286ac35b6c2b679ea1dfe2c97da SHA256 06e6e36a7764c46bee362b04d7fa69996e8cc22a7abd2223507b25c3d4cdb19d
-MD5 01f61c2e62adbac238568cbdb9e707fd ChangeLog 2326
-RMD160 846196f574594bc42c6442b55badb38594cdbf30 ChangeLog 2326
-SHA256 06e6e36a7764c46bee362b04d7fa69996e8cc22a7abd2223507b25c3d4cdb19d ChangeLog 2326
+EBUILD stgit-0.11.ebuild 730 RMD160 d73716f9073410707aabce2604e0ede34c18af45 SHA1 a3c11912ccf2268af1a946d878eacadadbcc3bfd SHA256 b0aaa80ec755b6bc1a3124a45c0e2bbbcecc35048c489115525f0507cb41f107
+MD5 886ee0c1b1c0c765549b505ef4ab881b stgit-0.11.ebuild 730
+RMD160 d73716f9073410707aabce2604e0ede34c18af45 stgit-0.11.ebuild 730
+SHA256 b0aaa80ec755b6bc1a3124a45c0e2bbbcecc35048c489115525f0507cb41f107 stgit-0.11.ebuild 730
+MISC ChangeLog 2451 RMD160 22074489a8c947a4a91955824ca9a2e87161f0cf SHA1 e1e3f23d01880be01528464ed4785e9346ce478c SHA256 0684bd2743de29b8d10df699a7db11021f7d535b8a0cb12c3206c29e4e72cc26
+MD5 222f2d66eb0c6c4f2f43fc290ef2237a ChangeLog 2451
+RMD160 22074489a8c947a4a91955824ca9a2e87161f0cf ChangeLog 2451
+SHA256 0684bd2743de29b8d10df699a7db11021f7d535b8a0cb12c3206c29e4e72cc26 ChangeLog 2451
 MISC metadata.xml 259 RMD160 b137bd5e523bc5e09ad7969c3013260327fd731e SHA1 2795fa96027e7293735f3f041a9e15ec57215b98 SHA256 b0892c824c698ba753c5c05f431e326eb598e229b9759fbc0089e68d48ea76b0
 MD5 b32bfee3c12fac430c39b4247b8ff31f metadata.xml 259
 RMD160 b137bd5e523bc5e09ad7969c3013260327fd731e metadata.xml 259
@@ -17,10 +22,13 @@ SHA256 b0892c824c698ba753c5c05f431e326eb598e229b9759fbc0089e68d48ea76b0 metadata
 MD5 4eb05a10ed47fde55d0661689057fb5d files/digest-stgit-0.10 229
 RMD160 98a2804571864f97763c03f3b530bd4c4ede6479 files/digest-stgit-0.10 229
 SHA256 c46d432a8827367b12ca935f8800645c8a857ea302ac33e1062f50725a72e42e files/digest-stgit-0.10 229
+MD5 4f157c972a2084d19fa385ce4429dc77 files/digest-stgit-0.11 229
+RMD160 e6aa05bc15daac3cad53a5e674e6ac40f0628b6b files/digest-stgit-0.11 229
+SHA256 1ac7edc954afd55872b1b985e5e50714cef0b712f4fb46c00835d24389d137d0 files/digest-stgit-0.11 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFFGtLoViELBEf1JB0RAtoPAJ9HO7XaVPiflH9VwnHA5whKZQEkoQCeKwSQ
-3qTWPHtcbPkkzrR4X822sQQ=
-=OyFC
+iD8DBQFFOqmNViELBEf1JB0RAilJAKCBbP64nYbqqx+7r7QWm6T1XDPw3wCfeEqi
+oxvQTtyoZWAjM0TifnOjnmQ=
+=hblC
 -----END PGP SIGNATURE-----