gentoo resync : 20.11.2017

14 files changed, 55 insertions, 21 deletions

diff --git a/sys-apps/agedu/Manifest b/sys-apps/agedu/Manifest
index 9ee944cddf81..5dfd89fa878f 100644
--- a/sys-apps/agedu/Manifest
+++ b/sys-apps/agedu/Manifest
@@ -3,10 +3,10 @@ DIST agedu-20151213.59b0ed3.tar.gz 164928 SHA256 c24eaa0b0e9f9c3474fa6a4aad7baff
 DIST agedu-20160906.853cea9.tar.gz 166835 SHA256 da0ebafbac9075e2a4aa81ae70387aceea591a58fa499699d58b30c5b8c46dac SHA512 a5b0b7c5ba4acb2b60def43ab661ef25f0fa5622a080e132b80c918a6800f0c12b9cf2688b604693559fcd8a0e6c50c8bdff6142b8be11d06ac0c1743936fbf1 WHIRLPOOL b473291d7fc5790226b2830d6620c435c4ecbbb3ee406fb8f33f47891a7b518d335bb0dafb00153117b5fd97016ea4ecface5fec3d796404d9744bc5738767db
 DIST agedu-20160920.853cea9.tar.gz 176763 SHA256 9c52eefe4932a4c07a30a79dbf2089982443817002ab9eabb478063113df5e18 SHA512 494dcdaece7ebe69ffd050f1abe8b0f7722cf9e26bfc0819fef992f08d62ce9557a7e0325a16e69adf7ea102eb3a416628457f8841a00f0086a51ed69e2aa36b WHIRLPOOL bf7f7d38ec8ba7c5a6007da6a0bc65d155fd45c19364ba18b4bf52066e5ea1f56cb05e7910cc42f07bd4e237deeddf44958646ed462005da711a7b7a1960d2a3
 DIST agedu-20170831.fc6b2b5.tar.gz 175900 SHA256 dd2e6f82270c5bf6083c0d275251207607d8b68955511b3083cec477279267bf SHA512 6e9255776b668de33209486d6fcdcf68e1d4785bd84e2d5392ac71d13e54c7b156d9959e681fefc9b965b43727fbab13ef0b1e1e7587fd56d8dea29568dd0e75 WHIRLPOOL 736bc07dedad0653cf250a0efac987d9e4123cec0ee45d278b70a2d020f80c60c9d40840228442083ac109f2bc6f5b196f59d64fada3331a5a92b134b8f6c320
-EBUILD agedu-20151213.ebuild 827 SHA256 503e102523131c59b80b18dda2af4771a2b892fd5a7d265c4c4361c6b09e690d SHA512 e16b7aabfcdc5cd0c0fe2ef870a073544bf5fff557d8a07caee87877617da3d75dc621c43f041e11078896f6527e3949ef48db31ae09b4b9317dd0c83493d5c9 WHIRLPOOL 6dbeb233d9557c65d0aba7698b2a3c72b6bc3fed702592c28567465724d4409d567d57718c8a5d3d8335840f08af98764212723556d715e80c6f6c20ac1c2b39
-EBUILD agedu-20160906.ebuild 840 SHA256 b7c82be8a76e5ca0ea58997a312c0190618ccdee051c03631a9480563971952a SHA512 6ae943e5261cce091ef4900366428709a931dd99da50e690853e295921f6f0cc94354b118df115b91997f790861d8dfad4ec4424c18d91f55d9b05dff17ab1eb WHIRLPOOL 928921525e6b98751e9f02aae6a7a19b6d658aa1187cb1e064fa914bc244f5c90e9aea7f95a7231da6ef178e5fcd6c9b2670f63f2e1ce47ae2603423cd694bf2
-EBUILD agedu-20160920.ebuild 840 SHA256 46a26b3cbdb774bfb8cf30513ea27384d32ea4a19ad99b8ac2d331d2c0dfc69e SHA512 5950f9ddd1160e222c3980012f87d71d87c2385f383c4d1a97315cfacb19a9d2f73da4000bce237a94dc6ac667c65acc6e21fe494799b8218ff6d189825a5176 WHIRLPOOL e1e55868457b31bfcdf4b51ac1c57229ca136c4c2f6c04de9fe61b173677070e663357c2ad234f7870ce9511fa7631dc5fb8a811a2eaa4d79397d58d31aec879
-EBUILD agedu-20170831.ebuild 840 SHA256 64e020fc56e5cbe0db50d096a9f0676c1cab98f1a752c6d72caee1d082d65252 SHA512 417a5192d96169e5def5c72697971a10c9e430d91a1f15cd45dfe44396b730ec7c27b7910b7cef49345bcc9b5d8935344431bcab90206aee317951dcabf8b2b8 WHIRLPOOL d53e2a53757a5a836e470e96cefdda73683dcc2111e3fd5453d9095b5c590733599a9403336910b6f2d34a74833d17d731dec5f401a6a4e7509c39d1f679c69e
+EBUILD agedu-20151213.ebuild 807 SHA256 ee5c5e4a37e0b79ecc8f829f04a34572e86b884cdffb9e364a603c0e760b891d SHA512 950291f1108ecc3951b3fc985fc083caa1267e9d7250969f25e462292b170fc3c65c3ee286b6f19fcfd67779830ba636960a1385cdd41dc9c6e8a600fcb9b430 WHIRLPOOL 9d19ebdf460a001c9014547e0bee86aa39037200260811a78e955c777bb0702274b9d84ac8ab9203bae3ce7f670091810b2717e827e71a922ca3e037a1fb725c
+EBUILD agedu-20160906.ebuild 820 SHA256 a42ee2db4becfe0c2a9c8dc82671668e97bf5f920d774c5c3e6f12532ffd855b SHA512 89d502c575ce3eca774052417b14862682152ec06c3628ca19eb49bf55ac4c2d8fcfb1690fba83004b26615a2a887d4a2ca5f92fcb449d59b898c0aba5259224 WHIRLPOOL 7cae61734457bbda3ac7df916422a66b3cf2cee8340ec486b39e77a27d9c72ca0b71a9a6ac860186028c48bb385c094e4595d4d97087a3043efbbf4cd4a34ba1
+EBUILD agedu-20160920.ebuild 820 SHA256 ba5e4b89bf29524dfacfc7390d4e4c9654969636c057aa0aee7d1e3594f3703d SHA512 1f009819d0d6faa5520eb1ee5afe8b5909bd429c40c43b1ac016bd0fff1f7d8b6d7c4f95d4423571c6d25ef8c4794947f0141b957cb531e333726df3ce03d7f8 WHIRLPOOL 7f8b6b54cd989aa748eae231b4370e9fde88cf6781c3b55f8e7c2fe161364771fef2ed94f9ac40f0b1128968b6b8908bc81cd774fcf57fe67a3a976a36ac6b9b
+EBUILD agedu-20170831.ebuild 820 SHA256 ded09d64c6d761080750ca3a45dd06084a417abf002a04045a2871b420a2117b SHA512 0ee867b3ff0802f28d9ca7b919a087c94dbc1ea826b5be998fd6aea959e17b172543230cbd1e8f5b1fa2d3327d86465637c72a76902f6e89295bc2e2fe964fbd WHIRLPOOL 7a5b0b78a7187c19f16be02c42538ca8e4782a25a91f879bb5a84d5071a1bfe224ded76a08735a4b046f7833020672ecddf381f2d1a8bf811314ab11d1f01f45
 MISC ChangeLog 3224 SHA256 51dd74b822694d83ebd22ffb4ab3e12cafb108b6724b54306bfbb081533b52bf SHA512 71d2f09808d105addf4bb5d2f94b40a2cbb1f430c23e70074d310597e7fab205aa12bb6fd9dd613dbb2680041421545ac9e47df8573a634df36350e8762b0b75 WHIRLPOOL b4ad9dcdf0edb00d23389623d398be731f43cb62699c2a996f29ca7e0d00c07b79378d946abbd44b7ed0d52b5644829b6bb0ddc6e5cb430544d27e5328118a44
 MISC ChangeLog-2015 1261 SHA256 b2daf3dc7f0215fcd5277f4d63991af0ca5ba633436c67c22f0f9555ebd92cd6 SHA512 a170dea7e4779bf1a47f48ff1a6dc4632981d821cd77f77c0c31058d0743430f45939d8c0c007b1bce36f865befeb9810195a26a91c6adb599cdacf5e62c6e49 WHIRLPOOL d328e04898828db3e823a4d4e14d5d6d6757a1e478054ec53337f6d96cf81910100266098ce34761ab25913aebff9193acd7fe6bb467aec6ec5b6e0072edb253
 MISC metadata.xml 252 SHA256 a590e5133cd97a615db4f977b0e28e5c60c56cac76eb3d339109cdf379003b60 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65 WHIRLPOOL b209a730a169969b9e3c4d4612368bc5b30bfa5fae275d98d83ba96fd0ad01d308a8fed4f7d67a7c9fa417c624dfeb23ce89ab58923a8a0b5b1bd68ee73f288c
diff --git a/sys-apps/agedu/agedu-20151213.ebuild b/sys-apps/agedu/agedu-20151213.ebuild
index 4a021c7748ca..8c1929b12c22 100644
--- a/sys-apps/agedu/agedu-20151213.ebuild
+++ b/sys-apps/agedu/agedu-20151213.ebuild
@@ -20,7 +20,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc ipv6"
 
 DEPEND="doc? ( app-doc/halibut )"
-RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
diff --git a/sys-apps/agedu/agedu-20160906.ebuild b/sys-apps/agedu/agedu-20160906.ebuild
index ddf32f62b617..0246d0cfa165 100644
--- a/sys-apps/agedu/agedu-20160906.ebuild
+++ b/sys-apps/agedu/agedu-20160906.ebuild
@@ -20,7 +20,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc ipv6"
 
 DEPEND="doc? ( app-doc/halibut )"
-RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
diff --git a/sys-apps/agedu/agedu-20160920.ebuild b/sys-apps/agedu/agedu-20160920.ebuild
index 6a605001694a..4ae893706f69 100644
--- a/sys-apps/agedu/agedu-20160920.ebuild
+++ b/sys-apps/agedu/agedu-20160920.ebuild
@@ -20,7 +20,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc ipv6"
 
 DEPEND="doc? ( app-doc/halibut )"
-RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
diff --git a/sys-apps/agedu/agedu-20170831.ebuild b/sys-apps/agedu/agedu-20170831.ebuild
index 7ee036858146..8b2ec089f3f4 100644
--- a/sys-apps/agedu/agedu-20170831.ebuild
+++ b/sys-apps/agedu/agedu-20170831.ebuild
@@ -20,7 +20,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc ipv6"
 
 DEPEND="doc? ( app-doc/halibut )"
-RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 79bdf8a05aca..1e10b6e2af10 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -14,7 +14,7 @@ DIST coreutils-8.28.tar.xz 5252336 SHA256 1117b1a16039ddd84d51a9923948307cfa28c2
 EBUILD coreutils-8.25.ebuild 5839 SHA256 0d18564c2dc7106d9882bb4e7597c0fc910c7dbfb0e7a802ff23d8dc2ab57310 SHA512 86a917921cfd7c20755c2570c58438f7bfe923f8838e91508300a745a4417038cc81112a50972f288a02ff3acbb0405ac01784170fbebd62c9ac4c1e40294816 WHIRLPOOL 2e08adaa8f170ae83ab956867d576d7b105a02f109108e7af3d06fd152a553c9633e009ad699657f366ad2809743316f368d98b72f03e9a20be84b602709ac36
 EBUILD coreutils-8.26.ebuild 5858 SHA256 6d65397b7c880200051a618774f1097b51497e025d458fa196486ed4ed3ce2e3 SHA512 fc8a6d01fb2e3885b876756dbc0c4a78e0300d470ca2e845de5045f6dc79f8d004b7069ca5df40bfee05662bbc01d05107ad793c868e2b6451b757fb2e149e14 WHIRLPOOL 2e023cef38d1f28f433e488e0116f057041b6a4c0f0ec812cbba1c5c2a75cf1ee1a19945a0ab7d1fc9816a375bfe1c6a2cab4806422f4ac4444fc46c8980512c
 EBUILD coreutils-8.27.ebuild 5901 SHA256 e48b42c3d0eae8703c22b7b0d0d638a210e11c7caba036bfde9bce8871529f08 SHA512 a230b81b5913e0b98efe30f2876587178539c9dd462424c4eb71f5572fd496e4b0224f76cef92be973601f022f439ee36da393fabf4b70c2bfec71785321e8cd WHIRLPOOL 948e7a87be1e56fee5e879af681860dd5bcc9b02e30435d84117cc790b0ba5f368f6f49a6615246a061dc014f1a44c65ef293907358b0531957779c87c066c6a
-EBUILD coreutils-8.28-r1.ebuild 6499 SHA256 99c4bfb0b7d039f74eb28ad4fa803cd4980c26a3c5e235d8bfc9191255290396 SHA512 c7feae6878c4c89323b7461b78c8f14f38b36a1eef2e475a287c0e734b837dcbc5b613af181a8641d48fea6d4e83af25aab2c7239e3f609c481d6053f236b214 WHIRLPOOL 1082fc5e6832fab47350b7601bb17ac585fad49425dbbd3decb1a56b3e5d32e3fd6625aed40217c786739aa3b22768706b6419a56af17ebba377d2843ccf173e
+EBUILD coreutils-8.28-r1.ebuild 6503 SHA256 673e33a92d0ef181d33d7dc5d8fd2261ba4774abe1d4bbdaf9253c4dc452bb49 SHA512 b8a6bf562e2e565752f54f75b69053cd9e5ccdf3e232cfdfb0ab7ef0604a2a87c796368d2dbafa9f26b3ff7cad336ddd58ff5fb9b9f6b7afca90f29c72308fba WHIRLPOOL 6267f730f76290e174e9d098534c6cb24b371888a02bcf42ce7ac155ece750cb521eafc796e4ed74bb256be881c7926b44919d405bb638c968b19066e885bc6e
 EBUILD coreutils-8.28.ebuild 5869 SHA256 c42674858864cb12c270e9431888f93778bc2996425f97691b952dea08fa0c61 SHA512 8c98e0e5cee83a5d3a6c138fde77888dc8b6df45e16e2cb48f93bffd91391a957be2489656b95030c1be14f04400a98b4cbde258e4a78559ac2de24cd8199d70 WHIRLPOOL 1cc452904196ade41ee491ce83e92d3263e63b3abb2ecf2b05bfa9c52460fedf0e0609ea8edefddf3ec32054febfbd0ba23954d6b236812168018dcf4c976017
 MISC ChangeLog 7611 SHA256 95cfa59136c273c96f0197f728a444d3337cf408e6d974d07553188148c77d14 SHA512 a1a429745e1d5b7efb21b321abd21e1b064bde4f271bbd600f6be3dd32dced5e04cea1fe8a2bc9abf12fdadde55ccefea1257730d5d944f5dc1b97d98d25e4ff WHIRLPOOL 93253eca9c20b770912675ad30f312e803fc1bf8cd17f59e0fd02446298d4f327e8f9c90ab4c90636fd9b4bc0dcbaf3ba477b3ba86f6820ff4040a676e057529
 MISC ChangeLog-2015 57093 SHA256 368347193225a6204bd2454ecbdf549ca614cb8fc5e183ac14c2f767288323e9 SHA512 ef4eff9a3d748641bf1b745599e951308801e1d00d67c5504d17e4d740f5cd7f0c75cd5ee34c8345e8017ee8b6397b84a41df84b4f342ff899a04fd35a0c8f28 WHIRLPOOL 43464de8d0d85fa5b35797c95049591d0a225e4e6f0ab596d8c637da0538f0605c15c35749195fea181b9d5e6a75ea7573a96dbe9da70f28e131a47c913d43b5
diff --git a/sys-apps/coreutils/coreutils-8.28-r1.ebuild b/sys-apps/coreutils/coreutils-8.28-r1.ebuild
index 347fb80b1ffe..aa904a4775e7 100644
--- a/sys-apps/coreutils/coreutils-8.28-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.28-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux static test userland_BSD vanilla xattr"
 
 LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f23f90c04c9b..9dd5a0747fe2 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,12 +5,12 @@ DIST portage-2.3.14.tar.bz2 948535 SHA256 98eaeef4057f4c5a2251638428865d996ae2cd
 DIST portage-2.3.6.tar.bz2 943085 SHA256 2f57545fcb142a4b23c2052c523d3d858754b232be21455ee6c6cd3ff0903cc2 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055 WHIRLPOOL d0258c579597690e8bf2cc2a3ecc36d543e67a728c302a9b16ae361086023a7e059ac1a9e2e64f026b7d975d6b619d3b981062227042098ed3afc1b86658b636
 DIST portage-2.3.8.tar.bz2 938062 SHA256 19b73658dca848d215c5527d1d020c8106352007a84d7675e5efd0a7b9b48a8a SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8 WHIRLPOOL 0c576bbd8aaf8b27fa1746c863ac02b2a5f361d9011d17250ffbe4b830a8a6bf10a0aee48b5181a8aa6c55d8ad81ad411195da2a6253e9b324d3c7397053fe29
 EBUILD portage-2.3.12.ebuild 8220 SHA256 08733d496146447491d9dc76828ecca92f9bc2db6f1c0600735369276c24a28b SHA512 01c64f9252eddec365801614582182d509f969fd83889d003a3081df96f92dc2f3b707231ef74357fdd049eedef726e95304d3ceec0c334504ca186ee5cd0f01 WHIRLPOOL 71f49ac7ab731414fa5b2d149cf754ebeabf851bed1fc4ee0826cdd6aa5f582b717e87863c0ee5871d541108e208758394c8d7cea5affc0e4a045059a8d232cc
-EBUILD portage-2.3.13-r1.ebuild 8248 SHA256 bb513bb8e88bcbaa11a9946d4bb1985e55d9c729e534093cf2355abceedc0700 SHA512 44b673644b49393bcc612edcc52cb08c07763438a72ede800a0fa34b57bacbf7a2c2a48130545d442f49e1e54e57ba1e91fc79fccb2071367cfaff6f126ee7d3 WHIRLPOOL 09d757bf43828e7c306e728dbe9be7c031d9c3a5dde839ebefa3cf21cc00a71a10b1208366fda572eb953bb698c7d0b7c932cb9d9812e6a562a3880e1f4f3986
+EBUILD portage-2.3.13-r1.ebuild 8513 SHA256 a04a77731ed304eadd658490877aa101fc6094783e1179583a921714c08d7da3 SHA512 7125e74dd28e8067a2fc3f5e0a5d890e340582b7233dc68599f59e9571a8c118fcea6f1df3db9ba76e53a38f207e5acbb400d644cab82d54271072877a79e6e4 WHIRLPOOL 718cac30ab5b0d89f2339895b2c0f592a3463387b388752e3ae8a4fe1b3bedd5856823950d60a5aacb86507f84ed2021b42855a5bc7fcfe19a9bef9b44dcfa97
 EBUILD portage-2.3.13.ebuild 8220 SHA256 08733d496146447491d9dc76828ecca92f9bc2db6f1c0600735369276c24a28b SHA512 01c64f9252eddec365801614582182d509f969fd83889d003a3081df96f92dc2f3b707231ef74357fdd049eedef726e95304d3ceec0c334504ca186ee5cd0f01 WHIRLPOOL 71f49ac7ab731414fa5b2d149cf754ebeabf851bed1fc4ee0826cdd6aa5f582b717e87863c0ee5871d541108e208758394c8d7cea5affc0e4a045059a8d232cc
-EBUILD portage-2.3.14.ebuild 8253 SHA256 8fd47563b3ac22f300deb0278b61ba058802f4cb666f2eb8a27f97379756d670 SHA512 2c0d114a1d7fa7341414729a9eec7013fa66055cd57bdb9bf3bbf395a11107bff6cd782b41983704710074c6a69aefb621aefe8d53f081a241081c183683a2e5 WHIRLPOOL 190364431a933b80787f69a0b0feae74b32672c401d2113faa99dbae375441649368ac4df648ed173d2caacef3dd2f68518e75d64004cad50e066cf4bc111d30
+EBUILD portage-2.3.14.ebuild 8518 SHA256 b61805701ef3522a59ee7490a547336fcec2f8b49391988f910dcced04ee4fd5 SHA512 033c2aa757ba302c47f9f6d7c587125ea854dd3d752249082d771ed8f0ee9696fa414e56c47ebf374b64ee6b72bf9795abf49f55d7e8214ede998b09c2af2674 WHIRLPOOL aa14fb50c40812c68ba2bb9459700931f1b8728e353f2cd16ba07a4c54b810c9e330fb9da547b1055c66cd9cedb0c03dcbff4a833f69376b12327fcef60c2104
 EBUILD portage-2.3.6.ebuild 8661 SHA256 9590a689915eea31ffc5dd347154719d70cfb4b000a60e0f6e6294fe0c3e1df7 SHA512 53301757289cc37690020ac7b5379d026ff1e87f9d558c913eae213d0f33b75261045616c9259fe28684aa1031c27d4f58a52438e67eb91a97d186a80ad298a4 WHIRLPOOL c70770b2e9ac8b9af931d9f9918af82ac20eda198a33d9cc19c5d457701fe09c3cd5d45fb756457b05209cc0594c2b0b4efe3d544e1966d759c6a27fcf5b0743
 EBUILD portage-2.3.8.ebuild 8211 SHA256 39b5c3e56de53bb619091fe7a9a56e48ccc564fa281ba1e0d249532c96c2cfc5 SHA512 d803ac927d8a6f7fb00f629bca8a1bf94200d4ecbc83740afb32041b865dcfd13ca4329eda9693ceab20d2bcec30b132e23fd0b62cef262f246297f0d6ff748a WHIRLPOOL 22b8e205b1cd3683178eafc8359b3e8447279963cea00cb0276ff7a3e38eb3d438b992f48d8ad496288e3c8ebeaa95526711fa6651a8dbadc6cfe65fa344199a
-EBUILD portage-9999.ebuild 7792 SHA256 1777d7baf2a1b271a3817e4f32729efec7af829baee1f27f6dc4bbd5b60d06fe SHA512 f755b0ff97e511564725e35162124605ca02237469ea4ff327a10a22c33facf9632d67a19ee213e7b797050fb531c7a10593846cbba6c8f450bf99f5fde11c17 WHIRLPOOL d0ad49e69eefd185e4105528cdb04d6a11812c7cdea0b9b5267ba6d044a04595e53e26749d93e5c2cb24536e070d4a3fdeb17c356a40bc4e4e4a44e78b2e312d
+EBUILD portage-9999.ebuild 7898 SHA256 890737dda10f80cdb1d3188a0f24f2e0e6d106e9b9075bfc83dc9f0d1bab3ffb SHA512 07c97f2f8b2fdbc4e1494fa517c88eb9fbdfd3429b3e21e4087be9ae4e6cf3ce401cd7def881d32cb9f5e9f8e25515e776c866f050c0181f9ef7e2cbf4affeef WHIRLPOOL 8ead498c39415e2afbfe909355fd2fd0739c6283d3570ed44047f2944490dea57f19b9bf599a98ef8834abfd220ce3d19510c36bd1c67bb971c363b4fc9d72dc
 MISC ChangeLog 16208 SHA256 6196c5e06a7043cd46882ba3258ead8c490a89e650695d390b58f03d68639c0d SHA512 70e1da4a0b81f7c7fe902229d85ade010dfdb5e377f68577fd1f6d7ff75c92b6cc172fd3cbb171e18f40565e2679a14aab70b756e6eebce8f7076502ff9b2465 WHIRLPOOL 4b7dcff2f27e863ef276ee14ddb30adebd175c8a8913d1618c5fec36a9590d19d712878977b7c049f67730d15594a61cfb7839bdde35b30a697c540d59346706
 MISC ChangeLog-2012 133873 SHA256 157a7eb13d4cf2e2c94bfcb7e91f218af1ea88f5ff20c24a50546950a9839c94 SHA512 1241f4ccd7b31bdd340649417257b0e95202992feb66e0cd4d41fc2d35bf0baeac19680f34a831d2fefce0c0fec03aa6e7a191f783e59cf9b93aaf266f010a3f WHIRLPOOL b027bdba0f5ccc1b3a2dc18df92d82b473af5e55536816b7177071c1ae1a89e4d50d42c2093fa1bbe28b92a42014fbefbfc9e7daa4e6426ebecbd5bffc3d479f
 MISC ChangeLog-2015 66573 SHA256 79f5ff4870713087f1a71d78a608f7c63bd2ce52e9a9642ad23d88e4ea30c807 SHA512 6df0a78314635f8fc0f721a4acda85accfaaa4eb3cefffd90e1fadeec6a3290f813780adbe572e5cd2281be4d742627f893a88ded06413d88fb8f0c41b01890b WHIRLPOOL 7b0060b46d0f5637189f7e6f915576e2a51977f11ddfdb37b0aa0cf1dac21f869ba2ec80ff0a4e633b547668261284acbaaaf52a3015f4f676e860cf8d48280e
diff --git a/sys-apps/portage/portage-2.3.13-r1.ebuild b/sys-apps/portage/portage-2.3.13-r1.ebuild
index b4ff41814d5f..9cd003779737 100644
--- a/sys-apps/portage/portage-2.3.13-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.13-r1.ebuild
@@ -87,6 +87,10 @@ pkg_setup() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	sed -e "s|user_options = install_data.user_options$|\0 + [\n\
+		('htmldir=', None, 'HTML documentation install directory')]|" -i \
+		setup.py || die #638046
+
 	if use native-extensions; then
 		printf "[build_ext]\nportage-ext-modules=true\n" >> \
 			setup.cfg || die
@@ -189,8 +193,14 @@ python_install_all() {
 	distutils-r1_python_install_all
 
 	local targets=()
-	use doc && targets+=( install_docbook )
-	use epydoc && targets+=( install_epydoc )
+	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
diff --git a/sys-apps/portage/portage-2.3.14.ebuild b/sys-apps/portage/portage-2.3.14.ebuild
index 7ee7d2c75f30..e0d4b1ef1b38 100644
--- a/sys-apps/portage/portage-2.3.14.ebuild
+++ b/sys-apps/portage/portage-2.3.14.ebuild
@@ -87,6 +87,10 @@ pkg_setup() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	sed -e "s|user_options = install_data.user_options$|\0 + [\n\
+		('htmldir=', None, 'HTML documentation install directory')]|" -i \
+		setup.py || die #638046
+
 	if use native-extensions; then
 		printf "[build_ext]\nportage-ext-modules=true\n" >> \
 			setup.cfg || die
@@ -189,8 +193,14 @@ python_install_all() {
 	distutils-r1_python_install_all
 
 	local targets=()
-	use doc && targets+=( install_docbook )
-	use epydoc && targets+=( install_epydoc )
+	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
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index c7453d27b016..adb4f2b5bde8 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -188,8 +188,14 @@ python_install_all() {
 	distutils-r1_python_install_all
 
 	local targets=()
-	use doc && targets+=( install_docbook )
-	use epydoc && targets+=( install_epydoc )
+	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
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index ccad78fe9de8..c6c2b0d7e224 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -12,6 +12,7 @@ AUX 234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch 821 SHA2
 AUX 234-uucp-group.patch 536 SHA256 b3ef6c7d40d86dfc801ff7839876dcffb299d0b6d5b11fbf081adfe51ee0d8e6 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912 WHIRLPOOL dc9bbd2879af33a8ff27e7a13052c51b4ddc1b336bbd58ed0b5e28bb63229acbb355b6316cc58555b12eee8ed2d73ba25ee21286e8e0f429d6760e70dc6de5a4
 AUX 235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch 1280 SHA256 a448c39a3d172c03edf4ac303b02251d3c09a9d21c2512ae475c1a92905b97af SHA512 70dd0b3ed7926fc2406aae8fc592ba7bbbf9bdd94151d3045d94683921f2921dbe8184f7184e4e5a9cd4bf1556ddb93f20f741df3bead3c664f4c71757e75376 WHIRLPOOL bd3aeda654fffd90e2b49757f5bdc483284d034a78f134f3c2b1870f11f35d9604d6105b159ff9cd879bb82c57536e363d8bf8cbba1878514cfc894ca009a47f
 AUX 235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch 2620 SHA256 0211aba9502c23e51e154fccdad7712d729caea3869f969313b9dbf08474641a SHA512 52bf63183930872c44c0dc53a616c75a4ae37ffedfcf34b2b5e400994b334d311b2afcadd75e91dd6c37a88cab71e30d2d6690261a980ea5dfc056b67d7e2e78 WHIRLPOOL 1f3c1fcc5a161644785aae482d97e2007150d47beae4372fdb30805f291b33e21d2e8e16ea6bc4cc9cf8c0fbd3d8ddfff2504af1e568c519b2398411eca9458e
+AUX 236-uucp-group.patch 562 SHA256 cc40b380fe0bc3451cdd5040131bd9a499fe260c740ba75ab41cf140273ec6b6 SHA512 27a3f0a037494326674e9098eab96199d2dbbd84dfa94a7dd23df0bf7fc632d1ddb21643288e71cc64109342bbcfcc4d77add07348d70633ec1da7cdf2253dc9 WHIRLPOOL 24c0519eb4c06060e85fda821808d702c036cdbacec901bc09241f600634c5777831b226945a2d5f2616640c1394b1b89c33b98e207af93819649361d76ee7c1
 AUX CVE-2017-15908.patch 1371 SHA256 b0651db043115e8251a4efccad369f917d4e8ffcfdd011baa93f99ebea0e03ea SHA512 e3ca9cb44981a7a5d80a7ca63d6c9249e42dc5af1290ecfd472ec377db4ac372a18c3a3b6a99e1b7cfa322f7c00f0a755c916f67273b0b1e0a0e37957035aba9 WHIRLPOOL f19731b7211060ffa3154bdd227840683bcac2ae5fcd6b18b1639b92a5212a0ed6c69b29b0938ea3b9c90b3c8dcaa31db4045cef6f1bf5dbc60c9ae1eacffcc8
 AUX CVE-2017-9217.patch 863 SHA256 d56929985fcabfbebc15799b38a6e9e5b298b2de0950bd75e1b49f5ac68655fb SHA512 d323c6e79f60bb7abdb4583f021041532d1bf1514500d09d07b0a429b6cfb76787f590de04446ae84d51747b0023042d575aeb07da29e4e8c0ad13656a1877a5 WHIRLPOOL e2c86993539d40c8ab83c34c7fe0678be9a87741e66b7b5b8225a60e289386c5379ff42c8c1ab71258bb5b79d74a05c846cbf8875f8b511589983207b1791376
 AUX generator-path.patch 1046 SHA256 aeb236e19bedc17737ada8953fed61272423b36fd186ffeaff0f14addc488549 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3 WHIRLPOOL cbc5eb71fe2f61c95adefca78f29f1acd7ccb7bf9ccb7872326b2c7ed2704f4c856dd7456759c3320496995bef4f94d390b0d5f6d9b2585cb99c4a27faabdf2a
@@ -23,7 +24,7 @@ EBUILD systemd-233-r4.ebuild 13626 SHA256 0dc86e550d767d12e945975267f4a6ff6c4a86
 EBUILD systemd-233-r5.ebuild 13669 SHA256 6ecc5fa2a1f6b7864113e59972a3bf150eb836ea43d06c5b4f84fd1cb6eae325 SHA512 722307b55c7621f119dee2e483bb7271d5a460945bd938adee6e679345a3549eaf060c96493b54e7a5bcb94a2821ce31949cfaeb5b1a43aeef36b673ecc39d7c WHIRLPOOL f1e5aabea3ff94eb2ee4576b5d34fb411c8bda9f01293b9579215b0e51a8103c93149befd25543c68d20855f0eff9804da7074449ec0db12b93d59b6cff4625f
 EBUILD systemd-233-r6.ebuild 13700 SHA256 c904d0a2fdc4b366ad4ec28b8745454f210ee50b4657994a704d67de09cbd0b6 SHA512 fa4e5a7adb361da720263cbac6e3cdb177a37a16b1ae5ed828c4d106a8770d3a3b900a178bfc6198b645dc07980eb462d61a25dcac6d01d581ae2454e3d8711a WHIRLPOOL bb8214b8e5a19a8499971cbbf56af842c159e88c254f74c10b7be7172513ee8ea8330e2dff107db9b395d6a1b490c203ab153c6e10035bce58750b2afbb4896a
 EBUILD systemd-235-r1.ebuild 13401 SHA256 bde936448268da8906d49ae5d0032cc496c38c32830414059a715af514c4c537 SHA512 240341672cc795a7bce946e5d44f9cc30f7099d6954b352fa13e142d185dd1fdf1bd665eb510355c6317c81d29e491cd7d41b5d7b28c8860f092767ea81b4ce1 WHIRLPOOL 6c707048afd34b9d7f51823661a833e312c0067bc38b6de9ed2e5afc51c3cc7134017adfa25ddc6de9aa368da7ec375238f33ef9c7b11cc0c05b37218402e635
-EBUILD systemd-9999.ebuild 13196 SHA256 0e18985198be157839accf26bfc358a784ad2f3b9b596fd8636f461bb2320fb1 SHA512 90b0283fb318638e572edcd03d04ba4545ffef50ea877c97277b43db8ddb95b9784e834072a51aa3954c8088c4a946390f5f3b2d651fbc6c959c74058b606dc1 WHIRLPOOL f790ba07e2bdb3f99f905a5dfd027891b8337e661e0ca5f88cf414c165f3e7924f9ec584e8b6baf2d8bcf053b49583d0bcac2d19e7acdf0d175fb5a681c4bdea
+EBUILD systemd-9999.ebuild 13196 SHA256 323d392d98a01e2676d0d70e8733870b746753bdaae201f86419796b3cd76ac8 SHA512 9f6b4de8d3cc40fefbf337155094c8f1c9d131713467ddff20fa4c19e594c5eacbd0096ec0e93143b8f26e540976700c2cca8aa6206e4c624034506183edef3c WHIRLPOOL 06bf8d32562a38b95aa7211eb42902a4611e28aa5d94dfb6e9ff31fce2ecd27f75fe7fb555f730e954909b76606558999e7c7244e78350b3512ea57344c05748
 MISC ChangeLog 20141 SHA256 b01beaf5824021996a73fbd2fb1749b390e13c13eb309d336934fc758a73fd57 SHA512 041097f0655b5464023c1365d6e2813def67ffcdf6d2ae28c48497280bf3ed1ba49fca24ef661cb30de4af97ab1cee53575b4f51cb985fcc700535f3d4432481 WHIRLPOOL 854111ca90d15661843afd4c026028949b7d6f8916e750a2537f22993225aef0ef4076c0ff3d818609a9b166ca926ba152e26d2e3d30510a646a5bcb6b5c04fb
 MISC ChangeLog-2015 69416 SHA256 10adffab2046e41857e68c45b411fa011fe6206cf8d4cab42db78562cecf6bd8 SHA512 bc8f0ad8ebb6a31db74be738e97d9cd1183c0cc394615d90bf15633a315778557170bb93ce7e88b63bb93237c1a748f6f3d0ab89539f014d319f30ba9a0021fc WHIRLPOOL 7052513a02364742e297fea4c595da7045b5b6a517a397314992b7cf87f40d9ffa16383c6e413d466fdfa3173e9e8769257cf46116e4808fad7ae5c0f7990296
 MISC metadata.xml 2242 SHA256 bf36eb284ac3dc4d6720c2ff98e995a031866055225678a283c73bf420bbac4c SHA512 ba6691a001c80d3c273977b703e08976b81302d3056fa830776f7462efecb2e49deaaf574d5abcc3a4b7480e1dd810eb5fe66faed65e130a6d5279b1ed387619 WHIRLPOOL 081b145d6840d2794f61a653b0a7d3ec74ada237c98509f0fef2401db826d861ca4615d1b1dabc6e601b72539d80a243b57d163a5e7cd03e6e151a68f3bd6d17
diff --git a/sys-apps/systemd/files/236-uucp-group.patch b/sys-apps/systemd/files/236-uucp-group.patch
new file mode 100644
index 000000000000..9c53b8b18ab9
--- /dev/null
+++ b/sys-apps/systemd/files/236-uucp-group.patch
@@ -0,0 +1,11 @@
+--- a/rules/50-udev-default.rules.in
++++ b/rules/50-udev-default.rules.in
+@@ -22,7 +22,7 @@
+ SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620"
+ SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620"
+ SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
+-KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
++KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp"
+ 
+ SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
+ 
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 9f58ed53ab21..8256350c5e12 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -155,7 +155,7 @@ src_prepare() {
 			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
 			"${FILESDIR}/228-noclean-tmp.patch"
 			"${FILESDIR}/233-systemd-user-pam.patch"
-			"${FILESDIR}/234-uucp-group.patch"
+			"${FILESDIR}/236-uucp-group.patch"
 			"${FILESDIR}/generator-path.patch"
 		)
 	fi