Sync with portage [Wed Dec 6 08:52:11 MSK 2017].

2017-12-06 08:52:11 +03:00 · 2017-12-06 08:52:11 +03:00 · d3ea4e2c0f
commit d3ea4e2c0f
parent 1ef32fc9ca
1007 changed files with 9947 additions and 8854 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 28854 BLAKE2B 2506ef3f4b7b1c7cc3f4dafe0ec4dbbdfe520c44e92cc9f254f3c7e48ef59632921a781f1a9fccd4b23d5c7f301b0e9eaf8b6c395103f35b34fde1e162e0e231 SHA512 79b9e33855eca2fbb2f1fc398d156854a84af88b2b38b4299738fb5133f4d3326dfded6dfb3bb1058a06a94092cf0cff957cc7d9213a1f632898705dacdd13d2
-TIMESTAMP 2017-12-04T09:08:46Z
+MANIFEST Manifest.files.gz 28834 BLAKE2B caea05a5423ef081f87659cc2cad46f70332091f8ff91cb8223b7ae7550786c9cb7d1eb79f4d8699292bc81cd62a95c16083c52f58ac54bd88fb1a19e1b5f5c1 SHA512 67691c59032b439a6d514c07df0c03d617749716bb8ebf229cb69ebac30de1c6b4b0345eb79141ba713a14c56f8505087cbeb3fc2650b3d23d8b16692e238147
+TIMESTAMP 2017-12-06T05:08:53Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlolEJ5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlone2VfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCfNhAAroIksx163Kgkaotf7bWMoazXirLWXrDM2haIfQC16KkvLTgyKKbcDdMt
-TKxjAlNOnOeHsBDR5/ppqPd0SpPKU5TxTmK3DftEl3bE8PMXAmtQ6FXd+01V1sKu
-yb+yq4yYWzZ+wZtSxeRY2juaoFPP9clpywDlj1FrknoIfehssN6Gj3QHYZ+wQPd6
-q4uDkzmOHZQf62ghatOWmfZt6ssajtUJS5Lg5BZl/1dQAfpMUk3ln+aFcjXY+3L3
-1XquXYLQU5F1EEF2ql0ohzJrwvFP4K4KdjUullJtFvMafNr2pkI8ty2bQDmkeuse
-7OjfeiryTdfsVibi16fe5jMjizOJQ0bRhZBhbXcmZKUMj9Alye2DeytVPD6VQV8r
-WrjSCCRpF3OF8stdJUYMbxiErzXp8LByYkkNXmV/E+cGnTyZyqg2ezyeq6zOA3z+
-YEBOxxmScbzT/jjP4muZySWIOrzb4EpCKDFdKR6GSB/HDuj9+b1knl4BC5NYrJ/v
-CB64xLmhg5NUu3V0Ucti7qh0R+MwJnRBaqIbtsjvQjnVELVt/GH3gGTnPAVyAd5r
-Cayt+qxmUNFxSLr2E3ACt+AgPge4GZ7UOYbMEHPdjAfq5qxMmIkAx2zVsuTmZSYS
-irxnlAtDz0kJlgujDb+d68n7I3TVFBRPu7nPwyWzW8zmtDihqxI=
-=Z1Xl
+klD1qg/+MVvYzAGUIyvf8M0NypOS6R3FHw7Je3WPSnah5BodAz6lUp9T+p6V7Uve
+Ow6nLJSDQkHYh8Ad19SN9CjYBL+nJ0yNE1DBCzXbMOG5Gfg5DA9flkyQUgv8fnT4
+rxFzi8J0mJR0ASo+/m/L3tRpDEOx92EVd5KrldBrRSGUXPqtvHUy8fbRZTpzqDpn
+Eo2A1mFKUkJRZp0YMpxbstzBC25vyI+gua5sW+Y+O0kYfXuoTSH3c/bfjAhr3FhZ
+kwgBCQ59XlMdQRevESpLCkqocpCFUpNR7ctJGdT8L/0JQk6M5TWiC1hDspVYQcx+
+vFIxQL7izbInNhV2XerIm/wfrZMYquJHSfVySu2yA9Y1rCW2sL3tUTbmniEhrQ0h
+QvY3WrMTJa5U46Xgl7FYlLeVi725UIV9EeAWqM30BgS6ytvvp7xhv/pK79IVq9av
+n9BmVS0iC76IW0E7evyHtt6ia0cihfnInrrL9kDMOExyfjXTmIr7Upok0P8yc0Xv
+8m4ZAoCMkKTNrBR5tHEQ6eZd+MtEupKTGDTGeMGX2bSKtgXv+wiWfPS32pFNRm/B
+Zasvz0wT3ZgSJj1+RsqS0MJ5T8WM+kiucfhA2nlCv7064wmbWScpvB988BtCN/Ta
+K2IUieiys3pH/vTlExyom0EE+RN5hvIJozG/jcchCVQStimMrGg=
+=Y7zV
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@ -1,10 +1,10 @@
 AUX brltty-5.2-fix-ldflags.patch 2168 BLAKE2B c75da04cfb57b550634a18f67c81fb0fef857122795ff1a28c5d8fd654849cd4fe25a436b72aa851cb746f6eea52e7c2a52f5ba40f3d64797341678b4035070f SHA512 72ce6b722e90deb9e3d6d537b54ce2f8625154a5920eb555fb5fab1b65703a4ff88a2e0907b74a11454231507ebd9741533ee9b77ec5dfeffd3870179ebd98e8
 AUX brltty-5.2-major.patch 1511 BLAKE2B 69ee1619d30241bae78e70c0876f7d9df664fef38ef4666bc34d3da8a45bc55f1b278f735169724f6882c408135f5dc51e7e75af9a0adf74351db4b324a0b66d SHA512 88d1eb5340e105c8e975e89071d8f9f7818d417931442c69cd1fff5cdb197dc1c40e4618c6a9b62b15f972e03523ac9d3a18deb0e7d1be6b6c1aed1b309e29cf
 AUX brltty-5.2-respect-AR.patch 433 BLAKE2B 20fc18a063bc568925646d6d21fe6c59c33105957f9de155ea9046cac95bf1319bdeab3cecf5d0016d72a5a2f484534bb6eec8aa9d4ae4f6f5d325a6ee6c27bd SHA512 ce778cded4ee6f9ac45faedd3727c58746e780cff944d2c39ff71f792905c7f214b104641aef72a233d07df74a92cc2a596ac6bac1b76873d82d2c1383e994e9
-AUX brltty-5.2-sysmacros.patch 750 BLAKE2B 8d6955bf3a4792d460e85869951a8fd10e4d99014a79e3f56257b65be3acb36db1dca299f7af75995fd3bfb33619548531ad4fab31734b3503a2048945e17732 SHA512 f64cfd6351d20807624ed398d1f1c466b92d8f281934cecbeeeadf1f0faf360f33e2e3764c7b9f7467ccf62af206368986c41867f6f3f54ff966be78902119e2
+AUX brltty-5.2-sysmacros.patch 458 BLAKE2B ed2f09ed3a137758603d0067ec18708bbfc24fb3cad90954905ebeac4900dd70b679ccfc1d64c6f23fc9d4c7de0275a760222f8dcd935086541ef16cfd9ac963 SHA512 8e1ea5351c963df01603ff2469ff01079896fac40fbc1b91bb88f976749b639b4c925382e041f402f1cfef8a16716fb46109650b173539d69131f1e275ee1392
 AUX brltty-5.2-udev.patch 1208 BLAKE2B c8fc47d9ea27ca78c4634be47d43f406ba0875eb1b4a19048c264faa602918ac96024b03f56c642722cc9eabdbbe9a9f9005ca4de0d39538f746ed4ecadce3dd SHA512 0a1873dbdee7b97385199bd1f7158847bd8c52f7678783add4353c990ad5a93bc5378f38e52e3b1b30d071167802750cfccad227260dab8eba52e88cb230cefd
 AUX brltty.rc 242 BLAKE2B 68fc8de846cdaff11b2b6377d49985c8cbad1342dad03e60f3a3ef2e8aeb728994c05f6b9bb9378e5434c1e4cd03ead0716abf7344dea3f993ac10d9c12edc23 SHA512 067dc15ca297774ad773512f57e0b828ce97a07ac7156e4c72fc25b8b045eeca313ae566564c954193be83c72928dc3a26e1fadc4b2cc1755c607f515590cb9a
 AUX brltty.tmpfiles.conf 31 BLAKE2B e51c4c6e98da2d68ebd2aca39d3015ca28b40dbee5528155f9efb87ef8ec5264b382c78acf748514bd1f3902dbedcd471f4e18b0361c6a924108a950c75aceb9 SHA512 3d52a11e0d266ac508ab5447b6515f006f610e3bcb2ec396c3fe4c58a68874c9568f7fd6a143829f69c1b87680f1157953eae9fe326f5db3723c7e4b46390bf7
 DIST brltty-5.2.tar.xz 2532684 BLAKE2B 9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f SHA512 8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
-EBUILD brltty-5.2-r1.ebuild 5196 BLAKE2B 60d9aa930fa67463003111b02fe339bf8f4c73282c67d29165273263b852fe51dadb7e1b0468ddf26ed27ba986ba4f67a5ee100cdc36dc9f8ddcfe815c057fce SHA512 2c2be3c79a3b8054f82adc5ea06ee00864b72325cf7da0ffeaa50019a13b763fd40b6d4d0918ecb935698daf2b20527b83136ec3f940829053f7141a9fac9df3
+EBUILD brltty-5.2-r1.ebuild 5110 BLAKE2B a4721ce01383f259b44457f3c1f49998d319a96888a9c94e82ca98dd3e12d58e7753a86425fae215b1c7accced2cd561447a95de4845e0ae0e12176204c447f1 SHA512 714da26e215f751c0fa2d438e2e9008e8634d8f56ce71b1aec8db5662e719103b83b05d7a2156e6736b74249fec6f44f6478b1913c9c07244367d39650117d54
 MISC metadata.xml 1502 BLAKE2B 75f1750b615a2d6d022ed682f65ce6d0d45908e0d5724a162220a915371ae357cd904b0c09083153fb0f07facbc89024604fe86e3386e58a7d409a82f3865835 SHA512 337bf98d4e2ffac2ea0721a042bd31958809de5089090b0a79d73457f700d57fb8ffe637f4ad9e896992e98a13fdbe1ac9a3f7758d8ad2703334db8edfb7c32c
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@ -3,7 +3,7 @@

 EAPI=5

-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
 FINDLIB_USE="ocaml"

 inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
@ -22,7 +22,7 @@ IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
 REQUIRED_USE="doc? ( api )
 	java? ( api )
 	ocaml? ( api )
-	python? ( api )
+	python? ( api ${PYTHON_REQUIRED_USE} )
 	tcl? ( api )"

 COMMON_DEP="bluetooth? ( net-wireless/bluez )
@ -30,7 +30,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
 	iconv? ( virtual/libiconv )
 	icu? ( dev-libs/icu:= )
 	python? ( ${PYTHON_DEPS} )
-	ncurses? ( sys-libs/ncurses:= )
+	ncurses? ( sys-libs/ncurses:0= )
 	nls? ( virtual/libintl )
 	tcl? ( >=dev-lang/tcl-8.4.15:0= )
 	usb? ( virtual/libusb:0 )
@ -64,10 +64,8 @@ src_prepare() {
 }

 src_configure() {
-	filter-flags "_*_SOURCE*"
-	append-cppflags -D_DEFAULT_SOURCE
-	has_version ">=sys-libs/glibc-2.25-r5" && append-cppflags -DHAVE_SYS_SYSMACROS_H
-	has_version "sys-libs/ncurses[tinfo]" && append-libs -ltinfo
+	append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
+	append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"

 	tc-export AR LD PKG_CONFIG
 	# override prefix in order to install into /
--- a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
@ -1,24 +1,20 @@
--- a/Programs/system_linux.c	2017-12-02 12:54:34.098643832 -0800
-+++ b/Programs/system_linux.c	2017-12-02 12:59:00.683592161 -0800
-@@ -24,6 +24,9 @@
+--- a/Programs/system_linux.c
+++ b/Programs/system_linux.c
+@@ -24,6 +24,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include <sys/sysmacros.h>          /* major() w/newer glibc */
-+#endif
+#include <sys/sysmacros.h>
 
 #include "log.h"
 #include "file.h"
--- a/Programs/brlapi_client.c	2017-12-02 14:29:37.524205316 -0800
-+++ b/Programs/brlapi_client.c	2017-12-02 14:32:45.679948051 -0800
-@@ -73,6 +73,9 @@
+--- a/Programs/brlapi_client.c
+++ b/Programs/brlapi_client.c
+@@ -73,6 +73,7 @@
 #include <linux/tty.h>
 #include <linux/vt.h>
 #define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include <sys/sysmacros.h>          /* major() w/newer glibc */
-+#endif
+#include <sys/sysmacros.h>
 #endif /* linux */
 
 #ifdef __OpenBSD__
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -1,4 +1,3 @@
-AUX ansible-2.3.2.0-fix_key_error.patch 2733 BLAKE2B 0ce0c7f6bdd8f42f3796847d16037d667c53c0cc1855d1f0d6101e44425bc4edbf724153ec5e3744621aed18d042b0bce075496dd552ecff3037f1e7738a36ad SHA512 fc124b19d7fd2d60ab6d7f5185e23334740ca549a8d06eb093ac194e8f17ca92cb0a64735726e9313d026985182e33eea7f1c56a511aba938216cafa0810ca7e
 DIST ansible-2.4.1.0.tar.gz 6675552 BLAKE2B 00497b33e833149510669c9e481b0893a2d016caf2949fa064ca0a2e4f62a6c5a3f94597673822418253b85abaf380308115dfaa4c1acd88f0c73322d87822d4 SHA512 86bda43d912fc6b9cbf662e7e9e3ca3178ac577bc7857c5dfc0e68a7083d76ad405b0ca9b34f680a0d635b87e0bf5dc8cbdeefb93174242e1942eabb74b07f1d
 DIST ansible-2.4.2.0.tar.gz 6503595 BLAKE2B df4ec4e24671f1488950f2d9eb7705fbad4e035d6ac67d5017417281455cc44cde1290976a9ed16675c0cc19a9190200b95b29890725c56df5f2699398accd6b SHA512 32a075959dca01e184d9c3988fc9c491e904e7627a38e3527c37a8b26340f331bd294cacfe7353d339d15488857ba5ee1b36d9ae4ebeb8b5827934a73f4b42b0
 EBUILD ansible-2.4.1.0-r1.ebuild 1441 BLAKE2B c7d99a3d842b55015f0839ec115c341fd5e543c5b045573681a071d956fa74931135388f9cf081a26b80a40db0040fb63c2a6037d5cf496a5d39945eed955f2b SHA512 611e6a76d51e16fdfb0131862c39935938b439ed36e0bc5724bbc78f3944d9048e33c277120a6f681a647102c648dbcf2052f7008960cd97ee7afa133f16c41c
--- a/app-admin/ansible/files/ansible-2.3.2.0-fix_key_error.patch
+++ b/app-admin/ansible/files/ansible-2.3.2.0-fix_key_error.patch
@ -1,74 +0,0 @@
-From fbe9ec58c7f48d2cef4a49ba96e84bce5933d654 Mon Sep 17 00:00:00 2001
-From: Denis Dupeyron <calchan@gentoo.org>
-Date: Wed, 9 Aug 2017 12:01:31 -0500
-Subject: [PATCH] template: fix KeyError: 'undefined variable: 0
-
-Fixes: https://github.com/ansible/ansible/issues/20494
-
-Based on a patch by Zac Medico at:
-https://github.com/zmedico/ansible/pull/1/commits/32e5613a95e525c3a25b8cd5aa1beaa75a4b0d5c
---
- lib/ansible/template/template.py | 10 ++++++++--
- lib/ansible/template/vars.py     | 14 +++++++++++++-
- 2 files changed, 21 insertions(+), 3 deletions(-)
-
-diff --git a/lib/ansible/template/template.py b/lib/ansible/template/template.py
-index 55936f4..fe11471 100644
--- a/lib/ansible/template/template.py
-+++ b/lib/ansible/template/template.py
-@@ -33,5 +33,11 @@ class AnsibleJ2Template(jinja2.environment.Template):
-     '''
- 
-     def new_context(self, vars=None, shared=False, locals=None):
-        return self.environment.context_class(self.environment, vars.add_locals(locals), self.name, self.blocks)
-
-+        if vars is not None:
-+            if isinstance(vars, dict):
-+                vars = vars.copy()
-+                if locals is not None:
-+                    vars.update(locals)
-+            else:
-+                vars = vars.add_locals(locals)
-+        return self.environment.context_class(self.environment, vars, self.name, self.blocks)
-diff --git a/lib/ansible/template/vars.py b/lib/ansible/template/vars.py
-index fc6140c..2bf95ac 100644
--- a/lib/ansible/template/vars.py
-+++ b/lib/ansible/template/vars.py
-@@ -19,6 +19,8 @@
- from __future__ import (absolute_import, division, print_function)
- __metaclass__ = type
- 
-+from collections import Mapping
-+
- from ansible.compat.six import iteritems
- from jinja2.utils import missing
- from ansible.module_utils._text import to_native
-@@ -27,7 +29,7 @@ from ansible.module_utils._text import to_native
- __all__ = ['AnsibleJ2Vars']
- 
- 
-class AnsibleJ2Vars:
-+class AnsibleJ2Vars(Mapping):
-     '''
-     Helper class to template all variable content before jinja2 sees it. This is
-     done by hijacking the variable storage that jinja2 uses, and overriding __contains__
-@@ -68,6 +70,16 @@ class AnsibleJ2Vars:
-             return True
-         return False
- 
-+    def __iter__(self):
-+        keys = set()
-+        keys.update(self._templar._available_variables, self._locals, self._globals, *self._extras)
-+        return iter(keys)
-+
-+    def __len__(self):
-+        keys = set()
-+        keys.update(self._templar._available_variables, self._locals, self._globals, *self._extras)
-+        return len(keys)
-+
-     def __getitem__(self, varname):
-         if varname not in self._templar._available_variables:
-             if varname in self._locals:
-- 
-2.13.3
-
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@ -14,5 +14,4 @@ AUX update-hddtemp.db 819 BLAKE2B 2322abe8bc4c4f49a4c16267783d9d7ee46666e1e11b70
 DIST hddtemp-0.3-beta15.tar.bz2 256372 BLAKE2B 1c928234c36172c387a002190045cd05007f4b4b8d74eb378ba810ea9aad96951b7a9b3b0f872130677fca1f294d86f855327dcfa5a263c9f3c7d58fbbba502e SHA512 7db5a3dff60c59ce147b996ea4f8b6de1abcd34301bb863507b4d4b44e72fdc031078867a7f37161e67e74f6b426a1d856d3081179c678d2a442815bb0faa94d
 DIST hddtemp-20080531.db.bz2 5627 BLAKE2B b973a981ee55033c8ba190efd9dc8586589292ef1f2b00542be7db2be64df812847665abefc7517f7c71dc70df153766570f62b69fc4891e758e82200ff8d589 SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059
 EBUILD hddtemp-0.3_beta15-r26.ebuild 2972 BLAKE2B f273cee116ed77f85fdedaab31f82c6a7bd109b306a9d56745767050cc65ed79c2b28875f934b02fbdde87db6e8e1185605525f1562d930d3b5eadf8bc4edd0c SHA512 64c30191b0103c410b9d8461c283738a56ccdc09b7fd2f9d8ee3f4e05f1a16768d2e94fe74f7638e1ed8c3852976a19fe9f3766581c49ed884f686495eca1bf5
-EBUILD hddtemp-0.3_beta15-r7.ebuild 2624 BLAKE2B 5bf8b396d227f649fb99eb54e8f70e5aee830543a31f5690ed7cc0b06df4a7898428510c61672390bf99781f9d109fa6c7758a8db55f214b09838514bcd35c71 SHA512 e52873a21479241b582ce0648aa8c973298b1adbced6738172733537a267d421f52bf454672f81578ab1293cb79ebd9ba3487c9b7024a66c4be073338bb40d87
 MISC metadata.xml 260 BLAKE2B 41040f0f9342dec7a3993d99bd9fb49f624c8fc8a0be036b3c2e3f2f20d4182d23c5b98a5451f5d2d6906d749b7756b7ec10b1e135bfa7b1633234ebdae1370a SHA512 480d8cf7f249c083d64b11e13bd93b42856531860afa935a9265bfcf9491fbd3997a9b9d8e90630daba103402fc9aa08c63ef18091cd6ee68310c0a8f3c38af3
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild
@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools readme.gentoo systemd
-
-MY_P=${P/_beta/-beta}
-DBV=20080531
-
-DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
-HOMEPAGE="https://savannah.nongnu.org/projects/hddtemp/"
-SRC_URI="http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2 mirror://gentoo/hddtemp-${DBV}.db.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
-IUSE="nls selinux"
-
-DEPEND=""
-RDEPEND="selinux? ( sec-policy/selinux-hddtemp )"
-
-S="${WORKDIR}/${MY_P}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="In order to update your hddtemp database, run:
-emerge --config =${CATEGORY}/${PF}
-
-If your hard drive is not recognized by hddtemp, please consider
-submitting your HDD info for inclusion into the Gentoo hddtemp
-database by filing a bug at https://bugs.gentoo.org/
-
-If hddtemp complains but finds your HDD temperature sensor, use the
--quiet option to suppress the warning.
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-satacmds.patch
-	epatch "${FILESDIR}"/${P}-byteswap.patch
-	epatch "${FILESDIR}"/${P}-execinfo.patch
-	epatch "${FILESDIR}"/${P}-nls.patch
-	epatch "${FILESDIR}"/${P}-iconv.patch
-	epatch "${FILESDIR}"/${P}-dontwake.patch
-	mv "${S}"/configure.{in,ac} || die
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	myconf="--with-db-path=/usr/share/hddtemp/hddtemp.db"
-	# disabling nls breaks compiling
-	use nls || myconf="--disable-nls ${myconf}"
-	econf ${myconf}
-}
-
-src_install() {
-	default
-	dodoc README TODO ChangeLog
-
-	insinto /usr/share/hddtemp
-	newins "${WORKDIR}/hddtemp-${DBV}.db" hddtemp.db
-	doins "${FILESDIR}"/hddgentoo.db
-
-	update_db "${D}/usr/share/hddtemp/hddgentoo.db" "${D}/usr/share/hddtemp/hddtemp.db"
-	newconfd "${FILESDIR}"/hddtemp-conf.d hddtemp
-	newinitd "${FILESDIR}"/hddtemp-init hddtemp
-	systemd_newunit "${FILESDIR}"/hddtemp.service-r1 "${PN}.service"
-	systemd_install_serviced "${FILESDIR}"/hddtemp.service.conf
-
-	readme.gentoo_create_doc
-}
-
-update_db() {
-	local src=$1
-	local dst=$2
-
-	while read line ; do
-		if [[ -z $(echo "${line}" | sed -re 's/(^#.*|^\w*$)//') ]]; then
-			echo "${line}" >> "${dst}"
-		fi
-
-		id=$(echo "${line}" | grep -o '"[^"]*"')
-
-		grep "${id}" "${dst}" 2>&1 >/dev/null || echo "${line}" >> "${dst}"
-	done < "${src}"
-}
-
-pkg_config() {
-	cd "${ROOT}"/usr/share/hddtemp || die
-
-	einfo "Trying to download the latest hddtemp.db file"
-	wget http://www.guzu.net/linux/hddtemp.db -O hddtemp.db \
-		|| die "failed to download hddtemp.db"
-
-	update_db "hddgentoo.db" "hddtemp.db"
-}
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@ -87,5 +87,6 @@ DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 3892
 DIST github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz 7897 BLAKE2B a2b6f62fea8cb724ebbc9658e37985ed27fd1c395a838b6f8f89bc3e05106cd3e89b86753223bccc50de210461c89b01d8e3095ae1c6dcb6bc9a655c462981f0 SHA512 460b1cbef7d5236b099a67b27e902f9077fd42d6aa3772c13c1c3ab20fca87719a770478a068bf150e1224612fe4e1eadb1ec7cdfa60ca9cc81e3f6de62ee9c4
 DIST github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz 169394 BLAKE2B fe292aaad3f31173e1ed0e0d9dff74b9f5c46803acee9476f86a4822327296bfe52009d68c1b7bc2ed246596032e74a597eb951795a37eea9518a01ab4b3ad9e SHA512 adbe58e9286863ef674b6204d3b56276ff4e3bb1743af53e369fd2be97ee28dc26bb89f509f9b01641731b058db464af839adbad0e31149503b57796b22b2be8
 DIST helm-2.7.2.tar.gz 823059 BLAKE2B 3c4b3270055931e92bdafa29dcb182524e08744b3631bedb384bc34c3fd71dfd3aa60a9754b270d8b69999824166314439e14b53f9659543d69ff30ac7dc8116 SHA512 8ab947faa891102d89f229d79b6e78992b7a37d9bccc2a7c882482dc8143619acb1409d5643717d8d10fbd7e0df9da07a1ee18019bdb6befa4ce189112001b4e
+EBUILD helm-2.7.2-r1.ebuild 8495 BLAKE2B 4dec9f5450105ed814d5f5ae978aafeb5790171e1e35cc36e0903590fc3129fcc82863421457dcce98c14851aabdfcf7755c507ae53f8d0a904934e6c9a325f2 SHA512 6e4ff8e304bf46838e2db5213bfe0a8209b30602b61abbe77bd3517ae6bbdcdd30a282095eabe3120ae43d99521bae5135844063fb184f35dc115e513d148807
 EBUILD helm-2.7.2.ebuild 8289 BLAKE2B f442ba6ae7d1d690543810d8fd24a699a0fe8bd19d16cf7e9c0d17664a9fc2b0d398a9120619e01d39ffd8c9145a1a5df28ea19847becafb48640901bb5054f0 SHA512 dc1f91c21a71e51d3c87db17b0d543ec4aca1c4b36da9f65bfe02ba7b693d6a66a6957fa5597f95a7c5d9132b8e9126d270c96ce7ec8fcfe454defe40a714180
 MISC metadata.xml 325 BLAKE2B 2c14b657183fbfb11e64b4e00d5fe758cc449191f675b9359c940f2098446a08310bae27d291e268e8ee22cf6a0435ae2065f1e50d961bbd16804890bcbab5c0 SHA512 7021bdc2264f99d038b05085afcb1de80bd03e705e4c286dc81e0aa486507ceeef102340d2c49b74c2b7aff87c7ae7bc96caf4ab0677f9dc22156b7faad0fce4
--- a/app-admin/helm/helm-2.7.2-r1.ebuild
+++ b/app-admin/helm/helm-2.7.2-r1.ebuild
@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="k8s.io/helm"
+
+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-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
+"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
+"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+"github.com/chai2010/gettext-go bf70f2a70fb1b1f36d90d671a72795984eab0fcb"
+"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
+"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/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
+"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
+"github.com/evanphx/json-patch 944e07253867aacae43c04b2e6a239005443f33a"
+"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 6aced65f8501fe1217321abf0749d354824ba2ff"
+"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
+"github.com/gobwas/glob bea32b9cd2d6f55753d94a28e959b13f0244797a"
+"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
+"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
+"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
+"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 36b14963da70d11297d313183d7e6388c8510e1e"
+"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
+"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
+"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
+"github.com/Masterminds/sprig efda631a76d70875162cdc25ffa0d0164bf69758"
+"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
+"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
+"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
+"github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"
+"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
+"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
+"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"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/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
+"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
+"github.com/spf13/cobra f62e98d28ab7ad31d707ba837a966378465c7b57"
+"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
+"github.com/technosophos/moniker ab470f5e105a44d0c87ea21bacd6a335c4816d83"
+"github.com/ugorji/go ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"
+"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"
+"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/grpc 8050b9cbc271307e5a716a9d782803d09b0d6f2d github.com/grpc/grpc-go"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
+"k8s.io/api cadaf100c0a3dd6b254f320d6d651df079ec8e0a github.com/kubernetes/api"
+"k8s.io/apiextensions-apiserver a5bbfd114a9b122acd741c61d88c84812375d9e1 github.com/kubernetes/apiextensions-apiserver"
+"k8s.io/apimachinery 3b05bbfa0a45413bfa184edbf9af617e277962fb github.com/kubernetes/apimachinery"
+"k8s.io/apiserver c1e53d745d0fe45bf7d5d44697e6eface25fceca github.com/kubernetes/apiserver"
+"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
+"k8s.io/kube-openapi 868f2f29720b192240e18284659231b440f9cda5 github.com/kubernetes/kube-openapi"
+"k8s.io/kubernetes 0b9efaeb34a2fc51ff8e4d34ad9bc6375459c4a4 github.com/kubernetes/kubernetes"
+"k8s.io/metrics 8efbc8e22d00b9c600afec5f1c14073fd2412fce github.com/kubernetes/metrics"
+"k8s.io/utils 9fdc871a36f37980dd85f96d576b20d564cc0784 github.com/kubernetes/utils"
+"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
+)
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+GIT_COMMIT="04769b7c26109aabfc9c6b645b345d665b6bd0cd"
+
+ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${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 ${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
+	./scripts/setup-apimachinery.sh || die
+	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
+	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=${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}
+	dodoc src/${EGO_PN}/README.md
+}
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@ -23,6 +23,7 @@ AUX salt-2016.3.4-dont-test-ordering.patch 1485 BLAKE2B 4075d7c43d7f6b419357aed1
 AUX salt-2016.3.4-test-nonexist-dirs.patch 1655 BLAKE2B 5e7907e0a10c4ee78b599ec98d38088c97889ae2002602db0c207fb210e2960e7b4b92c08f027854e6dd9205b000bb09e7b243346af755e6824561752e3ef2e9 SHA512 ee81b8104f066e1d161207fe82d8349eb8c40701544784a2b6e66842fe9e07d7edffa24cad8c5d2037e2e7fa0368c614ed177fdf7359c89255d068767968e8fd
 AUX salt-2016.3.5-tmpdir.patch 1982 BLAKE2B b8d587e6139ac49b78892572070d0985fb78de3986fedfc8df04276da69a6f7f0c28fcb1f41df282747c80bfaba266fdcfeb58890e494f32873d870add388d98 SHA512 755ac34298c6cbc57cf7404b209bd45ad216c07bb55b303e97375e1912aead765dddddbe3331314e4f245c6848e62447a5bb16b04367f20bb8387e89d0254859
 AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd29dbdee6ccbe0a07f139903360312db247926867a78513cd9022f492ce370eeafcc81bc4db545359036f8f5b0d2d64d3c5bb8aefc0 SHA512 33b69954e8112c0f76654d507df74a4cdd37e8227848f2ce0652b3ecee8b847253ccad33cada0e3dd1471c54c780dcc12d5e546c4ec43868511b95b0c7f71e17
+AUX salt-2017.7.2-fix_disk_format.patch 2111 BLAKE2B e8a1c24cd780e29092e3112256bbe3cf518dac49479abfcac0b2432b8528c448241bfc0cce5bbf20b1be674cd49766c151547cfb4d5ef0894b3c9a1d28ad332e SHA512 33c73a70e163135c238b85ad6a0beaed5ed5d339fee19dfa15f7dd073200cb788ec5234d89939eab1a8b080ccd0b22ed0a5409cfaad27ac1abbbda3f018f3d75
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed
@ -33,11 +34,12 @@ DIST salt-2015.5.10.tar.gz 5693422 SHA256 863a96e70f8521af35fe11b10d25b3205a0bfb
 DIST salt-2015.8.13.tar.gz 7036243 SHA256 cca82c9a4f267692660b098c1f76e54ab6a24131391893719bde0eb3a1ed2959 SHA512 ec8626f7360542bfeea90fc3d6fd9d9d015da4c2a6adf9957c22501ed9531b0a44d2cbc4853c41856b4cd46c142d2441884ec99700f3c0a5310cc428f9f1ec2a WHIRLPOOL c21f3bdc5fd674ea664c7e8fd58ef6685328a6ee3679850f3e9a085b1e604e1224a3323b906b47075fb8dd39f373583fb549e7b0f3f725d44928bcf716955a10
 DIST salt-2016.11.8.tar.gz 10142142 SHA256 e75f4178465d9198fcd5822643460c94d63de6221316367d5b85356ef8b1994a SHA512 0adc544ca460d13d2adb11b04575bd079a3dad1be3468bea7d32d0b74416b78546e4c86c75551bba09786be8e9810a6e30232414c4f5851cbc9a0fb4b894e0de WHIRLPOOL aa2ba8a4afbdd412e133364b4b034b7a34cb5af43fcbed929451624444440a07b143977ecf1db5cfcbbd53c98aedc15dae5ab8c246e48ab3b7c1053d30054b66
 DIST salt-2016.3.8.tar.gz 8519835 SHA256 9558379a11882348c1299ca094b638feb6bdf8f0d443d2055a71d0c9a52427e3 SHA512 bba41d4c70e278aa7196d292fb27b926dce32f4cc67c5b23b6c219ad59178b1a8b26e8adeb3a7bd587c25cc1c8ff36a207ea2a2f68d13d64f37a34f96f35ecd1 WHIRLPOOL 14e18eabd1287f05b0387455890f31c030ce6c84c831a12d0c691f76a3181dba0d3c12a15935c0f786c02fe6887d17a0fad492356814166c23865e3f98831f44
-DIST salt-2017.7.2.tar.gz 11471191 SHA256 ff3bc7de5abf01b8acbd144db5811b00867179b2353f5c6f7f19241e2eff2840 SHA512 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b WHIRLPOOL 85e6ae3ba1a5b7c1e3e8546daec6ceb4ec60fb915409dd8000298b394b933f24a4b1d5740ebe230930bf8de76e7934d1ae3c919a058fdf6bf60638c260e6a585
+DIST salt-2017.7.2.tar.gz 11471191 BLAKE2B 0b7184eb4dcb29f2a9603117d1c6fb9c729093c1ff11e18370929ec3fdbfe7bf8c0914f17260c3f613842c23359205a4a84d3e0bcd67476705e50f805bcd7b69 SHA512 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b
 EBUILD salt-2015.5.10.ebuild 4120 BLAKE2B b6c3f5f5fcb44721f55828b5d472b81d0bb3ef42e9ddd699c1bd52ce9c26929773662000b7984ed1ba573cff6bf476d2dc4b2026012d7ace822036aeb235b480 SHA512 083d1fefcb43b825d0e52e9cde37802c146261b98dc45d5ad780753b35f80444931529ca2334671515f69d5f8de6af6eb38512ea6806d9d06af24464b13c1270
 EBUILD salt-2015.8.13-r1.ebuild 4539 BLAKE2B 59bf43c454f1ea434abba97219920d938b6c0a92c2a4ac58e61a03620d19a959a589558e6dae174c76c6e2f84fadfe0b43d8b0a04dde7ecc764ebb8d6063a44c SHA512 9f581b8892282b96044511bbf444c9e95b1d548d9f39fe972e97aa9e801d961071301eeb1df41734a0c33a100d70d43a6c0bc3b04e7cf7c469dcc19aef577330
 EBUILD salt-2015.8.13.ebuild 4481 BLAKE2B eb797e470c44a94019cefaf8638b00f42dfc075a9ab70733fa55f897533c2801f131830be6a7caf9f34981a72c451e23d84712133c382645a585f30d77815324 SHA512 e3a39c1c44ce16b6bb63a05d135cf46f1a0676a419d70441f0d051b5f6f8f8f3a6b961961d03d7cfcab71b50866fcb1234f76f800c29050dd900743eb29e4586
 EBUILD salt-2016.11.8.ebuild 4623 BLAKE2B e01c069e867334c3312df92d6235c85124ae2bf2d1ac591e083e928f3522bdf3a4bc77351170721b2b290356776bb82ec8ca0afd894a1d28deb46df25d2831e2 SHA512 946eccb7bbe7175d81fa3746e6c87d7880ede9ed9c1f27106c2d6d782cbc001b05976fa113e2c5dc8b03c8b5d9a6ebfb0dd739250f82bf623ae4ab0f799f6738
 EBUILD salt-2016.3.8.ebuild 4670 BLAKE2B 6dc1143d60af6a1fd029f991fe8f1438c87865bc3369aef10ea45b3ec3e282bb02cddce76e9cd40289ec401600dfd70e141cc741214d6fa49c68fa88fa8153cb SHA512 3c9133d50c9abee9fc4dad7fcf9c643c84b0f3f8399fb71dc7e92e105f5dc4666b66c1bb308fd6950fe81d79fadc2a0eeaba14c75d9c6a2fe8e8c1ebb3d5cf02
+EBUILD salt-2017.7.2-r1.ebuild 4381 BLAKE2B e8f1a417b75b19e24474b96d8681b477045d19c1dbca1c3b4fd5e90e9aca7fa2d7f3bfa6223a8e508fd8695875e268bb12a246c4217376a3c37d6faba45e243d SHA512 2976747e1d16c4d3eb0868f489feba22fad18ce74543c6ffed5fd25d760594f1871e90ee0e6a8cf0827f131d7581cb6e50921ef9997e5f2cda32f4610cccf603
 EBUILD salt-2017.7.2.ebuild 4331 BLAKE2B fa924819154053c76ac002074d0d31867e7cd9b98b4abdae7a00a9aefd5281649d1924dc833c2f3ef8123796baec48d77c547ebcc410ce988a252986b9005486 SHA512 91f78244df90369ca0f1251618c463ef0c5ae34c2a7569c8cc23dd2cd5d4fc9000c0da521846a82d938fd1a49506d567307898c1368ffeb98babc93eabe6821b
 MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969
--- a/app-admin/salt/files/salt-2017.7.2-fix_disk_format.patch
+++ b/app-admin/salt/files/salt-2017.7.2-fix_disk_format.patch
@ -0,0 +1,48 @@
+From 18fb0be96a146589ccbd642caa9244480c51140b Mon Sep 17 00:00:00 2001
+From: Matthew Summers <msummers42@gmail.com>
+Date: Mon, 9 Oct 2017 20:38:52 -0500
+Subject: [PATCH 1/2] addresses issue #43307, disk.format_ to disk.format
+
+This change fixes breakage. It appears the disk.format_ func is
+aliased to disk.format in modules/disk.py
+---
+ salt/states/blockdev.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/salt/states/blockdev.py b/salt/states/blockdev.py
+index 4b0dc5ca81d..e6ecfeab3f1 100644
+--- a/salt/states/blockdev.py
+++ b/salt/states/blockdev.py
+@@ -159,7 +159,7 @@ def formatted(name, fs_type='ext4', force=False, **kwargs):
+         ret['result'] = None
+         return ret
+ 
+-    __salt__['disk.format_'](name, fs_type, force=force, **kwargs)
+    __salt__['disk.format'](name, fs_type, force=force, **kwargs)
+ 
+     # Repeat fstype check up to 10 times with 3s sleeping between each
+     # to avoid detection failing although mkfs has succeeded
+
+From 16e1c1dfc86920b7a00dbf7c39b805c359e4d13b Mon Sep 17 00:00:00 2001
+From: Matthew Summers <matthew.summers@syapse.com>
+Date: Mon, 16 Oct 2017 09:47:40 -0500
+Subject: [PATCH 2/2] fixed test addressing issue #43307, disk.format_ to
+ disk.format
+
+---
+ tests/unit/states/test_blockdev.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/unit/states/test_blockdev.py b/tests/unit/states/test_blockdev.py
+index e5899f1c70a..9b559dddfe5 100644
+--- a/tests/unit/states/test_blockdev.py
+++ b/tests/unit/states/test_blockdev.py
+@@ -100,7 +100,7 @@ def test_formatted(self):
+ 
+             # Test state return when block device format fails
+             with patch.dict(blockdev.__salt__, {'cmd.run': MagicMock(return_value=mock_ext4),
+-                                                'disk.format_': MagicMock(return_value=True)}):
+                                                'disk.format': MagicMock(return_value=True)}):
+                 comt = ('Failed to format {0}'.format(name))
+                 ret.update({'comment': comt, 'result': False})
+                 with patch.object(salt.utils, 'which',
--- a/app-admin/salt/salt-2017.7.2-r1.ebuild
+++ b/app-admin/salt/salt-2017.7.2-r1.ebuild
@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="http://saltstack.org/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	openssl? (
+		dev-libs/openssl:*[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-salt[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/timelib[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )"
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
+	"${FILESDIR}/salt-2017.7.2-fix_disk_format.patch"
+)
+
+python_prepare() {
+	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
+	rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+	mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+
+	(
+		cleanup() {
+			rm -f "${tempdir}"
+			rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+		}
+
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose
+
+	) || die "testing failed"
+}
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@ -1,3 +1,4 @@
-DIST testdisk-7.0.tar.bz2 676990 SHA256 00bb3b6b22e6aba88580eeb887037aef026968c21a87b5f906c6652cbee3442d SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2 WHIRLPOOL 9ef3ed733f13477435123089cbd6168c189591284aa72dc9636470b35a21a32222d6871916b43e3c2ba4ac6da85979d6ec249b22c2573b77db7b2bcc280b85f1
-EBUILD testdisk-7.0-r3.ebuild 2443 BLAKE2B 6e3ce9784e34190e089ed5b5b294c154f0e12536c308a82b3a9d472930af269ece3fdc2474a360265f8bdf079006ea658ed0145c3691687740ef0ea47874bbc3 SHA512 0e3e7478ddb21b301167f1ee39d67803e4f68912100194f7d6eba378281eaf2efeb36cadc773cb22aac896095e780288a53a13d0c21093fa858827dca63b1068
+AUX testdisk-7.0-qtbindir.patch 958 BLAKE2B 0d3ba4622cc6a83fe6b1fe65dd51203e05c936b7fc169fa5c070a3e77e799eac4f87068a6a6bbe9a3d6fbe25a8c6afae3a5251a72137eb4fdd4afb966e724a9e SHA512 c17dd97e058633cc3ca1f51d371bcce9d702dc2ffbd80eaad2aa1830d17c604702b23e4fb4d1516ab888f55899817e132be535d723c6b7275686d9513c6d6e31
+DIST testdisk-7.0.tar.bz2 676990 BLAKE2B deeeee290f05d4a992ff69c990cca8480c74e67ba2df0b523640833b968ed98dc9f44e5f33b2666daf07286dd8349b98171d6c65f7f3baae3d5cca159a5c9584 SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2
+EBUILD testdisk-7.0-r3.ebuild 2490 BLAKE2B 05e6b8c2362f82795092e86d4962b61bf18372c07f6c10a5ec63a3e6f16835a674800edaa84c8cab3ad0d5134f08228e24a5dd825fea4a8b73e6c21d08fc5e83 SHA512 b9abc56f703cdb6398fa694e428c32fb0951d3cbd790eea41da6c24df019e47b971df902aae086e9ab85c3c4861b20b5d4c602a2a6058aede5e8ed69cf43ca3b
 MISC metadata.xml 447 BLAKE2B da97d4af9961ab42d914dd33abbf433e5974ed49efb2ac2c4ff6cfdd50735bddc48b9b9e15d86a3701d740c73ef9df31439599fdd1cb6a37a306ddcf1cdafc73 SHA512 f6e65d544043790ff6b654dce7e4995214fde5f5c5f35926e396721cc223c97f06a918d7d345e9f4f51c82437af41887a0cb442eb0c7172f839df3249eb58095
--- a/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch
+++ b/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch
@ -0,0 +1,27 @@
+--- a/configure.ac	2015-04-18 11:04:47.000000000 +0200
+++ b/configure.ac	2017-12-04 20:34:51.804861863 +0100
+@@ -854,17 +854,14 @@
+ 
+ if test "$use_qt" = "true";
+ then
+-  PKG_CHECK_MODULES(QTGUI, [QtGui  >= 4.0.1],,use_qt=false)
+-  AC_CHECK_TOOLS(MOC,[moc-qt4 moc],)
+-  if test x$MOC = x ; then
+-	AC_MSG_WARN(Could not find a moc-qt4 or moc tool in your PATH.)
+  PKG_CHECK_MODULES([QTGUI], [QtCore >= 4.8.0 QtGui], [
+        QT_PATH="$( eval $PKG_CONFIG --variable=libdir QtCore )/bin"
+        AC_PATH_PROGS([MOC], [moc-qt4 moc], [moc], [$QT_PATH])
+        AC_PATH_PROGS([RCC], [rcc-qt4 rcc], [rcc], [$QT_PATH])
+  ], [
+        AC_MSG_ERROR([Qt4 not found])
+ 	use_qt=false
+-  fi 
+-  AC_CHECK_TOOLS(RCC,[rcc-qt4 rcc],)
+-  if test x$RCC = x ; then
+-	AC_MSG_WARN(Could not find a rcc-qt4 or rcc tool in your PATH.)
+-	use_qt=false
+-  fi 
+  ])
+   qphotorec_LDADD="$qphotorec_LDADD $QTGUI_LIBS"
+   qphotorec_CXXFLAGS="$qphotorec_CXXFLAGS $QTGUI_CFLAGS"
+ fi
--- a/app-admin/testdisk/testdisk-7.0-r3.ebuild
+++ b/app-admin/testdisk/testdisk-7.0-r3.ebuild
@ -47,6 +47,8 @@ RDEPEND="!static? ( ${DEPEND} )"
 AUTOTOOLS_IN_SOURCE_BUILD=1
 DOCS=( )

+PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" )
+
 src_configure() {
 	local myconf

--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@ -21,6 +21,7 @@ DIST amanda-3.4.2.tar.gz 5353734 SHA256 175c6a2ef57fe480ddeeefc920a93c8d1cde4111
 DIST amanda-3.4.3.tar.gz 5355137 SHA256 8ebca59d7b5fc64179fee3d9de4289cd9e8dbb49558e0a21228b06e16105d688 SHA512 5fa7a8c59961f87568d3459e6b5368e50c6cf74e1a6c7599faf5f85d537e72668775acc11009d1d5699ab92d1c21553b5b86e06b804c6a1ae04500889726694a WHIRLPOOL e1c4cd778d5c71994d2c74fef07948476f367fff42e666fb1b516035746c1e9562b9bf4579875e922c44f8dd65924bf9fec5ca7d30bbee0998540c4c319d18b0
 DIST amanda-3.4.4.tar.gz 5363929 SHA256 467e44eccd47170cf8ec40e914a2fbc1e6d50966e6a71c46d96091183c54a3d3 SHA512 e73ee29a6074396a885b08d9b1160b1e379423596dde872a14a8c8cf5845c9fcf3ea08038007a99063169a863d8b9f3ca9c23b8f5609d463a5b1f2ddcd44be96 WHIRLPOOL 221848cd608fd3e45b4f172f56ab691dc2a1dd659f3a5f15df6a2e973daae0964d88fd359c9975147b358289feb77779342f26956b0e693f8683da8d621f04ea
 DIST amanda-3.4.5.tar.gz 5365381 SHA256 bf05ea512676c7520ccff8d711e17176ea2aec47f7c517669cee02e8ab201343 SHA512 441efef6a34a1cb645c8c5d1e909f25230322ceb38d1efa0a104de2d9051640f7032255c8d8c7391a918102aceeb5073048070471fb642e185a2a113c817e00c WHIRLPOOL c21b1cbf276d60fae48c9178b7ae56416c81af4729341e9251b95c50775a3fdaf147c8d1d0e7c33b9477cd215ea4c0c51ac22e16348d2dfd9af20587d53f4b32
+DIST amanda-3.5.1.tar.gz 5402093 BLAKE2B 4c342fb55b2b5fc0d338a1616bf26b1d844b0ecd6627432b849996c0072756090e1f695050605af0a5c3eda2daeb63131fbe16b5ac728af9137699f4d916b8e8 SHA512 8d5451b6b3f18f9a705592ba6baf8ffb7fb4fe62261eac8a4f4fae4eded3f7f447f547ac6f016bcb57ea43f116cf87fdc48f8e77b117bbdecf00d3e37dd0f39f
 DIST amanda-3.5.tar.gz 5386719 SHA256 099eb36321b1360ebde6156fb1e75f3e0245520b6f886a0e8e0f31a7a6169be4 SHA512 31340eb250972b2d7b2ad5e51c4f3fafb9de15b9f51f688447214174c77ea89d344f50709ca51d6ba965f8ed6977608f22d7bc6811cc97b63207f7a7cec8219c WHIRLPOOL b6d12e046203f3f553e197215c1da8ed610f07a34ac6b8ca7e5b11846308d1ee490aaaaeee8daeae94b8b6b18fcb18bc26e434dc95042d08b443118ccb504801
 EBUILD amanda-3.3.9.ebuild 16110 BLAKE2B a35ec544433978b786f4f5a0889f9d68fa8ef1e5993d3ab881adeaf3860fa94b1558b93021013b98539463e584990d240f3740fdfb4bac5e87143db4a5aeb0d7 SHA512 d3d0523405799ea6c07df9a794c8f79fef780c0e367b595d61d25ed6a76a402fa85586268bfc490116e4363238f8d6c330614c252a02000d859c63d67a2220de
 EBUILD amanda-3.4.1.ebuild 16572 BLAKE2B ccb66acf67b1b1586c2f08c68ef30dcf6913846ac2d41e99ed86d166a7e70a15de86775e4902c68acb158b1b20c9987ceeaa4f5c632e4b85d65a3b6958858ce1 SHA512 f23b802ce76b9f91295921747fd0985e3befed5ec7743feffba4f9d96346c2fb6b4010af27598fd07d3a7e97bbe5fa615a8f65ca0b83851e905e09077f8d9372
@ -29,4 +30,5 @@ EBUILD amanda-3.4.3.ebuild 16478 BLAKE2B b13edc4eca457ceb5a60141ed0956e1465dc0e6
 EBUILD amanda-3.4.4.ebuild 16478 BLAKE2B b13edc4eca457ceb5a60141ed0956e1465dc0e634ab84e6df53cae85c9fb278a0372bd6d3af13f8d4b8dbdcd79bdc5aac806392dc6019f88ac76f98e4dfdce03 SHA512 02dc61995f38cf2e5dd038f638f510de42040ac8319311ea548055bd304abb07bdad15120807b4a077a8e4c52e0ecef1f57bad3567162d04fd77dbe6b82c257f
 EBUILD amanda-3.4.5.ebuild 16478 BLAKE2B b13edc4eca457ceb5a60141ed0956e1465dc0e634ab84e6df53cae85c9fb278a0372bd6d3af13f8d4b8dbdcd79bdc5aac806392dc6019f88ac76f98e4dfdce03 SHA512 02dc61995f38cf2e5dd038f638f510de42040ac8319311ea548055bd304abb07bdad15120807b4a077a8e4c52e0ecef1f57bad3567162d04fd77dbe6b82c257f
 EBUILD amanda-3.5-r1.ebuild 16938 BLAKE2B 8f3babd9023dcde42c315e4f37429ac880dfc5741796fec65cb8d66c92a3ea2dd1285efba960320d7809dc3cf17b5493a806ee18edcc8b7724daaa27363a2127 SHA512 a59b3f14fec406868d2f9ff1de19e3f8ed3eda4348675f084ae6cd8b92f52108788a1527e6772463b98a61dfbd89cacd06fd40d721f5e23eb8ffe9a5c770c07d
+EBUILD amanda-3.5.1.ebuild 16938 BLAKE2B 8f3babd9023dcde42c315e4f37429ac880dfc5741796fec65cb8d66c92a3ea2dd1285efba960320d7809dc3cf17b5493a806ee18edcc8b7724daaa27363a2127 SHA512 a59b3f14fec406868d2f9ff1de19e3f8ed3eda4348675f084ae6cd8b92f52108788a1527e6772463b98a61dfbd89cacd06fd40d721f5e23eb8ffe9a5c770c07d
 MISC metadata.xml 1046 BLAKE2B 616d759dc8ed31de7d8985e55809af32910917bdc7747a82e907addee906650e7918118938a408c6d5dcf2f4742ae085002f06f7fe367666fdc51cb885f078cd SHA512 1bce4cd8ded5c4eb69693ed0c09b80919a21007063e2c4be3d86f683026b9c67ac4c72290744e04938724c230ab625bf0bffd3c01866e98fffa7afc121e6ab87
--- a/app-backup/amanda/amanda-3.5.1.ebuild
+++ b/app-backup/amanda/amanda-3.5.1.ebuild
@ -0,0 +1,498 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools perl-module user systemd
+
+DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
+HOMEPAGE="http://www.amanda.org/"
+SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
+
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+RDEPEND="sys-libs/readline:=
+	virtual/awk
+	app-arch/tar
+	dev-lang/perl:=
+	app-arch/dump
+	net-misc/openssh
+	>=dev-libs/glib-2.26.0
+	dev-perl/JSON
+	dev-perl/Encode-Locale
+	nls? ( virtual/libintl )
+	s3? ( >=net-misc/curl-7.10.0 )
+	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
+	samba? ( net-fs/samba:= )
+	kerberos? ( app-crypt/mit-krb5 )
+	xfs? ( sys-fs/xfsdump )
+	!minimal? (
+		dev-perl/XML-Simple
+		virtual/mailx
+		app-arch/mt-st:=
+		sys-block/mtx
+		gnuplot? ( sci-visualization/gnuplot )
+		app-crypt/aespipe
+		app-crypt/gnupg
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	>=app-text/docbook-xsl-stylesheets-1.72.0
+	app-text/docbook-xml-dtd
+	dev-libs/libxslt
+	dev-lang/swig
+	"
+
+MYFILESDIR="${T}/files"
+ENVDIR="/etc/env.d"
+ENVDFILE="97amanda"
+TMPENVFILE="${T}/${ENVDFILE}"
+
+# This is a complete list of Amanda settings that the ebuild takes from the
+# build environment. This allows users to alter the behavior of the package as
+# upstream intended, but keeping with Gentoo style. We store a copy of them in
+# /etc/env.d/97amanda during the install, so that they are preserved for future
+# installed. This variable name must not start with AMANDA_, as we do not want
+# it captured into the env file.
+ENV_SETTINGS_AMANDA="
+AMANDA_GROUP_GID AMANDA_GROUP_NAME
+AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
+AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX
+AMANDA_TAR_LISTDIR AMANDA_TAR
+AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
+AMANDA_CONFIG_NAME AMANDA_TMPDIR"
+
+amanda_variable_setup() {
+
+	# Setting vars
+	local currentamanda
+
+	# Grab the current settings
+	currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
+
+	# First we set the defaults
+	[[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87
+	[[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda
+	[[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda
+	[[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87
+	[[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash
+	[[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda
+	[[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
+
+	# This installs Amanda, with the server. However, it could be a client,
+	# just specify an alternate server name in AMANDA_SERVER.
+	[[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}"
+	[[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
+	[[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
+	[[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
+	[[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
+	[[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1
+	[[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda
+	[[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
+	# These are left empty by default
+	[[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP=
+	[[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP=
+	[[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH=
+	[[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS=
+
+	# What tar to use
+	[[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar
+
+	# Now pull in the old stuff
+	if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
+		# We don't just source it as we don't want everything in there.
+		eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+	fi
+
+	# Re-apply the new settings if any
+	[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
+
+}
+
+pkg_setup() {
+	amanda_variable_setup
+
+	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
+	# another host than HOSTNAME.
+	if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
+		elog "You are installing a client-only version of Amanda."
+		elog "You should set the variable \$AMANDA_SERVER to point at your"
+		elog "Amanda-tape-server, otherwise you will have to specify its name"
+		elog "when using amrecover on the client."
+		elog "For example: Use something like"
+		elog "AMANDA_SERVER=\"myserver\" emerge amanda"
+		elog
+	fi
+
+	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
+	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
+}
+
+src_unpack() {
+	# we do not want the perl src_unpack
+	default_src_unpack
+}
+
+src_prepare() {
+	# gentoo bug #331111
+	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
+	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
+
+	# bug with glibc-2.16.0
+	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
+
+	eautoreconf
+
+	# places for us to work in
+	mkdir -p "${MYFILESDIR}" || die
+	# Now we store the settings we just created
+	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
+
+	# Prepare our custom files
+	einfo "Building custom configuration files"
+	local i # our iterator
+	local sedexpr # var for sed expr
+	sedexpr=''
+	for i in ${ENV_SETTINGS_AMANDA} ; do
+		local val
+		eval "val=\"\${${i}}\""
+		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
+	done
+
+	# now apply the sed expr
+	for i in "${FILESDIR}"/amanda-* ; do
+		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die
+	done
+
+	if use minimal; then
+		cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	else
+		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
+			server-src/am{addclient,serverconfig}.pl || die
+		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# fix bug #36316
+	addpredict /var/cache/samba/gencache.tdb
+	# fix bug #376169
+	addpredict /run/blkid
+	addpredict /etc/blkid.tab
+
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+	local myconf
+
+	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
+	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
+	einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server."
+	myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
+	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
+	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
+	einfo "Using ${AMANDA_USER_NAME} for amanda user."
+	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
+	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
+	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
+	einfo "Using ${AMANDA_TAR} as Tar implementation."
+	myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
+	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
+	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
+	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
+	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
+	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
+	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
+
+	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
+		eerror "If you want _both_ UDP and TCP ports, please use only the"
+		eerror "AMANDA_PORTS environment variable for identical ports, or set"
+		eerror "AMANDA_PORTS_BOTH."
+		die "Bad port setup!"
+	fi
+	if [ -n "${AMANDA_PORTS_UDP}" ]; then
+		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
+		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
+	fi
+	if [ -n "${AMANDA_PORTS_TCP}" ]; then
+		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
+		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
+	fi
+	if [ -n "${AMANDA_PORTS}" ]; then
+		einfo "Using ports ${AMANDA_PORTS/,/-}"
+		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
+	fi
+
+	# Extras
+	# Speed option
+	myconf="${myconf} --with-buffered-dump"
+	# "debugging" in the configuration is NOT debug in the conventional sense.
+	# It is actually just useful output in the application, and should remain
+	# enabled. There are some cases of breakage with MTX tape changers as of
+	# 2.5.1p2 that it exposes when turned off as well.
+	myconf="${myconf} --with-debugging"
+	# Where to put our files
+	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
+
+	# Samba support
+	myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)"
+
+	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
+	# default
+	myconf="${myconf} --with-bsd-security"
+	myconf="${myconf} --with-ssh-security"
+	myconf="${myconf} --with-bsdudp-security"
+	myconf="${myconf} --with-bsdtcp-security"
+
+	# kerberos-security mechanism version 5
+	myconf="${myconf} $(use_with kerberos krb5-security)"
+
+	# Amazon S3 support
+	myconf="${myconf} `use_enable s3 s3-device`"
+
+	# libcurl is required for S3 but otherwise optional
+	if ! use s3; then
+		myconf="${myconf} $(use_with curl libcurl)"
+	fi
+
+	# Client only, as requested in bug #127725
+	if use minimal ; then
+		myconf="${myconf} --without-server"
+	else
+		# amplot
+		myconf="${myconf} $(use_with gnuplot)"
+	fi
+
+	# IPv6 fun.
+	myconf="${myconf} `use_with ipv6`"
+	# This is to prevent the IPv6-is-working test
+	# As the test fails on binpkg build hosts with no IPv6.
+	use ipv6 && export amanda_cv_working_ipv6=yes
+
+	# I18N
+	myconf="${myconf} `use_enable nls`"
+
+	# Bug #296634: Perl location
+	perl_set_version
+	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
+
+	# Bug 296633: --disable-syntax-checks
+	# Some tests are not safe for production systems
+	myconf="${myconf} --disable-syntax-checks"
+
+	# build manpages
+	myconf="${myconf} --enable-manpage-build"
+
+	# Bug #636262
+	myconf="${myconf} $(use_with ndmp ndmp)"
+
+	# bug #483120
+	tc-export AR
+
+	econf \
+		$(use_with readline) \
+		${myconf}
+}
+
+src_compile() {
+	# Again, do not want the perl-module src_compile
+	default_src_compile
+}
+
+src_install() {
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+
+	einfo "Doing stock install"
+	emake DESTDIR="${D}" install
+
+	# Build the envdir file
+	# Don't forget this..
+	einfo "Building environment file"
+	(
+		echo "# These settings are what was present in the environment when this"
+		echo "# Amanda was compiled.  Changing anything below this comment will"
+		echo "# have no effect on your application, but it merely exists to"
+		echo "# preserve them for your next emerge of Amanda"
+		cat "${TMPENVFILE}" | sed "s,=\$,='',g"
+	) >> "${MYFILESDIR}/${ENVDFILE}"
+
+	# Env.d
+	einfo "Installing environment config file"
+	doenvd "${MYFILESDIR}/${ENVDFILE}"
+
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket
+	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service'
+
+	# Lock down next section (up until docs).
+	insopts -m0640
+	# Installing Amanda Xinetd Services Definition
+	einfo "Installing xinetd service file"
+	insinto /etc/xinetd.d
+	if use minimal ; then
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
+	else
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
+	fi
+
+	if ! use minimal; then
+		einfo "Installing Sample Daily Cron Job for Amanda"
+		insinto /etc/cron.daily
+		newins "${MYFILESDIR}/amanda-cron" amanda
+	fi
+
+	insinto /etc/amanda
+	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
+	doins "${T}/amandahosts"
+	fperms 600 /etc/amanda/amandahosts
+
+	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
+	insinto "${AMANDA_USER_HOMEDIR}"
+	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
+	newins "${MYFILESDIR}/amanda-profile" .profile
+
+	insinto /etc/amanda
+	doins "${S}/example/amanda-client.conf"
+	if ! use minimal ; then
+		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
+		doins "${S}/example/amanda.conf"
+		doins "${S}/example/disklist"
+		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
+	fi
+
+	keepdir "${AMANDA_TAR_LISTDIR}"
+	keepdir "${AMANDA_USER_HOMEDIR}/amanda"
+	keepdir "${AMANDA_TMPDIR}/dumps"
+	# Just make sure it exists for XFS to work...
+	use xfs && keepdir /var/xfsdump/inventory
+
+	local i
+	for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" /etc/amanda; do
+		einfo "Securing directory (${i})"
+		fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
+	done
+	# Do NOT use -R
+	fperms 0700 \
+		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
+		 "${AMANDA_USER_HOMEDIR}/amanda" \
+		 /etc/amanda
+
+	if ! use minimal ; then
+		fperms 0700 \
+			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
+	         /etc/amanda/${AMANDA_CONFIG_NAME}
+	fi
+
+	einfo "Setting setuid permissions"
+	amanda_permissions_fix "${D}"
+
+	# Relax permissions again
+	insopts -m0644
+
+	# docs
+	einfo "Installing documentation"
+	dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
+	# our inetd sample
+	einfo "Installing standard inetd sample"
+	newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
+	# Amanda example configs
+	einfo "Installing example configurations"
+	rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes} || die
+	mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/" || die
+	docinto example1
+	newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
+	newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
+	newdoc "${FILESDIR}/example_global.conf" global.conf
+
+	einfo "Cleaning up dud .la files"
+	perl_set_version
+	find "${D}"/"${VENDOR_LIB}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
+		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+
+	# Migration of amandates from /etc to $localstatedir/amanda
+	if [ -f "${ROOT}/etc/amandates" -a \
+		! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
+		einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
+		einfo "A backup is also placed at /etc/amandates.orig"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig" || die
+		mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/" || die
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" || die
+	fi
+	if [ -f "${ROOT}/etc/amandates" ]; then
+		einfo "If you have migrated safely, please delete /etc/amandates"
+	fi
+
+	einfo "Checking setuid permissions"
+	amanda_permissions_fix "${ROOT}"
+
+	elog "You should configure Amanda in /etc/amanda now."
+	elog
+	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
+	elog "and restart xinetd afterwards!"
+	elog
+	elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
+	elog "as an example of how to configure your inetd."
+	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	elog
+	elog "NOTICE: If you need raw access to partitions you need to add the"
+	elog "amanda user to the 'disk' group."
+	elog
+	elog "NOTICE: If you have a tape changer, you need to add the amanda user"
+	elog "to the 'tape' group."
+	elog
+	elog "If you use localhost in your disklist your restores may break."
+	elog "You should replace it with the actual hostname!"
+	elog "Please also see the syntax changes to amandahosts."
+	elog "The only exception is when you use the authentication method 'local'."
+	elog
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+}
+
+# We have had reports of amanda file permissions getting screwed up.
+# Losing setuid, becoming too lax etc.
+# ONLY root and users in the amanda group should be able to run these binaries!
+amanda_permissions_fix() {
+	local root="$1"
+	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
+	local le="/usr/libexec/amanda"
+	local i
+	for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
+		"${le}"/rundump "${le}"/runtar "${le}"/dumper \
+		"${le}"/planner ; do
+	    [ -e "${root}"/${i} ] || continue
+		chown root:${AMANDA_GROUP_NAME} "${root}"/${i} || die
+		chmod u=srwx,g=rx,o= "${root}"/${i} || die
+	done
+
+	# amanda-security.conf is a config file with similar requirements:
+	# writable only by root
+	# world-readable
+	# 3.3.9: introduced in /etc/amanda-security.conf
+	# 3.4.2: moved to /etc/amanda/amanda-security.conf
+	f=/etc/amanda/amanda-security.conf
+	chown root:root "${root}""${f}" || die
+	chmod u=rw,go=r "${root}""${f}" || die
+}
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@ -2,6 +2,7 @@ AUX kpropd.xinetd 194 BLAKE2B cfc40af2e75b0ce5a71e0dfdcfe076d13d996b25d2cb50d428
 AUX mit-krb5-1.12_warn_cflags.patch 448 BLAKE2B cd9793866173b394bab3497d19653ca3296924cc49aaf540499b149254265af1d995b4d7493b76185ce35d123e70827cb5fcb221efc6499b86a346cfad7478ab SHA512 42364d9cd8c0a6fd28ae661eeac4d0dd3f2001fe290bf9731ee99c2c786a6488805fc93057d59e201e2cef1e5280af4c170187aa5603f4cf542906abc0fccc2b
 AUX mit-krb5-1.14.2-redeclared-ttyname.patch 660 BLAKE2B 8fb59ad5ed7b0896272f4bf10e8e15a1c848047dbe6a7735930657422888530691f681949d72b4b0924a8983ec392282736eae57dd72c8548ee960fc85909c53 SHA512 90a2adedcdca4e2079daaa613e2d4f08e948ccfaf56aba19a08b4cbe2257a6a60dcfd5bbc4b19ca64f584759b1a374d1894729a423e636bfec1969a675a1628e
 AUX mit-krb5-1.14.4-disable-nls.patch 1247 BLAKE2B a24c425a21bed40c7b563658207f324d1dccade9b8aec4d4124e2a2d0007d81e314765d23fe3e4be2bf857fa67bf3da06aead99ffb21afe635bbb1d7bb2c89cf SHA512 5fecc719c5c8a1f5c971443d42561615b8fb8c6b99b735a633c7479f109cfb6852eee5179e267a1e2576e52faf2311395ddabdb47f749b573ead3ddd86714e2e
+AUX mit-krb5-1.15.2-fix-pkinit.patch 3196 BLAKE2B 6fdf17bb1ad096bc2745c3c908fbc913de3d4d7176c060cb51d911b256e82f67a73d9204044f5227c7d3d1cb1f76dbc31b2845738c4f97dd0a199990a9e09f0f SHA512 d7b3f33f25e610b24f2854892d75016dfa5b5e34fac24600df80b91194f5fe2e6dbc35ea3a9a772e0dcdf7659263a56230e767fe393d32796c61b3bd5bb2de69
 AUX mit-krb5-config_LDFLAGS.patch 466 BLAKE2B 2dd4f1cfc20bea229d08201d66e3de71472dccfa45dee9b260c51578187e706b864c0b4ff81c0c5a09fd29401c2abdbe334441ca075208299b02d5e1d49aff94 SHA512 9a1ca9b33e7708346eda78d199fdc51f0d7bd08d3d65ea15a19955a6155ab71b8ee0c8989859d6dff293a141f197ea19394a91b3b641181140a289b743e0f0e7
 AUX mit-krb5kadmind.confd 76 BLAKE2B ca69357a77ddaf67e2f9c104b17d49af5da9891b13bd855f8b04d54bfb6ccf07ae8c5cb694f65a47646675c844c8f8c7224e8487081df678c73c554498259516 SHA512 dbf968800959f0463899031e823f003e9ece90132f452ebf03df08caf0e6a6e6ca2cfdee91491d269cfa24bef19e72dd33c7d818a4bb13ef85edfb6f0e8299f3
 AUX mit-krb5kadmind.initd-r2 612 BLAKE2B ba2a70a7c123d63b9c58f4ec31c3c2366949e6971ff4f203cb38e1efb5a69991533291e118066e680d880c5221168c8eb5b047ec70dac857888330978d1e5a9b SHA512 3791af603380277a9d2632a01a86f96f68c9eb38a2c9574cca462fe9a01bef60f24785051d0215a8d71dd5022f1404e281929278e2bfd31603a0415dd9df6a98
@ -10,5 +11,6 @@ AUX mit-krb5kdc.initd-r2 572 BLAKE2B f9115cc452891e1267268df6d4beb7eeb69ec27edc9
 AUX mit-krb5kpropd.confd 84 BLAKE2B e3f47a3c520af14794c2fe11368651ba56e8aa059babb91b3112af9682403a6409b3fb39ed6313f9cd87169c3754e4c4fc17bc24b0b773cfdf01e7df3eb03490 SHA512 afd1cf21a6afd3bc73b1ef3cb0a26ec3420b26ed31196f8c092ae880b235043273c95e2ecb3b88e65ea008cd8ea6a10553d1966f45646cf5993d5752dfc945ac
 AUX mit-krb5kpropd.initd-r2 608 BLAKE2B 9737f5ff711b8e30444c14ca871e01f2c45e9aecdab99d3dcfd8c16bae65ed05fc732f2007c65f0abfab10cf766035c03c557d217f750ab06f804b639722b27e SHA512 28b9d9bc9d132d8bd87d5fd9e74103d4772f26cba48d28ad53f40ade037a5ac91e07c01aa3180d50c3624673bf4e534f76689b03feb4888cdd9198755576b6a7
 DIST krb5-1.15.2.tar.gz 9380755 BLAKE2B 3f5d00a70bf44ef077872bde282e4753e82acb70632e136b8f9f8d3a192e3e7b692840803e5a3f67ddb202d53631767ea9eb8b7615d45a3479389a01a6390ac4 SHA512 e5814bb66384b13637c37918df694c6b9933c29c2d952da0ed0dcd2e623b269060b4c16b6c02162039dadebdab99ff1085e37e7621ae4748dafb036424e612c2
+EBUILD mit-krb5-1.15.2-r1.ebuild 3920 BLAKE2B 4874c8516130a6ff27fc03aef15e0cb2a5fce3b8580d0797846da422a54615234097e6d25e4272ade5624136c84489d32416718d59595317c5522e68eee51389 SHA512 f44f5e7a2fc57156b23d4e91541d8fcf7b644eb0f4b293292a97bf690b93e2f379e070b1b9d31db72bb2af799afeea8b0ccc5e5f53c4d29f449ff76e0f9a22bb
 EBUILD mit-krb5-1.15.2.ebuild 3855 BLAKE2B fa45466eeb8cc35048b654d10a997fb85d35a004e51de910a6ce2b0c239c88b9048837ce81abf8a00b867d6278cb7f6f082fc9c63ffe9e74522668e79c664c64 SHA512 e80bd080eea92ccdc0c475bdc02fc5eed67af1168c98095782233a55524404e0e210c598bf19f999777a334682b717b76e767c11954d7710c405434d5154a927
 MISC metadata.xml 828 BLAKE2B f317440eac9d164e0640cb059dee0c3bdcfeaeb2d0e346d962f09b7152224efc10084611768663b84c67fdf73c9d89481370fe0b70ffe14aa10a360f60bd00f6 SHA512 c0f45699280d49b91eab24de6cbb28900170c3c4526b8c6ef0f6a996d3e53abd49911ce4f6ce7b28c69d37e86cc9e5b830977b9640809734e7fccf078886685c
--- a/app-crypt/mit-krb5/files/mit-krb5-1.15.2-fix-pkinit.patch
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.15.2-fix-pkinit.patch
@ -0,0 +1,98 @@
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+index 74fffbf321..4b86a6f302 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+@@ -5145,33 +5145,29 @@ crypto_retieve_X509_key_usage(krb5_context context,
+     return retval;
+ }
+ 
+-/*
+- * Return a string format of an X509_NAME in buf where
+- * size is an in/out parameter.  On input it is the size
+- * of the buffer, and on output it is the actual length
+- * of the name.
+- * If buf is NULL, returns the length req'd to hold name
+- */
+-static char *
+-X509_NAME_oneline_ex(X509_NAME * a,
+-                     char *buf,
+-                     unsigned int *size,
+-                     unsigned long flag)
+static krb5_error_code
+rfc2253_name(X509_NAME *name, char **str_out)
+ {
+-    BIO *out = NULL;
+    BIO *b = NULL;
+    char *str;
+ 
+-    out = BIO_new(BIO_s_mem ());
+-    if (X509_NAME_print_ex(out, a, 0, flag) > 0) {
+-        if (buf != NULL && (*size) >  (unsigned int) BIO_number_written(out)) {
+-            memset(buf, 0, *size);
+-            BIO_read(out, buf, (int) BIO_number_written(out));
+-        }
+-        else {
+-            *size = BIO_number_written(out);
+-        }
+-    }
+-    BIO_free(out);
+-    return (buf);
+    *str_out = NULL;
+    b = BIO_new(BIO_s_mem());
+    if (b == NULL)
+        return ENOMEM;
+    if (X509_NAME_print_ex(b, name, 0, XN_FLAG_SEP_COMMA_PLUS) < 0)
+        goto error;
+    str = calloc(BIO_number_written(b) + 1, 1);
+    if (str == NULL)
+        goto error;
+    BIO_read(b, str, BIO_number_written(b));
+    BIO_free(b);
+    *str_out = str;
+    return 0;
+
+error:
+    BIO_free(b);
+    return ENOMEM;
+ }
+ 
+ /*
+@@ -5187,8 +5183,6 @@ crypto_cert_get_matching_data(krb5_context context,
+     krb5_principal *pkinit_sans =NULL, *upn_sans = NULL;
+     struct _pkinit_cert_data *cd = (struct _pkinit_cert_data *)ch;
+     unsigned int i, j;
+-    char buf[DN_BUF_LEN];
+-    unsigned int bufsize = sizeof(buf);
+ 
+     if (cd == NULL || cd->magic != CERT_MAGIC)
+         return EINVAL;
+@@ -5201,23 +5195,14 @@ crypto_cert_get_matching_data(krb5_context context,
+ 
+     md->ch = ch;
+ 
+-    /* get the subject name (in rfc2253 format) */
+-    X509_NAME_oneline_ex(X509_get_subject_name(cd->cred->cert),
+-                         buf, &bufsize, XN_FLAG_SEP_COMMA_PLUS);
+-    md->subject_dn = strdup(buf);
+-    if (md->subject_dn == NULL) {
+-        retval = ENOMEM;
+    retval = rfc2253_name(X509_get_subject_name(cd->cred->cert),
+                          &md->subject_dn);
+    if (retval)
+         goto cleanup;
+-    }
+-
+-    /* get the issuer name (in rfc2253 format) */
+-    X509_NAME_oneline_ex(X509_get_issuer_name(cd->cred->cert),
+-                         buf, &bufsize, XN_FLAG_SEP_COMMA_PLUS);
+-    md->issuer_dn = strdup(buf);
+-    if (md->issuer_dn == NULL) {
+-        retval = ENOMEM;
+    retval = rfc2253_name(X509_get_issuer_name(cd->cred->cert),
+                          &md->issuer_dn);
+    if (retval)
+         goto cleanup;
+-    }
+ 
+     /* get the san data */
+     retval = crypto_retrieve_X509_sans(context, cd->plgctx, cd->reqctx,
--- a/app-crypt/mit-krb5/mit-krb5-1.15.2-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.15.2-r1.ebuild
@ -0,0 +1,149 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
+
+CDEPEND="
+	!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	pkinit? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
+	xinetd? ( sys-apps/xinetd )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	virtual/yacc
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+	eapply -p0 "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch"
+	eapply "${FILESDIR}/${PN}-1.14.4-disable-nls.patch"
+	eapply -p2 "${FILESDIR}/${PN}-1.15.2-fix-pkinit.patch"
+
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use keyutils || export ac_cv_header_keyutils_h=no
+	ECONF_SOURCE=${S} \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable nls) \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@ -1,3 +1,3 @@
-DIST rhash-1.3.5-src.tar.gz 316867 SHA256 98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c WHIRLPOOL 80540e96b554fad8c18da431677a0bdc361f7c406b746050bd25ad0b2eeb9d318f1ef0d87ef002d8b8c6fa7db6d789391115358a1676358afd478564d193b229
-EBUILD rhash-1.3.5.ebuild 2613 BLAKE2B 765f0aebcaa119fe15151c3b74426d5009eeea28e7a518ce78e67509ed927d17e5d8b225a11cbb2261c07ab7ae89730d95fc0befc4a0196414f23808e1f9b000 SHA512 6c18e8c0813dced4b245f9ef998d4af58246cbc2c922baa947be886342554dd24b44fd6b1e73be1bd0a6e9ab8b8d12b3668daaa0a562b048870f427a0e95bbf3
+DIST rhash-1.3.5-src.tar.gz 316867 BLAKE2B 3ffbf2ec5aef24ef63455e21c3efcae043a321a78be522a26bd25086111430071a496ab3775ff9b4956da7304df8d8e552a061f3306a7a683be5fc65ea3fd1c4 SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c
+EBUILD rhash-1.3.5.ebuild 2612 BLAKE2B 661592c5c8671c1f90f18b20991f0da9eea62f97d95fdaa8803c1de149be999b5ff180c9423f8b53d93993cc68b8c1a9cb17f8bd9f6387841bbc32cb0cfa7b08 SHA512 cc835cb20c7e49154fffcca705a49aa3d21d2ae2c080286f991e1e97ec494f3339158e296318db7ee1a423b7a2b75415f5f2211b0797f9d71997b2ed1a74cfa1
 MISC metadata.xml 843 BLAKE2B 9380d16da7ed26bc2cb455ad4e01806d54233df9ec229e67a8ed1a3944e91569cc4a478c375e75a87ea758eab6a886b89fae27dea32434e8c7f4a068d0371369 SHA512 360de1b8627471599f06a5bbd34a4359be7bd5bc39fe97d7db3da57794e2ace132539e56a2cc971b53911887b314a8ff1c689063c86d70473ac771062f1f3b4f
--- a/app-crypt/rhash/rhash-1.3.5.ebuild
+++ b/app-crypt/rhash/rhash-1.3.5.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls openssl static-libs"

 RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )"
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/pms/Manifest
+++ b/app-doc/pms/Manifest
@ -1,8 +1,8 @@
-DIST pms-5-prebuilt.tar.xz 540244 SHA256 c93ce6902db323ab7ec613ad90a6dca2beda2dd2cebcc3e8ace83c1faeb6a1c7 SHA512 64baadd65f1751783032065832d2a18242967f1853d9b6ce0565a5477c021cfad3c06d9c3cfeb83ca9a64bbb052ec67c174bfd27036945ff762fe4bbf8c28451 WHIRLPOOL 9369c7604fdf0aadb7666f1fc08f041b064896d6359dd76779dc3af842fef14d81aed07301ec52eac11462664d16faed0e3fd50a0b96702822c59538917f5f78
-DIST pms-5.tar.xz 50284 SHA256 a3b7702298adc4481584ed03f2d49e9fa7ea58638d8e8e9bf36fca832b2fbc87 SHA512 560bdda40d4d1628e97b65bb354c349e3ac52edd1e337427adb0db61e99b40d214459a5046f4b505edfabc3914e2d585ef0453b13057a25fe138b8a5ebd6292e WHIRLPOOL 373d333f1c060faacbfbd398ae3be3a0143c0ee618b093867313e4182bce7f15609445d2fc6b109f6f02fe597fe8f6cf687673029569e27fa7ed3411f4932013
-DIST pms-6_p20170429-prebuilt.tar.xz 514544 SHA256 37f6a0ae95a187a40d57ef5e7415cb0517ab7e9bc3431741fe7d5dca99e04b44 SHA512 92fd048c9e1fdf3d326d906c9d68e08bb9dae5b784117d112f24bb4131aef3f8e843cf096157e0c4eaed0d2d48e7e3bfc060ea205b04c9da0e8cbcc94b74619d WHIRLPOOL 51f05a12877651ad9e9f7cc0d8f8a4ff481d1cc781997ca65343b5226fc3fdb918c6d0eaa9bee5175ec9ae06d5acbba0798c60278966b190d8ff7424c7a5510f
-DIST pms-6_p20170429.tar.xz 53584 SHA256 34d3a449375fa89710d3c550d1f956f3f98b5726c7e729fe2208fbfc034e4df5 SHA512 b4d5eb85d1823d2c80348aa82686fcbf0ba06b19de046b722d0318e846ba6d9bbd0c810b6fe06e7d4eafd8933a1b1d2d04b041fcc35fd2496feca9c987323a5b WHIRLPOOL 452a9c2bb1e7b7fe32f1d985c16ac86690c72f1deb29cd9a22e9cee3642343282e1ebbcf99f90d5cc38a7c773035c21af2ae22223578f1d5a7c2fbe96c732a78
+DIST pms-5-prebuilt.tar.xz 540244 BLAKE2B 06fbfd4cbf9968fbe19d1960687f226c87b2a16df8b9c3c80328c9436d886b1888484b0cd636f3d5ce492578e8a3e7c1a42be5cf7f8072c71fa401f817125d33 SHA512 64baadd65f1751783032065832d2a18242967f1853d9b6ce0565a5477c021cfad3c06d9c3cfeb83ca9a64bbb052ec67c174bfd27036945ff762fe4bbf8c28451
+DIST pms-5.tar.xz 50284 BLAKE2B ecf3c34d79aa1439e0f0f4bca540b673440db04a7f533f103f5956f6a27e994ee42836ae2871c11fadf9230e2b5973d3d1db9e17167f886a6c929e533ece4d45 SHA512 560bdda40d4d1628e97b65bb354c349e3ac52edd1e337427adb0db61e99b40d214459a5046f4b505edfabc3914e2d585ef0453b13057a25fe138b8a5ebd6292e
+DIST pms-6_p20170429-prebuilt.tar.xz 514544 BLAKE2B 34f5dc9a65c9a0bcc8b6ea7c9c1e65e1fb9480b6b147f17880242aeb11e44641d4b5d59cd1ee179e3c51102af2075e28445dc8ea5cda1211d483c37007a60407 SHA512 92fd048c9e1fdf3d326d906c9d68e08bb9dae5b784117d112f24bb4131aef3f8e843cf096157e0c4eaed0d2d48e7e3bfc060ea205b04c9da0e8cbcc94b74619d
+DIST pms-6_p20170429.tar.xz 53584 BLAKE2B 3c9b7445fdd7c0a0ed2b5b6f29dd645090f0fda63f864b536e88ed5d2e0cf27bfd621da1480a576d999b1ad0b80b19ac011a5a984e8b6d24c8f7db7f68aeaa75 SHA512 b4d5eb85d1823d2c80348aa82686fcbf0ba06b19de046b722d0318e846ba6d9bbd0c810b6fe06e7d4eafd8933a1b1d2d04b041fcc35fd2496feca9c987323a5b
 EBUILD pms-5_p20120920.ebuild 1466 BLAKE2B 700a3bc9defb535677c09a07253699b478621bfa059b7615ee1dd27591e04cc53ac0b1208a07b85cdf898efde3ca931d5590f4819be3f053c6e7a37e13c02518 SHA512 9d33496e8f7329c80d55e024a4cb0408487d2628eae95c2f8769478fc4b1fed465e4b8b30b46c4ca05a93d6a1fd7229620d73f3c4472b30efb383b633172b473
 EBUILD pms-6_p20170429.ebuild 1597 BLAKE2B 53a85166c6b73693c1269206691c1d5894c18852f1cd54c8e79def58c1e576ac9b0bc569f382f6661f2e8cd85d4702595db5462ec080683dbb1da88d0a98bf41 SHA512 f3536cd222e766fcc64910e103006a5b0ad8864108f7f0594ff26e400b37f744eb3f71c61a83e640dee5126478422563f038318ca21535d58ed270f28b76569a
-EBUILD pms-9999.ebuild 1111 BLAKE2B e9c4efe07c241ef7bb3a465043000ca94218270eab8f0301f471e71f7d7fc1e5beb7e40085a475d8f2cc7b77f471df77e38deaccab81b5067d46e745c6e3c20d SHA512 edba51a068c080614b284b68ddf249824059fb069e97cdf6be0c83d336cd6a3adb62d6835124d669367f86cd571fddd62d6c6f40dd62285b9f84118bc981086b
+EBUILD pms-9999.ebuild 1069 BLAKE2B 52eebdd75d9e2ad8b76d9a3eab012366c0937e177e370148eef165b40a8cef3929781f18ff6fea0efc5582412425d5bb2fd6bcf66e1d608d4285ffe6906c53a6 SHA512 0d66fd71be681b73b6e9fb2a96716e1cdc03bc310efc4aadfa317a0bf2801d34bdd870c6a5f371f86c9d14ef7456e5e2fb32d5bbd47beb61083185a19bde2b34
 MISC metadata.xml 495 BLAKE2B 5792a9b2db15b671aba18a6ceb77cda04e4e83ceb5ef3ac130a8180803ebad25d99c3d3bdef32bfa1f0ba9186a3b27f5110e6dc172800f75aaa177b017c738c1 SHA512 11e0668a058130a9d62d28cdd70998b1bdc21722a600d87cc76b34882eae2c82d066955fd30fed77471a7078dc2a9181483ab832549d9be4d9060f63c18820ce
--- a/app-doc/pms/pms-9999.ebuild
+++ b/app-doc/pms/pms-9999.ebuild
@ -5,9 +5,7 @@ EAPI=6

 inherit git-r3

-EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
-	https://anongit.gentoo.org/git/proj/${PN}.git"
-
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 DESCRIPTION="Gentoo Package Manager Specification (draft)"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"

--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/ess/Manifest
+++ b/app-emacs/ess/Manifest
@ -1,10 +1,8 @@
 AUX 50ess-gentoo.el 58 BLAKE2B a643ea2780e8bb7c211ad438b41d709d39e3484a99ab1d603c86843aad92a66b8bbfc1bbe9a81c25fcc19cb68fa9de7d657bb99889704cc9593e61bff43e227c SHA512 e9023d176d39d3d3c35e004747007892e6f2e2b101b3c8e64fadc37d1fac8d264a786b7bad26c744730fec03580d7fb1170c8d2789e76e12b4eb47481b7f2808
-DIST ess-14.09.tgz 3350987 BLAKE2B 38b6f5e341d6822fe7e94b6555b0cf5d6fc6a1e63799c1bdc60906aeedf3c28bff4fe6ff197c52e82293eb3863edd094322c0761b301c9e028cbd7a2faae119c SHA512 91e275810f7a8c856f3392194ad3fb3d5f5b966e887568b22c133a362164e71ff5306d1d1a70e97f9d10261fe82eecb5f14e99a0dad4a4e239f5b810d7bba8ac
-DIST ess-15.03-1.tgz 3177102 BLAKE2B 83aa1a8a2e43d1bc144246593552b62ada9ac938d7e340c3e034e60adc609342fa688b21d69967b395a1c371defe6004cea4242f17ed1c11a30fad998df49e74 SHA512 5260d8afa10e1382cac3c70a4b6f753dd77e9f24bb2f68247732605b0f5fbb1b06e090dbcb45d747a484333f0779959c9213a4792103839b11c9e239bf35534d
 DIST ess-15.09-2.tgz 3248241 BLAKE2B 63e83436e60d6f9398dabaaed2aa795dee8888f3a992749bdf6ab9541464c65297c29e1d2936d3e6b1da6284c0c3508556b30a6b5a68e4e090e8e1ce3d925894 SHA512 9ba2f8800ece437e18749e29b6ecec3cf52297fa1c5a149dbf8eeb991df4f5dc99a76925458bd03203b7e8418347c4bcb5226e08dc64bd95d16e9a5b32f8634b
 DIST ess-16.04.tgz 3265496 BLAKE2B 2b7b9c972afb0fdea1b8c386d91ab0f2797c8ab1bf0e6a9ca17915670d7e4d61afbec108beb5e61fe7e0491f851aac21d5c2145c6c61d77b3be4046448479580 SHA512 5070197c8c622c83db98100272aa3bc947a0687fa357db1d63dab81b30175d7044f1eb5dc7274039f85636c613d23ad7b84eaae5ccef0cca7061d6d5af7b97d6
-EBUILD ess-14.09.ebuild 1103 BLAKE2B 371e1ae10fd90600e2987530ea6562f7514aa825186a3355335a5ec8743a237f3c457da483b8ec473ab972bc35b62cfe54e44bc96e8149b1bd1f1d26b468ae1b SHA512 116ed0dbc0a96881dae5fc21b9f81e9a7932e07603c16dee58ef29bbabf6668f989e2a6dc2a0f615ea57cb9594486cb27362b1acf28ed407b42e01efce17bf93
-EBUILD ess-15.03.1.ebuild 1161 BLAKE2B d30afdcbb8d06a00161c77149ad856d704771a881932b389c3ba230a4dbeb3c44db10d99da04d57b8a0f10d50e20fac4c5ad7f1bfac9e580bb907bc878f749a0 SHA512 68cc9ad8795c96f11f6cc880015134dc1037150ac731a46ed66e20bb4daf8dd6298195e38e239abb6b64a29285ad197c7ed191feffd25e4e0a92e760cc42cf15
+DIST ess-17.11.zip 3388618 BLAKE2B a935f11f71455791efe01a3d0fa5461cf2bf99c48807ef596f0c5b04e1c3a6d4b8710746c9dc5849c37261c9f8d528a64a48557a2350d5cae7109c0142bcb24c SHA512 0265ff2d284a1ce11b0ae125b4e77d7c4c10c2b491ceccb1efa6e59400f8377d2ac8951953fcbd38408d92d697c4cdd60dfb8385f19956414b88ac8f100c8551
 EBUILD ess-15.09.2.ebuild 1164 BLAKE2B 8a3105ca2a7ff0acdf27c3b9a061a395a8eb005511c3515d286eb99b4aa1ba3b43ecc21c82bb01f82438934f47b4ca1f9a8723a82ba001b37d5e1d899815f52b SHA512 ae190fba951333cad7300484d6988ca1d6e2954697a36c719a0616b99b10911d00846f63f5a5c5ba2662ec90eaf9f9d991ef0be55a01c89c71263a28011c1067
 EBUILD ess-16.04.ebuild 1114 BLAKE2B fa5a7812a40748d429fa77e151e8ef1cb987bf6e59a1853d2ba804d87ac28323f8fa5b4b1013578cb90886e25038b44e687209167953f17ce1d6665d261d4c77 SHA512 10a7ba2643a5e04e8b9fb3d80bf27f5e1ff02de0443f0cf7791e99defabf6e08959625c60938458c3d9ba612e7df8b96b46ff845af48220959ab0c5d9669fa16
+EBUILD ess-17.11.ebuild 1198 BLAKE2B 04422878bbff1ffb81ede5827d780910b029e5a9fc73254caff9ff8db9061f78f9643105e2360a5ffb1c517e10908af8e8f356c14659ac29f5aa0c4a817c628c SHA512 837bd8e8ce0c2df4ba63d5876220f9d0895c5317293ce16e0cfe6efa75a3a0014546214dc0bb37b5778dda21ecd29e01148da2e198bee52a7c1b948d2219341a
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
--- a/app-emacs/ess/ess-15.03.1.ebuild
+++ b/app-emacs/ess/ess-15.03.1.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-MY_P="${PN}-${PV%.*}-${PV##*.}"
-DESCRIPTION="Emacs Speaks Statistics"
-HOMEPAGE="http://ess.r-project.org/"
-SRC_URI="http://ess.r-project.org/downloads/ess/${MY_P}.tgz"
-
-LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-DEPEND="app-text/texi2html
-	virtual/latex-base"
-
-S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" \
-		INFODIR="${ED}/usr/share/info" \
-		LISPDIR="${ED}${SITELISP}/ess" \
-		DOCDIR="${ED}/usr/share/doc/${PF}" \
-		install
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-
-	# Most documentation is installed by the package's build system.
-	rm -f "${ED}${SITELISP}/${PN}/ChangeLog"
-	dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf}
-	newdoc doc/ChangeLog ChangeLog-doc
-	newdoc lisp/ChangeLog ChangeLog-lisp
-
-	DOC_CONTENTS="Please see /usr/share/doc/${PF} for the complete
-		documentation. Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
-	readme.gentoo_create_doc
-}
--- a/app-emacs/ess/ess-17.11.ebuild
+++ b/app-emacs/ess/ess-17.11.ebuild
@ -1,20 +1,22 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=6

-inherit readme.gentoo elisp
+inherit elisp readme.gentoo-r1

 DESCRIPTION="Emacs Speaks Statistics"
 HOMEPAGE="http://ess.r-project.org/"
-SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
+# ${P}.tgz is plain (uncompresses) tar, so use zip for this version
+SRC_URI="http://ess.r-project.org/downloads/ess/${P}.zip"

 LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"

 DEPEND="app-text/texi2html
-	virtual/latex-base"
+	virtual/latex-base
+	app-arch/unzip"

 SITEFILE="50${PN}-gentoo.el"

--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@ -2,14 +2,16 @@ AUX newlib-implicits.patch 5307 BLAKE2B bf4b9bb51d863815df6e0e4097be224a49ef67d9
 AUX xen-4.3-externals.patch 2806 BLAKE2B 43eca80ffc7381dffcbaa9fd61657d7c6038d2a4ccb32e7dc49fc0bf57abb4e84ecf63701aa61ee5392296fc39f4eec64c5f87695ef702864252230e66c30186 SHA512 07e9270ef404dfb765be284887e6d24202ac1783d08e7d30a768d461d6565fac4a4e9625b245610353bf2b76baf54c736170bfc84ed507491f7876e0d7a11c7d
 AUX xen-pvgrub-4.2-jserver.patch 1487 BLAKE2B 2d209eab79293e339abd87dd43cf1d63798ce8263a775dcdf37ce46b826728aacc542f20377ae13fccafa60e96b560fcfa4bfb6df90caf7db51e8580d93adccf SHA512 f92bced9f3e7fec84b1bfce6ce3366f134cec2b892ffc3afcdd3fd3f73daf158c17c312260fae39bc9e04c1dab1045d17f0da706dd0dba0279e66dea454aed8d
 AUX xen-pvgrub-4.8-jserver.patch 547 BLAKE2B 02539834c0c4d6c5b1d1b2304770bfca6372db20e1b213637f5e9874cb1288c2bb9bac72b5b4c1f97ee2dcc3f9646f4b9408daff2d1b975c2fdefc82f110da2f SHA512 38819b6041d679257a8ebf91f481bf3d9957d3c25ead64725fba9f83fee033235909a8599e986604546008c3077f37db332958fee70eafb4016d723c2e2bfc2a
-DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5
-DIST lwip-1.3.0.tar.gz 398933 SHA256 772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f SHA512 1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d WHIRLPOOL 63bdd9eb70f168ba2006a8f4bbe166b68528abe8364b23cdc1d468ccc4b137bb3447bf90695920f016e09d53d3b93ccf6e3697b3c46840f00b794789cb424acc
-DIST newlib-1.16.0.tar.gz 12024353 SHA256 db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3 WHIRLPOOL 47f7afd525f482d79d9e964f0e75ee8a77e59551bd19cd94f9b95ac3af9406afa381c9d8d224f76eb568441ab613b2b194f8e5be50aa222f9ed2d9b9761829db
-DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e
-DIST polarssl-1.1.4-gpl.tgz 611340 SHA256 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad WHIRLPOOL 39448c00dda142a836a78381b446c7b586272a44d8afc867a7ea702228f105bb2adffe757bd6c23af090cff64ef32e7af0c373dccc5145ff4c11552cf3f28383
-DIST xen-4.8.2.tar.gz 22522336 SHA256 cb1cc2f0985e3d8651215e5d24c1fcc3036994fa7cc495a5091a2c85ece2aff9 SHA512 7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da WHIRLPOOL 8e54e79219f89640162673da471a02ee8a39bb884e2376a79a09226462903185b49a771fef51ceca54c4dd42a110ee1214db6dbf94235a156a17d6c597634c3d
-DIST xen-4.9.0.tar.gz 23361741 SHA256 cade643fe3310d4d6f97d0c215c6fa323bc1130d7e64d7e2043ffaa73a96f33b SHA512 97f8075c49ef9ec0adbe95106c0cff4f9379578fd568777697565476c3fd948335d72ddcacf8be65fd9db219c0a35dcdc007f355f7e5874dd950fd4c0a0f966f WHIRLPOOL 354527ea01f69c6ab632cffe8f50ca93721d9a89cbc4d84886d24b53fabdb7f62132b80e36189c30c0c9fae66b367eec7e00bb4df5f7af054ec27cec912ecf47
-DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276
+DIST grub-0.97.tar.gz 971783 BLAKE2B a7b6feb6dddb6eeb20e027071091b2d37930e5b40687f8c8ff860839db208f832713db61389014d21842e1e152cad0466dc9722a79cbb81bfa1566a30b6b82cc SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb
+DIST lwip-1.3.0.tar.gz 398933 BLAKE2B 3567a593eec3d247213daaaab57d9456c9cae50329498ca55cee7726a59461f8e9d77d96cfc8204d6b7b7962f00664f44d3bc7f16a5a53f5e068a02d405fb457 SHA512 1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d
+DIST newlib-1.16.0.tar.gz 12024353 BLAKE2B 26d3308148fb99baf8ad02eee4cc699cfac690100ea63aaa4be03b86d12dade238478342514bd083cbc3d27964ac42eb8dae3873fdac5ff2c593fc4fb39b2309 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3
+DIST pciutils-2.2.9.tar.bz2 212265 BLAKE2B 014b664e90c64e7255c9e21fc25a2cc60d57f47ce282fc0331a0481a460b237783bd3774dd0689e1596d4a0be0d2889faad904da01a6f02147464bce1d1b1bc0 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5
+DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c907c3c6b352eed3d9e500fc5739e62eb4f6fc32ff02579c6a6de9bd49fcd2c8bd8b2d158a5050cbaa82118d61ef0 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad
+DIST xen-4.8.2.tar.gz 22522336 BLAKE2B 2c9da971622b4e52fe78fa029107bb1c5f945a63605406493df607c410c6f2a8c2cdb38b1eb30c1bc1c8bc6e5620efad977c3ba55e04c579c01d51f0104afcce SHA512 7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da
+DIST xen-4.9.0.tar.gz 23361741 BLAKE2B 1cfebb791ca5e51eda9b86a5d98e0883fab1554f5ac805fc065916fbbd3695e6b0f11ca75935a8f973735cc8dd83e38fe4a670d8489010be865be49d8fc1a341 SHA512 97f8075c49ef9ec0adbe95106c0cff4f9379578fd568777697565476c3fd948335d72ddcacf8be65fd9db219c0a35dcdc007f355f7e5874dd950fd4c0a0f966f
+DIST xen-4.9.1.tar.gz 23368303 BLAKE2B 4cfddb351c9a4aa08227138dc1afa921f3d1880048f897428226da38eff9470cd81ae9896f174583048dad0ba8d5c1426df58b029115ba1623366d1980630c0d SHA512 9d22f0aa5dcd01a1c105d17c14bce570cc597e884ddb9b4a46b80a72f647625b76ae5213cede423d0458c14e1906983595a9269bb6e6ff2e9e7e4dea840f4274
+DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
 EBUILD xen-pvgrub-4.8.2-r1.ebuild 4866 BLAKE2B 67220f04c3db0b0ee203fd3ef43a10d911cedca6f96b062f7e0bbfcbd93ce630f79cdb36d1fbaef9c19c62adec7516e93ca56992188ccad1ac48e69aa0c37f5e SHA512 7c711f3c45ca5cf76b7467f3c0b1a8fd71605c8afbeb3d223721b9509d713c860f4a89a10c593f012e3e67186218d982f5edd7a649a3a7f65a8adc5275c51e7f
 EBUILD xen-pvgrub-4.9.0.ebuild 4868 BLAKE2B 1d0f43c00eaffe6db31db67cfe30aff2caad6dc97b9373004b68e101aa4b523907769651b36f964bab1b5fedead4d29d1836f24e530ee1fd0af387db95f6cee3 SHA512 d301a42271af0af034f7d97b358f3931401331493198fdee0e40b36ed260a9d32fc5cab4b546a544fcd6d4218cdcee1cbb8b7a0b7bea3c8a62dd9979c4593fd1
+EBUILD xen-pvgrub-4.9.1.ebuild 4868 BLAKE2B 1d0f43c00eaffe6db31db67cfe30aff2caad6dc97b9373004b68e101aa4b523907769651b36f964bab1b5fedead4d29d1836f24e530ee1fd0af387db95f6cee3 SHA512 d301a42271af0af034f7d97b358f3931401331493198fdee0e40b36ed260a9d32fc5cab4b546a544fcd6d4218cdcee1cbb8b7a0b7bea3c8a62dd9979c4593fd1
 MISC metadata.xml 245 BLAKE2B 2bf2c7848c8c513915aaad9305b6146cf46201bbcf3ffa040c943b7188d2d2a9fe27e2b5ecde84ed2099dceadd4b057856df01ac603a6aceca0f7b7f466174c7 SHA512 3f646ec3197e46d25dde4f698b571fb85b040198f4cba7508c8d38405b4d9d0fc31dbd5ae6242aea8c2acd613aabe0486cb347a1db4811fa807b861148661f8b
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.9.1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.9.1.ebuild
@ -0,0 +1,161 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+
+UPSTREAM_VER=
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="
+		https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz
+		$GRUB_URL/grub-0.97.tar.gz
+		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
+		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
+		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
+		${UPSTREAM_PATCHSET_URI}"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext
+	sys-devel/bin86
+	sys-apps/texinfo
+	x11-libs/pixman"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-emulation/xen-tools-${PV}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+retar-externals() {
+	# Purely to unclutter src_prepare
+	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
+
+	# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+		-i "${WORKDIR}"/zlib-1.2.3/configure
+	sed -e 's:^AR=ar rc:AR=ar:' \
+		-e s':$(AR) $@:$(AR) rc $@:' \
+		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
+	einfo "zlib Makefile edited"
+
+	cd "${WORKDIR}"
+	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
+	tar czp grub-0.97 -f grub-0.97.tar.gz
+	tar czp lwip -f lwip-1.3.0.tar.gz
+	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
+	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
+	mv $set "${S}"/stubdom/
+	einfo "tarballs moved to source"
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \;
+	fi
+
+	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+	epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
+
+	# fix jobserver in Makefile
+	epatch "${FILESDIR}"/${PN}-4.8-jserver.patch
+
+	#Substitute for internal downloading. pciutils copied only due to the only .bz2
+	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	retar-externals || die "re-tar procedure failed"
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
+
+	if use x86; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+	elif use amd64; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+		if has_multilib_profile; then
+			multilib_toolchain_setup x86
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+		fi
+	fi
+}
+
+src_install() {
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+		if has_multilib_profile; then
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+}
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@ -1,4 +1,4 @@
-AUX gentoo-patches.conf 3523 BLAKE2B 9f40de564ccc71ebb980a36d5b21ef02c8c8ea0378c1064910cbf3d92326c73b31ed2530a36b47500f442e280819f1f59c6016328b872addc528f344ed553156 SHA512 4fde67d4888ff174905419a210a4f15420b55ebf47d1c93da57c9874397eb82481aaa25366e1d87b48f197bf06ce914f520e43cc9649f97e7f566b5fd86603c9
+AUX gentoo-patches.conf 3668 BLAKE2B 2ce0fad50929a1ad8b79c3ae8839822decc72c6de44ad0ec2bbbe073d4bd5b0fb19a9cb437e45ca86295cdcbd99669ae11255d1bd3c75babcb531f26a213f032 SHA512 168f3fecc33b42b9b0e7cf1910d76fd3be9db9b8524c4d705e3e0f78ff1cd3dbfb1b35223ec104147adfcdccda77daf826c942c5def3975bb3943fc43d90109e
 AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68
 AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
 AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b
@ -14,14 +14,16 @@ AUX xenqemudev.initd 1828 BLAKE2B db01ab9f24d0d5b0abef886a8f0b162f4c00289d9f86a5
 AUX xenstored.confd 42 BLAKE2B 61153f1bb17c78614e215f25f59642f35185f7f7a2e911e04285a7f589c6a69856f914096621eded787b0c23a3f8994076ee15d2dd3e2a36589a65cd585c7946 SHA512 0906cbcdc84935d07cf53bc4447a1f9a9dc4e4fb9fda9a7163f6982f1d8a3ada1f0650fcd254fb6f715a54f7971daf0a5e61c3de6db70dfd156156fd55b59fe4
 AUX xenstored.initd 1058 BLAKE2B 9fbf48f4245276ead9df1f47583b160d20b15ece27ee59b288a1c0e5231a0864c8880824a844e71563735e9fab1199b5596fc4e7390ed47dd5ec8e98856c6e39 SHA512 195a7a8d50d28597d8f66416141d416c32095af5499d5978c6163996ea9cbbd6bfb343f7e0fe7a8835e39c8924906547cfc662e2ddd96ec571f47b3da79de090
 AUX xenstored.initd-r1 916 BLAKE2B 5acda60c3d1c8aaf91d14d980a0b68f3d5ff803b617431c87f46b5c2c6f4c87548fa8db32ebd554e8aad4928d7ec0b16598bf8dfb0aa7e3642caa96eb164a292 SHA512 1404c9c454f5359389a2e9588317f10412dafdbdeb1de5da945c10f8e6efd09007e96d35b75d04a4c3d5c59baa9c3bbee4192240cacee128b0adf9066d3efc10
-DIST ovmf-20151110.tar.bz2 27518370 SHA256 74199f6b5c6f756881323242742c396c52096db5f61700a4eb839343f9ab0604 SHA512 dda185af2fc0b9a8d5fc7e1e96db6aa31807782fe77d38491896164d125c30d2277db3d71a7dce7bbd569723b344b97dfebbc78ddddca0a095721f6b1ae3a1d3 WHIRLPOOL 145fb1c873cce96b81b269b44800987ca1b7350425b682fd5a5799648b0270c6c17bb337ad7e06650e6b66a9ac6eef8d9c9239f1478a687be4af187e60c3f3f5
-DIST seabios-1.10.0.tar.gz 588213 SHA256 8976fc4c1ebcda66ac96689762247dfc99115a5f7acb3a7d4e18d18ff5de12a9 SHA512 f1b83ce37b59070b488e19f98c95ca9f413cf4969663331b631c3ccb884c90b2db793d32a779ef05cead538c2fd123be4b73391ad2fa20c900a1f14237178d8c WHIRLPOOL 77718eac01a59f94c3fa81195925ae09c19e11f80f107b3387e910408d88d3ffc93eaca3b73d6a52b67514538c0e020b0f4078db8277a5ee6361fd0d3ada8598
-DIST xen-4.8.2-upstream-patches-2.tar.xz 38852 SHA256 12c1f1fd2adba22b923d2ee944e6e66794701393966f9e9e2079961e202f6d64 SHA512 536823eabf03e92585a8c5cde90ce502672dd1ec080b28b39411d6a778b899436a57bfb633f11c94d48d2f963848b7771e469f5ea53e84b580976f631f69cc5d WHIRLPOOL 5baf92709da895eccbe8b154c1d1cdf4c2f0faf5166ef2e4bbf32ca6899d8b88aa67ccd765a15a2f9a6d5200d4a1eb832775891d41c00a950855e5d1d4358e35
-DIST xen-4.8.2.tar.gz 22522336 SHA256 cb1cc2f0985e3d8651215e5d24c1fcc3036994fa7cc495a5091a2c85ece2aff9 SHA512 7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da WHIRLPOOL 8e54e79219f89640162673da471a02ee8a39bb884e2376a79a09226462903185b49a771fef51ceca54c4dd42a110ee1214db6dbf94235a156a17d6c597634c3d
-DIST xen-4.9.0-upstream-patches-0.tar.xz 58780 SHA256 f3539c0f620d168e4dcfc4c11f895bd6850c1c566d53a9d3366907662c2960e3 SHA512 98c601d791661a306e3dce5befb37b80de8a71cdd1759f3da00b199d48e3b9468efd1332e26ae044ad616b41a02771ad07a1c96972103b7e0aa39b93fb556999 WHIRLPOOL 711d3a5bcc9bd9afded35252b2efc0d4ba39ab9edb595328e4ebd808513c863e447e3554600328982a440fe936b7f68baf0b925f9d8ef8d17965439eed35d98b
-DIST xen-4.9.0.tar.gz 23361741 SHA256 cade643fe3310d4d6f97d0c215c6fa323bc1130d7e64d7e2043ffaa73a96f33b SHA512 97f8075c49ef9ec0adbe95106c0cff4f9379578fd568777697565476c3fd948335d72ddcacf8be65fd9db219c0a35dcdc007f355f7e5874dd950fd4c0a0f966f WHIRLPOOL 354527ea01f69c6ab632cffe8f50ca93721d9a89cbc4d84886d24b53fabdb7f62132b80e36189c30c0c9fae66b367eec7e00bb4df5f7af054ec27cec912ecf47
-DIST xen-gentoo-patches-10.tar.xz 27876 SHA256 aa91759d25611afa2e851e190c8445b18e4262037fc06da886f2fa4a4c500b94 SHA512 2033f4cb671971c73841cfaa7eb46623c37778c5746b47302eee252c4af287ccbeb8d1884ffdf32cd97a38cd7785257d56f13ef20d4c03dc0fb1cb196dc04ece WHIRLPOOL e02cc3c6ffd701b2f04df111ab33b18f7fa09e292b94a34af4d806509a564b896a7b677ab64654523ee992f363d59bf6bd4c2cbeaea7330f368cf657bfa2d538
-DIST xen-ovmf-patches-2.tar.xz 4344 SHA256 495d61d718440057f8b0b54fb57061450dd764c6e87fe5f8bda1785bcddba770 SHA512 0bdc83029a01b613f5c1ca029bd45aebe211c332f09db91a0cc7d6b6f85a81dbbfdc20c62f0d20e973ee41b155a6551a4fad518cb792e1d508bf070e23d6a1d3 WHIRLPOOL 8346d68fa5d2a8e8a5c007b55e2b85cf48df045cc8c4818f09c756d28a52dd856671f37b4a53478e9b96ca9d2eca0c67fd15f009a94d1d2dfed8e83e596d9633
-EBUILD xen-tools-4.8.2-r3.ebuild 14154 BLAKE2B a2dfa495d7250cff3dd180e794f55615f8101cd6946872bd3d038eb4ccf8698c092d1ab12bd584b85362e72679dc23bd4ce52fc3c0411a736ed68c7e4b2f98b9 SHA512 2b9d6213ead36548a128bf671bbc83d5196a733fa61473760e778f4a2a4a03c5bacd82b9de87903b2fdbdcb2d88e710d42009be2840e1ef04a999111ad221e73
+DIST ovmf-20151110.tar.bz2 27518370 BLAKE2B c4ba51e59ca3f597d75639a792b1f307a70dc6127917306e6ce182a76646435bec8006f7db9ac5c580e0ad79465a2b2902cffa90139d367c89d16e28280a978b SHA512 dda185af2fc0b9a8d5fc7e1e96db6aa31807782fe77d38491896164d125c30d2277db3d71a7dce7bbd569723b344b97dfebbc78ddddca0a095721f6b1ae3a1d3
+DIST seabios-1.10.0.tar.gz 588213 BLAKE2B 254eb4572a1dac06020a545820efb53a130a027aaab035cd916009b424475f89bd151f82f1bc5103c01c4657d09da3219d2fbcc7728add473011dcfc7bff7410 SHA512 f1b83ce37b59070b488e19f98c95ca9f413cf4969663331b631c3ccb884c90b2db793d32a779ef05cead538c2fd123be4b73391ad2fa20c900a1f14237178d8c
+DIST xen-4.8.2-upstream-patches-2.tar.xz 38852 BLAKE2B cbc7bad4703fabd05b703c66268df0670e2ae97b77007895dceaf6465b12a2f9fbe3773c7735b307427ad18c61711b20beb7f3ae6b1f1b8b5efda2a847fec0ec SHA512 536823eabf03e92585a8c5cde90ce502672dd1ec080b28b39411d6a778b899436a57bfb633f11c94d48d2f963848b7771e469f5ea53e84b580976f631f69cc5d
+DIST xen-4.8.2.tar.gz 22522336 BLAKE2B 2c9da971622b4e52fe78fa029107bb1c5f945a63605406493df607c410c6f2a8c2cdb38b1eb30c1bc1c8bc6e5620efad977c3ba55e04c579c01d51f0104afcce SHA512 7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da
+DIST xen-4.9.0-upstream-patches-0.tar.xz 58780 BLAKE2B 6d12a5a5bb7d2be7ca6bb8636648ee219c9526dd34086c929d8cd32d096d2454d6cb499d459b436f228fa49f42ef3a1f5fbe9b5c84557e4054565a9edc0daad6 SHA512 98c601d791661a306e3dce5befb37b80de8a71cdd1759f3da00b199d48e3b9468efd1332e26ae044ad616b41a02771ad07a1c96972103b7e0aa39b93fb556999
+DIST xen-4.9.0.tar.gz 23361741 BLAKE2B 1cfebb791ca5e51eda9b86a5d98e0883fab1554f5ac805fc065916fbbd3695e6b0f11ca75935a8f973735cc8dd83e38fe4a670d8489010be865be49d8fc1a341 SHA512 97f8075c49ef9ec0adbe95106c0cff4f9379578fd568777697565476c3fd948335d72ddcacf8be65fd9db219c0a35dcdc007f355f7e5874dd950fd4c0a0f966f
+DIST xen-4.9.1.tar.gz 23368303 BLAKE2B 4cfddb351c9a4aa08227138dc1afa921f3d1880048f897428226da38eff9470cd81ae9896f174583048dad0ba8d5c1426df58b029115ba1623366d1980630c0d SHA512 9d22f0aa5dcd01a1c105d17c14bce570cc597e884ddb9b4a46b80a72f647625b76ae5213cede423d0458c14e1906983595a9269bb6e6ff2e9e7e4dea840f4274
+DIST xen-gentoo-patches-10.tar.xz 27876 BLAKE2B 8efece8548a046b47c04e5b9354ca8bdff55affd6c6bc67315ac7536778fbaa183d346e0ff83e365030df2433bddf845188a1c3fb8feaea2e93d5ba0dd1c779a SHA512 2033f4cb671971c73841cfaa7eb46623c37778c5746b47302eee252c4af287ccbeb8d1884ffdf32cd97a38cd7785257d56f13ef20d4c03dc0fb1cb196dc04ece
+DIST xen-ovmf-patches-2.tar.xz 4344 BLAKE2B 1514c89dcba05c84281e9d46ec5c3e9e946ea777dcbe64d1d7689298e187aac2c9a5febf407d79bdb3ebe47563972ea66e0f5204590c5abc98df9cf24549b92d SHA512 0bdc83029a01b613f5c1ca029bd45aebe211c332f09db91a0cc7d6b6f85a81dbbfdc20c62f0d20e973ee41b155a6551a4fad518cb792e1d508bf070e23d6a1d3
+EBUILD xen-tools-4.8.2-r3.ebuild 13955 BLAKE2B 52f60a82e49dacfd8125b7bafa850d9349192814f4c9cc1ce25e00f0781399f06faa90161941274dbc730cfd8c3c477110d0f4786e3f5dde71b3bb41e6f529db SHA512 405bf5661339cb4384e59cf2c019fbad39074f595dfc6bc6dd00347fb433ebfd843c5c02e29b918cf760390731569fd58ced5f57073edd2db626ca51fd7b1fd2
 EBUILD xen-tools-4.9.0.ebuild 13941 BLAKE2B 5fa54a3ca4a191aa9ca927eb3bfd2daa2a6ef7ec9941e9761369dffbef7f0a2aac9097abb68ceda913ea69ffba9f33f716ce85079f4610c26909afa94617e1aa SHA512 ba54bdc680040454856aa7f950bfed5dc9aefeeaaa9256059160814182a51b3c2f8fcfdffa22c961e614e8cc67eaa1aaec473720982d1956d9dea46abf28bbd4
+EBUILD xen-tools-4.9.1.ebuild 13741 BLAKE2B 52b179de0a023ff0045c819eeeface99bd48adbd3087f4d7c615dc466164cd12a6fa75aebef9c14f2a923c6e34a0baf7c98110148f437866143adf8a4ac842d8 SHA512 2eaa8c4faafa3f191bdcc52d61fb7965c53216a75ef0ee4e65c4098ef77cd06b28e75761b7bd85e80acf0d3ecb66b9e04e950cd382b766649eab353eb757f8e6
 MISC metadata.xml 1267 BLAKE2B 8b9111b781201a51e373b606c888440fe42630f9cb08a43a4bb5a512456f57e7bb4e4f2af0a23d4cbf75489ba01efbc38820a6881317f16a459c96f8717d2b52 SHA512 c4e947a8cff20e4c5e77f5764fe26ee86a5674cc24ba2eedb7867476f9805ca47b895fcee92e8f353bb4bce877d32832318f8f7fd9514103fb2a963d6ea74647
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@ -118,3 +118,11 @@ ${_gx027}
 ${_gx028} ${_gx029}
 ${_gx037} ${_gx042}
 "
+# xen-tools-4.9.1 patches set
+_gpv_xen_tools_491_0="
+${_gx008}
+${_gx038} ${_gx017} ${_gx039}
+${_gx027}
+${_gx028} ${_gx029}
+${_gx037} ${_gx042}
+"
--- a/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild
@ -179,10 +179,7 @@ src_prepare() {
 	# Upstream's patchset
 	if [[ -n ${UPSTREAM_VER} ]]; then
 		einfo "Try to apply Xen Upstream patch set"
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
+		eapply "${WORKDIR}"/patches-upstream
 	fi

 	# Security patchset
@ -197,20 +194,20 @@ src_prepare() {
 		source "${WORKDIR}"/patches-security/${PV}.conf || die

 		for i in ${XEN_SECURITY_MAIN}; do
-			epatch "${WORKDIR}"/patches-security/xen/$i
+			eapply "${WORKDIR}"/patches-security/xen/$i
 		done

 		# apply qemu-xen/upstream patches
 		pushd "${S}"/tools/qemu-xen/ > /dev/null
 		for i in ${XEN_SECURITY_QEMUU}; do
-			epatch "${WORKDIR}"/patches-security/qemuu/$i
+			eapply "${WORKDIR}"/patches-security/qemuu/$i
 		done
 		popd > /dev/null

 		# apply qemu-traditional patches
 		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
 		for i in ${XEN_SECURITY_QEMUT}; do
-			epatch "${WORKDIR}"/patches-security/qemut/$i
+			eapply "${WORKDIR}"/patches-security/qemut/$i
 		done
 		popd > /dev/null
 	fi
@ -227,9 +224,7 @@ src_prepare() {
 		source "${FILESDIR}"/gentoo-patches.conf || die
 		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
 		for i in ${!_gpv}; do
-			EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches-gentoo/$i
+			eapply "${WORKDIR}"/patches-gentoo/$i
 		done
 	fi

@ -238,10 +233,7 @@ src_prepare() {
 		if [[ -n ${OVMF_VER} ]];then
 			einfo "Try to apply Ovmf patch set"
 			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
-			EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" \
-			EPATCH_OPTS="-p1" \
-				epatch "${WORKDIR}"/patches-ovmf
+			eapply "${WORKDIR}"/patches-ovmf
 			popd > /dev/null
 		fi
 		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
--- a/app-emulation/xen-tools/xen-tools-4.9.1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.9.1.ebuild
@ -0,0 +1,454 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='ncurses,xml,threads'
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV=${PV/_/-}
+MAJOR_V="$(get_version_component_range 1-2)"
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=
+	SECURITY_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=10
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=2
+
+	SEABIOS_VER=1.10.0
+	# OVMF upstream 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
+	OVMF_PV=20151110
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0/${MAJOR_V}"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	^^ ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	sys-apps/pciutils
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.11
+	dev-python/lxml[${PYTHON_USEDEP}]
+	x86? ( sys-devel/dev86
+		sys-power/iasl )
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? (
+		app-arch/snappy:=
+		x11-libs/pixman
+		sdl? ( media-libs/libsdl[X] )
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	local i
+
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			eapply "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			eapply "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf || die
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			eapply "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+			eapply "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+		unset CPPFLAGS
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--localstatedir=${EPREFIX}/var \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	econf ${myconf}
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED%/}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+	use doc && dodoc -r docs/{pdf,txt}
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+	fi
+}
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@ -1,8 +1,13 @@
 AUX xen-4.6-efi.patch 1954 BLAKE2B c027aff764e83eef957241827980559ccfeec5525bf0ce6b6b2d38db565fd0f24b21609c1d497934ef823d42116eaf96799b45314f11f57a9238ab21f1255a00 SHA512 361af33159cf49626e92d2815fd4422ea5b1d696a32ce2695ce75205fbbfb89d96b64a8af7332fffdc4a4390000bf52d3730403dfc2334af0da0bea59d58b689
-DIST xen-4.8.2-upstream-patches-2.tar.xz 38852 SHA256 12c1f1fd2adba22b923d2ee944e6e66794701393966f9e9e2079961e202f6d64 SHA512 536823eabf03e92585a8c5cde90ce502672dd1ec080b28b39411d6a778b899436a57bfb633f11c94d48d2f963848b7771e469f5ea53e84b580976f631f69cc5d WHIRLPOOL 5baf92709da895eccbe8b154c1d1cdf4c2f0faf5166ef2e4bbf32ca6899d8b88aa67ccd765a15a2f9a6d5200d4a1eb832775891d41c00a950855e5d1d4358e35
-DIST xen-4.8.2.tar.gz 22522336 SHA256 cb1cc2f0985e3d8651215e5d24c1fcc3036994fa7cc495a5091a2c85ece2aff9 SHA512 7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da WHIRLPOOL 8e54e79219f89640162673da471a02ee8a39bb884e2376a79a09226462903185b49a771fef51ceca54c4dd42a110ee1214db6dbf94235a156a17d6c597634c3d
-DIST xen-4.9.0-upstream-patches-0.tar.xz 58780 SHA256 f3539c0f620d168e4dcfc4c11f895bd6850c1c566d53a9d3366907662c2960e3 SHA512 98c601d791661a306e3dce5befb37b80de8a71cdd1759f3da00b199d48e3b9468efd1332e26ae044ad616b41a02771ad07a1c96972103b7e0aa39b93fb556999 WHIRLPOOL 711d3a5bcc9bd9afded35252b2efc0d4ba39ab9edb595328e4ebd808513c863e447e3554600328982a440fe936b7f68baf0b925f9d8ef8d17965439eed35d98b
-DIST xen-4.9.0.tar.gz 23361741 SHA256 cade643fe3310d4d6f97d0c215c6fa323bc1130d7e64d7e2043ffaa73a96f33b SHA512 97f8075c49ef9ec0adbe95106c0cff4f9379578fd568777697565476c3fd948335d72ddcacf8be65fd9db219c0a35dcdc007f355f7e5874dd950fd4c0a0f966f WHIRLPOOL 354527ea01f69c6ab632cffe8f50ca93721d9a89cbc4d84886d24b53fabdb7f62132b80e36189c30c0c9fae66b367eec7e00bb4df5f7af054ec27cec912ecf47
+DIST xen-4.8.2-upstream-patches-2.tar.xz 38852 BLAKE2B cbc7bad4703fabd05b703c66268df0670e2ae97b77007895dceaf6465b12a2f9fbe3773c7735b307427ad18c61711b20beb7f3ae6b1f1b8b5efda2a847fec0ec SHA512 536823eabf03e92585a8c5cde90ce502672dd1ec080b28b39411d6a778b899436a57bfb633f11c94d48d2f963848b7771e469f5ea53e84b580976f631f69cc5d
+DIST xen-4.8.2-upstream-patches-3.tar.xz 49836 BLAKE2B c0f79727afdeb172a45c9bc0553bfbac865998e6b36364d38899201aa649dc338b77a899758516823112970163f9c9596b5e3940aee132561c62f2a245f4ba3f SHA512 d87702ba64c85fed2617912582979a96c708c610c38adfa57a6e5085bead06907c3917f3e344afa91c7b72a6c044a1711f5ba2ba2360737c774d5f9bec92d786
+DIST xen-4.8.2.tar.gz 22522336 BLAKE2B 2c9da971622b4e52fe78fa029107bb1c5f945a63605406493df607c410c6f2a8c2cdb38b1eb30c1bc1c8bc6e5620efad977c3ba55e04c579c01d51f0104afcce SHA512 7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da
+DIST xen-4.9.0-upstream-patches-0.tar.xz 58780 BLAKE2B 6d12a5a5bb7d2be7ca6bb8636648ee219c9526dd34086c929d8cd32d096d2454d6cb499d459b436f228fa49f42ef3a1f5fbe9b5c84557e4054565a9edc0daad6 SHA512 98c601d791661a306e3dce5befb37b80de8a71cdd1759f3da00b199d48e3b9468efd1332e26ae044ad616b41a02771ad07a1c96972103b7e0aa39b93fb556999
+DIST xen-4.9.0.tar.gz 23361741 BLAKE2B 1cfebb791ca5e51eda9b86a5d98e0883fab1554f5ac805fc065916fbbd3695e6b0f11ca75935a8f973735cc8dd83e38fe4a670d8489010be865be49d8fc1a341 SHA512 97f8075c49ef9ec0adbe95106c0cff4f9379578fd568777697565476c3fd948335d72ddcacf8be65fd9db219c0a35dcdc007f355f7e5874dd950fd4c0a0f966f
+DIST xen-4.9.1-upstream-patches-0.tar.xz 6856 BLAKE2B 52a7e3b456d330444166c36ce68b008150831b7bb5b64b4a3dbebfbbe8cd024311f3d7aadd1313b194bd5ce7a20cd2ca5a424754e59589b986490eda97bf5d06 SHA512 9af8861443a708c60df52c21512099a55a6018238350ece962a715b07ade9141cab2d46540b5d5e8e20347980f786f7d28ec130f7e8e03c46ff4808d3b36a913
+DIST xen-4.9.1.tar.gz 23368303 BLAKE2B 4cfddb351c9a4aa08227138dc1afa921f3d1880048f897428226da38eff9470cd81ae9896f174583048dad0ba8d5c1426df58b029115ba1623366d1980630c0d SHA512 9d22f0aa5dcd01a1c105d17c14bce570cc597e884ddb9b4a46b80a72f647625b76ae5213cede423d0458c14e1906983595a9269bb6e6ff2e9e7e4dea840f4274
 EBUILD xen-4.8.2-r2.ebuild 4933 BLAKE2B bb5a4b58eb2820d1aaf50d395fca36192fbda8c0bb337771f22745591e41fb405798f53e8994771fad1a9c6598cc7c71864aa7c5f97d053847636af3227684df SHA512 ce0551c26ed51598405eab862b42c872bccfe05e2064b2dd589e56c34828820356f4f39ffbffaf78cd07408e91569091de947cfe0cc0602faa3503063d3a7fa1
+EBUILD xen-4.8.2-r3.ebuild 4788 BLAKE2B 7d86e51fd58fa5f817d045d0b1eb8c4941c05258fde806e90d0aa442b6f293e58ea3e8c93dda16597df080a8860bac2f88597ae5a64fd6a0518ef22688e9a83c SHA512 0a284557d9bbe0baea2c72ddeb2fcebfa3a72ab11ff94b68125644249ac7675d053bf5c3962e7f571aa3557404e472866495d92b0c2d4d9e990b82cb4679476a
 EBUILD xen-4.9.0.ebuild 4907 BLAKE2B 79f07a9604c8d3d20903d9da5f410d2ce1b85fd0b888d8f0b2ff8d768941abf0f18a006bd1748cb480beac6c9cd7c1434a0005b15e6d33c4bfc0e81905009498 SHA512 a70419e05a800da71ef24b097a950b7eea338c467fb0313d69fae25e7f6555b8ffdc3c7c27f18b11081625e315f5a90858668a56fe863cc21fe7c94357c08e57
+EBUILD xen-4.9.1.ebuild 4715 BLAKE2B 3b7fa7af4b51afda5effb7e723e169be2a3db76aefcd4496220362d3ea0d07d51e78b99547860efd4e036c5156f67ae1ba77f4404c98e5d978a0820cebef0ca3 SHA512 955c0089c6ec4bd489141d60ed4f40ce5f21769dd25231f332db9674badbadf9aacb47d8783b80fcff7d076e384456214ea227f71f6de67506d82e03f32edf2e
 MISC metadata.xml 417 BLAKE2B 5713c8e5f27d56714938b7d2bed096c3b3f9fbb0ad9bce2bb3240e4a8556134cfc88efe0e2c7feb2e9cc722c11800e8433afa0d03746b05998909dd976230225 SHA512 2708f84b8a1508eebc96539993ae1bde4b921d4401229c221e2bee9a0cd643fdf1f854fcbba6033ed68667d0efb00c25222f4c68535a96f2200084d8d8759946
--- a/app-emulation/xen/xen-4.8.2-r3.ebuild
+++ b/app-emulation/xen/xen-4.8.2-r3.ebuild
@ -0,0 +1,175 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=3
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+}
--- a/app-emulation/xen/xen-4.9.1.ebuild
+++ b/app-emulation/xen/xen-4.9.1.ebuild
@ -0,0 +1,171 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+}
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-python/Manifest
+++ b/app-eselect/eselect-python/Manifest
@ -1,4 +1,6 @@
 DIST eselect-python-20160516.tar.bz2 46549 SHA256 bea0a39d9e5afb7513be47955a82efa636b983de6388965df517cb1eb7615fd2 SHA512 0ac310e13bca9e3cdfdd55820cc2956cacf28ade99c1b5048edadd48c6a04c2ae1037207aaac74fcd75e809cf993f88b52e463979b68bd123fe925e491a7030a WHIRLPOOL 66782323a455af7536592cf76c9fd9f57c8adf8a67b374c4e6bb96fdc21dfb8add4f74697139643c47561357a451d50b777f3e2e73db850176fc05d61ae6e54c
+DIST eselect-python-20171204.tar.bz2 46655 BLAKE2B f0bc46c796a1b9e01f964994219b9c7831f99844a12e97429b40482e28a590a2d825f7b6fbca27b0ca1ce616e5cfb388272af686ea2de65fda69da0319fddeda SHA512 f89183ca992bc38f2308a3217602d5ce6ec4b3b5b614f2aec48fb5b3b7e50a2e44dd18af36a7cfbd4b45d05346f2be97605e35fd274558e9173c6974681c8fa9
 EBUILD eselect-python-20160516.ebuild 1101 BLAKE2B e189b7c13192a28b4e5adab450e41927f31cab66a447a0aae23a14ea02f09449351a5bc588a64df75858c7a341e173bed06ec7040fbd4a41bba2d1ac6fb29ec5 SHA512 a8ebae6634638f735adeb741f182aa10484225a6d5458f7bd08fa0b043d8160c9f164d64854d682e1b867c1be8c9a5a42c475efec9a784bce80fd9ac08054924
-EBUILD eselect-python-99999999.ebuild 1102 BLAKE2B 77b68661ebf8daa24892fee1739f6ee01c9fdd1c30bc4a91f02ba139ab5a878e8cd5e0f1e12868134cbcdd7ed1703d3e683ecd45ecd7d3c733ef03fbef7b3d60 SHA512 f7bf212d900b56e8a31fa83cfdb050a1f345f8ec9d9e864abc69857930f272637612a5f1a1c0eb7b2285237e6810002a830698ac5326be2d7446bf6ab0b180e1
+EBUILD eselect-python-20171204.ebuild 1122 BLAKE2B 0dc2853efa4a8058b511ba480722490a40dc927da820f40b02bcaf904b31c3712a46408b1566c73ed83d20116c76a8e0d00ebd40c8103f97bf5f4e3d0afecaa6 SHA512 baab9007d3839db2b08aa15ba533bbdb6f958020fb63364809ec8b1d0910ac35f7f609ef090302acfb3815dd385ca6d1d4a239f93c2815cf026e1ee6b3b676e2
+EBUILD eselect-python-99999999.ebuild 1123 BLAKE2B 8f4ee6df6062fcad95144c8442c1ca28573a1f987c8310f8786f188ba0c8f800649be00b0ff0c7290f28f68b7d2a19164dada26bf7561aec13813c3d4ec5e955 SHA512 a71ce16b06ec69cbe0c1ad3c33c4534ddde120995033f8fc6e64484f97b5b743e75a62df2baad531ac5767aaa9d1b8b885aa45fa00b44dbf2a9331403aba31d0
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
--- a/app-eselect/eselect-python/eselect-python-20171204.ebuild
+++ b/app-eselect/eselect-python/eselect-python-20171204.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "99999999" ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+else
+	SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Eselect module for management of multiple Python versions"
+HOMEPAGE="https://www.gentoo.org/proj/en/Python/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+# python-exec-2.4.2 for working -l option
+RDEPEND=">=app-admin/eselect-1.2.3
+	>=dev-lang/python-exec-2.4.2"
+
+src_prepare() {
+	default
+	[[ ${PV} == "99999999" ]] && eautoreconf
+}
+
+pkg_postinst() {
+	local py
+
+	if has_version 'dev-lang/python'; then
+		eselect python update --if-unset
+	fi
+
+	if has_version "=dev-lang/python-3*"; then
+		eselect python update "--python3" --if-unset
+	fi
+}
--- a/app-eselect/eselect-python/eselect-python-99999999.ebuild
+++ b/app-eselect/eselect-python/eselect-python-99999999.ebuild
@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=6

 if [[ ${PV} == "99999999" ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="Eselect module for management of multiple Python versions"
@ -23,6 +23,7 @@ RDEPEND=">=app-admin/eselect-1.2.3
 	>=dev-lang/python-exec-2.4.2"

 src_prepare() {
+	default
 	[[ ${PV} == "99999999" ]] && eautoreconf
 }

--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@ -2,7 +2,6 @@ AUX sleuthkit-3.2.3-tools-shared-libs.patch 1685 BLAKE2B d7293ec0d58a4341c0901fc
 AUX sleuthkit-4.0.0-system-sqlite.patch 940 BLAKE2B b87e0fc6852ec23249ed05e4a43d4a892491c37eed591eb221ac713331c74ee1eec479e506091591a142b24fc11d91cecb5bac4d52d54ad7368e6c8d452f0ef7 SHA512 c73324bc73fa90b657deb634825c846c751913ff39f1613975b633eb6255b207fac3307ee575e0e683d4664b6809f792b8a7d6ef1cb9846f03c2338edc70f0f9
 AUX sleuthkit-4.1.0-system-sqlite.patch 934 BLAKE2B 264b67ea82005c89fb4a6d5b4473ac358e1d7b7e5b001af49cd726bbbbcbb9aa0d88d205dedcfdeba9ac9e579f430989bfe9b81d615bd053d4f5625165f768fb SHA512 401c312fb62505aeea23e7f95215580fc7a2a47b5428f762420b3402bb0fb75073ca2b9698378e93de1a0ef8476d258ad74140404b2db67fd2bd0b000245d737
 AUX sleuthkit-4.1.0-tools-shared-libs.patch 1678 BLAKE2B f60496480425fd78bc211a663be80db2472a9683f1ff76c747f8190d5544df532857f6e1fb4343d0405f8bf51aa7b7bf86ed55fffbeea0153341ce9f2dca077b SHA512 b559f669837194bed447ac269884ab50e6ea746aba2df799688964245c22814567871f12f96d43ba74016d5c448247b02bef5d7bdfd32fd782ef5e668686238e
-AUX sleuthkit-4.4.2-c89-fix.patch 912 BLAKE2B d9c19f5c239b9cabbaf2afec1a8d3e7e1c27b0f9e86e7ad301e25e9c61ff24588b89a1c803b28bbf749e1a26c4d4db799d76f5ca4abeaa9b04a85de89822f600 SHA512 d2d80561b432a1b5a0e7f94322b03bf24cedb91bf6c6fb145470b3c4f2c6dd98c43935d3a56ae11d1f651589db1ce4fc0d7468e32d5661b2785cf5e13d82609b
 DIST sleuthkit-4.0.2.tar.gz 7577570 SHA256 112f80fbc6a868c18c7a924f756b35c79eed9d0cc8923a4f973646f00e546e62 SHA512 acf1d6006db3e75675eb769034ea78fd78133ac0f83c9caa74ec720c0dd25f95fb1a5df2c652027eeeac53e1fca6a3096b5248db95e3a01ce95e72e779e44f37 WHIRLPOOL 72ba21e2b89c6b06974612041c9374e3f306237312328c375d012197409a02fcaa1abc120189d28a8261cabbbd1d6c37b3b14431c47b008f06d43a7c6d9ea612
 DIST sleuthkit-4.1.0.tar.gz 7974564 SHA256 b410428df2e1b253fa23ce6a299d059d8c2650bf9c602f7b80c0f4ce1368c36a SHA512 1cfa96bd3746c59c92c3e3f07f5f3f0f6896239bcaec012c43958654bb63794ecf9d7bd28bb9b4ab939558f4b27f03cd87f645ea91a8f9cfbb9037df93ef5223 WHIRLPOOL 20856982b77ecbdd1ed3b7c147e4340461830f0238ba7cdc17da3159f5a666df5b3d490760699d25d2896289c811f615ffb4160d163f9917f09e57a37ff26a21
 DIST sleuthkit-4.1.2.tar.gz 7990136 SHA256 58253b35c016083558fb581308f4a3baf884229de89eb84ddbfb977ed56600d3 SHA512 1f64acf42e86adf275bcd86c63c097210a498ac34ce69e64b3c120d86dffae65b5d57ed9618692dd510f637e940a48a60912dd57c8de840bf3a2b4428baabab8 WHIRLPOOL 1298a345416bec11564007c41474010cbddc26289aee025f31ecd2b7069f0d16ca81eeb07a292e38d91d6b34c3a891fad8a2f4b42bfd4df96053469d25dc8c65
--- a/app-forensics/sleuthkit/files/sleuthkit-4.4.2-c89-fix.patch
+++ b/app-forensics/sleuthkit/files/sleuthkit-4.4.2-c89-fix.patch
@ -1,29 +0,0 @@
-From 7caca2f8be471be337f7aea70cd900164bf070eb Mon Sep 17 00:00:00 2001
-From: Gokturk Yuksek <gokturk@gentoo.org>
-Date: Tue, 15 Aug 2017 21:04:24 -0400
-Subject: [PATCH] tsk/img/aff: loop initial declarations are not allowed in C89
-
-Declaring an integer inside a for loop as in for(int i;;) is not
-allowed in C89 and causes a build failure. Fix it by declaring the
-variable just before the for loop.
---
- tsk/img/aff.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tsk/img/aff.c b/tsk/img/aff.c
-index fd9c4ff..a832bfb 100644
--- a/tsk/img/aff.c
-+++ b/tsk/img/aff.c
-@@ -216,7 +216,8 @@ aff_close(TSK_IMG_INFO * img_info)
- {
-     IMG_AFF_INFO *aff_info = (IMG_AFF_INFO *) img_info;
-     af_close(aff_info->af_file);
-	for (int i = 0; i < img_info->num_img; i++) {
-+	int i;
-+	for (i = 0; i < img_info->num_img; i++) {
- 		if (img_info->images[i])
- 			free(img_info->images[i]);
- 	}
-- 
-2.10.2
-
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/datovka/Manifest
+++ b/app-misc/datovka/Manifest
@ -1,7 +1,9 @@
 DIST datovka-3.0.3.tar.gz 671555 SHA256 96bbc89fb2fe0c6a306d80260945b1b4eb089a061f9e324139b9a238d8588c3c SHA512 c3dfa23125849fb1c5691a4ad6077fedd307b8c0417c72e014876f56c1185a2da73478927fb594cac45ada77a71a3798f57a75032a4d83cd81c194fe3257397d WHIRLPOOL 4ab43452a51130ce021fd23e292f6922cd6d16670b8e65f270747b75b35b8fd085962fe6086ed3ae8f0797e4e764e5e403b7694dd82396a7c1d2b4dacb81262f
+DIST datovka-4.10.0.tar.xz 2449068 BLAKE2B 5da00d48aa2d1d04b2c32b49e3901187cfa6ac3d02d2ea230dcccaf048269b736f3a38c88530ab3865c673c661d2448d5eca5a7a8bebe8b01e24d9fb4c1a502f SHA512 2801898ab1511ac98d0eb5a1b0f82fe5f1bae6c2bbd77d8d818e848e0f85242a07f414d3983c9278db8540bcce9a7ddedc7e584c328a32c6715bcfa0e7d4afae
 DIST datovka-4.7.1.tar.xz 2347736 SHA256 65d10486505b06edf12de24dc79c1ae702a3ebefb35bc0b8fa6f301f657d2236 SHA512 b086f74bfc13bda0631d7dec3fc2523fcf6395e6874542f04173ddd7315ee6fbfa55e60b8d3e3b5dc7e6c2f0ce56c97fff9d9d1947ddfce5ad1613ac30af9d8a WHIRLPOOL 21f137cccc2b6612c7a4b98228297c5e5d0e519d2e10d2013f25db57baa0c3b09b658b51c5895f95abfb7aa988146ef423aa210f4705fad14d098c1159a194d9
 DIST datovka-4.9.2.tar.xz 2373540 SHA256 b1d10acdc6f6347f0b976f4c6f3ebdf25feb7f1a9bbdc745cd8a813ae2bc2f5d SHA512 a906a032d138be33f6011c9e5869c5c8ae44f305279fc531e6e21e7911a04d3f3f2a360d561f0553c581806fe3ac8344dbb30bcdc604e79db37fc948f12a7e1a WHIRLPOOL 00becd3917cf4584ca4fa26aabbb5be245cae1545f5a9e0bb51020137523b33f89a3a6cf913bbe92f25cfba59e1afbd1ef79b6829ebeb235b78d83c7e709268c
 EBUILD datovka-3.0.3-r1.ebuild 664 BLAKE2B 5dfcc4bfa7843f007dc01985d9e18cefa9176774b11680b58cc1ea5fa774971f7084d439ba18afc57abd5f0290ac1c28277bb4118800a3601763c20773c0862d SHA512 9531c13e5ecc9d26fbee745f7399132b18adf3c595dcf91ac0cb5ea55252614ba53e54b55f54f6fefd3e34d286dc08b95dc67a27d551c3e01b2e6a472c398b0c
+EBUILD datovka-4.10.0.ebuild 1092 BLAKE2B 50077cb1a9f9ec0c2d5f67de7c6181cb11081861e49cfd09ad7778abd10dee0bb185cd30aeeaf94903772ff435d9c5fdf0cbb5269d95594d9b1a6f5f5db48d7f SHA512 317817ecf97d217c5f5d787948e0127b005964e495a356f9ebcf5dfe4c1e462d32eb3727e7da530f2fb532ea7d64db086cee15bfd53bb53fbdf71bf2e068116d
 EBUILD datovka-4.7.1.ebuild 982 BLAKE2B f5403b08afc5f2c6d398fb9eb4fd98f463a8a9bd17e3fd6318124325e6d77ea8d258f3fcb6412997cde07c960a37d5cf0e3bccad3548123321b6f705c8d9d9ec SHA512 93b130ac994704500718e7729b2f1965ac93227c2b215d3b67c39b08446741e5c23099ce27e88e99b92b255b3f11dde4dea85626987abd94465e7bc60c938e30
 EBUILD datovka-4.9.2.ebuild 989 BLAKE2B 928649d617d216fcfbb4d3960b30625de0a2b7211350681903d660cc6ca67be1f9d1cc237b4eeb084c26f82efc7019a6dcda9435156de72981d045f16da76413 SHA512 48753345ccb14d1328ba38211f7577b370e1c9835bb5d51bbfde8a60df02eba182eb4166fcb2deff1f6f0161e3724187910bdba59a56f55c0ca62d8698be7275
 MISC metadata.xml 445 BLAKE2B 52a23fa53d98a5f8a9890ee261fb8021f5125eb8981a9826f64747022668a26da1d74e7e5acc025d984324eb8c4996728cca0e856ff1435c4b35d6cf015e96a7 SHA512 682fca99a52a692346a2dc85281b1108c4c660afc70924e52e79be01fdd7122e76d0a9dbed4aa7816ff3020c4d4782d4bf9f79d880c46ab2bb02f99039f34a16
--- a/app-misc/datovka/datovka-4.10.0.ebuild
+++ b/app-misc/datovka/datovka-4.10.0.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils gnome2-utils
+
+DESCRIPTION="GUI to access the Czech eGov system of Datove schranky"
+HOMEPAGE="https://labs.nic.cz/cs/datovka.html"
+SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# minimum Qt version required
+QT_PV="5.3.2:5"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qtnetwork-${QT_PV}
+	>=dev-qt/qtprintsupport-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}[sqlite]
+	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=net-libs/libisds-0.10.7
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+"
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+	lrelease datovka.pro
+	eqmake5 PREFIX="/usr" DISABLE_VERSION_CHECK_BY_DEFAULT=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
--- a/app-misc/ttyrec/Manifest
+++ b/app-misc/ttyrec/Manifest
@ -1,4 +1,4 @@
 AUX ttyrec-1.0.8-flags.patch 591 BLAKE2B 25a29be68f318dcb0604c6b3bf982f24d806f889f86bfbbe3795e6999763951fca64f02d82ac0a82e720c380e8432eb7d9e0cd6f9e7d1b193699fb614867e3b0 SHA512 245a5e34611869d4b612a25922cde034ad3e54a3b7579850f2ddce3e0200726ed3707a518464c176044c9a9ab5f60737ded7941f1882d560d963c59e6221861c
-DIST ttyrec-1.0.8.tar.gz 8528 SHA256 ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec SHA512 b7f6f4c78c5148dacc7058534d89f13fcf333ee9e099d4475135e9c15a99a8aed72bf4bd5954652a6bb044d11ad35b4cb8d07208a5349c79c811f68fde7e8611 WHIRLPOOL d8f51ea4c88082b0f272170fec7aed0fa14d153b145f17958dc6101b5e383bbf7dfc4c5ed9cdbac23c08cef6baf25f4b65f3db13f7575bae65bf9ca3f58d48e3
-EBUILD ttyrec-1.0.8-r2.ebuild 688 BLAKE2B a41fe9451470e3fb32b7983bcfb52047e2605c701aaffd7a6c2123796d022828235808e4e68384330e15c8c774d86c5878f630951a0f0947023ad8234c4861c9 SHA512 010ec6e1dd579c60f9c7256ca9ea8b1d7fcb0f6f9a691b4c1df757da039573d083d961d3c012432a131bb878516878b2d11dda4cd8d1e670f003232b3c2ff69b
+DIST ttyrec-1.0.8.tar.gz 8528 BLAKE2B 8b0218cb7fecdbcbaeee9da2b7982b880bb6f0092f65f2c730c5942eb3ab6dd9978b7168ff537b81503c697c5b948e7a0e2a267c35de1c0038d85277c6610a74 SHA512 b7f6f4c78c5148dacc7058534d89f13fcf333ee9e099d4475135e9c15a99a8aed72bf4bd5954652a6bb044d11ad35b4cb8d07208a5349c79c811f68fde7e8611
+EBUILD ttyrec-1.0.8-r2.ebuild 687 BLAKE2B 8283817ca58b4b79230360b6894944325ae092f85e9fd9d94dc27b0700b1328290ff852837ca52046f1182d8d42b830113a9df84502a20ed4ff2b584df08a99a SHA512 9917bed3418ac6638c3e3714f0452b3249afa277fbe39550928692cfe778f2e0bbe43424cafbb2096f5ca45b4c9b4513afdc5b8acc492ea62b918cc76fc99003
 MISC metadata.xml 575 BLAKE2B cbadaa7de1bd014a8b4d0fdce081ec4f078febf7a0884639762f714fadab3adbf6603475b331a2a07a17c0934ab0f5262bfd1191b5face6a252f7d4de8d06054 SHA512 57adba15d5ac7ae8f49445e81c7aefd99a840721b8636505908493e3e76ed12c24eb5ae87970de701395415c096ca360ad81fe27139fb4db79cfc3da1b7784fa
--- a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
+++ b/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://0xcc.net/ttyrec/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 PATCHES=( "${FILESDIR}/${P}-flags.patch" )

 src_compile() {
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@ -1,6 +1,6 @@
 DIST gemato-8.tar.gz 57379 BLAKE2B e83cba508ed781667abab3e18059f838c99e92217a7f1dde90b2cc4200a0ab83baabf789bc6bc978b4f080bf285ab9b7ea62e86a98c272abf3889093d780eac3 SHA512 9e5e7c304166d311b7101330b36c3d781e5d3901feb5247235ed04a8aa316416f6045658fab176e34ca6c2d6653eda66ef19789b39a60cb316add9985c9a8040
 DIST gemato-9.1.tar.gz 59352 BLAKE2B e2e2d02de29856a91c2432496101589fbe1a87456d46071c03ae5b999a46356f144c6d5831d42896ee15d1bdede32cdcc6b02c412b427f7878d8fc9ecaef84c1 SHA512 cf7bec8ccf7eab75bdbaf0e9a701c7b0fa1a8f2f329f4ba7ef3399898997a6bb3f53c6dfe49cd054ce12baf1f4490e2b7610f5964ff7e6053ae7dd53dd34900e
-EBUILD gemato-8.ebuild 1047 BLAKE2B 031ca60fc75f580c5cf6051e2838dd7cf98d7eadfc2d2b163b04463edf018c9eac520544e815de5d7e3f6062bb75641397c94e085d16ee0e51e3213ef6c03275 SHA512 ed9196e369cb4f964c70a9fb3f8e2226058284d92e2cd1a295a01069cee8f57c44f66891db4f87dadb314b5462b8deff576d00a6dd0abb1f31f3a68cf6063da9
+EBUILD gemato-8.ebuild 1054 BLAKE2B 76b1ace451f773cc6b60110fbc75df45bff19604ddf2383e4e59df5aeb4e730d61b66acab39d8060f0879be636dbe76b17bf7d29b63e6a03d16bf85015b03b1f SHA512 84d6dc68246c608eaa1d72ca902e688c24e5f16667397a784f298b9bc6718723f2b5bdec85aa1b3a99d063753de5a1533da0177459a9556bb27c15c5f5c68e90
 EBUILD gemato-9.1.ebuild 1047 BLAKE2B 031ca60fc75f580c5cf6051e2838dd7cf98d7eadfc2d2b163b04463edf018c9eac520544e815de5d7e3f6062bb75641397c94e085d16ee0e51e3213ef6c03275 SHA512 ed9196e369cb4f964c70a9fb3f8e2226058284d92e2cd1a295a01069cee8f57c44f66891db4f87dadb314b5462b8deff576d00a6dd0abb1f31f3a68cf6063da9
 EBUILD gemato-9999.ebuild 1038 BLAKE2B e6d3cbcc3f35d0e8a5f9370c2ad0eaa575f79fae8bb0ae921f1bb99c39b0c46da0caa217330b0090b10c610e2c9b0200c1501a4bf1df60cac0f11e2b61f98f86 SHA512 f19ce1d4f80d414b18ecbe2f8859ab9d6326ee8e30e03202dfcddee7604b337622fd7f599fa677fdd0273a2d98fab2d28e85b5ef3d27ebb122b7a4286d194631
 MISC metadata.xml 670 BLAKE2B 8495c32b74bb84f14d4fdd19fefd5c852534547fff65656f76290f019ddb2412453da59195bf67bd596acdd4f24b9f4fbb1d357375fd9ab1d83466e8479f53c4 SHA512 fc2549228500c0829f6e53e011cf46bee9bd3e5b234ceb73e3ef9c4ca3b3755ec3dbdbd86ff9c16ae65bf40329c47e9d6c4b7d78c810e609a50ad508c2776851
--- a/app-portage/gemato/gemato-8.ebuild
+++ b/app-portage/gemato/gemato-8.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+blake2 bzip2 +gpg lzma sha3"

 RDEPEND="
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/djview/Manifest
+++ b/app-text/djview/Manifest
@ -5,7 +5,7 @@ DIST djview-4.10.tar.gz 1077198 SHA256 7caf7ee249edd994092b32a5573f111b2337ec991
 DIST djview-4.9.tar.gz 930676 SHA256 d150f557aaa073356d77c1f5e566a6a566281df5f92395b6822139f0e5c90e0c SHA512 dc2862d673eb77cca77a512a64257e7b37707789de41362fb62295ef495201a81cf31d0282a88ed70e32f8c7cd5643b568ce9761297d0e61d72fdbea7ecbfa94 WHIRLPOOL b522f9ba7283430fa7134f172b6a358c95da03e10fcf1e5f55bdd5c9be1f2929c07682e48e3a90695c838dfd2ffb875794c95e70d4096dd9595da402f76523fd
 EBUILD djview-4.10.3.ebuild 1977 BLAKE2B c8b701604d32cef042adb9c4cd12ff60f7b5b0cde1084984cbb36a8ce76572df1d0b5ff286166016f6b42a398b7b4b2ff5261320c1ebbc93296b56470e37d651 SHA512 538d5f93cf7bd1b9201ddb8fbd2eb3374137c47f8e3624dbdcf44e3b823e72e3e7d8ef041af35c52f4d36f5abb36d19c68e4dd5c24ed8ae05dd30a4cafb42609
 EBUILD djview-4.10.5.ebuild 1977 BLAKE2B c8b701604d32cef042adb9c4cd12ff60f7b5b0cde1084984cbb36a8ce76572df1d0b5ff286166016f6b42a398b7b4b2ff5261320c1ebbc93296b56470e37d651 SHA512 538d5f93cf7bd1b9201ddb8fbd2eb3374137c47f8e3624dbdcf44e3b823e72e3e7d8ef041af35c52f4d36f5abb36d19c68e4dd5c24ed8ae05dd30a4cafb42609
-EBUILD djview-4.10.6.ebuild 1975 BLAKE2B 585cefe048c14a3d1f2b2dcbe3a89f84212a0022865dacf0b9e8782dbe8363784786d6642694072f8fe8b5cfdfb8e7808837373017c5a321c2dc24e8494a816e SHA512 e765f96a02c26f31150464201cedd3aaab7e54dbf2c352040c3f8fd7b2b9ce050d5d8fc4b94e84e10c2a0f3236d0cfa40544751cdc9290a6e200666c9d34ff79
+EBUILD djview-4.10.6.ebuild 1974 BLAKE2B c79ef9ea75611041256153d85484ac48a4cf31166b7ff052da1fea7ebbb49c380db597914c97164204848ffa4b6f647f53dead363bc67cbddd224d3ef824365c SHA512 f9e63674541a39acc816f4f9e7223e7dc8a42193946f127ea8554ac7177c2cad9e773619351d40eb2d4260af04ae5760ed2228c10f3f6f92775914d3ce88d32d
 EBUILD djview-4.10.ebuild 2027 BLAKE2B ca271d0bea9b072e044e37555c0621474115416ae0242933b442c8e4d318627ae338c83ef68903bb6f1ca62bba2ae29e5e6a33de5359baae500d6b112d196509 SHA512 3ceea3d4e3e82acf37d6612391b9f9d38d324a3e2a2ba8f8c6e667cbe5bf43cbf40c4fc5f2c055de82f521dbe8d76e448169d531e815d061ed5f38928d93cae5
 EBUILD djview-4.9.ebuild 1946 BLAKE2B fb46a53d90cd4313c90acef2ec11350a7ef296154e9d0b37740c210f1495bf6588256cf7e7654b67dfcd4a92cd13cbe76f56838af2418107d780e6a2a748d8c3 SHA512 d9c66756fdd98c2ae8323a1c23f5f171b205e8c6dae4c6de256c15fee6bb3c870edec36b4278a8e524fff7e7984cc657d97c4e54aee890e9bac9295af674ff36
 MISC metadata.xml 323 BLAKE2B c8498cdd0e1820eb610a9e2ede4e10287977c2eb71dd1b6b9862e3d11a34760cf8dcb5e9e59535ab0ceed04f3be2b00aa4942657a25fffc87b23966c2b2c1caf SHA512 53a7a7290a2286fd31248db31160697a3b2693275013a1ea453258f9ac52fa3ea7111718ca35a5eb1652050699e5be1111c7ebb73b2a3c699383d8305509a5c4
--- a/app-text/djview/djview-4.10.6.ebuild
+++ b/app-text/djview/djview-4.10.6.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 x86"
 IUSE="debug nsplugin"

 RDEPEND="
--- a/app-text/docbook-xsl-stylesheets/Manifest
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@ -1,5 +1,4 @@
 AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04
 DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7
-EBUILD docbook-xsl-stylesheets-1.79.1-r1.ebuild 2122 BLAKE2B b1a124e1349a4a6f0e267be4a57d1ef9a88d3c49570107fa8ec56cea286c242f31b34b3b05b80150fab519ea50d51587a84284ab44fb6ec5dd3b107f413c1311 SHA512 69c1f46596e62747f2011d69def968960f8243393998b5897f83dd4a641931e25dfe496ae502ee5c83714bc887b5c8023b8f208b1b3897d6f472eae134c2b2b3
-EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2204 BLAKE2B 698270179dc6ddfe8ee606832d30ef19a54c96bec803ae204ac593e378b3868b3d7d8591dd93c5e535b8a78ccf035e5e2724d459ccee2b183fa1ce93c80a8744 SHA512 01115efcec06425a1e1fbe0be634c474b757b10ca26e3b6e765a4d362cc1e1b39d5fb4ac2d938f83cd2806f0b7bf7dd2e65063322a972da88dbfe95725de8d1d
+EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2192 BLAKE2B 94f7538707bf5c9a8af189ef1aefcc80e0179769e29f5544afb65558b714aced8fe2b398785c0899a9339441bf69eb18c0f3ebb0ac47c95546e2229607637116 SHA512 2941be8fa4651d201cda5d1ff36f007d267ebf1c34a2227459ca32c38d824c3432b406912bc4c1fc80d755fc3efd19cee2eff5b7e0d121c45093a02942788945
 MISC metadata.xml 413 BLAKE2B c4ba1418a2d7499d953111afac5907a4dd53c183f8a2613218aa0f0f510f1b75d04c6839c5407f20703ebab963d505dc09e081cfb053970147b07001caea6920 SHA512 7c32b5261d0bfe9f552efd08854233b47958d04cab7b932ddb67cfe163319f8f8ea82d1b169203b9e2158d3a436862d7050dcc762d3b525ba806690640ad3892
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r1.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r1.ebuild
@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit ruby-single
-
-DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
-MY_PN="${PN%-stylesheets}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XSL Stylesheets for Docbook"
-HOMEPAGE="http://wiki.docbook.org/DocBookXslStylesheets"
-SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ruby"
-
-RDEPEND=">=app-text/build-docbook-catalog-1.1
-	ruby? ( ${RUBY_DEPS} )"
-
-S="${WORKDIR}/${MY_P}"
-
-# Makefile is broken since 1.76.0
-RESTRICT=test
-
-src_prepare() {
-	# Delete the unnecessary Java-related stuff and other tools as they
-	# bloat the stage3 tarballs massively. See bug #575818.
-	rm -rv extensions/ tools/ || die
-	find \( -name build.xml -o -name build.properties \) \
-		 -printf "removed %p\n" -delete || die
-
-	if ! use ruby; then
-	   rm -rv epub/ || die
-	fi
-}
-
-# The makefile runs tests, not builds.
-src_compile() { :; }
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	# The changelog is now zipped, and copied as the RELEASE-NOTES, so we
-	# don't need to install it
-	dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO
-
-	insinto ${DOCBOOKDIR}
-	doins VERSION VERSION.xsl
-
-	local i
-	for i in */; do
-		i=${i%/}
-
-		cd "${S}"/${i}
-		for doc in ChangeLog README; do
-			if [ -e "$doc" ]; then
-				mv ${doc} ${doc}.${i}
-				dodoc ${doc}.${i}
-				rm ${doc}.${i}
-			fi
-		done
-
-		doins -r "${S}"/${i}
-	done
-
-	if use ruby; then
-		local cmd="dbtoepub${MY_PN#docbook-xsl}"
-
-		# we can't use a symlink or it'll look for the library in the
-		# wrong path.
-		dodir /usr/bin
-		cat - > "${D}"/usr/bin/${cmd} <<EOF
-#!/usr/bin/env ruby
-
-load "${DOCBOOKDIR}/epub/bin/dbtoepub"
-EOF
-		fperms 0755 /usr/bin/${cmd}
-	fi
-}
-
-pkg_postinst() {
-	build-docbook-catalog
-}
-
-pkg_postrm() {
-	build-docbook-catalog
-}
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"

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

 RDEPEND=">=app-text/build-docbook-catalog-1.1
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@ -1,7 +1,7 @@
-DIST dos2unix-7.3.4.tar.gz 640991 SHA256 8ccda7bbc5a2f903dafd95900abb5bf5e77a769b572ef25150fde4056c5f30c5 SHA512 29958a2c702acc112b10f3fcb43fbff3b860c6d1f725c153af9a52dc20736755604f77bec37299dc88923a9e9b2ad73b994e9bc6f42f2757fe1819dd9873d710 WHIRLPOOL 46c771c63572d0d0301db5bde4734297df037654cbc71e5a8f93003fbf503399ec5026bc53fea3b3b10e346e2b59d24bdcd6d9139342354cdb1b8a6e240deaeb
-DIST dos2unix-7.3.5.tar.gz 662133 SHA256 a72caa2fb5cb739403315472fe522eda41aabab2a02ad6f5589639330af262e5 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58 WHIRLPOOL e1cda793c7e9a2b0f0000c61f5c4b9a48db37d41020af14e253b838768e81b0e94ea7a0666be712f79f89b05e5a6f72a1bf8516a01822f5da39062cc0bedf01f
+DIST dos2unix-7.3.4.tar.gz 640991 BLAKE2B 143ba62d859105147a0095732dd83f76cfe6a0e2ebcdd6753d8ea3ce47dcbb8372c0006da8be4c4e4efc2af93ba365a4a8d8bc8d451cc562944cec0251e523fd SHA512 29958a2c702acc112b10f3fcb43fbff3b860c6d1f725c153af9a52dc20736755604f77bec37299dc88923a9e9b2ad73b994e9bc6f42f2757fe1819dd9873d710
+DIST dos2unix-7.3.5.tar.gz 662133 BLAKE2B e24f77d92fe0c5931f9ca762b79a1713b14cc39b7566f78d55c4fd58bb7d3c0de1f2a8add8ffd6c3fa26a6bae73c412572fc71701e26b7b52f15b51b0de0d294 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58
 DIST dos2unix-7.4.0.tar.gz 710339 SHA256 bac765abdbd95cdd87a71989d4382c32cf3cbfeee2153f0086cb9cf18261048a SHA512 41be6b0c747f4a8e316eccecd468c8250aa6791962485569eb9496def60818ae434d619b5cfb5f80f15f8d17800314f5aefe229dc5d37faaa34e1270575175e9 WHIRLPOOL 89f093ff96aadbe64f5fb448d2be337464a0059cee3009cd513dbd0315b486c012efe53273467774dc9f884dfe5b1a4ee65903b94c2c5dd8c062ed3e41eed94a
 EBUILD dos2unix-7.3.4.ebuild 2026 BLAKE2B 4a38cbc0ce58d756615ecc1fdb1c699f81bef3219eb8716e4e72fbfe969b4e9aeaec1cd8ed445acf6ce215af1db523baa6dc0c29957aa4c5d77a87e71efd5618 SHA512 5e251e9ff961e07e91fef0c462d32f4e3b0ad7b7cfbb38a35b11c9a784b79256a4a4073a55adc4e96ff67fc896f85f2d007662cef8cfb09061709a02ddb4d760
-EBUILD dos2unix-7.3.5.ebuild 2038 BLAKE2B 0692e302912a35f318c94494f493fc1b866b4e5917f0184c68690dd20e423e8c154fe1053b50b2f9a7a92cd207a4779426ca8afeef9a2c28ec2c0514f9440de6 SHA512 70aac16e854bd20d886dea1bf6b7d935e27540cb23a4088b953f67864a2bf50e6b522fe4e07ab6ebaaa0a047b43fa26827a3040fefc801f72900bbdb8fdd8531
+EBUILD dos2unix-7.3.5.ebuild 2037 BLAKE2B edfc091f5ae520b92c58aa58b5273a1748c07741a64ad37fa9b06458c257b2e394fd43c56ae46c562f40a8331c9360e486f7d1e27957bff1f6e0c783b4f5a0f8 SHA512 be9ba30896b2e246b978ec3184c593c85e06e3b223fcdce599874645477f35c4161a6a1261379dbed08db2556eb9c472f6a89959a636887cfdd51ff924377dbe
 EBUILD dos2unix-7.4.0.ebuild 2046 BLAKE2B b76c15a3753bcfe22324fd3caafd4e4a1286d6d96bc379a3e23854dcc9bb7bb1344e7661cbdcc846caa1e740bee2a428f88408dea8ea6298735d15e2d8ffbfc5 SHA512 27fc2bd3e3e43512d4ab571ca5ddfb4f6ba8e0940eb8bd65c9d90f0c602822334f5789f3a2101311006fb614708ca32396ae8c3d24b8b313aa9248c8cd76d350
 MISC metadata.xml 343 BLAKE2B c4023a36777a79352885528afd87e7709255ccf7f02d9ba28e29eb11f6c67c2775eeeec4f2db95b427b94859e70e7cd276984bca828eb872116e7ec33751c31c SHA512 12f79ed9fdd8df3c05110ea2a31123ca92a855cdf9287910802cb4e68c384764cc84c29929376426b23bfe9699574dbbdc2105d82c6e2701aa9fe67079d867f3
--- a/app-text/dos2unix/dos2unix-7.3.5.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3.5.ebuild
@ -15,7 +15,7 @@ SRC_URI="

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"

 RDEPEND="
--- a/app-text/krop/Manifest
+++ b/app-text/krop/Manifest
@ -1,5 +1,3 @@
-DIST krop-0.4.11.tar.gz 35450 SHA256 5dc069afdad722e030037f7cc54bfd8b4ff3990c5600947722303053d2519d0f SHA512 785ac432f7e906ebee167791751b164a0ec30087caef0916bcd95494d7db310949aa4e44569ddaa181daca9c5834b743d3fdc64183093a41e23bb58cbe0d6cae WHIRLPOOL 5c09ddfb50055dc5a5a27e3f21bff1d1a8d7759e60cd488c54538438f83d43cb8254bf4fe0c633a9d7852a27906f3049e5a15c1d6e6ca025d161ac6de7fee778
 DIST krop-0.4.13.tar.gz 36654 SHA256 46aad911c6c5d46201e5e8c21b85bcbf6f1d8f5d9889e96e7bcab2cb6dd26966 SHA512 2d2af25124b45108715eb90344a5683adbda4c788bd419360b641e9f47553fe143a40205a44af9b3e4db6df4148b3328547e774f24b5c7c0fd23c9206e8a14b2 WHIRLPOOL 5d1e39a16e9e985ba7a78f1384578ff7d2dfc818218d02bdae06d694a833c3839e8373ef02f56abdded053bdde2d9d0c433bb8f227d2163953c0a17d222e1c53
-EBUILD krop-0.4.11.ebuild 609 BLAKE2B a740a07ac30a2c7f3e2120f29eb9d54793b1b17705b0c50654f52a3e52face3cfd1d18d2acca69708bc8e2115cd31a10d708561e8d9aabc2b5adef0653966c2e SHA512 a0dd10fa9ede60ae319817da497cb5be4256e3fa2d6d98d1998f8f93fd88609ff31c80d8446d3757c501d338b48eb68008a63046667255a93583637010ec65b8
 EBUILD krop-0.4.13.ebuild 609 BLAKE2B a740a07ac30a2c7f3e2120f29eb9d54793b1b17705b0c50654f52a3e52face3cfd1d18d2acca69708bc8e2115cd31a10d708561e8d9aabc2b5adef0653966c2e SHA512 a0dd10fa9ede60ae319817da497cb5be4256e3fa2d6d98d1998f8f93fd88609ff31c80d8446d3757c501d338b48eb68008a63046667255a93583637010ec65b8
 MISC metadata.xml 333 BLAKE2B b62d23170b13a4d2375de72955c2708368a34435f022231b829b19b60c9f38a1546ec62887dae545691eb1df45998ab7810aa58df3b94729632991e49c4c098f SHA512 30ec13878bbe3b50c90f1849bbc5bf0f8dc05bf1b6a8f79695590f48c76618eef4666965b8130d1909db3c960a43d3149dba525017f342ce9635afc530b873f0
--- a/app-text/krop/krop-0.4.11.ebuild
+++ b/app-text/krop/krop-0.4.11.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="A tool to crop PDF files"
-HOMEPAGE="http://arminstraub.com/software/krop"
-SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
-	dev-python/PyPDF2[${PYTHON_USEDEP}]
-	dev-python/PyQt4[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-	domenu "${WORKDIR}/${P}/${PN}.desktop"
-}
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@ -19,16 +19,19 @@ AUX poppler-0.59.0-respect-cflags.patch 2749 BLAKE2B 130566eaa2a4c87001f7cd94c72
 AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c
 AUX poppler-0.60.1-respect-cflags.patch 2956 BLAKE2B cb773887a8288a8c55022c6338afa816a34e42ad65fe9bb645e82af12ca38c7c32ded29f8bd6a8c3ca9f503978653c9974b58159e226bec369ccfd345ecbee98 SHA512 905ba703b71f637946f5adae510034a47cdc6dadb987d3c50de12e6275b53cc7d3f91456a62b4af8ef096592fd19b611888c37c7867ec44cfd82d3b252a4ac43
 AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
+AUX poppler-0.62.0-openjpeg2.patch 599 BLAKE2B 6227946829d8b04d3c12505f5a9878d78f44925b405c2871c6b69a36b02ec8f411ff3cfe397870606be3d2af1cc5e14f23e42744810a095de8d3788092af3521 SHA512 35539dacc3e40b966c94ab73f3ae9228229472e3729f45844224d65ecc215480386e3e14cfb659a9de59277ca5928b81a9502cd48af91e7bb20e259bc5681170
 DIST poppler-0.57.0.tar.xz 1703300 BLAKE2B e4126dff2e0ee140fa4c5c30d5a57da5aff38d4c1f566e4ace22d3fe625949db3a662a8513881702cd5c5c302845998dd462048b5158abaf1d119650c997c84c SHA512 197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f
 DIST poppler-0.58.0.tar.xz 1710412 BLAKE2B ac2558503f86e8f0729d9ee5e4bc6c59dc9a4abca2e94b4e94b27b139dcb237b608af70b011b6f042a06d18ce83e32593f5b3d28876ee2606d7e63bc9230e51e SHA512 0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee
 DIST poppler-0.59.0.tar.xz 1712004 SHA256 a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 SHA512 23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e WHIRLPOOL 82ec203c17e2b2544cc0ac12d0b22bb051abf776114d17e1548f47d5e38ff289dee2e9c4b27dc16e3953b6f5b5ff0e0eeecfba73561dbc396ee0db7c5a4847e2
 DIST poppler-0.60.1.tar.xz 1432712 SHA256 19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c SHA512 db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc WHIRLPOOL fe1fe7a3f0c0bac57c7503ad183fe2e8e2f0378c4dedc0dadbc6dcfaeaf8044bf387256742a970af5ed9e2704e42c35e996957e765eeff1aca4bedcc427ae6a7
-DIST poppler-0.61.1.tar.xz 1433696 SHA256 1266096343f5163c1a585124e9a6d44474e1345de5cdfe55dc7b47357bcfcda9 SHA512 780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d WHIRLPOOL 9d41a9c2ae551f71a82cdae763a4d9c032977c1140fb89f619b912169f9c48c6b310bba38b0138de16c5af04cb46f0f58c57c60a15a648fefcd92cee8c8583df
+DIST poppler-0.61.1.tar.xz 1433696 BLAKE2B 6749466223d3bb0e891c6b26c7f1faa5c774dd47ac94c22474efe4a52af228aeb2abbb8ab268667acaa83fb41293246266124a111740df764eeedbe229fa70aa SHA512 780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d
+DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706
 EBUILD poppler-0.57.0-r1.ebuild 4350 BLAKE2B 6a2624bc539f1742206987224cd351f3eec5b4f7484a767c9065efec4f338189451f1fd242437d931a45ea088a474d1dc38e6506a422ba6da38a750b4de174ab SHA512 a1ceaedc5c6e48641e3f74f7f24cd93c62c0e2f34dcaf8016e1d572d93a5fe53ec5ff62215b8b9d7773cf1c1614f945852fecd61b0418a3e13d804c1e0b9f7fc
 EBUILD poppler-0.57.0.ebuild 3858 BLAKE2B c4e998308076d2458384d364e684e6cd73233b873e258e50ca907ddab0b63fb4baa840b6cba30efb57d32b39a3e342bf8f2f538e68320938facdfe8f12d36d74 SHA512 7ac898f6ae7e4535acd582966abf08ebad92d957257da548a0c330998d82a6f6e82b7e4990c6c333f2625f34b84ddc41a973af43e68da3d9d081c0243c3a21fe
 EBUILD poppler-0.58.0.ebuild 3866 BLAKE2B 6cc87db70c2d396a98ed240b96458be5172b8b5fdb70d5da903d89cc0611e9b9f683ddba219dc97c0c8eb4dd93ba0a1a43d81e7645348abcd6dd4e2dab5ba248 SHA512 bc922423d817ad927ec5c25ec8504c187fd88a634fe03cf7b92d9c75342db7c92f65a1d37dbb134876d73b3f5a6261adc87b31639f642bf634682472b2a85218
 EBUILD poppler-0.59.0.ebuild 3866 BLAKE2B ef874dc127c9802e730a6b9136029461091b0a0b44d1b2105264fe452483a39c76c9f899abadbb7489a2b3a1634898c3a26f6f527a0ff181b80c58b7469f65ce SHA512 c888b97b35099c864d93f34cadec29db3d705648ecb36ec0d21622dbc58e2851eb59a0e32edf86f695b167ec9d89e008aaf4cc2ddfa1e5d702b79f635d667a70
 EBUILD poppler-0.60.1.ebuild 3861 BLAKE2B fa45fb8b44eebdcfa1513923a86071766ee4e5864631e81127b87a81f3c47bb00ba88d1af4f1dcc1915b938b584d17c89544320a50d766033079a130645c18d3 SHA512 973c61d28678966e7e3282121d0edf27a94680710fafbe3eae8c8a20a2edad72621a4b1ed8831f22fb3c527d85b6f800edb9ec17847b252abdda6e33b88585bb
 EBUILD poppler-0.61.1.ebuild 3861 BLAKE2B 5c838ed916b99b742f9bf190542b65dbc66b0d28562b987c59d98aee4e11335a9b112ef02de4e6e5dd5de3da4807993d101c7b00458baf22199cea550e43f121 SHA512 d7af6d662e22060b2651625f99fb0245cfb5ab5fc4f575a79319c629fb7c29926119fccbfe967a5dfd5af9ad6e9ad797771777ef18a4226f0192acde51fa2787
-EBUILD poppler-9999.ebuild 3875 BLAKE2B 5e97bd3fdf70a68b3efde627e2789aaa0d5c2ef181722b793c330cc9579f848bd565e5097279786ce9785692123e0dd25a5f9986c63418eeb6cc7143e67913b9 SHA512 0605c6eef746d5851b21b4a9b6c7382bc3ddf3b0edc2725df608d34e00470dd92e7d7a79857915d4b990d2e8d11b37c2684b09ed8fa36ead918f6149b8473e59
+EBUILD poppler-0.62.0.ebuild 3720 BLAKE2B 3bc49036daf93925bd118ae1ca73141df014cbc54ee3f0252d56b1ca938020504cfc63dce090fdb0624ef488ecc02beb88f7fc832cff80e61b51715a2577831d SHA512 a522bca4b504bb620f925fe7f2678368c1d29ab4e9bf4f48712f116c3c43044d5611a1b36d002f5763450b5b19ea9b7795a0e437e9e7b1141ade7769e2ae701e
+EBUILD poppler-9999.ebuild 3734 BLAKE2B 03dffe9f799bb1e9924eb4bb9706600a4453eebc0227697fae0d57f18aab14a2661be568f7f2d7e69a7f3e8c3be437de666d2c040515ecad98f951adbe22e669 SHA512 7eda31a630f84514751c332beb309b7da58c5611bc09a6228a9d53ea625baf471ae7e39534b765a00fc624d39109c36a2331636f3de4717156346fb9a9680eff
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
--- a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch
+++ b/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch
@ -0,0 +1,14 @@
+Sadly the CMake side of openjpeg slotting in Gentoo is broken.
+To reliably find openjpeg:2 we need to use pkg-config.
+
+--- poppler-0.62.0/CMakeLists.txt
+++ poppler-0.62.0/CMakeLists.txt
+@@ -193,7 +193,7 @@
+ endif()
+ set(WITH_OPENJPEG FALSE)
+ if(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2")
+-  find_package(LIBOPENJPEG2)
+  pkg_check_modules(LIBOPENJPEG2 libopenjp2)
+   set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
+   if(NOT LIBOPENJPEG2_FOUND)
+     message(FATAL_ERROR "Install libopenjpeg2 before trying to build poppler. You can also decide to use the internal unmaintained JPX decoder or none at all.")
--- a/app-text/poppler/poppler-0.62.0.ebuild
+++ b/app-text/poppler/poppler-0.62.0.ebuild
@ -0,0 +1,139 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs xdg-utils
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/72"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( >=app-text/poppler-data-0.4.7 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+
+	if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then
+		# we need to up the C++ version, bug #622526
+		export CXX="$(tc-getCXX) -std=c++11"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DENABLE_LIBCURL="$(usex curl)"
+		-DENABLE_CPP="$(usex cxx)"
+		-DENABLE_UTILS="$(usex utils)"
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo="$(usex cairo)"
+		-DWITH_GObjectIntrospection="$(usex introspection)"
+		-DWITH_JPEG="$(usex jpeg)"
+		-DWITH_NSS3="$(usex nss)"
+		-DWITH_PNG="$(usex png)"
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF="$(usex tiff)"
+	)
+	if use jpeg; then
+		mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg)
+	else
+		mycmakeargs+=(-DENABLE_DCTDECODER=none)
+	fi
+	if use jpeg2k; then
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
+	else
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=none)
+	fi
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@ -19,7 +19,7 @@ DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="https://poppler.freedesktop.org/"

 LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"

 # No test data provided
 RESTRICT="test"
@ -39,10 +39,6 @@ COMMON_DEPEND="
 	lcms? ( media-libs/lcms:2 )
 	nss? ( >=dev-libs/nss-3.19:0 )
 	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@ -63,8 +59,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
 	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
 	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
-	"${FILESDIR}/${PN}-0.40-FindQt4.patch"
+	"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
 )

 src_prepare() {
@ -93,7 +88,6 @@ src_configure() {
 	xdg_environment_reset
 	local mycmakeargs=(
 		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
 		-DBUILD_QT5_TESTS=OFF
 		-DBUILD_CPP_TESTS=OFF
 		-DENABLE_SPLASH=ON
@ -111,7 +105,6 @@ src_configure() {
 		-DWITH_JPEG="$(usex jpeg)"
 		-DWITH_NSS3="$(usex nss)"
 		-DWITH_PNG="$(usex png)"
-		-DWITH_Qt4="$(usex qt4)"
 		$(cmake-utils_use_find_package qt5 Qt5Core)
 		-DWITH_TIFF="$(usex tiff)"
 	)
--- a/app-text/tidy-html5/Manifest
+++ b/app-text/tidy-html5/Manifest
@ -1,3 +1,3 @@
-DIST tidy-html5-5.4.0.zip 573217 SHA256 aa9d611cdee60ef0d20941f6c5f09240189e3a90e4ef8994b15bf561ce3ed691 SHA512 788646c0c15a1be58695469977c340cbe7d37fada63faea34b67c1d7ffe6074ed2b6dcd6cc946a0ae99cd5319c9a8c5ffb81958f82b6097a35a3215bc1776fa8 WHIRLPOOL f081b17b22feb05c436756dea7e55cdd98608bc99d085db0121e0fdb297761dc7a87b4793586cdaf841bcc4a6bd1e08a566620030702482bd1ecce7dcdd94c86
-EBUILD tidy-html5-5.4.0.ebuild 526 BLAKE2B 6723e361038f98ef0fad63832c29f029ad22584750fc0f83a1dbf55c384b1cb8dda95de3ab8919e8058151f6b7330d0266f34437fb1579fa378e5b6ad8969197 SHA512 44a7e56d59986d4adb41dd03e56b0247c1b0e79152bbb9dc361e54c64abd6da2615a5b4c51b02ceb348fd0e853469f294996e894c389093185d6439efdbe7a59
+DIST tidy-html5-5.6.0.tar.gz 665438 BLAKE2B 3e362c8a22a5de827ec14110bad08985ff326c061043cd3cb0ffefd6b3af9a178197fca6a97bbb42b94760e530ec44646f13f6429736f7989effe52515580f21 SHA512 179088a6dbd29bb0e4f0219222f755b186145495f7414f6d0e178803ab67140391283d35352d946f9790c6b1b5b462ee6e24f1cc84f19391cb9b65e73979ffd1
+EBUILD tidy-html5-5.6.0.ebuild 532 BLAKE2B 7db541ebf60f822376913b7664efa74143e0819ec4a3975a5d1dd096185edefbc4673cae58f903739e68e1a5447d1b1c6d14e92d34addf40ae096690da6a7b87 SHA512 32744326634b48af283bfcda94ecf9a96c9d4a8780afa975d1c2996ebc5d0e267eb7d0439dbdba6cdafcd472acaf5f7d3862cb692fb081e09a7981ebeea33c1e
 MISC metadata.xml 333 BLAKE2B 92aabf92af24245465d0e5b1f99faabf41cdb71fffd31b7fb1e8268c5d91977b44d3998ede7789f280031c80d70deb726ed201b896007d63fd0710ffbf8b120e SHA512 aedfa31a9188be8d3ad9ea8b278acf1b3e90f9b0c91dd63b00c19a90c6a74d16ee57d80810f39392564fbc1b782b35b6231a9b453f91e765296e5ec45d5c087b
--- a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
+++ b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
@ -7,7 +7,7 @@ inherit cmake-utils

 DESCRIPTION="Tidy the layout and correct errors in HTML, HTML5 and XML documents"
 HOMEPAGE="http://www.html-tidy.org/"
-SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
--- a/app-vim/html5/Manifest
+++ b/app-vim/html5/Manifest
@ -1,3 +0,0 @@
-DIST html5-0.27.zip 30471 SHA256 56491f0ef69712267f39e85aa8686fdfd927f2473f36fba7467524abb3406b52 SHA512 94cc7ea1a082d232b85ca4b0887240a550f3a0381bebae5b8e06237257453f05f954e5e61a3d52437a9f27edfa05cb82e382a5796a7f02aedace2f226ab3f322 WHIRLPOOL f2dda6480ff52253771671e6834b2f938699cd5de01ddf08beeadb2129b0248041ee258bef0ae7d902cb28d23c758917c53a2dcd3dd0501232908559636066c5
-EBUILD html5-0.27.ebuild 478 BLAKE2B 33914b5b7d3213bd33f0b82deeab5d7184aef1e360ad2078b28e1d1896491f598212b7b1d26b32bc28e9b819cf6cb44a6b650154cbb1a044ac827b693d5562d2 SHA512 d721ad5a3bc7d77581ee7cd9631d5ed22254f77afdef0b7a7636ad059093a7747716bdc355be5a56a79a213aa7eb88451f35e713f41a6b2c342e2c831dea80fc
-MISC metadata.xml 425 BLAKE2B 91d7209d19d5f9e7ef5b4561bf9fdab7ed6598bf4ba5bf7b935e36d3bb10d4287d0bda7098b0134ac7473bb6ba5862e4a144b6ae6a45cbd15db5f35a5086963d SHA512 479faa9e818287fb3bf7142f5d0bc61cc04fbf3d48b67072d2c03245c482fb07cb63f89b73498f9049c11d4dc72a97fe8c4096915da9e73cdc245cbac99ab7a9
--- a/app-vim/html5/html5-0.27.ebuild
+++ b/app-vim/html5/html5-0.27.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: HTML5/SVG omnicomplete function, indent and syntax for Vim"
-HOMEPAGE="https://github.com/othree/html5.vim"
-SRC_URI="https://github.com/othree/${PN}.vim/archive/${PV}.zip -> ${P}.zip"
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-arch/unzip"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}.vim-${PV}"
-
-src_compile() { :; }
--- a/app-vim/html5/metadata.xml
+++ b/app-vim/html5/metadata.xml
@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>vim@gentoo.org</email>
-    <name>Gentoo Vim Project</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>monsieurp@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">othree/html5.vim</remote-id>
-  </upstream>
-</pkgmetadata>
--- a/app-vim/lightline/Manifest
+++ b/app-vim/lightline/Manifest
@ -1,2 +1,2 @@
-EBUILD lightline-9999.ebuild 547 BLAKE2B 4a58e5f4249d15188a3b8d5ee14b6965470ad9424af2afc2a617d6e5f1bcd255353c1069f6e3486c4668605b7c495e88ac81accd87bd54404d28ea12fdf30057 SHA512 66111e246aa0b2ca377e8d327c73ac039d6b54c1b35002d2fc53835c7fd8d4d0d581d2e5d76f911f116da48cca19ecbc7d2a0adaea24e45d6fe225c4723aba01
+EBUILD lightline-9999.ebuild 543 BLAKE2B 15bb8ad6c3ebbd1e89eb6357ba594045f94a0776eac486f415df8b529614856a0785d84d235685ec4c7f0d854e92330272c31802a10b949d666d14a7147421ac SHA512 f3cec9b22a25d7bf57aa8e42c4805530ad2988d9ad328dfcb7f017c1e0e54eb10c9d499f1a6cfd840b13c78a23c3f49d0af0870dc1919f4d49a61a8bf1deb6f6
 MISC metadata.xml 430 BLAKE2B 62d2f51b8599739f3b15b459084904ee4bd2a9736bbba7a093779aedc495586629f39f2f7511688f1f0898f27eb023acecf29ed921f56b70be921174f9bb17cc SHA512 b6fcb4818bfab07af559ff67912a956bffa0908ce29a91913088b86b7bea38e023ca1d407cacb30e48598e6d5fb5b851b72196eab5fbe7aa78362b976da535d9
--- a/app-vim/lightline/lightline-9999.ebuild
+++ b/app-vim/lightline/lightline-9999.ebuild
@ -15,7 +15,7 @@ fi

 DESCRIPTION="vim plugin: A light and configurable statusline/tabline"
 HOMEPAGE="https://github.com/itchyny/lightline.vim/"
-LICENSE="vim.org"
+LICENSE="MIT"
 VIM_PLUGIN_HELPFILES="${PN}"

 src_compile() { :; }
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
--- a/dev-ada/gnatcoll/Manifest
+++ b/dev-ada/gnatcoll/Manifest
@ -2,6 +2,6 @@ AUX gnatcoll-2016-gentoo.patch 14137 BLAKE2B 9e3c7086a4ecce79dbb7d2c21f5d97b46bf
 AUX gnatcoll-2017-gentoo.patch 10577 BLAKE2B 02d129052b0b10429ce8e003b0a0759a547884f92d67b0018170f8d2e8719cf22da1f277f9568673006e8f7abdb4759ec37626e3b4260d343f5560e479f0c729 SHA512 bf61075b9ce327b37d01f36d8fcb38f6f2e197167abb02a1dee9a96d456a710c986ed079a40e07edceb280281f8c8465315f09e5a0e3b880f3db44371ae3efef
 DIST gnatcoll-gpl-2016-src.tar.gz 5687584 BLAKE2B 0ff5489f3e02ceeb44292f0d13907959884a55ec8f00fcadb21ee4e8a07f863a3bae3c7ae18d3fc669895a76b5f8f495699d31af71940a5abd32b156ad5fe247 SHA512 8cf06e7c5d58d3b159855534791e7969882e04856ba9d03982a63dcfc630f5b5910c6cad57fec9b00c3d04008b0cb0a1fb238e349766348fa4548868238ede8a
 DIST gnatcoll-gpl-2017-src.tar.gz 5785988 BLAKE2B 828aff797f7d992bf3f5dda7f8ce8a79e97ecd98253a657fb6e79a2fd08aac97e19cb421f47010f8c1f26442a013b9126ab3a95353d9ce0f29d071601e9dfe2f SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363
-EBUILD gnatcoll-2016.ebuild 2958 BLAKE2B 081478374475a8038bf27b6aa82293970f7b0971807d4a1938bbcee5cc97d77b89a180db3a10ab4b0ce19bf91c36bf9ca73afbdd2a8017fd97c857e21329cb2f SHA512 6153da56e4e3d084b0dcee220080eb94e529df8defffdf1e7ebc19c5f5b1d0b452ee7fbb0a3220fc7fcf7eb378079289581d2090e0ee4fa925dcfc98cc7a53bc
-EBUILD gnatcoll-2017.ebuild 3076 BLAKE2B cb822a8e287931c30913c11bb47efe5498de69fffa8bac0979aa5df70d6e02d58a6b53944661497f90f574aa8dc60ccb8a46f2aea55d294700f8e813833c80a4 SHA512 9cf9159a8035a45386885138d4dac6b6adca6755d28a981ae92a149b27505532900f37a78ff8f6243242fbd89518dd6c35c964dfc4afe290d17a737316b6ab20
-MISC metadata.xml 1473 BLAKE2B dbcae7c0fcf02880fec66bc055d318274499b05714b8065a792f5ff56bd2e4dacc59b77bf7d909495c58f9d667d6703fe8e7594b13993eb0808167ca8bc60d21 SHA512 43c44b85940e585406e90e856f83af23a605d69c3e52af16b17e22eb49de170422a4981c366f19f7554c68a67d4633da117c19eceb8824fa33a7f8e21316ddaa
+EBUILD gnatcoll-2016.ebuild 2963 BLAKE2B 88c6806748d1ec08ef4a7767857ce4a2f691b609f17b4de376c9ec4edc25b7492ab65d96e94b4786dee5b6cf875561191491bb667b8b632a3801b53be8efe2b8 SHA512 9420452c92ec7a23214598e93b73bab38adad717c52f4350c1c5b3317d95592a1e6ea76ee3aad8063fcdf8eab15b8a99e516697f815e6f5da6845c5547c87150
+EBUILD gnatcoll-2017.ebuild 3081 BLAKE2B 9f713c2dab41e8e5a7830c6e4f1778ecda29c9e8954238aa666f5ee75d56e6da10312228c875538afceaed858902aceeceb346e782570937a1a7e8abb669d0f8 SHA512 ee90912564942e7d7903e89fceefba024508fce11453c45e684f460e8b06c732d9f85e6072ad33b2b14399faebaf721413cca10c4bd20dcbd9622180ce46eacf
+MISC metadata.xml 1412 BLAKE2B 363f55392d7b2859157ecde38b7d2ff918cbd52d4b24a327d80460ee0b1fbcb3f220e32df31b1dd7ce59258c267a2ca843be30b6eba3ffb6f4ccdc1d8360bc3c SHA512 607a522c91bf0e1d7f7bbbdb541d35108e4d77760f9dbb375abca7a361602d9157ed60d1b71fd51af652b718a763010be8daab44eb3a87aa7d47ca0f20e468fc
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5739942ac7a447658d00e1e7
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gmp +gnat_2016 gnat_2017 gtk iconv postgresql pygobject projects readline
+IUSE="gmp +gnat_2016 gnat_2017 gtk iconv postgres pygobject projects readline
 	+shared sqlite static syslog tools"

 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
@ -32,7 +32,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 		x11-libs/pango
 	)
 	pygobject? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
-	postgresql? ( dev-db/postgresql:* )
+	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
 		=dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static?]
@ -79,7 +79,7 @@ src_configure() {
 		--with-python \
 		$(use_with gmp) \
 		$(use_with iconv) \
-		$(use_with postgresql) \
+		$(use_with postgres postgresql) \
 		$(use_enable projects) \
 		$(use_enable pygobject) \
 		$(use_enable readline gpl) \
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed016
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gmp gnat_2016 +gnat_2017 gtk iconv postgresql pygobject projects readline
+IUSE="gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline
 	+shared sqlite static syslog tools"

 RDEPEND="dev-lang/gnat-gpl:6.3.0
@ -31,7 +31,7 @@ RDEPEND="dev-lang/gnat-gpl:6.3.0
 		x11-libs/pango
 	)
 	pygobject? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
-	postgresql? ( dev-db/postgresql:* )
+	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
 		>=dev-ada/libgpr-2017[gnat_2017,shared?,static]
@ -79,7 +79,7 @@ src_configure() {
 		--with-python \
 		$(use_with gmp) \
 		$(use_with iconv) \
-		$(use_with postgresql) \
+		$(use_with postgres postgresql) \
 		$(use_enable projects) \
 		$(use_enable pygobject) \
 		$(use_enable readline gpl) \
--- a/dev-ada/gnatcoll/metadata.xml
+++ b/dev-ada/gnatcoll/metadata.xml
@ -8,7 +8,6 @@
 	<use>
 		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
 		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="postgresql">Adds support for postgresql</flag>
 		<flag name="projects">Adds support for projects</flag>
 		<flag name="pygobject">Adds support for pygobject</flag>
 		<flag name="shared">Build shared library</flag>
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@ -1,5 +1,5 @@
 AUX gps-2017-gentoo.patch 11521 BLAKE2B d036d5b495cf3d08718347f5f2dba6c327cd97aec437b9b82df7808fc6de5ed24100cdfafec0a54bc162e64b17f9ffa868239582c69b57e218ae5efd5c8da4fa SHA512 950f9b27f50b18d30c29babcc212d52577b20ef17acae8ea4d5a1973b18ab6d01a2ba8d70b5693ea03ad0f50e06011aab6ee54f9399e1c58d61793f4f33794bd
 DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f
 DIST gps-gpl-2017-src.tar.gz 41216830 BLAKE2B 51ca89c38fa81888a9cf1831cf97f7e0ad72c444328a29063249a4fe72bbdc8357552d470872e9fbbeaf349ef0427b59fa41a0efb56200a07a9426343c731a57 SHA512 101ecef7f183de1da0c2b09d77f284a5e8c5ae56f34a897c8d471e79fe9a2832742608ff5251197ba2a52b5d9dfee6c6937fc22cd55f6d8f38359b070393cb64
-EBUILD gps-2017.ebuild 1629 BLAKE2B f03738019a930d22c4b7e23cc75b670de32a611a9c93fe770641df68461354a2ca8a4c9b34ba1cd7dc372527e2bda6e157fd7b02fe699d751d95edfb3827e74e SHA512 6b1a443e067c071c2116689e5f0f522d9ced9c4cb8de94a78129ef92593a1eb150ee3263e98841f496876139313b0b89159721b4be37a609eed0d89eadafa8b5
+EBUILD gps-2017.ebuild 1646 BLAKE2B 7d99c9dfc4bb0d98eb9d27b06e8b3c58930de167c163da43d239eb940e1b09778d592ceb4c4d5a10b03d41d29a8cce9c80c6a9f93fd3c8812df70125867b559a SHA512 c892e29d4dc2ee70c6ea85da4379cb4d11f8225ea2d8d7f352bb194cfe5c6d39a1ce9b3d46b4d6eb4d0b8c1a0852fceedd556119a1236da0f9a73b2d1437b314
 MISC metadata.xml 438 BLAKE2B 105849097d35788d4178db05bd3c9ab5b17eb94bee320d0dfc2914889a3764824f53950f674a4d1488b649a344729e03bb8eacda9896636a632b1288a0abf07c SHA512 2bf4e76aab6f461c501b34fee6fbf719715af34e2af827daee3a145de31b96b5568009a21daaa4269a19386b0be45dd419710e926505bda7763312c809864aae
--- a/dev-ada/gps/gps-2017.ebuild
+++ b/dev-ada/gps/gps-2017.ebuild
@ -34,6 +34,8 @@ RDEPEND="${PYTHON_DEPS}

 DEPEND="${RDEPEND}"

+RESTRICT="test"
+
 S="${WORKDIR}"/${MYP}

 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@ -2,6 +2,6 @@ AUX libgpr-2016-gentoo.patch 2822 BLAKE2B 759977ffe76fefc27c1aecdfe8a8647c78c8c3
 AUX libgpr-2017-gentoo.patch 2047 BLAKE2B 8c8befa6b392863163fac1c03acc63b96c075929fec2207fb654ab191bb6a8995e0c2576c218c59b90b1eb90d330ea7837d032427b9b9495bdd5e98709363070 SHA512 51b82725f94488c06e9a9aece82b9a3df78f7a763ed6ae6055335c0eae802207a698e186fb321261b4c45539c2fba076d08605dd5fc64508d71928210fe80f0c
 DIST gprbuild-gpl-2016-src.tar.gz 2142261 BLAKE2B 69948427eb6315b9fb2b84755192b53c035f74093dacb34852713083779bf8bd88dac6b38fe7685f6a40ecb2482f78b15a5221913df997847eee8b1359cf6c14 SHA512 6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
-EBUILD libgpr-2016.ebuild 1149 BLAKE2B d02f6784996799048d4982e242ca1f0b96c390420ec53ccb1e8f36749007fe4241935ae98781a276323d9252cbd5b2d59a660b3b6cdb06c3502c095e66649559 SHA512 9141c6fa2dc91758b309c2eb21fa845d98078fadddb9b26c40fdfcb5f453f31e7245a76cb05986dda476ca7777a1fcdb6c948d06c79aa1365bbbc427842bbaa3
-EBUILD libgpr-2017.ebuild 1530 BLAKE2B 557923a73032448e12d524d9be9e893f4d904d75720968c7899b6b114db428d53941e4c93d8e7e03987df2929603c29af38554339167fe7dff5bea0cb4468d42 SHA512 79ce27b7c90f4732458e018cec135462bafebf14d472493549ef20be606b1512a300ddfb30c91495b8104c8b79d7ed0218682108c894c9ec52f2b14b1896f12c
+EBUILD libgpr-2016.ebuild 1168 BLAKE2B dfb30003c3f2ff033c0748dd62c7b2236804050c9cae7e76a83cf2bc02b92bb447b28a9b0102e7399427cf89ead48bd17ed381f4afe5ad4c8aa015b5457f5cc6 SHA512 7b8eb381deb93b476d661e01b36a19314a2c75e811a38c6471a97c70ee3ab7305c90cb402ac9772c80063dda640893effef7d1d8b7a7b43992b061fada97d00c
+EBUILD libgpr-2017.ebuild 1549 BLAKE2B ef7ed848ecccd7cc7d53437c859ef066fa80aa3af7e0190a6cb47ae5595ade408f40e696ed159862e0d6073a67cfd8db8eefc3654c0a9747522101ef61fd8a59 SHA512 68f2ded303465eef392a550e540a58b7aca5ce8e82727cc4db30d1f99c7571942f5e8a8619c6ddb701c8bab7b2d4cf3fdf37bf2583c91a912e541e05fb641363
 MISC metadata.xml 1157 BLAKE2B 7a4bc1bbe6ebfb46595c86335b371dc07b7a3f45ab1dbb4cffe382ed8006dd83ba095702ef462580c272341f7ead36e08c6de27900667e4ee2610de4edb1dc76 SHA512 47a7793368b83f9f9101df74a87214ae6615c163a6ffbb24644b102b427ca8559f39f16075b6b5048b8dade368f540f2b8e9b19b376905996b0915c74faff580
--- a/dev-ada/libgpr/libgpr-2016.ebuild
+++ b/dev-ada/libgpr/libgpr-2016.ebuild
@ -7,7 +7,7 @@ inherit toolchain-funcs multiprocessing

 MYP=gprbuild-gpl-${PV}

-DESCRIPTION="Multi-Language Management"
+DESCRIPTION="Ada library to handle GPRbuild project files"
 HOMEPAGE="http://libre.adacore.com/"
 SRC_URI="http://mirrors.cdn.adacore.com/art/57399662c7a447658e0affa8
 		-> ${MYP}-src.tar.gz"
--- a/dev-ada/libgpr/libgpr-2017.ebuild
+++ b/dev-ada/libgpr/libgpr-2017.ebuild
@ -7,7 +7,7 @@ inherit toolchain-funcs multiprocessing

 MYP=gprbuild-gpl-${PV}

-DESCRIPTION="Multi-Language Management"
+DESCRIPTION="Ada library to handle GPRbuild project files"
 HOMEPAGE="http://libre.adacore.com/"
 SRC_URI="
 	http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@ -1,6 +1,7 @@
-AUX xmlada-2016-gentoo.patch 736 BLAKE2B 735fe5de39998f65777c4cdebd2390e9c3eb487d53a505faf8d2a1b083c71a439a5ef127e645b1aa23c9e90cedd82feb2f570d394aab308aed1432f46467a750 SHA512 23de23e5af65b02133730cdc30112e1f0585019aa3e6154b30b029f3d2f3bec74d7fe93549d5c505426eb2a13e6b820bafb78c02885dd70c4f3bf66b754171d4
+AUX xmlada-2016-gentoo.patch 1573 BLAKE2B a6c2d94f32fdea812777543eeef5403c6dcabd3314411a58cadcf0c877f3cf315c75e4147ec07be66ffa5d20a1b6672408aadc6c8dff5ececc1c891c4f1a1bb7 SHA512 c30789f6e5bfccbda41ac1742991dab5f7d4acf9fdac33247a68c47ae2c66f6451e918b005fe69af3f488c233a2a70b7eb791c5993d20c43f5d270e3a6693795
+AUX xmlada-2017-gentoo.patch 1133 BLAKE2B 6b15f8225c8d4094417f20b61261fc247a4c9290831265b15cf1a3f865d532c6e685cebf5c8cf635fc51ae0a44386428ee8b9300738a5fe0c2951e4a68cb7bb8 SHA512 47d383b18c6c46653c5369b691af47d8b7ea333d32d7ddcc5cb6831dea08dbfeec353ffa0e4de279baff4fedf911c39e28a6608529357ad70b9c1ce0a9a42b49
 DIST xmlada-gpl-2016-src.tar.gz 1440671 BLAKE2B 32998fbdb680f3a1ea7915f144c3039441d8608ded9fe2df99d9b5c9d13436a020c25a9773cced753ffa3ff89a918bbb1ef3ca310cbc58f583682deb7dcc9d09 SHA512 d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
-EBUILD xmlada-2016.ebuild 1237 BLAKE2B 0b53093c667a9d5f7b4f229a5a7d74403bbf39d836e0e05ee7a85f3140d1734b37a727096a90a652c8947771112044cdfb896c6a31d94d01a09ddc477dd029bb SHA512 1a30b3a57563657c760f3c1dca68c523aac805de9bdc0a07036d4376d0ceb1c68f6569a70205a3faa689b69b18537396f85cd2fe526fb14e728723940edbbc3d
-EBUILD xmlada-2017.ebuild 1481 BLAKE2B c26b9a4eaebfb75012a03f9df54555fdfd7b7d757c778fdf1e149937771cd5d4360a19c45cf5f80dea1de372dfc7c892ace4f1826b84fc2491c3823db23beede SHA512 49a749c0d45be451c55035dfccbbe2eba694a10146805b10a461b7941bec13f1706ebe42bba8caa70eb17337cae48bf2bcf5f70a9e42dd98a99d63b6e1c2f06d
+EBUILD xmlada-2016.ebuild 1300 BLAKE2B 85a44117b4e06011b98826db73e27170103c3dc0a4836dbbb4e52173e655470c57146c24235e3000f348b28117476ee9afe2ccd1b035afa695edd2e8517358b8 SHA512 ac3e75f8dfb7907865a1a72c4c33b9610899fa2d8f64b3b79bb3776b222cce3e86bcd2d30d28a6ec48608f64edd8940223aa46429ac5794ba50d4e483dc186a4
+EBUILD xmlada-2017.ebuild 1589 BLAKE2B 6ced473010522b1edd37d2bf9c16125a4cb6a54bfe006f35d18a3331ebf7acbf02a278b61359d4d75cb18b6eb7804858547f64937a2fa50ec86963cbef0a8bf0 SHA512 e9b59268de457144eaf7a06a738dfc3b5345977099d7bab0d00396ba28cafa4bfb615b6132bbdb34fc2335eb3c93087e86498f147a35d4e77f3dac8103ab4809
 MISC metadata.xml 1125 BLAKE2B 83c42db46eee7113a19c4cabb92e2f2b4607609e3ee4b624a5cf680c9a5d0b8394f31f9f99b973cd563b04a268aaab2f74f4bc2c1209179235f9f4814363087d SHA512 ab8a13a6e09513797895a7966adf026a21aa5f738853b039ec15d7091e32a8dd747c1c179ef92a24f2eb83f0a381c819f891bf35e6b4a90e1085aced8606f14d
--- a/dev-ada/xmlada/files/xmlada-2016-gentoo.patch
+++ b/dev-ada/xmlada/files/xmlada-2016-gentoo.patch
@ -1,6 +1,6 @@
 --- xmlada-2016-src/Makefile.in.old	2016-12-04 21:58:57.251338692 +0100
 +++ xmlada-2016-src/Makefile.in	2016-12-04 21:59:31.332755615 +0100
-@@ -49,13 +49,13 @@
+@@ -49,16 +49,17 @@
 endif
 
 static:
@ -17,3 +17,26 @@
 
 # Rebuild the tests (and not the XML/Ada code itself)
 test: force
+	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
+ 	${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} \
+ 		-XTESTS_ACTIVATED=Only xmlada.gpr
+ 
+--- xmlada-gpl-2016-src/tests/Makefile.old	2017-12-04 21:15:16.330459020 +0100
+++ xmlada-gpl-2016-src/tests/Makefile	2017-12-04 21:15:33.176156634 +0100
+@@ -1,8 +1,6 @@
+ TESTS= test_unicode \
+ 		 test_state \
+-		 test_xml \
+ 		 test_adacore_dom \
+-		 test_schema \
+ 		 test_date_time \
+ 		 test_numbers \
+ 		 test_adacore_schema \
+@@ -71,6 +71,7 @@
+ test_multiple_xsd:
+ 	@echo "multiple xsd"
+ 	@cd schema/multiple_xsd; \
+		GPR_PROJECT_PATH=../../../distrib:../../../input_sources:../../../dom:../../../sax:../../../schema:../../../unicode \
+ 		gprbuild -q -Pdefault.gpr; \
+ 		./validate > $(RESULTS)/multiple_xsd.out; \
+ 		cp $(RESULTS)/multiple_xsd.out $(RESULTS)/multiple_xsd.diff; \
--- a/dev-ada/xmlada/files/xmlada-2017-gentoo.patch
+++ b/dev-ada/xmlada/files/xmlada-2017-gentoo.patch
@ -0,0 +1,30 @@
+--- xmlada-gpl-2017-src/Makefile.in.old	2017-12-04 20:09:23.730805855 +0100
+++ xmlada-gpl-2017-src/Makefile.in	2017-12-04 20:09:51.586331155 +0100
+@@ -62,7 +62,8 @@
+ 
+ # Rebuild the tests (and not the XML/Ada code itself)
+ test: force
+	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
+ 	${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} \
+ 		-XTESTS_ACTIVATED=Only xmlada.gpr
+ 
+ # Run the tests. This requires an install of XML/Ada first
+--- xmlada-gpl-2017-src/tests/Makefile.old	2017-12-04 21:38:29.722818904 +0100
+++ xmlada-gpl-2017-src/tests/Makefile	2017-12-04 21:38:54.229382658 +0100
+@@ -1,8 +1,6 @@
+ TESTS= test_unicode \
+ 		 test_state \
+-		 test_xml \
+ 		 test_adacore_dom \
+-		 test_schema \
+ 		 test_date_time \
+ 		 test_numbers \
+ 		 test_adacore_schema \
+@@ -71,6 +71,7 @@
+ test_multiple_xsd:
+ 	@echo "multiple xsd"
+ 	@cd schema/multiple_xsd; \
+		GPR_PROJECT_PATH=../../../distrib:../../../input_sources:../../../dom:../../../sax:../../../schema:../../../unicode \
+ 		gprbuild -q -Pdefault.gpr; \
+ 		./validate > $(RESULTS)/multiple_xsd.out; \
+ 		cp $(RESULTS)/multiple_xsd.out $(RESULTS)/multiple_xsd.diff; \
--- a/dev-ada/xmlada/xmlada-2016.ebuild
+++ b/dev-ada/xmlada/xmlada-2016.ebuild
@ -40,6 +40,11 @@ src_compile () {
 	done
 }

+src_test() {
+	emake test
+	emake run_test | grep DIFF && die
+}
+
 src_install () {
 	for kind in shared static static-pic; do
 		if use ${kind}; then
--- a/dev-ada/xmlada/xmlada-2017.ebuild
+++ b/dev-ada/xmlada/xmlada-2017.ebuild
@ -26,6 +26,8 @@ DEPEND="${RDEPEND}

 S="${WORKDIR}"/${MYP}-src

+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
 src_configure () {
 	econf --prefix="${D}"/usr
 }
@ -45,6 +47,11 @@ src_compile () {
 	done
 }

+src_test() {
+	emake test
+	emake run_test | grep DIFF && die
+}
+
 src_install () {
 	for kind in shared static static-pic; do
 		if use ${kind}; then
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/cpp-hocon/Manifest
+++ b/dev-cpp/cpp-hocon/Manifest
@ -1,3 +1,3 @@
-DIST cpp-hocon-0.1.4.tar.gz 157988 SHA256 2274b99dc098122b6e3d2c8d23173d21893555190c5a008e5a9a7d84875c7275 SHA512 f5ee6c5e7eaa5139bb3c421fd8b7c0da337daec99dce7f426d567ced0036b7c49a396b1b9bdbaa8023cd776a5a942175082a4b30280d4211a0db51483324be42 WHIRLPOOL a9a4f677dc708d5097812ca407257c9f44168d36081d5a55d32d10862555fa89f213208b0e5c3e83900b1e8c7b313c4ba66e7684f9ba0b5c3b01f0a1ae8f1d6a
-EBUILD cpp-hocon-0.1.4.ebuild 979 BLAKE2B d416fb6a837464236f42966a234b71958f85fd50f922ecd33da4e41fdb945bea64f7db3719e677ffdb85484253413b55653d74595b3a61e427d7a49de0cf7a22 SHA512 152d672d209d47793c309de800d18b6bc063e984a8f3147d8d00162db7d71ff83c0656719e724527f652047229e2c0c9210556367566f61c387073f4d6e1fa7e
+DIST cpp-hocon-0.1.4.tar.gz 157988 BLAKE2B 3b9e3ec2c386446a2c1d078867b03fbfe2adc8160877288597c648eaf4af6e34f09b673780e6fb81ce9bd1724c1e3d6efc1102985d344a4d1d7bb48b15916190 SHA512 f5ee6c5e7eaa5139bb3c421fd8b7c0da337daec99dce7f426d567ced0036b7c49a396b1b9bdbaa8023cd776a5a942175082a4b30280d4211a0db51483324be42
+EBUILD cpp-hocon-0.1.4.ebuild 985 BLAKE2B 59a9e68eef069e85b0393aeab2ad952e26579f703b695091382d0f517fadd7dab7211a457f100ebf4bc8b015e6fe3be36943ac2a0c4be7e748842340488c1698 SHA512 81fd7e4950b092c77eeb6198edbe4a0feb82291ccfc461c7495199da5a9e00fa257540819cb95f5358e516dfca968e1a636f193f38849bc0d387320e8ecf7ec4
 MISC metadata.xml 433 BLAKE2B 5b3b4e23af7ff914d5b4a3ba6425f469273ef8fb513766a07b3d66110688df34dfd68b43812905bea98cc39c2b3df06b5614bf504a78f4c2ce0c6d56bfe483a3 SHA512 7f890317b6cdfc71563359d575446ccf489d6ffb79ba541566fa747e4a0c1e077ec7f7c5263d96035bbfe77f6631cfb9000f715c348ed543492b7dc4cc7cd305
--- a/dev-cpp/cpp-hocon/cpp-hocon-0.1.4.ebuild
+++ b/dev-cpp/cpp-hocon/cpp-hocon-0.1.4.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm hppa ~ppc ppc64 sparc x86"
 IUSE="debug test"

 DEPEND="
--- a/Show more
+++ b/Show more