gentoo resync : 21.05.2019

4 files changed, 9 insertions, 39 deletions

diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index c2ed6580a542..394e6cf59193 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -12,7 +12,7 @@ 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 2169 BLAKE2B c6db6a0bb066ab4a505a8d24c6d255b23ef3da9c90c2a2cc47a54c8d2c5e94683bf44b97ab071c02ec37cf98be2cf507b84645039063ad5482bf646e7455e693 SHA512 f90f728d15f6d6a98a57612e691c2e1b237d2a7033cfaa3ce7e236dc3987610b42d1794ffe5c489309123acc53b5fc776ee7666cb4fe56878d7347427594d3fc
 EBUILD layman-2.4.1-r1.ebuild 2109 BLAKE2B 2c09406d4bd3679deefc851bba94f909de9563be0131e0a747203b8cff8bbb45fc9f3481103a279a140d39953f8cb863cb2d119f8b31381ba1deeed0d5bc7da9 SHA512 0b1cd552fd2cb6c4d5bddc781c8b0a7125364e8a5967b83e87fbaf914e4f9f6eccea3e3b0534ca2ef7ce9c11abf6847e43f2c7447d039624845cd568b0890a00
-EBUILD layman-2.4.2-r1.ebuild 2282 BLAKE2B 8d8a1a6ec6ef824d9f58e5f28855a62963022d49efbd2648bc4321c3d1424550b27a7300d4466e6ded387aecbce9479a69f5b6979bf26f31e628ca925de172d5 SHA512 cc545f2dff482af90532c9f0a2d41b95d70fc5097d52f79af059ccba93c062ac8137074f2497d80ab919758c0184a56f0f0e944ffe97812ce160695762f1346e
-EBUILD layman-2.4.2-r2.ebuild 2423 BLAKE2B 6821448ea82274d5154163593228b8ddeb67ec6ac3e050cfc90922d43cbe92cf38424ccde8f76c7140fb3e488bf2cdc51b2b745fb961fd761596e9b474484401 SHA512 deb59af455da2adb32d694465c1af1d685bf151f1968ab532a5f65479f5036c63987686d2cee6ea7ec3b0e0e92e0603a4f370d4736985e22f34ceeb288874fa2
-EBUILD layman-9999.ebuild 2423 BLAKE2B 6821448ea82274d5154163593228b8ddeb67ec6ac3e050cfc90922d43cbe92cf38424ccde8f76c7140fb3e488bf2cdc51b2b745fb961fd761596e9b474484401 SHA512 deb59af455da2adb32d694465c1af1d685bf151f1968ab532a5f65479f5036c63987686d2cee6ea7ec3b0e0e92e0603a4f370d4736985e22f34ceeb288874fa2
+EBUILD layman-2.4.2-r1.ebuild 2162 BLAKE2B 10198d3e8ccb03f1314747a3618c6b372106a9102dd11f39def840a840ac45688e33f495dec626b13acace65c606c56a4932c254c16b314d47954d3ae217c1cd SHA512 0abb38d14c5041aec15ab54aecfb5a28fc548cbf2e20f3fa2f5750703acf086c09d4532f0f423aa1ac3f8758cf2608df7f4ef2311aba0c9930bee9424b88c949
+EBUILD layman-2.4.2-r2.ebuild 2303 BLAKE2B 3e532156c1cb250f3786c46335f125a1ad6099e3f17014cea85d1edf567b9052ee7f7bf8ce2120d6c36cbb5becdb140e721f15db888532c5109031a70a065966 SHA512 36d30fe2d042543ce9ce094ed5bd1b27676c7d826fdedadc7b8bd173a8709de0c446b890d8a3e2e0dc579a7f378adf95b99431810e7633a065ffda4c0a4a18d0
+EBUILD layman-9999.ebuild 2303 BLAKE2B 3e532156c1cb250f3786c46335f125a1ad6099e3f17014cea85d1edf567b9052ee7f7bf8ce2120d6c36cbb5becdb140e721f15db888532c5109031a70a065966 SHA512 36d30fe2d042543ce9ce094ed5bd1b27676c7d826fdedadc7b8bd173a8709de0c446b890d8a3e2e0dc579a7f378adf95b99431810e7633a065ffda4c0a4a18d0
 MISC metadata.xml 1177 BLAKE2B 0024befce684e122216fecaecb3ccf2f2da44fa82a3f2c8811155861041009a0cded912e93a2d6e66884814afc8b1ccbe6f006b40b6e44cafa13fa0f53c90a4d SHA512 d41244afefdb11e5f68be2200a759e4209b2b59f5b9de083e79a522d5a10f12359f9fd6f30fd24f73d4e9b190a2f974f8e519cd22614dd2b023594952dba957e
diff --git a/app-portage/layman/layman-2.4.2-r1.ebuild b/app-portage/layman/layman-2.4.2-r1.ebuild
index 781d4cfae715..46f0b1bd942d 100644
--- a/app-portage/layman/layman-2.4.2-r1.ebuild
+++ b/app-portage/layman/layman-2.4.2-r1.ebuild
@@ -35,18 +35,8 @@ RDEPEND="
 		)
 	)
 	gpg? ( >=dev-python/pyGPG-0.2 )
-	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}]
-		)
-	)
+	sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
+	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
 	"
 
diff --git a/app-portage/layman/layman-2.4.2-r2.ebuild b/app-portage/layman/layman-2.4.2-r2.ebuild
index 27e2292dd23e..52df5e51656a 100644
--- a/app-portage/layman/layman-2.4.2-r2.ebuild
+++ b/app-portage/layman/layman-2.4.2-r2.ebuild
@@ -41,18 +41,8 @@ RDEPEND="
 		)
 	)
 	gpg? ( >=dev-python/pyGPG-0.2 )
-	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}]
-		)
-	)
+	sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
+	!sync-plugin-portage? ( sys-apps/portage[${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 27e2292dd23e..52df5e51656a 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -41,18 +41,8 @@ RDEPEND="
 		)
 	)
 	gpg? ( >=dev-python/pyGPG-0.2 )
-	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}]
-		)
-	)
+	sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
+	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
 	"