sys-apps/portage-mgorny: Remove last-rited pkg

Closes: https://bugs.gentoo.org/683744
Signed-off-by: Michał Górny <mgorny@gentoo.org>

7 files changed, 5 insertions, 19 deletions

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 04fc8f63c525..02cab1459945 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -81,7 +81,6 @@ dev-lang/python-exec python_targets_pypy3
 # bug #315615, and makes subshell die support more robust
 # (so that repoman's ebuild.nesteddie check is irrelevant).
 sys-apps/portage ipc
-sys-apps/portage-mgorny ipc
 
 # Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
 # Python should use wide Unicode implementation by default.
diff --git a/profiles/default/bsd/fbsd/package.use.mask b/profiles/default/bsd/fbsd/package.use.mask
index 2a37504795be..2b1cdf985b06 100644
--- a/profiles/default/bsd/fbsd/package.use.mask
+++ b/profiles/default/bsd/fbsd/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (06 Apr 2018)
@@ -112,4 +112,3 @@ sys-apps/hwloc numa
 # Naohiro Aota <naota@gentoo.org> (07 Jul 2014)
 # xattr support is not available on BSD #501534
 sys-apps/portage xattr
-sys-apps/portage-mgorny xattr
diff --git a/profiles/features/hardened/package.use.force b/profiles/features/hardened/package.use.force
index 9b56509d22fc..28c4aed893e2 100644
--- a/profiles/features/hardened/package.use.force
+++ b/profiles/features/hardened/package.use.force
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Needed for XATTR_PAX flags
 app-arch/tar xattr
 sys-apps/coreutils xattr
 sys-apps/portage xattr
-sys-apps/portage-mgorny xattr
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index c143824e7072..71af7dd6cd4d 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Jeroen Roovers <jer@gentoo.org> (23 Feb 2019)
@@ -8,7 +8,6 @@ net-analyzer/wireshark sdjournal
 # Brian Dolbec <dolsen@gentoo.org> (17 Sep 2014)
 # mask pypy for several utilities due to incompatibility with libselinux
 sys-apps/portage python_targets_pypy python_targets_pypy3
-sys-apps/portage-mgorny python_targets_pypy python_targets_pypy3
 app-portage/gentoolkit python_targets_pypy python_targets_pypy3
 app-portage/layman python_targets_pypy python_targets_pypy3
 app-admin/webapp-config python_targets_pypy python_targets_pypy3
diff --git a/profiles/hardened/linux/package.use.force b/profiles/hardened/linux/package.use.force
index 9b56509d22fc..28c4aed893e2 100644
--- a/profiles/hardened/linux/package.use.force
+++ b/profiles/hardened/linux/package.use.force
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Needed for XATTR_PAX flags
 app-arch/tar xattr
 sys-apps/coreutils xattr
 sys-apps/portage xattr
-sys-apps/portage-mgorny xattr
diff --git a/profiles/package.mask b/profiles/package.mask
index 84551a624820..66039068dafd 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -460,14 +460,6 @@ dev-python/pygccxml
 dev-python/pyplusplus
 
 # Michał Górny <mgorny@gentoo.org> (18 Apr 2019)
-# Diverged too far from upstream Portage, and I don't have time anymore
-# to update or rebase it.  The most significant features were merged
-# back upstream, some more are waiting, the rest is customization
-# and some aggressive QA bits.  Use sys-apps/portage instead.
-# Removal in 30 days.  Bug #683744.
-sys-apps/portage-mgorny
-
-# Michał Górny <mgorny@gentoo.org> (18 Apr 2019)
 # All current versions of SystemRescueCD contain vulnerable packages.
 # Bug #683724.
 app-admin/systemrescuecd-x86
diff --git a/profiles/prefix/package.use.mask b/profiles/prefix/package.use.mask
index 49a1219196b1..454722cd311c 100644
--- a/profiles/prefix/package.use.mask
+++ b/profiles/prefix/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michael Haubenwallner <haubi@gentoo.org> (02 May 2019)
@@ -24,7 +24,6 @@ dev-vcs/git mediawiki mediawiki-experimental
 # very bad with, that really causes way more issues than it is worth to
 # have some boundary bugs solved and more robust subshell die support
 sys-apps/portage ipc
-sys-apps/portage-mgorny ipc
 
 # Michael Haubenwallner <haubi@gentoo.org> (17 Sep 2010)
 # sys-apps/keyutils is a linux only package