gentoo resync : 12.08.2018

10 files changed, 300 insertions, 82 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 0d3013fcf0b1..e54d1f09fbcf 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index 640fc6cf37fa..e9399688c163 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,18 +1,11 @@
-DIST c-dvar-7706828ecda2d8c508d6fc233dc9d198bab482ad.tar.gz 28454 BLAKE2B e109755fc3392f1c91820606af81852464a45b32ef43a9bce6fe32095f463336df8c5fe2410573830a1ac368d99d7e3da4cedb7e5ec89761459a5c6b9f54af11 SHA512 b6d69b11b3e47e8538c8eab04780966480db3881bf642f732b883f0b995ba374382fff54abe81eabe377d029445cc4af5bf52c8740282b0c03b959d8d5ae944d
 DIST c-dvar-f0a525477142f64c45b0be9393cc3b5dc3a6d6f9.tar.gz 26255 BLAKE2B 10941922212219f3b4c09306b8daf26cd921b078472c15db85205adcd65d503de5f58bc05eef3a2e60ca1485ebe44d282c2966ddd732d42ee092fe7880db5bbf SHA512 bf1593ca794ca973e8336954b527733f61c0bd389a729da32c84bc35ba6decea6434ea9728789e92f1663d2ec10cf3e4d4f50c8db907ed1566790214c40eaf5c
-DIST c-list-05bada3508c21027dbbbf1319f27ed65c7c03bc0.tar.gz 20726 BLAKE2B b9a4dd6d490136571600eeb790320986e8cd1e330772da28a6c5d7708f3f4026b5938369dc38827d8c19033feb254c58e155cb5c4359898be431cffb297fd393 SHA512 c9e5cdd30de45ead06565530eae996dd95712cb15880e33ae95bcc2a0ee65223177d1c46627f564eaf3edf13786410c870dec996a5103ea7ec02e280f0dbd650
 DIST c-list-071841c28d96e9104761af815a7ea367390c3174.tar.gz 24662 BLAKE2B d1d859d4c6c80540d984083c70b58fde62eed2074d942222d15430c475ee46280af098c2a4dbe00ccd81a80884432ae3043480f9a050cb73fe5c1675c0a3d6ef SHA512 de4fc5ed4d893b122ef320ad0323d44e616210fe590fedad8e38c3c3f8a6c0778178fb85e6e970913ff441f9b3e8861491f59fcef2c2c02ddf59120620d8cbe3
-DIST c-list-72c59181d677a3f50b201d51f190b1bff02d4279.tar.gz 20474 BLAKE2B e1459b064cf0bfd7656338b03f2f591b56308bab8541f72be0822a7849630d05d11c5f9df31753ae9cb6ca25389eef1e24a2e50791c81faea1d6e487bd06a46e SHA512 9f271160d1f3e40128ba158409730216c829060fa9f9844e7243826fd0219c3f678980eed5b8e15e13d65c6408b959bd47e07197791e06d03f6864fe9a9cf359
-DIST c-rbtree-825f626a16257c5f0b0c523c11ce1bca16851180.tar.gz 27988 BLAKE2B 9a6b47cee256e96c3cd7db1e3de684b7628427e90f3000cb69f7d177085322e37d8636b3d14d659c3619316e248ec9e970466b066491483c2e8787d1d8942d04 SHA512 649aff910fb38b49462f794fd908d6d6071c9b064ed8445255d674df2184277bd54ff04c2c1789b61585f377aa1fd611c4e241b5104641d60ae5ec803d675894
 DIST c-rbtree-ba0527e9157316cdb60522f23fb884ea196b1346.tar.gz 28400 BLAKE2B 35a0529bd262cbd8aa11228714ac331d7cd8202bd79165db4bebe5d5a1895adb58440d52edd7fcbfffb8d9a2f86c44d7642b0328ffae0bbcbdcd5c48999fdd12 SHA512 425c4525b7aead4f68ed401eefdff81b3fe1f444c76e934a67e0f18a3ba17b52bf3a1398879fa929d97186da7d4cb485618aec74b671145560ba251f5d24af8b
 DIST c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz 26702 BLAKE2B c67af60b180b80c358c94d43961423cd18b147ec98dd71fa9e858ae6b67ad29d1d1484816be9eff1ce5c7193aa22b7b754f4cc535888c2a62b88ea43155f71c6 SHA512 44fccf4509ad752f7ef8aef7e1afd62eb51660f2daba42f0ad8b1711a62ec53aa2bde78b895fbdd939ba9a1ba1fc06621c2506eb068948da4d6e7192cb8df29e
 DIST c-utf8-a77769a6c5b40c4a2e900cb4d1b59535696ef7e8.tar.gz 24767 BLAKE2B 064b2b7eabf8b23fcbd841a863c6c10c5079a534c5cdc9326486b2c5a0d754c86300c58edfb1fafc3972335fd3a90eeb0b8a14531d1f911ab3148c332fb48ed0 SHA512 d7e6b4162b452cd6e05bf9cdea039a7acbb02a1d72bc0197149745c9416b11ec394c0ea1363c72a3082931f0f738b34a11124d9e2aa962e83f4739e65e571065
-DIST c-utf8-cc67174f455c9196ebffc37b4d4f249da3dbc66f.tar.gz 21436 BLAKE2B d94c87a8ce99f3585da45678f36e59bbeded5d66f4cf7908da9fee3a4691fc704a0deefe66ddc3c7d8f653ec4bd7b2e8ed5892548a34930a10d1e5132f0954db SHA512 915258ea1d0f4e575c5f37746d34f98aebd6c9dd0c42e137f117dea1a8bbc895b775d9f9a6b2d91a6b008b095eb322332b3ec4d3de1a2333c8cbfcd7b89364b5
-DIST dbus-broker-11.tar.gz 160473 BLAKE2B b043709f5fcf18f27d0d76792c2f11f227764233d9362b65485fd76601f4cbabf4426065d6b2e659434a38b020901f2a8b3bdce86e8f5fef7acd8161df877c3e SHA512 c46f1739e289d82ef86d0d640c66f13ac97e10a483f513a4e6158e489ca1f05c45967131dd326a75f98d6b84e7891efcf605dde91ed73da4bfe2f076fcada56e
 DIST dbus-broker-14.tar.gz 179880 BLAKE2B bce75a5dacef22166c244151a1960119b1fb853357ffcdf5adf523223ed5a7beb2173fa872983cb1672c6fa2713e0a36916d7ff2ae6251c19bc0ec4ccc4e917d SHA512 7313a30facf2e64e98ac9d5e109b4ea2d5d0ad70bb4b82edd168ad7a7188b17710651b870827ae4d3b88db6dfdd41d4e9d0becea12307c481a581bfb524b572d
-DIST dbus-broker-9.tar.gz 155810 BLAKE2B ebb64f35303de988ea081b6dc9186a53317c5e610ca826afc4243191148f6d8d7038d6aa6f94bdd7b5225ebd2f2d93394d467605e5f878617becfd487ad0dfb6 SHA512 4eed5dede2ba6d45b883b1a484d59b774655063334611413e165558cb1e2efb21a5e17a182e836ae43cbfbfd366737c709d53ed0b9ec29ba3a9cd3718b29ec40
-EBUILD dbus-broker-11.ebuild 1959 BLAKE2B 1036ae55a30b7052a269494f1b7a30983e34ca312031f2e7f59f69e92cdf63dcf753f98edf46d7a93a6ae98e45d9cde260df70e21305dcb0757eb9c1ddab0072 SHA512 b11c2accaf059da089d98fd29b9b88ce39ce9a558bd31f721ccdf0a0d47a60ac73953dde929ee5bcd0ea6f9bffc7cc35de77387de0dc9436a4eef8a8a2701d03
+DIST dbus-broker-15.tar.gz 181175 BLAKE2B 94a51451e17e898d2c83b49c2d5415fc97ae38d035464268a9036e980fc5de6c65a436c2c019f92d1244a57a620b4dd3c3cccb2681afc26047e124b41c15ddcd SHA512 efb54ec7bc1918918794b106066219d9367cbaffa777ca9b3809af2d5c42c704dd4255cfb69e93afdb0f4db2d1a9adcbd491998201057ad656754908b177e1d6
 EBUILD dbus-broker-14.ebuild 2081 BLAKE2B 978622f99b77458cc54661f7a64b3986eb6775a556a5f66cb206a498570c7454e2f6dd74075792d5eea13490ad681df893cdd06f67a1902c08446f8b8400b951 SHA512 eca7c81a3c5b08c4488dd06245ab76a5dca3078ae26135188719a38da2916f2b9a0bc728511bea352ee2b7b4570c695bcedcc8e2a7bc4b0fc0ee652266921d03
-EBUILD dbus-broker-9.ebuild 1823 BLAKE2B a9060cc64329fc18816ac961d0ea4a11894f031ffc2c98ca301cc4f19472523c3d124850fe5ef33b897fdbf11006d3d4f9f71d8032abef7c5c12adfb0b17dc9a SHA512 04978b559c3f7178e2f909c33450b7160bf249de10483f952ebb1b6b6893dabea3c98854daec1b3318af817cc16516d4dc7cbf51f6cdc146b32fc076e86c9425
+EBUILD dbus-broker-15.ebuild 2081 BLAKE2B 978622f99b77458cc54661f7a64b3986eb6775a556a5f66cb206a498570c7454e2f6dd74075792d5eea13490ad681df893cdd06f67a1902c08446f8b8400b951 SHA512 eca7c81a3c5b08c4488dd06245ab76a5dca3078ae26135188719a38da2916f2b9a0bc728511bea352ee2b7b4570c695bcedcc8e2a7bc4b0fc0ee652266921d03
 EBUILD dbus-broker-9999.ebuild 2081 BLAKE2B 978622f99b77458cc54661f7a64b3986eb6775a556a5f66cb206a498570c7454e2f6dd74075792d5eea13490ad681df893cdd06f67a1902c08446f8b8400b951 SHA512 eca7c81a3c5b08c4488dd06245ab76a5dca3078ae26135188719a38da2916f2b9a0bc728511bea352ee2b7b4570c695bcedcc8e2a7bc4b0fc0ee652266921d03
 MISC metadata.xml 327 BLAKE2B baaa6c7be634d16ffbe1196a29bcc2254c77d857dd1b807d50dac7adbd3d20370bf55ac0ea8f60b0fb160bf9ae69d42a5002b4150c4b22c101b37ecab96028a2 SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1
diff --git a/sys-apps/dbus-broker/dbus-broker-11.ebuild b/sys-apps/dbus-broker/dbus-broker-15.ebuild
index a21aaabdae9f..f3dd9cd82a47 100644
--- a/sys-apps/dbus-broker/dbus-broker-11.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-15.ebuild
@@ -10,10 +10,10 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
 	dvar=f0a525477142f64c45b0be9393cc3b5dc3a6d6f9
-	list=05bada3508c21027dbbbf1319f27ed65c7c03bc0
+	list=071841c28d96e9104761af815a7ea367390c3174
 	rbtree=ba0527e9157316cdb60522f23fb884ea196b1346
 	sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
-	utf8=cc67174f455c9196ebffc37b4d4f249da3dbc66f
+	utf8=a77769a6c5b40c4a2e900cb4d1b59535696ef7e8
 	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz
 		https://github.com/c-util/c-dvar/archive/${dvar}/c-dvar-${dvar}.tar.gz
 		https://github.com/c-util/c-list/archive/${list}/c-list-${list}.tar.gz
@@ -29,11 +29,16 @@ HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="audit +launcher selinux"
+IUSE="audit doc +launcher selinux"
 
 RDEPEND="
-	audit? ( sys-process/audit )
+	audit? (
+		>=sys-process/audit-2.7
+		>=sys-libs/libcap-ng-0.6
+	)
+	doc? ( dev-python/docutils )
 	launcher? (
+		>=sys-apps/dbus-1.10
 		>=dev-libs/expat-2.2
 		>=dev-libs/glib-2.50:2
 		>=sys-apps/systemd-230
@@ -59,9 +64,10 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		-D audit=$(usex audit true false)
-		-D launcher=$(usex launcher true false)
-		-D selinux=$(usex selinux true false)
+		-Daudit=$(usex audit true false)
+		-Ddocs=$(usex doc true false)
+		-Dlauncher=$(usex launcher true false)
+		-Dselinux=$(usex selinux true false)
 	)
 	meson_src_configure
 }
diff --git a/sys-apps/dbus-broker/dbus-broker-9.ebuild b/sys-apps/dbus-broker/dbus-broker-9.ebuild
deleted file mode 100644
index 62c8053832d1..000000000000
--- a/sys-apps/dbus-broker/dbus-broker-9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
-else
-	dvar=7706828ecda2d8c508d6fc233dc9d198bab482ad
-	list=72c59181d677a3f50b201d51f190b1bff02d4279
-	rbtree=825f626a16257c5f0b0c523c11ce1bca16851180
-	sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
-	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/c-util/c-dvar/archive/${dvar}.tar.gz -> c-dvar-${dvar}.tar.gz
-		https://github.com/c-util/c-list/archive/${list}.tar.gz -> c-list-${list}.tar.gz
-		https://github.com/c-util/c-rbtree/archive/${rbtree}.tar.gz -> c-rbtree-${rbtree}.tar.gz
-		https://github.com/c-util/c-sundry/archive/${sundry}.tar.gz -> c-sundry-${sundry}.tar.gz
-	"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Linux D-Bus Message Broker"
-HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="audit +launcher selinux"
-
-RDEPEND="
-	audit? ( sys-process/audit )
-	launcher? (
-		>=dev-libs/expat-2.2
-		>=dev-libs/glib-2.50:2
-		>=sys-apps/systemd-230
-	)
-	selinux? ( sys-libs/libselinux )
-"
-DEPEND="${RDEPEND}
-	dev-python/docutils
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	if [[ ${PV} != 9999 ]]; then
-		rmdir subprojects/{c-dvar,c-list,c-rbtree,c-sundry} || die
-		mv "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die
-		mv "${WORKDIR}/c-list-${list}" subprojects/c-list || die
-		mv "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die
-		mv "${WORKDIR}/c-sundry-${sundry}" subprojects/c-sundry || die
-	fi
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-D audit=$(usex audit true false)
-		-D launcher=$(usex launcher true false)
-		-D selinux=$(usex selinux true false)
-	)
-	meson_src_configure
-}
diff --git a/sys-apps/dcfldd/Manifest b/sys-apps/dcfldd/Manifest
index 48d52ab62466..003233a27b12 100644
--- a/sys-apps/dcfldd/Manifest
+++ b/sys-apps/dcfldd/Manifest
@@ -1,3 +1,4 @@
 DIST dcfldd-1.3.4-1.tar.gz 163141 BLAKE2B 99954c674907196020dc1eff86103122897accdf0ff20ea0e6d5582d7fb87e4bcebfd12bf774f47e402853240896bbd536500c79ae6e7b478a3611171745dcc3 SHA512 04b53adf62c6b468ff816e2cd94cf360eb5315eb980e2aa7d71afae706ec9c4683430269e82d712608be265710907fdaaa1316e4f734b7481ee9395a37926c7a
+EBUILD dcfldd-1.3.4.1-r1.ebuild 393 BLAKE2B 9ec1739078e2bf496592f376b8e6090aaeb3cbff5330fa2120990629776eef90ecc7c6d0d8dc1f506656066feb978ba2d246cfa34d6604f2f3d2db53b28adca4 SHA512 361b2b4d7ac56d6e4ef706571aa9cc883ccc3dda91f09ddbc87c78f2dfaa349586cb56f4d15e82bc52bf323e8c4a4967a7c3569751e941fd75826571c03be696
 EBUILD dcfldd-1.3.4.1.ebuild 579 BLAKE2B 103e0d59ffa0a4bcdb83b954fcc048ed3ffcc876945bbddfcf9dffdf89872b4aad5defa068d37ac777be9e573897d4724e911e92e55e0cf3c2b8a9d849eb6d48 SHA512 aeb7a194e6f5a949ada035ebe6edd34f69eb639c80942d2b3b19d9a0dc053abe31e3d73ed48dfc0aa7b8c07a6b4e99be45ca5eeede80e814ef3f241cb2be5d7f
 MISC metadata.xml 243 BLAKE2B f8089442435627fe2c9fe0a53eb8637e58f37e443e0a12f8a62a96fff8bfabe3ce5d8744c4e54fc3dabe665ad2cadc2fe45cb6fd622cd5a5985767728651feee SHA512 8bec7ef7efabb34196784b71ed7c96e2c2e604665ab3ae6ce6f41e6b719e7b8fc4579e2ec6effce2181017d12784651019f5464623dfbc4f0c9b0437c2bae182
diff --git a/sys-apps/dcfldd/dcfldd-1.3.4.1-r1.ebuild b/sys-apps/dcfldd/dcfldd-1.3.4.1-r1.ebuild
new file mode 100644
index 000000000000..fdff926a5d6d
--- /dev/null
+++ b/sys-apps/dcfldd/dcfldd-1.3.4.1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+My_PV=$(ver_rs 3 '-')
+
+DESCRIPTION="enhanced dd with features for forensics and security"
+HOMEPAGE="http://dcfldd.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dcfldd/${PN}-${My_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${PN}-${My_PV}"
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 91d67bb6e62c..1909bb639d73 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -16,5 +16,5 @@ DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce5
 EBUILD memtest86+-4.20-r1.ebuild 1950 BLAKE2B 7748912836525d02d7909675f7c8b362f253fc3567495d243b0a08e3570d382c300de6239c3052af5b60db1761157754555f6f98793a7c285aeadc7b2f274cee SHA512 5bff802747e652f95f2b8bd7c4d73efaf581c5008f1bb6c17aa492335939012b9ef661a2986447a0e6f9493c522ea9cbd93f4ca3e6164f7142543b8a05adf2c4
 EBUILD memtest86+-4.20-r3.ebuild 1756 BLAKE2B 1e9d161b3358030cfc89d3b1c439d9494ac2063af1db9c28432e60200b5825a675ea421f6c7161bc7a9f151efdcfb1483a669aa60a4bcdd97961e00b2f643111 SHA512 3cc41d0ccd74282b5ed2929359829f4377478605b06c868728e9446f3b1df8a5f38166d793f0c800428b17b724118e0eafdfb44791ef577c8bef87d614d422e2
 EBUILD memtest86+-5.01-r2.ebuild 2384 BLAKE2B 6a7205c3fa74bd10c7c290151a49c2e6cb4bb966bf193a34956c763eca1969d2930a9abae09f5558facb37ce74c5ae32ae20824f6e75809b8f2e9fde310d6963 SHA512 a2912927e8d490829a187959711c85438649a912e440af637f1a9d401a574dcaf368203337123f5c9168897e5bdca0658170c2b07861bc4b10b40e53693820f4
-EBUILD memtest86+-5.01-r4.ebuild 2802 BLAKE2B 66af00a5567b1cd2475d3c113f000fe7def2954f25b881d1668e7eff7b2272b0adbf94f83e7a0fa308aa9dbe306857e8dec04697b6664f0446304c6ceb61d405 SHA512 85ed667275321e755453c46d051bb1f58c116d22524a348419390caa5c8b78cc026a48e5cb623db27f496b54b33698b19fb63f1c685cca1352c55f0ec94af339
+EBUILD memtest86+-5.01-r4.ebuild 2801 BLAKE2B b601647fa4e8d410eee52de112acdab024875fd8417cc8146979fa7ed4ee5c61efbc390ad029e8ad3a2488c2b69476da6a9890f18912a5040b3b3640a38eed98 SHA512 e92c6b7e9144bffdedf141bb4483f93fa7c7b28e8e20eb17342cc165a778ecac991d5cdfad4f806cef9655b7354e81674d3bcfe0112061025fce1e6c7812cba1
 MISC metadata.xml 563 BLAKE2B bd4e7ef2022ed705fc3902cd113f20b057b672dd50a9cf9362f56d4ccf1be9bab1fdb45d162cd646deb2acdab6829942da59f6dce0475a2d51c060662a33b9dd SHA512 26d725110c8b6214fce06feae590d1c437b64c9884ee5bc5421b4804b9391d7b928e11a270d84421ffbb5ea7a7b551dd26484565706499bdfbe871aef7ffb61b
diff --git a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
index 1e94fe931689..ad766837ca18 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 IUSE="+boot floppy iso serial"
 
 BOOTDIR="/boot/memtest86plus"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 83b164acf8bb..3304560bce32 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -8,6 +8,7 @@ DIST portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch 4131 BLAKE2B 1b05
 DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5
 DIST portage-2.3.44.tar.bz2 1008301 BLAKE2B de370ce9f455e6f778dece3be78703f23852caa9185d79b54e6fc35939923f2a28c91aa372a4ae601872b7933970b536e935ea1f8cb8604bf1547dced3d70c33 SHA512 e491998958439dc27fed6e6f9a3b87867c881cae6ec1fe9515db3277fb2f6f866b6ea6298bae5bf6553591ebe75719a5f379ae92e4aede440ac620ce4af9160d
 DIST portage-2.3.45.tar.bz2 1009687 BLAKE2B 396dc6e09e2415ab034963f2b30fe318bd783c873437f3f82e8af233605b7356130c45a18e2423029ec025669f0490542283308011dd60f4c3ee7a95a6d28c2b SHA512 551d24ac168f1cd8dd3affd6bc30e3a6e8a0622956407db72ffb283cfc0937b81b2cb1007ffe7eb8f9c7f94515fab44e1b82c1f45be0375c9d867369b2533792
+DIST portage-2.3.46.tar.bz2 1009905 BLAKE2B 009615295b3b040c5d009bf1ca87a2875eb2aef6380ae6c715cc08903865f6a52d7ece4a4ac861c59170480396f9c80df16c50a30f931420c6bac8e97d81b0db SHA512 60782adc06a1339166a33e25a26cfaae029b242e5036f329f9328c30c4e99ea9c1d23cbf487faa9f4834145b111d753b0a6f70fb090ae907a6ab61c637a0815d
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
 EBUILD portage-2.3.13-r1.ebuild 8239 BLAKE2B a98cf19dd9b963a97e2a0b018ec39a8680977fb5d787ce82514b649f73dce01ecf6723e9b5f973c3156449a911a29f6af235cd116761d55b269077499a6acffe SHA512 bb355bfbb9f0e31230aebfc0e2ab00e6a8b684aa83387343a3402db3591aefc416265f574b0a2e96e7f3ef64bd1578a5c63a7fdd722055cc0bfc19ca825f7316
 EBUILD portage-2.3.19-r1.ebuild 8143 BLAKE2B 624c8ab644fcb4a0a7d62d110f17c2112c7043157da9b53ef2d52384ee68adec7d530cc90d4954293b14ddbe7b9499dfffcb8f55e285b2f766c265dedd13649d SHA512 2e81c73d6a5aea4e333a187fe053a803088f6ca17dcdf5db3f287e0b483ce637779d4e1840a6fc7317ef7108d9d358ece9f4ed13df12ef48d88f4fb1344a5383
@@ -15,6 +16,7 @@ EBUILD portage-2.3.24-r1.ebuild 8997 BLAKE2B 66941bf2ca4330b0fa230833f6460044d80
 EBUILD portage-2.3.40-r1.ebuild 9676 BLAKE2B 143c477c2089c9cd8ab1df8a377cd6c5c65869027744a9fe82acacabd10d74011694772c46983b54d3f222ed0ae2bfb3449e8b899e6b1f3c1a8a06867d51d27a SHA512 4c5c837f5f546cfcb95afd9b1000d65575a3d3ff03d43161e83c2c5b905adec30808b75d58714db091e069cd08f71735964b3373261254a3c445fb236c250053
 EBUILD portage-2.3.44.ebuild 8678 BLAKE2B edeeb0ee8584d7adc647b1be0e101018d89fada9aceef207188e8bf72112633f1a43d428809c489eda5f94d28eee047e78191860da641fac2f43e4652c55caba SHA512 07a19dcd4e12678c4d82d8c1a2fddaaa9a15c99edd8fb0ec1e82d77693a21d1dd3266593461391de85a3472822556bcd2b47490ac53dc0bd3b7040db27bd3eea
 EBUILD portage-2.3.45.ebuild 8678 BLAKE2B edeeb0ee8584d7adc647b1be0e101018d89fada9aceef207188e8bf72112633f1a43d428809c489eda5f94d28eee047e78191860da641fac2f43e4652c55caba SHA512 07a19dcd4e12678c4d82d8c1a2fddaaa9a15c99edd8fb0ec1e82d77693a21d1dd3266593461391de85a3472822556bcd2b47490ac53dc0bd3b7040db27bd3eea
+EBUILD portage-2.3.46.ebuild 8678 BLAKE2B edeeb0ee8584d7adc647b1be0e101018d89fada9aceef207188e8bf72112633f1a43d428809c489eda5f94d28eee047e78191860da641fac2f43e4652c55caba SHA512 07a19dcd4e12678c4d82d8c1a2fddaaa9a15c99edd8fb0ec1e82d77693a21d1dd3266593461391de85a3472822556bcd2b47490ac53dc0bd3b7040db27bd3eea
 EBUILD portage-2.3.8.ebuild 7912 BLAKE2B 1ce75b28134fdd89a42bf12973dc87d609f3dc115f125e66159d8fda21f31f7e7629ff0832db995e11b711addb4ecab1500985700527758eaabbaa020fd75b18 SHA512 3b96e079c2c9be6213a40216a6eb0f7ffba6629263cd9f3bb1ad6d48ac66d45cddbf6df724e54252320e964de87a1c0d5cf0e7a8e22f287c3d3401652b745e3c
 EBUILD portage-9999.ebuild 8542 BLAKE2B 4c38d0c06a40d0aeeaa720d5a8b145166d8105dffaf46a202d9ff01c0187a145eeb4130ae34448e9a55564f4157730e6ef0e86e839d2d2c931d095d269eb86dc SHA512 42d98dad2ac11daf92995991963b3cd50a4f7a5baa51e7debcd735923a410b9dec46ff92dcc0ebeb4b83ffc5df05bec446f18e99a520c96828e5e77643627129
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.46.ebuild b/sys-apps/portage/portage-2.3.46.ebuild
new file mode 100644
index 000000000000..0da8ed04e4f9
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.46.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_4 python3_5 python3_6 python3_7
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-12.1[${PYTHON_USEDEP}]
+			app-crypt/openpgp-keys-gentoo-release
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/repoman-2.3.10"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+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)"
+
+pkg_setup() {
+	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i lib/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		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)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	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" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use epydoc && targets+=(
+		install_epydoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+}