From 105e79a09d03efb4f78e98eba7453c8cce750f12 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Fri, 30 Jan 2009 21:26:11 +0000
Subject: [PATCH]    Merged from trunk -r12552:12556

   | 12553   | Inside fetch(), only mention /var/log/emerge-fetch.log in    |
   | zmedico | locking messages when called by emerge.                      |

   | 12554   | Remove the emerge-fetch.log lock message code from fetch()   |
   | zmedico | since this is handled by the EbuildBuild class when it       |
   |         | synchronizes with the prefetcher.                            |

   | 12555   | Add messages before and after the src_prepare phase. Thanks  |
   | zmedico | to Arfrever for this patch.                                  |

   | 12556   | Fix die() usage in ebuild phase examples. Thanks to Jeremy   |
   | zmedico | Olexa <darkside@g.o> for this patch.                         |

svn path=/main/branches/prefix/; revision=12563
---
 bin/ebuild.sh           |  2 ++
 man/ebuild.5            |  7 +++----
 pym/portage/__init__.py | 13 -------------
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 64250ccf9..0ce6f896e 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -896,8 +896,10 @@ dyn_prepare() {
 	trap abort_prepare SIGINT SIGQUIT
 
 	ebuild_phase pre_src_prepare
+	vecho ">>> Preparing source in $srcdir ..."
 	ebuild_phase src_prepare
 	touch "$PORTAGE_BUILDDIR"/.prepared
+	vecho ">>> Source prepared."
 	ebuild_phase post_src_prepare
 
 	trap SIGINT SIGQUIT
diff --git a/man/ebuild.5 b/man/ebuild.5
index 50a54a0b0..cbac04bac 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -25,7 +25,7 @@ inherit some_eclass another_eclass
 
 DESCRIPTION="Super\-useful stream editor (sed)"
 HOMEPAGE="http://www.gnu.org/software/sed/sed.html"
-SRC_URI="ftp://alpha.gnu.org/pub/gnu/sed/${P}.tar.gz"
+SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL\-2"
 SLOT="0"
@@ -37,14 +37,13 @@ DEPEND="nls? ( sys-devel/gettext )"
 
 src_compile() {
 	econf \\
-		\-\-bindir="${EPREFIX}"/bin \\
-		|| die "could not configure"
+		\-\-bindir="${EPREFIX}"/bin
 	emake || die "emake failed"
 }
 
 src_install() {
 	emake install DESTDIR="${D}" || die "Install failed"
-	dodoc NEWS README* THANKS AUTHORS BUGS ChangeLog
+	dodoc NEWS README* THANKS AUTHORS BUGS ChangeLog || die "dodoc failed"
 }
 .fi
 .SH "VARIABLES"
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index d95e77b44..c9782f294 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3739,17 +3739,6 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
 					has_space = False
 
 			if distdir_writable and use_locks:
-				waiting_msg = None
-				if not parallel_fetchonly and "parallel-fetch" in features:
-					waiting_msg = ("Fetching '%s' " + \
-						"in the background. " + \
-						"To view fetch progress, run `tail -f " + \
-						EPREFIX + "/var/log/emerge-fetch.log` in another " + \
-						"terminal.") % myfile
-					msg_prefix = colorize("GOOD", " * ")
-					from textwrap import wrap
-					waiting_msg = "\n".join(msg_prefix + line \
-						for line in wrap(waiting_msg, 65))
 
 				if locks_in_subdir:
 					lock_file = os.path.join(mysettings["DISTDIR"],
@@ -3760,8 +3749,6 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
 				lock_kwargs = {}
 				if fetchonly:
 					lock_kwargs["flags"] = os.O_NONBLOCK
-				else:
-					lock_kwargs["waiting_msg"] = waiting_msg
 
 				try:
 					file_lock = portage.locks.lockfile(myfile_path,
-- 
2.26.2