Sync with portage [Wed Aug 1 21:31:00 MSK 2018].

2018-08-01 21:31:01 +03:00 · 2018-08-01 21:31:01 +03:00 · 5d2e9cfba1
commit 5d2e9cfba1
parent 6bafb09fc7
3595 changed files with 14970 additions and 16156 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 28805 BLAKE2B 02cd69cd767fa1492dc9ef0c7a05789988ebea1c6e937b016d1142708aa847ea08d2f04e90661dc6fe712c446087480b95523c334dcb737652da5f085795fa1c SHA512 e85703a7d9e7c7457657c2ca922b82be8f8db74be7b03e17dc8502010c0601eea59531c2ecbe9c8ea466fa385f79b9401e55e04bcd5b874f02d84fdd8ee6e5cb
-TIMESTAMP 2018-07-31T07:38:39Z
+MANIFEST Manifest.files.gz 28816 BLAKE2B 9a59e1901a4ead639e5dc1d3ae52ac949e4687ead9cad0b2b85dc41ab949ad766c73c22268bbff33415b8be14ed1451afa37494c660708d7ed41161dc2580ca5 SHA512 d2730c9f06935dd6c4d33a2c532415f94da9228a71a7081deb11a746bffa0899747684df32799eeafac9c778a37b7142e3452ad856593b35fe452eed94c40a51
+TIMESTAMP 2018-08-01T17:38:46Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAltgEf9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlth8CZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDgAg/9HTZ6hhWXkBLf7WpKMXsvMnxxW42awcsWipk+Mgc69fnk0eUIMcDoy4Oo
-kr06aMJHEfoi/ht4pob3O+YNBUWQZUYadmtF1csu6MEIWAZdxQtzwVUfmve8Dz17
-6M9ANliU1l/W112t0B3xRWHGqdWWtko86s77lrqK1xniDUSr5ytpSK3W5qOsRUE6
-GwFxpnMdm5u3whOQk9gsjNu0wdIDhtuOa9YFjWnHwmnWmWZwSnsCCRUp2/dHwUKD
-HWvv7L6TEZvMtQuyTsACotgIGBTh/eiFmrYZ1N4/9dPlsTwlaO4pCwqVcUw8F+wS
-E8lJY9VNpT/39qX+iekpC7ki4MYItsoPgxA3sDJRX9m8OcplOXyuhAncBvPIiXl1
-Xr4Ky4in9wfqWT03PFsJl96XE0NzdHg+ZYNyZP8N3jGiS/5oI3EwmqqNT8NEgXqP
-Bt0/qRGvJJg4paBg67d0jx9gnNcosNJW4+FwTmyoFjvNPTmriDgOP96uYAS7DPlM
-HylvFPSvsQw2OPVkMbMOqZ5Vg4NDn6gMxhvChGivPMqpp3M0Di1XBBUFsFsHl4pV
-ZOOVbFBABYNXOJO5Q4jlJw9Id8EUgL4F43JUMCsJRnpY2FY4Ei+UPYoWHzt/1PoG
-/YVvTDkdFX49NXvgj67kO9UENjAFsZ9qC0DHWxzdjtKtZMcI6Oo=
-=uF9u
+klDLmA//ZAJQhzzyNK3lPtNZcREMY4nMZ8MvdLF1SQ5gdhMHv4VgAgK5pXQUvcAG
+/tKsRoxLayM0gRHPXmDn/Q4F4TzQh1D5GdjDwIrN60Q87W+qkNyUTPReg9mHnaOl
+1qREjeD/Upl34ysqF3FPmvIp94id41NWqOWqsrJXNoldTJAZthdSodnYuRzvvUEN
+3Rqt1jRoYta6OmNX7dOzlvyYCYJk10qx7xlVHnvsdjXyphrgPPWfbDNKFfc1o/2l
+a9KhH++2OhBjCsDmtPH5J/oRCXRcr93aoJz3pcTehiHyQU78agsiHZlWVBIyimwZ
+kcRth1NT/8Rh8wo+7/P8ryW/1WVDspSxjQ8LfwcXNV2b2IlbJTgYQrasHiWSJ6/6
+dVrjiA+3pUYm7pvGInLf8s7gEuOvlGjzByYee+UCAQNE/zVh22qcWuou/0SnJwb2
+u8qJX/mslyTtifvqexoAg9LC3a0WvLqZuhH00aEQy9SKuAzzsBI4A1rVN2fElyws
+Em5H1q/X0bTnIkvYnS99i8z5EpAmTdiQ9oI1L8B2E7Noo0TLlop/7dMx33uJVell
+YRnxrCrtf22s7FJXT0B6cFxX8Mc6GKwn1GlQf4OKHTLsj5stxs4E7KnlJINkc2PS
+SyzXYVvg6uqg+RVyUwyj3oUMuq8eg9l+iNLgEFarYeqAvpWcT5s=
+=cbYM
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@ -5,10 +5,6 @@ AUX consul.logrotated 85 BLAKE2B 8f3212c58295d57e9265dec26b9bfe562c47ca168442180
 AUX consul.service 354 BLAKE2B 9996b9d6a1aab360a3b46518e2091e8f30794f3bd3d113a3e9cbff2f4ff8a4cd014475806bd75feb6948c12b60846a403e35630820b814032fadc9a664985b90 SHA512 537d35e5a79d40dc62f6eb04f4631251d1e6dd62f2bd7d5483274903996052705db5fb4026000ef6e768e3dafb02f155c5bc1fd15a32813ecca8b1348a95e92d
 AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e25606fb97b252be16f2d3f50630092be39be378821f7e17e4914557a55c620156e7d07ced151d1f977689 SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b
 AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d
-DIST consul-1.0.6.tar.gz 8211299 BLAKE2B 7ea5df497f4796e572a86127e0854935f97439504aff82fb697f33700e9d138048772f32f171dbbe4f1fb4d1ceefa7ca96cf3dce2a22cdffd4e1906f6befa55b SHA512 c55f09272859b828816ddf548952769172331c22be8a70a7f73ab9362744fb1f4bc5fdf81955a0dbc4101584cf3660f182620dcdc56bcf94b42dce644be232a8
-DIST consul-1.2.0.tar.gz 17187054 BLAKE2B 5e8d1151efe1e8ad5932886367d0012774713081aa2725f10d45af1e05751e328d76471ff3cbd85031c252c65cde0137f96c3ef86eca7e3e7f6b28e2d20ed0d5 SHA512 1c018a5f35164a899a086ccdae94cb5e6e2a490e4c788d65b0026dbf448950d0c1038b2d61cb10f5e8c9ad22a1affad64dd4a7086b59dffd115d40aa7b3d0cce
-DIST consul-1.2.1.tar.gz 14819500 BLAKE2B debb7ee5b8016527de0ebc680b228a9749435db4364e8d6e0160b1a20e2896dd4109edc5930dad961ce18f79182dda0c00a52a567ea6ff2d267b17448df2129d SHA512 5b5d8b62056c305f7388db50b54427ed21c41fef6d1b5f67da845a66bece35454e9f538bb0df59bc86788826b6cd20cd6179552060482908fc5cbc4a048c14a8
-EBUILD consul-1.0.6.ebuild 1578 BLAKE2B c32a67c19567b1b601bb6f272f6e435f9600accb4a41a03e774c197bb8f743d67c8fb4cc9e97c4829fb1bfd21eceed9318cc3f8e31217f89d57fe20c78f71054 SHA512 c2abbe3e57e2939832f443b2df5a5c3fad3fae197a5e96f6ed116f2c235a9df882848153f1928be71b5845c38256d99e1cceaf76c88efe30470495f0ef765572
-EBUILD consul-1.2.0.ebuild 1531 BLAKE2B 0d3891c096bd5a7b33a0f7b7969c7b27ea8536a1f1b608e1d119c1096734cf232dedf4ec38a011a39676ace9fa44de6ae8a58ad594f3d3fdd3093ee580e8509c SHA512 9ba4ed9ebb5c77b7ebc8daddf4346b8d14fca664eed894ee61c3aab06918d07a6a5156bf9717006009e65ff72c9954fd653630b0a16ab3ade5cbd9a36ef5005e
-EBUILD consul-1.2.1.ebuild 1549 BLAKE2B bdc1cd6343ac29a314886b52ce3bf9258d2d64d6c7b777d015e5ff4088d9cbf66ce4f0f35d187407342e4fa7c0711864e62e2f061fb9ce46b83ce169ae45fab0 SHA512 d738514b3177a539e266b3eff06d167ec9ec9e79da23df8071592dc4d6bc37e1eeafc2297f171af404983630272eda3211eda76b10f3fd491fc3ee5f89f81032
+DIST consul-1.2.2.tar.gz 15789375 BLAKE2B 8a0af370568f6fcb90334b147bd84e479efb682ed6c58d63dd56f3554f9e6538d37963ac825bb8598eef8948492feec688b8266733223d1557dbce9704daef35 SHA512 715f69e7b36d0070ea4e602dc50f51aa2547dbbbbb07cce985da79d1e201c6e84dade8a7c810e3602f88cfbd30e063669076954d2541810a18a0c9e7c9ff8458
+EBUILD consul-1.2.2.ebuild 1550 BLAKE2B 83bbc84358ac1cd5854fd6325b62a517e6da51a0cb8d4cce6b5b94278ca4ffafaa74f3232d4d6556ebc6611b4d71608e028f931a72a10536698cec17a7322203 SHA512 bb60a8d056fe2dfbaff0eb0de014af536f9bdf8e5e8a76b17174acb19ca005530eb8811b8357097fb4a469acb0c6751337c8e81eb99fbbd156111aa1040fe4ee
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
--- a/app-admin/consul/consul-1.0.6.ebuild
+++ b/app-admin/consul/consul-1.0.6.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/hashicorp/consul"
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="dev-go/gox
-	>=dev-lang/go-1.9:=
-	>=dev-go/go-tools-0_pre20160121"
-RDEPEND=""
-
-pkg_setup() {
-	enewgroup consul
-	enewuser consul -1 -1 /var/lib/${PN} consul
-}
-
-src_prepare() {
-	default
-
-	sed -e 's:^\(GIT_DESCRIBE=\).*:\1v'${PV}':' \
-		-e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e 's:go get -u -v $(GOTOOLS)::' \
-		-e 's:vendorfmt dev-build:dev-build:' \
-		-i "${S}/src/${EGO_PN}/GNUmakefile" || die
-}
-
-src_compile() {
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GOPATH="${S}" GOBIN="${S}/bin" \
-		emake -C "${S}/src/${EGO_PN}" dev
-}
-
-src_install() {
-	local x
-
-	dobin "${S}/bin/${PN}"
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners consul:consul "${x}"
-	done
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
--- a/app-admin/consul/consul-1.2.0.ebuild
+++ b/app-admin/consul/consul-1.2.0.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot systemd user
-GIT_COMMIT="2814197"
-KEYWORDS="~amd64"
-EGO_PN="github.com/hashicorp/consul"
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="dev-go/gox
-	>=dev-lang/go-1.9:=
-	>=dev-go/go-tools-0_pre20160121"
-RDEPEND=""
-
-pkg_setup() {
-	enewgroup consul
-	enewuser consul -1 -1 /var/lib/${PN} consul
-}
-
-src_prepare() {
-	default
-
-	sed -e 's:go get -u -v $(GOTOOLS)::' \
-		-e 's:vendorfmt dev-build:dev-build:' \
-		-i "src/${EGO_PN}/GNUmakefile" || die
-}
-
-src_compile() {
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GOPATH="${S}" \
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${GIT_COMMIT}" \
-	emake -C "src/${EGO_PN}" dev-build
-}
-
-src_install() {
-	local x
-
-	newbin bin consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners consul:consul "${x}"
-	done
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
--- a/app-admin/consul/consul-1.2.2.ebuild
+++ b/app-admin/consul/consul-1.2.2.ebuild
@ -4,7 +4,7 @@
 EAPI=6

 inherit golang-vcs-snapshot systemd user
-GIT_COMMIT="39f3f0"
+GIT_COMMIT="e716d1b"
 KEYWORDS="~amd64"
 EGO_PN="github.com/hashicorp/consul"
 DESCRIPTION="A tool for service discovery, monitoring and configuration"
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@ -96,7 +96,9 @@ DIST github.com-square-go-jose-f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz 2
 DIST github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz 7860 BLAKE2B 947a33bd0363cfa5333e4e41b59c8c758fab173bb9e0eef5560caca74f4321041ca69f6c2c5fe02ab36c8946038866033d8df9b7f9ed36be9f3fb1eff6dad182 SHA512 8b372ceba1a16acc8553c74d4872b042ca352d4128abc1e9f4aeb90f8489b7871d7fa7f97a6c4e8f472779d3a082f00e6d2ea30048a7b1bf4eb07fb544e45613
 DIST github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz 7897 BLAKE2B a2b6f62fea8cb724ebbc9658e37985ed27fd1c395a838b6f8f89bc3e05106cd3e89b86753223bccc50de210461c89b01d8e3095ae1c6dcb6bc9a655c462981f0 SHA512 460b1cbef7d5236b099a67b27e902f9077fd42d6aa3772c13c1c3ab20fca87719a770478a068bf150e1224612fe4e1eadb1ec7cdfa60ca9cc81e3f6de62ee9c4
 DIST helm-2.10.0_rc1.tar.gz 1151238 BLAKE2B a33fa6c547824ae1497e04110e9f3d74b1ab4bb6e7e1b7a598e8756ed76993bf969ae3d066d5d006393ea095e75c06b3ea5d8ef360111a2804bd5ee63b8b1bff SHA512 05b40169c0c0920cdb339a17526f080db25bde095c89415d0229220c0e19fca05e60cbddc7d3f66f5e701c52417d76251266bceb7293327985912510bb03b2b7
+DIST helm-2.10.0_rc2.tar.gz 1158443 BLAKE2B 012d38a7f565a43ba852fbd5b4958d154e818f2acdbcf269894dfad6f097bff89bb847df5fa6624b2a93771058c543c958a8aa46c65f91468d803e48f774eca1 SHA512 ff51c29b048f7a0360f498724153e58406b1accbd01f1dc92d23ea706fe24757990b59e23e2988e7b1d8ce67f31672559a1f2ef1d0e002fedd0b831d9fe77831
 DIST helm-2.9.1.tar.gz 1136941 BLAKE2B 57e319df56d60b1285df99ee6c0213e9700b80aa4117f11ab3e37493d552481875a42acd200d2183c2e587dc13130b9c47cbacee7dd7bfeaaf4dc9bb0a17dcc5 SHA512 c9830ae3de76e219dc4effad749fa6f80d24f47f034bd7150afc5817700947b678db64a0889fe1e3c3c69ed0932933ebf9bb893c065d7d77c2953190ab15b033
 EBUILD helm-2.10.0_rc1.ebuild 8581 BLAKE2B 4398d05cd3dacee15e455549013f383b397b81147ad4e0ab1fe565b977bb3f3973b2aed098603ff7b33ef06efba225efb054178f8ac8e63922d4788da29a8118 SHA512 f9de15ae8b44f1b9ca941c0ed697e76b832c59d05f0a8b10f1c8f99266bd5e79e4253e4223b62fef466f86b040e90404160da7bbccbd37fc2ceeb4472557b3b5
+EBUILD helm-2.10.0_rc2.ebuild 8581 BLAKE2B 93b4f2decf133729f3068d9addfaeec2c361986ad630d702de6798dfd26bae0bb4c57a28e469a4bdd12acd11ab1244d7dbf77c2162cb8b4afeda5500f46602f7 SHA512 8d2e053ed91e35abb2864ab775061c4c5c2e43ad6ab06cdd83be5ba4c36b768a2ddca6f02439fa96624942a606e99489f0514661ce55174080b36c5d73bc39be
 EBUILD helm-2.9.1.ebuild 8410 BLAKE2B 266d13ec9488fbc344e29c577238d5980d10a8c6094cb6f41c6127065ff7b899bc609b530bc0cd87816d71424492c87634848ce26002954a09fe60aa99578e42 SHA512 b21df5a0c6f9a1d13404a128c1466301848216386c74e143a04f1567bac648efaf727d22ac7cdb1a943c8edcdaa3ed3b5cc440c8cd664ddaab803514b4ba44c8
 MISC metadata.xml 325 BLAKE2B 2c14b657183fbfb11e64b4e00d5fe758cc449191f675b9359c940f2098446a08310bae27d291e268e8ee22cf6a0435ae2065f1e50d961bbd16804890bcbab5c0 SHA512 7021bdc2264f99d038b05085afcb1de80bd03e705e4c286dc81e0aa486507ceeef102340d2c49b74c2b7aff87c7ae7bc96caf4ab0677f9dc22156b7faad0fce4
--- a/app-admin/helm/helm-2.10.0_rc2.ebuild
+++ b/app-admin/helm/helm-2.10.0_rc2.ebuild
@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="k8s.io/helm"
+
+MY_PV=${PV/_rc/-rc.}
+
+EGO_VENDOR=(
+"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64"
+"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
+"github.com/Azure/go-ansiterm 19f72df4d05d31cbe1c56bfc8045c96babff6c7e"
+"github.com/Azure/go-autorest d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab"
+"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
+"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
+"github.com/cyphar/filepath-securejoin 06bda8370f45268db985f7af15732444d94ed51c"
+"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
+"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
+"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
+"github.com/docker/docker 4f3616fb1c112e206b88cb7a9922bf49067a7756"
+"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d"
+"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
+"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
+"github.com/evanphx/json-patch 94e38aa1586e8a6c8a75770bddf5ff84c48a106b"
+"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
+"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
+"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
+"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
+"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+"github.com/go-openapi/spec 1de3e0542de65ad8d75452a595886fdd0befb363"
+"github.com/go-openapi/swag f3f9494671f93fcff853e3c6e9e948b3eb71e590"
+"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
+"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
+"github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"
+"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
+"github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud 6da026c32e2d622cc242d32984259c77237aefe1"
+"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
+"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
+"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40"
+"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
+"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+"github.com/json-iterator/go 13f86432b882000a51c6e610c620974462691a97"
+"github.com/mailru/easyjson 2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
+"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
+"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
+"github.com/Masterminds/sprig 6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c"
+"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
+"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
+"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
+"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
+"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
+"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
+"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
+"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
+"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
+"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
+"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
+"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
+"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
+"github.com/spf13/cobra f62e98d28ab7ad31d707ba837a966378465c7b57"
+"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
+"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
+"golang.org/x/crypto 81e90905daefcd6fd217b62423c0908922eadb30 github.com/golang/crypto"
+"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
+"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
+"golang.org/x/sys 43eea11bc92608addb41b8a406b0407495c106f6 github.com/golang/sys"
+"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
+"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
+"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/grpc 5ffe3083946d5603a0578721101dc8165b1d5b5f github.com/grpc/grpc-go"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/square/go-jose.v2 f8f38de21b4dcd69d0413faf231983f5fd6634b1 github.com/square/go-jose"
+"gopkg.in/yaml.v2 670d4cfef0544295bc27a114dbac37980d83185a github.com/go-yaml/yaml"
+"k8s.io/api 8b7507fac302640dd5f1efbf9643199952cc58db github.com/kubernetes/api"
+"k8s.io/apiextensions-apiserver 898b0eda132e1aeac43a459785144ee4bf9b0a2e github.com/kubernetes/apiextensions-apiserver"
+"k8s.io/apimachinery f6313580a4d36c7c74a3d845dda6e116642c4f90 github.com/kubernetes/apimachinery"
+"k8s.io/apiserver f7914ed3085badf66a1b6f3a5218ada28f7bd084 github.com/kubernetes/apiserver"
+"k8s.io/client-go 23781f4d6632d88e869066eaebb743857aa1ef9b github.com/kubernetes/client-go"
+"k8s.io/kube-openapi 39cb288412c48cb533ba4be5d6c28620b9a0c1b4 github.com/kubernetes/kube-openapi"
+"k8s.io/kubernetes 32ac1c9073b132b8ba18aa830f46b77dcceb0723 github.com/kubernetes/kubernetes"
+"k8s.io/utils aedf551cdb8b0119df3a19c65fde413a13b34997 github.com/kubernetes/utils"
+"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+GIT_COMMIT="56154102a2f25ebf679c791907fd355bb0377f05"
+
+ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
+
+	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
+	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
+	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
+	popd || die
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN} bin/tiller
+	dodoc src/${EGO_PN}/README.md
+}
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@ -3,10 +3,8 @@ AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f
 AUX vault.initd 542 BLAKE2B 5e28a00356c010d34458c6f64d2bdb0736673ae552bec809cc5e23a1613e44cd847b4df99bee652a99cb6fb84443d5f9c5c1fba1c165d946f1c93cd8ca31ffa3 SHA512 ac13c688e006799b607c44e94fbdf922befc62131014b714a93ca4bb0205f5f012bb3e4814eeeb47b31034f5c35b187fc8ebaeca02bd02430c5842bc9821f29a
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 409 BLAKE2B 1e34e7bb4e5d52949b1b0afbe495aea00202ee599db1b1737bd81c5252a6d57efd2a5c98e4dfaa4d632bb664a467414e644ec751921ced20f5e4c40b27222eb6 SHA512 2c4c7c395ebcd06e70de57d93384442ea88346cc2815b509966bd9f12579758e5f43d9a2ca1158e3b25198ad0c82ed9cf5d453f3cd7b5873011b3b13ec60196c
-DIST vault-0.10.1.tar.gz 13001413 BLAKE2B d4dd663062062c55d110b165c1369a8a6f44c91002d564680ed008fcea2ce1e26ac24773deb951a46a7d9bcce2234e3b1dc250a957605f3ec82c781ac2e46b4a SHA512 dfa2d81e0e51cf41694ad40ad9bcc6847a9261ee06b2787d59915b941a63bfe58e649271e1ff5a963b892af5c13043057f29a1a8412efe51b3cf54157c54a060
-DIST vault-0.10.2.tar.gz 15861571 BLAKE2B c1129c6f87fcd00aaf8fecaf472e33c6872663cbac1e778e3d1af9ca7978501fe9ca400cc6d79224f9f0df5912909218dfc2ff1547144b3a94fa9f10aed89534 SHA512 ce24d0c3c126bd8f265542c97dea4f0a1c56c5003e74b0aeb16aa462c326aa360f169e0bd08a4187480dbfcf1a052249f4dcf5a5bf356c4c901676d1b55c67b0
 DIST vault-0.10.3.tar.gz 15902247 BLAKE2B f69ddbe1309800cfae756f8ca1dd0da3e92ce49a1ec70539dc30785344afb7fe39472dcb2fb5ee4f410c7b52b13b00996b08d89624ef8523adcf4f809601ad5c SHA512 baacf549f9b73d306154dad6cd6efb3fb0eca3280c885cd772dada524cd436c1d5f1f705118274aa7cea6002cd8e0b86f1dfb02c4f5787d08dc535112cb62096
-EBUILD vault-0.10.1.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
-EBUILD vault-0.10.2.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
+DIST vault-0.10.4.tar.gz 19207588 BLAKE2B 035e83c1d119b266817490afd4506fee5e5ceeff8a7c59188c59e28067f06e78f57e06d200026b288908f49a19ed22ebfd67e08c3c70026c7da22d05e33ec343 SHA512 7331e49c2bebbbbcebc74cfc1ce7d6984590fdd39b47f0bbf1b610cfe37b900a86b8ea63bc5d5e28ba34b68433944486979177aee6c10bf188095f5a50a4b61a
 EBUILD vault-0.10.3.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
+EBUILD vault-0.10.4.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
 MISC metadata.xml 306 BLAKE2B 882a83701d71a45cdc6fc00ba3da98ff7d7439c9f81ef0aa1655c49bd5e79b3e625858d33f4ac6d5157df6ef74c5dd00a2b8efb1fd5ee45f9a0ed785c90d8ebc SHA512 d1fc4040379fb33c7f193f37a1c044000408e47c9df8b17771ed7cb5194f9d8b8c062b8a6804e72fb5a666683a8d5b49ec5a6328394870d9bdc1b7f3e0e4e787
--- a/app-admin/vault/vault-0.10.2.ebuild
+++ b/app-admin/vault/vault-0.10.2.ebuild
@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fcaps golang-base golang-vcs-snapshot systemd user
-
-EGO_PN="github.com/hashicorp/${PN}"
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.10:=
-	dev-go/gox"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i src/${EGO_PN}/scripts/build.sh || die
-	sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	mkdir bin || die
-	export GOPATH=${S}
-	cd src/${EGO_PN} || die
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	dobin bin/${PN}
-}
--- a/app-admin/vault/vault-0.10.4.ebuild
+++ b/app-admin/vault/vault-0.10.4.ebuild
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@ -1,4 +1,4 @@
 AUX stress-ng-0.09.31-makefile.patch 1860 BLAKE2B a5fe82d643f79fd74303de3528a25444914e0071d9e43519c567a38c6f7956bafac3b48b12ed4d74abec9494fec70521a7e1e065905651de979f0051a6ade6ef SHA512 87fde07ed850f5761fd73bb147dd0d0a0781f190dd20d9cbfcc79013c5c8c3e5c1b1217f5dc20b596c9a8482b209f2855fbde73984249b156154eb87df273f86
-DIST stress-ng-0.09.33.tar.xz 354140 BLAKE2B 301af9eb7b805619d2e91af205e6b8e1e47fc24de0b99409627a0d0b7b09d3512fab27f4b89676ffc298bb9ee86074518c919016b389e88dfe0e571ace6df397 SHA512 2add6dd17e64c7a324143f00a1e42fc3070448575bf3b65a1a4d0d261748546410d1c024ec4320249600e0c99867bfb42bbac987f297d080802ce9977240efd7
-EBUILD stress-ng-0.09.33.ebuild 679 BLAKE2B d3489ae39f79b3a064b6ccdd7bab945e1e7c2d8447ad9ebe13b405cfb21d769fa57a1e2c987429546dcfdc232905661bf7b0c5ca5fe907bee3a1619c9457a2e6 SHA512 abaa37e711a7748dab9a501fb487e634b2560aa781545cccb4f0714efd90002d4659b93601c508b98832fd2d8526ab7bf3a47f12035131cb9102b80f4bf913d7
+DIST stress-ng-0.09.35.tar.xz 353748 BLAKE2B fb1b111960bf383fd24e4b855a4a2e41c8f838c8eb869aaef8113f36020ceff0c657063f77b89d7a78c15981ca7fa79214ef671311e5989dd2dc9a8203d83782 SHA512 3d685ac6ed20437ad20859e9a3881426111dc966da5bb999bd70dc651e879fe68564f32099664b84c09422deb905020a6b17197e286e7a9315f2cd55959091c6
+EBUILD stress-ng-0.09.35.ebuild 681 BLAKE2B 7d819ff63bae78b55ade23ccf680fad63382ba39f88614c2cfb56d1b871130c0714bcde50848bc8329006c7bd00004e0fac5fb290b6840ed2a2a1fae9a20bf7e SHA512 1a33939cb65405e390a5e96052eef683d879ccd28506d4bca5effbf86de16cc459b0773e70707b310707cb448b2da762cf5411fe4eeed1634b08211c10d89ec2
 MISC metadata.xml 796 BLAKE2B 746809bd51f5512246e29a1e15d9b41f3cf0df968b2e2655dcaef7bb839aff27ce2cefd4818e79fec18b9f12c7902bdd0440c634f9480da2352108950554d636 SHA512 47472bafada342a449ad7d3632c2b0859ee56f2eef31ca3ca9e7af1e106126ec7858862c67baa6b8d16611e2dd3ac166ecd931bab3491c875088e4bd66499aa6
--- a/app-benchmarks/stress-ng/stress-ng-0.09.35.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.35.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI="7"

 DESCRIPTION="Stress test for a computer system with various selectable ways"
 HOMEPAGE="http://kernel.ubuntu.com/~cking/stress-ng/"
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/codecrypt/Manifest
+++ b/app-crypt/codecrypt/Manifest
@ -1,5 +1,5 @@
 DIST codecrypt-1.7.2.tar.gz 446975 BLAKE2B 40b7f97dae84a0fd621ee19c6bfeba47b781a7f856ce9c077445d6387b75b97dce0fc02ee9481241b246b0eb7de6b44ac014a708a8ceba629828ca9d63b8e24c SHA512 4ad2ad9e665e486e353b48efff344436b276eac2dcbddcf4330796b8f1f06284eaeec9c4f4ef63f61e4477c3bce0973f60f76291dce11bee31a75658bee6a3a0
 DIST codecrypt-1.8.tar.gz 471273 BLAKE2B 30547c299689547b50e2742e12dbfd32f420217a81813446b36bf5ea52929ca1f3b1968d76937de17e0f003c82186abfa683a6e30dc1fa5dc2ffe89594827ae4 SHA512 0e452f4e93498faa671a5927a3dd93b6dc66cbda7eb71cb33a509f8608573eff5ac8fed0d5e09911e03c153b88c9cb1bb54f7b2aeeb7b6c31eec918ad9685102
 EBUILD codecrypt-1.7.2.ebuild 672 BLAKE2B 525178d3411173523afa24e0df3fd117095f34fab99ed4d8666e2be34b7408de6311b06088a8cdcdc4dfc43f179c86abc70ed769aa0dd978ae5e3ec60730d176 SHA512 a43435250a021b7418bf2e5eb1573237bfda0690bd65e6df597700dd9ef3bdf7ac316ae164bded683e8e7412fe1e57bf7428b0f629d6f614f1b2b7ef64d68f5e
-EBUILD codecrypt-1.8.ebuild 698 BLAKE2B 1503c168832401752ed9c97900c491c6656facd16deb7864374fd6de64340d741b80b27ce1bd26d65ab15cf0079efccbaff6c0d3e1e462cd38eaec47ba09bad2 SHA512 2ee7d6740af6fd54cc77eb8dd3bb79b787c6a09256cc426a27bdece3c30735fb3d63b8dde6919ddaac5bb1bfe0ed7e1eb347b22f407682fb79f42a2962e7f874
+EBUILD codecrypt-1.8-r1.ebuild 713 BLAKE2B fbe2c5bcba08834f475dc9655fe6b8623f1d44a9cb2743e5762ea69f04832fcb7fbd02312ef200b628ad35e05bc3fdc5c3ea1436656943cac2ef08eab2e74030 SHA512 fcfe53551ce1fa4c5de259a162b6dc485a3efcd6a05bfe4deb66a437a4dba289d32f4de2608dbd01b2c70596a1cfba759b0326a70c785799789bc84ff9e5f811
 MISC metadata.xml 757 BLAKE2B 5346ca41ed3210ef96baa63fc22e5733d47d8998f7b0cca37cd0aed53b67a7adf5bd8cbedd68d4194476ec7ff0fe83196038766cdbb3580b185566abca76ad9e SHA512 f7e7f6a747c42a666bd0b5de69999fd377374da728c9c98f8e57fa4c7fd93e97a7a7a721c568ba920c4cbe5f5591f4174db99d89fd209df7aecbad06f59f75a3
--- a/app-crypt/codecrypt/codecrypt-1.8-r1.ebuild
+++ b/app-crypt/codecrypt/codecrypt-1.8-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -15,14 +15,13 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+cryptopp"

 DEPEND="dev-libs/gmp:=
-	cryptopp? ( dev-libs/crypto++ )
+	cryptopp? ( >=dev-libs/crypto++-7 )
 	sci-libs/fftw:3.0"
 RDEPEND="${DEPEND}"
-
 src_prepare() {
 	default
-	# workaround -- gentoo is missing crypto++ pkg-config file
-	sed -i -e 's/PKG_CHECK_MODULES(\[CRYPTOPP\],.*/LDFLAGS="$LDFLAGS -lcrypto++"/' configure.ac || die
+	# workaround -- the library renamed the pkg-config file
+	sed -i -e 's/PKG_CHECK_MODULES(\[CRYPTOPP\],.*/PKG_CHECK_MODULES([CRYPTOPP], [libcryptopp])/' configure.ac || die
 	eautoreconf
 }

--- a/app-crypt/glep63-check/Manifest
+++ b/app-crypt/glep63-check/Manifest
@ -1,7 +1,3 @@
-DIST glep63-check-1.tar.gz 4632 BLAKE2B 3632199ca9ca8516a833aa6d93885f40a761c47ab5bc5685582c6c8e294af0d5a6e258656208c9a65c1c5d4852d5e32374a77b39a0dcf491605df4b733d2c162 SHA512 16e3031b9b04af09ba446c76e8776d802d197d2d1f934c9a409509a81fd299306b451ea3e52d1ac5b75c9d0c9a0d7f93b73e26732ecf51c5c3afe53f0c0868aa
-DIST glep63-check-2.tar.gz 5818 BLAKE2B 4cb99945e5bf3067e579feb630c8c5e3a33abdbc66cbdc90f00104a926880b29b61b22a8e151d1a35765787b80a1567fc6823259e94df0ab72810e9d76ea61a3 SHA512 bc3029e3886ad881f134da0e0821ed5bc908f7583d8031f76000827640d60e85adc182555163e6ef4138c1d1c9abb3e314ae5548acf82e384d66eac6d1e1b8c7
-DIST glep63-check-3.tar.gz 5892 BLAKE2B d59983cb36e30503e94479644dac6ac061e9420391fee3a8170faa1f9b12ba9c248fde53f649309d2c17c62fa6de5e45f3a34cae83ddec01b388b6dee13e85e5 SHA512 778db42d8482d4cf206f291cfddadfcb8fb333fc686b90d96d586e4b2c58280933a248534309ba9999ba32f7cf8fb3ed45bb4a97578e508d710105290fc3c2e7
-EBUILD glep63-check-1.ebuild 599 BLAKE2B 57129139a3c4999c93ddcfb915459471963e5fe70029ead8f91d3b5fbfcc7a13ea49bff7c24b50cfbcd3930aef2b8eba5d2cc107f4dd59030a61d58b2f93d6c4 SHA512 104d354b826ab4c9c4c01b587410de5a136239d8e1073d6aa8c5e97b28ac7e5d5e039154b72a913c1557035fe74b2b1988f4fbbc16bfa17efa01393d65f30da1
-EBUILD glep63-check-2.ebuild 599 BLAKE2B 57129139a3c4999c93ddcfb915459471963e5fe70029ead8f91d3b5fbfcc7a13ea49bff7c24b50cfbcd3930aef2b8eba5d2cc107f4dd59030a61d58b2f93d6c4 SHA512 104d354b826ab4c9c4c01b587410de5a136239d8e1073d6aa8c5e97b28ac7e5d5e039154b72a913c1557035fe74b2b1988f4fbbc16bfa17efa01393d65f30da1
-EBUILD glep63-check-3.ebuild 603 BLAKE2B b062189a109fb0227031fba2c627065b8badf676f9b2db60d8e1b847dc59e3e801ea392a47c2d67e7eb801b44df689f3dc486cef33496c62baaeb387f4821e59 SHA512 65ec1371049758b84c7f50f3afc3042df99ead045cfeafd4e61beae02ba36bab4802b1ffce8ee94ccdf32bf7c993b4d1f9f1b872d631640549e0be449e64c72d
+DIST glep63-check-4.tar.gz 5898 BLAKE2B b28dd0843138bb54c81142959a28b121b043b7da4e3dc797b8ad3ebabfde6f850a11c40e94e3d20b9cf152b2138165733ba36754859081eb59bbbd5e99f2b98e SHA512 65a40ce097937df0517f86d1b32fd47e23d39abc6a49fa45dfa9075e7f7a163c2c2e25f6e39538a5e47c295bfdb2390bc4909e14a06b21f2bf14edf8cf43f199
+EBUILD glep63-check-4.ebuild 603 BLAKE2B b062189a109fb0227031fba2c627065b8badf676f9b2db60d8e1b847dc59e3e801ea392a47c2d67e7eb801b44df689f3dc486cef33496c62baaeb387f4821e59 SHA512 65ec1371049758b84c7f50f3afc3042df99ead045cfeafd4e61beae02ba36bab4802b1ffce8ee94ccdf32bf7c993b4d1f9f1b872d631640549e0be449e64c72d
 MISC metadata.xml 513 BLAKE2B dc5036a6556ebfefbbfc1ad01f436b9793c5c0c51e7cbda49ee896ff364a30761f92ec63531317b4bd55bb9cc018d6ee62d07776a61ba75d7d1245c3d0c1339a SHA512 44aac823dedeb848696d166e28d151449b59d30a7dd87a0c2c339c044e2704908a1882e3b818ad7007822b5fd2efc52ad81564fad953862851b44480d61642fe
--- a/app-crypt/glep63-check/glep63-check-1.ebuild
+++ b/app-crypt/glep63-check/glep63-check-1.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit python-single-r1
-
-DESCRIPTION="GLEP 63 compliance checker for OpenPGP keys"
-HOMEPAGE="https://github.com/mgorny/glep63-check/"
-SRC_URI="https://github.com/mgorny/glep63-check/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-crypt/gnupg"
-
-src_compile() {
-	python_fix_shebang glep63-check
-}
-
-src_install() {
-	dobin glep63-check
-}
--- a/app-crypt/glep63-check/glep63-check-2.ebuild
+++ b/app-crypt/glep63-check/glep63-check-2.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit python-single-r1
-
-DESCRIPTION="GLEP 63 compliance checker for OpenPGP keys"
-HOMEPAGE="https://github.com/mgorny/glep63-check/"
-SRC_URI="https://github.com/mgorny/glep63-check/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-crypt/gnupg"
-
-src_compile() {
-	python_fix_shebang glep63-check
-}
-
-src_install() {
-	dobin glep63-check
-}
--- a/app-crypt/glep63-check/glep63-check-4.ebuild
+++ b/app-crypt/glep63-check/glep63-check-4.ebuild
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/latexila/Manifest
+++ b/app-editors/latexila/Manifest
@ -1,7 +1,5 @@
 DIST latexila-3.22.1.tar.xz 1111820 BLAKE2B 8a3e375ba048112565f6b074ec62a243fb34890f6e903a2ba2d36f7bb5ede6b0fcb8b488a725752c2edd06b0c71916f13915ebdc26fcf8b6a889523b99141b10 SHA512 7c2d3b95b9547e97c79f5e6384b1f33ccb81e70cea1d26fcc07845f3f391ac54b5931ddcec742f3439ba55e8f9f2a2054935795ab16bee584eb05780a72ba3a9
-DIST latexila-3.24.2.tar.xz 1120940 BLAKE2B fe564f7a53da496ac149e67c236c4c726db2b3dcd31240d05b3e89459b1f2f0bb623a6028e14d6cf8cc0188e32e9aa8000fd62b5599cc1e6dba0626a16946108 SHA512 8facaa57a87b58ba3aeffcd1c59e2770fe8e95bdbf0cd2e5fa39554c1eba3ba93aa4cb544fd09564cc9481d919a0b04d46169d053f9f155deaa8826050a4c72c
 DIST latexila-3.24.3.tar.xz 1112940 BLAKE2B 2410276574f02735dde9ce77a9bba257e3732784664b302870957fc3f8603bedddaebed4da3f6da1e1f6fc30e3dc233146b65dbf7589a8776c653018a4129355 SHA512 c7c8996704e68ed136d3d2a04c839faf5497a78ad459411daaabfba38ac883f253325f07a8c126cc4b2f1d553fe08b39f1d6a51d1b6944540dc13142173e4361
 EBUILD latexila-3.22.1.ebuild 1104 BLAKE2B 5017ad5bf77bf93cdebdafa7a7381a08b20b09d3bcedfb0375de136e55bee66f78a92346563531cd2b69dd1e171e84203e5fad0cfb6b5dc3fa77880b3a7d95bd SHA512 8d6acab4710c29a32215bbed77baab8193eec2d2abaab2b4d8329fdb2444750dbc903e004f86aae6cf8b73213225833b3034a70e0b3a972ef33344b0418fe492
-EBUILD latexila-3.24.2.ebuild 1155 BLAKE2B 3cc09d5496231ac907053b163351f24822d703c109e80bc7ddbcb3e4896f99ae87453030a4b3e14ab877fb6a2ae4b84f112d3e2219c82e0cb39b3f45ceec9bc5 SHA512 8e9f098ae73e4a88b7ebeacf604b358824046abf73a9736796869b753dbac9fc78ad884bb8772a5aa74ffe2133396d4941240661008492fe5007c778a03f4bc0
 EBUILD latexila-3.24.3.ebuild 1155 BLAKE2B 3cc09d5496231ac907053b163351f24822d703c109e80bc7ddbcb3e4896f99ae87453030a4b3e14ab877fb6a2ae4b84f112d3e2219c82e0cb39b3f45ceec9bc5 SHA512 8e9f098ae73e4a88b7ebeacf604b358824046abf73a9736796869b753dbac9fc78ad884bb8772a5aa74ffe2133396d4941240661008492fe5007c778a03f4bc0
 MISC metadata.xml 464 BLAKE2B 8d70a6283779236162f7d0838ca7e97ae90ae5641cfb2fa551426238ce06b64a22f368ddec6a13fea472b2aa038a7854a7c53fc3bdf5c0a13cc9cbefa042fe39 SHA512 2015c3aac4abb5275c45db624fb6ee841e55ca1fd4e976d60528b04b5084a0cbae7fc625369d03e2ca2ee3ee16719df1740246a06208b10e5a99ea3c6612a0b1
--- a/app-editors/latexila/latexila-3.24.2.ebuild
+++ b/app-editors/latexila/latexila-3.24.2.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_MIN_API_VERSION="0.34"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Integrated LaTeX environment for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/LaTeXila"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection +latexmk rubber"
-
-COMMON_DEPEND="
-	$(vala_depend)
-	app-text/enchant
-	>=app-text/gspell-1.0:0=
-	>=dev-libs/glib-2.50:2[dbus]
-	>=dev-libs/libgee-0.10:0.8=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtef-2.0
-	>=x11-libs/gtk+-3.20:3
-	>=x11-libs/gtksourceview-3.24:3.0=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	x11-themes/hicolor-icon-theme
-	latexmk? ( dev-tex/latexmk )
-	rubber? ( dev-tex/rubber )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection)
-}
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-infinality/Manifest
+++ b/app-eselect/eselect-infinality/Manifest
@ -1,3 +1,5 @@
+DIST eselect-infinality-1.1.tar.gz 8274 BLAKE2B 8bbdc7aa6966f685a73f1caecde632611b6b4455400e93f7c91e25c24fbaea97691784729ce6f08fa41f970ed999e189235a23da1d9409e24811331435987a13 SHA512 13fd5082db7739a64662a500aad6bd36e0e0c80a4042e87f077366e40bc9a2184b33f0d549fdec647694df320ba4cf1f93f77194a1d49074619e0798bd4072ef
 DIST eselect-infinality-1.tar.gz 8274 BLAKE2B be4696f34c908a5e6e55546dbaf63a753e936f06074face5f8c9964f89015ee7be88c935c32d36a255c9e7ed71e967d4591ee0ad598f5cbfafc809149e728b3b SHA512 0bff25817b68125c670ffb2782704604415f233711974c47935bd5dac80b164ca471cea1fea193886b30d0eec60a4a208f0ede6bd1a40488c2458a7dd9fe127d
 EBUILD eselect-infinality-1-r1.ebuild 698 BLAKE2B e3a20c706cfda7f0319751def8f49a03236cecf22ed068d7b3815d43be35d2a538616d176315f184ca4aa8b53e2a494b84d9eb5324c4284b3c5f514800e4f559 SHA512 81afb855c952f12c56aa6d3d46d027d1d8c9791ce5213706e5acb5017ab0dfd0fafe95d0d10a6b783d2c87e40da91b861083442d0fe214a0720d9604e1d210d3
-MISC metadata.xml 338 BLAKE2B 19f8bbc98dc95fbdf49922713afa90c1e1fbfaaf7c96fdd7862720be12de546f68155d2a3e76e7547a4530e8e0ef13e7c411d8cda9d4f8869536481da71d3d40 SHA512 f4a839e992f958b55552878bcde35f45bb7f8130b5fae9b382793e3aaba710230cf703b965eb0007ea5cad31e2702d88536c32d19cd30e05fb60bb359e965351
+EBUILD eselect-infinality-1.1.ebuild 694 BLAKE2B 6100b187511115dc19585b17b0dd547025b4bfd1ab755010d6daf5867d55bb3ff0f1d96c8f41cbdbc3bd63ba77733b01f970b0b0ac2cd9e36f6275b7b9d9b65d SHA512 f6450f62a55df1af9a7758924f88fb26f3e8c8741c7a574e784cb61e36f1dbbcbaf012d17348731cf3bdaee40222236f5010b009241f7a36377e4b3573c5e497
+MISC metadata.xml 338 BLAKE2B 74c86dfb8172cce6eadacfa36d1b6a77ceba1ae2e2ce77b5fa5170c53a6228f9b800c28ee22b393fe721d001f72a3609c757443c36339439dd01dbd6dc97f6fe SHA512 cd67cba2e024bc2afaca433d25e2b8589848ceb857eea7bf7fbc489ada5c6bbf7c944aa5a0b6f7a0bc5ed75d92acbc60f0acf6334587c890d0c623b2fa39e744
--- a/app-eselect/eselect-infinality/eselect-infinality-1.1.ebuild
+++ b/app-eselect/eselect-infinality/eselect-infinality-1.1.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit readme.gentoo-r1
+
+DESCRIPTION="Eselect module to choose an infinality font configuration style"
+HOMEPAGE="https://github.com/amadio/eselect-infinality"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-admin/eselect"
+DEPEND=""
+
+DOC_CONTENTS="Use eselect infinality to select a font configuration style.
+This is supposed to be used in pair with eselect lcdfilter."
+
+src_install() {
+	dodoc README.rst
+	readme.gentoo_create_doc
+	insinto "/usr/share/eselect/modules"
+	doins infinality.eselect
+}
--- a/app-eselect/eselect-infinality/metadata.xml
+++ b/app-eselect/eselect-infinality/metadata.xml
@ -6,6 +6,6 @@
    <name>Fonts</name>
  </maintainer>
  <upstream>
-    <remote-id type="github">yngwin/eselect-infinality</remote-id>
+    <remote-id type="github">amadio/eselect-infinality</remote-id>
  </upstream>
 </pkgmetadata>
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@ -1,7 +1,10 @@
 AUX nkf-2.1.3-strip.patch 328 BLAKE2B 8cf9585ce7285ab5227bb5ace9d92fa559e5cee377b665e76792bd0d921ab8c638a60bdab1510879dbbc2dc4ac131fcd7e9d6ef7f525a02d44cbcbaa6b5a3db1 SHA512 a23bf0164bcf765f3b846a564c55bd783362e6f84b6f582d4d84b5ec8b711ca07d23d104ef5de2e84de5d6754b064034736ecadc5ceab6bda9ad59f00f2f527d
+AUX nkf-2.1.4-python.patch 285 BLAKE2B 439d4009b56cd6469fc7d717b91bf0b89fcbf275d87081359eeb7ade447c76261465703ba33836b9d9a87b4da482dd9cea8bdd46818a43a0b27eb4e7182ae371 SHA512 4c9bc8468656ffb09033f6564775686e1bc2bc99c8e4856c7f38de87b4c3c842bdf6798924ea97a5da2b1b697d7aaca62556c836d122dd496e278b223c3d48f3
 DIST NKF_python20090602.tgz 2318 BLAKE2B 54399912fce0f4486e4051825319294a214089a59fa9b40e93bdc77859e79e5586abf2d197511cb158b094663993a692c981885e9db8fe260a5a746771168509 SHA512 3baee969daaba43e7ddee0d3b6d3d73ed67cfb0a3c3cbdabcdcda9fa1e61ccf374cd686ee096d031c3c48541c6be6daacf82e3b05885de63b88344d137c306d9
 DIST nkf-2.1.3.tar.gz 195020 BLAKE2B 7ffd2acdc16d98cfe1e7a73ff5999756a1c46e5dbbbf349d296f11526c077c42a64b1657d3a6bf8bee1326768ec06fe9d2aea02e5f8ba02e77626bb1316d1484 SHA512 e40798d4084657b545bdaa9904229b0a424a9be076c16993b97d206c3e82490c45288eaab417c6eea70b770f89530f90e98e1a659f8f7e4b928eea4396d1e738
+DIST nkf-2.1.4.tar.gz 232479 BLAKE2B 81887b8b0422e92b2fa2be285c1d9fa4da16d572ca50e1fbeef7be4f50af9ba9b64ef140163e325e57c351dd384ee8b09849bad7c37b03d48a9cb4b88f2ee199 SHA512 8667c20a6c5e9c0c6df7ebe2571bcf24090f04dafd306d32f07312acd659ea026a91d31521b4b213f77aba8218159effd73607d0b7236b7287e4a4cde8cc62b9
 DIST nkf.1j 24160 BLAKE2B 1d461dbacfb6e5ee358d7ea162582da5042a03f02448791c4ed33a10e9eb6e5907220db8d70aea691e3908252daffcbacdaab1b9fe52b0e4e25f7b590e5bca72 SHA512 4680dfb59ceb9db5031ecefeca808e34202c841309d5b634cdd7aa89ee97118701ddeddb0ae18a2cf791987929dc9c5a528275cb1f63b1742eac2197ac9c1416
-EBUILD nkf-2.1.3-r1.ebuild 1555 BLAKE2B 00cdbe4640317471c98c918f467c44fd1c079550294ca78d6d369823422d484de72d71003d6c2c223d0f361116e9a0aba002b18e9463991e9f0d6968fbd2acf9 SHA512 873a402d6cd444119fc3cc806a97e0f057343b26c724b38076168c416cdb3f9ee5d65fe50ae475469f8d55ae51fe5a45a7487f42277513c4b25dbd3202ecc5e0
-EBUILD nkf-2.1.3.ebuild 1424 BLAKE2B d672889f8d8b195d9a1ed1e655fdf5fc6d5a0fd8e2cb835cd145f09fd1c736c20f6f5feb901559cdd2028d0ed3d8c212689649c34d86616eb897875e84c9873f SHA512 c3055e5c093fade5bf12ef16b46fb6f6a9c8b74c60d98a7e5c0e8b9e6beb68ae8fb9f11fa9e00afaf304945adc7133f06bfc05772ab2eb667c1f2b2a443da13b
+DIST python-nkf-0.2.0_p20141211.tar.gz 187761 BLAKE2B b607e155934dd14ad4d29298f209a233d846122299326df48e45339661d1cd08a789f5278928cb4a32c747673723f5f8877d98c7a6200af6b2dbbf29cd100f00 SHA512 5a493f32244e3cb72d188fa39b810baef31ce5f530309797a05474e3f58cf22fd5f8b6c66cdf5268451c49ffb759c476c707329ce1ccf42da0362ad4f5c24d71
+EBUILD nkf-2.1.3-r2.ebuild 1713 BLAKE2B 67720f1fb282fcbb006336a357b5a97824147d97788065157e8e5ed139a1f3c19df620d1a1cf80f25b7634a7a6c9cd1e709c23be35b8c3018d84ee8c1c1a98bb SHA512 24b3317c3203f148e171f0c211cafe1214b4c1b110ffcf01989b4c42830303f6d843533231051d0daddf86921769eb8ab7fd2bea2527ff1acf2a175248be9b4d
+EBUILD nkf-2.1.4.ebuild 1832 BLAKE2B 07177c1eace2718e5288a56aacc52ee4436cfc6b3774ac3a8da2eb7d4d000afd8e73fa91b2e09830d39e77aa3c637e99a99455b640702cb6a10f9fea2de1d2a6 SHA512 5534788beb13116dfbbfe547c273cf06c12c817d398ab71217819d817ab1d5da65b077f9aab036f5b9254603fb6739e0c765049209913a79f83d818f4e345359
 MISC metadata.xml 310 BLAKE2B 5db509d8ef0ebd0727be43314f12d877a704ff9eb8b9cde61733c4dbad8196780c07c9de484f29786116e7fe9267ca3f6be9f727be9f4fa34e582b23fa586594 SHA512 2db03c97fb76c37b779c7f6e467c03b2bc08d2642090cc27a99ae07296edcde04924e37c8a3e6cb23d61552e8cf4bee273e5c17077fac0ae0ea3458aaa81eacd
--- a/app-i18n/nkf/files/nkf-2.1.4-python.patch
+++ b/app-i18n/nkf/files/nkf-2.1.4-python.patch
@ -0,0 +1,13 @@
+--- a/NKF.python/nkf.c
+++ b/NKF.python/nkf.c
+@@ -78,8 +78,8 @@
+ }
+ 
+ #define PERL_XS 1
+-#include "nkf-dist/utf8tbl.c"
+-#include "nkf-dist/nkf.c"
+#include "../utf8tbl.c"
+#include "../nkf.c"
+ 
+ static PyObject *
+ pynkf_convert(unsigned char* str, int strlen, char* opts, int optslen)
--- a/app-i18n/nkf/nkf-2.1.3-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.3-r1.ebuild
@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils distutils-r1 perl-module toolchain-funcs
-
-DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
-HOMEPAGE="http://sourceforge.jp/projects/nkf/"
-SRC_URI="mirror://sourceforge.jp/nkf/59912/${P}.tar.gz
-	l10n_ja? ( https://dev.gentoo.org/~naota/files/nkf.1j )
-	python? ( https://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-macos"
-IUSE="perl python l10n_ja"
-
-src_prepare() {
-	sed -i \
-		-e '/^CFLAGS/{s|-g -O2||;s|=|+=|;}' \
-		-e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
-		Makefile || die
-
-	if use l10n_ja; then
-		cp "${DISTDIR}"/nkf.1j "${S}" || die
-	fi
-
-	if use python; then
-		mv "${WORKDIR}/NKF.python" "${S}" || die
-		epatch "${FILESDIR}"/${P}-strip.patch
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" nkf || die
-	if use perl; then
-		cd "${S}/NKF.mod"
-		perl-module_src_compile
-	fi
-	if use python; then
-		cd "${S}/NKF.python"
-		distutils-r1_src_compile
-	fi
-}
-
-src_test() {
-	emake test || die
-	if use perl; then
-		cd "${S}/NKF.mod"
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	dobin nkf || die
-	doman nkf.1
-
-	if use l10n_ja; then
-		./nkf -e nkf.1j > nkf.1
-		doman -i18n=ja nkf.1
-	fi
-	dodoc nkf.doc
-
-	if use perl; then
-		cd "${S}/NKF.mod"
-		perl-module_src_install
-	fi
-	if use python; then
-		cd "${S}/NKF.python"
-		distutils-r1_src_install
-	fi
-}
--- a/app-i18n/nkf/nkf-2.1.3-r2.ebuild
+++ b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 perl-module toolchain-funcs
+
+DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
+HOMEPAGE="http://sourceforge.jp/projects/nkf/"
+SRC_URI="mirror://sourceforge.jp/${PN}/59912/${P}.tar.gz
+	l10n_ja? ( https://dev.gentoo.org/~naota/files/${PN}.1j )
+	python? ( https://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-macos"
+IUSE="perl python l10n_ja"
+
+src_prepare() {
+	sed -i \
+		-e "/^CFLAGS/{ s/-g -O2//; s/=/+=/; }" \
+		-e "/ -o ${PN}/s/\(-o \)/\$(LDFLAGS) \1/" \
+		Makefile
+	if use l10n_ja; then
+		cp "${DISTDIR}"/${PN}.1j ${PN}.ja.1 || die
+	fi
+	if use python; then
+		mv "${WORKDIR}"/NKF.python . || die
+		eapply "${FILESDIR}"/${P}-strip.patch
+	fi
+
+	default
+}
+
+src_configure() {
+	default
+	if use perl; then
+		cd NKF.mod
+		perl-module_src_configure
+		cd - >/dev/null
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+	if use perl; then
+		cd NKF.mod
+		perl-module_src_compile
+		cd - >/dev/null
+	fi
+	if use python; then
+		cd NKF.python
+		distutils-r1_src_compile
+		cd - >/dev/null
+	fi
+}
+
+src_test() {
+	default
+	if use perl; then
+		cd NKF.mod
+		perl-module_src_test
+		cd - >/dev/null
+	fi
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+
+	if use l10n_ja; then
+		doman ${PN}.ja.1
+	fi
+	dodoc ${PN}.doc
+
+	if use perl; then
+		cd NKF.mod
+		docinto perl
+		perl-module_src_install
+		cd - >/dev/null
+	fi
+	if use python; then
+		cd NKF.python
+		docinto python
+		DOCS= distutils-r1_src_install
+		dodoc README
+		cd - >/dev/null
+	fi
+}
--- a/app-i18n/nkf/nkf-2.1.3.ebuild
+++ b/app-i18n/nkf/nkf-2.1.3.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils distutils-r1 perl-module toolchain-funcs
-
-DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
-HOMEPAGE="http://sourceforge.jp/projects/nkf/"
-SRC_URI="mirror://sourceforge.jp/nkf/59912/${P}.tar.gz
-	python? ( https://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-macos"
-IUSE="perl python l10n_ja"
-
-src_prepare() {
-	sed -i \
-		-e '/^CFLAGS/{s|-g -O2||;s|=|+=|;}' \
-		-e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
-		Makefile || die
-
-	if use python; then
-		mv "${WORKDIR}/NKF.python" "${S}" || die
-		epatch "${FILESDIR}"/${P}-strip.patch
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" nkf || die
-	if use perl; then
-		cd "${S}/NKF.mod"
-		perl-module_src_compile
-	fi
-	if use python; then
-		cd "${S}/NKF.python"
-		distutils-r1_src_compile
-	fi
-}
-
-src_test() {
-	emake test || die
-	if use perl; then
-		cd "${S}/NKF.mod"
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	dobin nkf || die
-	doman nkf.1
-
-	if use l10n_ja; then
-		./nkf -e nkf.1j > nkf.1
-		doman -i18n=ja nkf.1
-	fi
-	dodoc nkf.doc
-
-	if use perl; then
-		cd "${S}/NKF.mod"
-		perl-module_src_install
-	fi
-	if use python; then
-		cd "${S}/NKF.python"
-		distutils-r1_src_install
-	fi
-}
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
+
+PY_P="python-${PN}-0.2.0_p20141211"
+PY_COMMIT="000915e115acac57a1fdbceb1e6361788af83a3d"
+
+DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
+HOMEPAGE="http://sourceforge.jp/projects/nkf/"
+SRC_URI="mirror://sourceforge.jp/${PN}/64158/${P}.tar.gz
+	python? ( https://github.com/fumiyas/python-${PN}/archive/${PY_COMMIT}.tar.gz -> ${PY_P}.tar.gz )"
+
+LICENSE="ZLIB python? ( BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-macos"
+IUSE="perl python l10n_ja"
+
+src_prepare() {
+	sed -i \
+		-e "/^CFLAGS/{ s/-g -O2//; s/=/+=/; }" \
+		-e "/ -o ${PN}/s/\(-o \)/\$(LDFLAGS) \1/" \
+		Makefile
+	if use python; then
+		mv "${WORKDIR}"/${PY_P} NKF.python || die
+		eapply "${FILESDIR}"/${P}-python.patch
+	fi
+
+	default
+}
+
+src_configure() {
+	default
+	if use perl; then
+		cd NKF.mod
+		perl-module_src_configure
+		cd - >/dev/null
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+	if use perl; then
+		cd NKF.mod
+		perl-module_src_compile
+		cd - >/dev/null
+	fi
+	if use python; then
+		cd NKF.python
+		distutils-r1_src_compile
+		cd - >/dev/null
+	fi
+}
+
+src_test() {
+	default
+	if use perl; then
+		cd NKF.mod
+		perl-module_src_test
+		cd - >/dev/null
+	fi
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+
+	if use l10n_ja; then
+		iconv -f ISO-2022-JP-3 -t UTF-8 ${PN}.1j > ${PN}.ja.1 || die
+		doman ${PN}.ja.1
+	fi
+	dodoc ${PN}.doc
+
+	if use perl; then
+		cd NKF.mod
+		docinto perl
+		perl-module_src_install
+		cd - >/dev/null
+	fi
+	if use python; then
+		cd NKF.python
+		docinto python
+		DOCS= distutils-r1_src_install
+		dodoc CHANGES README.md
+		cd - >/dev/null
+	fi
+}
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@ -19,10 +19,8 @@ AUX lircmd 364 BLAKE2B 71971476198f92bb2d26cbacc8fe330c4d73e0b36370180cfc6438047
 AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297aae75b17ed1bb858a57aa1f524d096ec2744f0d543b719f13e80a467869b7ac86e560cc396a24b0648 SHA512 6a69c7600024f00947dc35e3c6cebf7524fcf5f2a1e799fe70590fef2070c1049c4e6177711821f4e7b13972fd6f535591b48bb1006acd44fa650591b3265ace
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
-DIST lirc-0.10.0.tar.bz2 2523528 BLAKE2B 5c133b40936060fbaa0a9463b1b07d9197d935388e3eb4e46791b1f844b82ea6b6d42ae0c6ce249ca306688fa5d15718f5a3a54b497fc9f168b8b736b06bdd1e SHA512 06ccc1c8c80bfd17a6d180ae39a17779cbba341086f90a03a2e552bfb71e3abcb13f991312fba0e57df79c1882c1e29a2f273dddcd46a9ff53160b556e1547ab
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
 DIST lirc-0.9.0.tar.bz2 857286 BLAKE2B 034c7b8492dd42301bb6d40da8c6c95f714b925ee50e7396290231684024dc3fe3bb64987db92d2a4e4d56203436007e68222bbf9a775bb9d29bbefcc4a7c1e4 SHA512 e91534c63e6065bd7da3b15e1676edf1672b8beb21864a6825df86247d7d165bf2dee6f8191732933e24e42a406e46afc55559948e4061eed2de7b08fac13431
-EBUILD lirc-0.10.0.ebuild 3628 BLAKE2B 18880addbafab7abf3216e023ba27c568b1234f80a35bda0f45441d56f6e17c2ceb6623d5d25d9216b35d0aa4155eb060505d6c710913bf9052979654538e7d2 SHA512 375ada586cb5e60fc95d9c11962386d2cc2eb7e8ba8f3a40c12f766c9f256bd0812a5f9a564a1695eca60f05528e1f15d00b3fae359fb2a640525fac799a45b3
-EBUILD lirc-0.10.1.ebuild 3721 BLAKE2B 161f1efd8b7b814279490510991ad01ab08712fedcbebc17368ad1476d5353975b3484e1fa2fccf7b62cbf0abe79807ee35407cc62a0f666fd606e1a4ba39a3e SHA512 4cf5347f1b8b7f607194ac4cc0c1e6b3d3ceda359a27987dea534640a9f66a4450d5c8189f1b5c064672ed5fe2e8014020eabfb0b0d113590eaf0e3e195fdc4c
+EBUILD lirc-0.10.1.ebuild 3739 BLAKE2B 7370130d197f6243429cd1395dfdf2bbd6ebcd5afb14cb2234fc84769925618c12e5193553f6d425732b3419f23c851ccccd37029bbfc5393d49be875d5c9175 SHA512 95dc993ba6e9b3abf3f58c9a76e5831659fa5fc9c01e457f7e1cbb24eb4ef28f91714e191e7050cf54a6a1803e68cf2a7c440eee498d948c2fc001296f30cbf7
 EBUILD lirc-0.9.0-r6.ebuild 13250 BLAKE2B 81ca3c71e46089a8f3a1b412d53e60096f14c0825f8f4c7daf9fee9387e3eced4dda10c8e5dc4550a9e0eb1347b1db40972a3a2397154dce2a8e1d2ed8b99977 SHA512 0d620d93bccf35721830420a7e367b45c1b6a71891843db12fe4c96b0d1228de6367969545eeb0f0416833f195ed933eafef69d5d38a0a46a1f0ddc32829240b
 MISC metadata.xml 1175 BLAKE2B 1bcfd5d3fed6ee42c3e53168cc40fd930e6b92bf52bc787c43439f053e1fb97bf841d71ec58ce3fae56187c77cac767613107e74a90f8871dcfe3f33e4ff293f SHA512 c1d6ff9a423c0ea5d52410d5dfa2cd9dd94b61109494c629706dc74c228032e19e6504884c50694450624d6c05f437eaaebaee0ab626f7004fc7377331fa847c
--- a/app-misc/lirc/lirc-0.10.0.ebuild
+++ b/app-misc/lirc/lirc-0.10.0.ebuild
@ -1,151 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_{5,6} )
-
-inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
-
-DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
-
-LIRC_DRIVER_DEVICE="/dev/lirc0"
-
-MY_P=${PN}-${PV/_/-}
-
-if [[ "${PV/_pre/}" = "${PV}" ]]; then
-	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
-else
-	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	gtk? ( X )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	audio? (
-		>media-libs/portaudio-18
-		media-libs/alsa-lib
-	)
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	ftdi? ( dev-embedded/libftdi:0 )
-	systemd? ( sys-apps/systemd )
-	usb? ( virtual/libusb:0 )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	sys-apps/kmod
-	sys-kernel/linux-headers
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	gtk? (
-		x11-libs/vte[introspection]
-		dev-python/pygobject[${PYTHON_USEDEP}]
-	)
-	inputlirc? ( app-misc/inputlircd )
-"
-
-pkg_setup() {
-	use uinput && CONFIG_CHECK="INPUT_UINPUT"
-}
-
-src_configure() {
-	xdg_environment_reset
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable static-libs static) \
-		$(use_enable devinput) \
-		$(use_enable uinput) \
-		$(use_with X x)
-}
-
-src_install() {
-	default
-
-	if use !gtk ; then
-		# lirc-setup requires gtk
-		rm "${ED%/}"/usr/bin/lirc-setup || die
-	fi
-
-	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
-	newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd
-	newconfd "${FILESDIR}"/lircd.conf.4 lircd
-	newconfd "${FILESDIR}"/lircmd-0.10.0.conf lircmd
-
-	insinto /etc/modprobe.d/
-	newins "${FILESDIR}"/modprobed.lirc lirc.conf
-
-	newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec
-	newconfd "${FILESDIR}"/irexec-confd irexec
-
-	keepdir /etc/lirc
-	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		newdoc "${ED%/}"/etc/lirc/lircd.conf lircd.conf.example
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# Avoid QA notice
-	rm -d "${ED%/}"/var/run/lirc || die
-	rm -d "${ED%/}"/var/run || die
-}
-
-pkg_preinst() {
-	local dir="${EROOT%/}/etc/modprobe.d"
-	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
-		elog "Renaming ${dir}/lirc to lirc.conf"
-		mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
-	fi
-
-	# copy the first file that can be found
-	if [[ -f "${EROOT%/}"/etc/lirc/lircd.conf ]]; then
-		cp "${EROOT%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	elif [[ -f "${EROOT%/}"/etc/lircd.conf ]]; then
-		cp "${EROOT%/}"/etc/lircd.conf "${T}"/lircd.conf || die
-		MOVE_OLD_LIRCD_CONF=1
-	elif [[ -f "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		cp "${ED%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	fi
-
-	# stop portage from touching the config file
-	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		rm -f "${ED%/}"/etc/lirc/lircd.conf || die
-	fi
-}
-
-pkg_postinst() {
-	# copy config file to new location
-	# without portage knowing about it
-	# so it will not delete it on unmerge or ever touch it again
-	if [[ -e "${T}"/lircd.conf ]]; then
-		cp "${T}"/lircd.conf "${EROOT%/}"/etc/lirc/lircd.conf || die
-		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
-			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
-			rm -f "${EROOT%/}"/etc/lircd.conf || die
-		fi
-	fi
-
-	einfo "The new default location for lircd.conf is inside of"
-	einfo "${EROOT%/}/etc/lirc/ directory"
-}
--- a/app-misc/lirc/lirc-0.10.1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1.ebuild
@ -67,6 +67,8 @@ RDEPEND="
 	inputlirc? ( app-misc/inputlircd )
 "

+MAKEOPTS+=" -j1"
+
 pkg_setup() {
 	use uinput && CONFIG_CHECK="INPUT_UINPUT"
 	python-single-r1_pkg_setup
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@ -1,8 +1,13 @@
 DIST gemato-12.2.tar.gz 66897 BLAKE2B 85ca439620afdb2045e571ed7a11f3eb8ce85e41c0984ad51af3b9d22c0926138eda0c7b02e1d70e200eb8c93cf4003e61f901e0fd5fd28861217b02a1e3ab64 SHA512 10ba7da5de3b90722b0bdcf9d3766a7c83c68d29d23e49744a31b0c8ad80eaa4917dff2fbd9f12ef2fa4fde03244e79f6fe5e9c108db7fb64fd6ea68fa0eb81c
 DIST gemato-13.0.tar.gz 66899 BLAKE2B e75a16d6a26f010801df072154897a485e9aee6434cf60962d59d11fda70b790284a734d9137ccc7910b0a95278d922640aece45e42ca497d1118e01992c2a15 SHA512 0ca17f1df8606e09a88411d75d144094bd13e440b04721175c8d9a3ea92fc616b34de0c80c817898ee94a1d82e37e4de50319634a351a52bccaec9653ad2f166
 DIST gemato-13.1.tar.gz 66699 BLAKE2B f779efc2ad00c2bb6ad7eb2bbab8f6fbc8b8bc026b593bfc830844ba50a6d5ff260ca0b73190b1739268b2181461fbd4c4c45adf244b23b8ade7803d90c6773f SHA512 2cda08cee937cfdf4ff46d60b44d49e4de7af5c57bfc12ba5394e967fcdae6e4cb9ceaf131b379a2c90e92b14d8b1ec375362415fc81e16efcb3279a0ff1e46a
+DIST gemato-14.0-multiprocessing.tar.gz 71359 BLAKE2B b8c6fbcf8a83c8e85db4045ad23296944b94623d132a6c5f15b8388662fd092cb589600fda1d11c9645541106dc735dceaeed87d642b1fadf0f352f4a9b3f108 SHA512 2f1a1cbd837ab316bf544f713470f570286a313e002a4dcc075e464e77a3b10ba86410f805aad3d5702f3deedda48f8270f1274a67d76086b4ad5cd597426c5e
+DIST gemato-14.0.tar.gz 70754 BLAKE2B e66d63a20e144e809555b2eeff6a24f899e1f488c95a14b2250c6eb45c39a6e6b0e614afe30a64f5a353720ab38371ba3e4bf9948052dae3e06f9f82ac3d04a2 SHA512 0494b8fab720b4e5ad2b190fab128baf997073137b933bc113dddc8c5f2c54f53d09bc640b01565e9757b41197d039c8487cb2b78de77313722d19baf008b51f
 EBUILD gemato-12.2.ebuild 1209 BLAKE2B bdf78ce5cddb0d78e20048fbbef5eb9011900e00b7b9d91e21eb86d0b81fb315f7fbc4831b17759dacfc5e168957a6d6d07b49a5e50a77160dee02063544bd36 SHA512 321077315648ca61ef1ff4083c8ea0d651cf919e1008a2a0f74f94d9032e255b513b2e0bb68577c2fa0f5c5dad441a9cc67853538d99823412576c59afbad5c8
 EBUILD gemato-13.0-r1.ebuild 1348 BLAKE2B 51a605d710a59a6d4ae044aa2cb9921dacdccc89d3be16f43b9f2d52569990d7f43f71ec5c88950d368ab10c1afc318dc4ed14531909ef740c018cce7fd1740c SHA512 617a34511750626d0323ec1924e73508465d5d8da42db882f6135fb62101f6fb5c83eae4f163a33caa1c755f08a3c8e3a0716dba385596adafd1daa8cbe38577
 EBUILD gemato-13.1.ebuild 1363 BLAKE2B 3317fc9836c948377a652130f6628151240a0db9df937bbc478f72763c31d4d3c8cf006e76e6ef91c764cf1463557749f997f5bcba4e9b48561988a9d9d73fef SHA512 33ad8a3917f90ba214132ba5ab35c56dac6a17b53d442ad2646de9cfb2458d437d4c154fd9f066613fb25eb5a94b2ff6ab1bda272b37cbad2b4952e7bfbadc4e
+EBUILD gemato-14.0.ebuild 1363 BLAKE2B 3317fc9836c948377a652130f6628151240a0db9df937bbc478f72763c31d4d3c8cf006e76e6ef91c764cf1463557749f997f5bcba4e9b48561988a9d9d73fef SHA512 33ad8a3917f90ba214132ba5ab35c56dac6a17b53d442ad2646de9cfb2458d437d4c154fd9f066613fb25eb5a94b2ff6ab1bda272b37cbad2b4952e7bfbadc4e
+EBUILD gemato-14.0m.ebuild 1640 BLAKE2B e2e71f13997755fe1f4588cbcc551d851f09249009a9cc67b418cc96931c552b734d2cddfe2390c664c1555ed978067ab24945a83c47a628f81a46e9efb8ac61 SHA512 191730041d653dcfe0ded09b3380c6d5441eb2ccc3e3854e78461cb8f2271db20560a00e1b91a791131188ce508a57fc8477b068643a3e15f6fe1bcf9aa34502
 EBUILD gemato-9999.ebuild 1286 BLAKE2B 402b7ce64483e1225768e61a1d69ac59641158d42932ed86e08655c4d473664adc7e3ffbd7dc6e9349be54e8563d004deea07a0b1ad0b32b79573ae7770e86c7 SHA512 18b749bd0745a502dce6f0fd802800a36d13fe2c75d150975924eeb8da37e48aa05ef94008c2e4ca129e536c3ddcbb03030e456a6654807ab5732bf038b51dcc
+EBUILD gemato-9999m.ebuild 1481 BLAKE2B 29e278a127ee7c6a3a8b0095d8891b2c4c7499acedb3ee6bc87778b1060d7b707bbb69710c9d7cf3d83a02d5ddf57a32b6fcfc2878fba756f1387203156c7ce5 SHA512 750b63ad3781aa318d9ee7224b26686b687a9fce2769b92a927142dfa7076d19bdea892495dad7d168bff2c571ed50d02f6efff3ed78749d8f89e5f1e256ae39
 MISC metadata.xml 814 BLAKE2B 1e6845b23a861560cb0972f787a14f7ade2b471d98ff28f2ae3153e99011d98f2751d720d312a6006554117e3241e5ea8557211073f8d03bbfb751c23565c390 SHA512 d2367bd897e76939768a3cf8f173723e773ec5d12b7144793a69843a3a18aec50bcdb593956cce6644d45f27c263ebf1893ac375e5d4ee3d894dcb0bd4aa6d9e
--- a/app-portage/gemato/gemato-14.0.ebuild
+++ b/app-portage/gemato/gemato-14.0.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# pyblake2 & pysha3 are broken with pypy3
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
+PYTHON_REQ_USE='threads(+)'
+inherit distutils-r1
+
+DESCRIPTION="Stand-alone Manifest generation & verification tool"
+HOMEPAGE="https://github.com/mgorny/gemato"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
+IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
+
+MODULE_RDEPEND="
+	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
+	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
+	gpg? ( app-crypt/gnupg )
+	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
+	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
+
+RDEPEND="${MODULE_RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
+	test? ( ${MODULE_RDEPEND} )"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use tools; then
+		exeinto /usr/share/gemato
+		doexe utils/*.{bash,py}
+	fi
+}
--- a/app-portage/gemato/gemato-14.0m.ebuild
+++ b/app-portage/gemato/gemato-14.0m.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# pyblake2 & pysha3 are broken with pypy3
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
+PYTHON_REQ_USE='threads(+)'
+inherit distutils-r1
+
+MY_PV=${PV%m}+multiprocessing
+MY_P=${PN}-${MY_PV/+/-}
+
+DESCRIPTION="Stand-alone Manifest generation & verification tool"
+HOMEPAGE="https://github.com/mgorny/gemato"
+SRC_URI="https://github.com/mgorny/gemato/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
+IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
+
+MODULE_RDEPEND="
+	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
+	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
+	gpg? ( app-crypt/gnupg )
+	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
+	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
+
+RDEPEND="${MODULE_RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
+	test? ( ${MODULE_RDEPEND} )"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use tools; then
+		exeinto /usr/share/gemato
+		doexe utils/*.{bash,py}
+	fi
+}
+
+pkg_postinst() {
+	elog "The multiprocessing support in gemato may cause the process to hang."
+	elog "Please see https://bugs.gentoo.org/647964 for more details."
+}
--- a/app-portage/gemato/gemato-9999m.ebuild
+++ b/app-portage/gemato/gemato-9999m.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# pyblake2 & pysha3 are broken with pypy3
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
+PYTHON_REQ_USE='threads(+)'
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Stand-alone Manifest generation & verification tool"
+HOMEPAGE="https://github.com/mgorny/gemato"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/mgorny/gemato.git"
+EGIT_BRANCH="multiprocessing"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
+
+MODULE_RDEPEND="
+	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
+	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
+	gpg? ( app-crypt/gnupg )
+	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
+	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
+
+RDEPEND="${MODULE_RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
+	test? ( ${MODULE_RDEPEND} )"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use tools; then
+		exeinto /usr/share/gemato
+		doexe utils/*.{bash,py}
+	fi
+}
+
+pkg_postinst() {
+	elog "The multiprocessing support in gemato may cause the process to hang."
+	elog "Please see https://bugs.gentoo.org/647964 for more details."
+}
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@ -2,10 +2,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.64.tar.xz 533124 BLAKE2B c3e0ecdc2d82af197dabb8434677d4c3bfbbee01c482c496d89d2f7be988ef894e0b3c7cb64337216144644a48ee3213fc1683ae6d75091e471189a4550b8c71 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7
-DIST portage-utils-0.71.tar.xz 555156 BLAKE2B 504973b242f54824ae1f4b135dc1e1021ed0ca6a59d04ef39161255dbebdb7f8870455954ba02987c04c50f6963e7f6c460c4440b2c5ce456b9c489296979e48 SHA512 b9bf4156a1060fec56f9b6348d2d8e83b507a8bff2c507e07bc1c84075082b184d270ca0f89e0f4abf738ce9e8cb8b1f45a211d2dc52cadbdb0ee5d658bf678f
 DIST portage-utils-0.72.tar.xz 1585068 BLAKE2B 33aae0b59cd6f6b7a5503f0282d009c6516f00d14228461359e5124fa104b2ce89019ae5113bac2ed2c975c891d9d5371632ad3dd66572bd6e3ce890895e9ba7 SHA512 9248a1f0d7103f5a26cc01bb8abc5890a0b02b746e06312cd25f0223faa0b59ba7cc0708f272ce327c956086f9a4fcc994bf30b948131da0e63164bba35cf1f2
+DIST portage-utils-0.73.tar.xz 1585564 BLAKE2B b743f459770ebceaa86cc47b0a9d0172ee495bbe2930cd57c2909d3ac2d7c1672447e84240245e1b98922004f4f34418d75b39c7e1550a34a07b964b7ecbcc8d SHA512 d35af62e3b6551c5224a3afb89ebf2e08cf42de266389c3423782c19fcfe8934433a4554ea5ed629de495a66371f0220c479fa84f24d68655211b8538e18d105
 EBUILD portage-utils-0.62.ebuild 2014 BLAKE2B 58941548aecefed7c7a4bee3ec9e60de24ede0380c4a6cb4e3184ff457fb07c946e792d3e60e2a16bef4897b287fd19f9315fdaea4012bc19220379763418812 SHA512 3fc3be2e3e29821cd26cb7d8a9e7e6a026e17c839308039ef2011700677e3f05e2322e367e737e822ccbf1621221f7ff8ca929c6f60817dfdd295981745cda1d
 EBUILD portage-utils-0.64.ebuild 1307 BLAKE2B 19f158c23ac15aa0a9138d8f93d3c1bb6bd48ad9b89031f7e5faa4f643a026e87534857d8463db4aeda445566a1434092b0dbbf97ce96cea51d254f57b0c7549 SHA512 b5ec8a9d06cd50db047d5b758a328c7dbb31690de8f1b7368358bb700bca94f6b22bd32fa79a9f52d76f4a62182cd0cb148fa02418277f398e362b44e50ba7f1
-EBUILD portage-utils-0.71.ebuild 1092 BLAKE2B dc0f835b1e8e2065b6068fd011f2e6a953f046d366f46053dd534a3621379c68707b4612cbce46f74923a5535b280388c4cd3cc4b691826c08bb87d7c6b00ee6 SHA512 1b4a097f7408ebb6634d4b232ad3dc407b444c4dbb73b8d3b1c6b904cabddf0c3c53b4c51cd008355e7586f248fe663beff3a853dbfb847e29c7ab82c16ed390
 EBUILD portage-utils-0.72.ebuild 1092 BLAKE2B 1cadc306a2c0e0b5da2f767b4fbf1c1698d5d6ab33acf9408497a1f8e3bc6bb142c39a31336c99ac915102b10d50c047de6fa7ec0256bc3bfbd4c7a18af4a606 SHA512 94cfbbe0de0be8db8fefed2bb64778f754c7672f58b8f307b8a1fcbde1ab7f60224b626e915641a0166c9bc4de9b9f7c4dccbaf8170f78157af5e9084fc16253
+EBUILD portage-utils-0.73.ebuild 1092 BLAKE2B 1cadc306a2c0e0b5da2f767b4fbf1c1698d5d6ab33acf9408497a1f8e3bc6bb142c39a31336c99ac915102b10d50c047de6fa7ec0256bc3bfbd4c7a18af4a606 SHA512 94cfbbe0de0be8db8fefed2bb64778f754c7672f58b8f307b8a1fcbde1ab7f60224b626e915641a0166c9bc4de9b9f7c4dccbaf8170f78157af5e9084fc16253
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
--- a/app-portage/portage-utils/portage-utils-0.73.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.73.ebuild
@ -5,7 +5,7 @@ EAPI="6"

 inherit toolchain-funcs

-DESCRIPTION="small and fast portage helper tools written in C"
+DESCRIPTION="Small and fast Portage helper tools written in C"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
 SRC_URI="mirror://gentoo/${P}.tar.xz
 	https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
--- a/app-portage/smart-live-rebuild/Manifest
+++ b/app-portage/smart-live-rebuild/Manifest
@ -1,4 +1,6 @@
 DIST smart-live-rebuild-1.3.5.tar.bz2 16004 BLAKE2B fa1fcb13c739ef15b343de3460b029a311a4c08be3ec44ff5c0c89fef4d07fde7fa5558444b25ce234d64b03465b4a401593600f3fec5cbbfba76bdc76fcca34 SHA512 46933334c8c46a056c837e60a5d8aed30a35b1ddd20d7c0f03e813f6cac11cc2dc9469674b1e9c23d94c9ebc474e5eacc7aa0e8f82492554a7f49b438ed740d2
+DIST smart-live-rebuild-1.3.6.tar.gz 17194 BLAKE2B a1c4f07e66ce3328ae70f88d086c33875bed68aea645a180e68fbd997051c6d398c1133d8e9c72378741fe41c519e941e76dc25d9c3f9c61c36531fe6fbe8e79 SHA512 f9fe57269654d69c3b21d0b6e378dfa3d2c00e67dae44278b2b81d631e4645346ecaeb5c9f43b77d39312b97edee247ba8b05303be903d6a3573bc226159c40f
 EBUILD smart-live-rebuild-1.3.5.ebuild 832 BLAKE2B 6e2cdd282bb221449a6ad6b3b245e8c11afd52f34bf0a92a5e2029c03fb848bac6bc1989dd86fe103568fa3491c425786606272f473e89d2118ab4e31024e9bb SHA512 b64f511562e14cc338c5a3a1275b21874d7a4b8b16ff1b7d678327cd1d2f5677daec4377b23763b8a1b3401aac5c7f8319950133ad066ee76464f905585c3a28
+EBUILD smart-live-rebuild-1.3.6.ebuild 834 BLAKE2B 51475f3b8bed594ec4cda14e0ccbc212047bbe926b5e76c699075da1be182746f8e50fa04c113bd45d760a773743c95f73624e266b996490d764d3df1bde2249 SHA512 607ce34040450a962ce31a971496d689da6c1e066337c318de8ccd4e8878a5970c5ca6e74781df0706db94028ad5616e024bede53c87572c917ccb7742837d1b
 EBUILD smart-live-rebuild-9999.ebuild 740 BLAKE2B 6fee19f8e59b7da874e9edafbbb794285c11a7338e531062d30deb73dd51f1e2e8287ed1887fb4146e54665b083b419fac14214c0d5104d934c2fdf1aa2c56f9 SHA512 87bef6aa7cb90ab260b8eab9dcaae46b2d2a3ec92c2117fbb53535e3841b8f903a706bc972cf5db7196459878330ad5caefe8bfc6b13ad57b57d2e29595e257a
 MISC metadata.xml 769 BLAKE2B 5aaad83253d55d1096c19aeb6a980e31456ca20a1ecfdb45e93dfd2f72cff7cce61124bf546932266d24d0c9fd0493ae4c61089ab291028360834c2f6d237e5a SHA512 d11c942868f0166c646922088dfecf3047f8ca017b85965382bec8fc794e11d6ffdea27a9156a41faec10a79a13836b13d8b9213a44e57672e1355fbd6bfd0da
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Check live packages for updates and emerge them as necessary"
+HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
+SRC_URI="https://github.com/mgorny/smart-live-rebuild/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
+
+# Tests need to be fixed
+RESTRICT=test
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/portage
+	newins smart-live-rebuild.conf{.example,}
+	insinto /usr/share/portage/config/sets
+	newins sets.conf.example smart-live-rebuild.conf
+}
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/mecab/Manifest
+++ b/app-text/mecab/Manifest
@ -1,4 +1,4 @@
 AUX mecab-0.98-iconv.patch 302 BLAKE2B 3644a66b1bdf9099ff0258a057c930c1b2e065836b0e6332211e4d04efbbf39da1de2788d90143826a1c9d887fcb63042e533864e746b7c385baea485cb93490 SHA512 c0dcaa8637f1c16a33bd4dd4007225a4f1ed3f0eebcda28dc7d92ec0a66ea16b5bdd956fb3a904af8070ce0ac2d6c9090b602b4705e73fac1100a845b3a756ce
 DIST mecab-0.996.tar.gz 1398663 BLAKE2B 97ea18a00c6f2284c994681631b84a572d244b741c8e30b5fdf5404b2bf80fdd4c724c803999955e36ee252e59e6644716dbdca55a6ffb2e4de52193d7f777bd SHA512 aca6d16f411b9ba9b6687242246aeb28ede6d6c6a9122d4a32da9d8e76e79b5f4af2c8e3b13ad9462b34e9d2994cbd9bbbedebac45609684db9b703da999577f
-EBUILD mecab-0.996.ebuild 1133 BLAKE2B ddc7e387dc68793f75bc7a58132d0f99a8fe1820c733560209bf2730ebadd70a38715f82dc3d1f779272870ce7fea0323bd0890b2d18f641d9fe13c9e12f0a11 SHA512 93658fdd5a23235aecaf8b4a415be8c2fe21c0d7ba89f8f77b4a5f1d7475091c1f3d86d0892bafb20d17b8bfd963b930556d09349aa944a341a9ac357cfe4a67
+EBUILD mecab-0.996-r1.ebuild 1177 BLAKE2B 18b4d1070b00d682411d1908312c4e01e700af26aaddfc3d8e3f0f10e4ca5b2ff2ff023723b7eb9d673c09052a710cc33d507bcf61036e6dfa91a27fc476194b SHA512 5cbf8c0f4caa80fbce2a4148113d74ada27fd9b2733cfb6c616e5bc836e54a608f9e1f3c658f9efb3d4f080e2e97203248264b406bf7fefd3a37b3e12f032d59
 MISC metadata.xml 412 BLAKE2B ca6440887d39a7ded3f9d000ec965344164f69dfdf0e98bd070cdc531804d7c94d74fe9a6a3ead7876fd9bf39eacbe5649b3e5357b1083f30d78ac51fd0a7afa SHA512 78feb6a8557ee197f02071540a3c6836cebec69cffc3d32a22f8563008614da66a6b26fafa0dae24b0c21cb7492e203c096f67c5482d1ffe617098b0db0670e0
--- a/app-text/mecab/mecab-0.996-r1.ebuild
+++ b/app-text/mecab/mecab-0.996-r1.ebuild
@ -30,9 +30,10 @@ src_prepare() {
 	sed -i \
 		-e "/CFLAGS/s/-O3/${CFLAGS}/" \
 		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
-		configure.in || die
+		configure.in
+	sed -i "s:/lib:/$(get_libdir):" ${PN}rc.in

-	mv configure.{in,ac}
+	mv configure.{in,ac} || die
 	eautoreconf
 }

--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@ -3,10 +3,13 @@ AUX boost-1.55.0-context-x32.patch 1077 BLAKE2B 76ff0e52ca076ccddd58a469b4531f49
 AUX boost-1.56.0-build-auto_index-tool.patch 412 BLAKE2B 4449dbe600547f339eba9afc4d3da5310f08baa2dd1beb30f9c1b4076e95e867c8fa84fef8a84e2aa38bf35368173e52057e73499a66766cbb81e2d3312fa07b SHA512 9fe245adddf76375d0ee8066952c46d229c9e37fdce83ff608fcc1fb5942b1c226a0fba6e28f859bbcd58863dc49a356f32c7fcc3b90baca4069c6bdc9c0f203
 AUX boost-1.63.0-fix-python.patch 4210 BLAKE2B f39a501c9a2718ff77300d97ec8d1ec0a99e90b6f4f2f4ef970a5daaebe1065a870d98f759c0e946707251a93bda0c54f3f864b1e4189f915226d638738e7dca SHA512 0f390cae5a53f48f548e65149aaca4b1191ca6610863e7e471686556107c8ac398eb4bcad71a92849e941cad031cec9cbd543c646ee122238579ca881c420aad
 AUX boost-1.65.0-fix-python.patch 9210 BLAKE2B 31e32cfbc8fa0c4e8a5c142f56a4a7b1d06173b6a5b7b4bc1c2fcc64e645eac22e9e4f85c8b278a1fcefcb15e389a38d82ec90facdbb1e7812f9f4cc77d2fe93 SHA512 df2e8841b3415724b2920230da36e3e3aa610a5d7ee7dcada847cb4d6c921405ef4f0c034f96d1ac078d33bb3f32408b748cf7835f173b6e7692c76c6135e2f2
+AUX boost-1.67.0-fix-python.patch 6017 BLAKE2B e249ea8f387bb2b87f58bb2a538992ea20c12ad2a127da940bc86f1b6f5231a5d8b77b46cd8e946b723b2e0a2d05240e1bbf66ab738980f95f2407e325bc6bc5 SHA512 bcd0c5fad2dc5ca4964f6b366fb5bb2d5e016b0d67480a3abebee03743d337c8514b580d610e9cbe215bd1602a6846963aeab7f04ac72cbc0ed146c7869b4f32
 DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 227c4432bd3ca0eb390048ec85047958fcb6ae289996501812cd8b13bf74bbe9b677d0110948265cab59a60deb36c4fc08440af74ac5a5219ea4eaea4fa6918f SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad
 DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
 DIST boost_1_66_0.tar.bz2 85995778 BLAKE2B 9ab1fe396b10ab85d7e4084ec7abb8d785ecd892c8f51aea5a401cb565b111c256533364fe028da74ed376534889f43c5ccbdcd703cd236526ae66a064220765 SHA512 0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b
+DIST boost_1_67_0.tar.bz2 87336566 BLAKE2B 85ea00fc2197b1bbfc35d69427c87f23ea43d7592f1c9ce66e2afcde8476bdec86f6debdac815b23de59f4665a8e0c7f1519ab66a31d39df629723bc45710058 SHA512 82bf33d7d2c3db109c9d1f12d40bc2d364c8c95262386f906ccd1a71cd71433bcc01829e968b4a13a5003cf0b50cbdf0b435a1d76530cea7bb05725c327411e8
 EBUILD boost-1.63.0.ebuild 12466 BLAKE2B 7aedf34bbef100bb52457e3906422ae22435a34486a921f60a7b0a5a4f48f251228331f1cebb9317c1c43355a8dffb4f9f555e4477136fc4cfc51f057b118c0f SHA512 215acc04fd1fc80271bb1d64c5e508a1c9162613ea526aabf291445f58a6f547155c0d000987a3a98c8dde8387db012978c42b140d03352b52f91df33d18aa5a
 EBUILD boost-1.65.0.ebuild 12442 BLAKE2B 961453196627d0671eb5e3e38292156ddaa94418941f503312aad0c949b320c14d98a88f8c8e91f8b76f3ce150235f66f80f7dade71b710ebfb5a94517f8897d SHA512 e11e282a61f07cdfa1bd24d3032baacf064518f1fbd65c432d04ebf1e1f890879302f64e800cb005bda5c3cee015cf86c327fa546ef8f7bd7f937871f6129fef
 EBUILD boost-1.66.0.ebuild 12459 BLAKE2B 6653ddd8bc307f9c91166bac312ee146e174bf09cfbc28afb3dbb8aff8bf286bb37f766bc2735f0cedd5cb113bd26637a3116bdeb6be0afca93d6bd80a89c093 SHA512 6ccbd309c502220afb9da6abedb36fb52791dcaee848acc102c1fcf69f538e3477939b14c0a1892fd31babf3002307adae2b310503d1f9bd17d2393611b2ce6a
+EBUILD boost-1.67.0.ebuild 12358 BLAKE2B 5d420ea8d2209632e8fb7a0a49fdf31b24ab07e4986ef4d5f7ec9c08ef239d9b06c9d4e4fd61efdd73aa211566a664cddc76f48b2af0482ac5ebd83de2f46e41 SHA512 649f9d15de4c8c6d614fe1103cf7357c7b96ad37a2fa18679ee3640a3e174299d40489f8497876ec68118fca4c11765c8ff6b287b916375958a5419ce7f6a9c8
 MISC metadata.xml 1526 BLAKE2B 11c2e9eb5b41e3fa0b100d58d672acefe4a949d0fa428b4ce1d100cc8f95eec7c1279c725741033ca50f61cb258b388270c18361a5b714a684398cc3ae1a445c SHA512 4ba131f2492ae41f642a28dd69e5bd1d5d79c013e42a6c18ba135b36d470990ea20c8aa7cec6e3cb1d6ea8d7f6b6a5b45efb4b3dcba198bcf43809eff0f65ae6
--- a/dev-libs/boost/boost-1.67.0.ebuild
+++ b/dev-libs/boost/boost-1.67.0.ebuild
@ -0,0 +1,419 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit eutils flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
+
+MY_P="${PN}_$(ver_rs 1- _)"
+MAJOR_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="https://www.boost.org/"
+SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+
+IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
+
+RDEPEND="icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
+	python? (
+		${PYTHON_DEPS}
+		>dev-python/numpy-1.7[${PYTHON_USEDEP}]
+	)
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	!app-admin/eselect-boost"
+DEPEND="${RDEPEND}
+	=dev-util/boost-build-${MAJOR_V}*"
+REQUIRED_USE="
+	mpi? ( threads )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+# the tests will never fail because these are not intended as sanity
+# tests at all. They are more a way for upstream to check their own code
+# on new compilers. Since they would either be completely unreliable
+# (failing for no good reason) or completely useless (never failing)
+# there is no point in having them in the ebuild to begin with.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch"
+	"${FILESDIR}/${PN}-1.55.0-context-x32.patch"
+	"${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch"
+	"${FILESDIR}/${PN}-1.67.0-fix-python.patch"
+)
+
+python_bindings_needed() {
+	multilib_is_native_abi && use python
+}
+
+tools_needed() {
+	multilib_is_native_abi && use tools
+}
+
+create_user-config.jam() {
+	local compiler compiler_version compiler_executable
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		compiler="darwin"
+		compiler_version="$(gcc-fullversion)"
+		compiler_executable="$(tc-getCXX)"
+	else
+		compiler="gcc"
+		compiler_version="$(gcc-version)"
+		compiler_executable="$(tc-getCXX)"
+	fi
+	local mpi_configuration python_configuration
+
+	if use mpi; then
+		mpi_configuration="using mpi ;"
+	fi
+
+	if python_bindings_needed; then
+		# boost expects libpython$(pyver) and doesn't allow overrides
+		# and the build system is so creepy that it's easier just to
+		# provide a symlink (linker's going to use SONAME anyway)
+		# TODO: replace it with proper override one day
+		ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die
+
+		if tc-is-cross-compiler; then
+			python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
+		else
+			# note: we need to provide version explicitly because of
+			# a bug in the build system:
+			# https://github.com/boostorg/build/pull/104
+			python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
+		fi
+	fi
+
+	cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ || die
+using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
+${mpi_configuration}
+${python_configuration}
+__EOF__
+}
+
+pkg_setup() {
+	# Bail out on unsupported build configuration, bug #456792
+	if [[ -f "${EROOT%/}/etc/site-config.jam" ]]; then
+		grep -q gentoorelease "${EROOT%/}/etc/site-config.jam" && grep -q gentoodebug "${EROOT%/}/etc/site-config.jam" ||
+		(
+			eerror "You are using custom ${EROOT%/}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+			eerror "Boost can not be built in such configuration."
+			eerror "Please, either remove this file or add targets from ${EROOT%/}/usr/share/boost-build/site-config.jam to it."
+			die
+		)
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Do not try to build missing 'wave' tool, bug #522682
+	# Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
+	sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
+
+	multilib_copy_sources
+}
+
+ejam() {
+	local b2_opts=(
+		"--user-config=${BOOST_ROOT}/user-config.jam"
+		"$@"
+	)
+	echo b2 "${b2_opts[@]}"
+	b2 "${b2_opts[@]}"
+}
+
+src_configure() {
+	# Workaround for too many parallel processes requested, bug #506064
+	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
+
+	OPTIONS=(
+		$(usex debug gentoodebug gentoorelease)
+		"-j$(makeopts_jobs)"
+		-q
+		-d+2
+		pch=off
+		$(usex icu "-sICU_PATH=${EPREFIX}/usr" '--disable-icu boost.locale.icu=off')
+		$(usex mpi '' '--without-mpi')
+		$(usex nls '' '--without-locale')
+		$(usex context '' '--without-context --without-coroutine --without-fiber')
+		$(usex threads '' '--without-thread')
+		--boost-build="${EPREFIX}"/usr/share/boost-build
+		--prefix="${ED%/}/usr"
+		--layout=system
+		# building with threading=single is currently not possible
+		# https://svn.boost.org/trac/boost/ticket/7105
+		threading=multi
+		link=$(usex static-libs shared,static shared)
+		$([[ ${CHOST} == *-winnt* ]] && printf -- '-sNO_BZIP2=1\n')
+	)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# We need to add the prefix, and in two cases this exceeds, so prepare
+		# for the largest possible space allocation.
+		append-ldflags -Wl,-headerpad_max_install_names
+	elif [[ ${CHOST} == *-winnt* ]]; then
+		compiler=parity
+		if [[ $($(tc-getCXX) -v) == *trunk* ]]; then
+			compilerVersion=trunk
+		else
+			compilerVersion=$($(tc-getCXX) -v | sed '1q' \
+				| sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^ \t]*\) .*,\2,') || die "sed failed"
+		fi
+		compilerExecutable=$(tc-getCXX)
+	fi
+
+	# bug 298489
+	if use ppc || use ppc64; then
+		[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
+	fi
+
+	# Use C++14 globally as of 1.62
+	append-cxxflags -std=c++14
+}
+
+multilib_src_compile() {
+	local -x BOOST_ROOT="${BUILD_DIR}"
+	PYTHON_DIRS=""
+	MPI_PYTHON_MODULE=""
+
+	building() {
+		create_user-config.jam
+
+		local PYTHON_OPTIONS
+		if python_bindings_needed; then
+			PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
+		else
+			PYTHON_OPTIONS=" --without-python"
+		fi
+
+		ejam \
+			"${OPTIONS[@]}" \
+			${PYTHON_OPTIONS} \
+			|| die "Building of Boost libraries failed"
+
+		if python_bindings_needed; then
+			if [[ -z "${PYTHON_DIRS}" ]]; then
+				PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
+			else
+				if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
+					die "Inconsistent structure of build directories"
+				fi
+			fi
+
+			local dir
+			for dir in ${PYTHON_DIRS}; do
+				mv ${dir} ${dir}-${EPYTHON} \
+					|| die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed"
+			done
+
+			if use mpi; then
+				if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
+					MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
+					if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
+						die "Multiple mpi.so files found"
+					fi
+				else
+					if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
+						die "Inconsistent structure of build directories"
+					fi
+				fi
+
+				mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \
+					|| die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed"
+			fi
+		fi
+	}
+	if python_bindings_needed; then
+		python_foreach_impl building
+	else
+		building
+	fi
+
+	if tools_needed; then
+		pushd tools >/dev/null || die
+
+		ejam \
+			"${OPTIONS[@]}" \
+			${PYTHON_OPTIONS} \
+			|| die "Building of Boost tools failed"
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_install_all() {
+	if ! use python; then
+		rm -r "${ED%/}"/usr/include/boost/python* || die
+	fi
+
+	if ! use nls; then
+		rm -r "${ED%/}"/usr/include/boost/locale || die
+	fi
+
+	if ! use context; then
+		rm -r "${ED%/}"/usr/include/boost/context || die
+		rm -r "${ED%/}"/usr/include/boost/coroutine{,2} || die
+		rm "${ED%/}"/usr/include/boost/asio/spawn.hpp || die
+	fi
+
+	if use doc; then
+		# find extraneous files that shouldn't be installed
+		# as part of the documentation and remove them.
+		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
+		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
+		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
+
+		docinto html
+		dodoc *.{htm,html,png,css}
+		dodoc -r doc libs more tools
+
+		# To avoid broken links
+		dodoc LICENSE_1_0.txt
+
+		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
+	fi
+}
+
+multilib_src_install() {
+	local -x BOOST_ROOT="${BUILD_DIR}"
+	installation() {
+		create_user-config.jam
+
+		local PYTHON_OPTIONS
+		if python_bindings_needed; then
+			local dir
+			for dir in ${PYTHON_DIRS}; do
+				cp -pr ${dir}-${EPYTHON} ${dir} \
+					|| die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed"
+			done
+
+			if use mpi; then
+				cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \
+					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed"
+				cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \
+					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed"
+			fi
+			PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
+		else
+			PYTHON_OPTIONS=" --without-python"
+		fi
+
+		ejam \
+			"${OPTIONS[@]}" \
+			${PYTHON_OPTIONS} \
+			--includedir="${ED%/}/usr/include" \
+			--libdir="${ED%/}/usr/$(get_libdir)" \
+			install || die "Installation of Boost libraries failed"
+
+		if python_bindings_needed; then
+			rm -r ${PYTHON_DIRS} || die
+
+			# Move mpi.so Python module to Python site-packages directory.
+			# https://svn.boost.org/trac/boost/ticket/2838
+			if use mpi; then
+				local moddir=$(python_get_sitedir)/boost
+				# moddir already includes eprefix
+				mkdir -p "${D}${moddir}" || die
+				mv "${ED%/}/usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die
+				cat << EOF > "${D}${moddir}/__init__.py" || die
+import sys
+if sys.platform.startswith('linux'):
+	import DLFCN
+	flags = sys.getdlopenflags()
+	sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
+	from . import mpi
+	sys.setdlopenflags(flags)
+	del DLFCN, flags
+else:
+	from . import mpi
+del sys
+EOF
+			fi
+
+			python_optimize
+		fi
+	}
+	if python_bindings_needed; then
+		python_foreach_impl installation
+	else
+		installation
+	fi
+
+	pushd "${ED%/}/usr/$(get_libdir)" >/dev/null || die
+
+	local ext=$(get_libname)
+	if use threads; then
+		local f
+		for f in *${ext}; do
+			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
+		done
+	fi
+
+	popd >/dev/null || die
+
+	if tools_needed; then
+		dobin dist/bin/*
+
+		insinto /usr/share
+		doins -r dist/share/boostbook
+	fi
+
+	# boost's build system truely sucks for not having a destdir.  Because for
+	# this reason we are forced to build with a prefix that includes the
+	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
+	# but to do it the dirty way of manually setting the right install_names.
+	if [[ ${CHOST} == *-darwin* ]]; then
+		einfo "Working around completely broken build-system(tm)"
+		local d
+		for d in "${ED%/}"/usr/lib/*.dylib; do
+			if [[ -f ${d} ]]; then
+				# fix the "soname"
+				ebegin "  correcting install_name of ${d#${ED}}"
+				install_name_tool -id "/${d#${D}}" "${d}"
+				eend $?
+				# fix references to other libs
+				refs=$(otool -XL "${d}" | \
+					sed -e '1d' -e 's/^\t//' | \
+					grep "^libboost_" | \
+					cut -f1 -d' ')
+				local r
+				for r in ${refs}; do
+					ebegin "    correcting reference to ${r}"
+					install_name_tool -change \
+						"${r}" \
+						"${EPREFIX}/usr/lib/${r}" \
+						"${d}"
+					eend $?
+				done
+			fi
+		done
+	fi
+}
+
+pkg_preinst() {
+	# Yai for having symlinks that are nigh-impossible to remove without
+	# resorting to dirty hacks like these. Removes lingering symlinks
+	# from the slotted versions.
+	local symlink
+	for symlink in "${EROOT%/}/usr/include/boost" "${EROOT%/}/usr/share/boostbook"; do
+		if [[ -L ${symlink} ]]; then
+			rm -f "${symlink}" || die
+		fi
+	done
+
+	# some ancient installs still have boost cruft lying around
+	# for unknown reasons, causing havoc for reverse dependencies
+	# Bug: 607734
+	rm -rf "${EROOT%/}"/usr/include/boost-1_[3-5]? || die
+}
--- a/dev-libs/boost/files/boost-1.67.0-fix-python.patch
+++ b/dev-libs/boost/files/boost-1.67.0-fix-python.patch
@ -0,0 +1,153 @@
+Python module needs to be built without these extra renames.
+MPI module needs to reference correct python
+
+~Index: boost_1_64_0/libs/mpi/build/Jamfile.v2
+~===================================================================
+~--- boost_1_64_0.orig/libs/mpi/build/Jamfile.v2
+~+++ boost_1_64_0/libs/mpi/build/Jamfile.v2
+~@@ -61,10 +61,10 @@ libraries += boost_mpi ;
+~     lib boost_mpi_python
+~       : # Sources
+~         python/serialize.cpp
+~+        /user-config//boost_python_alias
+~       : # Requirements
+~         <library>boost_mpi
+~         <library>/mpi//mpi [ mpi.extra-requirements ]
+~-      	<library>/boost/python//boost_python
+~         <link>shared:<define>BOOST_MPI_DYN_LINK=1
+~         <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
+~         <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
+~@@ -92,8 +92,8 @@ libraries += boost_mpi ;
+~         python/skeleton_and_content.cpp
+~         python/status.cpp
+~         python/py_timer.cpp
+~+        /user-config//boost_python_alias
+~       : # Requirements
+~-      	<library>/boost/python//boost_python
+~         <library>boost_mpi_python
+~         <library>boost_mpi
+~         <library>/mpi//mpi [ mpi.extra-requirements ]
+Index: boost_1_67_0/libs/mpi/build/Jamfile.v2
+===================================================================
+--- boost_1_67_0.orig/libs/mpi/build/Jamfile.v2
+++ boost_1_67_0/libs/mpi/build/Jamfile.v2
+@@ -60,33 +60,13 @@ libraries += boost_mpi ;
+
+   if [ python.configured ]
+   {
+-    py2-version = [ py-version 2 ] ;
+-    py3-version = [ py-version 3 ] ;
+-
+-    # These library names are synchronized with those defined by Boost.Python, see libs/python/build/Jamfile.
+-    lib_boost_python(2) = boost_python ;
+-    lib_boost_python(3) = boost_python3 ;
+-
+-    lib_boost_python($(py2-version)) = $(lib_boost_python(2)) ;
+-    lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ;
+-
+-    lib_boost_mpi_python(2) = boost_mpi_python ;
+-    lib_boost_mpi_python(3) = boost_mpi_python3 ;
+-
+-    lib_boost_mpi_python($(py2-version)) = $(lib_boost_mpi_python(2)) ;
+-    lib_boost_mpi_python($(py3-version)) = $(lib_boost_mpi_python(3)) ;
+-
+-    for local N in 2 3
+-    {
+-        if $(py$(N)-version)
+-        {
+-            lib $(lib_boost_mpi_python($(py$(N)-version)))
+    lib boost_mpi_python
+               : # Sources
+                 python/serialize.cpp
+               : # Requirements
+                 <library>boost_mpi
+                 <library>/mpi//mpi [ mpi.extra-requirements ]
+-                <library>/boost/python//$(lib_boost_python($(py$(N)-version)))
+                <library>/boost/python//boost_python
+                 <link>shared:<define>BOOST_MPI_DYN_LINK=1
+                 <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
+                 <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
+@@ -94,12 +74,12 @@ libraries += boost_mpi ;
+                 -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
+                 <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
+                 <python-debugging>on:<define>BOOST_DEBUG_PYTHON
+-                <python>$(py$(N)-version)
+               : # Default build
+                 <link>shared
+               : # Usage requirements
+                 <library>/mpi//mpi [ mpi.extra-requirements ]
+               ;
+            libraries += boost_mpi_python ;
+
+             python-extension mpi
+               : # Sources
+@@ -116,8 +96,8 @@ libraries += boost_mpi ;
+                 python/status.cpp
+                 python/py_timer.cpp
+               : # Requirements
+-                <library>/boost/python//$(lib_boost_python($(py$(N)-version)))
+-                <library>$(lib_boost_mpi_python($(py$(N)-version)))
+        <library>/boost/python//boost_python
+        <library>boost_mpi_python
+                 <library>boost_mpi
+                 <library>/mpi//mpi [ mpi.extra-requirements ]
+                 <link>shared:<define>BOOST_MPI_DYN_LINK=1
+@@ -125,16 +105,7 @@ libraries += boost_mpi ;
+                 <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
+                 <link>shared <runtime-link>shared
+                 <python-debugging>on:<define>BOOST_DEBUG_PYTHON
+-                <python>$(py$(N)-version)
+               ;
+-
+-            libraries += $(lib_boost_mpi_python($(py$(N)-version))) ;
+-        }
+-        else
+-        {
+-            alias $(lib_boost_mpi_python($(N))) ;
+-        }
+-    }
+   }
+ }
+ else if ! ( --without-mpi in  [ modules.peek : ARGV ] )
+Index: boost_1_67_0/libs/python/Jamfile
+===================================================================
+--- boost_1_67_0.orig/libs/python/Jamfile
+++ boost_1_67_0/libs/python/Jamfile
+@@ -36,9 +36,10 @@ local rule split-version ( version )
+ # For example, Boost.Python built for Python 2.7 uses the suffix "27"
+ rule version-suffix ( version )
+ {
+-    local major-minor = [ split-version $(version) ] ;
+-    local suffix = $(major-minor:J="") ;
+-    return $(suffix) ;
+    # local major-minor = [ split-version $(version) ] ;
+    # local suffix = $(major-minor:J="") ;
+    # return $(suffix) ;
+    return "" ;
+ }
+
+
+diff -ur boost_1_67_0.orig/boostcpp.jam boost_1_67_0/boostcpp.jam
+--- boost_1_67_0.orig/boostcpp.jam	2018-07-30 16:26:03.346187542 -0700
+++ boost_1_67_0/boostcpp.jam	2018-07-30 16:26:18.839081472 -0700
+@@ -105,7 +105,7 @@
+ python-id = [ option.get "python-buildid" ] ;
+ if $(python-id)
+ {
+-    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" _ ] ;
+    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" _ ] ;
+ }
+
+
+diff -ur boost_1_67_0.orig/libs/python/Jamfile boost_1_67_0/libs/python/Jamfile
+--- boost_1_67_0.orig/libs/python/Jamfile	2018-07-30 14:56:15.591366992 -0700
+++ boost_1_67_0/libs/python/Jamfile	2018-07-30 16:26:31.662993677 -0700
+@@ -47,7 +47,7 @@
+ python-id = [ option.get "python-buildid" ] ;
+ if $(python-id)
+ {
+-    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" _ ] ;
+    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" _ ] ;
+ }
+
+ rule python-tag ( name : type ? : property-set )
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@ -5,5 +5,4 @@ DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae
 EBUILD efl-1.17.0-r1.ebuild 7068 BLAKE2B e0ce5cf1e86f41918799a7ceebfa341726ea9a700c7e2e4d89acedaf595171b12bef11261fed2bea14c4099fa63fcf063d0eddb49c1dcf490449f936ec4dd1c8 SHA512 a5293c2f97a4976fe3681ad8da97918f37a0bd47bf37cf38d4f025ad7512782e967deaef1d2f80c624ccf57c8b68b74f8288a9b223f710dcee3bde515d454be2
 EBUILD efl-1.18.4-r1.ebuild 7298 BLAKE2B d88740f4081b53d274f36e1f8200dd917030b6246cc88d8f9f2b24569ff79a69f2b7e68e76d61e2123297315850d03c3273894ffc0a508d425724fb25395ddd3 SHA512 2e2992916f6af3acec5af00c3d5c3e781414fb2c35c13000a18786dfd0e46ba27506130010900cbe75da80f33fa62410ccfb597be4b77d2770773bdf87be7faa
 EBUILD efl-1.20.7-r1.ebuild 7785 BLAKE2B 6f9cff3f6fbf9a8169251b5e89b447cf20a9d9a187efe24681dc6d6e5e6fa912018df393444fd7720d0605116c68f0ad0c7173192ca720ccb3472da57d11e6b0 SHA512 3433be6e2fe8913671f8028fbd2566ea98fb4f14c9184086f4bd13760aaa153769b024dd57faa7e0c5327b6de961f55175c5d35ecc515b7e76a11c595f6e0d0d
-EBUILD efl-1.20.7.ebuild 8732 BLAKE2B a9d1650012beaabce5e423b9d15ac362e9298f30ca67033950f1fd2fcf0ea233ac7c1f923c3f7ecefa04cffe52d4e4bc4017e6ec68049c7588c51f2436dee513 SHA512 befffaca4129e3ddc6a4db04efa0c58a04eef1343f656b22541c0423fffaa7f9e63fd62d1d53171c5cb874ae0494de77a1f0d4c95307dfe1dc8c5d6b1af1d791
-MISC metadata.xml 2292 BLAKE2B f2d83b012b8bbeef3f7841290eb25016ebdd042c2afe66e04b7ceabbb1ef3b627bbaef099047e4b0f9ce364c7488bf06369f4b140b8c5b3f8fe639f59dd2d2d0 SHA512 efdbe9d36bda51b5184e7a664f945c70fb776509c6e3826f2801b0cf5a6dac8cd1304e3e041c130b665acc36f9ef53180648b4a09b15bbf2b1b7265f824cefa1
+MISC metadata.xml 2242 BLAKE2B 5bcbcb78454bc3640d839857c026114a69f485bbbe934cc2db098168368c34e0840e37389628e8c0425e9045833735c58c8c1a36132a76d36c3eeef4d8c557f7 SHA512 65a10606f3e77f82a26b4cf9fdba2a4ef1358fcd041ee5bbffe2a932477597479cdc604dd5df1a4cb0384709116b1d9430f1815f5020b1ff7cf4eeea7d8cd0f3
--- a/dev-libs/efl/efl-1.20.7.ebuild
+++ b/dev-libs/efl/efl-1.20.7.ebuild
@ -1,346 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P=${P/_/-}
-
-if [[ "${PV}" == "9999" ]] ; then
-	EGIT_SUB_PROJECT="core"
-	EGIT_URI_APPEND="${PN}"
-elif [[ *"${PV}" == *"_pre"* ]] ; then
-	MY_P=${P%%_*}
-	SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
-else
-	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-inherit enlightenment gnome2-utils pax-utils xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-IUSE="avahi +bmp dds connman debug drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound svg systemd tga tgv tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm"
-
-REQUIRED_USE="
-	?? ( opengl gles )
-	fbcon? ( !tslib )
-	gles? (
-		|| ( X wayland )
-		!sdl
-		egl
-	)
-	gnutls? ( ssl )
-	ibus? ( glib )
-	libressl? ( ssl )
-	opengl? ( || ( X sdl wayland ) )
-	pulseaudio? ( sound )
-	sdl? ( opengl )
-	vnc? ( X fbcon )
-	wayland? ( egl !opengl gles )
-	xim? ( X )
-"
-
-RDEPEND="
-	avahi? ( net-dns/avahi )
-	connman? ( net-misc/connman )
-	drm? (
-		>=dev-libs/libinput-0.8
-		media-libs/mesa[gbm]
-		>=x11-libs/libdrm-2.4
-		>=x11-libs/libxkbcommon-0.3.0
-	)
-	fontconfig? ( >=media-libs/fontconfig-2.5.0 )
-	fribidi? ( >=dev-libs/fribidi-0.19.2 )
-	gif? ( media-libs/giflib:= )
-	glib? ( dev-libs/glib:2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.6 )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	harfbuzz? ( >=media-libs/harfbuzz-0.9.0 )
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( >=app-i18n/ibus-1.4 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	libuv? ( dev-libs/libuv )
-	luajit? ( >=dev-lang/luajit-2.0.0 )
-	!luajit? ( dev-lang/lua:* )
-	pdf? ( >=app-text/poppler-0.45.0[cxx] )
-	physics? ( >=sci-physics/bullet-2.80 )
-	pixman? ( x11-libs/pixman )
-	postscript? ( app-text/libspectre )
-	media-libs/libpng:0=
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw )
-	scim? ( app-i18n/scim )
-	sdl? (
-		>=media-libs/libsdl2-2.0.0
-		virtual/opengl
-	)
-	sound? ( media-libs/libsndfile )
-	svg? (
-		>=gnome-base/librsvg-2.36.0
-		>=x11-libs/cairo-1.0.0
-	)
-	systemd? ( >=sys-apps/systemd-209 )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib )
-	unwind? ( sys-libs/libunwind )
-	valgrind? ( dev-util/valgrind )
-	vlc? ( media-video/vlc )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		>=dev-libs/wayland-1.11.0
-		>=x11-libs/libxkbcommon-0.6.0
-		media-libs/mesa[gles2,wayland]
-	)
-	webp? ( media-libs/libwebp )
-	X? (
-		>=media-libs/freetype-2.5.0.1
-		x11-libs/libXcursor
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libXScrnSaver
-
-		opengl? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-
-		gles? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		xpresent? ( x11-libs/libXpresent )
-		)
-	)
-	xine? ( >=media-libs/xine-lib-1.1.1 )
-	xpm? ( x11-libs/libXpm )
-
-	sys-apps/dbus
-	>=sys-apps/util-linux-2.20.0
-	sys-libs/zlib
-	virtual/jpeg:0=
-
-	!dev-libs/ecore
-	!dev-libs/edbus
-	!dev-libs/eet
-	!dev-libs/eeze
-	!dev-libs/efreet
-	!dev-libs/eina
-	!dev-libs/eio
-	!dev-libs/embryo
-	!dev-libs/eobj
-	!dev-libs/ephysics
-	!media-libs/edje
-	!media-libs/elementary
-	!media-libs/emotion
-	!media-libs/ethumb
-	!media-libs/evas
-	!media-plugins/emotion_generic_players
-	!media-plugins/evas_generic_loaders
-"
-#external lz4 support currently broken because of unstable ABI/API
-#	app-arch/lz4
-
-#soft blockers added above for binpkg users
-#hard blocks are needed for building
-CORE_EFL_CONFLICTS="
-	!!dev-libs/ecore
-	!!dev-libs/edbus
-	!!dev-libs/eet
-	!!dev-libs/eeze
-	!!dev-libs/efreet
-	!!dev-libs/eina
-	!!dev-libs/eio
-	!!dev-libs/embryo
-	!!dev-libs/eobj
-	!!dev-libs/ephysics
-	!!media-libs/edje
-	!!media-libs/emotion
-	!!media-libs/ethumb
-	!!media-libs/evas
-"
-
-DEPEND="
-	${CORE_EFL_CONFLICTS}
-
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	# Get clean environment, see bug 557408
-	xdg_environment_reset
-	chown portage:portage -R "${HOME}"
-}
-
-src_prepare() {
-	enlightenment_src_prepare
-
-	# Remove stupid sleep command.
-	# Also back out gnu make hack that causes regen of Makefiles.
-	# Delete var setting that causes the build to abort.
-	sed -i \
-		-e '/sleep 10/d' \
-		-e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \
-		-e '/BARF_OK=/s:=.*:=:' \
-		configure || die
-
-	# Upstream doesn't offer a configure flag. #611108
-	if ! use unwind ; then
-		sed -i \
-			-e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	if use ssl && use gnutls ; then
-		einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;"
-		einfo "gnutls has been selected for you."
-	fi
-	if use opengl && use gles ; then
-		einfo "You enabled both USE=opengl and USE=gles, but only one can be used;"
-		einfo "opengl has been selected for you."
-	fi
-
-	E_ECONF=(
-		--with-profile=$(usex debug debug release)
-		--with-net-control=$(usex connman connman none)
-		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
-		--with-x11=$(usex X xlib none)
-		$(use_with X x)
-		--with-opengl=$(usex opengl full $(usex gles es none))
-		--with-glib=$(usex glib)
-		--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
-
-		$(use_enable avahi)
-		$(use_enable bmp image-loader-bmp)
-		$(use_enable bmp image-loader-wbmp)
-		$(use_enable dds image-loader-dds)
-		$(use_enable drm)
-		$(use_enable drm elput)
-		$(use_enable doc)
-		$(use_enable eet image-loader-eet)
-		$(use_enable egl)
-		$(use_enable examples always-build-examples)
-		$(use_enable fbcon fb)
-		$(use_enable fontconfig)
-		$(use_enable fribidi)
-		$(use_enable gif image-loader-gif)
-		$(use_enable gstreamer gstreamer1)
-		$(use_enable harfbuzz)
-		$(use_enable hyphen)
-		$(use_enable ico image-loader-ico)
-		$(use_enable ibus)
-		$(use_enable ivi wayland-ivi-shell)
-		$(use_enable jpeg2k image-loader-jp2k)
-		$(use_enable libuv)
-		$(use_enable !luajit lua-old)
-		$(use_enable neon)
-		$(use_enable nls)
-		$(use_enable pdf poppler)
-		$(use_enable physics)
-		$(use_enable pixman)
-		$(use_enable pixman pixman-font)
-		$(use_enable pixman pixman-rect)
-		$(use_enable pixman pixman-line)
-		$(use_enable pixman pixman-poly)
-		$(use_enable pixman pixman-image)
-		$(use_enable pixman pixman-image-scale-sample)
-		--enable-image-loader-png
-		$(use_enable postscript spectre)
-		$(use_enable ppm image-loader-pmaps)
-		$(use_enable psd image-loader-psd)
-		$(use_enable pulseaudio)
-		$(use_enable raw libraw)
-		$(use_enable scim)
-		$(use_enable sdl)
-		$(use_enable sound audio)
-		$(use_enable svg librsvg)
-		$(use_enable systemd)
-		$(use_enable tga image-loader-tga)
-		$(use_enable tgv image-loader-tgv)
-		$(use_enable tiff image-loader-tiff)
-		$(use_enable tslib)
-		$(use_enable v4l v4l2)
-		$(use_enable valgrind)
-		$(use_enable vlc libvlc)
-		$(use_with vlc generic_vlc)
-		$(use_enable vnc vnc-server)
-		$(use_enable wayland)
-		$(use_enable webp image-loader-webp)
-		$(use_enable xcf)
-		$(use_enable xim)
-		$(use_enable xine)
-		$(use_enable xpm image-loader-xpm)
-		--enable-cserve
-		--enable-image-loader-generic
-		--enable-image-loader-jpeg
-
-		--disable-tizen
-		--disable-gesture
-		--disable-gstreamer
-		--enable-xinput2
-		--disable-xinput22
-		--enable-libmount
-
-		# currently no JavaScript engine builds. Therefore:
-		--with-js=none
-
-		# external lz4 support currently broken because of unstable ABI/API
-		#--enable-liblz4
-	)
-
-	use fbcon && use egl &&	E_ECONF="${E_ECONF} --enable-eglfs"
-	use X && use xpresent && E_ECONF="${E_ECONF} --enable xpresent"
-
-	enlightenment_src_configure
-}
-
-src_compile() {
-	if host-is-pax && use luajit ; then
-		# We need to build the lua code first so we can pax-mark it. #547076
-		local target='_e_built_sources_target_gogogo_'
-		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
-		emake -C src "${target}"
-		emake -C src bin/elua/elua
-		pax-mark m src/bin/elua/.libs/elua
-	fi
-	enlightenment_src_compile
-}
-
-src_install() {
-	MAKEOPTS+=" -j1"
-
-	enlightenment_src_install
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@ -31,7 +31,6 @@
 		<flag name="psd">Enable PSD image loader</flag>
 		<flag name="scim">Enable Smart Common Input Method</flag>
 		<flag name="tga">Enable Tga image loader</flag>
-		<flag name="tgv">Enable TGV image loader</flag>
 		<flag name="tslib">Enable <pkg>x11-libs/tslib</pkg> for touchscreen events</flag>
 		<flag name="unwind">Enable debug support via <pkg>sys-libs/libunwind</pkg></flag>
 		<flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@ -1,14 +1,6 @@
-DIST libfmt-3.0.1.tar.gz 606603 BLAKE2B faba3f2e1ab6677403141d7eb9a217857f1a18668fff802c8b027598b94b8a8227af890eb98d20a42dde62aa02584b208187f4a4c71bc2d55d029a2c5af12259 SHA512 daf5dfb2fe63eb611983fa248bd2182c6202cf1c4f0fc236f357040fce8e87ad531cdf59090306bb313ea333d546e516f467b385e05094e696d0ca091310aad6
-DIST libfmt-3.0.2.tar.gz 608369 BLAKE2B abc4634a8f3da9eed68e5f52497503a34a25e8cd3141819bfb8c08c4dd9eb47edac1e263d81d997d1465a221fa1958c6a5c40a8bdd06017430922a25716b1c34 SHA512 50f5a25d1a10fd5b265f3811fa11886b9efdae2952f2aefc9f22c87c1a748128369f4d530b320e5e9c67c745cdab4607d1cb08940f4cf968300dee22e1150117
-DIST libfmt-4.0.0.tar.gz 617818 BLAKE2B 0cbbbb86bb6ff488226786c40cdf919fa2004c25a3da7a11ec69b81b08ca58a6a721c4e11f42a684d790c61b6ba0012d04f3af8b75f38ff2fd80332e80795a82 SHA512 8b9f7ce4720c3caef6de4a75b8d4b0fd7db4f1638edca98d5ea95f4a5157aef8faefbac68438236691bd373111ca089b4d3864f7352f3fba1fe44392e9644f8b
 DIST libfmt-4.1.0.tar.gz 620863 BLAKE2B ff3a7db5a1eed3a6fc936be16caf2dd153d9452df16c07d6e0dc718bcfb9f51f52146498cb3f49591f1ad96d36a9561de2a78426d3bb8a0907b772e8be5a6f7f SHA512 8daaa4a61bfe63345a12df0a9bca0b1cd6a162d0f4e97d2d2978ae19a1a1357ec4d4cce948ce726cdbe9403e51ad995950a2a99de28f9b9085c02ce845540b22
-DIST libfmt-5.0.0.tar.gz 634165 BLAKE2B 32ef9f655e4864ef6decd6e8545260996834103cc7cbf0df7bce00afe88c15a9821fe2d46d3f6f1e3a729b45916c515e088e3a04a4e46e709e7c74fe3e04f34c SHA512 1ce93648ab7aca6082767ff009d5836e226fa42f183852ca15230f371ef0a34878110ca63d8669a68de7f115c137fdaa11de998986a9440f08d50f0f214ebb90
 DIST libfmt-5.1.0.tar.gz 641502 BLAKE2B 8507e875a78de2e89b7fe2c1c049691bfef6e0a7375ef7958e2191bcc4c60972b54b6ebc213d1465826af8322d8f90b217c1c7e176b29351c733184ff95cca40 SHA512 b759a718353254fa8cd981e483bf01a45af0fc76901216404ace5e47f5d3edf43d42422184e5413c221e49832322fdf60d1860e8ec87349c674511064b31e5d6
-EBUILD libfmt-3.0.1.ebuild 649 BLAKE2B 516deac5abf6212aa6e5f76a1b407c12444209cbc1393f488cf544c8849143ce976283177f7b0d79198b1d9b76abfd5e10eeb2e6d1880aa4dd2df5e916e1afdd SHA512 11e31c4ba76f2ee6ec3ba96ffcc74af496b93f565598fef7090ab2695a2ff884ceec5e1110a6eeb8ac5f91b7698efef02c44b3a98cce4d4d57e9fc0235318be8
-EBUILD libfmt-3.0.2.ebuild 737 BLAKE2B 0022cf34771a888150bd9e5eee091d26f158036b21ecb6f2952d2a06c43281e55a1ea5743999a50c4214bcc0df07ea2c0a5f00cca7b484e446ddc6f8218c08a9 SHA512 5fae3765dcfa750b08d4e366f6306219250b70e9d7c508e3bc01976d4038135ccc5cde6dc12ea65255eb250ac56dbc0143f0637fba8b414f68102cf479f49a71
-EBUILD libfmt-4.0.0.ebuild 770 BLAKE2B f9b87f63ec9b107adbc8fb079be9bd0d8f8ac496abb58076acdc2100f50a159ceb6dcd3a34771d4235f8d5c979ed42f6d31455231984d4fa08e543d7749febf5 SHA512 506b735d656546d3ba2114fad8099a364e7ae22b6ce08254dce879680d8284013f258054692f9a876da363d8147aff06e2245c6cadb8edf0483c4a046853ff44
-EBUILD libfmt-4.1.0.ebuild 770 BLAKE2B f9b87f63ec9b107adbc8fb079be9bd0d8f8ac496abb58076acdc2100f50a159ceb6dcd3a34771d4235f8d5c979ed42f6d31455231984d4fa08e543d7749febf5 SHA512 506b735d656546d3ba2114fad8099a364e7ae22b6ce08254dce879680d8284013f258054692f9a876da363d8147aff06e2245c6cadb8edf0483c4a046853ff44
-EBUILD libfmt-5.0.0.ebuild 770 BLAKE2B d629242c9a6109b42955a371589ad62ab163efa8b8b1ddbec61fd126af1368e704e2dc310bd48f9c829d81a56781d3610b63f0831c0879944788231293c00daf SHA512 b0962102dcc508761ea630c58e2e124fb0d2470f6b63fc527901ca8d5b80d3478c327dd1b4980055b295833aac85c2fc7801e87409842f7b7f17781782f037ae
+EBUILD libfmt-4.1.0.ebuild 770 BLAKE2B d629242c9a6109b42955a371589ad62ab163efa8b8b1ddbec61fd126af1368e704e2dc310bd48f9c829d81a56781d3610b63f0831c0879944788231293c00daf SHA512 b0962102dcc508761ea630c58e2e124fb0d2470f6b63fc527901ca8d5b80d3478c327dd1b4980055b295833aac85c2fc7801e87409842f7b7f17781782f037ae
 EBUILD libfmt-5.1.0.ebuild 770 BLAKE2B d629242c9a6109b42955a371589ad62ab163efa8b8b1ddbec61fd126af1368e704e2dc310bd48f9c829d81a56781d3610b63f0831c0879944788231293c00daf SHA512 b0962102dcc508761ea630c58e2e124fb0d2470f6b63fc527901ca8d5b80d3478c327dd1b4980055b295833aac85c2fc7801e87409842f7b7f17781782f037ae
 EBUILD libfmt-9999.ebuild 770 BLAKE2B f9b87f63ec9b107adbc8fb079be9bd0d8f8ac496abb58076acdc2100f50a159ceb6dcd3a34771d4235f8d5c979ed42f6d31455231984d4fa08e543d7749febf5 SHA512 506b735d656546d3ba2114fad8099a364e7ae22b6ce08254dce879680d8284013f258054692f9a876da363d8147aff06e2245c6cadb8edf0483c4a046853ff44
 MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c
--- a/dev-libs/libfmt/libfmt-3.0.1.ebuild
+++ b/dev-libs/libfmt/libfmt-3.0.1.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="BSD-2"
-IUSE="test"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DFMT_TEST=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
--- a/dev-libs/libfmt/libfmt-3.0.2.ebuild
+++ b/dev-libs/libfmt/libfmt-3.0.2.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="BSD-2"
-IUSE="test"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
--- a/dev-libs/libfmt/libfmt-4.0.0.ebuild
+++ b/dev-libs/libfmt/libfmt-4.0.0.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib versionator
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="BSD-2"
-IUSE="test"
-SLOT="0/$(get_major_version)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
--- a/dev-libs/libfmt/libfmt-4.1.0.ebuild
+++ b/dev-libs/libfmt/libfmt-4.1.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/dev-libs/libfmt/libfmt-5.0.0.ebuild
+++ b/dev-libs/libfmt/libfmt-5.0.0.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib versionator
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="BSD-2"
-IUSE="test"
-SLOT="0/$(get_major_version)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
--- a/dev-perl/Devel-Leak/Devel-Leak-0.30.0.ebuild
+++ b/dev-perl/Devel-Leak/Devel-Leak-0.30.0.ebuild
@ -10,6 +10,6 @@ inherit perl-module
 DESCRIPTION="Utility for looking for perl objects that are not reclaimed"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ia64 ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ia64 ~mips ~ppc ppc64 sparc x86"

 DEPEND="virtual/perl-ExtUtils-MakeMaker"
--- a/dev-perl/Devel-Leak/Manifest
+++ b/dev-perl/Devel-Leak/Manifest
@ -1,3 +1,3 @@
 DIST Devel-Leak-0.03.tar.gz 3233 BLAKE2B 4743f91a3d1bacd83c5f91f42a232c029a6dd84667d42aa903d309e07c852e619b8663d8cfa873d33ab1412eb6f6ae83fe99d6479d6be37e6e23bf015aac479b SHA512 177f64b87fa6ab08b93f7c5bfcbaf4421e8431bf795976a0a7efa0120828984fed29a2bc12918e5bea9ea3edccf6316ba8daf704f349aece84b45bdd11f57707
-EBUILD Devel-Leak-0.30.0.ebuild 361 BLAKE2B cd66648b96a322a7821b4484352cea5790b38a7aef81fee29363c70af2c980c29acc9d47bfcf4bb51fad193479eecc2466bcb4f9dd45416f341e320a5705842c SHA512 7b41a3a073b164b151106efb6b4f89430e7d913751835454e67dcf4cbfa7b885b210a662f4799798ea2173cd240f0033e6dd23401720d043752dc0aa40d245c2
+EBUILD Devel-Leak-0.30.0.ebuild 360 BLAKE2B 6e30b1c0c198db1c891b4e73e67c765e6df921503ba300fb018bf2cc4441f7f9290c32eb7f1820df11ee8244c929b5964f6dfc8a9e9ea60b97b50de307dca682 SHA512 109a3729c86ba0998fb46699933a8e4bac31c46dbde6c46bf1bf291d9a345cafdb9050e06befce3743c07255ec6bc663b188626308cc9f8172bcc625817dc463
 MISC metadata.xml 416 BLAKE2B 2c73871ec7966af3b62eb01f4641352824cb2081ee28b8e0a6bd96008384a8417b4ec76e056445e4a1828da2bd8d4c396bc47d46b3d09968dbe9b303e21e3e3f SHA512 a9c12172786cc42b085236ba4f3305bf321284ba53a39b396e31dd76e12be6c687c57f17ad3e3a8171d935b6d4bc6802225b3314309c9748ab365003116133d3
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
--- a/dev-perl/Readonly/Manifest
+++ b/dev-perl/Readonly/Manifest
@ -3,5 +3,5 @@ DIST Readonly-2.01.tar.gz 23227 BLAKE2B 7a245411a17132cdd3617de70386cd1f7f511505
 DIST Readonly-2.05.tar.gz 28877 BLAKE2B 7fb072e0057cb125665855eaa058b77b74aeadc3fa4be3ca4e87ed6214b22a52c0ee4fe7df4739b288c49116d16d05cbcc93bd7035e71bc51e55be69002265e0 SHA512 d42406c1985248a352860f80c3b0b1a41476e5a7b4bff71e83122d7c5eb609296a1eb00aa71cf9f899317e31c706d75ff07950815eff84afb6bec40de6de2ace
 EBUILD Readonly-2.0.0.ebuild 525 BLAKE2B fc9123a64c1f8ad26c24f87a08f515a348f4d6280884559c9ff289beb6ff6f898e752d036b5bc269255e49c77e51b345131835bee56d088f255c321c3c3df031 SHA512 3e2d4681e7f6caa8fa3869ba691956ea0c6bd7150cf14c285b7665956450d782489f23a71f08823fb6743cbdd315367a86f542bd3f232e23d6bb3aa269d91815
 EBUILD Readonly-2.10.0.ebuild 493 BLAKE2B 27a7a4dd1e70fff937ee325803eb5e8d41d89a57264a6a9701ffaebb4452b1f51c0ba5220479b6c79866dc15fa88c17640af948f1c315f80991939c97986ac27 SHA512 bc4998169ec43e0d14f7f75bf6e98b5dd35514e295ef2bbcd590e6f5a8ea7a0a5d15312e994d33678ba3d9ce04bda1cc5bf298f202cd918f88161d227669723f
-EBUILD Readonly-2.50.0.ebuild 491 BLAKE2B 9819ce7f9c2f3e0f7e59136e39c98c2a2baabae5a2e064ea1f25ccdc6afd405f5a1dae19b55733a81b9bee31d62119f7ea0428084e9de6b6b57ddb4d86ec8a8a SHA512 a36d17021fc1fd921aeb246464c5a0287683e2682a9fdf3aac046e48794edad9b0ad691743c52f3bbbe76578f6b023f05222abf669c60cffc5bf472b323ba55a
+EBUILD Readonly-2.50.0.ebuild 490 BLAKE2B 29d476fcd9b1422c093b0cbbdcf0fd9ac9f9dd809db1f19836d092c174daaee2663983970e2fc01c8f33ece596f27783c268e89f304debbd88b05dadca234400 SHA512 95672554e28106eb2b2981d790addbc22ae24e30e8b09856b2533bf0c6634de2f6cca5eed8810d9515dd32450ee880f9075b9d51ca3882557f5546ba70217852
 MISC metadata.xml 573 BLAKE2B 71bcb9521e50f5017a6b98c3d6df2a46bd27455b922b6b2ff8a1dc234cb867c0d973dfe6046b7521982656d610d6039b27280492580bf427a54548eca640a890 SHA512 d401187b68959c86290c4588ddea6dac4eddca3d00ad180fbf38c319b7a1399c85aaa0becc3ffc5e010f708d6a0a0eb457f8d54c5fb3f407187271306a610048
--- a/dev-perl/Readonly/Readonly-2.50.0.ebuild
+++ b/dev-perl/Readonly/Readonly-2.50.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Facility for creating read-only scalars, arrays, hashes"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="test"

 DEPEND="
--- a/dev-perl/SGMLSpm/Manifest
+++ b/dev-perl/SGMLSpm/Manifest
@ -3,5 +3,5 @@ AUX sgmlspl.patch 367 BLAKE2B 575227a13579947e2fe276965c55b215fe3df0569b36907258
 DIST SGMLSpm-1.03ii.tar.gz 93250 BLAKE2B 88d0f36321c42891c62cc1dbb263d5f3c04377ebe80b9e5f41fa3199efe45c78b35dd4fe21e3a769b8cd5785ad4fc5954a617f1a594afb12be74486e468157da SHA512 edbac8112561912d5d7a9faee2d920bf763576ace5a9bdef5fc3f235533805643ad8db5f57d96c34ce9ecbf1796399dc531f40ab4b2796a1e130a8f288c901d4
 DIST SGMLSpm-1.1.tar.gz 114100 BLAKE2B eef93b64f7fcded73bee0e169e417853d84e2f446d569906f752a87ddd1edcb40c63dde3a50d4e4d7840e8c296d9ff20eed5c316bbd528adef16a1d85a38f0d2 SHA512 0ca3f0f3265f20661ae88ad4764fbf82f226382f79f62c01653265cc7372524dfdf30ce5abffc0344624f5e6138e483952471f8c18d59794b40035af0b7526bc
 EBUILD SGMLSpm-1.03-r7.ebuild 734 BLAKE2B 7b1df11450f83726616d557865f844f94ac3344d1d02a03c7a9585dafad06d4636cb05b9b967e6a646446ce727a997445bcb0af94d4980ab706d7ab6ed4c3981 SHA512 771e93de2d208d218e7e799695b6a478ffe20c2b5aacc0ab54e8b157acd22cdf6bd81856d43813a5ec5ec1915e40bc124e2d2981eaeae05ccce51141617a2a49
-EBUILD SGMLSpm-1.1-r1.ebuild 569 BLAKE2B fe9d78dd6b147b46137d1e0ba3f3151e17bb01b34f5aa9de2e7da7ecb6bcb8d9ed917d514133939230e6b57295e95a5952537bc79381067912e0c839db58a1a4 SHA512 933d208b43100f2fce5fa014f60c2c28544ef82dc5d1b82acaa1a371904f481a568cc47d66b96dcf7b3449e9bb25cb34e8fe48d215c55b56a4e9acdf00570ff5
+EBUILD SGMLSpm-1.1-r1.ebuild 568 BLAKE2B d9e8106a00703d1ede203b7997990a72ffeb0fb63d335f5c225dd2add4fa7d1c9b5def6d062cd1e57459a65fd663e257474ca57448dfb79999cf0ca8bc2e08f1 SHA512 c3cbaad6680fe3661f36e55784f049734334ccd673cc485ebb372dd5f77f7cc8f2b852beb545f826d5aace5eaf5ca56c8ed84e18a19031d2d6533f45b65aafa0
 MISC metadata.xml 801 BLAKE2B 89d9fae1e95fae3f561735f49d0383950669702a88dbba4847bbdc633edfb44d3025fbc79c932150bedd007764a83a8908ab65baee0971d4efc5ea1f58aeb6df SHA512 4b714f8c595c2276548599d642fd02df763044c09e1abd6097588859764701fec6ce9abd0a9798db573d71cc703293dedf462ade1b8b6d5b96faa9b8ee593756
--- a/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
+++ b/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Perl library for parsing the output of nsgmls"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 DEPEND="dev-perl/Module-Build"
--- a/dev-perl/Search-Xapian/Manifest
+++ b/dev-perl/Search-Xapian/Manifest
@ -3,6 +3,6 @@ DIST Search-Xapian-1.2.25.0.tar.gz 72097 BLAKE2B 9e9f54718bf597c7592cc936e23ce46
 DIST Search-Xapian-1.2.25.1.tar.gz 72320 BLAKE2B ffdc57cd70b35ef0ddfa94818d7b34b5d80077380901791b27564e6f544a658221e34e3997ae1412ccb8f1e21d515041959de90859f66c450273432de1d1f9bf SHA512 7cb78c1304b69a733b75c1a9b5ae4197be519e67528214a46e4bb9da660cda79f8e9ecf46219af09f174bf652b6000e0eeb50f736a80f2e6f47be46b2d58ef8d
 EBUILD Search-Xapian-1.2.23.0-r1.ebuild 848 BLAKE2B 56753bc06cb9ea5b59af4eb3b72c2256035597766759fb466cb360c563f08b195e6e6a490a67cc8351017173dbf32d1c17422f1d28929e633553af78d4e5e364 SHA512 3bc66d209ac83199c244c0a2b19f4e05e9f90fcedbdb78110d0838d1d0cd46c312e36ff532bd9e5261e9164d4ef7011b51135188475d529869a94e1fcda68fb8
 EBUILD Search-Xapian-1.2.23.0.ebuild 811 BLAKE2B 1786babd7796e3e96044782b01ab14c375984d6b7ebcbc26809edf9cfc6fbba18ff7dde83e803ace38e70c31193e04c2c093be89dc86075899340ef073386c3c SHA512 6f2d28ebba029857d0a9cdc05b12747b03205b2018a86c9b89b87655d87516d1a936b09025702c687ce69d0b32f27be1ee70f9cb669ae0f8611e9d271a48aef2
-EBUILD Search-Xapian-1.2.25.0.ebuild 851 BLAKE2B b0c33c2e986b6b29205aada12118e6aacc751c86dc50921cd5226265e186e5894fa20c75512e59f84d0b5ba58b378e46533e0e7e4d6891620ea5e5abddc7297a SHA512 466a7603c5cffbc3ce9b2500efaafff2738222f0a6d33bf2ba6de149061f33a7d3546644e998b269e50f26f3856403879971d8ecc2509765f9e01ec15543a185
+EBUILD Search-Xapian-1.2.25.0.ebuild 850 BLAKE2B bf20f868aa1fdeb32ea4c3171aeceab4389b2ced34a6891c8b671e82681d1c8be089170aa748aa906fa3227ac15122fc4ab48f6da26a605be680a938c9ae69bb SHA512 518f8a10e3678794e6a833fcd53a5164c64cdad5a627c84794f59bc9492888bb765d86373b29ad9a4bb2e45fa1a2333ab14c9670dec4ab6f2294aea2c193e3de
 EBUILD Search-Xapian-1.2.25.1.ebuild 854 BLAKE2B 6f08b04008d6885e162334d1bcc9e54673b6fdcdd895a21f9d43851a4de58ff2d0a0ffd9dee30f4e70df7fc4889705ba2bb05babf5992db24bd63a5407b502ae SHA512 f636e4fbe2c473a6cf4fd793a6f60471abf6d4c5f8457be54158fcb0591b1bf23c8f37ce83bbef1a92838729fe39476b048031f3727879b733125b4a51a57c51
 MISC metadata.xml 3929 BLAKE2B 9b11bf5990a09722eb6a8352791c5df25f6b99c4c877dd381549b875519a5d923c1d55153603a1983941473103d7960b6de4368c99d078a7241302b1e7104594 SHA512 37f1f94a3f429144f0e7e9d801e763d18de8def1b0a066e4acadd168cc9f291103c456b29726b995777554235ebf62f2af20c18db155a13ac9f15955cd6ff077
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.25.0.ebuild
+++ b/dev-perl/Search-Xapian/Search-Xapian-1.2.25.0.ebuild
@ -13,7 +13,7 @@ DESCRIPTION="Perl XS frontend to the Xapian C++ search library"

 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ia64 ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ia64 ~mips ~ppc ppc64 sparc x86"
 IUSE="examples test"

 RDEPEND="dev-libs/xapian:0/1.2.22
--- a/dev-perl/Socket6/Manifest
+++ b/dev-perl/Socket6/Manifest
@ -1,5 +1,5 @@
 DIST Socket6-0.27.tar.gz 64936 BLAKE2B 14b5777662f883989f23ae5004000974acc2e9bf7d5908e82d9b55532fa0be5a109d52c1c801052a1dd8375fbd400b3f61914a33091ac77eec46f9423405ac22 SHA512 8431d3d3d48da0b55dbe5478f9226ddb77bc2fbd2db164683312d51446dfdf52c2f596ff1ee7287a4321386579db8713169eabf65b93ff900808ca311cefe6d5
 DIST Socket6-0.28.tar.gz 65567 BLAKE2B 9f8b83bafb9e57f4f26b2e123bda04c9ffeb801487743046f46ed583add67e663a9ce6dfbdd150cb0dcaa606f83198d44c0fa932be19b444d96b86ef2281fb58 SHA512 6f7ea283b0eabbe3051ec6d54e070a0290aa1cec6bb82b949a5a23b38b591766d19d2ae7e085c86cf44dac19784c5df3c2bf25a011b77281d5cb7d025beaafce
 EBUILD Socket6-0.270.0.ebuild 545 BLAKE2B 154df7c066b5f259c30921471e33a2f21b130e764360b34b5245debd5eaf68b21899906c12355c5c0ad1dd5f94512c5da54ffe6abdca28eba0a7d7bad9d8b305 SHA512 1d9c2b73c20f4cea62f62d8990179cbc9e1199f4c38ff37e1b57d39e8fbac65caeb418bc9dc1787d8dadbaccc5e0493347cf80433f43f9d06ec15770023903f2
-EBUILD Socket6-0.280.0.ebuild 544 BLAKE2B 3fa440625aecd12d183a829559876a71186e65292ab6dc3263fa0e991d0ac0f7251213574cb0c6e547801949a404aeff8bbbc33d2f492afc9e15bfb81ad2e227 SHA512 0fddd064087feffca2ef5e99c38c99cc513fd3cdd595918186ee59073d2eea7b2af66ea57b0270ac1b15b15ae0cbb42d90c0e787474fe950cc373e157e17f421
+EBUILD Socket6-0.280.0.ebuild 543 BLAKE2B 8740e0a910b644faebc449562a8c0ff4824d714674bd8f4198c9b6e1e645fb2dace6bc7a2f80339586fbb2cdf9a130cfe607e42ebe64775c4c78551787574a23 SHA512 796340407801028b080712553943e0a935006c74a5af691798f5d19323de7777e8396ec1ed69bbf7a498febe743b494138bfc1d9232daff9e79001c1d5ecd846
 MISC metadata.xml 385 BLAKE2B b434cae1c1b59a635335aa32a84cce3ba7f04ecb1a305fa6ef8db820cd8a237c9f0a88ea13837e6ffd71df522e271ffc573da9faf3b04aa78a47f2c5e33201e8 SHA512 bcabd5ec895d143170b58c356b11d4c09512a9767e4fe3452939954267786b0a99b2e3bb501d097e9563891f15173ba3e60a730f4fccd79a349a6723fb603311
--- a/dev-perl/Socket6/Socket6-0.280.0.ebuild
+++ b/dev-perl/Socket6/Socket6-0.280.0.ebuild
@ -11,7 +11,7 @@ DESCRIPTION="IPv6 related part of the C socket.h defines and structure manipulat

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""

 src_unpack() {
--- a/dev-perl/String-CRC32/Manifest
+++ b/dev-perl/String-CRC32/Manifest
@ -1,5 +1,5 @@
 DIST String-CRC32-1.5.tar.gz 6990 BLAKE2B 41a50b6c9898737c2c5d0cb8b879fbcad4af82a5573d182e2d356886470808011076625c6f604d233f4c23738aa2d940f9e8c1f70d9fb4c24757fad837021c22 SHA512 dacde8a8618dedc1107394ab06db5ab421d025ebef1626c3f6a8e35261256d0017c7165a56d6463e3f0481cae2b408502713fa3b77f8f041a6bf8fc1f48e8707
 DIST String-CRC32-1.6.tar.gz 7713 BLAKE2B 9b976be73e7781beccada0c2c0bf535f5d23ada71840fce82f1915bbf0f2c5ddeb9d4ec50b89e396b9ef373826961fc4f78e9a0e5df38823a482d939bf35e769 SHA512 e8915066edca5407de5c42cf6ec6367cfc8662d3c353ee7b9150e372fccbca136946a8e30ec18f4ccba3a08d4864387f3cad01b3b0117e019927b72c9081fe39
 EBUILD String-CRC32-1.500.0.ebuild 447 BLAKE2B 40125628071988340e0d6eefd0f298110d360b4649c67742cbb59815850aee6d4d06f421119217d9a87db463ef8397a176ddd3963778ac39880b3863a2a34a20 SHA512 389a3921a8f04fd470a9f9717b7eba91e26481cf8e696c56cdfd5230730e4ceb42810ab6d459cd2686c09f832a16221dfc78ef7724d54d1ba65f7b7e5df166bc
-EBUILD String-CRC32-1.600.0.ebuild 434 BLAKE2B 9382387c199d064ced4fe4014fca171c8529e2d4a15212c88862717008c2f9cff2ea319c7a791776935f1f879627a47a1a1d19f6a15f3cbb09bcd6cd87d365fb SHA512 e240c249023f83c4daf8c5c89792f6d271cb371df6f573c1e73a9b2bbdde1d25a6d8c040b013b0cc429db32407a47723dac826364b2029a9eeafc07350c63359
+EBUILD String-CRC32-1.600.0.ebuild 433 BLAKE2B 968926a492418db3772079b77a894216012c069c0b4034eddeaf2731624f78dff254c1bb973a3fb073fed7a9f18cac19e195e8eb96db2c843a279186a756e107 SHA512 848596f4dd976dddf1e6b42b9e94f6388c4d638369e86479442128c71f8e791c6f18ec60cda790947c1c5c28c209df5906e112c1ff0c485bf877d14862381c60
 MISC metadata.xml 396 BLAKE2B 658c0776d2718378d8d42440db2e215cda28d5c9a1562b37a4ffdd99866983fcab416088bfd7c536e14795416122e7ccc9d4d1950bab02d4c97b50cc63c1bf56 SHA512 ffbff3086034b3e0d177dc0204fcd5107d8511280878fdbfbe0727b6548ad7f210d5112e1b5ddd108af5450074259a6b7d464005ccd63c51096e869e38e3b61c
--- a/dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild
+++ b/dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild
@ -11,5 +11,5 @@ DESCRIPTION="Perl interface for cyclic redundancy check generation"

 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
--- a/dev-perl/Sub-Exporter-Progressive/Manifest
+++ b/dev-perl/Sub-Exporter-Progressive/Manifest
@ -1,5 +1,5 @@
 DIST Sub-Exporter-Progressive-0.001011.tar.gz 5829 BLAKE2B 5e5ff8589fad5570f60e1179fa8ced0ffc80f3dfb395cdcf84594fb76477a61b3a19e8fa612dc5ae3f4c2d14ae950cd6da439c6be40a371c1f30546052d3ba1e SHA512 897c93813aa0e0e5a7337eea861230a3180bdf9c7983f035c9afbee9d56992ab707456ee7ceb392b31d0fa9ef0138bcab36b3a4efcd03f98ccc022e799601daa
 DIST Sub-Exporter-Progressive-0.001013.tar.gz 13468 BLAKE2B fa89dabd394888994df760982526139e6afece0f012b7aa269b354519966f9f3ed0549a2c148403eb23fd7446037931d49b7c3d5dcf5511ffe43367ab23e4aaf SHA512 28d0ac6a380a4fc1515bd69320bcfd073c0c0e92ea34bb924972aa46fb2f6912485d686f0eca5d5b885d8b06927250dfaacd1a7ff86ba029f879a183cba546c4
 EBUILD Sub-Exporter-Progressive-0.1.11.ebuild 505 BLAKE2B 0e49d14e989e93098bd71aab9d68a85affe1c0d8deb1cb7356d71be1068cbd8313e98e37363a58e55829ead15a016225117fa3b21f7b5d63076020ad153e2d91 SHA512 908d170c14787d011be0f9330555a0d91fa0bf7f566ed8a9698fa64bf9560a0a842288987ea17e05d6ea6fea26a3b4ee1860cb5080bb5c55d2c3673fe1af06a0
-EBUILD Sub-Exporter-Progressive-0.1.13.ebuild 564 BLAKE2B 7a44617676f42a0ecea94e34db3473d4143ade8607fc4702dabefe6bf0fc07c12697aae1eb882afd6aeb82efe173b4e863df2bc15d880d78c2d59398ebb7febe SHA512 61ff5591d016a2767cf4935562db22cba972f0f4cb445e2846d0a0d25fb8a971e7c44e7ba330314486c8b3b9c377a5992f728afb87c793096fa1e9b40867fac1
+EBUILD Sub-Exporter-Progressive-0.1.13.ebuild 563 BLAKE2B 092c1d21f1e15079d82792e4537ff35c310af21d42071b53be723b8f711dc12c3d736ab97730538f09c394e7e2aab011f4f0a1439dbca5868b7e86db6dbf4ec3 SHA512 c8f154abfe9e8aee4a05a6ee178927280fc0bc0b1bc69ab49416ca0c64cab6b386e5b5dddd490932d1fe387a90200763ac53aea0b33830694a0906ea41fd5847
 MISC metadata.xml 409 BLAKE2B 8aaddbfc0a137889fa1b408d1a64ecec329f2e3c5434d5351cd1a3735a217152dac346e7ffbad990a44d590c5851935f81beabd80be72b4a498de09d46150722 SHA512 17297583180f217b9263475386120f0da3ce1e40348c7cbb5eb924075863834788dd8539d63441e41986d27b6dfa3b9f249c1a3ff0e9cd122b20c5c7a6e31780
--- a/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13.ebuild
+++ b/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Only use Sub::Exporter if you need it"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE=""

 RDEPEND="
--- a/dev-perl/Sys-Hostname-Long/Manifest
+++ b/dev-perl/Sys-Hostname-Long/Manifest
@ -1,4 +1,4 @@
 DIST Sys-Hostname-Long-1.5.tar.gz 5474 BLAKE2B 8b484e1b0c3e410265b0b8d433853c50a95d4320adcb39b3c1489d2c9317a7129ebbefc96a2cb282ff0158a1a4680fe507670267c73873cc36b8d9fdede4b79b SHA512 e34a5f17e65eb9c8d3aa213a6d930be4d0b6981dae3bf600e782b0e9863e6584061285a894f9f54daff7520bcadbb3e8cd6b1f9f973ad1c1b72c79e9f588133b
-EBUILD Sys-Hostname-Long-1.500.0-r1.ebuild 519 BLAKE2B c1f52979f7927091ffa1b210a5618e0befc45710b2df73d758b243e1bd8fbba4ecafd11b9d2ecccfaacfcdbef42f4366f2df97071f0eab13e53e2d27710adc5b SHA512 0015d21a83ed35e340cf2a7c97d331b73bf4ece8319da347f7ffff701b10b4d1300bc63bf164155aa07181af35984c5b2dfa3781c83b07985ea89448c967f0dc
+EBUILD Sys-Hostname-Long-1.500.0-r1.ebuild 518 BLAKE2B 51df124c3b552cb503bbf0f91ba0bffb62b93ba4ae85146f89418f7b61426e372545ce6cb21962d0ea99abef2f3c3f6646d153bc9560781f1e15f3a0c6901891 SHA512 0592c7cfd64f8576931929173e1f22de33e2c79b206436f40ac60e03f1c5a637c1a7d61d3bfdc358eab134c44a12c10b7a947c5eaadaf31e0679403ccb720b2a
 EBUILD Sys-Hostname-Long-1.500.0.ebuild 519 BLAKE2B 210421232238f5c5a1f77ea8bae788be3dfdcd0864eee38bf435fe16a0e85b3be26382582a4a30c4d86240633fa71040c7de1fd5a8ed72ea8cd4dd80868b3d12 SHA512 1ae7125f9fdd7b4e6ad40d4bfacc74b1c4374f468f854b22bd12a55dfe62c74416e49281fc3777a26043ff53de8247d6943458688e362595fae293d4832be592
 MISC metadata.xml 407 BLAKE2B 6359e696bdb60896c83f134f5d092cce4b295701b6f2a974e63a1d17dfce7e0c409f29da7659ed2851780403a03f3e37991bc766f42aa46fcb399b3a993bbd04 SHA512 2844cd8d9fdab6382ab1d4f82d9ed67f5a8b644cbdcde635e7759d9576ea65092379a8096d01f6de23f40af9d4a0e4ed9ff1c41179428cca38cca36162fa996a
--- a/dev-perl/Sys-Hostname-Long/Sys-Hostname-Long-1.500.0-r1.ebuild
+++ b/dev-perl/Sys-Hostname-Long/Sys-Hostname-Long-1.500.0-r1.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Try every conceivable way to get full hostname"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 hppa ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""

 src_install() {
--- a/dev-perl/Sys-MemInfo/Manifest
+++ b/dev-perl/Sys-MemInfo/Manifest
@ -1,5 +1,5 @@
 DIST Sys-MemInfo-0.98.tar.gz 13213 BLAKE2B 10a7f9820aac1e70b635a531f6d77e8c00d490783be51ab2c2dc778b67a14c62ed5d8e004045f408281d3843d756a2e090b32418f8188c3d07a7d1f50572c23e SHA512 06f3d5d5678832c688dae6b50392cfe549a105359be5d868d020bbb34839216ded7138cac1788d398330deaf260789e91a7a2c3f4998af1ddedf33006c31e1d4
 DIST Sys-MemInfo-0.99.tar.gz 13276 BLAKE2B f45ebe017ff40cd612d69b9e804348bed8b78526c18b308a16accf7ffeec1263c2bd8ac6de8ffdf25f9c4e01562a9aa91563f159f0e76268e4bc4f188654a814 SHA512 ad0f8a12db7f7c643d0eb2d68fb1dcbff43928b786d390243e89d88537bd99360f88af177678ce5141e3870224da80ea5a432c465e8c7ec384abd21014c0e1c0
 EBUILD Sys-MemInfo-0.980.0.ebuild 336 BLAKE2B d4936a8ae0f7d4c46cf0ca0ed4f9430ef4e05d1a2d4e867174ced0bfed8efbfd044d057c41a2e930962eb6cfc9d61b30aec016a78d66d3eea3571754cbd5f479 SHA512 7aaf81518a84bb45189c78b330f3bab70d65fc94705a32f1ff3dc2b54ba03b8847cc1faae157859885fc89010f0a8740d8f7cad2a6d445696bf65e1fabac68a3
-EBUILD Sys-MemInfo-0.990.0.ebuild 324 BLAKE2B aac4c0efa4dc0dd5e7d9368392fbd0b47e9e859389382e9b2ab44d68dbccad0d74d065db6f713d1b97d0471a6b591a9959199441961272eadddb592f5d592575 SHA512 0b3a59108d759c6dab3a5ab822670723ab9182583ae0ab5838a1d316f1ea9d34e67346ddba28289a0054c715f5927bbea22e0294223849adc2b4d1aa2c3a8f1e
+EBUILD Sys-MemInfo-0.990.0.ebuild 323 BLAKE2B 869876ecf1a2c20d5eca283c8694ef4c115dbefcb8fa7b6eaae4953d0eb9c7b6d58f7905e6fc57df19791dd3b34e03fa49419f52049b25d37462c6f8ba172293 SHA512 2d9b175854849cb4f7535cdd6032c5911df9bdb66e0fd2cd08b51b4363d5e23b07f2f04d355bc8d4bd41116d355d59e1a9223799c7325ff0c10d848d9e597134
 MISC metadata.xml 394 BLAKE2B b7e0a7ed14932310573ca127666a03a4b4ad0288e064be8c6635cd4e5bd6fd140fa8739f63bc7e52705340f1b742e619ab9a98cadc6186dc73bd02520c71b3db SHA512 4f5d6ec753c13288d84749c79e14cf5c1a8ad61ff4e1df308ba4bd6cc8a2a47bc5ca86b88cc3c9f2157beb2e31e371b2eb1fde6c7f23a816de6345c3c0a00c00
--- a/dev-perl/Sys-MemInfo/Sys-MemInfo-0.990.0.ebuild
+++ b/dev-perl/Sys-MemInfo/Sys-MemInfo-0.990.0.ebuild
@ -11,5 +11,5 @@ DESCRIPTION="Memory informations"

 LICENSE="LGPL-2.1 ${LICENSE}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/ansi/Manifest
+++ b/dev-python/ansi/Manifest
@ -0,0 +1,3 @@
+DIST ansi-0.1.3.tar.gz 4561 BLAKE2B 33f1bb49dac19879a1e98dc75706e1963a11665a31c80161a6ff9580b5e2c0ec50de7e168860cde647488c67d2bb5bfd1418b9f4637c9db2f3d68d1b49bcfb47 SHA512 824ba1a9125af8fc23f402ab4de26c82250dad7be0080e0050585ad955337801393792c01ed3affa8a25551fa07b3caaedecde1889401293d415249e70a72705
+EBUILD ansi-0.1.3.ebuild 459 BLAKE2B e861e3a7f46e163615fefe41ccaf9a6bfa94fd3bad91176b2995598e19924e0e49c5a0c48deb3cbbeeb644bc06f22ec506e64746fff7e39b26814b4d817bfd00 SHA512 9a305ab520ba8ee3e76d0ae25f22e4bd08278d9edf3965a23839514f3575103bee045e5aed888268d885dc028bf0ac395e426f49c7696a821e565f060b329e0e
+MISC metadata.xml 366 BLAKE2B bb092fb0749c188b5367ff6c352e7614fcd4761d81063f7ed4c07958e6fe2752e88e0dcdb93f48cc58a0e35b8aa2f5ba280ca082767c303118f956d7c5ed5c46 SHA512 4fdd976a6c082c245474c4c5d4809b9b17ad90fc237b2ea08cd3fd3022ae3e3a0a92b8f27b53429ae8f1a1bf964ea1af65523f9f43128a40e296d6714b1b4711
--- a/dev-python/ansi/ansi-0.1.3.ebuild
+++ b/dev-python/ansi/ansi-0.1.3.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="ANSI cursor movement and graphics in Python"
+HOMEPAGE="https://github.com/tehmaze/ansi"
+SRC_URI="https://github.com/tehmaze/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${PN}-${P}"
--- a/dev-python/ansi/metadata.xml
+++ b/dev-python/ansi/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tehmaze/ansi</remote-id>
+		<remote-id type="pypi">ansi</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@ -1,9 +1,5 @@
-DIST cliff-2.11.0.tar.gz 77037 BLAKE2B a38f37574f1802a2724143f35cc1d1159d8165f75f4c9e582e726cfdc9090814635d99b073a5d8df3a3e3b3d57b79e4e383c0569bd6769325d81af69384e9946 SHA512 0f29431b30610f0c781c9eddac57724043b6d7c05bc82f0ec3027a68230222f18f78ffc1d82dbd8ff4b5408b255b27879bbc1266e8641b4bc1c871f029f6cba2
 DIST cliff-2.11.1.tar.gz 76570 BLAKE2B dc0b4a702c6807077f830941516e8c5f2dc6b732e7a7788eb2c2e5fc5c3fa8d893e7156d6ad76904deb2d1cf31d1ef50d08b73b750422b84bb053a09e4930bb2 SHA512 ba494cc26e103c6043de49a59b3e9c0c9bb1658416095f02c6bccd3536f24615239a66941fb971c289926c88e85eeb29eb10065379e4f21645828f6aa4a2755e
 DIST cliff-2.12.0.tar.gz 77405 BLAKE2B 70b3865837bdba1396fd76b4937c594dfc9f50db24f684c6676c4ac1125ab34f6cdca29fe63a490d41abd49a268d6246afc873a5805446d06b07cd754aebb727 SHA512 5802cdd17b6aa81dbb344efb8ef53212de999ab33eaec1eb06e1d002ab513758d3634ae5013ece6375b1bb98c9fed99aa74cf92752c34e1132fa5ac20a969f4f
-DIST cliff-2.8.0.tar.gz 71815 BLAKE2B d73d467a1e2e06e5f45e7fce766d6c8daf79d9a882692c0e77049427bb6de629409a282c8c554ba92c62a9c8fd44e0b19cd3cd93b9b3f1f2b8091a1e917a25b8 SHA512 a371916945ee71ec519aeb923ca44b0a0e10fe6e460d236434c5c2946ad2b517050bf9d0430bdde506bdf2d28ba60bd45941d9ce21d77a83e2d5541b088d04b3
-EBUILD cliff-2.11.0.ebuild 1796 BLAKE2B 45b373a825128f6cbfdb751a068907609c1b87712843049329c1ccc2fe60f9e760ace69037c5c3e493d20fdcbc8aae93120c55237f4b9cfc7d98cfa8034d059a SHA512 9dde86186646b99511a1f3378f1d63d9a6f580cccd91a72ea81a15adea5285310aa6a4728849fda8eabc1fca2ee302d01131ebad4946313f2b98e4f97830cdb5
-EBUILD cliff-2.11.1.ebuild 1798 BLAKE2B 88010d5f16f658aaf0f8e02ee0455d321a898cad08d671e157f25bb37d0567a8edf6120dc51ed1731d7f1b98390e95b3d2aaebe2c322b9a26311a8b82f7b5973 SHA512 e11ed282dc82c2a1bc6bede4d5752c258519d62d5024b1feee1aa8cf123312721d8f6ae4e011d4ed87cb269da5020d38878af847c01a432ee7fa022eed086708
+EBUILD cliff-2.11.1.ebuild 1796 BLAKE2B 45b373a825128f6cbfdb751a068907609c1b87712843049329c1ccc2fe60f9e760ace69037c5c3e493d20fdcbc8aae93120c55237f4b9cfc7d98cfa8034d059a SHA512 9dde86186646b99511a1f3378f1d63d9a6f580cccd91a72ea81a15adea5285310aa6a4728849fda8eabc1fca2ee302d01131ebad4946313f2b98e4f97830cdb5
 EBUILD cliff-2.12.0.ebuild 1816 BLAKE2B 116dad4f946510b3e3d2305754a982ff7013f38e7969ffc22de1c61c313a9b426b9b1e0ea21410265c16629885a3e1c401bdd4ebe08003ef2815eccffb434b18 SHA512 609252565bcc6134db8b3752d0d0fdc7e2eff3e8208ae25aa2708a7b014c4c6d3e4872aeec757581ca1c7610caa6c8a66f182abb864dfcde6c00d80edea3d6e2
-EBUILD cliff-2.8.0.ebuild 1803 BLAKE2B 1c356b186cd61f0b64ec018b9b798832541d967bc78335e6ac8c1bb80b20656bcc7d05c4c6bc62d4262ecd2efce17e1ca0db2329fd748919b78d33ad72edeb86 SHA512 714dcf939b7044a111e7e40fd8efa141907ea852d4f763ebc4b39fd4bb792445d078f85132ede9171d237af386025c5743236fdb0d19daa3a59a70a17fc15001
 MISC metadata.xml 709 BLAKE2B 05e69832a5cff97a52caebc4c113a39342e62803fd523a753a8ba119f4326a9814c7c382e88906514e539922c1f22683a09dd46b2c11e3d60b8f885072a08e72 SHA512 f031fa34d06b4c12c8eba5a046c07f1e391fd84bd29d6a4ca8c769c2d774262d66d7bac12d05cb8ef669db7e2713d6862b6a118e9f9ca810e9ae0fa9fb881892
--- a/dev-python/cliff/cliff-2.11.0.ebuild
+++ b/dev-python/cliff/cliff-2.11.0.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/dreamhost/cliff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-	)
-"
-# source files stipulate <sphinx-1.3 however build effected perfectly with sphinx-1.3.1
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cmd2-0.6.7[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/unicodecsv-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	"
-
-python_compile() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	nosetests ${PN}/tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/cliff/cliff-2.11.1.ebuild
+++ b/dev-python/cliff/cliff-2.11.1.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"

 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
--- a/dev-python/cliff/cliff-2.8.0.ebuild
+++ b/dev-python/cliff/cliff-2.8.0.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/dreamhost/cliff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
-	)
-"
-# source files stipulate <sphinx-1.3 however build effected perfectly with sphinx-1.3.1
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cmd2-0.6.7[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/unicodecsv-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	"
-
-python_compile() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	nosetests ${PN}/tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/daemonize/Manifest
+++ b/dev-python/daemonize/Manifest
@ -0,0 +1,3 @@
+DIST daemonize-2.4.7.tar.gz 10096 BLAKE2B aeac5b0c0ac3dc0a1a069f3b1bdcc81bc8cc6703c4650ee6b569f6ce9caf6255551655e41a94406b1ff22817ef2f64d7826ad9491cbe1b0591e357141f34f06f SHA512 33c32893916b9bc45949bb4115bc8aee2eacd809535783eb7b07d3d3ee162ea969da5a739078f8b061e89da52e8da468f9d7fe916dd4f9d7dbea7012c2955e9d
+EBUILD daemonize-2.4.7.ebuild 457 BLAKE2B 06d131875c27ca68fa0c8cba2154577748fca2f21b28e8e59ba0543943ab5cc8f8b9c9aa978d20d3045f7bfba0dea4e34dcf8aa608c8d038629c790a5b10b610 SHA512 7a3d533a6965809eb1518482da18e432b5912c99bfdafc4f0d58e49d2aa4abfb1e8121610fd98ed87aaea7e59ba6a75f697b0b72b1cf91f44e65b12ea1f8f8e2
+MISC metadata.xml 377 BLAKE2B c8bc7c4e33e27cb2f208673e213460e02fa448f41226b08324f44d700d856be8b1bd408dce6f24dbdc1ffe8d2b15d99f56160fb93727066d887362fee7a532db SHA512 7d2e4141f084e93515957fb82473b1504b53c5082063b3f4c97fc1d326bc03b589405df8b3f19f8f926656fd52d7972b1b95a479c045d8a691cec255bb95d4c0
--- a/dev-python/daemonize/daemonize-2.4.7.ebuild
+++ b/dev-python/daemonize/daemonize-2.4.7.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for writing system daemons in Python"
+HOMEPAGE="https://github.com/thesharp/daemonize"
+SRC_URI="https://github.com/thesharp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/daemonize/metadata.xml
+++ b/dev-python/daemonize/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">thesharp/daemonize</remote-id>
+		<remote-id type="pypi">daemonize</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/fabric/Manifest
+++ b/dev-python/fabric/Manifest
@ -1,6 +1,7 @@
 DIST Fabric-1.14.0.tar.gz 219294 BLAKE2B e4f8512fd5f84dacccdafbde51ed109fd7128954635ea67ed7461f686769c107cfa6bf0181921aea5db214ffb9fb52c7f0de88c5edbbdd63258e8c280e37c70d SHA512 3bb90597356ac033e5a9bba668ec8b080ee10cac31f54b1e89b6e2e21550ba5f2341e774ed9ff52c3a4ecbc3bae3206d155c6bfe6678576caca8e439c7810ed9
 DIST fabric-1.14.0-completion.bash 4266 BLAKE2B b691b34d3a62ab8a70d184fe89150d50a0817df0619cfcb4a82dcda485b0a77bb33b5f7e548b1c50ddf8c9c9ae48721c9621e0ca6ed4396dea2f9a0e1ae61931 SHA512 2303e3b6a71ac8f6a61ce3bd464f3c950db8374b61a6375ccc6fbb2dc815a4a44509a034788862bd361ace7c0f401533cd5cee0fb6fca8d9ff7e0ffd143706a3
 DIST fabric-2.2.1.tar.gz 145848 BLAKE2B 8717a2df6d6bac41db3923e85045e1248e4376784ecf35ef3c0dc4e44a6698266305463f535d8998e489e056a158835597ae9117af2de7e6a22e2437c21217dc SHA512 51e570f1a94131e59c0e2b28c7d56e92e3230acdcb5be7c9e1ef96031988aff853ab7f91082ba468f75bf8eaa83ba826372f522ee336dcf1f2665e8222831d87
+EBUILD fabric-1.14.0-r1.ebuild 2162 BLAKE2B 36a3d0a6e660e7ef850eb87d8ff4b2b858a3db08095bc69487003e8db1976d9faa95f03365786a0353b014b0b9222447ea70394568cd9580520c98581b496a73 SHA512 d2f83cbbdc340d04e3f08809616f3e5021db7f28681ff2a27e1946c4eb2b4a4e7ff6f6c5c252e909e93d572a63a2d49497873181368231ed3001fbc6a305444f
 EBUILD fabric-1.14.0.ebuild 2163 BLAKE2B 98ef182b8a84056f297ef881a07a4062b4b0fd7c601e58de9103d4383af31ef346c6ca242cfe2677c1d0fbe2492009a3921430eec3df74373565350600d99977 SHA512 dcd699a6e9ae08cea481b354a4c1327bf1738815761fb6f856a84684e99f81cf553c31d2e7f64f906456aa4b687b11435fd93dc094dc9db45459819154a56c76
-EBUILD fabric-2.2.1.ebuild 1450 BLAKE2B 9e7c17944df269c3173bd97d57d76459ca9e3cc6e3a5430940c6a796e4785954af58e40e19f602eb79769445cab1fabd0f7baa0c3ed184c4d2990db1d956caf2 SHA512 19d87ee1a125760da861935a981d0f16eee2cb7c2a01803ea782585757ffc4ed332e28beb32f3e61f414339fda76758b295e8608fa3b65a87ded4e2858873608
+EBUILD fabric-2.2.1.ebuild 1523 BLAKE2B d6ecbb6c23d969a9806256c994f0f6229419c995994c18aca3aae991967f989f2d2729463e42d58d6668f6ef5858ea4d4544c992e11f58fd4522d5bfff86f6d9 SHA512 d196e42a2717b6b693fa3b7cce3ce65d123d41144251782e59bc58c7cac24ab69449f1a0f24ff208c2d3ee41ad2d47390f81b7b76482b3e4c5a076ebdfd562f7
 MISC metadata.xml 524 BLAKE2B 9df10f0b4cbe8197f27e7b5fc67fee9d46d881ab29cd29f2255aca693b3439c49edd1145ec2442cc6d49fcb173998aef3bbd2a3f2017e1cb83fcc79f1c50c59e SHA512 1a7a207ebf6d760a6f8e150806addbc9ca6c207b0f93c13bf5525ab2868d95a2b33acee846dee25eb70af0163cb2e05323de1ac2b74155046de962a44c470413
--- a/dev-python/fabric/fabric-1.14.0-r1.ebuild
+++ b/dev-python/fabric/fabric-1.14.0-r1.ebuild
@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_PN="Fabric"
+MY_P="${MY_PN}-${PV}"
+
+COMP_HASH="83d303e9fb352deaf4885b6db0781b3d9115e9c6"
+
+DESCRIPTION="A simple pythonic tool for remote execution and deployment"
+HOMEPAGE="http://fabfile.org https://pypi.org/project/Fabric/"
+SRC_URI="
+	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	https://raw.githubusercontent.com/kbakulin/fabric-completion/${COMP_HASH}/fabric-completion.bash -> ${P}-completion.bash"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/paramiko-1.10[${PYTHON_USEDEP}]
+	<dev-python/paramiko-3.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7
+		dev-python/alabaster[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		<dev-python/fudge-1.0[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Re-set intersphinx_mapping for doc build
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed \
+			-e "s|'http://docs.python.org/2.6', None|'${PYTHON_DOC}', '${PYTHON_DOC_INVENTORY}'|" \
+			-e "s|    'www'|    #'www'|" \
+			-i sites/docs/conf.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c sites/docs/ sites/docs/ sites/docs/html || die
+	fi
+}
+
+python_test() {
+	# 1 failure, reported https://github.com/fabric/fabric/issues/1360
+	sed \
+		-e 's:test_abort_message_only_printed_once:_&:g' \
+		-i tests/test_utils.py || die
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( sites/docs/html/. )
+	distutils-r1_python_install_all
+	newbashcomp "${DISTDIR}"/${P}-completion.bash fab
+}
--- a/dev-python/fabric/fabric-2.2.1.ebuild
+++ b/dev-python/fabric/fabric-2.2.1.ebuild
@ -52,7 +52,8 @@ python_compile_all() {
 }

 python_test() {
-	${EPYTHON} -m pytest -s -v || die "Tests failed"
+	# -p pytest_relaxed: this plugin has to be loaded explicitly
+	pytest -s -v -p pytest_relaxed.plugin || die "Tests failed"
 }

 python_install_all() {
--- a/dev-python/invoke/Manifest
+++ b/dev-python/invoke/Manifest
@ -1,4 +1,4 @@
 AUX invoke-1.1.0-skip-pty-tests.patch 959 BLAKE2B 4e23e88f3cdee0a3e7408b3fa217dafe28f36967516a7231543e8303b22c901a5c63a45dcf1332ae7a6e5d031fd535f8674388474429deec15535ad378cd02a7 SHA512 3ee402afa6f658639b56049e114b9e243be91e0a8016f0fda18d3f34c3a3e8d1be9a452d4828f072fc220b185790c820c43bb5d9a7b9060265c181fe2f63c58e
 DIST invoke-1.1.0.tar.gz 309811 BLAKE2B d1832d141a50d5ee9039614191cc02f266f440fd939463d572218a79ded9384ac8dc71798f716482021a0cc39611bc51b73973b67973d3cd5a3d208608091e17 SHA512 6b8ebee7d2dd68fe0134491b15a3b85fd6d1493c5b81f00ba577c6bcf3e4a264d74f68bdd0d40a4c5bdde18c021395ee335d10dde8e676bc9efb313e1ae9b55c
-EBUILD invoke-1.1.0.ebuild 704 BLAKE2B cecac4b811b5a022e42ea7381b1b084408703a5ee2072d84fc2d1191039cf1e51e58b631ffd348cb23261651476b9078ae3c0bf85c0b9d3c86b7d6c794e3bdb9 SHA512 cb0b0013aee2cd54c65ba0b1c5339deeac4a587cde176dc49256b7d83a0ff17ffc98dbf913e8bce7dad06c38089b65a672d6e87b29939a6563412eeee36ca91e
+EBUILD invoke-1.1.0.ebuild 799 BLAKE2B ba3815945d9388207aa725b43c581cf02cc22c6b17b19b20549b0b2ae7d2fd08c003e7d58a3eab0a9790e1b4b077ead9827eca1b588f667628a177365f247e4d SHA512 3f03a59ac27d7d1b92e7939a68910a0c08621d0cdffd9fe3b26e483ad52e622aaf1a41d621c3b36552ba7517eea6f7a19bf6c875e7da13c02d68191343f3c3d9
 MISC metadata.xml 438 BLAKE2B fd7de2d82839646be57042d5db8b2d4a27f9e3f16bad202dc068d2eaf590e04952003d67614c98554c631668c0c31927a7e3a4f73ec15761a66631d01cf6aef3 SHA512 eb37fe7d88bec1255f2579bd9e60054b887c466984017501327a48a6a8ae6e3a3b3b473c850db94b0dda7bdeeb63b8c60e0cdae041fa034854fb68ee416fc9bd
--- a/dev-python/invoke/invoke-1.1.0.ebuild
+++ b/dev-python/invoke/invoke-1.1.0.ebuild
@ -29,5 +29,6 @@ PATCHES=(

 python_test() {
 	# -s flag is important: tests fail when pytest isn't in "no capture" mode
-	${EPYTHON} -m pytest -s -v
+	# -p pytest_relaxed: this plugin has to be loaded explicitly
+	pytest -s -v -p pytest_relaxed.plugin || die "Tests failed"
 }
--- a/Show more
+++ b/Show more