From ddd0c4a77dbbc48e65565a392b00949f71c18778 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 18 May 2013 11:47:03 -0700
Subject: [PATCH] docs: metadata/cache is now md5-cache bug #470154

---
 bin/egencache   | 10 +++++-----
 man/egencache.1 |  8 ++++----
 man/emerge.1    |  4 ++--
 man/make.conf.5 | 12 +++---------
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/bin/egencache b/bin/egencache
index 59d5c3bd7..133903d8e 100755
--- a/bin/egencache
+++ b/bin/egencache
@@ -82,7 +82,7 @@ def parse_args(args):
 	actions = optparse.OptionGroup(parser, 'Actions')
 	actions.add_option("--update",
 		action="store_true",
-		help="update metadata/cache/ (generate as necessary)")
+		help="update metadata/md5-cache/ (generate as necessary)")
 	actions.add_option("--update-use-local-desc",
 		action="store_true",
 		help="update the use.local.desc file from metadata.xml")
@@ -387,8 +387,8 @@ class GenCache(object):
 				self.returncode |= 1
 				writemsg_level(
 					"Error listing cache entries for " + \
-					"'%s/metadata/cache': %s, continuing...\n" % \
-					(self._portdb.porttree_root, ce),
+					"'%s': %s, continuing...\n" % \
+					(trg_cache.location, ce),
 					level=logging.ERROR, noiselevel=-1)
 
 		else:
@@ -409,8 +409,8 @@ class GenCache(object):
 				self.returncode |= 1
 				writemsg_level(
 					"Error listing cache entries for " + \
-					"'%s/metadata/cache': %s, continuing...\n" % \
-					(self._portdb.porttree_root, ce),
+					"'%s': %s, continuing...\n" % \
+					(trg_cache.location, ce),
 					level=logging.ERROR, noiselevel=-1)
 
 		if cp_missing:
diff --git a/man/egencache.1 b/man/egencache.1
index 7f942c799..825a300f2 100644
--- a/man/egencache.1
+++ b/man/egencache.1
@@ -1,4 +1,4 @@
-.TH "EGENCACHE" "1" "Dec 2012" "Portage VERSION" "Portage"
+.TH "EGENCACHE" "1" "May 2013" "Portage VERSION" "Portage"
 .SH "NAME"
 egencache \- generate metadata cache for ebuild repositories
 .SH "SYNOPSIS"
@@ -6,12 +6,12 @@ egencache \- generate metadata cache for ebuild repositories
 .I [options] --update [ATOM]\fR...
 .SH "DESCRIPTION"
 The egencache program generates metadata cache for ebuild repositories and
-stores it in the \fImetadata/cache/\fR directory within the repository itself,
-for distribution.
+stores it in the \fImetadata/md5\-cache/\fR directory within the repository
+itself, for distribution.
 .SH ACTIONS
 .TP
 .BR "\-\-update [ATOM] ... "
-Update the \fImetadata/cache/\fR directory (generate metadata as necessary).
+Update the \fImetadata/md5\-cache/\fR directory (generate metadata as necessary).
 If no package atoms are specified then all will be updated. See ebuild(5)
 for the details on package atom syntax.
 .TP
diff --git a/man/emerge.1 b/man/emerge.1
index 23b023cf0..b4b5002a4 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1,4 +1,4 @@
-.TH "EMERGE" "1" "Feb 2013" "Portage VERSION" "Portage"
+.TH "EMERGE" "1" "May 2013" "Portage VERSION" "Portage"
 .SH "NAME"
 emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"
@@ -170,7 +170,7 @@ with the \fI\-\-verbose\fR option.
 Displays a list of available package sets.
 .TP
 .BR \-\-metadata
-Transfers metadata cache from ${PORTDIR}/metadata/cache/ to
+Transfers metadata cache from ${PORTDIR}/metadata/md5\-cache/ to
 /var/cache/edb/dep/ as is normally done on the
 tail end of an rsync update using \fBemerge \-\-sync\fR.  This process
 populates the cache database that portage uses for pre-parsed lookups of
diff --git a/man/make.conf.5 b/man/make.conf.5
index f54c93f28..9b4121ce6 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Apr 2013" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "May 2013" "Portage VERSION" "Portage"
 .SH "NAME"
 make.conf \- custom settings for Portage
 .SH "SYNOPSIS"
@@ -391,14 +391,8 @@ This feature is enabled by default.
 Automatically perform a metadata transfer when `emerge \-\-sync` is run.
 In versions of portage >=2.1.5, this feature is disabled by
 default. When metadata\-transfer is disabled, metadata cache from the
-${PORTDIR}/metadata/cache/ directory will be used directly (if available)
-and eclasses in ${PORTDIR}/eclass/ must not be modified except by
-`emerge \-\-sync` operations since the cache validation mechanism
-will not recognize eclass modifications. Normally, this issue only
-pertains to users of the rsync tree since the cvs tree does not contain
-a metadata/cache/ directory. Users of the rsync tree who want to modify
-eclasses should use \fBPORTDIR_OVERLAY\fR in order for the cache
-validation mechanism to work correctly.
+${PORTDIR}/metadata/md5\-cache/ directory will be used directly
+(if available).
 .TP
 .B mirror
 Fetch everything in \fBSRC_URI\fR regardless of \fBUSE\fR settings,
-- 
2.26.2