gentoo resync : 18.11.2018

17 files changed, 88 insertions, 319 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 71110bd34bcf..0fd4e1c2811f 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index e335e86430c4..5764d4750f7e 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,10 +1,10 @@
 DIST eix-0.32.9.tar.xz 599072 BLAKE2B 40fd86520e5c98e4a7cf6710fcd16ce685cc14fbafa417f6694134702b61b83d8d47cfc908c5621d77ba827f7449c985de7dc16650358a8ccad2ab4b48644e38 SHA512 1a7c3d5f371150f5990fe1f1c4cadb0e3ee0a5810011702904aabd58ca250c10f820d6c64e7182096e0b7e2aa001cf573c5f2e83499ceb350cc59b599ec2ca5b
-DIST eix-0.33.0.tar.xz 610600 BLAKE2B 484d70c3efcceebf54f2a2e0af69b701716d6c6c45aa867a8cc372b135db29bb1bf23cf0efa6d3d2a19224255113229fa30cdd40ab4d64f226eafa73991daa96 SHA512 6fd4ca253ee908eb192ee35c4228bea0fa8a04030070b35489bddc639053c2e3f6a2faf32f539ffd2c7d9da0c664ff5f29ac0d732d9a47b6c9976a65dd402de2
 DIST eix-0.33.2.tar.xz 614192 BLAKE2B dcbbdb9b9ccf6f780d89c791c34cc588700720b7f015fb0db7ea86dd78a383892266b0e96c49282fdea58e78293c69e8acc153cea631443c35d3ee29dd4c016f SHA512 28ca4cc57e5c7ef81feb37fa90d598e681e192c442c7446c93a442908d2a9744340f7a93c71135ec3083fb85c48a65638c8929b6e1e632464132f4320225d637
 DIST eix-0.33.5.tar.xz 626628 BLAKE2B 2bb102279084f6bb6871bb4bbe55100708866337501c6043508ee13bdb92064c3a4a41d067b9d4c03af1a5ffbece53d9c66cf89639adf0c555a9511cae3d702f SHA512 7a71a411d4428ee491b9aee0f414e038a08f2195db58466db9b96f0d80edca7eaa153e63534c832c71e1b488e21fbd869a96bd10a21e06a93ce7eba1f808b684
+DIST eix-0.33.6.tar.xz 625512 BLAKE2B 3f27e3cfa00dc4979bbebbd3b31dfa29e7dcd527fdf7b3ca3fdc6a4ce45a64d7f07fe20ea4a526533aa506c2d9e7fcbbf7b5e83ad6a2d4bbacd1ce75b6cde4ae SHA512 3f04f06533d4e7a0acd5b6e85d1194c8f9b013595ebe75c3dda06cce42e7721a57393aed17e9dd6437780b48378691d84b6e595999ce4321ad114b239313c7cf
 EBUILD eix-0.32.9.ebuild 2897 BLAKE2B 25b666ca91a0d72d8a58d610e7162194a81fb3010f0c8475b0fd66ad2354bc420063080843df75aef7f1a331ecc3329b9f8c1665464c39014cb7609d1b88a770 SHA512 528cdba7e083e90458390c08a85ff790c242cc4d371572ebf5459b5c37f9676d1e3a6df5cfba3c558347d4f94454c7ef9254256c00cea57edfd41b5a0dee7a01
-EBUILD eix-0.33.0-r1.ebuild 2803 BLAKE2B d6f6529df6b609003e9c5b49e9c732e8bbedec446936d4b53b13c45b69df03b7a5ee830d3c9dd8c7e450543129bb9e61bc8e2cf839c11cfd079bc2722918b5ca SHA512 31bcf38358758e013484fb86b43bfee405d51361bc0df1162044085c724a8eb1f98184469038f20579069e5cc3e86352cc25515858747af2e1758b0148d26a8b
 EBUILD eix-0.33.2-r1.ebuild 2803 BLAKE2B a8217bb65f047590307aa403e54396ba55f4d2aad98b58d9452bb9e855e7edad327c66b6816e243f911d32dfe335900dcd174be3fcb4160d63221d56ec840cac SHA512 48cfb75718d8021014d94d9bb1291e47d8a1eced46932262f70fe53a9e3acea80ee3f87d1f73af259ad158bc366cd2000b194ab74fa6d62d584370244cc16870
 EBUILD eix-0.33.2.ebuild 2795 BLAKE2B c490432dce6040986795e37744569cf27d320e9a0e066f5998960eded9cbd17e443786eb4346463d4d8d852765ff8791856951c109a514d7a0b6568bb7888571 SHA512 bc901e7e995bde5142988d6bf7ff4031fd3c895684e10db8249e7c723f39d9de4bb948d369da252aaa9b6378fa42318b66be177df6124ef79d9bf7094c762bfe
 EBUILD eix-0.33.5.ebuild 2803 BLAKE2B a8217bb65f047590307aa403e54396ba55f4d2aad98b58d9452bb9e855e7edad327c66b6816e243f911d32dfe335900dcd174be3fcb4160d63221d56ec840cac SHA512 48cfb75718d8021014d94d9bb1291e47d8a1eced46932262f70fe53a9e3acea80ee3f87d1f73af259ad158bc366cd2000b194ab74fa6d62d584370244cc16870
+EBUILD eix-0.33.6.ebuild 2800 BLAKE2B f23daa963d486af806ccb9fefad94164bb299071b6df49b8f122ebdcbf0c228888da359d3185d7962f69e1c2b084cc6019ced705528f814bf04a5a39992b3a59 SHA512 b53472ef80af890d9822d32ed890d62962fac175f2eb19da716426d2b159629d96758bc92110502b01201347d3449416a678527dc18b968c472fb1ec1e15c83c
 MISC metadata.xml 933 BLAKE2B 50fb01d14ad0ce00114dc8b6d9c70fdc2c5ee036d9883cd307721bc0abfa1ef9a74a826b5ab74dab7f9c9579e20c9b222cce33e04c065eb3310d230578fe9f42 SHA512 e5272580ca0631bcb1150f8a879150e8ae9c90948b3c90ef8ee42631e7345b99c2a6db64ce199a02e86f83ede5f8b41134d50136746d836fe68ae97429a6b550
diff --git a/app-portage/eix/eix-0.33.0-r1.ebuild b/app-portage/eix/eix-0.33.6.ebuild
index 3f61ef866261..22862304f235 100644
--- a/app-portage/eix/eix-0.33.0-r1.ebuild
+++ b/app-portage/eix/eix-0.33.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -74,7 +74,7 @@ src_configure() {
 	)
 
 	# https://github.com/vaeth/eix/issues/35
-	append-cxxflags -std=c++11
+	append-cxxflags -std=c++14
 
 	econf "${myconf[@]}"
 }
diff --git a/app-portage/fetchcommandwrapper/Manifest b/app-portage/fetchcommandwrapper/Manifest
index ad60da15c497..73bc9048165c 100644
--- a/app-portage/fetchcommandwrapper/Manifest
+++ b/app-portage/fetchcommandwrapper/Manifest
@@ -1,9 +1,3 @@
-DIST fetchcommandwrapper-0.7.1.tar.gz 3187 BLAKE2B b2ddce407cb9977ca66da6ca732ef263f4f3e3fe60296882e6266af9c36c1b103d62d8a002d72e1827d02c6b4cb4c0a90ea31938460d598f39b531a2f3e32615 SHA512 be1e382180606d527f85c2f45888373286687c2b521c66cb11ed90f05e107bb54cbfe83b0509bf52e31108db3a52b9089259c83e63cae3a1d25dbca583faaf74
-DIST fetchcommandwrapper-0.7.2.tar.gz 3134 BLAKE2B af98fa7ad46bb1179c71db36a2465f904e5f0c28b573272eb84da328fc0a5c0f209674a9e23f2d482f14c472e5d6879fb872c2e09465638b3249b503f583cc53 SHA512 f268cbef691320106b3f929b0ab3b63085ffdd3e1988fbada2d37c6abcdf7e417758055fff503bb70490840dfde7704e87bb7434faa1d1115cc42729ad10de61
-DIST fetchcommandwrapper-0.7.3.tar.gz 3431 BLAKE2B c9c03eb0cb39c1f61f741cf716cc9c857bab8400cfc4c622350b0b65e03cdc618c86922cf6dc2cd5f2b841f8771ab9d0f2b39eca326fa4806eb77c56376b938a SHA512 df314331b66b89842285a175be686fe800de4a93ad382b72659429a62de02c4fc708d8964f766c7203c3c2aa838a684e808442d410d37ab9f8b9af8328442a51
 DIST fetchcommandwrapper-0.8.tar.gz 3558 BLAKE2B 6e37264382900d9326d7da0546ac870a07b9ba66056221e17cc2a170ccfe367e867d74cf3b6f1a6e9d5ce834a054d26b40e57d9d1bd00a87bda80b77b1b427bd SHA512 b064515d3f4b85f849de53934a45e7a64c9af8bfcfb83ee70d09aad9712623cff2c43a28c93ccd00b74f99679856225201e7c8f33b9b0338121ac1072335e5ba
-EBUILD fetchcommandwrapper-0.7.1.ebuild 634 BLAKE2B fd0a02ae7d64277dd3f1d4fe0cbd29c1b941c485cb1614990fa2b129e2101a5a61a3fcdb690ca0d1ade8be65b9bb96d6aeceb4a90054fbf5c3736c6816a43053 SHA512 8b281114c4c0218fa5005c14937a8032b3b46fe1f9100f63ed3a91636ed6c6483a5993b7cb9741838b49c0951470dcfe248c8f75d0dea873716ffb4882377809
-EBUILD fetchcommandwrapper-0.7.2.ebuild 634 BLAKE2B fd0a02ae7d64277dd3f1d4fe0cbd29c1b941c485cb1614990fa2b129e2101a5a61a3fcdb690ca0d1ade8be65b9bb96d6aeceb4a90054fbf5c3736c6816a43053 SHA512 8b281114c4c0218fa5005c14937a8032b3b46fe1f9100f63ed3a91636ed6c6483a5993b7cb9741838b49c0951470dcfe248c8f75d0dea873716ffb4882377809
-EBUILD fetchcommandwrapper-0.7.3.ebuild 685 BLAKE2B ae6c4afa9d6766f2b709294884be8f13702fd0db175291c9aa7b1838f083ffeb15b3e7a677a5f5e4c4b1bddf26f3b5b79176e0bf882ea3c42cf1eae059866cc7 SHA512 4fc5bba0a8524e937cfb8ace71173b10f614a1fbdc90290f1e751035c74674b7e68455ca24d73205754bcedc653a7157d4ce64bf7a7f580f88a58f5c814b857a
-EBUILD fetchcommandwrapper-0.8.ebuild 685 BLAKE2B ae6c4afa9d6766f2b709294884be8f13702fd0db175291c9aa7b1838f083ffeb15b3e7a677a5f5e4c4b1bddf26f3b5b79176e0bf882ea3c42cf1eae059866cc7 SHA512 4fc5bba0a8524e937cfb8ace71173b10f614a1fbdc90290f1e751035c74674b7e68455ca24d73205754bcedc653a7157d4ce64bf7a7f580f88a58f5c814b857a
+EBUILD fetchcommandwrapper-0.8-r1.ebuild 699 BLAKE2B a9f71bbfb042fd9b6561ff4864f5551dad95c828d66ef78e196089ceb6b36ab19e600f94d1f77521eae5ca2f875518648739ce491924d53fc9161fba7d1c1dcd SHA512 e686fd203cdf9babc99aa730cf285f8394701f4d334b321555c8061573aa4fd11350c25c87cb26cd7490125d9e146ca766da548a2b019fb0a6b7ae4631d00d5f
 MISC metadata.xml 350 BLAKE2B e6a5ab6c334161cc899297d647447e23a004ec3b4466e68a50b20ae25957d740935784224f54914e9d91a3384cd7d2a88eef19687aacda05fb52430fa5c3e9b9 SHA512 700ba67b643b208acca8a25e93ec723a25d23d0b14f52866e20935fc58487401a2b0d2f90df6804f5c660427a849a3d32e520725aff2e47319d8e4ff184fc1b8
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.1.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.1.ebuild
deleted file mode 100644
index d4abf02b7dd7..000000000000
--- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND"
-HOMEPAGE="https://github.com/gentoo/fetchcommandwrapper"
-SRC_URI="http://www.hartwork.org/public/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=net-misc/aria2-1.10.2"
-
-pkg_postinst() {
-	ewarn 'You need to append'
-	ewarn '   source /usr/share/fetchcommandwrapper/make.conf'
-	ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.'
-}
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.2.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.2.ebuild
deleted file mode 100644
index d4abf02b7dd7..000000000000
--- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND"
-HOMEPAGE="https://github.com/gentoo/fetchcommandwrapper"
-SRC_URI="http://www.hartwork.org/public/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=net-misc/aria2-1.10.2"
-
-pkg_postinst() {
-	ewarn 'You need to append'
-	ewarn '   source /usr/share/fetchcommandwrapper/make.conf'
-	ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.'
-}
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.3.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.3.ebuild
deleted file mode 100644
index bf638f923ccf..000000000000
--- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND"
-HOMEPAGE="https://github.com/gentoo/fetchcommandwrapper"
-SRC_URI="https://github.com/gentoo/fetchcommandwrapper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=net-misc/aria2-1.10.2"
-
-pkg_postinst() {
-	ewarn 'You need to append'
-	ewarn '   source /usr/share/fetchcommandwrapper/make.conf'
-	ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.'
-}
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8-r1.ebuild
index bf638f923ccf..a29ec9fc0106 100644
--- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.ebuild
+++ b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND=">=net-misc/aria2-1.10.2"
+RDEPEND=">=net-misc/aria2-1.10.2[metalink,xmlrpc]"
 
 pkg_postinst() {
 	ewarn 'You need to append'
diff --git a/app-portage/grs/Manifest b/app-portage/grs/Manifest
index d1fc177f392e..0a7de676d69c 100644
--- a/app-portage/grs/Manifest
+++ b/app-portage/grs/Manifest
@@ -1,7 +1,7 @@
 DIST ISO-1.tar.gz 2887967 BLAKE2B 0ae9d9c4078974316d6865a8601705f7c69c8305d8401835bfa544d14a90b3688ea6b881a1c07bcb969fe2b15f210d05f114ebaf3af5ba6f1ae3705d395f1603 SHA512 50bd9bcaa3d1900763936beb4801fd9e5cb963e39d51c39c9cc9a8d160469db1b0c6fffae01bbb5d5d5c6d4e42d84a6c499c465bbdd964835c2d190785eed52d
-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-r1.ebuild 1136 BLAKE2B 1f7b978a9648202c738d231a27a8572a68b014fe1a461312052dc8b3cc261062360bd1fbe23ada78d7aa34f9dc52acca0d59724f7443a70537d239ff4e2273c2 SHA512 1ceafda1d51f8afa45bf412bff3870ab0aa9191798bdaf87d61403c3429543924a7634b21e709d32cc065f386515a7bd960c7f20d2658369563b69d32c46d7c0
-EBUILD grs-9999.ebuild 1362 BLAKE2B 46a18645f931045f3ab9984ce8a28b9aa82a4ca1c0021619d43e3ae20773d7e5ea32c00b2e635f5ebe73f30bdb36db26cb7f3e1a873b5d6ccacaa91f1f046c4e SHA512 034c51c2f6d9bacc504925f92ca37a2b6151b701d1b8564a8e2af39802c5d6206a5618b195d3ef4be82a79d92d3013e81e4206c2b49396d1dc138c55dcd94caa
+DIST grs-0.7.tar.gz 36330 BLAKE2B 9e835262656f8a51969810f92a1ae801bc058c4529c01fe1998227fa8b81939c1d7db9f335f5a18f18d9cbd53ec809d289efd80ba7543b3b61a8dee1296bd780 SHA512 b530d66e3402e34f1c4efdff0af0e1d0f0ccf311c440c8d5ee050f8a8ab178d663433f766d507c5b1280ef9056fd97d05915e65e07a1a59bb8a3c80fd4bab4c6
+EBUILD grs-0.6-r1.ebuild 1137 BLAKE2B 2e3b9bf26a56e68c99ce6948f1dae78a6773a117f3354a4979865e96a56242ba3c792050f93729a0699175d59c08f0ecce477b1bdc6d3f533b382378dc9dbcb7 SHA512 718f231d2ba04966a408b7c02ebf47c2eee83cd7f1c4274eb5e818346f38681dea56b0a45d8cc96447c7b7777e49efb486825e03298f0b13104a5f8714d690a0
+EBUILD grs-0.7.ebuild 1368 BLAKE2B a52038471b4e024aebd20c5d8a5179bdd2d4443961172869cb1df24a2a3c643f35e842a2c418c3c7d832e995546078d19abfc79f9d36af8acc611ef92080a902 SHA512 9ce761b4865fdd6bb3c3472da74e86b5cb1130620a820cbc2f7c9c3ee6317315ad65fa4ba3c2a5315d1d2894296f3ee30efe87e931983d69eb40b3fba62a6df6
+EBUILD grs-9999.ebuild 1368 BLAKE2B a52038471b4e024aebd20c5d8a5179bdd2d4443961172869cb1df24a2a3c643f35e842a2c418c3c7d832e995546078d19abfc79f9d36af8acc611ef92080a902 SHA512 9ce761b4865fdd6bb3c3472da74e86b5cb1130620a820cbc2f7c9c3ee6317315ad65fa4ba3c2a5315d1d2894296f3ee30efe87e931983d69eb40b3fba62a6df6
 MISC metadata.xml 335 BLAKE2B 24dec8cf9113a9a1114ebac569e5f335f82bbd0e89efc87f4897fd79e7da509450e562aa825c01a20e3edfa82523bf443f0d24f8a0964b73f1074975eee821d8 SHA512 e753c37f63f2d42e2745076a5969ef57a87e71a9dc96b6f681d138c6d9c23d8903683208fa1519e91f08856f40e900812cba2b4d53c51c3827e18edd940b8d7b
diff --git a/app-portage/grs/grs-0.5.ebuild b/app-portage/grs/grs-0.5.ebuild
deleted file mode 100644
index ef064c9ea51b..000000000000
--- a/app-portage/grs/grs-0.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1 linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/grss.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-DESCRIPTION="Suite to build Gentoo Reference Systems"
-HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-arch/tar[xattr]
-	app-crypt/md5deep
-	dev-libs/libcgroup
-	dev-vcs/git
-	net-misc/rsync
-	sys-apps/portage
-	sys-fs/squashfs-tools
-	virtual/cdrtools
-	|| (
-		sys-kernel/genkernel
-		sys-kernel/genkernel-next
-	)"
-
-pkg_setup() {
-	local CONFIG_CHECK="~CGROUPS"
-	local ERROR_CGROUPS="WARNING: grsrun requires CONFIG_CGROUPS enabled in the kernel."
-	linux-info_pkg_setup
-}
-
-src_install() {
-	distutils-r1_src_install
-	echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
-	doenvd "${T}"/20grs
-}
diff --git a/app-portage/grs/grs-0.6-r1.ebuild b/app-portage/grs/grs-0.6-r1.ebuild
index 171b185d8595..c5876bba4ff5 100644
--- a/app-portage/grs/grs-0.6-r1.ebuild
+++ b/app-portage/grs/grs-0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 arm x86"
 fi
 
 DESCRIPTION="Suite to build Gentoo Reference Systems"
diff --git a/app-portage/grs/grs-0.7.ebuild b/app-portage/grs/grs-0.7.ebuild
new file mode 100644
index 000000000000..c741dcba3eaa
--- /dev/null
+++ b/app-portage/grs/grs-0.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 linux-info
+
+ISO="ISO-1.tar.gz"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/grss.git"
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${ISO}"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~blueness/${PN}/${ISO}"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Suite to build Gentoo Reference Systems"
+HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="server"
+
+DEPEND=""
+RDEPEND="
+	|| (
+		sys-apps/portage
+		sys-apps/portage-mgorny
+	)
+	server? (
+		app-arch/tar[xattr]
+		app-crypt/md5deep
+		dev-libs/libcgroup
+		dev-vcs/git
+		net-misc/rsync
+		sys-fs/squashfs-tools
+		virtual/cdrtools
+		|| (
+			sys-kernel/genkernel
+			sys-kernel/genkernel-next
+		)
+	)"
+
+pkg_setup() {
+	if use server; then
+		local CONFIG_CHECK="~CGROUPS"
+		local ERROR_CGROUPS="WARNING: grsrun requires CONFIG_CGROUPS enabled in the kernel."
+		linux-info_pkg_setup
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+	echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
+	doenvd "${T}"/20grs
+	if use server; then
+		mkdir "${D}"/usr/share/${PN}
+		cp "${DISTDIR}"/${ISO} "${D}"/usr/share/${PN}
+	fi
+}
diff --git a/app-portage/grs/grs-9999.ebuild b/app-portage/grs/grs-9999.ebuild
index aa1fb650569d..c741dcba3eaa 100644
--- a/app-portage/grs/grs-9999.ebuild
+++ b/app-portage/grs/grs-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit distutils-r1 linux-info
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz
 	https://dev.gentoo.org/~blueness/${PN}/${ISO}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 DESCRIPTION="Suite to build Gentoo Reference Systems"
@@ -58,7 +58,7 @@ src_install() {
 	echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
 	doenvd "${T}"/20grs
 	if use server; then
-		mkdir ${D}/usr/share/${PN}
-		cp "${DISTDIR}"/${ISO} ${D}/usr/share/${PN}
+		mkdir "${D}"/usr/share/${PN}
+		cp "${DISTDIR}"/${ISO} "${D}"/usr/share/${PN}
 	fi
 }
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 0ecf939eeec8..7829c1384887 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,14 +1,9 @@
 AUX repoman-2.3.0-bug-586864.patch 1034 BLAKE2B a2641d1c47907ec6069c490de30aabdcb654fefbff36665899463f2bd4fab343f254ab54038b5756c32b8df9058f270e9ef17c743898bdfec6b65847dae2f443 SHA512 463bd5f0255165faf0c60faa327c29d9eb1a6f9ccdf41369879485f234e1bf9d2713332c115b36088ac9227a56ca154786b3955b2d6e8ffdf7bdc3f10a5a762e
-DIST repoman-2.3.0-bug-586864.patch 1074 BLAKE2B f29ed4b9b66540bf765cd9bdf46ed10d99845ca141df4ad9701d94d8283343bb2e9101cf44e10ed2dc2dd11d02c5dea68e113f624db82d420dac5e846dd44c59 SHA512 b48112a623a4844e5783f229ee0208f729b99ab46128d19735a76633efee17deb81342b5dc8fa67f4f4f5a851509c04c8d2f2ba2cbd992a9d26e61da4ed5f7e8
-DIST repoman-2.3.0.tar.bz2 75285 BLAKE2B 980fadf2247869358f76f6708117b8a9591763e9cae8fdeed8fe4cbc6915d0fd4473381a0eed99c16fc67394fda996c12b9784b7511ebe07267496e39d683258 SHA512 960c63caed12f7c89d374ecceb39677b62d588bf75cc8da1857641c60310061188f4c2fd7177c93a4e8f20cf00a423426f2a70666320f263158531a618a7ff9c
 DIST repoman-2.3.10.tar.bz2 87545 BLAKE2B 67e1e514eebd50516aeaea2708ebe4c9d69cbf61add5fa19a31681f085a6dd8c39695cb63d9b4cd23caa955c85669148fce3c31c08b913e31839ff186e3b3ecc SHA512 498ce493661eb5939a5f1345337e11a84e97fc11a0556f2660bd8900f0cb0f6340a401e5728c4557248dd54bcdc0a7d2c72dbb23eea3acb35e053d7359c0e535
 DIST repoman-2.3.11.tar.bz2 86807 BLAKE2B f5bf8e9b7bac7816ee9b1139d0e0d30e99fc06da4fb742e430c237d9be0e6261bcf5d8f3412f1c20a34e2766c5acc86176b4731f20adc9554de9949bd5622a5d SHA512 331614554bb7ba49b8b63b8612642426fb458aa84de78bb9958be85d03e43d662fc094ecd2472a6f06c6b4f0368ec0542083b04c25f7d8b6aabb432cd2b32367
-DIST repoman-2.3.6.tar.bz2 78961 BLAKE2B c11953ced4d6bcd5e6e6a5b2dacb8802446f3acfd1842854b33fa8c0a64fa636a0b278b4fd3010b7070a7e2f00ae841ea331925ca20175e7c7e571082195d3d1 SHA512 490078d4621073e448d037373617911093bc4c3262961c4da00f201f880069c0b70c019abd86c15954ff0c547b0ea49434ee97cd972c2baff82f7cfed1a987b3
-DIST repoman-2.3.9.tar.bz2 86432 BLAKE2B 8b60e9ee2705e8fe5d6ab569120f96ca452327c70b95a3b2fff291d4e5c6e446a5bbfa9256b5b0ed18a4e54662bb1b60f4a1e80a8a0c07d276a42fe756ec30e2 SHA512 7b492db9b46f8ebb681ec7dec6dee4a40ce5f95809d505e8b74058c391d16dacdb0171befad64f0281c0168316fcc9d7ec09c7b37742b87b890593ac610329a7
-EBUILD repoman-2.3.0-r1.ebuild 2503 BLAKE2B 3c6b8981076ccbaa0c270c4a5a5e60382892d9793b47b163ac40ad965be32106e508cd9f8c020fe28c67778d36b8cf35653bef11c159d8fe7a663186a5cfdec0 SHA512 b79135e052cf2b1106e3ebda0dfd63b37f1fe5d2869b0a97149180f1e64f21f4543e4a1f0478531019e46d602232f15c13f49d9f5e51a07c97865223ae8b866d
+DIST repoman-2.3.12.tar.bz2 86737 BLAKE2B b27d89b0fe62d52607c55b1cf1d5662699d1e46ad7ef85553d642be8fb915435f1748914b9d63febb7dddd67bd5623f72ba4aa9ca7634af98f85634af91a74c1 SHA512 64bede0e1deb7d2a8c4c702d6845e84f8937cbfb54f6f35d88a10b13c961f28948f17c9e1d623bf0f663b22f98dc4e8f514c200fb4f1b93d7535addd5efa1342
 EBUILD repoman-2.3.10.ebuild 1952 BLAKE2B e14b21a2bd636bff2104dcf56d91e99a5cf0ab1deaf6ccdd3c4c30a482f0780a37f005c80d14d74cb27d2ce523e1c7c6db6eaa8e6501178506053c38f4dcb5f6 SHA512 e053f9decb8bc1e4bc9a2df878ee227f5bfde2fa325eaa137a24b2ce070a8abe6fa6144e01b737da188bcb20d5d7b69133adff27296e7a77292f3761e9dba0fd
 EBUILD repoman-2.3.11.ebuild 1946 BLAKE2B 2286b77ccd4d1bd546e84ea0c50bb3ba12ea30c5b3a38ea98649bb74cbae82910c79ab0501087f12fa36fca9696c269b5610b082e462b765e3bc493c838030f9 SHA512 d866b6bdef1c4da28eb7368862b725e87c4bcf052b4df083e2c0a1631ed928814c9bdbda3022258fdb25a5b5c2fbbf13e235a617ab64d2d2e59d666795956469
-EBUILD repoman-2.3.6.ebuild 1843 BLAKE2B 7423ea5e4fe5e895912bf383fc4e319c08abd5ea0995c497baef8bb8291516691e92124156681d860c3963966db8ecba48efb364de8256860b9c09aa1ef72bbb SHA512 d8dda4aaf8518c40bf2fc6dda958fd6218cd604a4102f9d1aff9c9b7ed0cdd6314dad10a11ab5e38ce455cebb12eaa20d99e21dd3ae2495182411a6f7abe7acd
-EBUILD repoman-2.3.9.ebuild 2165 BLAKE2B 9dc5c9f83b489e59770411eb09b1706145eb931ced4ea11f70df8bded8b8ae01cc5d0fd817dcb24765abf71738f84bece86ad189ba5db2a2ec94ceeabbf92bd1 SHA512 a77bf9f1c9d5e13bd1d6459afde097187f2ab3c596fca467f63cb2090ae5d48c8f634f9d20accb750e2f674214a8c69609b3e2a80b254df4fc36b4622c560d19
+EBUILD repoman-2.3.12.ebuild 1958 BLAKE2B 3b07f84e738e20027799bcb3faf4985b5b3040699051380ce8b8b640289a37cee9b97fc46a3a3b3e2559aaddde5b70d86b4e7f8626dff5721d2b450d5e7e89c6 SHA512 2486405267eb1de83802c9ecc817fe0f31d1e9825c92991bd0064e5908c4e0069e5ed2fb0b44bf7e8092cf4163a9b14f00c425bc72174a39dc393fbb4898f734
 EBUILD repoman-9999.ebuild 1982 BLAKE2B 2da48849d7f710be3930ae5882f420d25e9e9aa07a5d94cb77e658b0914cfe94ec2b3bcb174bfbb8a9739a55732f4fea02ca85afe8516dcdaf89627bdefcf0be SHA512 e9ee663fd2019db232df7cba9b0842f654f64c7b83dacd991a9844c1736651ff74ce2096979035ca2b29e6e9ddbbf01891c35206b77bb4ca0f077c7354e65f6e
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.0-r1.ebuild b/app-portage/repoman/repoman-2.3.0-r1.ebuild
deleted file mode 100644
index 0cfe176939b0..000000000000
--- a/app-portage/repoman/repoman-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_3 python3_4 python3_5 python3_6
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 eutils multilib
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-lang/python-exec:2"
-
-RDEPEND="
-	dev-lang/python-exec:2
-	!<sys-apps/portage-2.3.0_rc
-	>=dev-python/lxml-3.6.0
-	"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/repoman"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	https://gitweb.gentoo.org/proj/portage.git/patch/?id=ef33db45a0c1d462411d4ced1857a322c0ab28f6 -> repoman-2.3.0-bug-586864.patch"
-
-python_prepare_all() {
-	epatch "${DISTDIR}/repoman-2.3.0-bug-586864.patch"
-	distutils-r1_python_prepare_all
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog ""
-	elog "This release of repoman is from the new portage/repoman split"
-	elog "release code base."
-	elog "This new repoman code base is still being developed.  So its API's"
-	elog "are not to be considered stable and are subject to change."
-	elog "The code released has been tested and considered ready for use."
-	elog "This however does not guarantee it to be completely bug free."
-	elog "Please report any bugs you may encounter."
-	elog ""
-}
diff --git a/app-portage/repoman/repoman-2.3.9.ebuild b/app-portage/repoman/repoman-2.3.12.ebuild
index bfc9375dc61a..3273c5884deb 100644
--- a/app-portage/repoman/repoman-2.3.9.ebuild
+++ b/app-portage/repoman/repoman-2.3.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
@@ -25,18 +25,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=sys-apps/portage-2.3.27[${PYTHON_USEDEP}]
+	>=sys-apps/portage-2.3.43[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	sed 's:FileNotFoundError:EnvironmentError:' -i pym/repoman/config.py || die
-	sed 's:file\.size\.fatal:file.size-fatal:' -i pym/repoman/modules/scan/fetch/fetches.py || die
-	distutils-r1_src_prepare
-}
-
 python_test() {
 	esetup.py test
 }
diff --git a/app-portage/repoman/repoman-2.3.6.ebuild b/app-portage/repoman/repoman-2.3.6.ebuild
deleted file mode 100644
index dc60ecf6859d..000000000000
--- a/app-portage/repoman/repoman-2.3.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.3.14[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	elog ""
-	elog "This release of repoman is from the new portage/repoman split"
-	elog "release code base."
-	elog "This new repoman code base is still being developed.  So its API's"
-	elog "are not to be considered stable and are subject to change."
-	elog "The code released has been tested and considered ready for use."
-	elog "This however does not guarantee it to be completely bug free."
-	elog "Please report any bugs you may encounter."
-	elog ""
-}