gentoo resync : 02.06.2019

28 files changed, 831 insertions, 155 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 4cc0ce11a1b2..393827b00360 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/elicense/Manifest b/app-portage/elicense/Manifest
index e37b984fc18c..dfcc9903da7e 100644
--- a/app-portage/elicense/Manifest
+++ b/app-portage/elicense/Manifest
@@ -1,4 +1,4 @@
-DIST elicense-1.0.0.tar.gz 8719 BLAKE2B 4d9c06cf3229f5a13ec246080098e1f8389afa951bf95cce48159509c160bbc43da511ec0936139c282f59514419fc4911b6a7c9c89bdce18ccda8d175baacae SHA512 5b81e9256486f42f9060d29c7ba3c9101a23a60bfc1ceed978172a2d6feeda22e42486b950ee181a3fe5166e69cabc0ba29043811076865b38f687c0258e9aa8
-EBUILD elicense-1.0.0.ebuild 695 BLAKE2B c9a2e729e957e9a856c08fa90fdaf903f62e4f9068279775a8932897aabf71b4c3800c17ec485a0526caae57a8d74a8d43ff4237141816b37b9d9e0b2e9b4e7d SHA512 8fc2dc5be6ad20d05d3c8fb25d1ffbe24e9db5651ce92ac4a6fd9f7261e5cd69372a130c086ff982d90b06d488e110cf39bfc53ff5cd8812523bfb28f4fbec2f
-EBUILD elicense-9999.ebuild 695 BLAKE2B c9a2e729e957e9a856c08fa90fdaf903f62e4f9068279775a8932897aabf71b4c3800c17ec485a0526caae57a8d74a8d43ff4237141816b37b9d9e0b2e9b4e7d SHA512 8fc2dc5be6ad20d05d3c8fb25d1ffbe24e9db5651ce92ac4a6fd9f7261e5cd69372a130c086ff982d90b06d488e110cf39bfc53ff5cd8812523bfb28f4fbec2f
+DIST elicense-1.0.1.tar.gz 9260 BLAKE2B b5782412de613bce009ff1d685de6af9a129afadd131a91328cfd02d55c416e5c7549aacf676c4596a4512de4e3a42d2b89c24d2367404177e9675a7fdc35d94 SHA512 3b7b412742a9b67b5c4dda10838d6380c1f18199bcaa87458f30b06bff068228f64364d336d1daf4b95df6c1889ae9de7f277dea3defd18dbf74d50fc9381500
+EBUILD elicense-1.0.1.ebuild 940 BLAKE2B b8caa99f39eb24d20ab49e5a73c1db2d334b98721ccc19a174ebb4982679381107c9c68f9acb663b7a26cc30c2f919c7fc511447d70dbed4ce9b4f7d6e1ac97e SHA512 1230df0f640f01e7c753a3bd956bf82652ae68e9452567aaf554a830335d105585c7a51b166fa7c78e172c2a2bcd20fc035be838ab733cd66ade8c876d978b56
+EBUILD elicense-9999.ebuild 952 BLAKE2B 1f07bd06d78d0477ab50cbe4e58872acb853500bc41a5c1c79e06bbdbc7b847dbdcff98758782c2d0d051eb2d4acec375344b31d52a9b3559597abfee9d05f22 SHA512 ef169f0c15add750841267965de9b12c8a1e8845d107461b82952c94623b55ccde90c1b88b5108a8489e33466edca0fa87a39e91b8016c332e7ac9d07c07b94a
 MISC metadata.xml 355 BLAKE2B 3b6e208a86ad1c40713f9e441d5ec81de0040c146d4cdfd1e1026d550dda0177ae659120ee272d84035fe9fbfc0d2089a7f2726056247710530db9b59e4ae1d2 SHA512 2c5c3010075adc10002bbce3613c30228993c3a14acf9785ac452b39608fa8cb7e9f810490710b91be4558c9a30342e679a44e7ba88fe060eb563da7369e2bba
diff --git a/app-portage/elicense/elicense-1.0.0.ebuild b/app-portage/elicense/elicense-1.0.1.ebuild
index a7cb3da3c328..b6b7af167598 100644
--- a/app-portage/elicense/elicense-1.0.0.ebuild
+++ b/app-portage/elicense/elicense-1.0.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Whissi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-fbsd"
 fi
 
 DESCRIPTION="Tool to find installed packages in Gentoo with non-accepted license(s)"
@@ -21,3 +21,16 @@ SLOT="0"
 IUSE=""
 
 RDEPEND=">=sys-apps/portage-2.3.62[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	local MY_PV=${PV}
+	if [[ ${PV} == "9999" ]]; then
+		local last_commit=$(git rev-parse HEAD)
+		MY_PV="${last_commit:0:7}-git"
+	fi
+
+	sed -i -e "s/^MY_PV =.*$/MY_PV = \"${MY_PV}\"/" \
+		elicense || die "Failed to sed in version."
+}
diff --git a/app-portage/elicense/elicense-9999.ebuild b/app-portage/elicense/elicense-9999.ebuild
index a7cb3da3c328..bbba9eea7ef6 100644
--- a/app-portage/elicense/elicense-9999.ebuild
+++ b/app-portage/elicense/elicense-9999.ebuild
@@ -21,3 +21,16 @@ SLOT="0"
 IUSE=""
 
 RDEPEND=">=sys-apps/portage-2.3.62[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	local MY_PV=${PV}
+	if [[ ${PV} == "9999" ]]; then
+		local last_commit=$(git rev-parse HEAD)
+		MY_PV="${last_commit:0:7}-git"
+	fi
+
+	sed -i -e "s/^MY_PV =.*$/MY_PV = \"${MY_PV}\"/" \
+		elicense || die "Failed to sed in version."
+}
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index f261acbc54a9..4b1addaba035 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -4,7 +4,7 @@ DIST gemato-14.1-multiprocessing.tar.gz 71707 BLAKE2B d7d22615a65bd598160b23e01a
 DIST gemato-14.1.tar.gz 71142 BLAKE2B a7c8f814f9c6875e977aa178d4a49e3454ea8d6e19750786452aa2f34f0904f0ccc0a9a58411a0214a68cecd571320769c6374b265e2aa7f52fbead53ba6b284 SHA512 de57f3b7aa17e650894876bc2423c4fa9809f2de25aa2fb8ef070e943faa182c80f7ea8a519ecdf6edec8098d11f786344ee872b9e98c69bd6739760652baa2e
 EBUILD gemato-14.0.ebuild 1352 BLAKE2B c2d1e7c84eb461f2b2f321f699958e480ec7d4459c001f542b36bd3219358ecdcf9f5211fa39ec320f32feb5fb07929f3631a3d243a5e7909f91a61fbfe4885b SHA512 caf7b72bf8cd730dcf8ac572223c1b2ec0ca4d7f6fa021cfed7d2d398e8c4bbb64211baac89dd7f317526a733a496dd3ef0559d81706d7fa7eb8c6af0260901a
 EBUILD gemato-14.0m.ebuild 1635 BLAKE2B ed2bb89c6b7f2fd7125fddb8429d1ea70d77fe3eacef38b65a3e5ef48a75f6fd9827d227668854090d565a4b3136c1888a901b6a3478175fff15418d3e0e9870 SHA512 763cfbbd2995d8a90e1b7278cc831ddafa7eb53dad2c4f461e1ca76db24e398ded702462bd22a65b0d389ca14952223c5c4c3601eb99c70ae33abde85db74591
-EBUILD gemato-14.1.ebuild 1365 BLAKE2B 3c6b7060d66b0d53d63578425c8826459e232b0054d4982ac316b6cb6816edb5d6f2b1f08d012190c587effcccbacadd939d6048cd62e8842d9f9810d2de77ae SHA512 02eb84f44d5ffbda592dcaac785f438dc97d4e4c66806e6b6d14de607c4cb835745024ee7f247d98ebfe38e62851acdd3b43edcb3fd8de325db12081e3892e52
+EBUILD gemato-14.1.ebuild 1360 BLAKE2B 1471a5580bf77e1d3784c06545e75fb16b5feaaf6e1e1f56a1aad22bbfacbae1e3990f999a086b6fc7718b2cbc6bb21ee50b954fbc776a65abf4d3859e5a4f04 SHA512 0282b0228f936c9fb4e9afc83fbe96fd14087849e9d7517e8dfe863e302c015134a5e311b21925ebaeee230b91cc4ea12186358b24b2cc77e661e8b853eb9be9
 EBUILD gemato-14.1m.ebuild 1635 BLAKE2B ed2bb89c6b7f2fd7125fddb8429d1ea70d77fe3eacef38b65a3e5ef48a75f6fd9827d227668854090d565a4b3136c1888a901b6a3478175fff15418d3e0e9870 SHA512 763cfbbd2995d8a90e1b7278cc831ddafa7eb53dad2c4f461e1ca76db24e398ded702462bd22a65b0d389ca14952223c5c4c3601eb99c70ae33abde85db74591
 EBUILD gemato-9999.ebuild 1271 BLAKE2B 761c2087c144d5936aefcb45cf2be23641c2605f1f836e07ade31b577f8bc6f82c8ffe7313580b371b89bea6f036996d7a1925fffbb03553cf57d02800ca370a SHA512 a910a795abe974d3c389a77cfc827fa7393e6adc603ade32d782dc5838eda46f7c255abdbb89de263ac7c38d948bfb616d1c3cb72088d3fb5a7da6bab027cd28
 EBUILD gemato-9999m.ebuild 1466 BLAKE2B 53d42b54cc09dd377a60bac37fabc82ae5e272cbd336fd7f5047fbd7d940dc9005ac1006ffce31576ca146c5f65c56af83405c1f0a93831e4a24051c0f075a8a SHA512 4deb02e736943d5014d53a05602da09b1d7436ed28a4f528240b18b65741fad352cea686f9532f81d6f60a0c62735a3e5db3ace44c6dd7308f55928d844a2562
diff --git a/app-portage/gemato/gemato-14.1.ebuild b/app-portage/gemato/gemato-14.1.ebuild
index 0a832d61d642..b25839d56663 100644
--- a/app-portage/gemato/gemato-14.1.ebuild
+++ b/app-portage/gemato/gemato-14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd"
 IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
 
 MODULE_RDEPEND="
diff --git a/app-portage/genlop/Manifest b/app-portage/genlop/Manifest
index 7563a8e147fd..e0177f6b9448 100644
--- a/app-portage/genlop/Manifest
+++ b/app-portage/genlop/Manifest
@@ -4,7 +4,7 @@ AUX genlop-0.30.9-display.patch 676 BLAKE2B 4fe5071ecbd13e1c10e969d66a9bd74dadaa
 DIST genlop-0.30.10.tar.gz 20872 BLAKE2B e06088678598464c67b78cf10a7472d7bf7b22d69c85fc072064b7a90fe57e2015fddba30edaa85574381cd59367b81c7bf514c269d5dc186fbcc367bba0cca4 SHA512 eab59d7dc012fbbdbe7de509deba66e6c7d0c5a37064e79c25a37c64becc259ee5206194615b60b3363022fa59e458356547edca307ceb4e19eeeaf4b146c593
 DIST genlop-0.30.9.tar.gz 21160 BLAKE2B 4d8fd34c8ea1e49498ebb887782c02b2dd20bd20bd1559b469dc93ccaa9873b27681c8c50ca85d3a96ca687f28f77750d79d9d93ac50e10c3d0fac2a593dd1ea SHA512 659c85bb1d75a90e37449a194fca2c610b2684dab3eb722d566aa929626d958aa1584d12a623f31518d982543be9392786291886ea66a5511e61de1beb3a6936
 EBUILD genlop-0.30.10-r1.ebuild 772 BLAKE2B c1d35e9e7bdae44a38a36da8592c1d390cdddb59644063946653736869b0d7ea93b4af41e9b29128108990d2b4ad75ab0b9f361fc8766c27c8750069599a4c3a SHA512 7fa8dfea27721eb493556cbccccaa6ef878de49a7d5f2c0d9d0897600f0380979671c8487f5b74979762dd87381f6296c50a6e491750e996e0b52776051c76bc
-EBUILD genlop-0.30.10-r2.ebuild 802 BLAKE2B b2f7e022697ada81eda7c26f02d3b4131b1f861fc3595e0680a757feca5fb2e103d448596c26cf4f45af07ac873f3f70e35bf5c74d52c3baed7411176f4225f6 SHA512 411d087bc42afac13961cfbd9d7956aaaf3f602d5a91b960970fef2bcd046984910e778e09f214572a12cd2f7ecdce0a1bcd03f50d505737cf1dfd4010451422
+EBUILD genlop-0.30.10-r2.ebuild 800 BLAKE2B 4cd7507a334f0cebc51f6bf20a35bc4d381779a9a86b2be4f5b6cae168908dffaf9b8d36918b6c43f4fe6efba551ba26e801572eee37b531a3c18622f0fff04a SHA512 807c8fda6471ac1463170fb2f6c060be538f09865cb001d639349c52558dcc73263b2939b43cbfeebd1ba1d2bd85e9124a8cbd230a3a7013893f94c04fde856b
 EBUILD genlop-0.30.9-r1.ebuild 773 BLAKE2B cfccd4ab36b55323bf320928c7c0e8719b92c00e1254dbf295241287010913768865b3428ac0130db3d93ab6fc12f5d60e50a4e417280c21a630a83cb1180711 SHA512 c53494d4d127c4b54d6c8a8897b1ff76d3bb0f6f2ee686042ad18422570802b2ca0d8a9f4e22fd1076342f48409182a9d72f196a3f652757c312f3c9e42d84fb
 EBUILD genlop-9999.ebuild 540 BLAKE2B a1785e1dd85c8d0fc365a21175f8df825390f5ce3ba9da561d99bb7138b965eedae647e54536567aeffe32014edfd2ee909a1030db96248ddae48a13b23c8f7d SHA512 7912f2f2cd550ecee97e1778a77613b22595839f0effe4815b7afc710a03530027b1bf29baabdd75705aac5a1cd2f0721c097a6514c0556e050a400866c5f162
 MISC metadata.xml 377 BLAKE2B 275b2a7cd7c400a7f16f8031457520d9a1e44ffdf0f2a53ffc06194a4f2e752ede65f13f36b852a24a67267907a6a2a8c7a81f1cc812c5b4c676edcc1fc492cc SHA512 3bc89900e1d25dc84831f78427b06089a1f0a16710d2adf31871af825041522b2446eb2a8156c4506d7e19cb6c73fa055f318b9dc48c9bd15d92511493098f1c
diff --git a/app-portage/genlop/genlop-0.30.10-r2.ebuild b/app-portage/genlop/genlop-0.30.10-r2.ebuild
index dcf811ab6d16..166dbebf221b 100644
--- a/app-portage/genlop/genlop-0.30.10-r2.ebuild
+++ b/app-portage/genlop/genlop-0.30.10-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index e63a0894bc60..d860765f4778 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -1,14 +1,9 @@
-AUX mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch 721 BLAKE2B 6faf73309a13a2f4b039e00555f9c8ffa01458aaf1a80eecd5ab8fb9349b869f7c9d63d2d288668f2960e230b9c4323cb6c309e9c19aad38ca87dccf5fcf9468 SHA512 032544106b1e6dad76f46131f94913b1875d9605808dbe5145ca0fd80916c158551745a850a25cf4252f9f860e8608ed76e31ca878110db66e05003e86d55127
-AUX mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch 658 BLAKE2B 21ec938fa75ec527f9670eaf25a7d308126a098ce558587fd3a1995ac02ecb82ae21ed76dcb5f0605581e777ba93c987780e11e3990cc3f15383b5a17e3f18e7 SHA512 4f2ce8c8136a380cfcd0f44489fcd51be1a8c66353dba59ff8872ca6f72901c0f19f231f8c44fe396bb5735e6e8e16b389e22bcada1f9a0a793dec20baefe604
-DIST mirrorselect-2.2.0.1.tar.gz 13138 BLAKE2B 40a2724ee8c83018e19a56a49b677cfa3f89d56450ba743ddf67a324b43881fcd8e99022f9532499b5b4d826b8d6700a5606294af3becde1f928ecaa07338f44 SHA512 08216c381b70856dd56e903a208bc0ed202826b89136dd0b1cf69bd7cf2afa2df608ac2a0aed5161a56f51cf4bcb51f3826ad55b3a26e671ba2c68490c9cffad
-DIST mirrorselect-2.2.2.tar.gz 15964 BLAKE2B 96698286c05fd96ea03ec6594c8b0849fad3b1ffdd3f1ecf1a76d205005b07bd4971211e72f10952f5155c91376192fd81efbdfdd5058c9a1c60cf731b0bacd1 SHA512 91ce16d236418ba186c447c6497684c4138afd4279a0ba95ee0f069309e8ce086a5a4ce4715ef21275362b7c3772924d422d7711d188d40c1e0b90f773765cf9
 DIST mirrorselect-2.2.3.tar.gz 15230 BLAKE2B 7234ab8a681713c63b201e1ae362ea9a28d5e76b5640c6128d79c66d9967660474d0597822604defd3f562cd155524835c5ae20cbf21c5526595775b3be39dc4 SHA512 af1d3657b9ff5a6184ebfd89579a1bdbf11f7389ca12d4cd7a41cd136a553732cbbfb7675e25f7d79756b0b9e74b496d28ee5fdc8872173825262fae0052e8e2
 DIST mirrorselect-2.2.4.tar.gz 16085 BLAKE2B 67d3de3e25a993a4bfc546ae7d188b2a7e61da1cfbc85ac50119c88a81c4966959e31f88101880ba86ef27f0b0674a3d279b11135d2475d0b2fed1ea899021f5 SHA512 8749a916911088d128f9064d5aa78c3bf8b529d583db86eb6f7190959008257e231f7b0bae9a2f2fd6edc45f6d0ffb07364c16a3f190f8c97b88472c2d082037
+DIST mirrorselect-2.2.5.tar.gz 16638 BLAKE2B b306f146936344309e79469281830bdbd088bae3686de777bf24bce5bd4e915c951b1f01612c9600cadcbc90139c74a9a5774ca5779bae339d1d5f33d17f70f1 SHA512 845df4073f5dc7544d7c1ae410f154e27ef9a9848c2fa182f4d0acd287f17792d11065b1b3394856bd760589d6b24e30e031d10e4ef6c987ac4321dc7e044e4e
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
-EBUILD mirrorselect-2.2.0.1.ebuild 858 BLAKE2B a02fbca35c275845f8363b6c62196efc717dc5e598020fcfe87386c938e6c45c883809a17cfa611ce19c446f1f4f202d58105639d8b97e159fc8b8891862e843 SHA512 07bd6b8a86105dd42c6645dbcb97e72c681dd10651591036d5eb63bbd928c3f745a670c5be1adc5149f074f99d8f02ddcca907b0eba98f303ce0da44ea875632
-EBUILD mirrorselect-2.2.2-r2.ebuild 1123 BLAKE2B f46044dbbc399f0a328353d3341d009c49b7ba07d7302c83fcdf1c25e8882b18eea130ae9d2b5352bc8ae1c42edc4dfaa5087e038e0c12e2ee6b88bdae1e1957 SHA512 b591331504d1b799156376682f19ae419a129738fcbd7f3141f92fe0c03d7badc79ffeabad0695c47f6f2b2f17b624bff02e98184cb9551d96dbd40fb8387b37
-EBUILD mirrorselect-2.2.2.ebuild 1009 BLAKE2B c94f8f77acc95639337ec600388242c956cd2804bef08d2b0c472e8e1ebebc30dd6604e0232ca3167cf8293ef1d2a69c98122f26d7b0ea82eb2dde1ca9d2cfaa SHA512 08f27bfcd5101cc0446d586c935639e1724278259490ba34dd45947410559438793d9d8e3c34533f4a47bc68fde0254334c642fbf720ab4cd2fe604011ce347a
 EBUILD mirrorselect-2.2.3.ebuild 988 BLAKE2B 8595db07b837f8c8d31b19415d6e68cb8d91dad412fe4e9bcc31687a230239b8ea94edb71a2aa44bb967e47643e1407e959747e6fb72ed20f8ca6bea0ae8ce23 SHA512 844328048a7f7cf05e6fde4b5b81a5b37b99e719e09878bde75f027735378eefc6461552550c5b093186d3820ce65c53a2e8899bdc28821b04eb01491eb0aecb
-EBUILD mirrorselect-2.2.4.ebuild 986 BLAKE2B 6eee6df9c8666a281520511348fc7f182e539ea7a3e179c4b31b94b67d22bb96615f73237ae4928b2db9c9e1cf84dfd2dc83446939faf49cc68b0ad276332599 SHA512 c1a1469efaa63b3ffacaabb470abfe3375d6c5fe04c44254f1639340e34fcce6025b56a74b508b456789339c97e0335fdb115dd46ced53c5ee0e3141cf6a7c0e
-EBUILD mirrorselect-9999.ebuild 1046 BLAKE2B b150f3953eb8fab0dafafb9b70862559961cb882fd56304ecf1fb389d77429e53a652c72298d69f1c3a896cdbf5b44dba9e11a620c190be2869535d7e5bafd35 SHA512 4a4aea0b7bcad385dbd6a6a793965a8c3714ad0a5dc6a6a8c3c3603478ffa372441b207c60dcd77ac64eb73fcbbed2e800f0a87007143ccbba3b0ad030b25794
+EBUILD mirrorselect-2.2.4-r1.ebuild 974 BLAKE2B 1f29d20581f56fcc6a8530e342b93e6c0da8251d28be1a8418648f214cd561b8de7e810bd3352e1c0e5106ef9d016b1b59c05a480db17fb34f6774065dfc26f9 SHA512 06381acd35fda51d71ce12386b673aee1963ec336ce316238c53bff30075db2e77393f83c40ae029aacbe43783dcf76508107a7edbbb9d0c7483fd0667ba289a
+EBUILD mirrorselect-2.2.5.ebuild 1069 BLAKE2B d5f3eb9996e4787b2bdcd86b50c79beaf9e1863a5fa4d875f857acfe9f9d683066e6be1e81e73494fd337399aa105d6c1ac396951c211b61273a4a0eb8d964d3 SHA512 6c710d4520b3b1ec78e4e3bcffa262461a4cf26386b2e8cedee3717cea55a0df2fca77e662096e81455e63fc3ff134270e03d942d97f27e1297532b1a85e81c1
+EBUILD mirrorselect-9999.ebuild 1125 BLAKE2B 52bd3f705108f52a8cc381fca6b9296264b2152848b88321b5b874fcc9672469fde32f20a27728b2b0fb042ff591f961dcd4a702f77bd73adc9b7ad948b44ada SHA512 eb6bb88fc85b92606f3dcf3fe149e6c41f5bd67bc6a96dd158ff2db1f191909557d82cbf82d3ced101e18de5101a91bb22d53913eee9b719b0e839e78a234b4c
 MISC metadata.xml 470 BLAKE2B 5b799aaffb1a8166846fbc1f4bc2f28c3e664bc2a17c8dc9d743c9294a682787c404c9f099faae26667d1b38c977910acbf5e4e0cff21467bad45fc0f0e142d7 SHA512 31405437e73acec409d4d9c14d33fb10b03aed300ac88d5f793666cc7324abd46ff8703d794009316716d1a63b2b80721dc5e0841f0e1d0fbebc1f9b83f13acc
diff --git a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch b/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch
deleted file mode 100644
index d170103a4657..000000000000
--- a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e9dea3a98aa5031fecf1c7115de77e948e8d07ca Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Tue, 27 Jan 2015 10:19:05 -0800
-Subject: [PATCH] Add missed output mode function assignment.
-
----
- mirrorselect/extractor.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py
-index 59efad1..06dce6c 100644
---- a/mirrorselect/extractor.py
-+++ b/mirrorselect/extractor.py
-@@ -107,6 +107,7 @@ class Extractor(object):
- 		# setup the ssl-fetch ouptut map
- 		connector_output = {
- 			'info':self.output.write,
-+			'debug': self.output.write,
- 			'error': self.output.print_err,
- 			'kwargs-info': {'level': 2},
- 			'kwargs-debug': {'level':2},
--- 
-2.2.2
-
diff --git a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch b/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch
deleted file mode 100644
index 2e5fd93c09cb..000000000000
--- a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9ec1e9649c980d32d23aab40eff3cac5e8f6f555 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Mon, 26 Jan 2015 18:23:05 -0800
-Subject: [PATCH] Update for ssl-fetch api change
-
----
- mirrorselect/extractor.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py
-index ec5f299..59efad1 100644
---- a/mirrorselect/extractor.py
-+++ b/mirrorselect/extractor.py
-@@ -109,6 +109,7 @@ class Extractor(object):
- 			'info':self.output.write,
- 			'error': self.output.print_err,
- 			'kwargs-info': {'level': 2},
-+			'kwargs-debug': {'level':2},
- 			'kwargs-error': {'level':0},
- 			}
- 
--- 
-2.2.2
-
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
deleted file mode 100644
index 81e105381e8a..000000000000
--- a/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
-SRC_URI="https://dev.gentoo.org/~dolsen/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux"
-
-RDEPEND="
-	dev-util/dialog
-	net-analyzer/netselect
-	"
-
-python_prepare_all()  {
-	python_export_best
-	eprefixify setup.py mirrorselect/main.py
-	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
-	distutils-r1_python_prepare_all
-}
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild
deleted file mode 100644
index 2d83632168c0..000000000000
--- a/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz
-	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-	"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	dev-util/dialog
-	net-analyzer/netselect
-	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
-	"
-
-PATCHES=(
-	"${FILESDIR}/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch"
-	"${FILESDIR}/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch"
-)
-
-python_prepare_all()  {
-	python_setup
-	eprefixify setup.py mirrorselect/main.py
-	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
-	distutils-r1_python_prepare_all
-}
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
index c70e13ffed3b..70711940f738 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 prefix
 
 DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz
+SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.gz
 	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
 	"
 
@@ -18,17 +18,16 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd"
 
 RDEPEND="
 	dev-util/dialog
 	net-analyzer/netselect
-	>=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}]
-	<dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
+	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
 	"
 
 python_prepare_all()  {
-	python_export_best
+	python_setup
 	eprefixify setup.py mirrorselect/main.py
 	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
 	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.4.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.5.ebuild
index 92d8fee57299..6a451ee30e96 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.4.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 prefix
@@ -22,7 +22,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 
 RDEPEND="
 	dev-util/dialog
-	net-analyzer/netselect
+	>=net-analyzer/netselect-0.4[ipv6(+)]
 	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
 	"
 
@@ -33,3 +33,7 @@ python_prepare_all()  {
 	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
 	distutils-r1_python_prepare_all
 }
+
+python_test() {
+	esetup.py test || die "tests failed under ${EPYTHON}"
+}
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index 36964fd86606..de12fd9a5ea9 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 git-r3 prefix
@@ -22,18 +22,22 @@ KEYWORDS=""
 
 RDEPEND="
 	dev-util/dialog
-	net-analyzer/netselect
+	>=net-analyzer/netselect-0.4[ipv6(+)]
 	=dev-python/ssl-fetch-9999[${PYTHON_USEDEP}]
 	"
 
 python_prepare_all()  {
-	python_export_best
+	python_setup
 	eprefixify setup.py mirrorselect/main.py
 	echo Now setting version... VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
 	VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
 	distutils-r1_python_prepare_all
 }
 
+python_test() {
+	esetup.py test || die "tests failed under ${EPYTHON}"
+}
+
 pkg_postinst() {
 	distutils-r1_pkg_postinst
 
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 83261ac38419..ec9a96099767 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -3,8 +3,10 @@ AUX post_sync 190 BLAKE2B ad1a8705af98cc7d0122173e6edb821eb7be6f024fda5eb145d713
 AUX q-reinitialize 68 BLAKE2B f1c2cd5009f30018dfc2d508a627253c08fc6e74859d072b917a0518850b879ecd0318df7a86c8597d28cf4410312f757aaf5cf8780899180a5e2a9a906b1ac2 SHA512 d322fc0e3fd82583e9cfc6ffa95636134e4491e63fc1a1f34dcda58a1749c3ebcda97caee47bea4f44fb056c35c97e30819dd22e5c2ed8c936e0863466ebf6ae
 DIST portage-utils-0.62.tar.xz 527216 BLAKE2B ac8331b74998ddb86db55a937992447bccf60611cc259ceb5fe79918c1a43b6dc4633e4ad64462e2df5c39e8d8aa193bd57ab24dcd714e088357eb3cb177e972 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1
 DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c584248e9970956033e4191a7a842a4b2162110ac99c2bb18645aaafc6ae6ee960e9b26ba0a8863497911eef1e943f64 SHA512 cd3f44c135b3d44e15a95eed41281fce62f225a9d05d5d5bb1be230b2d59cdb87755f011b313a9ec32e4cafdf3b3979c4ef423365edd7dcc472ca2e38c09c83e
+DIST portage-utils-0.80_pre20190530.tar.xz 1758056 BLAKE2B 2d595db45ecfe125da80924b145be4d1ebfcda09afb3dd39c4dfa084b4113e162637cbfc8f3362554b39de55339462de9714cbef6194816b7340e77c335d3432 SHA512 720bb057e6428d51832d1e92e8ae1fb4d7b6c1f407f78656ef4853822b08525849614f7f760a395385d69400c08bf103eb05308b87bd9f7189cac53e95e93583
 EBUILD portage-utils-0.62.ebuild 2006 BLAKE2B c44402ebef59a344bfb3ed571a46b7a58dda17b3b1d231aee55c77d42a59c62ec5de69b595a67ca2dbadc568022f63385950964f0350303c65cecc5f541b36df SHA512 579f27018139dd0dda0781d7b9483ca4a467d069f6b0a8aa55a9786b8cd3fbfa78919b7fa6b85044f78bac6ad6ec896ec7bd990cb428d0dddf5bfeb1f2175272
 EBUILD portage-utils-0.74-r1.ebuild 1140 BLAKE2B d58ad14ab2c7f786fc36147436e68ba29bdd100c912538cc2f28ff8a54be4c0556a87cafc512cd62c2b3be50c9ba784cf4b5dbe184929f3684b39d5df4e324f4 SHA512 84b221b821b7beedc52d15aefe9646e571c66f4086e89c4ac8cee7cc398b19428eb09000ca033f0eaadeb84222c468d002c76ed84070eb26a5e7200572679445
 EBUILD portage-utils-0.74.ebuild 1073 BLAKE2B 813ec25c4030ad26b1b28294c268c0f3bbbe296488a811ecd2a8d87ea6bb7f1caaa9ecdee34f272e9cf5879cf3454506ad7a62be2d3e74b926cdd012e239be3a SHA512 fa9079a716b50a4caa61fba5225ec28a2fc4d8ea2c95cb8bc283434a7c96392fa9898537c6f98277860fe06a23fe02c255c17e54a2869e371235e094a99a8e4a
-EBUILD portage-utils-9999.ebuild 1025 BLAKE2B 19c5e62767263aef9e68337535359d1c1c9684ab83c2c395b9ac26dfc5e5c2e556aa5b564f9780ed80d5a2eb2aebaf7349e5048186a48c2482404af4ab2d9b2b SHA512 0a0c5564b45eccf468e32493958ae7ecc00c7690ac3b4514458b2e9c8ed9aabe0d01419e456b0e5404ea5ca30d98a6c568b53e4da214ca9bbcb7812f93a898c0
-MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
+EBUILD portage-utils-0.80_pre20190530.ebuild 1258 BLAKE2B 828316494d67b4712d6917a1a1504257a622d9c65c13a8378113da30676a1e7eb96310459a33edd655852ca5454e477a960b66cf1e6e480e66dda62c40ddf7cc SHA512 14cb6d702ee4dbba7f8c3ab2b21cccc66f6c4379cb02eabdc01a95dfc3e7e3b794825cc4174f12ccd2c39c143b32391c6cddb07efa7da5ff1527a8963db8406a
+EBUILD portage-utils-9999.ebuild 1298 BLAKE2B 323a076f738e9700c561e234cb93ab703d8533946a626035fa9749e76a4442f96488d3bc737bfac18798d4a2c2f81e1027465c13829052bedefc1dc7ad81ccc4 SHA512 533e36b48b751fdb3b2d4a52082a00fe93b8145d9f6f15c79de842db8ad00c2bf6b5d39eef9dd9075366300f9a710024e14aeb084d66f0c1305991628a0de1b9
+MISC metadata.xml 390 BLAKE2B 8912128b1d4cc1afd29f01ca9b9014a5e1726d2a74fd42e57836f40ecfab15c2fc89bc403c9e4a41fd14e40fd732e546d93ed03004c820b5a25be69e0725e606 SHA512 a152ae18c44f4a4946b62e8724d84409c4cc1ffa66892e649551b3815935de4f3a926b7b9926fef9d5c9594fb9f70ef7571e1f9ea3c3709516b47665279a549d
diff --git a/app-portage/portage-utils/metadata.xml b/app-portage/portage-utils/metadata.xml
index a53ffbea77d3..dac8feca7f1d 100644
--- a/app-portage/portage-utils/metadata.xml
+++ b/app-portage/portage-utils/metadata.xml
@@ -5,4 +5,7 @@
 		<email>grobian@gentoo.org</email>
 		<name>Fabian Groffen</name>
 	</maintainer>
+	<use>
+		<flag name="qmanifest">Build qmanifest applet, this adds additional dependencies for GPG, OpenSSL and BLAKE2B hashing</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-portage/portage-utils/portage-utils-0.80_pre20190530.ebuild b/app-portage/portage-utils/portage-utils-0.80_pre20190530.ebuild
new file mode 100644
index 000000000000..5ff83758116d
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.80_pre20190530.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Small and fast Portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls static openmp +qmanifest"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+RDEPEND="dev-libs/iniparser:0"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	static? ( dev-libs/iniparser:0[static-libs] )
+	qmanifest? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		app-crypt/libb2
+		dev-libs/openssl:0=
+		sys-libs/zlib
+		app-crypt/gpgme
+	)
+	"
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		--disable-maintainer-mode \
+		--with-eprefix="${EPREFIX}" \
+		$(use_enable qmanifest) \
+		$(use_enable openmp)
+}
diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
index 224433e36f2b..25967bcab798 100644
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="nls static"
+IUSE="nls static openmp +qmanifest"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
@@ -24,12 +24,29 @@ fi
 RDEPEND="dev-libs/iniparser:0"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
-	static? ( dev-libs/iniparser:0[static-libs] )"
+	static? ( dev-libs/iniparser:0[static-libs] )
+	qmanifest? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		app-crypt/libb2
+		dev-libs/openssl:0=
+		sys-libs/zlib
+		app-crypt/gpgme
+	)
+	"
 
 src_prepare() {
 	default
 }
 
 src_configure() {
-	econf --disable-maintainer-mode --with-eprefix="${EPREFIX}"
+	econf \
+		--disable-maintainer-mode \
+		--with-eprefix="${EPREFIX}" \
+		$(use_enable qmanifest) \
+		$(use_enable openmp)
 }
diff --git a/app-portage/pram/Manifest b/app-portage/pram/Manifest
index 95705946333f..718ec5af0bf5 100644
--- a/app-portage/pram/Manifest
+++ b/app-portage/pram/Manifest
@@ -1,5 +1,7 @@
 DIST pram-3.tar.gz 4334 BLAKE2B f06f9cfe938f83702baaa8f8bee06937e8790e533e14ab419251934d0f4300ee75d5377a4f4e0e47a774bd3c25ef31236d7e451b929cfbfe8343d226a311ca2d SHA512 526149523b748b57095ecb3eb23f6808ab57ee1d8dc60e27067931d269ce3465ad8a0e54e8edaa3a1f74fd0a8dd135fe4a92779382ba6e367112016bc254fc98
 DIST pram-5.tar.gz 4443 BLAKE2B 0c5d1ddfa44944e8480cffd0b4f49d6143fff36ed690c9e7c0acbdd54ae6ea50b6c1610c65914c2626a260c9de1084b42e101ca38952a3e8fb9264663c3ad00c SHA512 7634bcaac11c999e2ef01d5e12305d96032396ce624cc6085b4954583aebf6d54f0a1155604863d1aeda1c2bdf17ddcfd81b833decddfbe11eb8689297c70b23
+DIST pram-7.tar.gz 7471 BLAKE2B 5152002be35755031a81dbaa61118fcab0529eb9732f134b11eb2499a539e04b8b8cb6402ee3bb39c7b7c82bc918ee4fef30e247fcdba3fe32c5457cf654e257 SHA512 42e95577802d5940a0eab8da5fd36d9eb2338eccf654260364b91990a0d8de9d56cbfde767dc60bfd3c826eb45a1b0e73af717740488af0a25ff6d8c656df93e
 EBUILD pram-3.ebuild 493 BLAKE2B bed413200050b99fd437dddbc02048e966e7c81f35804475e8e174ef3298647cd1a84c402deb2af0090603e1e03c0f7b8ffe616e2eb01616b7165e82f3913e98 SHA512 201dc579fd7918a6044b0b1938b74211afe19a6d50ae3d12d72017dd4695c5fe3b737135fa57c7768b8b1bfdf7859a971d0663ae5821b983609395cbd977b730
 EBUILD pram-5.ebuild 495 BLAKE2B 564ab559666243a00b0484e74608cec8d1cbe75fed20c86b7532ba1b2563af221e1dc9600ee4cda700093cd7291d62734e4ae8fa86b9c36c209eb14f15bce8fc SHA512 a5c13b3f07a9b4190c14f4c2ab23d28a060a6e48feaa1d0775aa950232489bb4343a35df91bcc1aa1e31d87f93c4f69d56977dcad7f86cbbbd35536c5177ed33
+EBUILD pram-7.ebuild 561 BLAKE2B 08cc2882eecb7ae25d59705aeac1671b3096c73e31aae38d5c894241d6066c0f301e7a9627b28f718a9168924bd9ddf6c2e96e661f4a1e381b192c6b5e175ed0 SHA512 8ef56b158ebd21d89e2fd6db80b2acb4ea3e97c413645526f31a8cfbf7331fc4476669478f1f28f9e65deaa41c124be309f3c90e949e2f50c7a75e38340b2950
 MISC metadata.xml 521 BLAKE2B 666d2a5e1366b0623f3ee47cae65ec248612729ffd0d39b009f0bb95ea79fefb1b0fa3343eff98841d2b1b0f6ccf03c6579370415cb4240441cff5f942557ed5 SHA512 36326936f659a738a0a7a0d1e7b6388820e4f19acf29dbd9efa646cdeb7ad65814b509f9619dddb822fc012ea8b2e06258d2887c5825283db6c77365a6fdc77d
diff --git a/app-portage/pram/pram-7.ebuild b/app-portage/pram/pram-7.ebuild
new file mode 100644
index 000000000000..515d0a342fb1
--- /dev/null
+++ b/app-portage/pram/pram-7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Tool to ease merging Pull Requests and git patches"
+HOMEPAGE="https://github.com/mgorny/pram"
+SRC_URI="https://github.com/mgorny/pram/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-vcs/git
+	net-misc/wget[ssl]
+	virtual/editor
+	!dev-perl/Gentoo-App-Pram"
+DEPEND="
+	test? (
+		${RDEPEND}
+		app-crypt/gnupg
+		sys-apps/diffutils
+	)"
diff --git a/app-portage/prefix-toolkit/Manifest b/app-portage/prefix-toolkit/Manifest
index ff3466f15f5c..041f2b31e6af 100644
--- a/app-portage/prefix-toolkit/Manifest
+++ b/app-portage/prefix-toolkit/Manifest
@@ -1,2 +1,3 @@
 EBUILD prefix-toolkit-0.ebuild 15920 BLAKE2B 2870e1ec8e65f26f38e15bad7f4ba5e6bedd909d34de3017885fa9d45a885646b586e26af29d226558103800e8b68db637516d5256007bba0f5e07452e565696 SHA512 87ca32003ec443f57d6980db36f098d2abc9bd28ae2c9361ef2f01fc9d9da66bac2fb2f1354b293212fa8cd53605cf5cc9a1974718e0d88f30a120f01816e50d
+EBUILD prefix-toolkit-1.ebuild 15932 BLAKE2B bd487e55cfc8bbd571d4668505914610d5be4627db4e43b5c941fe72e0ca276501e0312546078f5ca0e510e9630aff7212f9e696709dcd374cbb290f181f6de5 SHA512 86e1e36ca1460622cc6ae2ac2b75a02540966ed27e079b8dbf24d900bcccf5d9249c9d1133ba5228d83e27ad8eabb8bced37befde69b1fb93231425ae0e2ee5c
 MISC metadata.xml 243 BLAKE2B d650658b3e248940751d20c9e517a011a34f8d99df54d5203162d67c21df384f507e44ed0c848c1adc99fae8d511e204129f2709f5bdc5d1b2c8e41120bbe6db SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9
diff --git a/app-portage/prefix-toolkit/prefix-toolkit-1.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-1.ebuild
new file mode 100644
index 000000000000..0b61ff486871
--- /dev/null
+++ b/app-portage/prefix-toolkit/prefix-toolkit-1.ebuild
@@ -0,0 +1,567 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Utilities for users of Gentoo Prefix"
+HOMEPAGE="https://prefix.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-3"
+SLOT="0"
+
+[[ ${PV} == 9999 ]] ||
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+BDEPEND="
+	>sys-apps/portage-2.3.62
+"
+DEPEND=""
+RDEPEND="
+	!app-portage/prefix-chain-setup
+	!sys-apps/prefix-chain-utils
+	prefix-stack? (
+		>=sys-apps/baselayout-prefix-2.6
+	)
+"
+
+S="${WORKDIR}"
+
+my_unpack() {
+	local infile=$1
+	local outfile=${2:-${infile}}
+	ebegin "extracting ${outfile}"
+	sed -ne "/^: ${infile} /,/EOIN/{/EOIN/d;p}" "${EBUILD}" \
+		> "${outfile}" || die "Failed to unpack ${outfile}"
+	eend $?
+}
+
+src_unpack() {
+	if use prefix-stack ; then
+		my_unpack prefix-stack.bash_login
+		my_unpack prefix-stack.bashrc
+		my_unpack prefix-stack.envd.99stack
+		my_unpack prefix-stack-ccwrap
+		local editor pager
+		for editor in "${EDITOR}" {"${EPREFIX}","${BROOT}"}/bin/nano
+		do
+			[[ -x ${editor} ]] || continue
+		done
+		for pager in "${PAGER}" {"${EPREFIX}","${BROOT}"}/usr/bin/less
+		do
+			[[ -x ${pager} ]] || continue
+		done
+		printf '%s\n' "EDITOR=\"${editor}\"" "PAGER=\"${pager}\"" > 000fallback
+	else
+		my_unpack prefix-stack-setup
+	fi
+	my_unpack startprefix
+}
+
+my_prefixify() {
+	local ebash eenv
+	if use prefix-stack ; then
+		ebash="${BROOT}/bin/bash"
+		eenv="${BROOT}/usr/bin/env"
+	else
+		ebash="${EPREFIX}/bin/bash"
+		eenv="${EPREFIX}/usr/bin/env"
+	fi
+
+	# the @=@ prevents repoman from believing we set readonly vars
+	sed -e "s,@GENTOO_PORTAGE_BPREFIX@,${BROOT},g" \
+		-e "s,@GENTOO_PORTAGE_EPREFIX@,${EPREFIX},g" \
+		-e "s,@GENTOO_PORTAGE_CHOST@,${CHOST},g" \
+		-e "s,@GENTOO_PORTAGE_EBASH@,${ebash},g" \
+		-e "s,@GENTOO_PORTAGE_EENV@,${eenv},g" \
+		-e "s,@=@,=,g" \
+		-i "$@" || die
+}
+
+src_configure() {
+	# do not eprefixify during unpack, to allow userpatches to apply
+	my_prefixify *
+}
+
+src_install-prefix-stack-ccwrap() {
+	# install toolchain wrapper.
+	local wrapperdir=/usr/${CHOST}/gcc-bin/${CHOST}-${PN}/${PV}
+	local wrappercfg=${CHOST}-${P}
+
+	exeinto $wrapperdir
+	doexe prefix-stack-ccwrap
+
+	local cc
+	for cc in \
+		gcc \
+		g++ \
+		cpp \
+		c++ \
+		windres \
+	; do
+		dosym prefix-stack-ccwrap $wrapperdir/${CHOST}-${cc}
+		dosym ${CHOST}-${cc} $wrapperdir/${cc}
+	done
+
+	# LDPATH is required to keep gcc-config happy :(
+	cat > ./${wrappercfg} <<-EOF
+		GCC_PATH="${EPREFIX}$wrapperdir"
+		LDPATH="${EPREFIX}$wrapperdir"
+		EOF
+
+	insinto /etc/env.d/gcc
+	doins ./${wrappercfg}
+}
+
+src_install() {
+	if use prefix-stack; then
+		src_install-prefix-stack-ccwrap
+		insinto /etc
+		doins prefix-stack.bash_login
+		insinto /etc/bash
+		newins prefix-stack.bashrc bashrc
+		newenvd prefix-stack.envd.99stack 99stack
+		doenvd 000fallback
+	else
+		dobin prefix-stack-setup
+	fi
+	exeinto /
+	doexe startprefix
+}
+
+return 0
+
+: startprefix <<'EOIN'
+#!@GENTOO_PORTAGE_EBASH@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> -- 2007-03-10
+# Enters the prefix environment by starting a login shell from the
+# prefix.  The SHELL environment variable is elevated in order to make
+# applications that start login shells to work, such as `screen`.
+
+# if you come from a substantially polluted environment (another
+# Prefix), a cleanup as follows resolves most oddities I've ever seen:
+# env -i HOME=$HOME TERM=$TERM USER=$USER $SHELL -l
+# hence this script starts the Prefix shell like this
+
+if [[ ${SHELL#@GENTOO_PORTAGE_EPREFIX@} != ${SHELL} ]]
+then
+	echo "You appear to be in prefix already (SHELL=${SHELL})" > /dev/stderr
+	exit -1
+elif [[ ${SHELL#@GENTOO_PORTAGE_BPREFIX@} != ${SHELL} ]] &&
+	 [[ ${EPREFIX-unset} == '@GENTOO_PORTAGE_EPREFIX@' ]]
+then
+	echo "You appear to be in stacked prefix already (EPREFIX=${EPREFIX})" > /dev/stderr
+	exit -1
+fi
+
+# What is our prefix?
+EPREFIX@=@'@GENTOO_PORTAGE_EPREFIX@'
+BPREFIX@=@'@GENTOO_PORTAGE_BPREFIX@'
+
+# not all systems have the same location for shells, however what it
+# boils down to, is that we need to know what the shell is, and then we
+# can find it in the bin dir of our prefix
+for SHELL in \
+	"${EPREFIX}/bin/${SHELL##*/}" \
+	"${BPREFIX}/bin/${SHELL##*/}" \
+	${SHELL##*/}
+do
+	[[ ${SHELL} == */* && -x ${SHELL} ]] && break
+done
+
+# check if the shell exists
+if [[ ${SHELL} != */* ]]
+then
+	echo "Failed to find the Prefix shell, this is probably" > /dev/stderr
+	echo "because you didn't emerge the shell ${SHELL}" > /dev/stderr
+	exit 1
+fi
+
+# set the prefix shell in the environment
+export SHELL
+
+# give a small notice
+echo "Entering Gentoo Prefix ${EPREFIX}"
+# start the login shell, clean the entire environment but what's needed
+RETAIN="HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL"
+# PROFILEREAD is necessary on SUSE not to wipe the env on shell start
+[[ -n ${PROFILEREAD} ]] && RETAIN+=" PROFILEREAD=$PROFILEREAD"
+# ssh-agent is handy to keep, of if set, inherit it
+[[ -n ${SSH_AUTH_SOCK} ]] && RETAIN+=" SSH_AUTH_SOCK=$SSH_AUTH_SOCK"
+# if we're on some X terminal, makes sense to inherit that too
+[[ -n ${DISPLAY} ]] && RETAIN+=" DISPLAY=$DISPLAY"
+# do it!
+if [[ ${SHELL#${EPREFIX}} != ${SHELL} ]] ; then
+	'@GENTOO_PORTAGE_EENV@' -i $RETAIN $SHELL -l
+elif [[ ' bash ' == *" ${SHELL##*/} "* ]] ; then
+	# shell coming from different prefix would load it's own
+	# etc/profile upon -l, so we have to override
+	'@GENTOO_PORTAGE_EENV@' -i ${RETAIN} "${SHELL}" --rcfile "${EPREFIX}"/etc/prefix-stack.bash_login -i
+else
+	echo "Only bash is supported with stacked Prefix (you have ${SHELL##*/}), sorry!" > /dev/stderr
+	exit 1
+fi
+# and leave a message when we exit... the shell might return non-zero
+# without having real problems, so don't send alarming messages about
+# that
+echo "Leaving Gentoo Prefix with exit status $?"
+EOIN
+
+: prefix-stack.bashrc <<'EOIN'
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# In stacked Prefix there is no bash installed, yet
+# etc/bash/bashrc from base Prefix still is useful.
+#
+
+if [[ $- != *i* ]] ; then
+	# Shell is non-interactive, bashrc does not apply
+	return
+fi
+
+if [[ -r @GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc ]] ; then
+	source '@GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc'
+	# only if base Prefix does have an etc/bash/bashrc, we also
+	# run bashrc snippets provided by packages in stacked Prefix
+	for sh in '@GENTOO_PORTAGE_EPREFIX@'/etc/bash/bashrc.d/* ; do
+		[[ -r ${sh} ]] && source "${sh}"
+	done
+	unset sh
+else
+	# etc/profile does expect etc/bash/bashrc to set PS1
+	PS1='\u@\h \w \$ '
+fi
+EOIN
+
+: prefix-stack.bash_login <<'EOIN'
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# In stacked Prefix there is no bash installed, so there is
+# no bash able to load this Prefix' profile as login shell.
+# Instead, you can specify this one as bash rcfile to mimic
+# a bash login shell using this stacked Prefix profile.
+#
+
+if [[ -s '@GENTOO_PORTAGE_EPREFIX@/etc/profile' ]] ; then
+	. '@GENTOO_PORTAGE_EPREFIX@/etc/profile'
+fi
+if [[ -s ~/.bash_profile ]] ; then
+	. ~/.bash_profile
+elif [[ -s ~/.bash_login ]] ; then
+	. ~/.bash_login
+elif [[ -s ~/.profile ]] ; then
+	. ~/.profile
+fi
+EOIN
+
+: prefix-stack.envd.99stack <<'EOIN'
+PKG_CONFIG_PATH@=@"@GENTOO_PORTAGE_EPREFIX@/usr/lib/pkgconfig:@GENTOO_PORTAGE_EPREFIX@/usr/share/pkgconfig"
+PORTAGE_CONFIGROOT@=@"@GENTOO_PORTAGE_EPREFIX@"
+EPREFIX@=@"@GENTOO_PORTAGE_EPREFIX@"
+EOIN
+
+: prefix-stack-setup <<'EOIN'
+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+PARENT_EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
+PARENT_CHOST="@GENTOO_PORTAGE_CHOST@"
+CHILD_EPREFIX=
+CHILD_PROFILE=
+
+#
+# get ourselfs the functions.sh script for ebegin/eend/etc.
+#
+for f in \
+	/lib/gentoo/functions.sh \
+	/etc/init.d/functions.sh \
+	/sbin/functions.sh \
+; do
+	if [[ -r ${PARENT_EPREFIX}${f} ]] ; then
+		. "${PARENT_EPREFIX}${f}"
+		f=found
+		break
+	fi
+done
+
+if [[ ${f} != found ]] ; then
+	echo "Cannot find Gentoo functions, aborting." >&2
+	exit 1
+fi
+
+for arg in "$@"; do
+	case "${arg}" in
+	--eprefix=*)	CHILD_EPREFIX="${arg#--eprefix=}"	;;
+	--profile=*)	CHILD_PROFILE="${arg#--profile=}"	;;
+
+	--help)
+		einfo "$0 usage:"
+		einfo "  --eprefix=[PATH]       Path to new EPREFIX to create stacked to the prefix"
+		einfo "                         where this script is installed (${PARENT_EPREFIX})"
+		einfo "  --profile=[PATH]       The absolute path to the profile to use. This path"
+		einfo "                         must point to a directory within ${PARENT_EPREFIX}"
+		exit 0
+		;;
+	esac
+done
+
+#
+# sanity check of given values
+#
+
+test -n "${CHILD_EPREFIX}" || { eerror "no eprefix argument given"; exit 1; }
+test -d "${CHILD_EPREFIX}" && { eerror "${CHILD_EPREFIX} already exists"; exit 1; }
+test -n "${CHILD_PROFILE}" || { eerror "no profile argument given"; exit 1; }
+test -d "${CHILD_PROFILE}" || { eerror "${CHILD_PROFILE} does not exist"; exit 1; }
+
+einfo "creating stacked prefix ${CHILD_EPREFIX}"
+
+#
+# functions needed below.
+#
+eend_exit() {
+	eend $1
+	[[ $1 != 0 ]] && exit 1
+}
+
+#
+# create the directories required to bootstrap the least.
+#
+ebegin "creating directory structure"
+(
+	set -e
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.mask
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.force
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage/env
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage/package.env
+	ln -s "${PARENT_EPREFIX}"/etc/portage/repos.conf "${CHILD_EPREFIX}"/etc/portage/repos.conf
+)
+eend_exit $?
+
+#
+# create a make.conf and set PORTDIR and PORTAGE_TMPDIR
+#
+ebegin "creating make.conf"
+(
+	set -e
+	echo "#"
+	echo "# The following values where taken from the parent prefix's"
+	echo "# environment. Feel free to adopt them as you like."
+	echo "#"
+	echo "CFLAGS=\"$(portageq envvar CFLAGS)\""
+	echo "CXXFLAGS=\"$(portageq envvar CXXFLAGS)\""
+	echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\""
+	niceness=$(portageq envvar PORTAGE_NICENESS || true)
+	[[ -n ${niceness} ]] &&
+		echo "PORTAGE_NICENESS=\"${niceness}\""
+	echo
+	echo "# Mirrors from parent prefix."
+	echo "GENTOO_MIRRORS=\"$(portageq envvar GENTOO_MIRRORS || true)\""
+	echo
+	echo "# Below comes the prefix-stack setup. Only change things"
+	echo "# if you know exactly what you are doing!"
+	echo "EPREFIX=\"${CHILD_EPREFIX}\""
+	echo "PORTAGE_OVERRIDE_EPREFIX=\"${PARENT_EPREFIX}\""
+	echo "BROOT=\"${PARENT_EPREFIX}\""
+) > "${CHILD_EPREFIX}"/etc/portage/make.conf
+eend_exit $?
+
+ebegin "creating use.mask/prefix-stack"
+printf -- '-%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.mask/prefix-stack
+eend_exit $?
+
+ebegin "creating use.force/prefix-stack"
+printf -- '%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.force/prefix-stack
+eend_exit $?
+
+ebegin "creating env/host-cc.conf"
+cat > "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf <<-EOM
+	CC=${PARENT_CHOST}-gcc
+	CXX=${PARENT_CHOST}-g++
+	EOM
+eend_exit $?
+
+ebegin "creating package.env/prefix-stack"
+cat > "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack <<-'EOM'
+	# merge with the parent's chost. this forces the use of the parent
+	# compiler, which generally would be illegal - this is an exception.
+	# This is required for example on winnt, because the wrapper has to
+	# be able to use/resolve symlinks, etc. native winnt binaries miss
+	# that ability, but cygwin binaries don't.
+	sys-devel/gcc-config host-cc.conf
+	sys-apps/gentoo-functions host-cc.conf
+	EOM
+eend_exit $?
+
+#
+# create the make.profile symlinks.
+#
+ebegin "creating make.profile"
+(
+	ln -s "${CHILD_PROFILE}" "${CHILD_EPREFIX}/etc/portage/make.profile"
+)
+eend_exit $?
+
+#
+# adjust permissions of generated files.
+#
+ebegin "adjusting permissions"
+(
+	set -e
+	chmod 644 "${CHILD_EPREFIX}"/etc/portage/make.conf
+	chmod 644 "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf
+	chmod 644 "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack
+)
+eend_exit $?
+
+#
+# now merge some basics.
+#
+ebegin "installing required basic packages"
+(
+	set -e
+	export PORTAGE_CONFIGROOT@=@"${CHILD_EPREFIX}"
+	export EPREFIX@=@"${CHILD_EPREFIX}"
+	export PORTAGE_OVERRIDE_EPREFIX@=@"${PARENT_EPREFIX}"
+
+#	# this -pv is there to avoid the global update output, which is
+#	# there on the first emerge run. (thus, just cosmetics).
+#	emerge --pretend --oneshot --nodeps baselayout-prefix
+
+	# let baselayout create the directories
+	USE@=@"${USE} build" \
+	emerge --verbose --nodeps --oneshot \
+		'>=baselayout-prefix-2.6'
+
+	# Record the prefix-toolkit into @world file, as it provides the
+	# env.d telling the PM to manage this stacked Prefix, but may not
+	# (unlike baselayout) be part of @system set per the profile.
+	emerge --verbose --nodeps \
+		prefix-toolkit
+
+	emerge --verbose --nodeps --oneshot \
+		gentoo-functions \
+		elt-patches \
+		gnuconfig \
+		gcc-config
+
+	# select the stack wrapper profile from gcc-config
+	env -i PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" "$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
+
+	# do this _after_ selecting the correct compiler!
+	emerge --verbose --nodeps --oneshot \
+		libtool
+)
+eend_exit $?
+
+#
+# wow, all ok :)
+#
+ewarn
+ewarn "all done. don't forget to tune ${CHILD_EPREFIX}/etc/portage/make.conf."
+ewarn "to enter the new prefix, run \"${CHILD_EPREFIX}/startprefix\"."
+ewarn
+EOIN
+
+: prefix-stack-ccwrap <<'EOIN'
+#!@GENTOO_PORTAGE_BPREFIX@/bin/bash
+
+if [ -r /cygdrive/. ]; then
+	winpath2unix() { cygpath -u "$1"; }
+	unixpath2win() { cygpath -w "$1"; }
+fi
+
+myself=${0##*/} # basename $0
+link_dirs=()
+opts=()
+chost="@GENTOO_PORTAGE_CHOST@"
+prefix="@GENTOO_PORTAGE_EPREFIX@"
+absprefix=${prefix}
+if [[ ${chost} == *"-winnt"* ]]; then
+	# we may get called from windows binary, like pkgdata in dev-libs/icu
+	# in this case, PATH elements get the "/dev/fs/C/WINDOWS/SUA" prefix
+	absprefix=$(winpath2unix "$(unixpath2win "${absprefix}")")
+fi
+[[ ${myself} == *windres* ]] && mode=compile || mode=link
+orig_args=("$@")
+
+for opt in "$@"
+do
+	case "$opt" in
+	-L)
+		link_dirs=("${link_dirs[@]}" "-L$1")
+		shift
+		;;
+	-L*)
+		link_dirs=("${link_dirs[@]}" "${opt}")
+		;;
+	*)
+		case "${opt}" in
+		-v)
+			# -v done right: only use mode version if -v is the _only_
+			# argument on the command line.
+			[[ ${#orig_args[@]} -gt 1 ]] || mode=version
+			;;
+		--version)	mode=version ;;
+		-c|-E|-S)	mode=compile ;;
+		-print-search-dirs) mode=dirs ;;
+		esac
+		opts=("${opts[@]}" "${opt}")
+		;;
+	esac
+done
+
+# remove any path to current prefix, need base prefix only
+new_path=
+save_ifs=$IFS
+IFS=':'
+for p in $PATH
+do
+	IFS=$save_ifs
+	[[ ${p#${absprefix}} != "${p}" ]] && continue
+	if [[ -z "${new_path}" ]]; then
+		new_path="${p}"
+	else
+		new_path="${new_path}:${p}"
+	fi
+done
+IFS=$save_ifs
+
+PATH=${new_path}
+
+# binutils-config's ldwrapper understands '-R' for aix and hpux too.
+# parity (winnt) understands -rpath only ...
+case "${chost}" in
+*-winnt*) rpath_opt="-Wl,-rpath," ;;
+*) rpath_opt="-Wl,-R," ;;
+esac
+
+pfx_link=("-L${prefix}/usr/lib" "-L${prefix}/lib")
+pfx_link_r=("${rpath_opt}${prefix}/lib" "${rpath_opt}${prefix}/usr/lib")
+pfx_comp=("-I${prefix}/include" "-I${prefix}/usr/include")
+
+# ensure we run the right chost program in base prefix
+[[ ${myself} == *-*-*-* ]] || myself=${chost}-${myself#${chost}-}
+
+case "$mode" in
+link)    exec "${myself}" "${link_dirs[@]}" "${pfx_link[@]}" "${opts[@]}" "${pfx_comp[@]}" "${pfx_link_r[@]}" ;;
+compile) exec "${myself}" "${link_dirs[@]}" "${opts[@]}" "${pfx_comp[@]}" ;;
+version) exec "${myself}" "${orig_args[@]}" ;;
+dirs)
+	"${myself}" "${orig_args[@]}" | while read line; do
+		if [[ "${line}" == "libraries: ="* ]]; then
+			echo "libraries: =${prefix}/usr/lib:${prefix}/lib:${line#"libraries: ="}"
+		else
+			echo "${line}"
+		fi
+	done
+	;;
+*)			echo "cannot infer ${myself}'s mode from comamnd line arguments"; exit 1 ;;
+esac
+EOIN
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 7e30dadef91a..f6f8b66cc91d 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,8 +1,10 @@
 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.12.tar.bz2 86737 BLAKE2B b27d89b0fe62d52607c55b1cf1d5662699d1e46ad7ef85553d642be8fb915435f1748914b9d63febb7dddd67bd5623f72ba4aa9ca7634af98f85634af91a74c1 SHA512 64bede0e1deb7d2a8c4c702d6845e84f8937cbfb54f6f35d88a10b13c961f28948f17c9e1d623bf0f663b22f98dc4e8f514c200fb4f1b93d7535addd5efa1342
+DIST repoman-2.3.13.tar.bz2 86733 BLAKE2B 7e281284924520c656acfe219eb57acdd61c8cc59b4942444a1eea0353649727ff79746f4237aa6f022e3ee8cfb13336e2c1db1a0469e1d5c34ea6067a04ae9d SHA512 852952cbbfb5cc7148ada111bad6db162843812a7ad35073426f1b9fc8a16adba43beebdb613e08712681fe3c3479904fd7bebb623af18465cbb5cc69ec00db9
 EBUILD repoman-2.3.10.ebuild 1947 BLAKE2B 5d1a5e9fe74a16d9bac3c12577c76e3e18dd6c6249d08a44b0d8b02863f9bfa5610470a2ca33a724ec7b5079402b4c5bf8f4d339da3200661cc6fb4148392355 SHA512 399353e4ea2e55a2d2be99b44040d1ff63786395f68270592f65db6a0172aec3dfbf1ec66f42e6b6511d01bae71b6c425c2b00f28fa1f0981b7b7d2ed46472d2
 EBUILD repoman-2.3.11.ebuild 1944 BLAKE2B e1fcbbbe81adb06fff85c70a53a5f0ef4951e99351ad32f99e3bf64a5b97a5ea9bc30b3de922e3355a623b840c5ed24d13215b9fdbe091cd858dea6e824a9356 SHA512 309c463aa75cbc09d1e0c58748ccb6920ba722a57d5146e319aea38f9a7c80308859ea746668bfe66da23c23748d470b91b5e71faa6feb6acf913aca3e73b11b
 EBUILD repoman-2.3.12.ebuild 1963 BLAKE2B 4dc7b5a7e24ae8e9267d424271c4f8a185727ab7dab85667a4339082ce9314520544f096cd8f3c0f90b6d2d1b24bd3607be1191414b36df4184e97c58fb47d98 SHA512 926ca8fbf0a9ee482205c891b913ffae61e4a41455eee82aea0da10e93c9a6dbb9100cbacc0a2f3075e5819db78885b7df19edf95d7e208a092d021950ee670b
+EBUILD repoman-2.3.13.ebuild 1963 BLAKE2B 4dc7b5a7e24ae8e9267d424271c4f8a185727ab7dab85667a4339082ce9314520544f096cd8f3c0f90b6d2d1b24bd3607be1191414b36df4184e97c58fb47d98 SHA512 926ca8fbf0a9ee482205c891b913ffae61e4a41455eee82aea0da10e93c9a6dbb9100cbacc0a2f3075e5819db78885b7df19edf95d7e208a092d021950ee670b
 EBUILD repoman-9999.ebuild 1984 BLAKE2B 731d6bd31c3f65e5402c3ca736afda5e7c566a25d59e869fde16a39cad2541a9261820d72c67150e8789464c8043f24d8329d40c3e8121ce61bc1bc6daa3795c SHA512 e411f9c7ba86104fb32f0013c12956362fe3de11fe5d3238999c4b5c3c625bdd6c7fe6fb136de24993e2525655b9c22c0a06d285323a8babccfb6fc0572a4924
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.13.ebuild b/app-portage/repoman/repoman-2.3.13.ebuild
new file mode 100644
index 000000000000..f4313d582c61
--- /dev/null
+++ b/app-portage/repoman/repoman-2.3.13.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=sys-apps/portage-2.3.43[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${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() {
+	if [[ -z {REPLACING_VERSIONS} ]]; then
+		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 ""
+	fi
+}
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index 830cf77d177e..de8f1fbc443f 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,4 +1,6 @@
 DIST unsymlink-lib-13.tar.gz 8736 BLAKE2B 5b44112299232185f3f7a5d88057caa7e9161ca03a3e79bebd9dbf70a61ddde255d3a24679b9004cc572fedcfc24ffeb42693319e5dfa1f8371f8fed1408b15d SHA512 c87676b80259f2a20fde257e2b090380c3b04be1542a5a92832487327b8d1eb737059a6e6898f713fa378b792e23d2896280b94cb00d7961a0beba81cd6b3bd2
+DIST unsymlink-lib-14.tar.gz 10089 BLAKE2B 24252eb31a0a0fe83a260e8eee76d42c473d76dbebe4d2fd604d1ab663ea7439da4c03dd0b953efa30e0d74d654101b7a0264db1da50de826c5a5f4ae79f3ff0 SHA512 ab3ffcbc7cdcac98068a6e3c86e71cb472cff67aed1ddc570701ed6c34fa17e04d84a13bf5fb2696aeff0f8338b2464d1e06ce829ffc693011c51481ecba2be8
 EBUILD unsymlink-lib-13.ebuild 582 BLAKE2B b62d621c212ba50a4fd23f1a7f82556293cb641fea9780b8912f4eb0574afc4d743487a0d7c0ed1466085de10a5c80f2cd5d2908b1b0c8175e12952fd8275ee9 SHA512 99c47df9a06d16b8ab5a35dd1a5d987641f8652a447de245cce7786a8cfc252d57fd693c9e78078bea53b933664826200e8f3b5fe958974f67cf0152d176cc88
+EBUILD unsymlink-lib-14.ebuild 630 BLAKE2B a7a82062dd14d42f6933b292abcc5567bf5e942238f3604719796675e4a41509c06afb04d9ed2005e500be83f5ebc6802c0c9744e3b3ddd5b76f569dbb311c47 SHA512 b082779cccb6a4fff08bbe6028b3a4daaa14f606616081e9b7bb33ae9377c1a0cc92b552b78857dd9904a82dc8963e9310b0d37e05fd68015011e5d945d012d6
 EBUILD unsymlink-lib-9999.ebuild 568 BLAKE2B c9759f261cf2c0e79b5250f7a9cc80a4f64d489152833cfc163e475071278d83e5c22946433da0a1659c247fbbe33a6904d91d1ab05bdffac75b7e499d537342 SHA512 4e97c29a2633b030c81151cad3348dd7fe3eec2d7908c21153b3fdde4fe0566f3be9c6036730769520525e851bcbd4597ddde767c0300b9397f29657e9e819a0
 MISC metadata.xml 401 BLAKE2B f16ce51083f8054e7190c2d5fc193808898071af155cc8442a9ef7064cb4d46e6639d8724f85a4a0f551477c6f7ae0f81434c6bef8bd88b2077ea7b7e1f2133b SHA512 dbd79971b54d9027956c46586b547f8308404e273e91dd7ff84d3fbbd50936b8f19dd1dacde5e16a22ca2ef17924f19f66ec83e64c9f145f29322150db9e00a6
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-14.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-14.ebuild
new file mode 100644
index 000000000000..90b56e60ca45
--- /dev/null
+++ b/app-portage/unsymlink-lib/unsymlink-lib-14.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit python-single-r1
+
+DESCRIPTION="Convert your system to SYMLINK_LIB=no"
+HOMEPAGE="https://github.com/mgorny/unsymlink-lib"
+SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	sys-apps/portage[${PYTHON_USEDEP}]"
+
+src_test() {
+	# tests are docker-based
+	:
+}
+
+src_install() {
+	python_doscript unsymlink-lib
+	dodoc README
+}