Merge commit '27a88259e99ef93cf6045a6ee3e3e31722c33c3a'

4 files changed, 3 insertions, 49 deletions

diff --git a/metadata/news/2015-02-04-portage-sync-changes/2015-02-04-portage-sync-changes.en.txt b/metadata/news/2015-02-04-portage-sync-changes/2015-02-04-portage-sync-changes.en.txt
index 5a2d2124ba42..aeff021602be 100644
--- a/metadata/news/2015-02-04-portage-sync-changes/2015-02-04-portage-sync-changes.en.txt
+++ b/metadata/news/2015-02-04-portage-sync-changes/2015-02-04-portage-sync-changes.en.txt
@@ -4,7 +4,7 @@ Content-Type: text/plain
 Posted: 2015-02-02
 Revision: 1
 News-Item-Format: 1.0
-Display-If-Installed: sys-apps/portage
+Display-If-Installed: <sys-apps/portage-2.3.62
 
 There is a new plug-in sync system in >=sys-apps/portage-2.2.16.
 This system will allow third party modules to be easily installed.  Look
diff --git a/metadata/news/2018-01-30-portage-rsync-verification/2018-01-30-portage-rsync-verification.en.txt b/metadata/news/2018-01-30-portage-rsync-verification/2018-01-30-portage-rsync-verification.en.txt
index 1964855e4d1a..0e7fd910d7c8 100644
--- a/metadata/news/2018-01-30-portage-rsync-verification/2018-01-30-portage-rsync-verification.en.txt
+++ b/metadata/news/2018-01-30-portage-rsync-verification/2018-01-30-portage-rsync-verification.en.txt
@@ -3,7 +3,7 @@ Author: Michał Górny <mgorny@gentoo.org>
 Posted: 2018-01-30
 Revision: 1
 News-Item-Format: 2.0
-Display-If-Installed: sys-apps/portage
+Display-If-Installed: <sys-apps/portage-2.3.62
 
 Starting with sys-apps/portage-2.3.21, Portage will verify the Gentoo
 repository after rsync by default.
diff --git a/metadata/news/2018-03-13-portage-rsync-verification-unstable/2018-03-13-portage-rsync-verification-unstable.en.txt b/metadata/news/2018-03-13-portage-rsync-verification-unstable/2018-03-13-portage-rsync-verification-unstable.en.txt
deleted file mode 100644
index 9f96f2719235..000000000000
--- a/metadata/news/2018-03-13-portage-rsync-verification-unstable/2018-03-13-portage-rsync-verification-unstable.en.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-Title: Portage rsync tree verification unstable
-Author: Zac Medico <zmedico@gentoo.org>
-Posted: 2018-03-13
-Revision: 1
-News-Item-Format: 2.0
-Display-If-Installed: sys-apps/portage
-
-Portage rsync tree verification is being temporarily turned off by
-default, starting with sys-apps/portage-2.3.24. This permits
-stabilization of sys-apps/portage-2.3.24 while still working on bugs
-relating to tree verification [1]: deadlocks [2] & key fetching [3].
-
-If users wish to enable the 'rsync-verify' USE flag for sys-apps/portage,
-they need to follow these steps:
-
-1) In order to unmask the 'rsync-verify' USE flag, create a file named
-/etc/portage/profile/package.use.mask containing a line like the
-following:
-
-    sys-apps/portage -rsync-verify
-
-2) Once the 'rsync-verify' USE flag has been unmasked as described
-in step 1, it can be enabled with a line like the following in
-/etc/portage/package.use:
-
-    sys-apps/portage rsync-verify
-
-3) After the configuration changes in steps 1 and 2 have been made, run
-the following command:
-
-    emerge --oneshot --newuse '>=sys-apps/portage-2.3.24'
-
-After all above steps are successfully completed, a line like the
-following should appear in the emerge --info output for the gentoo
-repository:
-
-    sync-rsync-verify-metamanifest: yes
-
-If you wish to disable it for some reason, you can set
-'sync-rsync-verify-metamanifest = no' in your repos.conf.
-
-[1] https://bugs.gentoo.org/650144 sys-apps/portage: [TRACKER] issues
-    related to 'rsync-verify' USE flag
-[2] https://bugs.gentoo.org/647964 app-portage/gemato-11.2: deadlock?
-[3] https://bugs.gentoo.org/649276 sys-apps/portage: gpg key refresh
-    needs exponential backoff with jitter
diff --git a/metadata/news/2018-07-11-portage-sync-allow-hardlinks/2018-07-11-portage-sync-allow-hardlinks.en.txt b/metadata/news/2018-07-11-portage-sync-allow-hardlinks/2018-07-11-portage-sync-allow-hardlinks.en.txt
index d64f0cb3fe36..18dc6b395842 100644
--- a/metadata/news/2018-07-11-portage-sync-allow-hardlinks/2018-07-11-portage-sync-allow-hardlinks.en.txt
+++ b/metadata/news/2018-07-11-portage-sync-allow-hardlinks/2018-07-11-portage-sync-allow-hardlinks.en.txt
@@ -3,7 +3,7 @@ Author: Zac Medico <zmedico@gentoo.org>
 Posted: 2018-07-11
 Revision: 1
 News-Item-Format: 2.0
-Display-If-Installed: sys-apps/portage
+Display-If-Installed: <sys-apps/portage-2.3.62
 
 For users of the rsync tree, beginning with sys-apps/portage-2.3.42,
 the default behavior for sync operations will use hardlinks in order