provide a custom src_test since the default one fails. fix one pkg_postinst einfo. remove 0.99.8{b,c}

(Portage version: 2.0.51.22-r3)

6 files changed, 18 insertions, 111 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 22c2caa4fd4c..f9993f0f5b3f 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.31 2005/10/11 00:58:49 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.32 2005/10/14 15:13:43 ferdy Exp $
+
+*git-0.99.8c-r1 (14 Oct 2005)
+
+  14 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.8b.ebuild,
+  -git-0.99.8c.ebuild, +git-0.99.8c-r1.ebuild:
+  provide a custom src_test since the default one fails. fix one pkg_postinst
+  einfo. remove 0.99.8{b,c}
 
 *git-0.99.8c (11 Oct 2005)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 7ef7bbb7a05d..e42b005d29ee 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,5 +1,6 @@
 MD5 d35a0c0793dbfc65191588d2eca405d1 git-0.99.8a.ebuild 2835
 MD5 134e1de50624a1500a842e644ac4617e git-0.99.8c.ebuild 2921
+MD5 96bf9e6348415093decc7f01cbe6cbb0 git-0.99.8c-r1.ebuild 2957
 MD5 edebd592261315b29a6b903b414573d2 git-0.7.ebuild 1312
 MD5 37b46b1dfe818b2bf62ee6b8f576d682 git-0.99.8b.ebuild 2921
 MD5 bece04f1ff8a2020d9f15749fc738044 ChangeLog 4728
@@ -10,3 +11,4 @@ MD5 62316f61a79143fdaf1e9f747d1ddf03 files/digest-git-0.99.8a 69
 MD5 fd5868fcfa11211c2a38977cb3a252c8 files/digest-git-0.99.8b 69
 MD5 c54bcb57e21a5986c4befcf024d75e18 files/digest-git-0.99.8c 69
 MD5 8ebc37d29c321b95a3c0ae51ebee4d4d files/digest-git-0.7 59
+MD5 c54bcb57e21a5986c4befcf024d75e18 files/digest-git-0.99.8c-r1 69
diff --git a/dev-util/git/files/digest-git-0.99.8b b/dev-util/git/files/digest-git-0.99.8b
deleted file mode 100644
index b1ab81386784..000000000000
--- a/dev-util/git/files/digest-git-0.99.8b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e3f151e028e04c8193fc0326a9a15038 git-core-0.99.8b.tar.bz2 366605
diff --git a/dev-util/git/files/digest-git-0.99.8c b/dev-util/git/files/digest-git-0.99.8c-r1
index e33005db531d..e33005db531d 100644
--- a/dev-util/git/files/digest-git-0.99.8c
+++ b/dev-util/git/files/digest-git-0.99.8c-r1
diff --git a/dev-util/git/git-0.99.8b.ebuild b/dev-util/git/git-0.99.8c-r1.ebuild
index a85145be0884..75bde2bf2e3a 100644
--- a/dev-util/git/git-0.99.8b.ebuild
+++ b/dev-util/git/git-0.99.8c-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-0.99.8b.ebuild,v 1.1 2005/10/06 20:04:01 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-0.99.8c-r1.ebuild,v 1.1 2005/10/14 15:13:43 ferdy Exp $
 
 inherit python
 
@@ -88,6 +88,11 @@ src_install() {
 	newconfd "${FILESDIR}/git-daemon.confd" git-daemon
 }
 
+src_test() {
+	cd ${S}
+	make test || die "tests failed"
+}
+
 pkg_postinst() {
 	echo
 	ewarn "Some commands will be renamed before the final 1.0. Use the git"
@@ -98,9 +103,9 @@ pkg_postinst() {
 	echo
 	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 "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"
+	einfo "git-cvsimport command. You should install >=dev-util/cvsps-2.1 before"
 	einfo
 }
diff --git a/dev-util/git/git-0.99.8c.ebuild b/dev-util/git/git-0.99.8c.ebuild
deleted file mode 100644
index 72b094152299..000000000000
--- a/dev-util/git/git-0.99.8c.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-0.99.8c.ebuild,v 1.1 2005/10/11 00:58:49 r3pek Exp $
-
-inherit python
-
-DESCRIPTION="GIT - the stupid content tracker"
-HOMEPAGE="http://kernel.org/pub/software/scm/git/"
-SRC_URI="http://kernel.org/pub/software/scm/git/${PN}-core-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="mozsha1 ppcsha1 doc curl tcltk gitsendemail"
-S="${WORKDIR}/${PN}-core-${PV}"
-
-DEPEND="dev-libs/openssl
-		sys-libs/zlib
-		app-text/rcs
-		!app-misc/git
-		doc? ( >=app-text/asciidoc-7.0.1 app-text/xmlto )"
-RDEPEND="${DEPEND}
-		dev-lang/perl
-		>=dev-lang/python-2.3
-		tcltk? ( dev-lang/tk )
-		curl? ( net-misc/curl )
-		dev-perl/String-ShellQuote
-		gitsendemail? ( dev-perl/Mail-Sendmail dev-perl/Email-Valid )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e "s:-g -O2:${CFLAGS}:" \
-		Makefile
-}
-
-src_compile() {
-	# Use python_version to check for python 2.4.
-	# If the user don't have version 2.4 have then we set WITH_OWN_SUBPROCESS_PY
-	# that makes use of a suplied version of subprocess.py
-	python_version()
-	[[ $PYVER < 2.4 ]] && export WITH_OWN_SUBPROCESS_PY=yes
-
-	if use mozsha1 ; then
-		export MOZILLA_SHA1=yes
-	elif use ppcsha1 ; then
-		export PPC_SHA1=yes
-	fi
-
-	if ! use curl; then
-		export NO_CURL=yes
-		ewarn "git-http-pull will not be built because you are not"
-		ewarn " using the curl use flag"
-	fi
-
-	use gitsendemail && export WITH_SEND_EMAIL=yes
-
-	emake prefix=/usr || die "make failed"
-
-	if use doc ; then
-		sed -i \
-			-e "s:^\(WEBDOC_DEST = \).*$:\1${D}/usr/share/doc/${PF}/html/:g" \
-			${S}/Documentation/Makefile || die "sed failed (Documentation)"
-		emake -C Documentation/ || die "make documentation failed"
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} prefix=/usr install || die "make install failed"
-
-	if use gitsendemail ; then
-		exeinto /usr/bin
-		newexe git-send-email.perl git-send-email
-	else
-		sed -i -e '/^send-email *$/d' ${D}/usr/bin/git
-	fi
-
-	use tcltk || rm ${D}/usr/bin/gitk
-
-	dodoc README COPYING
-	if use doc ; then
-		doman Documentation/*.1 Documentation/*.7
-		make install-webdoc -C Documentation/
-	fi
-
-	newinitd "${FILESDIR}/git-daemon.initd" git-daemon
-	newconfd "${FILESDIR}/git-daemon.confd" git-daemon
-}
-
-pkg_postinst() {
-	echo
-	ewarn "Some commands will be renamed before the final 1.0. Use the git"
-	ewarn "wrapper in your scripts to avoid compatibility problems. Check the"
-	ewarn "changes table at:"
-	echo
-	echo "http://dev.gentoo.org/~r3pek/git-new-command-list.txt"
-	echo
-	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"
-	einfo
-}