gentoo resync : 23.03.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-03-23 04:19:44 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-03-23 04:19:44 +0000
commit: c5283d322accc6097afec74eab24550829788bab (patch)
tree: b99ce668128d82a026eaa31461643f9173f9b77b /app-portage
parent: 5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 (diff)
69 files changed, 280 insertions, 113 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 2cb90323ccf5..db0867b20b67 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/demerge/Manifest b/app-portage/demerge/Manifest
index 9acefb53ccc5..6f260abf0321 100644
--- a/app-portage/demerge/Manifest
+++ b/app-portage/demerge/Manifest
@@ -1,3 +1,3 @@
 DIST demerge-0.047.tar.gz 11142 BLAKE2B aba6e40d9a47032782bafe0bfc77f0bdda7e9782daac56712025c6a544db5624a824cfb1db8b32d2dc61a3e3c561432159eb8208bc5da6f94745ec603a457420 SHA512 6c2d172694516c030c358c9668ff4a1fe54d910583de6829bec0de6e67d428b1853b23f6ccd18fc9286932cb9a2bc5a37bab4b5ce43ddf2dd031c64c2ee6b1ce
-EBUILD demerge-0.047-r2.ebuild 1325 BLAKE2B a6ff9d72a4a41a49011744a0670bffcd708d3cb6e2f78d9041e5055acb88501d44629256d99c4c96fafd014d66d0bbe6843d41eca560d29b170687fb8491e21e SHA512 6c02224548af746e9ac1a406267b6dd7f25d147d3443f85e035a20b5ab4ed75b289bb22d1112207b0e09f39a28d3b63df834e779eba70141739ed608d7d9f7ad
+EBUILD demerge-0.047-r3.ebuild 1364 BLAKE2B 8bac5b8fbbdabe89a6e717cde3fbff04110c5ebfa470d2c90e22a75c8df542a6cdc38e2ead434417ef3a1ba19b9ac528de856cf7cfb09847fddc8c3cbf75b272 SHA512 1110ea8a530420726e16673d9043bada92f11b15200df7b86f39dc92eb6d7f17336621551c5037eda1a4c4233ffadc33835c1668ada324ea6425cc6ad84825c2
 MISC metadata.xml 473 BLAKE2B b5851d52694607cb0f67dcf21d9d383b1076795e2f2d815b3597b78e149a7f3394312a8d092bc6a96b9e20b592eff074d7b38cc72d7110d4384a65cf28857388 SHA512 084e5b4c139be745f253a91466ad38846d047bca3e5c742a46c8795a47c32d027daf727d7bda4b26cb5fada3b1d77fb820ab52d1c250d67cfcd6591c50c4a97d
diff --git a/app-portage/demerge/demerge-0.047-r2.ebuild b/app-portage/demerge/demerge-0.047-r3.ebuild
index acbdfaaa5e9d..980b9722183b 100644
--- a/app-portage/demerge/demerge-0.047-r2.ebuild
+++ b/app-portage/demerge/demerge-0.047-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,10 @@ DEPEND="dev-lang/perl
 		dev-perl/TermReadKey
 		dev-perl/Shell-EnvImporter"
 RDEPEND="${DEPEND}
-		sys-apps/portage"
+		|| (
+			sys-apps/portage
+			sys-apps/portage-mgorny
+		)"
 
 src_prepare() {
 	# Fix path for new make.conf location
diff --git a/app-portage/diffmask/Manifest b/app-portage/diffmask/Manifest
index 7f8f16fe8d15..06d8a3808bb2 100644
--- a/app-portage/diffmask/Manifest
+++ b/app-portage/diffmask/Manifest
@@ -1,4 +1,4 @@
 DIST diffmask-0.3.3.tar.bz2 8605 BLAKE2B a7699dba6b619ff2e64a8148057e06be8d477605fba100b45f056957eb1b55cc50634b698250f68023137bcf01932635c7de798f42edfa1297cc38097e764f44 SHA512 5f28f68dc1adba2fb7b0db5e2a329e46017298de9c44765d521a0f338223eef2a77573636987e942595db9b89b72db93b68cf5b805091b0ebb1e91a18bfcd48b
-EBUILD diffmask-0.3.3-r2.ebuild 529 BLAKE2B 68a9d558fc054cfbe9a694cbfbfba0d192519af484cd483bd149d4d5a6c8a38751c72c410aaa2f6dd3ff592e803f13d0177d5311510d1e26848b9811ac099a29 SHA512 9182358e989ccbdaa955fa2ae676ae4237c51e38f3b4b796f2300136dc6bc0f1c37557d35730d1885ccf1aee865ab76f65a56bd35a5ea43808dcae387be9c9d9
-EBUILD diffmask-9999.ebuild 628 BLAKE2B d79772bc1774b0bd76afc06d7f5d33592e75dadac701e42a39dd87ea5b6c7d41aa09191dd0d688c483d557624a2327bbacc8532c9f69c41f9a7c065ce79e5a2f SHA512 76c25cd8062533cced22c9a95e2cbc8100c3c2f3324ce1eb349906b5bb32d9dadc2b1f3853cb2382f25932844d7ec9bb176edf0c52a80e310edef6fbb0c4e948
+EBUILD diffmask-0.3.3-r3.ebuild 585 BLAKE2B 812f5033b428bd54d0d11b031dc54fc2af310632383b1d2582cca407e1ca2639bf6ffa5672ecbba5ef40862e53f0ece0cdbbc2b4ce222320944d68f574cfaf96 SHA512 c9a52ffdd2397fe5cb88144ae188ec1fe2ace345f8748a9c75f9d2807782b207d990ca6a10e25166ae0735c3a1d5ffbb74ed53324e7240fa5bf24b7bccae9ded
+EBUILD diffmask-9999.ebuild 684 BLAKE2B e1fa01030cf283302e3051c6ca72ad53bb4585dfd80af9b619e94606997a9dd846229d3956b1d0724cb02bdf6ea22176edbc3eb24345e027b50d00e966249e65 SHA512 cde5cfd3956b2349dcc15dbbd6c07d2b4448bcbd3f921dbc374eb884e4add22be204c2227ad39a7f1c827943d341867cc487048c7337cfba62ecc17508496d57
 MISC metadata.xml 871 BLAKE2B 68ec7d532a39561adbcb959e05b223b679f07e19bb68257a9ef6961c25ec5e850e893ed06fd899cee059a57c60655c4ed060cae3bf309adf81400b5e3a3654bf SHA512 98374fb6cc37dac755916a9ea83fc642707c54338a7b4abf151475916be379859f76987d575eb4e4d6d455e7a7081316d8442396d59e5591edef44eca89f72d0
diff --git a/app-portage/diffmask/diffmask-0.3.3-r2.ebuild b/app-portage/diffmask/diffmask-0.3.3-r3.ebuild
index 14598106ea42..1b7c91a0cd0f 100644
--- a/app-portage/diffmask/diffmask-0.3.3-r2.ebuild
+++ b/app-portage/diffmask/diffmask-0.3.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,4 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
diff --git a/app-portage/diffmask/diffmask-9999.ebuild b/app-portage/diffmask/diffmask-9999.ebuild
index 91a23879b64f..3b906ae054ef 100644
--- a/app-portage/diffmask/diffmask-9999.ebuild
+++ b/app-portage/diffmask/diffmask-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
 #if LIVE
 
 KEYWORDS=
diff --git a/app-portage/distpatch/Manifest b/app-portage/distpatch/Manifest
index c691be65432b..5427caf04439 100644
--- a/app-portage/distpatch/Manifest
+++ b/app-portage/distpatch/Manifest
@@ -1,3 +1,3 @@
 DIST distpatch-0.1.2.tar.gz 19998 BLAKE2B 1ede140e1b427df8f35011a025dc81b614c1a372668e41a26bbd02a3ab084b97c504a5de8e288a9d16d75439d0e3393ac13ef8cf49d55620babcee79fd137699 SHA512 f4dd08fd69a5b2030e0b912c1153994bcc03f40af65fff185231a220c110d0e7b5a4acf402d116e9dbfef86b13d17036ca563d0fefd89bc62809e1ecc9acf1ed
-EBUILD distpatch-0.1.2.ebuild 579 BLAKE2B 5075c1a1126583e578c930783ba207957b7ac34a30154faae00c768c8507859caeac997bf9c70319d578f619cea08c9d0c1690df599bd723b94c69d3acaf2048 SHA512 e8ac6b1a92f5a4eaf4d6aa3fa39b5a143be30df91652d0d9796284bdf5ebc29ff552a2a2cce60ea18e51a1c8b1bec443de33be72c912d07428e0afd21b6addf4
+EBUILD distpatch-0.1.2-r1.ebuild 689 BLAKE2B 8d2a423f86303ba72d6bb7fee48a299ae634da7962648febfb3d66addbdbb5bd16006a3984339121a652579a32783a627efa5ef0bfe96af1cb24359296347f8c SHA512 1df97a296228ff408ff7643b8584402f8e49c94db6f695fec41408f34501ca00f46bbde8459adadd065bc0833817103264a6753e2b2a4c75400f3e8a8907eaf7
 MISC metadata.xml 489 BLAKE2B 8e711ca92c6c71f69ad71dbe4253ea4ff8444c5122e408c404d0adfa9b0cbcbe61df31a9ef7f58564109a4a655bcf3fe9d4cbb1e1c5b3d5b7bfff0318355f149 SHA512 bf9e190068b60e9bcf3a857a38a155c7189d0ea00a098e2df94b152218157c03f936ab15e00038edc09aa9583cba1711a57e1a9ef17edb794fef59372b35f08a
diff --git a/app-portage/distpatch/distpatch-0.1.2.ebuild b/app-portage/distpatch/distpatch-0.1.2-r1.ebuild
index f4b74b77721b..5c369d66145e 100644
--- a/app-portage/distpatch/distpatch-0.1.2.ebuild
+++ b/app-portage/distpatch/distpatch-0.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,9 +16,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-CDEPEND=">=sys-apps/portage-2.1.8.3
-	dev-python/snakeoil"
+CDEPEND="
+	|| (
+		>=sys-apps/portage-2.1.8.3[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)
+	dev-python/snakeoil[${PYTHON_USEDEP}]"
 DEPEND="${CDEPEND}
-	dev-python/setuptools"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
 	>=dev-util/diffball-1.0.1"
diff --git a/app-portage/eclass-manpages/Manifest b/app-portage/eclass-manpages/Manifest
index 1773a2e28d84..9d2fb36bb6c2 100644
--- a/app-portage/eclass-manpages/Manifest
+++ b/app-portage/eclass-manpages/Manifest
@@ -4,5 +4,5 @@ DIST eclass-manpages-20180119.tar.xz 459484 BLAKE2B 99464007c42b3d9ccc98e991b987
 DIST eclass-manpages-20180302.tar.xz 454568 BLAKE2B 2d09a44e33efe0a302d4bdfaa3189e6ca0d373c84518e58bfb62824c00f83e865660c42cb0df597902d253241d9cbdac468add16ad19f94edd925460701c9f4f SHA512 17878001c9d70c69b9260541ac87cf642da0f0c5adbb77b3df2f614331e29af6af90b64950c9d95a2bc76d4b24180b46575d02a602956b721e3b03b93ee251e0
 EBUILD eclass-manpages-20180119.ebuild 1094 BLAKE2B ebb62e20bab310089379baa86b0ba73af6286669917115817faa4f96269b37ec8a1052417686e5648c1667b429bf89d6cdc3089d63d6f327ec9e1585d28971fb SHA512 074e5e6c5111c14e6f7c86fcaae0f22bd3718e19a229d4978b03341cc9050c9e48cfc566cc0b7dbef6330f1566cdbee14320aac03d395786195d725eb07ec557
 EBUILD eclass-manpages-20180302.ebuild 1094 BLAKE2B ebb62e20bab310089379baa86b0ba73af6286669917115817faa4f96269b37ec8a1052417686e5648c1667b429bf89d6cdc3089d63d6f327ec9e1585d28971fb SHA512 074e5e6c5111c14e6f7c86fcaae0f22bd3718e19a229d4978b03341cc9050c9e48cfc566cc0b7dbef6330f1566cdbee14320aac03d395786195d725eb07ec557
-EBUILD eclass-manpages-99999999.ebuild 916 BLAKE2B 45211f3e2b6102ea314ad4d29b41b4f2dd0022cdec40a5c4d998efcf6dd3222d0b15f805b3d0ed964e97eb23b4e210f77efc036c3ff20ed1d10a5d03ba07808e SHA512 f282ff310f77b69c8dd48a211e1e79feb1ca6a0e269694ab8d11919a44fc1417b7de5a804b4a6c32cc9ab83a4ef25144b37d0d7e16ae67a3fa8424a62b6cc0e0
+EBUILD eclass-manpages-99999999.ebuild 954 BLAKE2B 654df18ee7a23338c3d87fbe1e545858aa8ef64bec0cc54e5795f7431e513776d1d40d136ffbd0061aedd63f956bb49e118f1f82de38acfdb80f3abc77125612 SHA512 ac8ecd64716f06e3130345e45b5d5ee2c5c339dac5429d0d765bfac0c50dcab433a6d210c5b425fd52c516ee2af8fb9cc47888b0a398da8fe0f85adb09409be9
 MISC metadata.xml 374 BLAKE2B 3f87ce1d875199a067b945d6c9f3b80bde36ec25714d7dd802a55b37895d6c1e9360e003c4e6066ffcf6338a7f04b46a181a8c49f7144866fd9547626a0378bb SHA512 3caedcecef2f388c833b9f7db0af743a71227288bb145ec8a56c2862c7f56571a860f7f961d0ab1565cc98a0d178e87e24a7321cf0b7d4c4d3ab95c120fb0cf9
diff --git a/app-portage/eclass-manpages/eclass-manpages-99999999.ebuild b/app-portage/eclass-manpages/eclass-manpages-99999999.ebuild
index 2ee50cf52679..ea11ad476084 100644
--- a/app-portage/eclass-manpages/eclass-manpages-99999999.ebuild
+++ b/app-portage/eclass-manpages/eclass-manpages-99999999.ebuild
@@ -12,7 +12,11 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="sys-apps/portage"
+DEPEND="
+	|| (
+		sys-apps/portage
+		sys-apps/portage-mgorny
+	)"
 
 S=${WORKDIR}
 
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index b028d0d89b89..5424584a729a 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -9,5 +9,5 @@ EBUILD elogviewer-2.1-r2.ebuild 1349 BLAKE2B b39d72b182768ddd0f2b1feb283af288227
 EBUILD elogviewer-2.6-r1.ebuild 1511 BLAKE2B 099a4423d6fd1ae1b9cc9b39cfc74c7121c4058a55753ce7671cf5f3d0120c6611e7ccfa510fc587d2a5aa04c584ed021400e33c7e6dff05ed2eb2ac2f99a0fc SHA512 5996ca563a74e8ec679c0e4ea87821d4b0bbbabeba6c32a51a8bc5b2c360e53dcbd419b2422a8852b628b8f720f9083476c2e8d4e4a2c34ddb060095630a96bf
 EBUILD elogviewer-2.6-r2.ebuild 1569 BLAKE2B e0bb5b2ca7bf6e04ff9adb6f611bbd4cebd6487c34803c6df2f3d85d2a61c694c0ac6b3907fb96bbe3d793490bc3d1e50f4fd1af3147f433755f421b279540b8 SHA512 9a05aad3e028ed993283c0bb9dbef9b517f0f7b58d4c85b955404b75253677b916d91b8a28a3c8b566f153c680d0f72ccb72daa101fe9c29681a6d5b7adbad5a
 EBUILD elogviewer-2.6.ebuild 1457 BLAKE2B a70315579271f03b824747f6a2590cdbe113bae593910e215a1cb9750ee9ac9ee01bb43ff96fe22345fa7a9b2e66e741c3ea5b5dd5edf7b335d70dfb4ac669b5 SHA512 1914a17e6a2dbb062b3b15c051e32be7d4c03d46243d359d192af79f0496354ef0ade2af62ac4dba01624f0f379fcb7c0c03d9f7af83669b029f81e79ba600e9
-EBUILD elogviewer-2.7.ebuild 1831 BLAKE2B 8611d1a044e9c6e8ceb1d6539615765fd9ce2a9f0909ba80322475f045146478edd4429215c7e8b68fd86f20ab717c6ca0bdd1c2531dcd8b5c7291d21ee54222 SHA512 e860952f7ea59fba7fa31c81ca4a9568c96164430d70a897c998f4b4c0c5ab505233a9648c9004215c6db3055fb4d4c656c718cc35b540f5b350411bb773e1dd
+EBUILD elogviewer-2.7-r1.ebuild 1903 BLAKE2B ba1d44a2d319b8c1286e94d521e6a15da9a56e74acdb4f7fab110c63085d79708c82f0fa77ba262a48ffc62f6908167f43b019141d47be1af593195f6912096c SHA512 884642f815e018d5eb0fc5c323ff0fd7d71ab7f2f00670694cc71661f38147ca0f88bc793326ccf0c5f86a8f7a3c459fdb2c5f6340015cc113c540e9760862fa
 MISC metadata.xml 509 BLAKE2B 3a84f5b5dafc1666c58c34666742f4e67bf969d7e0b4b166bddb32b7254d3b4e5257730541438746071f2a8c1a9e057ac0b5977e32695c6a96a76b661cd84d2d SHA512 2fc82898f7f2968181f8ea2cbcb3ad34327f4849e6060ab818c4d4d9bf58a8515027e74dc6034dd1016e12c0df7fb84d0c234235880ee547a5ae3fac9a09e1b3
diff --git a/app-portage/elogviewer/elogviewer-2.7.ebuild b/app-portage/elogviewer/elogviewer-2.7-r1.ebuild
index 6d26ee4235d0..34dca2224b62 100644
--- a/app-portage/elogviewer/elogviewer-2.7.ebuild
+++ b/app-portage/elogviewer/elogviewer-2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,10 @@ RDEPEND="${PYTHON_DEPS}
 		dev-python/PyQt4[${PYTHON_USEDEP},X]
 		dev-python/pyside[${PYTHON_USEDEP},X]
 	)
-	>=sys-apps/portage-2.1
+	|| (
+		>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)
 	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
 	!dev-python/PyQt5[-gui]
 	!dev-python/PyQt5[-widgets]
diff --git a/app-portage/emerge-delta-webrsync/Manifest b/app-portage/emerge-delta-webrsync/Manifest
index 98721408e3ce..40be2b75fb0c 100644
--- a/app-portage/emerge-delta-webrsync/Manifest
+++ b/app-portage/emerge-delta-webrsync/Manifest
@@ -5,5 +5,5 @@ DIST emerge-delta-webrsync-3.7.3 22348 BLAKE2B 7f89d71c2621bb3f2ebacaf1a5cdc66f3
 EBUILD emerge-delta-webrsync-3.6.2.ebuild 1113 BLAKE2B 8757ee5dbcc212aee3975c9ab9050c06b1fbbc72a9fbd986e6d65b72d739093aa67b918b8a1c1626ba731c7361b2fc5c8148e7cedb1cbcb83ee4240ce5f1a5ec SHA512 18f23ead9aba98412070f5d7a7c06fdf53cf38d0c92a8103a903e8b434d7f977731abd6406e9ea4e1c81aaa3d47803186c360a12743a37635da4b24ff1b254ca
 EBUILD emerge-delta-webrsync-3.7.1.ebuild 1117 BLAKE2B a5718e0358bbfb5b2e6f1e266cbce042979b5a394d39d3f9c7acd934ac6c8bdb0f9148d7f3b555b849cd99fc8cae1d2515613443feab818b0a7839cb0566ace6 SHA512 25e2fcf9089a3a6354503ee783269a85adb08cc934f67c3b34c8901f3b3c807c5200f06320ebfbfe34a49ab8d7ad88ee1cbfb6e2e254d0d9edd185b651a5f43f
 EBUILD emerge-delta-webrsync-3.7.2-r1.ebuild 1223 BLAKE2B eb7b371e2584645e623e31fbc395f52dee2754825165032406ccfa3c4b505d826f1cec1d90792391612b75983b2400d09bb58cba66c8b2726e7bd553ac65af33 SHA512 84208b781a603717b8f22f1a111949279aeb44b693fedb7d0e823f9dbd6c8a21037f353f8ea12c2d7694cb484f20af448688a2f75976288ac73afd9213a3c728
-EBUILD emerge-delta-webrsync-3.7.3.ebuild 1116 BLAKE2B a5f5d9d2e55967da428e449c535c7c49ede3276d30ce5fb956628bd71f736649714ca4ac11a55c7eb2a48ab7fa9640b002ab98f25de560f0a5f2f6f1456bafc4 SHA512 d1c3444f4b3ea4825efb4fd4e18d98f138f5f8f7d187b63dd8f6f35e23192db0c3d793e559f0af44ef4df3d102f5e267e165c6d89e8a0854f17ecc3d8fba29bb
+EBUILD emerge-delta-webrsync-3.7.3-r1.ebuild 1152 BLAKE2B 38658bc218767c81baefae62af6f04dba9f609a3ca39242517fe81fed033c07109100c22759e4d0e1c00c3cc290d05abe2d15426be8fae96fcf0e2a720f1e64b SHA512 03e4b5228f1ded39ae9e3047455e3cbf7a13a15f3b6ada9a0d95fc37e9c59461042313f82ccd47b73b2e2d9fed31ecc4a6625dff68e1137fbd8a32748afc59c6
 MISC metadata.xml 294 BLAKE2B a26f2f113f9a9b66edbc88a0ab73a5da655fd240a97668cf1884e9192c4425cc478ab3f187ae1ba12b351c3de5b79d37b771e139cc51909d683decdc945454f5 SHA512 c4cdfd8350418cd0c231874c709d1fdf2c8132309dcd621682ebb77abd77ed57ce0d484a387b75f4762e58193150ca744e51b560d9b5a8cf631b4faef1465555
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.3.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.3-r1.ebuild
index e9bca915fffa..676645ce9c0f 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.3.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,10 @@ IUSE=""
 DEPEND=""
 RDEPEND="
 	app-shells/bash
-	>=sys-apps/portage-2.1.10
+	|| (
+		>=sys-apps/portage-2.1.10
+		sys-apps/portage-mgorny
+	)
 	>=dev-util/diffball-0.6.5"
 
 S=${WORKDIR}
diff --git a/app-portage/epkg/Manifest b/app-portage/epkg/Manifest
index c3a2a0539ef8..c136576921f6 100644
--- a/app-portage/epkg/Manifest
+++ b/app-portage/epkg/Manifest
@@ -3,5 +3,5 @@ DIST epkg-0.3.tar.gz 2926 BLAKE2B c467f15581de5a95623f569de58b327ab1c2ef0f50091c
 DIST epkg-0.4.tar.gz 3696 BLAKE2B c0532ac424159bf9bd66c3afb549f6aacb8dfc47ec25e2bfa0b789aabc0a203d29c51f810e3d27de058c3374caae41e13b22fef0239fcec6ef491cddcf9770ac SHA512 2b9ef0e2d0ec123a1e333403371d0d4d750bc5247a05771dc2f694d225ea5db2702dbc9a126cec1d0ddca38dffa837dd66acaa046ac94d00a28890f3e3cd7879
 EBUILD epkg-0.2.ebuild 502 BLAKE2B 130bfe43d7f18f4740d1d2a252eaead17a48869ac687c203f019b0f9a2d67429985f323d29f743b6ed017873e6f7c2cc0c688d06114e37c204ab6b86ccf5b2bb SHA512 f96f319506ffcf75a5b6b6030dc0481b81849f9e39c8b8cd874c4a0c0a86949c0702228e79fe301bff6d24c7c668552b817f6d6556bc097bd2b76142051c3152
 EBUILD epkg-0.3.ebuild 518 BLAKE2B 6999ef2feed2fc86a34b1ccb27f6a54cc29dfb436aafa391c1f8d257b999a2fd4fd6e2d3ce6ce002384c7363928a89f6593a6e7a42558c80ce07e98816924a55 SHA512 20d2c8b87b3ddf47049c265a49f4f7447d60d3fe158991865f3504834c23da9fa10596dace07a71b64710850dd472fd64ab89ca4acdad8268c66202edab2ca41
-EBUILD epkg-0.4.ebuild 512 BLAKE2B 8b0f544738e859a8725ea01cfc1a2c6e75af4be3b77e26f6fdd7b3757b0ca7d7ba1a77acb275f9948dcb277d2bfdbfcc749dbea07d6b4a5c0389c63edf64e137 SHA512 958392c809f278684f980b59abfbd581d901202bc2b1cfd228d4adecd8039806752ac15461e83a31a248e6a3ce4a6059cbd2bbb395bea695b699ba5f466d097c
+EBUILD epkg-0.4-r1.ebuild 551 BLAKE2B 9d4e3e70a5eb2ca87f4251e0375e515564a948f0c63539bc45f22c7a68a03077aadc5e4dc0c097d12bd8f260161fe2842b9e61a96f155f3626702f8e0b2b4af1 SHA512 8a4fc028cd0ee7d9cb937d62476aeacc15eab3d8d776270ddf5aba7df6dfbe164bca5ed3d339e396ce40af769a82f5315f3c09c7728837ae5ebdbd5a45198578
 MISC metadata.xml 219 BLAKE2B 3aa3a0bafea86569301510afade33d5fc60054738285425c905c398a437a3ad917736cb53c26aac3d76dc6501b474c53d6a9ca118dfdc2115518faedae4d4d6e SHA512 b0549e6cb87ae03afde418a4bc199edd3cc4d0d0d545a2a96713fd8f66adcad0750f52a426856a9572455de41253b63f7559a80c3f3a60fee92cae6c4a63b82f
diff --git a/app-portage/epkg/epkg-0.4.ebuild b/app-portage/epkg/epkg-0.4-r1.ebuild
index 484c567dcc1e..06f08b0aa4e9 100644
--- a/app-portage/epkg/epkg-0.4.ebuild
+++ b/app-portage/epkg/epkg-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,10 @@ S="${WORKDIR}/${PN}-${P}"
 DEPEND=""
 RDEPEND="app-portage/eix
 		app-portage/gentoolkit
-		sys-apps/portage"
+		|| (
+			sys-apps/portage
+			sys-apps/portage-mgorny
+		)"
 
 src_install() {
 	dobin epkg
diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
index 386f5a0f0aff..b4e69d2707f7 100644
--- a/app-portage/esearch/Manifest
+++ b/app-portage/esearch/Manifest
@@ -2,6 +2,6 @@ AUX 1.3-Fix-python-3-compatability.patch 1177 BLAKE2B 1b119e299c6a1ab3a55e6f9319
 AUX 1.3-Fix-setup.py.patch 792 BLAKE2B 1bbaa8f4499d48508c38c48e579849dd8b5cfae587e982b4bae1932d3c8a23d0c4ad43639710576a9b7dcc53a93d47f1965166b271e93c4cee5309be03a05bc9 SHA512 db741e6effca01b8e71810bd455d227c93df2ca86f5b77c69ba227cb1426dfeca548854b626d4d626e311faa6b8bb137c9f22b21322b6fa9f5ac2dec4786a5d2
 AUX eupdatedb.cron 659 BLAKE2B c0e820e59ba42f9caf2997f0042836c564283edc1edbcd8fbae4d1a79c9acfe9df344d945dd2ffb1d13d0aeb36f32dada366332517b728e2e5fedfe725788f0a SHA512 4ebaa0f8f73215aa497dc0adb922eae1ca42047b7069d2d0dd279edca8c4d9e782ccbfbc421ccd4cdbbffcc5cd8cffcf0c56ab66747043c5743c217c1e33df92
 DIST esearch-1.3.tar.gz 19383 BLAKE2B 308cb075eff0a592135e883913bab3709b64a785602250ae06bfcb50eca6f8dacfb047bb4326b4b9476553bc8bd993b69295373cced7a18786a7834378e860e9 SHA512 7fbc1c362a320a76a40c45ddf83a29223eaafd3cfed1d8a9410a380e2025fb515eea26e38ebf0f304d14230c6c5cfc83ef2116b774b1d50ee4f7f4bb0ac046c4
-EBUILD esearch-1.3-r1.ebuild 1538 BLAKE2B 495c48eb87e2a9eebdfcd5d131ccffa8edb1f3bcd3acd33e818958be03ef177dcd2bd8a77d8f29a706c761bdfa2e8163ff5685271ffcfc6b8b41964c2ba5bb06 SHA512 63b7a6a11d998772f823233681b955159235a65e337a622a86b0d15c3c92af7c2ab599d9569cd8de3f049f035affc1acbddf034e457f253daa90b1af732652fd
-EBUILD esearch-9999.ebuild 1107 BLAKE2B 95e167030d6989a92e1f0f25ea603f76f746e8b01a0ab659014e6156ddf3ee0cbd6976fe109744cd21ad66baa6d673e1cc3e50161554c0d6a430d3e3c3d6b132 SHA512 9aa432d7827fba874c8bb6cc8646b30721cc7b3c6401223dffdbc0c099ea9d7f8e470e4effd134c51e4126400ea69e7bffe4077b5545a9b865230b2073ce518c
+EBUILD esearch-1.3-r2.ebuild 1576 BLAKE2B 98fe51c640d6830e8bfbad7c8fb45110a4642418def3facf8d7dd7b73c5106a90cce51aa037755946c18cf3ba3979a2ab365c13b1de328ae7c3b95895d9ceec3 SHA512 33db3a09d49e7a2de817797d35f0316a033bd6c6fb70af57321e0a0bf2372e1448de4abf29d78a5bdbbccde8518814756ac9ac8297aaa4a49a1c14f8998da70b
+EBUILD esearch-9999.ebuild 1145 BLAKE2B 6cdb90bf72eb3f638fd11eab43bcd9b5f1d408b60d86397b4d47163fef0dd4dd0a641d38d2df762db04ef7a3c9d4b3bd5791de16fdeeb9e2d163adee2a8f66bd SHA512 af36069c02638fb83cdb9e5cdda3c76e3719526085449d823e17042da88b8414fbf285d0ffe9ba0458cf5e7ec170b20699c6391667b3b4287c5d2ee730a961f1
 MISC metadata.xml 357 BLAKE2B db12b57347ce8c8f1e41c64bf0a94c80509e27964353113c40d4c49aee85d3ab747d3ac2a05b1a1314b141feef9a014a3b475bad5101a077da803f55cc853098 SHA512 a84ae0adf855d68fc14b01d1583b0c264a27852df31397af387ee7d8948f413cd98d2fad937899a91387f23d70738a540522b393e2fdab21dc0f55014cf6557f
diff --git a/app-portage/esearch/esearch-1.3-r1.ebuild b/app-portage/esearch/esearch-1.3-r2.ebuild
index 0454193e2011..3c8b1eac66e5 100644
--- a/app-portage/esearch/esearch-1.3-r1.ebuild
+++ b/app-portage/esearch/esearch-1.3-r2.ebuild
@@ -18,7 +18,11 @@ IUSE="l10n_fr l10n_it"
 
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 
-DEPEND="sys-apps/portage"
+DEPEND="
+	|| (
+		sys-apps/portage
+		sys-apps/portage-mgorny
+	)"
 RDEPEND="${DEPEND}"
 
 # Populate the patches array for any patches for -rX releases
diff --git a/app-portage/esearch/esearch-9999.ebuild b/app-portage/esearch/esearch-9999.ebuild
index fb347e360d9e..ae29c8dc76a8 100644
--- a/app-portage/esearch/esearch-9999.ebuild
+++ b/app-portage/esearch/esearch-9999.ebuild
@@ -18,7 +18,11 @@ IUSE="l10n_fr l10n_it"
 
 KEYWORDS=""
 
-DEPEND="sys-apps/portage"
+DEPEND="
+	|| (
+		sys-apps/portage
+		sys-apps/portage-mgorny
+	)"
 RDEPEND="${DEPEND}"
 
 python_prepare_all() {
diff --git a/app-portage/euscan/Manifest b/app-portage/euscan/Manifest
index 6ed9c2346a58..8d486f3f6a24 100644
--- a/app-portage/euscan/Manifest
+++ b/app-portage/euscan/Manifest
@@ -1,4 +1,4 @@
 DIST euscan-0.1.1.tar.gz 441780 BLAKE2B 7c0603cca9b9da1f849999b215db2d397656ffc1e8e87193174e6ada548497f1ebb30252f83d0fb4dbbfa92000480947b1731f1792d8612e1ad56fd56daa2b54 SHA512 2f55f8f4b0fd46b13c981ba94be29a62f16fe2890ce03f99ac14b1488c2ebb59abdaee12f671d679b934b4fd875ee27e751d2c305420f7cfb08e69ec899a75ab
-EBUILD euscan-0.1.1-r1.ebuild 807 BLAKE2B 5e25da8735311675fdccca536984a5cf1a393dcc7423d76218aaf297c1d4073cce45a1dcc3f150e7c72c33ce088266e9e67e6d386de238f720ad838b629328ab SHA512 7c6800d0e92415790e0dd61814ac14e40278dbed98727ba122bb90f46a053ec1e4c6884395e635f167ca927a5338f42b5be50f2c7f78d58421ba7568b4cc2218
-EBUILD euscan-9999.ebuild 760 BLAKE2B f8d46d6943b818abd28a551c6733e808a773e32e8b2981bf499ee0cb83c488ff0b1792f07ab6d6890df51274949dd620b8f1847267056efd0ae24d34bfcd2421 SHA512 b18756fc63adbcb606faecfeab2864661a370bd093ef5d471d43fdefe5aaa9d3259d950fd0102c70576b071cc619be972a01b67787545b6cd43f89309825140d
+EBUILD euscan-0.1.1-r2.ebuild 863 BLAKE2B cbc6710b4911fcaa58c1a32ae90859571e45f6301e434e76d0f576f3fa57e2e56ca89c1c0cb18f7c82e119bedfb14613324db5209b4042cbad4bbed7b9f81a39 SHA512 b1a802d02693afed7d393823b88760c41a7b67da8dc67f194dc42f58a9a2cd1e510bb3ca21fd5d6fd2c9d77ded0bd4b1cfdff4f59894030e0c742f83e6486fd0
+EBUILD euscan-9999.ebuild 816 BLAKE2B ccba573b5a4740c44ce9d39ab050b4deb0d06ef901cb5556dc1a04249d943b79849f63e3f63e07f9983ec913466a6649697dddcc34caaa577d056d6c2409138a SHA512 b366831123590d0ee27951147a9f7ac66c8cc2df6a83c03539317e58c9f6377f6deac80231056d90304a24de2d0472fbc01d56a369e77ad0a8bfe8b0b05cab62
 MISC metadata.xml 340 BLAKE2B 9429176a710bbd82a9c4bfdbf3228422807daa00564201eec1d8bfa2a1b76f65b84e16e6083cb0847bed08745262f0b95b8563b7449e69be95d8bc2ecdba6d1c SHA512 de74198fe372171f19b6486164e81b3f256ae6a04451ce5c3c789909a0a3bff6ec15a42a3cf3387f227cef33f8dbb32eb9872af95d6f962f61ecd2fa64ad0b5d
diff --git a/app-portage/euscan/euscan-0.1.1-r1.ebuild b/app-portage/euscan/euscan-0.1.1-r2.ebuild
index 19345bf907e9..27566cc7555f 100644
--- a/app-portage/euscan/euscan-0.1.1-r1.ebuild
+++ b/app-portage/euscan/euscan-0.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,11 @@ IUSE=""
 
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
-DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+DEPEND="
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
 RDEPEND="${DEPEND}
 	>=app-portage/gentoolkit-0.2.8[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/app-portage/euscan/euscan-9999.ebuild b/app-portage/euscan/euscan-9999.ebuild
index 2cf8630bb3c3..c71e1ee07ef8 100644
--- a/app-portage/euscan/euscan-9999.ebuild
+++ b/app-portage/euscan/euscan-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,11 @@ IUSE=""
 
 KEYWORDS=""
 
-DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+DEPEND="
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
 RDEPEND="${DEPEND}
 	>=app-portage/gentoolkit-0.2.8[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/app-portage/flaggie/Manifest b/app-portage/flaggie/Manifest
index 44426204057f..93ea0023c94c 100644
--- a/app-portage/flaggie/Manifest
+++ b/app-portage/flaggie/Manifest
@@ -1,4 +1,4 @@
 DIST flaggie-0.2.1.tar.bz2 16767 BLAKE2B fea0fbc505bfa97e7bee2c05f0cc19077b9b23a021b01aafa2c4b064466677f9dd4ae95c36f6de65b4ad07c5046d539ceb0cb667dcb791b60410d7a5e688813f SHA512 3f273ebeceaaedce7a3807126fb3f450e420338a883440066d06a4d6a95b63bd538bb5da882fea23e0d390b28a83f50375dbda2624f656327775b2b700f2b2e4
-EBUILD flaggie-0.2.1.ebuild 1127 BLAKE2B aa063c4c44d23a9be1771fd93245f354a7d778a2fbfaf7814cd0fafaf51764ba24f7779496d0bcc5a5fab57d5b89e02731aa1fa4b211991eaa96db56b9e0b658 SHA512 443394e552ab925cdc4d4b3208d70c521db8ab4b08f61bf2b97bb2058ac1cf82c12038cb34ebda11d18f2c93efc679b82aaa667fbedcc17d53f41d46b4dba737
-EBUILD flaggie-9999.ebuild 1040 BLAKE2B 5e0df39d0b33143b44777974e27f1b32c0e9d78057848248e336475a7985e5569d2b5e5f373d1a969ab7918038cccf7f2b7206f001aca3b2f16baa047add5e7c SHA512 57259958f20a745a0dd0573577fe52aa14c1067cee633bcecbff429ef69bf1dd927e65b3bbc4bd96ed4dae29bcccdecce2f8bc2f3149bf43770b1cc4e7ae62eb
+EBUILD flaggie-0.2.1-r1.ebuild 1183 BLAKE2B 80cf98bc9f217d6f34b40ad3b5acaa7ecdf456f4756b0b717dec3d97424a1383d00d3387d5e4abc8c44aa2e1bda3b6998a598972a49862038fcac383268ca317 SHA512 658d4d06e9a35e4cd39c344716c8f1c3c1021f8d377d26885c244205e5b945818a9ad2e249c6c19424b737cbf4bff318a6488a354a697e1460c62c5554e862e1
+EBUILD flaggie-9999.ebuild 1096 BLAKE2B 160eb996e148481ae0625a866c97e71175b78991eec0acb87f7c7221c202553f4e49df7d8034c873fae8b324a4f1e50ca9ac9ebcb387c1d6423afc843b0fa4cd SHA512 71826a72d278256024ed1fe9c127b3f7eed003c2a79c639bd094dc8aab1b91861c43d3f69e2028b70eea3b279fb31790df5225d9c83ac71a85cec92b730dbec7
 MISC metadata.xml 503 BLAKE2B f86cc20c12e1bf2bfb8d04b6ec0ae1cb66fd4a239cfe41885b1277abc2590fbed0a27dcdad6c0290227f140e4b783ffcbeb8c4556fa4874f0cb4e1d77e691165 SHA512 d406c0b2397c2d40c1aab0db4d4a54c2b928075558c823da63fe21762ed618da5aa20fcfc86c4b3066d8a7bbbc4dcc55d6037025db27a7873de274282dc0a88f
diff --git a/app-portage/flaggie/flaggie-0.2.1.ebuild b/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
index db5dbabc1d17..6cf9bd001462 100644
--- a/app-portage/flaggie/flaggie-0.2.1.ebuild
+++ b/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,11 @@ SLOT="0"
 KEYWORDS="amd64 arm ~hppa ~mips ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
 
 python_install_all() {
 	newbashcomp contrib/bash-completion/${PN}.bash-completion ${PN}
diff --git a/app-portage/flaggie/flaggie-9999.ebuild b/app-portage/flaggie/flaggie-9999.ebuild
index 60d5f61f5398..b6b4297c035b 100644
--- a/app-portage/flaggie/flaggie-9999.ebuild
+++ b/app-portage/flaggie/flaggie-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,11 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
 
 python_install_all() {
 	newbashcomp contrib/bash-completion/${PN}.bash-completion ${PN}
diff --git a/app-portage/g-cpan/Manifest b/app-portage/g-cpan/Manifest
index 4f255b0ebf53..afe30290613e 100644
--- a/app-portage/g-cpan/Manifest
+++ b/app-portage/g-cpan/Manifest
@@ -5,6 +5,6 @@ DIST g-cpan-0.16.9.tar.gz 34463 BLAKE2B 7eff6b7da75219712504ac7b9ea1833e9eaa9ba4
 EBUILD g-cpan-0.16.5.ebuild 1060 BLAKE2B 3be8d10a59f30f09900fdc04a0b1e9548f9f60e4d0d00edbff8ee104237e73d6e09414bbda59cebf717b9c2e195e17ebec0d6ebd5763f9bcc56bab2e5d5b4c73 SHA512 a2524f42f7df44c7eb2eceabb9fef72173b4d2f9981eba77d77c6728c549bc31e55eff27621ce736c46610d037dd33807d8fafe10efd2315abc6ca2f0295eb5c
 EBUILD g-cpan-0.16.6.ebuild 1152 BLAKE2B 61e9caa00ce569ed6d60ff1f6fcd1bf758dbc4ef4b2eabb2b926c5788416eb068519a6de8aad5fbde96e4a6b3927494dead5e896b134c531f0b998469596a5c0 SHA512 0def8a8ea3c3644fc55dc1a99110213814063e881bf4c5ae49c8bd69fd460c9236b6d95d7a0ffa76bcd42d1175f451eeea4998832f09f780b96d07daedf0650f
 EBUILD g-cpan-0.16.7.ebuild 1444 BLAKE2B 1b080e7778c77fae162e96491b903323d465548587c592b3a6aafac263e9fed6c52dc45fd6fd574ce2ed30a0d674ca01f551649045e124db65ee9e8100cfd02e SHA512 2a89a12a6d0d096a6bbc5ff30655250f63e7c5cf9cbc271e59691972552450eca0945072cb3d485883c4eb203d4ae9ed9c1095dd752d8c197c5826a612eebca3
-EBUILD g-cpan-0.16.9.ebuild 1429 BLAKE2B 86c18b925e3e3f08fd637f2f88467c9efe73f479b65e0c0edca8627c0235f8ffaeef6377cabcaf76255ec003c9256ade81bd7f12307c7801525442951195f6d5 SHA512 dd77001bc6b259c6282f7fcf271cf468a16e119cb757fbd54217e8e1ee2be07ff0089f1c5740a71e79f15fb4f8f0bcd4a8bbb532a87de856f4ceecb9598df363
-EBUILD g-cpan-9999.ebuild 1480 BLAKE2B f54eedc29569897bb1a9b0970453ef010b88e93b096e039f4a502ba0e84c4f71b5a220858e9759339277ae727b07952540e85431ce666ab202b3a2104d2d0693 SHA512 7086e51ac1cfa3ab8f7a1e596c60470ae8fd7e3530fdced8c6dffd8d4094dcf9a2e987786231c1fd2f9a4dc9eeae563743b7f0e44b35952ebbfb46813756653e
+EBUILD g-cpan-0.16.9-r1.ebuild 1465 BLAKE2B c3b4bcc156fb5ca09ba395800dc1a27df677318148e3fe7fb74d1302ec7e1cfca12c91035212c83b91d4dd342a7e71b8d79b52cc2ca49113c12d53c7b7289ee2 SHA512 f9d78f275a85061e6c09ce3cbf0fa12f8077304319e523c18aa9aa18a7bbf94d6a4cf7a34503355b10fecbf8d46f324f200fc39ac908ddcd0b50867c3d2473ea
+EBUILD g-cpan-9999.ebuild 1516 BLAKE2B 66c1aef06647806674803443fa3632a0a9e1a9152d82d173da516bf37f3811cabb611f3af7f429a36816d934ea0cd4a1cd46c610a5cd63a47b48707384173cdd SHA512 b9031204e3bf4b22ba8fde4d3243e33e29b908d9338930311ca25b5a120b4b6e1c031c9afa8b2f5d7252e8224a45c55ef474c39b88a76c993bcc06e781071d61
 MISC metadata.xml 565 BLAKE2B 3614246d5827779c1fd4f713fcadc54210893e680d8d10edbd98bad63ac93bb0e642b6a44fa5496f2bdf40eb3accdb79eca0c1fbd8a459655d192fe7af6f99b5 SHA512 057c2d4a401423d789283661cef0a4c42955d10cbf9671f671de279975fde004d0836e5fec8bd1d34c5f0f1f0bf21d6ebded0bb716d7445001c975a22ff2d0c9
diff --git a/app-portage/g-cpan/g-cpan-0.16.9.ebuild b/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
index a385366a29ce..39bcbf8a06f6 100644
--- a/app-portage/g-cpan/g-cpan-0.16.9.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,7 +31,10 @@ COMMONDEPEND="
 	>=dev-perl/YAML-0.60
 "
 RDEPEND="${COMMONDEPEND}
-	>=sys-apps/portage-2.0.0
+	|| (
+		>=sys-apps/portage-2.0.0
+		sys-apps/portage-mgorny
+	)
 "
 DEPEND="${COMMONDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/app-portage/g-cpan/g-cpan-9999.ebuild b/app-portage/g-cpan/g-cpan-9999.ebuild
index 669c09926378..50536a4a795b 100644
--- a/app-portage/g-cpan/g-cpan-9999.ebuild
+++ b/app-portage/g-cpan/g-cpan-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,10 @@ COMMONDEPEND="
 	>=dev-perl/YAML-0.60
 "
 RDEPEND="${COMMONDEPEND}
-	>=sys-apps/portage-2.0.0
+	|| (
+		>=sys-apps/portage-2.0.0
+		sys-apps/portage-mgorny
+	)
 "
 DEPEND="${COMMONDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/app-portage/g-octave/Manifest b/app-portage/g-octave/Manifest
index 3c722f3e7ffe..54d3c17ee15c 100644
--- a/app-portage/g-octave/Manifest
+++ b/app-portage/g-octave/Manifest
@@ -3,5 +3,5 @@ AUX g-octave-0.4.1-fix-Makefile.patch 491 BLAKE2B c2deff7f9ff544a62ae6877ec229dd
 AUX g-octave-0.4.1-fix-sourceforge-svn-root.patch 1441 BLAKE2B 89ddb026eb2b0f133ba508c3f351bc32fe7968d91034416559b7ec80319473b3a323f72a9fd5cfb7b88603b1176b91ba312580acbb7930b6f07ecde335f05037 SHA512 637a3f0a7be6cacde645768bc2f576ceccb163fa00dae60520ff0de876f8414b75568e33a04bbc225520ef05258e4339930f748577620cb9588cfcbf961fce1b
 DIST g-octave-0.4.1.tar.gz 52285 BLAKE2B d1e39931471c527c5542683c976487c56bca2a4666a437e110fa41b504287c0dd87aad94bf98298544c374c6d3faa0722fb3fab43228c56425be19b450ae0dd4 SHA512 424b95e626981aa5685795ffb3df1a1d608e5293adba074cc67f7dcf08d4a0c94a0174005f97a8da1ba1ae4233299e6a530af96ba3b9fd0d8b224915e947efb3
 DIST g-octave-db-bdf02cb.tar.gz 39836 BLAKE2B fadc374e69bbf785f9e9ecae02eeba6f1c048d11503e5d97db2b4cc65c820ec829615be72ce823ef44ecb0e59e1b68dd40f7310d19d0b7706a2ff47ab95c0851 SHA512 5eae00e18b6d4633ed0feda3a2eea6b36da049c133bcd49e54481443ff435bfcab0f303ab9f0e8c3f48fad707625ee13b4564c510d89fa196e737c7599ea5fa6
-EBUILD g-octave-0.4.1-r5.ebuild 2362 BLAKE2B b47e1373dff00f19fedc984e08aa94bf8192d12a3d7a1589e17ab2b9e2f98d05f0cfc95bd993ebc190bcfec1a8ae03474893a0d76cfafc33c07fcfbec5c874b5 SHA512 951ac52387f25f968249e7925c2abec03e231a9ffe082512c0ac13f2f8f8e5f7489536f412b8a9bc141e421b1bd7522d01323c78cae0a3e512af9309f0175360
+EBUILD g-octave-0.4.1-r6.ebuild 2400 BLAKE2B 377e382f3ac1b7b11a1b2be35a3f62b0aed726100faa67238d1be5820f404d1ebe387ea63d6faeb9c78c7c15e8629c9a2d4f9617ab748a303266d4e5fd41ac4c SHA512 eab3022412af9978db1bf11982349ab08ece972d3d1710c7858520423244d930c0d90a92967098ce0143b23217eaf112b3b811bf20222e5a02fb9e56d7db7d46
 MISC metadata.xml 953 BLAKE2B c7df56688e694e153043051b897de819f4b43441399ce338d7b65a2bffa689c0c68bd03fed1ce10a5111e422e4e38c796387c8e52758d47b06a369fea10b22fa SHA512 2e9160dc06169653737491b25ac4f1e4ad4416a3a6d9789078021c8a501d67c07294a6360762beea1815608d1d2e92a089bcac4614113bfa8c9d312723bda20f
diff --git a/app-portage/g-octave/g-octave-0.4.1-r5.ebuild b/app-portage/g-octave/g-octave-0.4.1-r6.ebuild
index 539e75f517a4..544b0d4318bb 100644
--- a/app-portage/g-octave/g-octave-0.4.1-r5.ebuild
+++ b/app-portage/g-octave/g-octave-0.4.1-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 DEPEND="doc? ( >=dev-python/sphinx-1.0 )"
-RDEPEND="sys-apps/portage"
+RDEPEND="
+	|| (
+		sys-apps/portage
+		sys-apps/portage-mgorny
+	)"
 
 python_prepare_all() {
 	local PATCHES=(
diff --git a/app-portage/g-sorcery/Manifest b/app-portage/g-sorcery/Manifest
index f8c1302cfdda..aed9e4139258 100644
--- a/app-portage/g-sorcery/Manifest
+++ b/app-portage/g-sorcery/Manifest
@@ -2,8 +2,8 @@ DIST g-sorcery-0.1.tar.gz 45796 BLAKE2B 8439b7c8a394723156ee1d35d432ac10197e04b0
 DIST g-sorcery-0.2.1.tar.gz 55546 BLAKE2B 56fb8a766c17c220a8279d2288f5de5c6976dc8fb380ac695bcf891616aa8a284f6b07c9be79c3c819c69faf7fcf9a7a826ee8b8b955db007c00e23d6417f2f8 SHA512 42c34ed8addaf721583029d5056751810b0a77546f798081c7c605223342fa2a99bd2e30f20f004a8606ccf847108f0e2ef2c479f3cbb55f2fe6648d4ffc075e
 DIST g-sorcery-0.2.tar.gz 54173 BLAKE2B c110c670d792bf41430980a5155ca83d9ff45e9e301507628913666ebf313155e3b262856efcdd4896dad005c2eac393f9573fc106fa868b057a7b8f5a026b9f SHA512 9715d468c3eb34eac2bda81b7442d86fc8af984c2115c93682ae6c63d59a9ed3d7d0234df845659ccd991eb304d732ae33e31c217a7916b8dd08e2617984cb32
 EBUILD g-sorcery-0.1-r1.ebuild 666 BLAKE2B b0d63d33218764d3f41820017973e9ba785ccee04b2a0ba1bb9e1eb96e8fc3dd18baba1f36997e776a8ac23e69ca57b030f00c6f713ecf0fe7e46bd58e28f3e5 SHA512 0b86108e43627da22083a965455f8a2a109d207281eeff32d40cae1c4e8b360037e05f46731ec65aa8291ad8d8260288207ab189fd1ed06a934b2694d8fa2a12
-EBUILD g-sorcery-0.2.1-r1.ebuild 940 BLAKE2B 9e5424dce4c1c2a462e387c31343dc51d7680b1cab658d9803e6be4a588d2880b1613f848a29c8cf09e8a0665f05af1602b706dede28a85b4e83e10d260125ad SHA512 d9586977e692fc760aa2e607ae6de3724a9253a01103538fee105eb8061a52e3bd0f981ef0de1b26341fd3d598caa024c19e3db90c512dd9a89900febdacbeba
+EBUILD g-sorcery-0.2-r1.ebuild 894 BLAKE2B cf6b55447cecabc742fe669f6f8f920348569270d62bd7d3983ceda343a957279d73d22fc659228436d0e2d3d746cc56fd54a3ea31d65037a2f3830ee787d688 SHA512 d590fcc4c64e6e2bcfb38e16653ed1bee65f47b6b349d3eac977219fb51f34afb4a2cb39b7b04b2629327fceb7f67aed81499c716482fe75e9135638847322ca
+EBUILD g-sorcery-0.2.1-r1.ebuild 946 BLAKE2B 78fa086f1b961de3c6412a2ae00b5fb192045d6affef49f9acd9312c2bc0fb9d8272e877fe6443a5db466c5934c4abac63edae569dd0117f1a209bb1a66bc5fb SHA512 856c674325a812dd6ca86df2872cdd496997a31e32295b95c483867fc8a023e47ebde79eb6203a19295192cafa51d8348d004bda4cd6c17a648f461acd32e35e
 EBUILD g-sorcery-0.2.1.ebuild 866 BLAKE2B 99748c1dc04ce8ac57784e4746dd015f52d60116651578a78aee0c37e1fadc92b012aef2dc8bc36be66adc5fd46ffd6312e5de44d42bd3ba676bedb470e95ef0 SHA512 f290aaab0f812cf104d6dc4fc0db9d4e7fd383f1743a3bba12600faa3fa03931f274760cf4ec046d27edd7daceb8ad989edef0c1b8558f0bd7bc89ad91360364
-EBUILD g-sorcery-0.2.ebuild 840 BLAKE2B bac7b89adbb168a57b8001ecdd8c493ae4015d9e176a21060e615565d43a2832f56fecdd2f5ccece5dd1092759cccde1c2346482342588b7f9eb4f070eaaeecd SHA512 708c0c4bdee4a452e76432cb659b4406e2d74fb5afa30f3f3439fdc213eb95e828d25c8e02edd4487bb23e97c13a02f9a4b5257c240a25fc286e4239058de1d6
-EBUILD g-sorcery-9999.ebuild 836 BLAKE2B 96bb699767629222d2b5e7c8cd14513f04f4550cb12afaa522bfde97244d3c7e63d82dc9cfcaa3f3efeb39b0aafb41d46a555eb92e6f52787a7645d9b9d01348 SHA512 54832b1386e1863ca783affa01ed2947d60eec4170cdeedacfc5b9d6c819c883ffd3689888b06633caccdbd0f264577c69f1978374d70f89e1b478e275b15c80
+EBUILD g-sorcery-9999.ebuild 890 BLAKE2B 19a7ff26359345f57e1c3cb992b623203c479c9a7d7b44cd0db778051af1367c20e714d85973955c3e18b283b61af77459492289adbb6d73b3cfe8ca16e79331 SHA512 4d926be667a33365f1379e09edabbeb159a6869e737e73082d75dbbab40b4fd84f7a99e43f764005027318302921348f64fdef8a105b370b7c59d2b6844379ce
 MISC metadata.xml 494 BLAKE2B 558f844e741fb22e9b08b8e926fdc0bb697a6d0697815efe74e925eca39f644223772a1ed3f98585383f58a5d2ed4b092b8868b595f453184762c62e1937f2da SHA512 dc99a22780958061da21e20aa74ea128b1397fe09092b8dc32268577315efdb6d8531b227e24863cab4eaf393ce94e783c763f0835a5358ea39c02bd628a74c1
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.ebuild b/app-portage/g-sorcery/g-sorcery-0.2-r1.ebuild
index a86a63afcbe4..5ee1d41cb94f 100644
--- a/app-portage/g-sorcery/g-sorcery-0.2.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,10 @@ IUSE="bson"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 
 DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	sys-apps/portage[${PYTHON_USEDEP}]"
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
 RDEPEND="${DEPEND}"
 PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]"
 
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
index 8ce106b78ae1..6180319065de 100644
--- a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jauhien/g-sorcery/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="bson git"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 	git? ( dev-vcs/git )
diff --git a/app-portage/g-sorcery/g-sorcery-9999.ebuild b/app-portage/g-sorcery/g-sorcery-9999.ebuild
index 8e6f16207b89..8b59511a4f4d 100644
--- a/app-portage/g-sorcery/g-sorcery-9999.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,10 @@ IUSE="bson git"
 
 DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 	git? ( dev-vcs/git )
-	sys-apps/portage[${PYTHON_USEDEP}]"
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
 RDEPEND="${DEPEND}"
 PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]"
 
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 89b07d0b3033..99af562b45d2 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -5,6 +5,6 @@ DIST gentoolkit-0.4.2.tar.gz 3215652 BLAKE2B 97b4dcac7293b50161169a6c777623cb1c5
 EBUILD gentoolkit-0.3.3.ebuild 2190 BLAKE2B 14e659c8159365d4d1317952cff7241f5629571b7264018b082dd4aee393a4414b3d97b101f26a252a3dfd8f372e2711c9857033e5e0c68f675cf33996104b0b SHA512 6f95f1af8e2ae139ef6058b3798f75e331890bc05efb8abb4cc3c0e4014176424a424e9663f748f3cbae510186d8a7dce1b9d11e0813aa5e65ac9e4ee6d3aaa8
 EBUILD gentoolkit-0.4.0.ebuild 2164 BLAKE2B 7a4d91380523e5355a68e4320907375e49b69acd3f48a549a46576277da776c5be47113828f757affe0439b6803a2a0ebef7c7f6a7c4438f1800584e4439d321 SHA512 aa0fe594f28562a24ee73cb2eae52f1797758ec4c80d0db24f52de3f81aac7a64de5f59b6b273ce4f84d88a88b058f0f880b5498fc118e4b2f4572c459b99fca
 EBUILD gentoolkit-0.4.1.ebuild 2180 BLAKE2B f141489aaf43bf65d686166a4fc66f1acb58c16d4eab35566d323077ad8730b413f11beed94af79f03f30b1daf7bf6954d2b0ef791504c7f47c3c90e222e506c SHA512 92016e7cab3aa9c2a2fcdc42d9958f47a1bb41da5c88664128aeb0c9a86fa00ff79c99cb100be03f056df23a506e2e52b6b4068b828885ee08173a4ef4404726
-EBUILD gentoolkit-0.4.2.ebuild 2163 BLAKE2B 169a94d11af69764cd5d85748dd9c54cb3dd2dfdd98c6d0d8b99299533ea2e919ca0f56239b64b99845277d1e3102937e82e7fe9323694d60028624bb4bd2aa4 SHA512 41f136f4341c8713ada6e918924bf5fa7874e94a0a5669a257aa1e6b4aa48d353e0b1f2364d2c6c5aef305e780e8c4dbff2049453504c3e2767088b3c75db0ab
-EBUILD gentoolkit-9999.ebuild 1982 BLAKE2B 0888c0f52854fd7cae18fa46252691f0599c2854f34e03caf286f21f25bf43a51f89956734f78836c120b85110bbdb5ede5546ae449686a3953130ddcb49c864 SHA512 b77aeb8574d8b5cd687ba57108d1630b9e31f7eda573bbcfa1929c42866a972fc248ba125c21bc10eab2eb7435d3cd7f6aa242700126d6fcecd90d1b8b9f082d
+EBUILD gentoolkit-0.4.2-r1.ebuild 2219 BLAKE2B ffea1f1091baca733452321ae072345969b914d5536ef03532160415eafc23dd242f5f62858475acdcf6581b7551eeae2ee8c967ca10e9c29567677b6bd830fd SHA512 e67c0c0b7d1ebcddd922f2af1fe0a8934db7ee119d86a4d7a39e51772cb56470cd2457caefe357e8536228aaf2b3e3ceca7442107a8415f5b74b90f085619185
+EBUILD gentoolkit-9999.ebuild 2038 BLAKE2B b73ca2d3af0a6d7adf65e489cceb6bd4ff29c61e2e657dd28c0ab17e3050cc1031d0db237ff9467dc80f3c463ad0c1f3efdd9ec5d13f35ca0983a435c61329d0 SHA512 d0110f470a871858b3ffad3617714db71b1b015c72fc9f3c39921f3c4b6ab80192c1b060f2de3fdc673a8a8ccca7b5be92a43fb52b5dfe664d832ae093bec7f2
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.2.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
index df5293c2d9f3..9307a8289711 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.2.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
@@ -18,7 +18,11 @@ IUSE=""
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+DEPEND="
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
 RDEPEND="${DEPEND}
 	!app-portage/gentoolkit-dev
 	sys-apps/gawk
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index 7583a0910da3..084927bf88c8 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -20,7 +20,11 @@ IUSE=""
 
 KEYWORDS=""
 
-DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+DEPEND="
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
 RDEPEND="${DEPEND}
 	!app-portage/gentoolkit-dev
 	sys-apps/gawk
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index 3c374c00218c..7f2db4aafdba 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,4 +1,4 @@
 DIST gentoopm-0.2.9.tar.bz2 24652 BLAKE2B 1046d4cc5dca19d2cc72e8d8d54cd0d2172164aa5594666c89a4dde9dbd994654d07982a2381fa09038b29ebb011bdd410f60ac3c340bdbf533bcfc29f4c4796 SHA512 e7d1daa811eb6c0877c2bec98b72bce61380802fe704f271a4df6383506d62ba661eb83ac9afd432627e2f10bf38840796768a565b80b6489563cfc54ed81ae7
-EBUILD gentoopm-0.2.9.ebuild 905 BLAKE2B b4fc579c83d65355c95a31344a7764d14ca4587a123d852e527d01ac4570b17384c0381c1ea3a2ef1af50f01c75206e856e09a794f74819a5204063fe5370bff SHA512 7a0f8d7429949ede7d17fc1a70b1a77c7c08feb812f9e495b0fa393471b6c43e1faf166f26cccc1a3641f377c1ed53e03f19c336d7641c059bc497e7af57ee9b
-EBUILD gentoopm-9999.ebuild 1052 BLAKE2B 1e9c2a405738f46f4b4d107f0361016b4fa145eea8e1437b39faae6882e1520c0da4440409038961ce32149466feea417cc3ad7998bc16d507c5a6f70f0c829b SHA512 446019bf972e550acca235b0735adb312b037e3d818a85a6e00acd80c35ad6afc279f00ff433237e6a1d02b5c85c6e8f4aca378723d613658529fdd2fd704ec7
+EBUILD gentoopm-0.2.9-r1.ebuild 949 BLAKE2B cddba8cbec01872603134552283f1893df14f877a5a31d855ef74a93939b354a85e988856d9163878e85fe21da8a192ea1bc61bfa0db20962c9443a13d422f5a SHA512 47f12ad7c000b293e07e8baa9a309f82014604aa37961b81328b9102df7dd98ba1ba55744029362048eb79db27e162b7ce8c336a16e89f7cb5c370e14b14eeed
+EBUILD gentoopm-9999.ebuild 1096 BLAKE2B 0103075de6fa4557d8c877d7c7764534fe8470de7f3618266154119554db6dd7ded2ade13a6a4cdfa78c53fb06b8b8c7c7da31c05beadb1da78d89d33e5ac872 SHA512 683aa712825c855dd299811e2e87732b1f5bf79a0d68e121c5d53579a92a60da4ff3afb37307f8d46939e869c4da21251d5c8c9ad113def2aad7b64f2d9335bb
 MISC metadata.xml 527 BLAKE2B cc7db429f639eefca32141b0b3936964330508679f87cf2c75e3c5dd86e24e25cb8628d51f4da728bff784af983ebb33ee64cd8e3becd953033f8b35bcfe7f13 SHA512 422137d02e652646b6e1cc176d4b5209dd7831dcd63eb1c47ce58105aee6648817cd79b67c8dcc1002cb97c53112b0ec75957821af0935275ee5125013c7ff2e
diff --git a/app-portage/gentoopm/gentoopm-0.2.9.ebuild b/app-portage/gentoopm/gentoopm-0.2.9-r1.ebuild
index 60dc5d73ba47..21be8599cc2d 100644
--- a/app-portage/gentoopm/gentoopm-0.2.9.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.2.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,6 +18,7 @@ IUSE="doc"
 RDEPEND="|| (
 		sys-apps/pkgcore
 		>=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
 		>=sys-apps/paludis-0.64.2[python-bindings] )"
 DEPEND="doc? ( dev-python/epydoc )"
 PDEPEND="app-eselect/eselect-package-manager"
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index a4529c98bc9b..e9de24d57a0a 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,6 +20,7 @@ RDEPEND="
 	|| (
 		>=sys-apps/pkgcore-0.9.4[${PYTHON_USEDEP}]
 		>=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
 		>=sys-apps/paludis-3.0.0_pre20170219[python,${PYTHON_USEDEP}] )"
 DEPEND="doc? ( dev-python/epydoc[$(python_gen_usedep python2_7)] )"
 PDEPEND="app-eselect/eselect-package-manager"
diff --git a/app-portage/grs/Manifest b/app-portage/grs/Manifest
index 1fe1112a63e7..d1fc177f392e 100644
--- a/app-portage/grs/Manifest
+++ b/app-portage/grs/Manifest
@@ -2,6 +2,6 @@ DIST ISO-1.tar.gz 2887967 BLAKE2B 0ae9d9c4078974316d6865a8601705f7c69c8305d84018
 DIST grs-0.5.tar.gz 34213 BLAKE2B 3745d68db8da65f72e3b82ed2350d8a8696848d451aa3da5c941174403be7fea9a4b7536cdf532d0d89b6014817c14f874d0dbca3408bdd8326e88396767f119 SHA512 85cb78d898c266fe4f1a5298d3add20fb127d43469cd00d32400bebf0c7350c07b581f9e8714a32db62c57f5a92fca0cbe66f0e2812dab86f57d9e8c66aaab7f
 DIST grs-0.6.tar.gz 34752 BLAKE2B cbd99ba7fea491db032d08cd1daa5a18cab8e8f21110bbe7d6d9c2b532776a9c9f55bd4a1d2b9bd6ea5fdaefdd2fb5af5b35beb6adcfe57d0d02b779c6ceaacb SHA512 ede5117ffe5dad982366b3acabc98bc018cc74aa079080f1a20fe31e86bca0b6ed48589ce22a400bf43d882f17dc630a4f7c99a7f7b4a4cb7c6f2f97974ecc5d
 EBUILD grs-0.5.ebuild 1037 BLAKE2B 715b4ca9f91d01a445de5bb151f30704db2ceceff33d24b35183c9d42b881e7c9336608956e827face1068059d594748bc9ebfcbfc1b3c604f1f8f2558cda123 SHA512 bd97ae2e24f527e13138fd6b9bf00ac453c566e10ad0051c985fc78ff4b26a205c71e36e0f98b691f8bbd9b90b3db5af5b3521c3715f4800cae43cef5327d04b
-EBUILD grs-0.6.ebuild 1100 BLAKE2B 32ebcdcde9ff909213bcbd1f34b32b333b3d9ef7976c5629b6321aa875f3944b7a123c71cacb142e5b47cae87be4d8d8d809536db8399e4fae49c3e2ea375e3b SHA512 a4d1767778b7abf4d968fd280a0247f2806efd79bdbc33c71840dd4c5562ad5ea120787603b57645ba1f2b5d49433f7fb67e0e0ef1c3aa7aafa8dd4d368d9c8a
-EBUILD grs-9999.ebuild 1326 BLAKE2B 0c6fe46c8f6d318367d2b23d08d28c2339bf29707a2fe273a2470fa8059514e6dd1f9c439e92dab290a5a3300575d7442d5f08d7979925533d3b7b670555ec81 SHA512 7076b8e574bda5525c9daa3a41e59d3191c04236ae2915c827b5b4df73993d3a9f1351ca5752573060df73060ceaa7a2be03a1be4982177b695a9d33d85930fa
+EBUILD grs-0.6-r1.ebuild 1136 BLAKE2B 1f7b978a9648202c738d231a27a8572a68b014fe1a461312052dc8b3cc261062360bd1fbe23ada78d7aa34f9dc52acca0d59724f7443a70537d239ff4e2273c2 SHA512 1ceafda1d51f8afa45bf412bff3870ab0aa9191798bdaf87d61403c3429543924a7634b21e709d32cc065f386515a7bd960c7f20d2658369563b69d32c46d7c0
+EBUILD grs-9999.ebuild 1362 BLAKE2B 46a18645f931045f3ab9984ce8a28b9aa82a4ca1c0021619d43e3ae20773d7e5ea32c00b2e635f5ebe73f30bdb36db26cb7f3e1a873b5d6ccacaa91f1f046c4e SHA512 034c51c2f6d9bacc504925f92ca37a2b6151b701d1b8564a8e2af39802c5d6206a5618b195d3ef4be82a79d92d3013e81e4206c2b49396d1dc138c55dcd94caa
 MISC metadata.xml 335 BLAKE2B 24dec8cf9113a9a1114ebac569e5f335f82bbd0e89efc87f4897fd79e7da509450e562aa825c01a20e3edfa82523bf443f0d24f8a0964b73f1074975eee821d8 SHA512 e753c37f63f2d42e2745076a5969ef57a87e71a9dc96b6f681d138c6d9c23d8903683208fa1519e91f08856f40e900812cba2b4d53c51c3827e18edd940b8d7b
diff --git a/app-portage/grs/grs-0.6.ebuild b/app-portage/grs/grs-0.6-r1.ebuild
index 0ebcdf129559..171b185d8595 100644
--- a/app-portage/grs/grs-0.6.ebuild
+++ b/app-portage/grs/grs-0.6-r1.ebuild
@@ -23,7 +23,10 @@ IUSE="server"
 
 DEPEND=""
 RDEPEND="
-	sys-apps/portage
+	|| (
+		sys-apps/portage
+		sys-apps/portage-mgorny
+	)
 	server? (
 		app-arch/tar[xattr]
 		app-crypt/md5deep
diff --git a/app-portage/grs/grs-9999.ebuild b/app-portage/grs/grs-9999.ebuild
index abf196bc0732..aa1fb650569d 100644
--- a/app-portage/grs/grs-9999.ebuild
+++ b/app-portage/grs/grs-9999.ebuild
@@ -27,7 +27,10 @@ IUSE="server"
 
 DEPEND=""
 RDEPEND="
-	sys-apps/portage
+	|| (
+		sys-apps/portage
+		sys-apps/portage-mgorny
+	)
 	server? (
 		app-arch/tar[xattr]
 		app-crypt/md5deep
diff --git a/app-portage/hackport/Manifest b/app-portage/hackport/Manifest
index 550db990064f..7b696eab4517 100644
--- a/app-portage/hackport/Manifest
+++ b/app-portage/hackport/Manifest
@@ -7,6 +7,6 @@ EBUILD hackport-0.5.1.ebuild 1251 BLAKE2B 4e39c3a41890d38e4aeac5657ba077cf80d5dd
 EBUILD hackport-0.5.2.ebuild 1251 BLAKE2B 4e39c3a41890d38e4aeac5657ba077cf80d5dd96d354349fed3d9da342858f0ad823df8ad66e7096d6f1d05cb25e48ad67c360ccba65627eed17c70958d70f08 SHA512 2833246aaf85bc2aa5cfd00125515b2cf4e11d564ba477b97e9b0f0c494871b8cb865d9ebacac6377fae4dabf7ba274b7c8f9e18a0c59e4f44aab8d2eb76e8ae
 EBUILD hackport-0.5.3.ebuild 1251 BLAKE2B 1fd04b8a2a0978b641307a912b68c06f3b68551340262cc7a06c7bf4cdb03839cd7ea85162d688cd50074e62756fd48c24a3c8dbf6152c1e5b58b14c43f0256f SHA512 27170b43c9cf49d89ba294bed4bdb973f4a52261d79160e8795708bc406debab65b6d1911ab8bea4d8a0dd61d7343b7a71452103c8843b3973780465895d610c
 EBUILD hackport-0.5.4.ebuild 1251 BLAKE2B a6caf0eb3c04f85c621b4f994057a4f3e5c477078aad16de3d555a2a4d6a57470e7d30a57124efdb36c164c4c1c8d00d15bd0da0f505d2e4e8860a48d4146222 SHA512 7b6b4d7028f12bf55da10c0192998488a80c9af19dd8c227cba17b49958aac7d702f4e0af82052cfed9fe6c53d8601d2540c383ea1d5dbf183284e09f72d28d2
-EBUILD hackport-0.5.5.ebuild 1302 BLAKE2B 9cdb30531201b52f2122064d430c80b6089929f8523d909a1319d4bb64be1e9da1d90c3fa843a3f39e1cd93572d8e253cc3df832fe50eb618e221e4b7f2c0e43 SHA512 afd0bde01bfc553ec56b8d797ef3ac2c99ccd11322a0e0ed8960e38877407342e6b6dedcb8a50771b9654443e82cb7633bc714a73e00d83dfba0b06a3028f2bc
+EBUILD hackport-0.5.5-r1.ebuild 1335 BLAKE2B 35405227a3890d7ab38993520906542e1606853e87a30e2c5cd29c88f9098ec38e32b0435bb4c1799d8a1cedd9f33fa606c098ac209b1cff4b9116f05db0ff3a SHA512 0ac5557f0d5c4f6484a4d3692de353e5080237221793e03cff98a22368fedd2aa3e899d5373892cbd40399f8c60b5443cf4137025033d16fbf8d67e121d02eae
 EBUILD hackport-9999.ebuild 1364 BLAKE2B 1e83624e23cf82608e2996db2bd6022dff5bbba215702422b6a795bedae3e0cd1d471d0b427eee70d41f19061e73783a0a2e123de6eb810ae81a2f5c99c3e6d3 SHA512 e94224507ca7bbc52d2d3fbea71a760f799651c5da9d7b964427a96b6e7d911fc33d7ea6c2aee0da6b7eab177e6aeaced60cd377f8d39c1fed9fd2bde173f20e
 MISC metadata.xml 497 BLAKE2B 513f311e8507da5bc7ab496ee848d1d50459839bd7df3b318583807d4d2ab056faf8284fe4417a5a81eea35c0b51ddc18b21b77c2569143d48eecc57a66e97ad SHA512 8f4884fa20eb6a46b2007e99a6787f51a7d8f6a8cbb18b1c7f12541914f6d6959274ace8f9576529e5ab6a372d3904f54d11470e9f5d81f6ee066628e1fc2de3
diff --git a/app-portage/hackport/hackport-0.5.5.ebuild b/app-portage/hackport/hackport-0.5.5-r1.ebuild
index 0dea5360f725..35d3380ce9ad 100644
--- a/app-portage/hackport/hackport-0.5.5.ebuild
+++ b/app-portage/hackport/hackport-0.5.5-r1.ebuild
@@ -19,7 +19,12 @@ IUSE=""
 
 RESTRICT=test # tests are broken: need path to ebuild tree
 
-RDEPEND="|| ( <sys-apps/portage-2.3.0 app-portage/repoman )
+RDEPEND="
+	|| (
+		<sys-apps/portage-2.3.0
+		sys-apps/portage-mgorny
+		app-portage/repoman
+	)
 	dev-haskell/async:=
 	dev-haskell/base16-bytestring:=
 	dev-haskell/base64-bytestring:=
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index d3309f96ef10..9afebfd540b2 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -12,6 +12,6 @@ EBUILD layman-2.0.0-r1.ebuild 1629 BLAKE2B ff95ce6ba92ce4d8b536260cb15149f786bee
 EBUILD layman-2.0.0-r3.ebuild 1668 BLAKE2B 9132c3dc910abfadf07e6fd9b3a69ea6234bd63dac873d20fd0235d3c35ba21991b2b97dc992d735a1b0452eaf44cb5eea7cab6678a977dce55c932bfbb685e2 SHA512 215e1136fbba7153772417deee4456b4174d0b551194f4ebeb3f29583315a74fcb4791b631c1049fb993218b2b8d6e30910366eaf935e4d0b010725488d7213f
 EBUILD layman-2.2.0-r7.ebuild 2178 BLAKE2B 2b3959e9f03c436dd07d7db4cc36b6d0a147cc0e3d35dfc9363e2baa1e869b9092c4eadda6a5424ea53c50667add23622065222ac4ade7142bc34cebc2e08f5f SHA512 04c77e388d73a53034fce76018c09d79ff67e1ece9719afb381bb79a4566b45873ba3acab4040f64b4012e0a442f72d9bb534f1cfe19840a461e5b607678b255
 EBUILD layman-2.4.1-r1.ebuild 2116 BLAKE2B 4f16a3e6aa26701a653c3b2e103085edd6420676f0667db18ccd87cf3aba8a858827f85f5fce383c379c658faeb82b736a77f17790a5ba95eaeafea72a1aa9f2 SHA512 5ecb7a7786ca0354090a20f4fc63def960d27a2a47b77d2d69742f905109a06f693154694967229ab3dcfbb52ec4ddfbfcee7260c426afe2253011f329035b60
-EBUILD layman-2.4.2.ebuild 2169 BLAKE2B a39ff01536cdfb08eb8ce50255b07ce29b0ecd780736796a8dea774b4037e3529192cee223e665588d797cc2fc1595dff54eae7de242e996663304fa2070558c SHA512 4019a22b5535b9539d206a3c586581b29e068f8dc06c474d4278a2d91997b348f454177027ce2d63a05ab8aa0caf0f482e1bdc164f43b7f13607a67462521d4d
-EBUILD layman-9999.ebuild 2104 BLAKE2B faac34ced24e00f4e7ab24c2199711184c802a28820a8db4dab4515d3e7e33ff6be56fc3efadf426dde8b1305c3726c57dfea44ca4e14b3020dcf84a76fd2c97 SHA512 125bae3ff55719296ebb215b2e4a346afa529a828114c8c107ba8f1d795fdbf2ad246ffc5eb684d4fa7764e39e5d66f3da4f6d2ba693ef94ebb0fb6355be9ab0
+EBUILD layman-2.4.2-r1.ebuild 2289 BLAKE2B 46d9b5292320f7d091822630cb69037f0745a9dd35f1b4b5b7da8c60571a7072a82635603e0403e9b4819b80d511429025a6d2909eef14e64dd3bb37d5af93e9 SHA512 d4d2e268bba46ff1c6c33963c4ff75239db5f28c8eb64109a86d3531c7f707c61a2011d4270d2a55c3365aeb59a6344a6ccbdcabc89c0bae3405b6278c91eca1
+EBUILD layman-9999.ebuild 2223 BLAKE2B 1d32d63d9c99593e03dc8e3ed8b31d775918593bc115129433eee7dec66d115eba0424eba42864e187a2796e5bc3ea54aa5c3ac13a2d851fc81dcb18ad8d3342 SHA512 ac5a21aa58ae616b661f92ed4dfcd9cd15413be55778e496a22dded16de24efa26f707008d50a2e0bbe43a4c615dcff1333d972cde8eca2671b3c1f480c3b8d4
 MISC metadata.xml 1177 BLAKE2B 0024befce684e122216fecaecb3ccf2f2da44fa82a3f2c8811155861041009a0cded912e93a2d6e66884814afc8b1ccbe6f006b40b6e44cafa13fa0f53c90a4d SHA512 d41244afefdb11e5f68be2200a759e4209b2b59f5b9de083e79a522d5a10f12359f9fd6f30fd24f73d4e9b190a2f974f8e519cd22614dd2b023594952dba957e
diff --git a/app-portage/layman/layman-2.4.2.ebuild b/app-portage/layman/layman-2.4.2-r1.ebuild
index 8e8ec17a7a6d..7cd74b995ce9 100644
--- a/app-portage/layman/layman-2.4.2.ebuild
+++ b/app-portage/layman/layman-2.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
 
 DEPEND="test? ( dev-vcs/subversion )
@@ -35,8 +35,18 @@ RDEPEND="
 		)
 	)
 	gpg? ( >=dev-python/pyGPG-0.2 )
-	sync-plugin-portage?  ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
-	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	sync-plugin-portage? (
+		|| (
+			>=sys-apps/portage-2.2.16[${PYTHON_USEDEP}]
+			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+		)
+	)
+	!sync-plugin-portage? (
+		|| (
+			sys-apps/portage[${PYTHON_USEDEP}]
+			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+		)
+	)
 	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
 	"
 
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index c7ff3068c986..41753c3c8898 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -36,8 +36,18 @@ RDEPEND="
 		)
 	)
 	gpg? ( >=dev-python/pyGPG-0.2 )
-	sync-plugin-portage?  ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
-	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	sync-plugin-portage? (
+		|| (
+			>=sys-apps/portage-2.2.16[${PYTHON_USEDEP}]
+			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+		)
+	)
+	!sync-plugin-portage? (
+		|| (
+			sys-apps/portage[${PYTHON_USEDEP}]
+			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+		)
+	)
 	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
 	"
 
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index b34aa178214e..c1daa3429a4a 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -8,6 +8,6 @@ EBUILD metagen-0.6.3.ebuild 825 BLAKE2B a4a5044861e9c83e27b449648616853ca2703b2a
 EBUILD metagen-0.6.4.2.ebuild 829 BLAKE2B 0abf87e7e3e3be9bc00248fbb09a1fbff50cd4eee23dad358b02566a5c1e6a7de201eb6af364246db40f7b33b22ee062327d9e7f7e10c128f8d400d9542c8212 SHA512 542fd0585a00e849a8692540992b6de31becfc3ecaa35f37873cfd4b2878568328ae3c61f004ba2d05637e856c179fa17d05eee7688bf02600abb96373f77760
 EBUILD metagen-0.6.5-r1.ebuild 930 BLAKE2B 0c766ffbf7aca569a55b3efca68f219c7e8675cea1eaa13492c7b4947b771ab4b2f8a70f3827dec4fab48b920debe25764c910018f1b467eb300a56c9a282129 SHA512 a6e76c8f6f6b95bc89ea766e6ab5f3fe4af7728d6a3df90687f62fae934f4d3d6cd39007f37eec7bf295bdd63f9075f4a33507caa96fcc91a3802aa86a5fc3ae
 EBUILD metagen-0.6.5.ebuild 825 BLAKE2B 11b103026c9fec8053f87f7f460d0d91ed1623c7157c953af8c64a93e223b8efcbdce79a08688bb220c7ae2aa5a19dce52c02b87d9f7108be4b39abc7dcebc4f SHA512 8892e342ee8b999c42e7f90dfcdf50f568fa886cf313c9c869387a21be4c3eeb298ba069e8d6b23eb2305cb3d5dcbfb638692ee8c3f69bf0dfb7ce4fa5453402
-EBUILD metagen-0.6.6.ebuild 818 BLAKE2B 9e94f6b46652793e1705cb58b0700ff1f608fd7e1e25ca12ccb71cf4ed46ae83eb8128cd2f7a73b48e1a6c4edc76cf868edb4771c3ca423e955bae35a3a2d4dd SHA512 d0a98e890b7a3ff7e07149b1430a869288b56c0e32cbe6b39ea9bd3fd621bc5019015ce884137fa57f3d6c67710125aa0929f72655c98b8d9b76cfea571e22f2
-EBUILD metagen-9999.ebuild 889 BLAKE2B 576d080466f825b4b313c2908d658833ad28ffd0a065368cd7454fcfcefe546c7fce8acdb460b0a0a8b5c1891a9db53e4c9b45f07c7afa46b9e7535b4cc6cf83 SHA512 9fde9c59acf15aa2d6cc2ecc0a8925800b66375d0dda8276333ee579f457d404c1d779b59ac03e9f036ee8b996ea7aa0cf6c2a0732a624b0ac1e862b713b91df
+EBUILD metagen-0.6.6-r1.ebuild 872 BLAKE2B 04c208b0af3d80a60a3d3ae8844816621e0fa44914af35a77a6aaf787d6a8d8f8b3d666827baad72631c2f95548d062b3ded1fee660d94ce563dae71862e034b SHA512 b38245bd017b59ed45f2fe73aa99f0ab78c7db56d0aaedc35b4051ab9ba9c8362a131bcee87150767ba7294dade9a4394e17f333c15ba0c62b2224eb39f5ac8d
+EBUILD metagen-9999.ebuild 933 BLAKE2B 848344caaa665d2f0bf8f1f13d2ec5c97802eea12ab2ed4bcc45e6d0db23c940e0de5ab85c1dcbcfd9594ebf9955065ee783b550565b0a7f18392eb0be1a62ff SHA512 fa61cb086af549787017c3e6710600d5558b2d65952e9acf6d194678a58cf0289232df7544b96c329e6fada9a21849520db65af26e354b7c65c6079b6265fda7
 MISC metadata.xml 295 BLAKE2B b7dab399d97c12c36ca3d8312dc628a9b1d393d6eaec7c941d6cc03fc7bae3c6cf7385e91758708712fd7e155a5051e8de5bc155563f552707bc1dd0c74262b4 SHA512 68ea6ebd27bc287655010afbfa6ea291c8bb7de14cef145c91b3179c4d28e865701ef8dfe914457ea933785045731277d3b245877d935d1163915a76db9511b8
diff --git a/app-portage/metagen/metagen-0.6.6.ebuild b/app-portage/metagen/metagen-0.6.6-r1.ebuild
index 124483989462..4a7336fac2c0 100644
--- a/app-portage/metagen/metagen-0.6.6.ebuild
+++ b/app-portage/metagen/metagen-0.6.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,10 @@ KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
-	sys-apps/portage[${PYTHON_USEDEP}]"
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
 RDEPEND="${DEPEND}"
 
 python_install() {
diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild
index 6f413d6b1c1d..5393a9b28614 100644
--- a/app-portage/metagen/metagen-9999.ebuild
+++ b/app-portage/metagen/metagen-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,6 +19,7 @@ IUSE=""
 DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
 	|| (
 		( >=sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}] app-portage/repoman[${PYTHON_USEDEP}] )
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
 		<sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
diff --git a/app-portage/overlint/Manifest b/app-portage/overlint/Manifest
index 790a6fad55e3..b74f68087cf8 100644
--- a/app-portage/overlint/Manifest
+++ b/app-portage/overlint/Manifest
@@ -1,5 +1,5 @@
 DIST overlint-0.5.2.tar.gz 2701 BLAKE2B 28fe90628d1c6603af0936b7a5d945b39bd93b3a7444bee7ac79bb939d8c108a32f58ce51fe10198564d24927bb7c04e273de83417c77ec38d3442562a7a2a7b SHA512 aae78ed2d3f02e83ced3dbe8ace468adb204b80e040b979a97d92af0c91e79019f2ed14e6e3655ffa8137c55c8fd1f054c27229819ae7908632586acb284f3ea
 DIST overlint-0.5.3.tar.gz 2706 BLAKE2B 78c76a72556213bbc84b91ada3ea1d71ad045fe4498baab1f6710190a55802e5ffee14d652540d2cb7caaecd407963f7bad9682cb72e5e6571597983384bf019 SHA512 348b59e5f013b1c4060312208fdc7fddad3252d6f386513d743b7685d8aafbf76ac626fb9000c2d47c362b85d223dea5f59b4cfec55dbf24a52185c5b943a149
 EBUILD overlint-0.5.2.ebuild 466 BLAKE2B c916134cbe58ada2432a06f4be63496eba7f66ccc2943eca889dd5fefad9340ae432b824749d199ac49a5904a819a7c3bc06f143f1c16afc1ca5bd2ef8ff43bf SHA512 14bb74721903f33da9fbe1c44892b631553e14d36f8ecf05de11ee331006b6523d5d24305943904bfde815a6396d7b3f1cd6482de16eb0d2a9ea438199cc3742
-EBUILD overlint-0.5.3.ebuild 487 BLAKE2B 25bdb0cd030aec5e3811bac0d2f5997fd13292629b919b7607f428ef31f71d9811ddc6243d249013cb2cfb8bd3b32e7cddec91d8c4eb5a9e521f2f5fc312c5cb SHA512 3848cb95b5d2420ded863bf12825e4421211f111bda1e9cec7ec512b70e2857839e76cea3dfec0d9b2e9010cec03998820e78b4dc84bedc15fa72103cdda7617
+EBUILD overlint-0.5.3-r1.ebuild 543 BLAKE2B 98f28a6fe5bab8f66a0a9ed4b5a811822a80a2d0c7b3b3cbfae5d7875afd78d10735ab5293d271a0fa7ec1eb1d8ad8682ed7224e34fabee3ca8c9edaf9f9ded8 SHA512 ea3665a033c1040b741cd206af229872d16580abb2c99b13fb6aea42d7f5deb93b0f667ad4671a8d53351b0af9e5498c0abac12ab3bcfac431416cbd8050e137
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-portage/overlint/overlint-0.5.3.ebuild b/app-portage/overlint/overlint-0.5.3-r1.ebuild
index 7e57262b3a36..c21a4821b5d1 100644
--- a/app-portage/overlint/overlint-0.5.3.ebuild
+++ b/app-portage/overlint/overlint-0.5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,4 +16,8 @@ SLOT="0"
 KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
index ceab75d77e56..022318115c06 100644
--- a/app-portage/pfl/Manifest
+++ b/app-portage/pfl/Manifest
@@ -2,5 +2,5 @@ AUX e-file-20110906-http-response.patch 356 BLAKE2B b995c07f558e398615fcaf74e87f
 AUX e-file-20110906-portageq.patch 1256 BLAKE2B e7cbbc0de5c592b4088d732f4f5a8c03d32842b4a375aedbcac4d82de11760221ea170a19fbb54cc909b4383e693b9ac3a1970047b6aeca0f32ebe10cf7bb50a SHA512 370f74f68888860e8b8d82ea55288c67df45e946e3fc1ff6e4a0c24a4036a045a942347c7eaee02574f7c3d66a6c5c5b3a2208a2c7457f4e7d1fed65e95466aa
 AUX pfl-2.4-reponame.patch 336 BLAKE2B 246570c1c8e77a0cedbac41a9f639cf9ebf1c6c0ed40eb968f4db1c03f6c4cad6688faf86d384b81f7c835438853a43833ff27b854a5d4de41a788934284cae5 SHA512 bb1d4af5b29f070ef75cebd0374fd50556bbc38c8b7b15256c1156dae9887b6e794a0bcc35a199e4e232cae20251a7b74da614779ed589ae9f0420829a5a4659
 DIST pfl-2.4.tar.bz2 6274 BLAKE2B 7cf72dc4b9182b3ea43fb1661330debeb79afdaaab8a519dc2f8f0a048f5f7e66ee2466a44b4683f36eebae248f6df407d0d0fc3914f3a8eb427bc2af0692bb6 SHA512 a33712bc38d6e02474856dc3a9eac0d39be032a9554f2510815602e94648cd6bf499111a3354568788ddcc0a653a2ac54fac56b0af03fb1cf822ec44ffcb1d72
-EBUILD pfl-2.4-r4.ebuild 1133 BLAKE2B 670159c2dbadaa43216af81c2015a1b5120944c507acfcf66fabd862f7949ca2ad256ed086d1681495a05a01896655919d35a1b1b341393dc9d4dcd854929b35 SHA512 5af730fc92de9ac3975ee483c8cfb0555bb08db5df66f6e2c097f855c8d7bb0512a2ca790d08b5aaf9d8d95731002458d4933fcd5031f118c32318213e56c851
+EBUILD pfl-2.4-r5.ebuild 1187 BLAKE2B 5a967446090b7776eac821306d2706dac343ee14a5c3eadc7b1272cb3f4fd8bfee7662519a83149e8f175107eaa24fa6172ee4e07f065c4079921fe090e83941 SHA512 54aaee896889cfb453d101cea9463c2ff63ab149ccbb3614b08172280db20a45b4a2dac508d9481ce1ba6302ffc598649bc9e704229f6b97b32187920c11e48b
 MISC metadata.xml 495 BLAKE2B ef70490d091bdd595de1f73ab32dfa8d537c32bf8b5362d7ba19529d7f8c4cc8252702ab781fee5021f13a36b1724f471ff9b6358ddfb77cf7c31f2c4ff56b0d SHA512 b556cae880b209d43627f462f429c4aa71f023e96f6bef4eb2fbed854d28e94be98a3f07e65b980dbc22e6ad9b7da6fc284402329119a47538a2eb1158ce942b
diff --git a/app-portage/pfl/pfl-2.4-r4.ebuild b/app-portage/pfl/pfl-2.4-r5.ebuild
index 2a623a82db6e..6f6863beffab 100644
--- a/app-portage/pfl/pfl-2.4-r4.ebuild
+++ b/app-portage/pfl/pfl-2.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,10 @@ IUSE="+network-cron"
 DEPEND=""
 RDEPEND="${DEPEND}
 	net-misc/curl
-	sys-apps/portage[${PYTHON_USEDEP}]"
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
 
 src_prepare() {
 	epatch "${FILESDIR}"/e-file-20110906-http-response.patch \
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 273ae71ac0d7..f2e6beb4e0b8 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -9,6 +9,6 @@ DIST portage-utils-0.65.tar.xz 542804 BLAKE2B bddc1a0ffa52a8d871547e5f4cbbca254e
 EBUILD portage-utils-0.62.ebuild 2243 BLAKE2B 383eb4fa9791b2f9f99b6a71004a410342b1751b5e987f698f8a70df90fa1186ed6f91050788cfb68f983df5fece3be98da5b65cd7aa62678f1b534554e09736 SHA512 b6f941532e77f9670b7ccfcfb2fa8ef039335e88ccaeb6d32370aab032674435e1acfbc633a22ce98f736626351df77d8e2ee9bf6e5bdb37f0c6427c4fdc317b
 EBUILD portage-utils-0.63.ebuild 1190 BLAKE2B bc78f2a5ec957e2bb6a60f9377028579ca6fffffd4b46803d977dc463ea3e4dace74de224e5d88262a92e46b81882c6ded1bdb38595a5cbdf62ba4754bae5e3c SHA512 dcc3384a68e6f44066eb9eaa35909cca3076724939d38800d8a3290354dcf11809c19274605acf5f88423418ec76b9a0e8b7e1dcce2b19ef8f1e61f1dbab3a0f
 EBUILD portage-utils-0.64-r1.ebuild 1156 BLAKE2B f48b8b7f8022efc4139a3fef3e4972bc60bae01d1fe1406ed9fe28ed2ec57c0a3474be929f98d70fc0e063f5a9cd9bea5ae4b5427e54ba75fa1ed4e8fdbfb33d SHA512 f844f217e2e3c516813c53b1193af4f81c91c574a4bd29dacc66eb39eca52a4f63c94c607b191ff8285ef659f5fa353115271f01744106ee7030909533645f56
-EBUILD portage-utils-0.64.ebuild 1078 BLAKE2B 85f7cc3f046e2e35099b7bdb839fc6411ead2b6c6fea20a53a6416bc25b04ba679fff1a5b207a10783fad3cfb43953882a6257f29212514d740c7aa11de7c34e SHA512 1ddb384e1567a2173d8702ddef1c3469aac0ad1a4f6298a2c38b1d8716117b317249691ca0015489ea337e75271f560d53477b32583ee163b477474ffbbce54d
+EBUILD portage-utils-0.64.ebuild 1077 BLAKE2B 2de3751b36fc3020734f9b212bb2b5fb0957b194de836c71884c1a2315c58bb49b864885b598134fffd8e513b6b94325454ba7bb259872a8d8759b14944cfea2 SHA512 8a0a68ceacbbcf3d2430154de855999fef1a3f867127c704d7a33c634fa249f344c04412719e7810dc4289c3b0611bd8227b7ba37220933ab1858c73eb835bcb
 EBUILD portage-utils-0.65.ebuild 1092 BLAKE2B dc0f835b1e8e2065b6068fd011f2e6a953f046d366f46053dd534a3621379c68707b4612cbce46f74923a5535b280388c4cd3cc4b691826c08bb87d7c6b00ee6 SHA512 1b4a097f7408ebb6634d4b232ad3dc407b444c4dbb73b8d3b1c6b904cabddf0c3c53b4c51cd008355e7586f248fe663beff3a853dbfb847e29c7ab82c16ed390
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild
index 3f0acfc8e9f1..9fae38417f20 100644
--- a/app-portage/portage-utils/portage-utils-0.64.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.64.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-portage/porthole/Manifest b/app-portage/porthole/Manifest
index ac015ab8df27..07451f003491 100644
--- a/app-portage/porthole/Manifest
+++ b/app-portage/porthole/Manifest
@@ -2,5 +2,5 @@ AUX porthole-0.6.1-masking_status.patch 485 BLAKE2B 92188c56635ab69207dcee949303
 AUX porthole-0.6.1-missing-attribute.patch 665 BLAKE2B ac282d0f7ef0f94d125520d25c3171b3f05bf42338f399b6bd7b82f09e9f6d0740e6df06c256b7179d9889b4c361b0ffa2954fd14f9a835d024feaf71499105a SHA512 e450d7d188b7762cebdfd33e6bc586c38e63fec80fe51fd500559587a85e6f5632ad3279d8e8a4bc37781e77f3f6f3df9af8b013f1725dbb47877642177d27d2
 AUX porthole-0.6.1-missing_import.patch 858 BLAKE2B 6b338ff4425d533e6f5a7033f2372032b7184ef3119a95cd5251ff92430223cbef3e95922850ee62416f9d7f2e0dde6df015a5cad1146e227c120c2e4a902630 SHA512 aa61359f9b0d53ffeb3a68bdcacf0010de2a789ea70b1bc0a1035d649ff3986e7fb44292fced65f5652475956d7a10d15907a4e6fa139854f7cdb4a7db1eaebd
 DIST porthole-0.6.1.tar.bz2 958696 BLAKE2B e4eb7493a66278cd7d16ac68304fe74ad8623054a95bb3dca84b0b8236f76cb9b0a92f446d1ffd95f907c29d703d93bdd48e8e5064485b69282e8680f5fcb658 SHA512 9bc1d79c587ad8228b9bb4eee6cb32559a5d7b6a9f4f6ece752fce9030f71fdbfd6158d7a2a055641b63df1f0a1c31995747e15b618de79cd8a7a56e4d8f634c
-EBUILD porthole-0.6.1-r4.ebuild 2004 BLAKE2B cc43bff307460bcf80e49fb835b8fc298b01899edd1677269f813e8ac5e5f2b663154dc621e77360d752b9785c28a975ecc3d62ad84e2f7255fbdb20eb13ed46 SHA512 cbeea11ed7167f2d85e0776d59a4af8a7f83e2536b3ec2a7971e4ef5db2d484ecb04fae045603268835c06a8a018f43723fb964d3519976ce81ec8dcabe11842
+EBUILD porthole-0.6.1-r5.ebuild 2060 BLAKE2B 9b62d2c9c8886bfa21c1b80880ae377b21d35d83560fc809f2a6f35387fa9141503f8331b46573b52d5491fbab237cf43b6328dd69abc5113e072366c6b51cf3 SHA512 5defd448ca7af6aef841fee4ff4aaff06fc2ed4f040d2185e31fe6237eb3bbd36d462cd0883f1c370e65ab3fa0c02773384302e62f22f94cd0679527355290a3
 MISC metadata.xml 519 BLAKE2B 2c5fd18fa8f91cecdebd9e89292c1862e11e126cbf710db17af3358e92bd2a7abd30e5a7ff925b33c446d9d7c6937f2e3d19c171e8c35c2bbee243e2f9339947 SHA512 d149c76b00d1a0c2b3593f90b45b944de122498606d86cb90f992beb2a727bb3b32f610e823c0d0ad0377538616447698acc110c6f152860844a53610d531220
diff --git a/app-portage/porthole/porthole-0.6.1-r4.ebuild b/app-portage/porthole/porthole-0.6.1-r5.ebuild
index b89b89c8092c..4c439daffb48 100644
--- a/app-portage/porthole/porthole-0.6.1-r4.ebuild
+++ b/app-portage/porthole/porthole-0.6.1-r5.ebuild
@@ -18,7 +18,11 @@ KEYWORDS="amd64 arm ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="nls"
 LANGS="de pl ru vi it fr tr"
 
-RDEPEND=">=sys-apps/portage-2.1[${PYTHON_USEDEP}]
+RDEPEND="
+	|| (
+		>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)
 	dev-python/pygtk:2[${PYTHON_USEDEP}]
 	gnome-base/libglade:2.0
 	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index 28f5cdba74c3..8f71a248a782 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -4,6 +4,7 @@ DIST portpeek-2.1.25.tar.gz 12864 BLAKE2B 1b0522b1d6beee25451f461c86019236667124
 DIST portpeek-2.1.26.tar.gz 13004 BLAKE2B 1de44e9cc3f097154c5374c2619367d20bba62c69acb7ef4b7efcab17a60d0918c98f6d1fd2ec149379f2408f4a932d3389ff19c720c9a63e4dc197021d4e2f8 SHA512 0bf139381629118cc216c1fb21e65d9a317eaa0f1a200f8032f6050dea12940ab6bfc440a0001e2f26d74a21698d8de14001309342c202ae9837923d703b7ad3
 EBUILD portpeek-2.1.21.ebuild 692 BLAKE2B 30e2e87dfe6088945b51c93d67a69798503266774b094517cd29d8a408f7bfb27716dad8026a01b10e88e15ff1e91b5ecc14034b87d24346f3e8dd8122f525fa SHA512 02c5df14a945e8703ae9f99ee7d61083dd6b125ff5bc7d12c9f09cb0c8006335696de9113a8d490ce6460bd59d5b91f71af50119efb943e62b5d6ad196149045
 EBUILD portpeek-2.1.24.ebuild 694 BLAKE2B 78f2e828f1f25bf4a430a050faaa9795a3328e35839bb57090c397a16966317a19f6e38df261f20ee5bad64e28b97efa574cd2147df993a69ec7190652337675 SHA512 2de0c56eade803cfde62c396d3347a4a3242ad36c10d5dcd4895d3c7fe2b20c62fb9c8272e6558c6b7a64b25301575a9416a5e1dc788002825f3f9a8c3c5ce6b
-EBUILD portpeek-2.1.25.ebuild 695 BLAKE2B 6ba24a0eabe3752d47fd7869b046c693df9b1096c36ee9874feb295e48f1364de47a3a03624522efeee3018c12173afaf664f2e345efeaadf54d90166bdba19f SHA512 784ac87c05225d84bae0d3e2803a1954f1f6d9daec80048ddc1c8b029426d3b7af01e37078754d033eaf1ffefd18807ea1f6304221e03014e1c2885670491910
-EBUILD portpeek-2.1.26.ebuild 702 BLAKE2B 96268ffe951345572fe4df7991c9cbef8871480b79b58d69063fde7e3893329de4f8542149dceb76de804f51cd59b14045591e8f6f6bb741087ee194ee461c18 SHA512 5b309404209ebc4b1eb4f09734cd09ca0331d64685e845bb5265d9dadd6712ceccf5523dbcc10091131de70b66d4278b434f48bb900d585c644ae62ba3bdfe91
+EBUILD portpeek-2.1.25.ebuild 694 BLAKE2B 7ce31d63bec751641bf74868e04df23064b72f7ffae9ba11a30b89b64e7c28588fbf39669407aa55732c9dac196044cf398f65f42134e44318367ba6a712a8ff SHA512 464d37757a6f770369b445fab9588e948590e7929d5528255ccece45941e79cbecbe6bf88c8d4dcdd9f31d7065393a183e49e64ebde501c8b84340be6a5b886a
+EBUILD portpeek-2.1.26-r1.ebuild 756 BLAKE2B 0237f012275b1de58b1cb9c7497a1e115550bbcacb2ad63c4313363863d0a4a903c3cb4e265fa94fecc6ec9cb48efe3bb8a65f0eb0586b7a5dfd22fe6763a54b SHA512 fba92d9cf82681e4bfcf5b8707657ed02c9726e1b98b6a9f7f403f03c0c8a14b7b2578b195ba0a4c9466e04a616a21de7215a18417f0c0008ee66ead92f58b4c
+EBUILD portpeek-2.1.26.ebuild 712 BLAKE2B c6a539332fa2d7d90723bce8721e004557ef1b9d77d1bfe814d57ce015073a3122cc167c1c1fef9884c719698648ddb3a108fddd4f13d5faeadaca4c356911ab SHA512 a054bbaaa443406ee70ecb8473d36113b14057e8622d066eb22517c08015e3a214756bba8c4e4bc6d2361a703477f4fb3da8dace7ed4677b6a36e1df876aae14
 MISC metadata.xml 222 BLAKE2B 5192d31072923545c8f760f9c3b3274f610b7a94a53cf55bc85c5c20a953b227b7cdb64cb5f5921b8b2822ec6563479b5d4883ec2b569a066d8ab569713fa8be SHA512 3d793038a1abf5bb86eeb23fee623f27db1d8e529372adc51eb4ffd1d0c2deb6df1c4d637954cc68e07d590c25e3d74a8437d02c1864a21c96f63597192cfef9
diff --git a/app-portage/portpeek/portpeek-2.1.25.ebuild b/app-portage/portpeek/portpeek-2.1.25.ebuild
index 3e486e855a50..e44085c02489 100644
--- a/app-portage/portpeek/portpeek-2.1.25.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.25.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-portage/portpeek/portpeek-2.1.26-r1.ebuild b/app-portage/portpeek/portpeek-2.1.26-r1.ebuild
new file mode 100644
index 000000000000..801252517706
--- /dev/null
+++ b/app-portage/portpeek/portpeek-2.1.26-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit python-r1
+
+DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
+HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
+SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=app-portage/gentoolkit-0.4.0
+	|| (
+		>=sys-apps/portage-2.3.19-r1[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
+
+src_install() {
+	python_foreach_impl python_doscript ${PN}
+	doman *.[0-9]
+}
diff --git a/app-portage/portpeek/portpeek-2.1.26.ebuild b/app-portage/portpeek/portpeek-2.1.26.ebuild
index 1fee1c28c074..06eb5a6cda32 100644
--- a/app-portage/portpeek/portpeek-2.1.26.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.26.ebuild
@@ -21,7 +21,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	>=app-portage/gentoolkit-0.4.0
-	>=sys-apps/portage-2.3.19-r1[${PYTHON_USEDEP}]"
+	|| (
+		>=sys-apps/portage-2.3.19-r1[${PYTHON_USEDEP}]
+	)"
 
 src_install() {
 	python_foreach_impl python_doscript ${PN}
diff --git a/app-portage/repo-commit/Manifest b/app-portage/repo-commit/Manifest
index 9800cb9365e5..881e0efc1951 100644
--- a/app-portage/repo-commit/Manifest
+++ b/app-portage/repo-commit/Manifest
@@ -1,4 +1,4 @@
 DIST repo-commit-0.4.1.tar.bz2 54416 BLAKE2B 85b4c9608baac4fc267047cb3177a80fa9d5ef761cb70a7d752acf5448607330c873ec1180c207a399e81b55d82ebf23816cfefed380ecb2de0d5eff3fc63b61 SHA512 25d4ec02605454e49dafb59a753abbe6b28b2e07225d5479bfa0e0d493d3dd6bd2302dd4efaa2d6a6af5f8c7e41a5029ac8edb9d7b1dd8ec9349a057d1d61622
-EBUILD repo-commit-0.4.1.ebuild 533 BLAKE2B fe8abc573b7bae2452d8ede05b3b0073d9077b941837213cc09a6f3b06738f98aa101e65a912b39bcfe62d012a7f57e1efc62965f25b4e65729dbd6fd4cb2817 SHA512 2f4882d0b988b1a0f35501f016e6baa35b551e23f94e90b96f557bac294e937f7be85afd25927d686c8da20920976390a6810856006d2ccc9af9c3d937c73ab6
-EBUILD repo-commit-9999.ebuild 682 BLAKE2B 29d8c85ddd950c96727ae164f6d9dbb449e7a248c6282eb88488bef1088463e7f8a2404e5c47f61b679de692a1f867398d121cdd26a6393bd797a29c96065ace SHA512 97f73e3db00fa6d70448f5c9d30db34075c0a7c0db19e06df3b69159c21b02a875a94f9f08826041ecf24f9f83ceaa3c3f63da4e4ab476b822d05892116b138a
+EBUILD repo-commit-0.4.1-r1.ebuild 565 BLAKE2B 5158900b66b782a08cebada3b71c3a88c0208f63b6c9cad33b023a2dac224a264dea1acde1f0bb241c64a2febbb6fec2b67af1394e27959e7ac5c2ccdc619233 SHA512 9344eddc2d5f4ab47d95cb0de7ceffddc286a283f417d70a7505be7a80eb6065b733f62ee3376289620eb1728ca6b4ad73f5394407c7afb55b875e4060d7d869
+EBUILD repo-commit-9999.ebuild 714 BLAKE2B 65ef8c52eef4f77ce1be989ff41bc5f93f380894ac1338760fcc19ad61beb34b34b8a4639ec0e77d9f4cfd287b4609263cf05753aad61ceb323e7eb301ea6475 SHA512 37db547812a58842dc56d9cd0c78cb3c1b689f95a3fdc57514c00c61d131f5b8e02a5ff9a10831d1aef21d2bcb62c624670e294bca33c321d3aded21273bd1c3
 MISC metadata.xml 430 BLAKE2B dd1a44ffd6c5bfcb12270c03220891674e21e6de4313a40f37821e053eb04cac8680c1558cc8961db61d71be918330eaeac4eaacc63f1e385bc471899d07afe0 SHA512 e8f0ae4509498e5fa1f2ac9949b6a5ffd12b86d0a15968fb0f31c65624eef062e31ff36431bd5366560a37fc48ef96f54d6a0a6baccc61d0c2ab3144556ce966
diff --git a/app-portage/repo-commit/repo-commit-0.4.1.ebuild b/app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild
index d9e1004d6089..456a5e1868b1 100644
--- a/app-portage/repo-commit/repo-commit-0.4.1.ebuild
+++ b/app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -19,6 +19,7 @@ RDEPEND="
 		>=sys-apps/portage-2.2.0_alpha86
 		( >=sys-apps/portage-2.1.10.30
 			<sys-apps/portage-2.2.0_alpha )
-		app-portage/gentoolkit-dev
-	)
-	sys-apps/portage"
+		sys-apps/portage-mgorny
+		( sys-apps/portage
+			app-portage/gentoolkit-dev )
+	)"
diff --git a/app-portage/repo-commit/repo-commit-9999.ebuild b/app-portage/repo-commit/repo-commit-9999.ebuild
index e8559e807850..ad2905116f17 100644
--- a/app-portage/repo-commit/repo-commit-9999.ebuild
+++ b/app-portage/repo-commit/repo-commit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,9 +26,10 @@ RDEPEND="
 		>=sys-apps/portage-2.2.0_alpha86
 		( >=sys-apps/portage-2.1.10.30
 			<sys-apps/portage-2.2.0_alpha )
-		app-portage/gentoolkit-dev
-	)
-	sys-apps/portage"
+		sys-apps/portage-mgorny
+		( sys-apps/portage
+			app-portage/gentoolkit-dev )
+	)"
 #if LIVE
 
 KEYWORDS=
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index 4db3f5c3abe8..4e21a16d27c9 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,4 +1,4 @@
 DIST unsymlink-lib-12.tar.gz 8689 BLAKE2B 3c170886bfa3980ef0d51be1e3636afcd700aad94514a2783a1bf221970022fb4812640ac0c2f54e6b0d3b93244a64221b092768425faa1ddcfdc21ba76d9cd1 SHA512 e964cf8dae4107cbe0f5a304e693794d50316b914cca6cdf068ac3e715c8a6fab44d96ec38bd34e5c4f65dd169629bcaca3a0b6ce3256c3d40dbff69dac56fe5
-EBUILD unsymlink-lib-12.ebuild 587 BLAKE2B 55186b97491db39eed8e5eb442e97e3e9183873728cab04bea70ad8bee7daca0bc68c9858e1873889eec71e606444fca2bd97aaa8732cb00ef3474ef856727c7 SHA512 933b23621879ed7560c7045e48f6b72a6a52fa655d6f6adcc447b2d9cc7b25da5a05af9597922fed6ba77cbea6a12d807875fc0ba2dc2eb04309f2cae72776d4
-EBUILD unsymlink-lib-9999.ebuild 573 BLAKE2B 8708c8cf4a0fb2249a4440d38983595c7101e1f07ac2522460d2738f80abfb7b640fe5a4cbdeacfe0148dbc01f75389015f9e11e7dc6f7b8e13c8fa4ada458f6 SHA512 dcc7c50d19385bd074da4f77444d910258fcd3acf83e7a7a983aea2848403c29ec655ff0346fbeebe21522ae2cc9965177c82c66afb3aeb2bbb7764488fb180d
+EBUILD unsymlink-lib-12-r1.ebuild 641 BLAKE2B f967256636c88afa1d80c73359cedec7f29f73403796ddeceb4b1ebf98f5b30d0dc968cc1633ced1ee3a922715f06a565359dc05f7e5f320e9a787d7432a5861 SHA512 29232685faf31b790a027e2ea862de4b309d9a9423585bf1d12d63cdf298a20b2e6fd68f8a1917fbac14b7ffd3e6a287d1c358c2744e597ccaeaa32cba279b75
+EBUILD unsymlink-lib-9999.ebuild 627 BLAKE2B 4ebcd4f34b4326174f4c32cbc5c23572e8ca57a5bdaa3f170c60ca5bb2d4a9ac31b9a8203093bd7891eb78fb62642a4b9cb9f0e5fb16aa276e9561d4b0ff1a96 SHA512 e8a09ca9ebc84eb8702334de9c72f508bbe168961d0eba7f113c24f6e08e477d63ffde2f79927d7c1b6b0f2056e4ea6fb42c5c60156e92700088e70429b108d4
 MISC metadata.xml 401 BLAKE2B f16ce51083f8054e7190c2d5fc193808898071af155cc8442a9ef7064cb4d46e6639d8724f85a4a0f551477c6f7ae0f81434c6bef8bd88b2077ea7b7e1f2133b SHA512 dbd79971b54d9027956c46586b547f8308404e273e91dd7ff84d3fbbd50936b8f19dd1dacde5e16a22ca2ef17924f19f66ec83e64c9f145f29322150db9e00a6
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-12.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-12-r1.ebuild
index cc0eef3daa07..2fcdf5eb3a90 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-12.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-12-r1.ebuild
@@ -17,7 +17,10 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	sys-apps/portage[${PYTHON_USEDEP}]"
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
 
 src_install() {
 	python_doscript unsymlink-lib
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
index 8a11a8833e6b..0a8f8ce3adaa 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
@@ -18,7 +18,10 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	sys-apps/portage[${PYTHON_USEDEP}]"
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
 
 src_install() {
 	python_doscript unsymlink-lib
author	V3n3RiX <venerix@redcorelinux.org>	2018-03-23 04:19:44 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-03-23 04:19:44 +0000
commit	c5283d322accc6097afec74eab24550829788bab (patch)
tree	b99ce668128d82a026eaa31461643f9173f9b77b /app-portage
parent	5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 (diff)