Sync with portage [Tue Jun 13 12:15:12 MSK 2017].

app-accessibility/at-spi2-atk/at-spi2-atk-2.22.0.ebuild

@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 COMMON_DEPEND="

app-accessibility/at-spi2-core/at-spi2-core-2.22.1.ebuild

@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="X +introspection"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 
 # x11-libs/libSM is needed until upstream #719808 is solved either
 # making the dep unneeded or fixing their configure

app-admin/ansible/Manifest

@@ -1 +1,2 @@
+DIST ansible-2.3.1.0-pycryptodome.patch 32463 SHA256 fe464db648783871618ef26b9b1d8ffa7c090a558caed30857953eec65ef6a65 SHA512 0ed750d5d27378b942808a7db9be968cfe281a2985d40a13476763572b5aa95a4e336eda9b91b4fda4e20320214d7dabc38a69c18baf404696cb4bdb70c395cf WHIRLPOOL 9b2f754a31926c54bed9416d273d9e6b790b7652721c0f7de2abc8ccb25354925b64fbf98a02ab42f89fe9bc58c495bec54e12f8a541599b1d409914af6628af
 DIST ansible-2.3.1.0.tar.gz 4263357 SHA256 cd4b8f53720fcd0c351156b840fdd15ecfbec22c951b5406ec503de49d40b9f5 SHA512 7b4b33c56a15c41d756f095944d7a0dbf894557350879430df21061b717b9574aae624a276bf7e1a13d043b718aeaccac1ce510a3cb085983311ddf06fa832bc WHIRLPOOL 5552ff64e8cac722a705bd1e72465c8bfe583a1c5efc587ca141b34eaa35d2af0ea2e1084a072ecb7dbb28d59d7f56e47c4c73f9e3e0f7f2451ef4e7134ad1af

app-admin/ansible/ansible-2.3.1.0.ebuild

@@ -9,7 +9,8 @@ inherit distutils-r1 eutils versionator
 
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="http://ansible.com/"
-SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz"
+SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/ansible/ansible-2.3.1.0-pycryptodome.patch"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -47,7 +48,7 @@ DEPEND="
 # not included in release tarball
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${P}-pycryptodome.patch" )
+PATCHES=( "${DISTDIR}/${P}-pycryptodome.patch" )
 
 python_test() {
 	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die

app-admin/ansible/files/CVE-2017-7481.patch

@@ -1,135 +0,0 @@
-From ed56f51f185a1ffd7ea57130d260098686fcc7c2 Mon Sep 17 00:00:00 2001
-From: James Cammarata <jimi@sngx.net>
-Date: Mon, 8 May 2017 10:37:10 -0500
-Subject: [PATCH] Fixing security issue with lookup returns not tainting the
- jinja2 environment
-
-CVE-2017-7481
-
-Lookup returns wrap the result in unsafe, however when used through the
-standard templar engine, this does not result in the jinja2 environment being
-marked as unsafe as a whole. This means the lookup result looses the unsafe
-protection and may become simple unicode strings, which can result in bad
-things being re-templated.
-
-This also adds a global lookup param and cfg options for lookups to allow
-unsafe returns, so users can force the previous (insecure) behavior.
----
- docs/docsite/rst/intro_configuration.rst | 14 ++++++++++++++
- examples/ansible.cfg                     |  8 +++++++-
- lib/ansible/constants.py                 |  1 +
- lib/ansible/template/__init__.py         | 11 +++++++++--
- 4 files changed, 31 insertions(+), 3 deletions(-)
-
-diff --git a/docs/docsite/rst/intro_configuration.rst b/docs/docsite/rst/intro_configuration.rst
-index 3647e22..259e107 100644
---- a/docs/docsite/rst/intro_configuration.rst
-+++ b/docs/docsite/rst/intro_configuration.rst
-@@ -86,6 +86,20 @@ different locations::
- Most users will not need to use this feature.  See :doc:`dev_guide/developing_plugins` for more details.
- 
- 
-+.. _allow_unsafe_lookups:
-+
-+allow_unsafe_lookups
-+====================
-+
-+.. versionadded:: 2.2.3, 2.3.1
-+
-+When enabled, this option allows lookup plugins (whether used in variables as `{{lookup('foo')}}` or as a loop as `with_foo`) to return data that is **not** marked "unsafe". By default, such data is marked as unsafe to prevent the templating engine from evaluating any jinja2 templating language, as this could represent a security risk.
-+
-+This option is provided to allow for backwards-compatibility, however users should first consider adding `allow_unsafe=True` to any lookups which may be expected to contain data which may be run through the templating engine later. For example::
-+
-+    {{lookup('pipe', '/path/to/some/command', allow_unsafe=True)}}
-+
-+
- .. _allow_world_readable_tmpfiles:
- 
- allow_world_readable_tmpfiles
-diff --git a/examples/ansible.cfg b/examples/ansible.cfg
-index e283064..77ba5d2 100644
---- a/examples/ansible.cfg
-+++ b/examples/ansible.cfg
-@@ -282,7 +282,7 @@
- # Controls showing custom stats at the end, off by default
- #show_custom_stats = True
- 
--# Controlls which files to ignore when using a directory as inventory with
-+# Controls which files to ignore when using a directory as inventory with
- # possibly multiple sources (both static and dynamic)
- #inventory_ignore_extensions = ~, .orig, .bak, .ini, .cfg, .retry, .pyc, .pyo
- 
-@@ -294,6 +294,12 @@
- # Setting to True keeps them under the ansible_facts namespace, the default is False
- #restrict_facts_namespace: True
- 
-+# When enabled, this option allows lookups (via variables like {{lookup('foo')}} or when used as
-+# a loop with `with_foo`) to return data that is not marked "unsafe". This means the data may contain
-+# jinja2 templating language which will be run through the templating engine.
-+# ENABLING THIS COULD BE A SECURITY RISK
-+#allow_unsafe_lookups = False
-+
- [privilege_escalation]
- #become=True
- #become_method=sudo
-diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py
-index da45037..40d1038 100644
---- a/lib/ansible/constants.py
-+++ b/lib/ansible/constants.py
-@@ -236,6 +236,7 @@ def load_config_file():
-                                        ["~", ".orig", ".bak", ".ini", ".cfg", ".retry", ".pyc", ".pyo"], value_type='list')
- DEFAULT_VAR_COMPRESSION_LEVEL = get_config(p, DEFAULTS, 'var_compression_level', 'ANSIBLE_VAR_COMPRESSION_LEVEL', 0, value_type='integer')
- DEFAULT_INTERNAL_POLL_INTERVAL = get_config(p, DEFAULTS, 'internal_poll_interval', None, 0.001, value_type='float')
-+DEFAULT_ALLOW_UNSAFE_LOOKUPS = get_config(p, DEFAULTS, 'allow_unsafe_lookups', None, False, value_type='boolean')
- ERROR_ON_MISSING_HANDLER  = get_config(p, DEFAULTS, 'error_on_missing_handler', 'ANSIBLE_ERROR_ON_MISSING_HANDLER', True, value_type='boolean')
- SHOW_CUSTOM_STATS = get_config(p, DEFAULTS, 'show_custom_stats', 'ANSIBLE_SHOW_CUSTOM_STATS', False, value_type='boolean')
- NAMESPACE_FACTS = get_config(p, DEFAULTS, 'restrict_facts_namespace', 'ANSIBLE_RESTRICT_FACTS', False, value_type='boolean')
-diff --git a/lib/ansible/template/__init__.py b/lib/ansible/template/__init__.py
-index 5d551d7..49de8aa 100644
---- a/lib/ansible/template/__init__.py
-+++ b/lib/ansible/template/__init__.py
-@@ -252,6 +252,9 @@ def __init__(self, loader, shared_loader_obj=None, variables=dict()):
-             loader=FileSystemLoader(self._basedir),
-         )
- 
-+        # the current rendering context under which the templar class is working
-+        self.cur_context = None
-+
-         self.SINGLE_VAR = re.compile(r"^%s\s*(\w*)\s*%s$" % (self.environment.variable_start_string, self.environment.variable_end_string))
- 
-         self._clean_regex   = re.compile(r'(?:%s|%s|%s|%s)' % (
-@@ -574,6 +577,7 @@ def _lookup(self, name, *args, **kwargs):
- 
-         if instance is not None:
-             wantlist = kwargs.pop('wantlist', False)
-+            allow_unsafe = kwargs.pop('allow_unsafe', C.DEFAULT_ALLOW_UNSAFE_LOOKUPS)
- 
-             from ansible.utils.listify import listify_lookup_plugin_terms
-             loop_terms = listify_lookup_plugin_terms(terms=args, templar=self, loader=self._loader, fail_on_undefined=True, convert_bare=False)
-@@ -510,7 +510,7 @@
-                     raise AnsibleError("An unhandled exception occurred while running the lookup plugin '%s'. Error was a %s, original message: %s" % (name, type(e), e))
-                 ran = None
- 
--            if ran:
-+            if ran and not allow_unsafe:
-                 from ansible.vars.unsafe_proxy import UnsafeProxy, wrap_var
-                 if wantlist:
-                     ran = wrap_var(ran)
-@@ -600,6 +605,8 @@ def _lookup(self, name, *args, **kwargs):
-                         else:
-                             ran = wrap_var(ran)
- 
-+                if self.cur_context:
-+                    self.cur_context.unsafe = True
-             return ran
-         else:
-             raise AnsibleError("lookup plugin (%s) not found" % name)
-@@ -656,7 +663,7 @@ def do_template(self, data, preserve_trailing_newlines=True, escape_backslashes=
- 
-             jvars = AnsibleJ2Vars(self, t.globals)
- 
--            new_context = t.new_context(jvars, shared=True)
-+            self.cur_context = new_context = t.new_context(jvars, shared=True)
-             rf = t.root_render_func(new_context)
- 
-             try:

app-admin/ansible/files/README.gentoo

@@ -1,8 +0,0 @@
-You can define parameters through shell variables OR use config files
-Examples of config files installed in /usr/share/ansible/examples
-You have to create ansible hosts file!
-More info on http://docs.ansible.com/intro_getting_started.html
-
-Some optional dependencies, you might want to install:
-dev-python/keyczar - needed to support accelerated mode
-dev-python/paramiko - alternative SSH backend"

app-admin/ansible/files/ansible-2.3.1.0-pycryptodome.patch

@@ -1,905 +0,0 @@
-diff -uNr ansible-2.3.0.0.ORIG/lib/ansible/executor/process/worker.py ansible-2.3.0.0/lib/ansible/executor/process/worker.py
---- ansible-2.3.0.0.ORIG/lib/ansible/executor/process/worker.py	2017-05-23 14:23:12.313595450 +0100
-+++ ansible-2.3.0.0/lib/ansible/executor/process/worker.py	2017-05-23 14:24:22.116598926 +0100
-@@ -26,14 +26,6 @@
- 
- from jinja2.exceptions import TemplateNotFound
- 
--# TODO: not needed if we use the cryptography library with its default RNG
--# engine
--HAS_ATFORK=True
--try:
--    from Crypto.Random import atfork
--except ImportError:
--    HAS_ATFORK=False
--
- from ansible.errors import AnsibleConnectionFailure
- from ansible.executor.task_executor import TaskExecutor
- from ansible.executor.task_result import TaskResult
-@@ -95,9 +87,6 @@
-         #pr = cProfile.Profile()
-         #pr.enable()
- 
--        if HAS_ATFORK:
--            atfork()
--
-         try:
-             # execute the task and build a TaskResult from the result
-             display.debug("running TaskExecutor() for %s/%s" % (self._host, self._task))
-diff -uNr ansible-2.3.0.0.ORIG/lib/ansible/modules/cloud/amazon/ec2_win_password.py ansible-2.3.0.0/lib/ansible/modules/cloud/amazon/ec2_win_password.py
---- ansible-2.3.0.0.ORIG/lib/ansible/modules/cloud/amazon/ec2_win_password.py	2017-05-23 14:23:12.299595449 +0100
-+++ ansible-2.3.0.0/lib/ansible/modules/cloud/amazon/ec2_win_password.py	2017-05-23 14:29:51.003615305 +0100
-@@ -93,9 +93,10 @@
- '''
- 
- from base64 import b64decode
--from Crypto.Cipher import PKCS1_v1_5
--from Crypto.PublicKey import RSA
- import datetime
-+from cryptography.hazmat.backends import default_backend
-+from cryptography.hazmat.primitives.asymmetric.padding import PKCS1v15
-+from cryptography.hazmat.primitives.serialization import load_pem_private_key
- 
- try:
-     import boto.ec2
-@@ -103,6 +104,9 @@
- except ImportError:
-     HAS_BOTO = False
- 
-+BACKEND = default_backend()
-+
-+
- def main():
-     argument_spec = ec2_argument_spec()
-     argument_spec.update(dict(
-@@ -151,15 +155,12 @@
-     else:
-         try:
-             with f:
--                key = RSA.importKey(f.read(), key_passphrase)
--        except (ValueError, IndexError, TypeError) as e:
-+                key = load_pem_private_key(f.read(), key_passphrase, BACKEND)
-+        except (ValueError, TypeError) as e:
-             module.fail_json(msg = "unable to parse key file")
- 
--    cipher = PKCS1_v1_5.new(key)
--    sentinel = 'password decryption failed!!!'
--
-     try:
--        decrypted = cipher.decrypt(decoded, sentinel)
-+	decrypted = key.decrypt(decoded, PKCS1v15())
-     except ValueError as e:
-         decrypted = None
- 
-diff -uNr ansible-2.3.0.0.ORIG/lib/ansible/parsing/vault/__init__.py ansible-2.3.0.0/lib/ansible/parsing/vault/__init__.py
---- ansible-2.3.0.0.ORIG/lib/ansible/parsing/vault/__init__.py	2017-05-23 14:23:12.311595449 +0100
-+++ ansible-2.3.0.0/lib/ansible/parsing/vault/__init__.py	2017-05-23 14:31:23.267619901 +0100
-@@ -25,7 +25,6 @@
- import sys
- import tempfile
- import random
--from io import BytesIO
- from subprocess import call
- from hashlib import sha256
- from binascii import hexlify
-@@ -35,32 +34,14 @@
- # Note: Only used for loading obsolete VaultAES files.  All files are written
- # using the newer VaultAES256 which does not require md5
- 
--try:
--    from Crypto.Hash import SHA256, HMAC
--    HAS_HASH = True
--except ImportError:
--    HAS_HASH = False
--
--# Counter import fails for 2.0.1, requires >= 2.6.1 from pip
--try:
--    from Crypto.Util import Counter
--    HAS_COUNTER = True
--except ImportError:
--    HAS_COUNTER = False
--
--# KDF import fails for 2.0.1, requires >= 2.6.1 from pip
--try:
--    from Crypto.Protocol.KDF import PBKDF2
--    HAS_PBKDF2 = True
--except ImportError:
--    HAS_PBKDF2 = False
--
--# AES IMPORTS
--try:
--    from Crypto.Cipher import AES as AES
--    HAS_AES = True
--except ImportError:
--    HAS_AES = False
-+from cryptography.exceptions import InvalidSignature
-+from cryptography.hazmat.backends import default_backend
-+from cryptography.hazmat.primitives import hashes, padding
-+from cryptography.hazmat.primitives.hmac import HMAC
-+from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
-+from cryptography.hazmat.primitives.ciphers import (
-+    Cipher as C_Cipher, algorithms, modes
-+)
- 
- from ansible.compat.six import PY3, binary_type
- from ansible.compat.six.moves import zip
-@@ -73,26 +54,8 @@
-     from ansible.utils.display import Display
-     display = Display()
- 
--# OpenSSL pbkdf2_hmac
--HAS_PBKDF2HMAC = False
--try:
--    from cryptography.hazmat.primitives.hashes import SHA256 as c_SHA256
--    from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
--    from cryptography.hazmat.backends import default_backend
--    HAS_PBKDF2HMAC = True
--except ImportError:
--    pass
--except Exception as e:
--    display.vvvv("Optional dependency 'cryptography' raised an exception, falling back to 'Crypto'.")
--    import traceback
--    display.vvvv("Traceback from import of cryptography was {0}".format(traceback.format_exc()))
--
--HAS_ANY_PBKDF2HMAC = HAS_PBKDF2 or HAS_PBKDF2HMAC
--
--
--CRYPTO_UPGRADE = "ansible-vault requires a newer version of pycrypto than the one installed on your platform." \
--    " You may fix this with OS-specific commands such as: yum install python-devel; rpm -e --nodeps python-crypto; pip install pycrypto"
- 
-+BACKEND = default_backend()
- b_HEADER = b'$ANSIBLE_VAULT'
- CIPHER_WHITELIST = frozenset((u'AES', u'AES256'))
- CIPHER_WRITE_WHITELIST = frozenset((u'AES256',))
-@@ -100,12 +63,6 @@
- # (used in VaultFile header) to a cipher class
- 
- 
--def check_prereqs():
--
--    if not HAS_AES or not HAS_COUNTER or not HAS_ANY_PBKDF2HMAC or not HAS_HASH:
--        raise AnsibleError(CRYPTO_UPGRADE)
--
--
- class AnsibleVaultError(AnsibleError):
-     pass
- 
-@@ -410,8 +367,6 @@
- 
-     def encrypt_file(self, filename, output_file=None):
- 
--        check_prereqs()
--
-         # A file to be encrypted into a vaultfile could be any encoding
-         # so treat the contents as a byte string.
- 
-@@ -424,8 +379,6 @@
- 
-     def decrypt_file(self, filename, output_file=None):
- 
--        check_prereqs()
--
-         # follow the symlink
-         filename = os.path.realpath(filename)
- 
-@@ -440,8 +393,6 @@
-     def create_file(self, filename):
-         """ create a new encrypted file """
- 
--        check_prereqs()
--
-         # FIXME: If we can raise an error here, we can probably just make it
-         # behave like edit instead.
-         if os.path.isfile(filename):
-@@ -451,8 +402,6 @@
- 
-     def edit_file(self, filename):
- 
--        check_prereqs()
--
-         # follow the symlink
-         filename = os.path.realpath(filename)
- 
-@@ -471,7 +420,6 @@
- 
-     def plaintext(self, filename):
- 
--        check_prereqs()
-         ciphertext = self.read_data(filename)
- 
-         try:
-@@ -483,8 +431,6 @@
- 
-     def rekey_file(self, filename, b_new_password):
- 
--        check_prereqs()
--
-         # follow the symlink
-         filename = os.path.realpath(filename)
- 
-@@ -581,10 +527,6 @@
- 
-     # Note: strings in this class should be byte strings by default.
- 
--    def __init__(self):
--        if not HAS_AES:
--            raise AnsibleError(CRYPTO_UPGRADE)
--
-     def _aes_derive_key_and_iv(self, b_password, b_salt, key_length, iv_length):
- 
-         """ Create a key and an initialization vector """
-@@ -620,41 +562,22 @@
-                 ' switch to the newer VaultAES256 format', version='2.3')
-         # http://stackoverflow.com/a/14989032
- 
--        b_ciphertext = unhexlify(b_vaulttext)
--
--        in_file = BytesIO(b_ciphertext)
--        in_file.seek(0)
--        out_file = BytesIO()
-+        b_vaultdata = unhexlify(b_vaulttext)
-+        b_tmpsalt = b_vaultdata[:16]
-+        b_ciphertext = b_vaultdata[16:]
- 
--        bs = AES.block_size
--        b_tmpsalt = in_file.read(bs)
-+        bs = algorithms.AES.block_size // 8
-         b_salt = b_tmpsalt[len(b'Salted__'):]
-         b_key, b_iv = self._aes_derive_key_and_iv(b_password, b_salt, key_length, bs)
--        cipher = AES.new(b_key, AES.MODE_CBC, b_iv)
--        b_next_chunk = b''
--        finished = False
--
--        while not finished:
--            b_chunk, b_next_chunk = b_next_chunk, cipher.decrypt(in_file.read(1024 * bs))
--            if len(b_next_chunk) == 0:
--                if PY3:
--                    padding_length = b_chunk[-1]
--                else:
--                    padding_length = ord(b_chunk[-1])
-+        cipher = C_Cipher(algorithms.AES(b_key), modes.CBC(b_iv), BACKEND).decryptor()
-+        unpadder = padding.PKCS7(algorithms.AES.block_size).unpadder()
- 
--                b_chunk = b_chunk[:-padding_length]
--                finished = True
--
--            out_file.write(b_chunk)
--            out_file.flush()
--
--        # reset the stream pointer to the beginning
--        out_file.seek(0)
--        b_out_data = out_file.read()
--        out_file.close()
-+        b_plaintext = unpadder.update(
-+            cipher.update(b_ciphertext) + cipher.finalize()
-+        ) + unpadder.finalize()
- 
-         # split out sha and verify decryption
--        b_split_data = b_out_data.split(b"\n", 1)
-+        b_split_data = b_plaintext.split(b"\n", 1)
-         b_this_sha = b_split_data[0]
-         b_plaintext = b_split_data[1]
-         b_test_sha = to_bytes(sha256(b_plaintext).hexdigest())
-@@ -676,19 +599,16 @@
- 
-     # Note: strings in this class should be byte strings by default.
- 
--    def __init__(self):
--
--        check_prereqs()
--
-     @staticmethod
-     def _create_key(b_password, b_salt, keylength, ivlength):
--        hash_function = SHA256
--
--        # make two keys and one iv
--        pbkdf2_prf = lambda p, s: HMAC.new(p, s, hash_function).digest()
-+        kdf = PBKDF2HMAC(
-+            algorithm=hashes.SHA256(),
-+            length=2 * keylength + ivlength,
-+            salt=b_salt,
-+            iterations=10000,
-+            backend=BACKEND)
-+        b_derivedkey = kdf.derive(b_password)
- 
--        b_derivedkey = PBKDF2(b_password, b_salt, dkLen=(2 * keylength) + ivlength,
--                            count=10000, prf=pbkdf2_prf)
-         return b_derivedkey
- 
-     @classmethod
-@@ -696,55 +616,31 @@
-         # 16 for AES 128, 32 for AES256
-         keylength = 32
- 
--        # match the size used for counter.new to avoid extra work
--        ivlength = 16
-+        # AES is a 128-bit block cipher, so IVs and counter nonces are 16 bytes
-+        ivlength = algorithms.AES.block_size // 8
- 
--        if HAS_PBKDF2HMAC:
--            backend = default_backend()
--            kdf = PBKDF2HMAC(
--                algorithm=c_SHA256(),
--                length=2 * keylength + ivlength,
--                salt=b_salt,
--                iterations=10000,
--                backend=backend)
--            b_derivedkey = kdf.derive(b_password)
--        else:
--            b_derivedkey = cls._create_key(b_password, b_salt, keylength, ivlength)
-+        b_derivedkey = cls._create_key(b_password, b_salt, keylength, ivlength)
- 
-         b_key1 = b_derivedkey[:keylength]
-         b_key2 = b_derivedkey[keylength:(keylength * 2)]
-         b_iv = b_derivedkey[(keylength * 2):(keylength * 2) + ivlength]
- 
--        return b_key1, b_key2, hexlify(b_iv)
-+        return b_key1, b_key2, b_iv
- 
-     def encrypt(self, b_plaintext, b_password):
-         b_salt = os.urandom(32)
-         b_key1, b_key2, b_iv = self._gen_key_initctr(b_password, b_salt)
- 
--        # PKCS#7 PAD DATA http://tools.ietf.org/html/rfc5652#section-6.3
--        bs = AES.block_size
--        padding_length = (bs - len(b_plaintext) % bs) or bs
--        b_plaintext += to_bytes(padding_length * chr(padding_length), encoding='ascii', errors='strict')
--
--        # COUNTER.new PARAMETERS
--        # 1) nbits (integer) - Length of the counter, in bits.
--        # 2) initial_value (integer) - initial value of the counter. "iv" from _gen_key_initctr
--
--        ctr = Counter.new(128, initial_value=int(b_iv, 16))
--
--        # AES.new PARAMETERS
--        # 1) AES key, must be either 16, 24, or 32 bytes long -- "key" from _gen_key_initctr
--        # 2) MODE_CTR, is the recommended mode
--        # 3) counter=<CounterObject>
--
--        cipher = AES.new(b_key1, AES.MODE_CTR, counter=ctr)
--
--        # ENCRYPT PADDED DATA
--        b_ciphertext = cipher.encrypt(b_plaintext)
-+        cipher = C_Cipher(algorithms.AES(b_key1), modes.CTR(b_iv), BACKEND)
-+        encryptor = cipher.encryptor()
-+        padder = padding.PKCS7(algorithms.AES.block_size).padder()
-+        b_ciphertext = encryptor.update(padder.update(b_plaintext) + padder.finalize())
-+        b_ciphertext += encryptor.finalize()
- 
-         # COMBINE SALT, DIGEST AND DATA
--        hmac = HMAC.new(b_key2, b_ciphertext, SHA256)
--        b_vaulttext = b'\n'.join([hexlify(b_salt), to_bytes(hmac.hexdigest()), hexlify(b_ciphertext)])
-+        hmac = HMAC(b_key2, hashes.SHA256(), BACKEND)
-+        hmac.update(b_ciphertext)
-+        b_vaulttext = b'\n'.join([hexlify(b_salt), hexlify(hmac.finalize()), hexlify(b_ciphertext)])
-         b_vaulttext = hexlify(b_vaulttext)
-         return b_vaulttext
- 
-@@ -757,48 +653,21 @@
-         b_key1, b_key2, b_iv = self._gen_key_initctr(b_password, b_salt)
- 
-         # EXIT EARLY IF DIGEST DOESN'T MATCH
--        hmacDecrypt = HMAC.new(b_key2, b_ciphertext, SHA256)
--        if not self._is_equal(b_cryptedHmac, to_bytes(hmacDecrypt.hexdigest())):
-+        hmac = HMAC(b_key2, hashes.SHA256(), BACKEND)
-+        hmac.update(b_ciphertext)
-+        try:
-+            hmac.verify(unhexlify(b_cryptedHmac))
-+        except InvalidSignature:
-             return None
--        # SET THE COUNTER AND THE CIPHER
--        ctr = Counter.new(128, initial_value=int(b_iv, 16))
--        cipher = AES.new(b_key1, AES.MODE_CTR, counter=ctr)
--
--        # DECRYPT PADDED DATA
--        b_plaintext = cipher.decrypt(b_ciphertext)
--
--        # UNPAD DATA
--        if PY3:
--            padding_length = b_plaintext[-1]
--        else:
--            padding_length = ord(b_plaintext[-1])
- 
--        b_plaintext = b_plaintext[:-padding_length]
--        return b_plaintext
-+        cipher = C_Cipher(algorithms.AES(b_key1), modes.CTR(b_iv), BACKEND)
-+        decryptor = cipher.decryptor()
-+        unpadder = padding.PKCS7(128).unpadder()
-+        b_plaintext = unpadder.update(
-+            decryptor.update(b_ciphertext) + decryptor.finalize()
-+        ) + unpadder.finalize()
- 
--    @staticmethod
--    def _is_equal(b_a, b_b):
--        """
--        Comparing 2 byte arrrays in constant time
--        to avoid timing attacks.
--
--        It would be nice if there was a library for this but
--        hey.
--        """
--        if not (isinstance(b_a, binary_type) and isinstance(b_b, binary_type)):
--            raise TypeError('_is_equal can only be used to compare two byte strings')
--
--        # http://codahale.com/a-lesson-in-timing-attacks/
--        if len(b_a) != len(b_b):
--            return False
--
--        result = 0
--        for b_x, b_y in zip(b_a, b_b):
--            if PY3:
--                result |= b_x ^ b_y
--            else:
--                result |= ord(b_x) ^ ord(b_y)
--        return result == 0
-+        return b_plaintext
- 
- 
- # Keys could be made bytes later if the code that gets the data is more
-diff -uNr ansible-2.3.0.0.ORIG/test/runner/requirements/integration.txt ansible-2.3.0.0/test/runner/requirements/integration.txt
---- ansible-2.3.0.0.ORIG/test/runner/requirements/integration.txt	2017-05-23 14:23:12.379595453 +0100
-+++ ansible-2.3.0.0/test/runner/requirements/integration.txt	2017-05-23 14:24:22.118598926 +0100
-@@ -1,8 +1,8 @@
-+cryptography
- jinja2
- jmespath
- junit-xml
- ordereddict ; python_version < '2.7'
- paramiko
- passlib
--pycrypto
- pyyaml
-diff -uNr ansible-2.3.0.0.ORIG/test/runner/requirements/network-integration.txt ansible-2.3.0.0/test/runner/requirements/network-integration.txt
---- ansible-2.3.0.0.ORIG/test/runner/requirements/network-integration.txt	2017-05-23 14:23:12.379595453 +0100
-+++ ansible-2.3.0.0/test/runner/requirements/network-integration.txt	2017-05-23 14:24:22.119598926 +0100
-@@ -1,5 +1,5 @@
-+cryptography
- jinja2
- junit-xml
- paramiko
--pycrypto
- pyyaml
-diff -uNr ansible-2.3.0.0.ORIG/test/runner/requirements/sanity.txt ansible-2.3.0.0/test/runner/requirements/sanity.txt
---- ansible-2.3.0.0.ORIG/test/runner/requirements/sanity.txt	2017-05-23 14:23:12.379595453 +0100
-+++ ansible-2.3.0.0/test/runner/requirements/sanity.txt	2017-05-23 14:26:01.910603896 +0100
-@@ -1,5 +1,7 @@
-+cryptography
- jinja2
- mock
-+paramiko
- pep8
- pylint
- pytest
-diff -uNr ansible-2.3.0.0.ORIG/test/runner/requirements/units.txt ansible-2.3.0.0/test/runner/requirements/units.txt
---- ansible-2.3.0.0.ORIG/test/runner/requirements/units.txt	2017-05-23 14:23:12.379595453 +0100
-+++ ansible-2.3.0.0/test/runner/requirements/units.txt	2017-05-23 14:24:22.119598926 +0100
-@@ -1,10 +1,10 @@
- boto
- boto3
-+cryptography
- jinja2
- mock
- nose
- passlib
--pycrypto
- pytest
- pytest-mock
- pytest-xdist
-diff -uNr ansible-2.3.0.0.ORIG/test/runner/requirements/windows-integration.txt ansible-2.3.0.0/test/runner/requirements/windows-integration.txt
---- ansible-2.3.0.0.ORIG/test/runner/requirements/windows-integration.txt	2017-05-23 14:23:12.379595453 +0100
-+++ ansible-2.3.0.0/test/runner/requirements/windows-integration.txt	2017-05-23 14:24:22.119598926 +0100
-@@ -1,4 +1,6 @@
-+cryptography
- jinja2
- junit-xml
-+paramiko
- pywinrm
- pyyaml
-diff -uNr ansible-2.3.0.0.ORIG/test/units/parsing/vault/test_vault_editor.py ansible-2.3.0.0/test/units/parsing/vault/test_vault_editor.py
---- ansible-2.3.0.0.ORIG/test/units/parsing/vault/test_vault_editor.py	2017-05-23 14:23:12.324595450 +0100
-+++ ansible-2.3.0.0/test/units/parsing/vault/test_vault_editor.py	2017-05-23 14:24:22.120598926 +0100
-@@ -22,7 +22,6 @@
- 
- import os
- import tempfile
--from nose.plugins.skip import SkipTest
- 
- from ansible.compat.tests import unittest
- from ansible.compat.tests.mock import patch
-@@ -32,27 +31,6 @@
- from ansible.module_utils._text import to_bytes, to_text
- 
- 
--# Counter import fails for 2.0.1, requires >= 2.6.1 from pip
--try:
--    from Crypto.Util import Counter
--    HAS_COUNTER = True
--except ImportError:
--    HAS_COUNTER = False
--
--# KDF import fails for 2.0.1, requires >= 2.6.1 from pip
--try:
--    from Crypto.Protocol.KDF import PBKDF2
--    HAS_PBKDF2 = True
--except ImportError:
--    HAS_PBKDF2 = False
--
--# AES IMPORTS
--try:
--    from Crypto.Cipher import AES as AES
--    HAS_AES = True
--except ImportError:
--    HAS_AES = False
--
- v10_data = """$ANSIBLE_VAULT;1.0;AES
- 53616c7465645f5fd0026926a2d415a28a2622116273fbc90e377225c12a347e1daf4456d36a77f9
- 9ad98d59f61d06a4b66718d855f16fb7bdfe54d1ec8aeaa4d06c2dc1fa630ae1846a029877f0eeb1
-@@ -423,9 +401,6 @@
- 
-     def test_decrypt_1_0(self):
-         # Skip testing decrypting 1.0 files if we don't have access to AES, KDF or Counter.
--        if not HAS_AES or not HAS_COUNTER or not HAS_PBKDF2:
--            raise SkipTest
--
-         v10_file = tempfile.NamedTemporaryFile(delete=False)
-         with v10_file as f:
-             f.write(to_bytes(v10_data))
-@@ -451,9 +426,6 @@
-         assert fdata.strip() == "foo", "incorrect decryption of 1.0 file: %s" % fdata.strip()
- 
-     def test_decrypt_1_1(self):
--        if not HAS_AES or not HAS_COUNTER or not HAS_PBKDF2:
--            raise SkipTest
--
-         v11_file = tempfile.NamedTemporaryFile(delete=False)
-         with v11_file as f:
-             f.write(to_bytes(v11_data))
-@@ -478,10 +450,6 @@
-         assert fdata.strip() == "foo", "incorrect decryption of 1.0 file: %s" % fdata.strip()
- 
-     def test_rekey_migration(self):
--        # Skip testing rekeying files if we don't have access to AES, KDF or Counter.
--        if not HAS_AES or not HAS_COUNTER or not HAS_PBKDF2:
--            raise SkipTest
--
-         v10_file = tempfile.NamedTemporaryFile(delete=False)
-         with v10_file as f:
-             f.write(to_bytes(v10_data))
-diff -uNr ansible-2.3.0.0.ORIG/test/units/parsing/vault/test_vault.py ansible-2.3.0.0/test/units/parsing/vault/test_vault.py
---- ansible-2.3.0.0.ORIG/test/units/parsing/vault/test_vault.py	2017-05-23 14:23:12.324595450 +0100
-+++ ansible-2.3.0.0/test/units/parsing/vault/test_vault.py	2017-05-23 14:24:22.120598926 +0100
-@@ -38,28 +38,6 @@
- from ansible.module_utils._text import to_bytes, to_text
- 
- 
--# Counter import fails for 2.0.1, requires >= 2.6.1 from pip
--try:
--    from Crypto.Util import Counter
--    HAS_COUNTER = True
--except ImportError:
--    HAS_COUNTER = False
--
--# KDF import fails for 2.0.1, requires >= 2.6.1 from pip
--try:
--    from Crypto.Protocol.KDF import PBKDF2
--    HAS_PBKDF2 = True
--except ImportError:
--    HAS_PBKDF2 = False
--
--# AES IMPORTS
--try:
--    from Crypto.Cipher import AES as AES
--    HAS_AES = True
--except ImportError:
--    HAS_AES = False
--
--
- class TestVaultIsEncrypted(unittest.TestCase):
-     def test_bytes_not_encrypted(self):
-         b_data = b"foobar"
-@@ -181,38 +159,6 @@
-         self.assertIsInstance(b_key, six.binary_type)
-         self.assertEqual(b_key, b_key_2)
- 
--    def test_is_equal_is_equal(self):
--        self.assertTrue(self.vault_cipher._is_equal(b'abcdefghijklmnopqrstuvwxyz', b'abcdefghijklmnopqrstuvwxyz'))
--
--    def test_is_equal_unequal_length(self):
--        self.assertFalse(self.vault_cipher._is_equal(b'abcdefghijklmnopqrstuvwxyz', b'abcdefghijklmnopqrstuvwx and sometimes y'))
--
--    def test_is_equal_not_equal(self):
--        self.assertFalse(self.vault_cipher._is_equal(b'abcdefghijklmnopqrstuvwxyz', b'AbcdefghijKlmnopQrstuvwxZ'))
--
--    def test_is_equal_empty(self):
--        self.assertTrue(self.vault_cipher._is_equal(b'', b''))
--
--    def test_is_equal_non_ascii_equal(self):
--        utf8_data = to_bytes(u'私はガラスを食べられます。それは私を傷つけません。')
--        self.assertTrue(self.vault_cipher._is_equal(utf8_data, utf8_data))
--
--    def test_is_equal_non_ascii_unequal(self):
--        utf8_data = to_bytes(u'私はガラスを食べられます。それは私を傷つけません。')
--        utf8_data2 = to_bytes(u'Pot să mănânc sticlă și ea nu mă rănește.')
--
--        # Test for the len optimization path
--        self.assertFalse(self.vault_cipher._is_equal(utf8_data, utf8_data2))
--        # Test for the slower, char by char comparison path
--        self.assertFalse(self.vault_cipher._is_equal(utf8_data, utf8_data[:-1] + b'P'))
--
--    def test_is_equal_non_bytes(self):
--        """ Anything not a byte string should raise a TypeError """
--        self.assertRaises(TypeError, self.vault_cipher._is_equal, u"One fish", b"two fish")
--        self.assertRaises(TypeError, self.vault_cipher._is_equal, b"One fish", u"two fish")
--        self.assertRaises(TypeError, self.vault_cipher._is_equal, 1, b"red fish")
--        self.assertRaises(TypeError, self.vault_cipher._is_equal, b"blue fish", 2)
--
- 
- class TestVaultLib(unittest.TestCase):
-     def setUp(self):
-@@ -267,8 +213,6 @@
-         self.assertEqual(self.v.b_version, b"9.9", msg="version was not properly set")
- 
-     def test_encrypt_decrypt_aes(self):
--        if not HAS_AES or not HAS_COUNTER or not HAS_PBKDF2:
--            raise SkipTest
-         self.v.cipher_name = u'AES'
-         self.v.b_password = b'ansible'
-         # AES encryption code has been removed, so this is old output for
-@@ -282,8 +226,6 @@
-         self.assertEqual(b_plaintext, b"foobar", msg="decryption failed")
- 
-     def test_encrypt_decrypt_aes256(self):
--        if not HAS_AES or not HAS_COUNTER or not HAS_PBKDF2:
--            raise SkipTest
-         self.v.cipher_name = u'AES256'
-         plaintext = u"foobar"
-         b_vaulttext = self.v.encrypt(plaintext)
-@@ -292,8 +234,6 @@
-         self.assertEqual(b_plaintext, b"foobar", msg="decryption failed")
- 
-     def test_encrypt_decrypt_aes256_existing_vault(self):
--        if not HAS_AES or not HAS_COUNTER or not HAS_PBKDF2:
--            raise SkipTest
-         self.v.cipher_name = u'AES256'
-         b_orig_plaintext = b"Setec Astronomy"
-         vaulttext = u'''$ANSIBLE_VAULT;1.1;AES256
-@@ -314,8 +254,6 @@
-         # FIXME This test isn't working quite yet.
-         raise SkipTest
- 
--        if not HAS_AES or not HAS_COUNTER or not HAS_PBKDF2:
--            raise SkipTest
-         self.v.cipher_name = 'AES256'
-         # plaintext = "Setec Astronomy"
-         enc_data = '''$ANSIBLE_VAULT;1.1;AES256
-@@ -350,8 +288,6 @@
-         self.v.decrypt(b_invalid_ciphertext)
- 
-     def test_encrypt_encrypted(self):
--        if not HAS_AES or not HAS_COUNTER or not HAS_PBKDF2:
--            raise SkipTest
-         self.v.cipher_name = u'AES'
-         b_vaulttext = b"$ANSIBLE_VAULT;9.9;TEST\n%s" % hexlify(b"ansible")
-         vaulttext = to_text(b_vaulttext, errors='strict')
-@@ -359,8 +295,6 @@
-         self.assertRaises(errors.AnsibleError, self.v.encrypt, vaulttext)
- 
-     def test_decrypt_decrypted(self):
--        if not HAS_AES or not HAS_COUNTER or not HAS_PBKDF2:
--            raise SkipTest
-         plaintext = u"ansible"
-         self.assertRaises(errors.AnsibleError, self.v.decrypt, plaintext)
- 
-@@ -368,9 +302,6 @@
-         self.assertRaises(errors.AnsibleError, self.v.decrypt, b_plaintext)
- 
-     def test_cipher_not_set(self):
--        # not setting the cipher should default to AES256
--        if not HAS_AES or not HAS_COUNTER or not HAS_PBKDF2:
--            raise SkipTest
-         plaintext = u"ansible"
-         self.v.encrypt(plaintext)
-         self.assertEquals(self.v.cipher_name, "AES256")
-diff -uNr ansible-2.3.0.0.ORIG/test/utils/docker/centos6/Dockerfile ansible-2.3.0.0/test/utils/docker/centos6/Dockerfile
---- ansible-2.3.0.0.ORIG/test/utils/docker/centos6/Dockerfile	2017-05-23 14:23:12.321595450 +0100
-+++ ansible-2.3.0.0/test/utils/docker/centos6/Dockerfile	2017-05-23 14:24:22.121598926 +0100
-@@ -9,6 +9,8 @@
-     file \
-     gcc \
-     git \
-+    libffi \
-+    libffi-devel \
-     make \
-     mercurial \
-     mysql \
-@@ -16,6 +18,7 @@
-     mysql-server \
-     openssh-clients \
-     openssh-server \
-+    openssl-devel \
-     python-coverage \
-     python-devel \
-     python-httplib2 \
-@@ -40,8 +43,6 @@
-     && \
-     yum clean all
- 
--RUN rpm -e --nodeps python-crypto && pip install --upgrade pycrypto
--
- RUN /bin/sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
- RUN mkdir /etc/ansible/
- RUN /bin/echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-diff -uNr ansible-2.3.0.0.ORIG/test/utils/docker/centos7/Dockerfile ansible-2.3.0.0/test/utils/docker/centos7/Dockerfile
---- ansible-2.3.0.0.ORIG/test/utils/docker/centos7/Dockerfile	2017-05-23 14:23:12.321595450 +0100
-+++ ansible-2.3.0.0/test/utils/docker/centos7/Dockerfile	2017-05-23 14:24:22.121598926 +0100
-@@ -17,15 +17,20 @@
-     bzip2 \
-     dbus-python \
-     file \
-+    gcc \
-     git \
-     iproute \
-+    libffi \
-+    libffi-devel \
-     make \
-     mariadb-server \
-     mercurial \
-     MySQL-python \
-     openssh-clients \
-     openssh-server \
-+    openssl-devel \
-     python-coverage \
-+    python-devel \
-     python-httplib2 \
-     python-jinja2 \
-     python-keyczar \
-diff -uNr ansible-2.3.0.0.ORIG/test/utils/docker/fedora24/Dockerfile ansible-2.3.0.0/test/utils/docker/fedora24/Dockerfile
---- ansible-2.3.0.0.ORIG/test/utils/docker/fedora24/Dockerfile	2017-05-23 14:23:12.321595450 +0100
-+++ ansible-2.3.0.0/test/utils/docker/fedora24/Dockerfile	2017-05-23 14:24:22.121598926 +0100
-@@ -17,18 +17,23 @@
-     dbus-python \
-     file \
-     findutils \
-+    gcc \
-     git \
-     glibc-locale-source \
-     iproute \
-+    libffi \
-+    libffi-devel \
-     make \
-     mariadb-server \
-     mercurial \
-     MySQL-python \
-     openssh-clients \
-     openssh-server \
-+    openssl-devel \
-     procps \
-     python2-dnf \
-     python-coverage \
-+    python-devel \
-     python-httplib2 \
-     python-jinja2 \
-     python-keyczar \
-diff -uNr ansible-2.3.0.0.ORIG/test/utils/docker/fedora25/Dockerfile ansible-2.3.0.0/test/utils/docker/fedora25/Dockerfile
---- ansible-2.3.0.0.ORIG/test/utils/docker/fedora25/Dockerfile	2017-05-23 14:23:12.321595450 +0100
-+++ ansible-2.3.0.0/test/utils/docker/fedora25/Dockerfile	2017-05-23 14:24:22.121598926 +0100
-@@ -20,12 +20,15 @@
-     git \
-     glibc-locale-source \
-     iproute \
-+    libffi \
-+    libffi-devel \
-     make \
-     mariadb-server \
-     mercurial \
-     MySQL-python \
-     openssh-clients \
-     openssh-server \
-+    openssl-devel \
-     procps \
-     python2-dnf \
-     python-coverage \
-diff -uNr ansible-2.3.0.0.ORIG/test/utils/docker/opensuse42.1/Dockerfile ansible-2.3.0.0/test/utils/docker/opensuse42.1/Dockerfile
---- ansible-2.3.0.0.ORIG/test/utils/docker/opensuse42.1/Dockerfile	2017-05-23 14:23:12.321595450 +0100
-+++ ansible-2.3.0.0/test/utils/docker/opensuse42.1/Dockerfile	2017-05-23 14:24:22.121598926 +0100
-@@ -21,6 +21,8 @@
-     openssh \
-     postgresql-server \
-     python-coverage \
-+    python-cryptography \
-+    python-devel \
-     python-httplib2 \
-     python-jinja2 \
-     python-keyczar \
-diff -uNr ansible-2.3.0.0.ORIG/test/utils/docker/opensuse42.2/Dockerfile ansible-2.3.0.0/test/utils/docker/opensuse42.2/Dockerfile
---- ansible-2.3.0.0.ORIG/test/utils/docker/opensuse42.2/Dockerfile	2017-05-23 14:23:12.321595450 +0100
-+++ ansible-2.3.0.0/test/utils/docker/opensuse42.2/Dockerfile	2017-05-23 14:24:22.122598926 +0100
-@@ -21,6 +21,7 @@
-     openssh \
-     postgresql-server \
-     python-coverage \
-+    python-cryptography \
-     python-httplib2 \
-     python-jinja2 \
-     python-keyczar \
-diff -uNr ansible-2.3.0.0.ORIG/test/utils/docker/ubuntu1204/Dockerfile ansible-2.3.0.0/test/utils/docker/ubuntu1204/Dockerfile
---- ansible-2.3.0.0.ORIG/test/utils/docker/ubuntu1204/Dockerfile	2017-05-23 14:23:12.321595450 +0100
-+++ ansible-2.3.0.0/test/utils/docker/ubuntu1204/Dockerfile	2017-05-23 14:24:22.122598926 +0100
-@@ -17,6 +17,8 @@
-     gawk \
-     gcc \
-     git \
-+    libffi-dev \
-+    libssl-dev \
-     libxml2-utils \
-     locales \
-     make \
-@@ -50,8 +52,6 @@
-     && \
-     apt-get clean
- 
--RUN pip install --upgrade pycrypto
--
- # helpful things taken from the ubuntu-upstart Dockerfile:
- # https://github.com/tianon/dockerfiles/blob/4d24a12b54b75b3e0904d8a285900d88d3326361/sbin-init/ubuntu/upstart/14.04/Dockerfile
- ADD init-fake.conf /etc/init/fake-container-events.conf
-diff -uNr ansible-2.3.0.0.ORIG/test/utils/docker/ubuntu1404/Dockerfile ansible-2.3.0.0/test/utils/docker/ubuntu1404/Dockerfile
---- ansible-2.3.0.0.ORIG/test/utils/docker/ubuntu1404/Dockerfile	2017-05-23 14:23:12.321595450 +0100
-+++ ansible-2.3.0.0/test/utils/docker/ubuntu1404/Dockerfile	2017-05-23 14:24:22.122598926 +0100
-@@ -16,6 +16,8 @@
-     fakeroot \
-     gawk \
-     git \
-+    libffi-dev \
-+    libssl-dev \
-     libxml2-utils \
-     locales \
-     make \
-diff -uNr ansible-2.3.0.0.ORIG/test/utils/docker/ubuntu1604/Dockerfile ansible-2.3.0.0/test/utils/docker/ubuntu1604/Dockerfile
---- ansible-2.3.0.0.ORIG/test/utils/docker/ubuntu1604/Dockerfile	2017-05-23 14:23:12.321595450 +0100
-+++ ansible-2.3.0.0/test/utils/docker/ubuntu1604/Dockerfile	2017-05-23 14:24:22.122598926 +0100
-@@ -17,6 +17,8 @@
-     gawk \
-     git \
-     iproute2 \
-+    libffi-dev \
-+    libssl-dev \
-     libxml2-utils \
-     locales \
-     lsb-release \
-diff -uNr ansible-2.3.0.0.ORIG/test/utils/docker/ubuntu1604py3/Dockerfile ansible-2.3.0.0/test/utils/docker/ubuntu1604py3/Dockerfile
---- ansible-2.3.0.0.ORIG/test/utils/docker/ubuntu1604py3/Dockerfile	2017-05-23 14:23:12.321595450 +0100
-+++ ansible-2.3.0.0/test/utils/docker/ubuntu1604py3/Dockerfile	2017-05-23 14:24:22.122598926 +0100
-@@ -15,6 +15,8 @@
-     gawk \
-     git \
-     iproute2 \
-+    libffi-dev \
-+    libssl-dev \
-     libxml2-utils \
-     locales \
-     lsb-release \
-diff -uNr ansible-2.3.0.0.ORIG/test/utils/shippable/other.sh ansible-2.3.0.0/test/utils/shippable/other.sh
---- ansible-2.3.0.0.ORIG/test/utils/shippable/other.sh	2017-05-23 14:23:12.320595450 +0100
-+++ ansible-2.3.0.0/test/utils/shippable/other.sh	2017-05-23 14:24:22.123598926 +0100
-@@ -12,6 +12,8 @@
- retry.py apt-get install -qq \
-     shellcheck \
-     python2.4 \
-+    libssl-dev \
-+    libffi-dev \
- 
- ln -sf x86_64-linux-gnu-gcc-4.9 /usr/bin/x86_64-linux-gnu-gcc
- 
-diff -uNr ansible-2.3.0.0.ORIG/test/utils/tox/requirements.txt ansible-2.3.0.0/test/utils/tox/requirements.txt
---- ansible-2.3.0.0.ORIG/test/utils/tox/requirements.txt	2017-05-23 14:23:12.321595450 +0100
-+++ ansible-2.3.0.0/test/utils/tox/requirements.txt	2017-05-23 14:24:22.123598926 +0100
-@@ -11,7 +11,7 @@
- redis
- python-memcached
- python-systemd
--pycrypto
-+cryptography
- botocore
- boto3
- pytest

app-admin/ansible/files/ansible.env

@@ -1,2 +0,0 @@
-# Use ssh transport by default. Comment it out if you want to use paramiko
-ANSIBLE_TRANSPORT="ssh"

app-admin/keepass/keepass-2.36.ebuild

@@ -34,13 +34,8 @@ src_prepare() {
 	# (which keeps/looks for xsl files in its own folder)
 	default
 
-	# New Mono Prep Script until keepass 2.36+ comes out.
-	# This script has been upstreamed, still waiting for final confirmation.
-	local newMonoPrepScript="${FILESDIR}/keepass-2.35-new-monoprep-script.sh"
-
 	# Switch into build dir so the mono prepration script works correctly
 	cd Build || die
-	cp -f "${newMonoPrepScript}" PrepMonoDev.sh
 	source PrepMonoDev.sh || die
 	cd ../ || die
 }

app-admin/mei-amt-check/Manifest

@@ -1 +1 @@
-DIST mei-amt-check-0_p20170514.tar.gz 10795 SHA256 c51e633b0e174578afead03ae7fa2aaae32e20400655bc744ce1597bfc640567 SHA512 31f4e28bf21f366890ca1d2d64b70b44eca04d7271543188254884d59c65201d0bb85bc70aeba7885b065c8af929f1529fe04280aeb3a93f55edf439ee1a84d5 WHIRLPOOL 3d1008fd32a809f547866086acda4ee001426111bb9cb4f8a3468ea6ea7aeced1266f5c494cf7df537b95b6ff137d1deb5cfe5bc70685223bd8d17655da7c968
+DIST mei-amt-check-0_p20170515.tar.gz 10793 SHA256 d84d8b25b60cc434236cad0c5a59ac0763ab3e61fe5c563c300e72b2a1860e34 SHA512 62ac6d3b2cacfc4770a076bffad1a4f8ba9233acef09b2e7bc77da545a67886b86e4076cceecd5ca8aab38c661cf8a1ddb178e7caf181b2da6171c467fbd8988 WHIRLPOOL 8e179423972082618162654c413a776e6b9d04be7c8d73b8b7c079f3cb1e439aa1f0c56c39a65c1f4349e5816c56046b67b53ff9ad1a84b2e6c72e23f7db43e2

app-admin/mei-amt-check/mei-amt-check-0_p20170515.ebuild

@@ -7,7 +7,7 @@ inherit vcs-snapshot linux-info toolchain-funcs
 
 DESCRIPTION="AMT status checker"
 HOMEPAGE="https://github.com/mjg59/mei-amt-check/"
-COMMIT="a4d8fca4d18e1ae896b0305a53e152b568596bc1"
+COMMIT="d07672120ce7a0c79e949e537f3d19efecec1700"
 SRC_URI="https://github.com/mjg59/mei-amt-check/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"

app-admin/monit/Manifest

@@ -1,3 +1,3 @@
 DIST monit-5.20.0.tar.gz 1267991 SHA256 ebac395ec50c1ae64d568db1260bc049d0e0e624c00e79d7b1b9a59c2679b98d SHA512 653cba9d63fad42acf8c27ee9c050d047fc78e0b7e8cdb0f3d0a533d5b5e01ccf1b82d443cb6518d286547087a021e37a59cbffedbb3daf49ff8f95e8c64b884 WHIRLPOOL 28f9fcfa86c346fb390654e4730cc52ce30b794b2dc1e02a484079b55a8bcb50d78a71e2e856f1ce1e161dc99bcd6913b4db92ed0deab64e969c5c6a464c584d
-DIST monit-5.21.0.tar.gz 1302859 SHA256 fbf76163ed4a180854d378af60fed0cdbc5a8772823957234efc182ead10c03c SHA512 ab0f255bc5f2d1c4b642694b411fca202258360bc24e9da8631026cde868a336b9472b6f341517248bcbbaeefeeb9c07477194f450410cf14f64b5016b2c009b WHIRLPOOL 4a9b1b080192b08af486c840c833c8e5f6d29795b07ecb653e73d2409a3b620bc59a2d13c4f541840128c1d83b0675a9cfa8fe95e8aebd2dc0f94f404b20d90c
 DIST monit-5.22.0.tar.gz 1296354 SHA256 9fc58b5e3caafd64f0b6fff3e65ae757239fab37d04fb33efce177da15176183 SHA512 d7325d463f92eb5e1d6c8cdae01cbf787c23799ac4dd79e66931fe47960d69dba0ed76afb0715be2e877dc42bf77cd73886f5080e10b87084cce4e0da5f71961 WHIRLPOOL 0959136e1a15b56d3b0632630402dd123f9a782f6445ea83a88c25c9938878f1645fa1d9788fbab7400ab41d4f8b375a1ecaef52c1d75f507db3e44e0bb64159
+DIST monit-5.23.0.tar.gz 1298472 SHA256 dd39fe3a379c02402ba9c44c201b3ba925ebdc8f04225918820607b6c5d56713 SHA512 6ca3de51c7fdb8a677feafb684dc459f4064539fe5501dfa53a2027bb7b1e6f6121b7fa593c9e373f009d2fd0eeca2b9dd659c337f056dfe769908a3aa7ec5b8 WHIRLPOOL 1d02ec6ca5152c9df3131e851354ae5af58f8526f7934184c5d4f423bbba9a620c70a6d2731336aa8862d4e33cf4bebdc9b7ef1d3950bea1b49caa2dd660ca88

app-admin/multilog-watch/multilog-watch-1.12.ebuild

@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils
 DESCRIPTION="Watches a multilog file for irregularities"
 
-HOMEPAGE="http://www.eyrie.org/~eagle/software/multilog-watch/"
+HOMEPAGE="https://www.eyrie.org/~eagle/software/multilog-watch/"
-SRC_URI="http://archives.eyrie.org/software/system/multilog-watch
+SRC_URI="https://archives.eyrie.org/software/system/multilog-watch
-http://www.eyrie.org/%7Eeagle/software/multilog-watch/sample.filter"
+https://www.eyrie.org/%7Eeagle/software/multilog-watch/sample.filter"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"

app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild

@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
+inherit perl-app
+
+DESCRIPTION="Simple log watcher"
+HOMEPAGE="https://sourceforge.net/projects/swatch/"
+SRC_URI="mirror://sourceforge/swatch/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-perl/Date-Manip
+		dev-perl/Date-Calc
+		dev-perl/File-Tail
+		dev-perl/TimeDate
+		>=virtual/perl-Time-HiRes-1.12
+		!app-admin/swatch"
+
+src_install() {
+	emake install
+	newinitd "${FILESDIR}/${PN}-init" "${PN}"
+	newconfd "${FILESDIR}/${PN}-confd" "${PN}"
+	insinto /etc
+	doins "${FILESDIR}/${PN}rc"
+
+	# Clean up perl localpod and packlist (bug #620886)
+	perl_delete_localpod
+	perl_fix_packlist
+}

app-admin/systemrescuecd-x86/Manifest

@@ -23,3 +23,4 @@ DIST systemrescuecd-x86-4.9.5.iso 520032256 SHA256 ffe944b6c74ca5da16396d4c647ea
 DIST systemrescuecd-x86-4.9.6.iso 566126592 SHA256 345600159383a70cfd6dd8c32831ca6296610f95d3487e471e34c49721cfb1e8 SHA512 89f6fdc89f91e515d2d84543998ce2c4629c88d290d4aa16f9ad42e194ad7720ec02155a30e19a4744e5d68db0bb476fc86cafe64ec9eb62ff809c32504841b5 WHIRLPOOL 6452efa46721aabd53ebdd9d4506eeb28618481cf04858995bba2e78c4780019217575f5187b4e104e39b476da718359e3d229b4648bdcc3258f31b3a06a8b78
 DIST systemrescuecd-x86-5.0.0.iso 484790272 SHA256 0f04739b9a4c5b3174e4ffe462e23f8b700f9fdff37c75b64e7913b768bd9427 SHA512 67e442f229c55d16a13a46619134afee14fd7cf71e9d5e3d6f54a7b2ce3646e9ff89a17605c05f7a255b251c3bc56004aa9a59bd06f3ed69f7f4b9057ea6ea6c WHIRLPOOL 67b5ccec685746845361aa710e936aa6c693e08cd514283ad4805b44c385de19f5d3ba45cc349ae4b284c28046919ff8cd117a7f458a52fd488a2860f97359b4
 DIST systemrescuecd-x86-5.0.1.iso 485711872 SHA256 17f56dc7779d3716539a39a312ddb07d27f2cb1aa55b12420960bd67b00f6c9f SHA512 b18663574e54f1b6b5a147aa947d8faa4ad7eff7d756e8c3cee5397fdf3ac97c1c907f65a61403b2f0a7583fb9ad0fb74c920a8040365f6caad649371deeb1c4 WHIRLPOOL c33d81ebcec3d5f6744c7a8ccb5d33ae1b1847e31fcf43f66bfa4fdfdeeb226950562665f2a8b41d67c6077ec9cbea62ec8836135b3c391865f4171e147cc04a
+DIST systemrescuecd-x86-5.0.2.iso 495773696 SHA256 a2abdaf5750b09886cedcc5233d91ad3d1083e10380e555c7ca50849befbf487 SHA512 eaf5c080fbf810c0f966335c1f2f797f8e756c03a6246c8f2e2dd13637a66a160fd0d966095849d16b94664bf973bb9064e1f9f91785f0fd51372820c90b905f WHIRLPOOL 1b2cef05c0d8dff99757cfcf15c21ca3de42d6a5d41ec876bd4196af7f44209387b695e0e75ea03b00f1615be9a7b2c94eb41c1a72326c0c67df1e4129db4362

app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.2.ebuild

@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}

app-cdr/burn-cd/burn-cd-1.8.1.ebuild

@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aglyzov/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"

app-crypt/acme/Manifest

@@ -1,2 +1,3 @@
 DIST certbot-0.14.1.tar.gz 851705 SHA256 7992fced742649e7b7668e4db7685de12248a4ffba66810cb336e9b6412e3567 SHA512 309e0e1d071960ae9a5cc4c9f965cc623b68d3d61f69282f21629514553a75af4d384d2c29fd3beee6eb8447c7b6651ce86c33c4f3916876fac7a91a08d2075d WHIRLPOOL f5a5be776f0a9bb9096a6e8dfa64942bd00583559cba64d3c1a5b991578bb8c7cac5076895e4291e1ec4c8fa767f026a90e0c1312c4f425ffcb5bf08bd0e9e40
+DIST certbot-0.15.0.tar.gz 942788 SHA256 87d306b1c013b472b8f548b38ccc476c125816435bb3b99e932fed09ac777296 SHA512 e884b34985a1128ce94d6b2be77af6ee86ded8b870e066f3f4bc22f78501f3f0a51060edcf75a11cd31dd525388adb8ccc4e2da0068b5b75be131d0fb0ca6844 WHIRLPOOL 01b172e8c7ac5d3678ee608b36d93f23943bf17f1e9c593cc1af3febcf0549b03961e69e537f099643dd9ee268497f76c2c18d8fa7a1d45753bc50e670375317
 DIST letsencrypt-0.1.0.tar.gz 524821 SHA256 1c1ac7b41e5e0fc0e41a7ef159ac9147a4aafff54453d57b519eb05bf52ade14 SHA512 6a786290362741ac97dcb4b59bc4cba56f3e8b5193bbc10be19086d462f76e6124259c42bac36afe9eb818f4bb9edec34f8e2a02bd8c855e3b35404f4ee81f96 WHIRLPOOL cdc41a3466de54ab8ddfeedea9935205d78383028769dcfbc876be0c2ef80c2d14f5d0e4a9c56a751163718f5ababb07848822989a060de7031ea8ebdf6424a0

app-crypt/acme/acme-0.15.0.ebuild

@@ -0,0 +1,38 @@
+# 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})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests -w ${PN} || die
+}

app-crypt/cfssl/cfssl-1.2.0_p20170601.ebuild

@@ -17,6 +17,8 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="hardened"
 
+RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
+
 RESTRICT="test"
 
 src_compile() {

app-dicts/duali-data/duali-data-0.1b-r1.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Dictionary data for the Arab dictionary project duali"
-HOMEPAGE="http://www.arabeyes.org/project.php?proj=Duali"
+HOMEPAGE="https://www.arabeyes.org/Duali"
 SRC_URI="mirror://sourceforge/arabeyes/${P}.tar.gz"
 
 SLOT="0"

app-dicts/myspell-cy/myspell-cy-20060316.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 MYSPELL_SPELLING_DICTIONARIES=(
@@ -16,7 +16,7 @@ inherit myspell
 
 DESCRIPTION="Welsh dictionaries for myspell/hunspell"
 LICENSE="GPL-2"
-HOMEPAGE="http://lingucomponent.openoffice.org/"
+HOMEPAGE="https://lingucomponent.openoffice.org/"
 
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""

app-dicts/myspell-cy/myspell-cy-20130708.ebuild

@@ -17,7 +17,7 @@ MYSPELL_THES=(
 inherit myspell-r2
 
 DESCRIPTION="Welsh dictionaries for myspell/hunspell"
-HOMEPAGE="http://extensions.openoffice.org/en/project/gwirydd-sillafu-cymraeg-welsh-language-spell-checker"
+HOMEPAGE="https://extensions.openoffice.org/en/project/gwirydd-sillafu-cymraeg-welsh-language-spell-checker"
 SRC_URI="mirror://sourceforge/aoo-extensions/geiriadur-cy.oxt -> ${P}.oxt"
 
 LICENSE="GPL-2 LGPL-2.1"

app-dicts/myspell-da/myspell-da-2.1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -18,8 +18,8 @@ MYSPELL_THES=(
 inherit myspell-r2
 
 DESCRIPTION="Danish dictionaries for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/stavekontrolden-danish-dictionary"
+HOMEPAGE="https://extensions.libreoffice.org/extension-center/stavekontrolden-danish-dictionary"
-SRC_URI="http://extensions.libreoffice.org/extension-center/stavekontrolden-danish-dictionary/pscreleasefolder.2011-09-30.0280139318/2.1/dict-da-${PV}.oxt"
+SRC_URI="https://extensions.libreoffice.org/extension-center/stavekontrolden-danish-dictionary/pscreleasefolder.2011-09-30.0280139318/2.1/dict-da-${PV}.oxt"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"

app-dicts/myspell-da/myspell-da-2.3.ebuild

@@ -19,7 +19,7 @@ inherit myspell-r2
 
 DESCRIPTION="Danish dictionaries for myspell/hunspell"
 HOMEPAGE="https://extensions.libreoffice.org/extensions/stavekontrolden-danish-dictionary"
-SRC_URI="http://extensions.libreoffice.org/extension-center/stavekontrolden-danish-dictionary/pscreleasefolder.2011-09-30.0280139318/2.1/dict-da-${PV}.oxt"
+SRC_URI="https://extensions.libreoffice.org/extension-center/stavekontrolden-danish-dictionary/pscreleasefolder.2011-09-30.0280139318/2.1/dict-da-${PV}.oxt"
 SRC_URI="https://extensions.libreoffice.org/extensions/stavekontrolden-danish-dictionary/${PV}/@@download/file/dict-da-${PV/./-}.oxt"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"

app-dicts/myspell-en/myspell-en-20160901.ebuild

@@ -30,7 +30,7 @@ MYSPELL_THES=(
 inherit myspell-r2
 
 DESCRIPTION="English dictionaries for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extensions/english-dictionaries"
+HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
 SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY_PV}/@@download/file/dict-en.oxt -> dict-en-${PV}.oxt"
 
 LICENSE="GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson"

app-dicts/myspell-en/myspell-en-20170101.ebuild

@@ -30,7 +30,7 @@ MYSPELL_THES=(
 inherit myspell-r2
 
 DESCRIPTION="English dictionaries for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extensions/english-dictionaries"
+HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
 SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY_PV}/@@download/file/dict-en-${PV}.oxt"
 
 LICENSE="GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson"

app-dicts/myspell-en/myspell-en-20170501.ebuild

@@ -30,7 +30,7 @@ MYSPELL_THES=(
 inherit myspell-r2
 
 DESCRIPTION="English dictionaries for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extensions/english-dictionaries"
+HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
 SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY_PV}/@@download/file/dict-en-${PV}.oxt"
 
 LICENSE="GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson"

app-doc/gimp-help/Manifest

@@ -11,3 +11,4 @@ DIST gimp-help-2.6.1-html-pl.tar.bz2 28753373 SHA256 d60a1b99cfcefa43bf400b0add2
 DIST gimp-help-2.6.1-html-ru.tar.bz2 29324878 SHA256 4f788dcf870fce463342437e1099bffc965d3d1e173f61d352fedd87d2d6a7ab SHA512 ac564048f0543aa22481756ecd7f5c6c75f96094bc0b6aee2446f4c3ccedf511e2217034f95e1953f5ad615ff5a246de9326adace4641e568e41b603d83c18c7 WHIRLPOOL 8d950b49234f115f66d7ecc92211f35c2a6abd56fbe25c2b01b5329bbef0e396dca20bc8ffc174bc3ba21b861478e52b42d6b934b732ff96e21d6d5083f29818
 DIST gimp-help-2.6.1-html-sv.tar.bz2 29462846 SHA256 fb6bb874b28f7cd225efd614f30edf20c978ea15d31217cf22304a7091fa3fc9 SHA512 c12cda4c29bde87d79ae1ed3e1d6ec85f7ea8e3e8c01bf3b3b95a67478fee1c16f8421c4f869134b584c38aac611f6a69e7c1c4dd4b5906a69ad46f8f7b0c6ad WHIRLPOOL 9ab7eaddc1a6ccdf51ec8b473ff257fef0a4618f5b481f2f37a8009be628e323bb39896c01d4521b97c4e33b18b397b67cf9490e5ab6f0dde48af63d663e7850
 DIST gimp-help-2.6.1-html-zh_CN.tar.bz2 28735285 SHA256 d82128dcd669c6247ded3b3cfa33071a44a6e08d8325ceb820089b4722ad5c69 SHA512 daa6fd365c04c3dc78c1955301f0544ec67e17ff156e6e10d6cad959b9a1121a976feff29e30008809bc1beb1b4868474c40e36a76ea45410e3b7f5aed719055 WHIRLPOOL 76a7c49eee569d4eaab93f2ca3d8312e228edbab7f6c14535dd8979e58e5bbbb46ea91c85269b611be8f3ac37890615947d990f3766c228cd2fd61912cbe0605
+DIST gimp-help-2.8.2.tar.bz2 158504580 SHA256 e5658f1553428898bc23f07eedbb87e259ef9010fcf55b99b364f07d143b6e57 SHA512 3afdaa8b2f005d939d039d2e22c8306145e7b7acaca5ef89279998e87931e99d1fe607f1337f7796d667d5c6be456ba976b3c8a937c9dd6b1888d7158cfbed67 WHIRLPOOL 199a9d682c3f5516e858ace16e5c867cd0c28f9f18e2c9133e38dd49217326b674f0563f0f0727003ce5ebcc4a7a7d30d90eed98a4a85de56da62104e6591a67

app-doc/gimp-help/gimp-help-2.6.1.ebuild

@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
 inherit eutils
 
 DESCRIPTION="GNU Image Manipulation Program help files"
-HOMEPAGE="http://docs.gimp.org/"
+HOMEPAGE="https://docs.gimp.org/"
 
 LICENSE="FDL-1.2"
 SLOT="2"

app-doc/gimp-help/gimp-help-2.8.2.ebuild

@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1
+
+DESCRIPTION="GNU Image Manipulation Program help files"
+HOMEPAGE="https://docs.gimp.org/"
+SRC_URI="mirror://gimp/help/${P}.tar.bz2"
+
+LICENSE="FDL-1.2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/libxslt
+	sys-devel/gettext
+"
+
+src_configure() {
+	econf --without-gimp
+}

app-editors/lpe/lpe-1.2.6.13.ebuild

@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="a lightweight programmers editor"
-HOMEPAGE="http://packages.qa.debian.org/l/lpe.html"
+HOMEPAGE="https://packages.qa.debian.org/l/lpe.html"
 SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}-0.1.tar.gz"
 
 LICENSE="GPL-2"

app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild

@@ -0,0 +1,136 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic pax-utils
+
+DESCRIPTION="The Ubiquitous Amiga Emulator with an emulation core largely based on WinUAE"
+HOMEPAGE="http://www.rcdrummond.net/uae/"
+# We support _rcX for WIPX versions and _preYYYYMMDD for CVS snapshots.
+if [[ "${PV%%_rc*}" = "${PV}" ]] ; then
+	# _pre is used, cvs version
+	my_ver=${PV%%_pre*}
+	snap_ver=${PV##*_pre}
+	S="${WORKDIR}"/${PN}-${my_ver}-${snap_ver}
+	SRC_URI="http://www.rcdrummond.net/uae/test/${snap_ver}/${PN}-${my_ver}-${snap_ver}.tar.bz2"
+else
+	my_ver=${PV%%_rc*}
+	WIP_ver=${PV##*_rc}
+	S="${WORKDIR}"/${PN}-${my_ver}-WIP${WIP_ver}
+	SRC_URI="http://www.rcdrummond.net/uae/${PN}-${my_ver}-WIP${WIP_ver}/${PN}-${my_ver}-WIP${WIP_ver}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X dga ncurses sdl alsa oss sdl-sound capslib"
+
+# Note: opposed to ./configure --help zlib support required! Check
+# src/Makefile.am that includes zfile.c unconditionaly.
+RDEPEND="X? ( x11-libs/libXt
+			 x11-libs/libxkbfile
+			 x11-libs/libXext
+			 x11-misc/xkeyboard-config
+			 dga? ( x11-libs/libXxf86dga
+				    x11-libs/libXxf86vm )
+			)
+		!X? ( sdl? ( media-libs/libsdl )
+			  !sdl? ( sys-libs/ncurses:0= ) )
+		alsa? ( media-libs/alsa-lib )
+		!alsa? ( sdl-sound? ( media-libs/sdl-sound ) )
+		capslib? ( >=games-emulation/caps-20060612 )
+		sys-libs/zlib
+		virtual/cdrtools"
+
+DEPEND="${RDEPEND}
+		X? ( dga? ( x11-proto/xf86vidmodeproto
+					x11-proto/xf86dgaproto ) )"
+
+src_prepare() {
+	default
+	# Fix for high cpu use when compiled with --disable-audio
+	use alsa || use sdl-sound || use oss || eapply "${FILESDIR}"/${P}-high-cpu-usage.patch
+}
+
+src_configure() {
+	strip-flags
+
+	local myconf
+
+	# Sound setup.
+	if use alsa; then
+		elog "Choosing alsa as sound target to use."
+		myconf="--with-alsa --without-sdl-sound"
+	elif use sdl-sound ; then
+		if ! use sdl ; then
+			ewarn "sdl-sound is not enabled because sdl USE flag is disabled. Leaving"
+			ewarn "sound on oss autodetection."
+			myconf="--without-alsa --without-sdl-sound"
+		else
+			elog "Choosing sdl-sound as sound target to use."
+			ewarn "E-UAE with the SDL audio back-end doesn't work correctly in Linux."
+			ewarn "Better use alsa... You've been warned ;)"
+			myconf="--without-alsa --with-sdl-sound"
+		fi
+	elif use oss ; then
+		elog "Choosing oss as sound target to use."
+		ewarn "oss will be autodetected. See output of configure."
+		myconf="--without-alsa --without-sdl-sound"
+	else
+		ewarn "There is no alsa, sdl-sound or oss in USE. Sound target disabled!"
+		myconf="--disable-audio"
+	fi
+
+	# VIDEO setup. X is autodetected (there is no --with-X option).
+	if use X ; then
+		elog "Using X11 for video output."
+		ewarn "Fullscreen mode is not working in X11 currently. Use sdl."
+		myconf="$myconf --without-curses --without-sdl-gfx"
+		use dga && ewarn "To use dga you have to run e-uae as root."
+		use dga && myconf="$myconf --enable-dga --enable-vidmode"
+	elif use sdl ; then
+		elog "Using sdl for video output."
+		myconf="$myconf --with-sdl --with-sdl-gfx --without-curses"
+	elif use ncurses; then
+		elog "Using ncurses for video output."
+		myconf="$myconf --with-curses --without-sdl-gfx"
+	else
+		ewarn "There is no X or sdl or ncurses in USE!"
+		ewarn "Following upstream falling back on ncurses."
+		myconf="$myconf --with-curses --without-sdl-gfx"
+	fi
+
+	# bug #415787
+	myconf="$myconf --disable-ui"
+
+	myconf="$myconf $(use_with capslib caps)"
+
+	myconf="$myconf --with-zlib"
+
+	# And explicitly state defaults:
+	myconf="$myconf --enable-aga"
+	myconf="$myconf --enable-autoconfig --enable-scsi-device --enable-cdtv --enable-cd32"
+	myconf="$myconf --enable-bsdsock"
+
+	econf ${myconf} \
+		--with-libscg-includedir="${EPREFIX}"/usr/include/scsilib
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# The emulator needs to be able to create executable heap
+	# - doesn't need trampoline emulation though.
+	pax-mark me "${ED}/usr/bin/uae"
+
+	# Rename it to e-uae
+	mv "${ED}/usr/bin/uae" "${ED}/usr/bin/e-uae"
+	mv "${ED}/usr/bin/readdisk" "${ED}/usr/bin/e-readdisk"
+
+	dodoc docs/* README ChangeLog
+}

app-emulation/e-uae/files/e-uae-0.8.29_rc4-high-cpu-usage.patch

@@ -3,8 +3,8 @@ Index: src/sd-none/sound.c
 RCS file: /cvsroot/uaedev/uae/src/sd-none/sound.c,v
 retrieving revision 1.4
 diff -u -r1.4 sound.c
---- src/sd-none/sound.c	15 Feb 2007 04:47:38 -0000	1.4
+--- a/src/sd-none/sound.c	15 Feb 2007 04:47:38 -0000	1.4
-+++ src/sd-none/sound.c	25 May 2007 14:47:35 -0000
++++ b/src/sd-none/sound.c	25 May 2007 14:47:35 -0000
 @@ -30,10 +30,6 @@
  {
  }

app-emulation/fuse/Manifest

@@ -1,2 +1 @@
-DIST fuse-1.0.0.tar.gz 1628751 SHA256 a00add3abc0148247f7990e6feebcc32d82ebe857897d9426e5230222425aeb9 SHA512 dfa3647d12f515f4fbea1481e074b947adc552f1fdec23c20b550bdce619e7efdd977cad7ecb75ab50eb2da785d95ef9d8908d44600412d12da4ca5751d0d7c3 WHIRLPOOL 4329df04555d031f41581d47d1284ebd73aaec19320df3dbd9a2aa594085a95734aaae9275487809800ae371e2ce6d4c14a6fdb628f959f2db791c19fdeeae9c
 DIST fuse-1.1.1.tar.gz 1881332 SHA256 a857d4bd62e01d18429897467508af15624cbaf343caed8b9ba1ab3a8879444e SHA512 67d12c56057a13121d8a5c073002dd2168268894669bdb50f3aba977cb1f53afa48774bfcb438a627a5afdbd2288248d4449e57d744e17b9e3eba00970685a14 WHIRLPOOL b64dd50037a4cba617bd0e10794c01e1a63bc2e68cd990636c1daa88e9a515032216b34e72ca6876f432a72d214d1220b808d2aae2ba849ee66f3d3784f14b73

app-emulation/fuse/fuse-1.0.0.ebuild

@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils flag-o-matic
-
-DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall"
-HOMEPAGE="http://fuse-emulator.sourceforge.net"
-SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="alsa ao fbcon gpm gtk joystick memlimit png sdl svga X xml"
-
-# This build is heavily use dependent. Fuse user interface use flags are, in
-# order of precedence: gtk, sdl, X, svga and fbcon. X version of fuse will
-# be built if no valid user interface flag is chosen.
-RDEPEND="~app-emulation/libspectrum-1.0.0
-	gtk? ( x11-libs/gtk+:2
-		alsa? ( media-libs/alsa-lib )
-		!alsa? ( ao? ( media-libs/libao ) )
-		joystick? ( media-libs/libjsw ) )
-	!gtk? (
-		sdl? ( >=media-libs/libsdl-1.2.4 )
-		!sdl? (
-			X? ( x11-libs/libX11
-				x11-libs/libXext
-				alsa? ( media-libs/alsa-lib )
-				!alsa? ( ao? ( media-libs/libao ) )
-				joystick? ( media-libs/libjsw ) )
-			!X? (
-				svga? ( media-libs/svgalib
-					alsa? ( media-libs/alsa-lib )
-					!alsa? ( ao? ( media-libs/libao ) ) )
-				!svga? (
-					fbcon? ( virtual/linux-sources
-						gpm? ( sys-libs/gpm )
-						alsa? ( media-libs/alsa-lib )
-						!alsa? ( ao? ( media-libs/libao ) )
-						joystick? ( media-libs/libjsw ) )
-					!fbcon? ( x11-libs/libX11
-						x11-libs/libXext
-						alsa? ( media-libs/alsa-lib )
-						!alsa? ( ao? ( media-libs/libao ) )
-						joystick? ( media-libs/libjsw ) ) ) ) ) )
-	dev-libs/glib:2
-	png? ( media-libs/libpng sys-libs/zlib )
-	xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README THANKS )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-}
-
-src_configure() {
-	local guiflag
-
-	if use gtk; then
-		guiflag=""
-	elif use sdl; then
-		guiflag="--with-sdl"
-	elif use X; then
-		guiflag="--without-gtk"
-	elif use svga; then
-		guiflag="--with-svgalib"
-	elif use fbcon; then
-		guiflag="--with-fb"
-	else  # We default to X user interface
-		guiflag="--without-gtk"
-	fi
-
-	append-libs -lm #370265, fixed in 1.1.1
-
-	econf \
-		--without-win32 \
-		${guiflag} \
-		$(use_with gpm) \
-		$(use_with alsa) \
-		$(use_with ao libao) \
-		$(use_with joystick) \
-		$(use_enable joystick ui-joystick) \
-		$(use_with xml libxml2) \
-		$(use_with png ) \
-		$(use_enable memlimit smallmem)
-}
-
-src_install() {
-	default
-	doman man/fuse.1
-}

app-emulation/libspectrum/Manifest

@@ -1,2 +1 @@
-DIST libspectrum-1.0.0.tar.gz 462552 SHA256 cdf8f5006676c0f68939e331eeadeda5d608d777f1234b080b97f677f1dd287c SHA512 1ed3e36e9d62d69b470e959509d2a56e5a3608a9ea9f3f6f0ddd78e4f5f4a75da957e4120a0ffdf6366c3e90e148de9d83954fc711414389687e55bbc91f1bc8 WHIRLPOOL bf245f20181c82bae9e985e230729c3f341134f84239d82133231b2de5d8fe61533a1e11a9004b6d5a0971bdd97622ba453912522c66292b82715a5a937d351b
 DIST libspectrum-1.1.1.tar.gz 502942 SHA256 178d3607af2109b6b8dafac4f91912745b9f3c087319945c3a886bb7fe7989d5 SHA512 61197c8d1d6b4b595b55cf7e8f8c43423935291a9fbc688f1bb06d4c3ef53dbcf391a96f0528443518c2ca2d6fe187ee56d5ed915702f13a16ad44aa16037f49 WHIRLPOOL c89c7c3183f9d960dcedf789c763687e66cdaea1b2c41fdd41c1f1b0484cc9039790415bf8f231ff2bea0914fe2ababfd6d174338141bee13859521bf73caa92

app-emulation/libspectrum/libspectrum-1.0.0.ebuild

@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-DESCRIPTION="Spectrum emulation library"
-HOMEPAGE="http://fuse-emulator.sourceforge.net/libspectrum.php"
-SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="audiofile bzip2 gcrypt zlib"
-
-RDEPEND="zlib? ( sys-libs/zlib )
-	bzip2? ( >=app-arch/bzip2-1.0 )
-	>=dev-libs/glib-2
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	audiofile? ( >=media-libs/audiofile-0.2.3 )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig"
-
-src_configure() {
-	econf --with-glib \
-	$(use_with zlib zlib) \
-	$(use_with bzip2 bzip2) \
-	$(use_with audiofile libaudiofile) \
-	$(use_with gcrypt libgcrypt) \
-	|| die "econf failed!"
-}
-
-src_compile() {
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "Make install failed"
-	dodoc AUTHORS ChangeLog README THANKS doc/*.txt *.txt
-	doman doc/libspectrum.3
-}

app-emulation/libvirt/Manifest

@@ -1,2 +1,3 @@
 DIST libvirt-3.2.0.tar.xz 14057340 SHA256 9481a083b567a07927f239553dd70b5c0d1bff5b9b4ec61be1899981c646209e SHA512 35a9db3d59a3817d15fd6a586a2a73860b3d8a2d2ff37dbea1b4045fe1514c3535fce2eeba0f09df2d0bb9072ed9f1078ca9bad61a37c586eb019ddad3f898c4 WHIRLPOOL 499eb2cbf1367c99c106a747c76087f6ed980cc057cdb10cefe50a8a823a294f67925c98b1baa6ac7e12dcc20c90145b9a0c1e0927772e3b4a046bb4414391a0
 DIST libvirt-3.3.0.tar.xz 14043384 SHA256 29e00984174e33cf2183b478382c017de26860452ffee17b73871051264ebb1b SHA512 69166ddd7d4b9ef3b1bf2466e781139ef9b4d224a64acc7b8e6fca8786d36482138a1fe7b7407c0fca3b3d012cb418d168671a3e65e428f023c16493b7718c2d WHIRLPOOL 1b2688f6b9a89608677070b5ce1fd2b2af115336126d4214071bc1abba25056d54dbbf16d6bdfab7582b252a833d3e53e51175d552d5c936b08973c0eed76643
+DIST libvirt-3.4.0.tar.xz 14630904 SHA256 42186af6225904d2ada0b494fda4fa777fe5e662a9134686816e7919332c248d SHA512 41a3374e8a171827dfc11feb2ae8c1a9d889912257191b94111f53bbe0521d5bc73c824ea856e4cece257918b244120e9f44c800abe23d0296c85c18b5d14461 WHIRLPOOL 3b4b9ad35f590748fbc63595fab86671f66674d2c40fa8e02860265a39be5b48ed9c66c14ac235b36d29d833475aebbbf57f691e53ac2bd324dacb16507793bf

app-emulation/libvirt/libvirt-3.4.0.ebuild

@@ -0,0 +1,382 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils user linux-info systemd readme.gentoo-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+	SRC_URI=""
+	KEYWORDS=""
+	SLOT="0"
+else
+	# Versions with 4 numbers are stable updates:
+	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
+		SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz"
+	else
+		SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
+	fi
+	KEYWORDS="~amd64 ~x86"
+	SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="
+	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
+	libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
+	+qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
+	wireshark-plugins xen zeroconf zfs elibc_glibc
+"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	policykit? ( dbus )
+	qemu? ( libvirtd )
+	uml? ( libvirtd )
+	vepa? ( macvtap )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+	app-misc/scrub
+	dev-libs/libgcrypt:0
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.7.6
+	|| ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 )
+	>=net-libs/gnutls-1.0.25:0=
+	net-libs/libssh2
+	>=net-misc/curl-7.18.0
+	sys-apps/dmidecode
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:=
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dbus? ( sys-apps/dbus )
+	elibc_glibc? ( sys-libs/glibc[rpc(+)] )
+	firewalld? ( net-firewall/firewalld )
+	fuse? ( >=sys-fs/fuse-2.8.6 )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	libssh? ( net-libs/libssh )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	openvz? ( sys-kernel/openvz-sources:* )
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[-device-mapper-only(-)]
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	qemu? (
+		>=app-emulation/qemu-0.13.0
+		dev-libs/yajl
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	wireshark-plugins? ( net-analyzer/wireshark:= )
+	xen? (
+		app-emulation/xen
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/udev
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+	zfs? ( sys-fs/zfs )"
+
+DEPEND="${RDEPEND}
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch
+	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-3.0.0-fix_paths_for_apparmor.patch
+	"${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
+	"${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch # bug #609488
+)
+
+pkg_setup() {
+	if use qemu; then
+		enewgroup qemu 77
+		enewuser qemu 77 -1 -1 "qemu,kvm"
+	fi
+
+	use policykit && enewgroup libvirt
+
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use macvtap && CONFIG_CHECK+="
+		~MACVTAP"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	# Handle specific kernel versions for different features
+	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	if kernel_is ge 3 6; then
+		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
+	fi
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+
+	default
+
+	if [[ ${PV} = *9999* ]]; then
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+			git submodule status | sed 's/^[ +-]//;s/ .*//'
+			git hash-object bootstrap.conf
+		) >.git-module-status
+	fi
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
+		-e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
+		-e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with apparmor)
+		$(use_with apparmor apparmor-profiles)
+		$(use_with audit)
+		$(use_with caps capng)
+		$(use_with dbus)
+		$(use_with firewalld)
+		$(use_with fuse)
+		$(use_with glusterfs)
+		$(use_with glusterfs storage-gluster)
+		$(use_with iscsi storage-iscsi)
+		$(use_with libvirtd)
+		$(use_with libssh)
+		$(use_with lvm storage-lvm)
+		$(use_with lvm storage-mpath)
+		$(use_with lxc)
+		$(use_with macvtap)
+		$(use_enable nls)
+		$(use_with numa numactl)
+		$(use_with numa numad)
+		$(use_with openvz)
+		$(use_with parted storage-disk)
+		$(use_with pcap libpcap)
+		$(use_with phyp)
+		$(use_with policykit polkit)
+		$(use_with qemu)
+		$(use_with qemu yajl)
+		$(use_with rbd storage-rbd)
+		$(use_with sasl)
+		$(use_with selinux)
+		$(use_with udev)
+		$(use_with uml)
+		$(use_with vepa virtualport)
+		$(use_with virt-network network)
+		$(use_with wireshark-plugins wireshark-dissector)
+		$(use_with xen)
+		$(use_with xen xen-inotify)
+		$(use_with xen libxl)
+		$(use_with zeroconf avahi)
+		$(use_with zfs storage-zfs)
+
+		--without-hal
+		--without-netcf
+		--without-sanlock
+		--without-xenapi
+
+		--with-esx
+		--with-init-script=systemd
+		--with-qemu-group=$(usex caps qemu root)
+		--with-qemu-user=$(usex caps qemu root)
+		--with-remote
+		--with-storage-fs
+		--with-vmware
+
+		--disable-static
+		--disable-werror
+
+		--with-html-subdir=${PF}/html
+		--localstatedir=/var
+	)
+
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
+	else
+		myeconfargs+=( $(use_with virtualbox vbox) )
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+src_test() {
+	cd "${BUILD_DIR}"
+
+	# remove problematic tests, bug #591416, bug #591418
+	sed -i -e 's#commandtest$(EXEEXT) # #' \
+		-e 's#virfirewalltest$(EXEEXT) # #' \
+		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
+		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
+		tests/Makefile
+
+	export VIR_TEST_DEBUG=1
+	HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Remove bogus, empty directories. They are either not used, or
+	# libvirtd is able to create them on demand
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var/cache
+	rm -rf "${D}"/var/run
+	rm -rf "${D}"/var/log
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	systemd_install_serviced \
+		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
+
+	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd || die
+	newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die
+	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
+	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	readme.gentoo_print_elog
+}

app-emulation/spim/files/spim-8.0-r1-respect_env.patch

@@ -1,5 +1,5 @@
---- spim/Makefile	2010-08-01 22:14:53.352906061 +0200
+--- a/spim/Makefile	2010-08-01 22:14:53.352906061 +0200
-+++ spim/Makefile	2010-08-01 22:15:00.994905920 +0200
++++ b/spim/Makefile	2010-08-01 22:15:00.994905920 +0200
 @@ -66,13 +66,13 @@
  
  
@@ -92,8 +92,8 @@
  
  very-clean: clean
  	rm -f configuration
---- xspim/Makefile	2010-08-01 22:14:53.351905921 +0200
+--- a/xspim/Makefile	2010-08-01 22:14:53.351905921 +0200
-+++ xspim/Makefile	2010-08-01 22:26:08.361917058 +0200
++++ b/xspim/Makefile	2010-08-01 22:26:08.361917058 +0200
 @@ -169,18 +169,18 @@
  
           VARDBDIR = $(VARDIR)/lib

app-emulation/spim/spim-8.0-r2.ebuild

@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="MIPS Simulator"
+HOMEPAGE="http://spimsimulator.sourceforge.net/"
+SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc X"
+
+RDEPEND="X? ( media-fonts/font-adobe-100dpi
+	x11-libs/libXaw
+	x11-libs/libXp )"
+DEPEND="${RDEPEND}
+	X? ( x11-misc/imake
+		x11-proto/xproto )
+	>=sys-apps/sed-4
+	sys-devel/bison"
+# test hangs forever, disabling it
+RESTRICT="test"
+
+src_prepare() {
+	# fix bugs 240005 and 243588
+	eapply "${FILESDIR}/${P}-r1-respect_env.patch"
+
+	#fix bug 330389
+	sed -i -e 's:-12-\*-75-:-14-\*-100-:g' xspim/xspim.c || die
+
+	default
+}
+
+src_configure() {
+	tc-export CC
+	emake -C spim configuration
+
+	if use X; then
+		emake -C xspim configuration
+	fi
+}
+
+src_compile() {
+	emake DESTDIR="${EPREFIX}" -C spim
+
+	if use X; then
+		emake DESTDIR="${EPREFIX}" EXCEPTION_DIR=/var/lib/spim \
+			-C xspim -j1 xspim
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${ED}" -C spim install
+	newman Documentation/spim.man spim.1
+
+	if use X; then
+		emake DESTDIR="${ED}" -C xspim install
+		newman Documentation/xspim.man xspim.1
+	fi
+
+	doicon "${FILESDIR}"/xspim.svg
+	make_desktop_entry xspim xSPIM xspim "ComputerScience;Science;Education"
+
+	dodoc Documentation/SPIM.html
+	dodoc ChangeLog Documentation/BLURB README VERSION
+	if use doc ; then
+		dodoc Documentation/TeX/{cycle,spim}.ps
+	fi
+}
+
+src_test() {
+	emake -C spim test
+}

app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild

@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manages the /usr/bin/miniAudicle symlink"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/miniaudicle.eselect-${PV}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2.3"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# Fixes listing as described in bug 320189, not upstream yet
+	eapply "${FILESDIR}"/miniaudicle-1.0.1_list.patch
+	default
+}
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	newins "${WORKDIR}/miniaudicle.eselect-${PV}" miniaudicle.eselect
+}

app-eselect/eselect-miniaudicle/files/miniaudicle-1.0.1_list.patch

@@ -1,5 +1,5 @@
---- miniaudicle.eselect-1.0.1.orig	2010-07-14 23:21:11.000000000 -0400
+--- a/miniaudicle.eselect-1.0.1.orig	2010-07-14 23:21:11.000000000 -0400
-+++ miniaudicle.eselect-1.0.1	2010-07-14 23:22:22.000000000 -0400
++++ b/miniaudicle.eselect-1.0.1	2010-07-14 23:22:22.000000000 -0400
 @@ -73,7 +73,7 @@
  	targets=( $(find_targets ) )
  	write_list_start "Available miniAudicle audio engines:"

app-i18n/man-pages-fr/Manifest

@@ -1,2 +1,2 @@
-DIST man-pages-fr-2.39.0.tar.bz2 893093 SHA256 0a9157868ef7f5be469a4252d0df08d0df0cf7b57b986a55e9e4e7592c212da2 SHA512 1c3d856a16cb42a55293d89806c176b6bd952119e1ca2300d1f4e66471147877a25dba9050e3998a6110592c7de6bcd36bd60f945b2f30d663248ccfc80274ea WHIRLPOOL d47fbdf9eb2e2164c7643fb2f91480c360b80f6338afcd74bde733d9b3a1e7a4279b509e2ac96befdd0e757eadd1adbf4ddb53773a03e90ae488c6397c407f04
 DIST man-pages-fr-3.40.1.tar.bz2 1136351 SHA256 0bab5b5f703c805139bfa38ceb2360173044aca5dd398bc1e307da9745e35988 SHA512 58027da7b78a442a84448ed6d7c6c89ccbe97fd811afb26a9c6580da2e15b86f7fae4c876d773f7ceca1fbe92c265693eae01b76ad4795b52c0298ba25ac1330 WHIRLPOOL dcf6a253a149e41d489fc4362e8430ce37b823f0d7804fc80f2aa97d0f4f9fe1def1804bad69f8f1de4e8ee79c1297b8a32e0b9a4449b4c2b64da4408fe28dbe
+DIST man-pages-fr-3.70-1.tar.xz 1143156 SHA256 6d07c3b51a75c10b72eaab703c3eb5d315fd6fa8b354e145cc29da12e9a158a6 SHA512 7bb6991b2278c898d67d465ebe434dc3a969e9ec5c962ed6b6fdb41e66121a1924573f529d310adf30cd8494515888627b3226f26b906452a8882c4851c290d8 WHIRLPOOL 4858ad94730f9ef509e8684656fb982d8c547f960f8278121e7d514953303d8f40a66540335a71cab6ac5470bad5bd5da1167bdf4d0eb26fff3e07117b1540cb

app-i18n/man-pages-fr/man-pages-fr-2.39.0.ebuild

@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="A somewhat comprehensive collection of french Linux man pages"
-HOMEPAGE="http://fr.tldp.org/manfr.php"
-SRC_URI="ftp://ftp.win.tue.nl/pub/linux-local/manpages/translations/${P}.tar.bz2"
-
-LICENSE="man-pages GPL-2+ BSD MIT LDP-1 public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-src_compile() { :; }
-
-src_install() {
-	dodoc LISEZ_MOI changements
-	for x in man? ; do
-		insinto /usr/share/man/fr/${x}
-		doins ${x}/* || die "doins ${x}"
-	done
-}

app-i18n/man-pages-fr/man-pages-fr-3.40.1.ebuild

@@ -1,15 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="A somewhat comprehensive collection of french Linux man pages"
-HOMEPAGE="http://traduc.org/perkamon"
+HOMEPAGE="https://traduc.org/perkamon"
-SRC_URI="http://alioth.debian.org/frs/download.php/3722/${P}.tar.bz2"
+SRC_URI="https://alioth.debian.org/frs/download.php/3722/${P}.tar.bz2"
 
 LICENSE="man-pages GPL-1+ GPL-2+ GPL-2 BSD BSD-2 MIT rc LDP-1 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="virtual/man"

app-i18n/man-pages-fr/man-pages-fr-3.70.ebuild

@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A somewhat comprehensive collection of french Linux man pages"
+HOMEPAGE="https://traduc.org/perkamon"
+SRC_URI="https://alioth.debian.org/frs/download.php/file/4119/${P}-1.tar.xz"
+
+LICENSE="BSD FDL-1.1 FDL-1.2 GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="virtual/man"
+DEPEND=""
+
+S="${WORKDIR}/fr"
+
+src_install() {
+	dodoc README.fr
+	doman -i18n=fr man*/*
+}

app-misc/datefudge/datefudge-1.17.ebuild

@@ -5,7 +5,7 @@ EAPI=4
 inherit multilib toolchain-funcs eutils
 
 DESCRIPTION="A program (and preload library) to fake system date"
-HOMEPAGE="http://packages.qa.debian.org/d/datefudge.html"
+HOMEPAGE="https://packages.qa.debian.org/d/datefudge.html"
 SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"

app-mobilephone/gammu/gammu-1.33.0-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils cmake-utils python-single-r1
 
 DESCRIPTION="A tool to handle your cellular phone"
-HOMEPAGE="http://www.wammu.eu/"
+HOMEPAGE="https://www.wammu.eu/"
 SRC_URI="http://dl.cihar.com/${PN}/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"

app-mobilephone/gammu/gammu-1.36.8.ebuild

@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils cmake-utils
 
 DESCRIPTION="A tool to handle your cellular phone"
-HOMEPAGE="http://wammu.eu/gammu/"
+HOMEPAGE="https://wammu.eu/gammu/"
 SRC_URI="http://dl.cihar.com/${PN}/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"

app-text/duali/duali-0.2.0-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ PYTHON_REQ_USE="gdbm"
 inherit python-single-r1
 
 DESCRIPTION="Arabic dictionary based on the DICT protocol"
-HOMEPAGE="http://www.arabeyes.org/project.php?proj=Duali"
+HOMEPAGE="https://www.arabeyes.org/Duali"
 SRC_URI="mirror://sourceforge/arabeyes/${P}.tar.bz2"
 
 LICENSE="BSD"

app-text/dvipsk/dvipsk-5.996_p20160523.ebuild

@@ -28,7 +28,7 @@ SRC_URI="${SRC_URI} ) "
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"

app-text/dvisvgm/Manifest

@@ -1,7 +1,2 @@
 DIST dvisvgm-1.10.tar.gz 831654 SHA256 339f4dcef0916c1daaf1b65d966737279464ec6858b28fda7196d8030d7f3735 SHA512 2d3cb2e6b36d6a3b996347b6031f67bb89bc76d2bf0244347e512e66333536638caf855d9856771b10245387abae99a06d4c6fe33def814cae639810b4cfe906 WHIRLPOOL 398e5378ce6e84768b73f7d6e9776eb177619de785a70d8fa416fecb275903e49c065ec23d78881eede9d4944525ecfba44d34a5d1b74b87dc1ef6ecf127b869
-DIST dvisvgm-1.8.1.tar.gz 706270 SHA256 6832e3f4b43fa0b96333c1857012e70a83f059b0d222239936e1d6fa3b62cc08 SHA512 6ca3f0e4ff28fa59d14dd5891b205db850bb8c91531e6bcda05a3e6bb7e2bca9d71eaca4bf408577cd756277e8f3b6be12e5b3102fb848b329f66b7a9eda0270 WHIRLPOOL 0bd6e23c2df1499f4d106d007ff995bbbeb70482bc0087ff3acfcb921085f24ac66374ee949f00ccc6ee56c104880a4a58ad365df0a5ce91c65409a3a3c097bc
-DIST dvisvgm-2.0.4.tar.gz 2163747 SHA256 3553e3b0bd5936c10f2b16c97e2c4f8cc79908d4effb3ef1d598d30b1fec39b2 SHA512 fc1207505936d5e22a8d70e8d0778454d516131995c4feb494b8b427addb549012c77ceec95206be3c6ec394008f779cf879ace9b4e1bf364940049bfdc00b69 WHIRLPOOL d9b3a0a3c49d2b1ccd503e2de800603dd47c363af0c89ce328235f6ae1871499b3c400b9d77398b256ebd768b11b8948a29bd40a928df4fecc16828275ed369e
-DIST dvisvgm-2.1.1.tar.gz 2318231 SHA256 90f7a276a3fd2e0585faa356164145b936e69463317c4255a994b56b3ea00c33 SHA512 27fac78faf8eba9d8b51fda6add1973f720eae20ae16953acf985002539f447ef3b839dd7e5619d402048a46b193c9376cdd4e71896a083336e20fd99eb385b9 WHIRLPOOL 3fce984969534818d687d4ed1085fa62cdf7eb913bb1a6e172e4202cf600d77f5dfa85cf4c09cc26a53513c14946c970ef17f67472143b843803fbd62447077a
-DIST dvisvgm-2.1.2.tar.gz 2761428 SHA256 e17146e06474eb9bd932c164c92c16bdadb60320123ccba04c4bb2db0d3eb788 SHA512 397972e9d84eb043bee947d2378b38200d4ea52a474c5cfb8e94674cc0779cd5c2fc23249cd78f4ee4a9cf7872ea57343ed1e93186d317710c633442dd18ecae WHIRLPOOL 9ec4326c0487b15ec5adebb7c064d70b7c135abdf3a6fe02b9de1d49c3bab7c594b07b76787b4c1117e542159b09ae90d1750f3c7203ddfd20b79f3744623754
 DIST dvisvgm-2.1.3.tar.gz 2802278 SHA256 553215051e85882ab4658c294ed0483cd5009d295f0a38dfccb480367abfd170 SHA512 dfd6e94b28dcdf2d1be236f3f29eaf4e3e5b7bb34544cdd55ae09de612b02561dd782b693a9a94eea07420c795d31ef210eba34cb663d7de98f438c089369ff2 WHIRLPOOL 0baf0fff0172f9ff7dc95a848b69af240d6008f9f6e306f613f73b02a54d1922407cd12560fe166fd758de5f6f4a04e00e5d50af8098d09d59be84d4353e6962
-DIST dvisvgm-2.1.tar.gz 2303827 SHA256 4ae8f128cd1f1f1018623255e7160187ac24929bb1f940ba9cf993a2a3115bae SHA512 744fa6ed4ec64f8688caade785c6cc0488b42fe22434874070b9f8788ac6b468349e98b320bc70d4db3035e73f143de503aeabbe266516f6b4cd167eedbe8540 WHIRLPOOL 708aeea12657a2b0739d01aaffdfc49fb570223c9764f4073ada6168c169735019639cd260278711b4b722274f1de70044a0fb4cefc085b539ab8f6692c4b815

app-text/dvisvgm/dvisvgm-1.8.1.ebuild

@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-RDEPEND="virtual/tex-base
-	app-text/ghostscript-gpl
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"

app-text/dvisvgm/dvisvgm-2.0.4.ebuild

@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic autotools
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.bplaced.net/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-RDEPEND="virtual/tex-base
-	app-text/ghostscript-gpl
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	dev-libs/kpathsea
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	app-text/asciidoc
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-c99-compile.patch
-	eautoreconf
-}
-
-src_configure() {
-	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-	default
-}

app-text/dvisvgm/dvisvgm-2.1.1.ebuild

@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.bplaced.net/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-RDEPEND="virtual/tex-base
-	app-text/ghostscript-gpl
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	dev-libs/kpathsea
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	app-text/asciidoc
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
-
-src_configure() {
-	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-	default
-}

app-text/dvisvgm/dvisvgm-2.1.2.ebuild

@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.bplaced.net/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-RDEPEND="virtual/tex-base
-	app-text/ghostscript-gpl
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	dev-libs/kpathsea
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	app-text/asciidoc
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
-
-src_configure() {
-	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-	default
-}

app-text/dvisvgm/dvisvgm-2.1.3.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.

app-text/dvisvgm/dvisvgm-2.1.ebuild

@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.bplaced.net/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-RDEPEND="virtual/tex-base
-	app-text/ghostscript-gpl
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	dev-libs/kpathsea
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	app-text/asciidoc
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
-
-src_configure() {
-	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-	default
-}

app-text/dvisvgm/files/dvisvgm-2.0.4-c99-compile.patch

@@ -1,24 +0,0 @@
-From 4aaf49080cfc84c2aa4a271b8dd12e9e9fa8b7bd Mon Sep 17 00:00:00 2001
-From: Martin Gieseking <martin.gieseking@uos.de>
-Date: Wed, 16 Nov 2016 18:36:09 +0100
-Subject: [PATCH] ensure compiling C files with --std=c99
-
----
- configure.ac | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1044096..6a317be 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,8 +17,9 @@ AH_TEMPLATE([TARGET_SYSTEM], [The machine triplet of the target system])
- AC_DEFINE_UNQUOTED([TARGET_SYSTEM], ["$target"])
- 
- # Checks for programs.
--AC_PROG_CXX
- AC_PROG_CC
-+AC_PROG_CC_C99
-+AC_PROG_CXX
- AX_CXX_COMPILE_STDCXX([11], [noext])
- 
- AC_PROG_RANLIB

app-text/libgxps/libgxps-0.2.5.ebuild

@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86"
 IUSE="debug +introspection jpeg lcms static-libs tiff"
 
 RDEPEND="

app-text/ps2pkm/ps2pkm-1.8_p20160523.ebuild

@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"

app-text/texlive-core/texlive-core-2016-r5.ebuild

@@ -74,7 +74,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk X doc source tk +luajittex xetex"
 
 TEXMF_PATH=/usr/share/texmf-dist

app-text/texlive/texlive-2016.ebuild

@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context detex dvi2tty extra epspdf games graphics
 humanities jadetex luatex metapost music omega pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xindy xml X"

app-text/ttf2pk2/ttf2pk2-2.0_p20160523.ebuild

@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and

dev-cpp/glibmm/Manifest

@@ -1,3 +1,2 @@
 DIST glibmm-2.48.1.tar.xz 6235724 SHA256 dc225f7d2f466479766332483ea78f82dc349d59399d30c00de50e5073157cdf SHA512 280949315e592ff8f3f7cfa6376d129211ffb6832146578d6533c4792aafef8b4ea5354943d5623ebf34ce31b8c71b6055a51de2b8ae8cfb419e6e033d9f98fa WHIRLPOOL 81c369bf7bf7ebc1f88e47943ed4b352644cad05566ec2fa04f0974a9e48dbc56b3cbd2f3bde9f55412da886e9b99fde096a1936834c65c77ede3781be30e0fd
-DIST glibmm-2.50.0.tar.xz 6435208 SHA256 df726e3c6ef42b7621474b03b644a2e40ec4eef94a1c5a932c1e740a78f95e94 SHA512 ed1043fbb5d16dfcb1e71f73e2c998110aa0dbc42b3fc9d8d1cc03e299b171021f2d2ac3055f5685d11b4dc1ddef42d9378eaac895163ddd80f39a627cecdc60 WHIRLPOOL b9c6867876311381b986f5123b6574bae01b45054e80a00c83688d756ed2a8e213dc3b1153a0aeb2672d9db998771fd6f538e1d592ffcb695ff7ac6147094975
 DIST glibmm-2.50.1.tar.xz 6444576 SHA256 1fd85051da9cb402cc8348cec72dfe4d79f9345df4a1dbf68703a4ded45846a4 SHA512 4f25c75c1628ca2f4db1c29cebc63187d372603066b06aa6a66c6da792f9e02cb4a413e41f058a81e2d5a2b38d625de13df76115b278f010ce2fc493fe6e6bbb WHIRLPOOL 54b656e04550a050994061db1498a3ac066b1e37643faa218ec1ef04604c0d37c799572b546e79c29f1b35586b1a5b0c354eca72151756eb99f4434a27fa7ae2

dev-cpp/glibmm/glibmm-2.50.0.ebuild

@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug test"
-
-RDEPEND="
-	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-# dev-cpp/mm-common needed for eautoreconf
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
-			-i Makefile.am Makefile.in || die "sed 1 failed"
-	fi
-
-	# don't build examples - we want to install example sources, not binaries
-	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die "sed 2 failed"
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(use_enable debug debug-refcounting) \
-		$(multilib_native_use_enable doc documentation) \
-		--enable-deprecated-api
-}
-
-multilib_src_test() {
-	cd tests
-	default
-
-	for i in */test; do
-		${i} || die "Running tests failed at ${i}"
-	done
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-	find examples -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
-	dodoc -r examples
-}

dev-cpp/glibmm/glibmm-2.50.1.ebuild

@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
 
 RDEPEND="

dev-cpp/gtkmm/gtkmm-3.22.0.ebuild

@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE="aqua doc test wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

dev-db/etcd/Manifest

@@ -1,6 +1,4 @@
-DIST etcd-2.3.7.tar.gz 2209051 SHA256 aa3a6340bb08d072d1d2ecfbe3c1e02235251760d031a2b699ee1710510ee883 SHA512 a551287ebf6e881e2c6a56a7e75c273d125ed2b4b3ea58533e4481bc12ca21167de02820aaa1f4775b81385e96e65f882e97121920be02d72abe82f43652daf9 WHIRLPOOL e01bf51978b9287e9e662f8689630d80eb79aace43fe0c81f1898718ccec1a0a93e53543c3df001dfc12dac2a3844f5a4fe2de28d97654b671648ad93681185a
 DIST etcd-2.3.8.tar.gz 2206562 SHA256 6a138b2005e42b0961a12886cc641b792e991cd631fdb502ec5c614b65231cd1 SHA512 4268de32797cab23e9e47784d31d5abd6982068c53d3cc9735a06719740dba45b73f4e067cbc7aa8aef5ca7c56d8be067f1076685ac82f64012b760d8b7f2bfc WHIRLPOOL 4db1b4fe6d0ff917adfc53bd959bb7ac2937da794483e4a4a95e5fb557cf4fbfd43d5bb3c5e21e499432f80f6606407accaa69bc03a3982621276deb529c07da
 DIST etcd-3.0.17.tar.gz 2208002 SHA256 c56c68a8cd5d120a51432f3a79a2c19082a6824493e4bb08c4e440aefbf73d8f SHA512 6eb6a61210f225b6fe7e911ad135e5014f80f71a04adccc3f382ca7b5e1b1b692b12dde26335ecac176cb8b8f4586732cb6e650b32730ec68ef7fbcbba7ab160 WHIRLPOOL 102dc47d120a1f4173b67168e5e51f64025da280ca41161131a6bd2ef9521605ef19e03166848f6c32862a3adbfc0a026f547dc7764018e85f6ac28f89c8d256
-DIST etcd-3.1.0.tar.gz 2516872 SHA256 62ecb70a470b45436814e2882d36742a4035e1d62e6634450e71ca0ed951919b SHA512 b377ac492dd842a0f24d2816cd37bb40e692289efbbab63ab54e1b31e7999f26c6c0f2887249f5fd775266919a614699e561ecfc82c8a687d2cf1b25fdb7478f WHIRLPOOL b47a81ea597617a4eab6ee29d51b964f942b8dc324063e6633e2818320ce3b19e1907975a28ca3186cc112553b4e8580c210ad4854945484dcc26f359d0c60e6
+DIST etcd-3.1.9.tar.gz 2524517 SHA256 94cf6a970ca707eec16e3264b8cd20ef8963d0683958ef087b52f490ab784a6f SHA512 e4727f2bafaf38c139608726947258f3ae3aa91452b145710ff527f5b57cbda18474902450581882e668befc422f6a1b9f1232a23e3eeedefae2ed2da1814cfc WHIRLPOOL c0241b76220cfccc331db3caf19c1ab33485b0219d31656a26e577c0ae9ae606f17f05b34a1c58644b24a2a712b61982429c25489923892ccb09806ac0a2eb24
-DIST etcd-3.1.6.tar.gz 2522712 SHA256 9bc6f280f3875f7e5dd6685c4dbe1a237306669843cced38d08ea53580bafb19 SHA512 3ff6d7c85c345d5d4515f7c8cc40c01758ef34bfe65a8f23149dfea5037e4dee5c382e3a28c17d7e8865b8e916c2e61cc350277c9e5be7f5b7853c4f59a2bfe3 WHIRLPOOL 87f9835a1a6ed40bcfedb051973140e81b72874da6be22777f70e8a2a6046a2be5ebd00b2e98220d77eb185ef9e044032cc2fbfc2513187633b606b9087347c2
+DIST etcd-3.2.0.tar.gz 2869095 SHA256 b047756eea4d1592d373582e3300c0aec58c508e6a08bf6582c08d3571f3578d SHA512 a5d119eace3ffb441b847613bed0f011f53666eba0130b0da48b4511b61918228412f1caa93775c5b4e32f9c9cb549382f922257fd1b93f844967521686b86c6 WHIRLPOOL 95df6f3f271016bdf8288a6cd3424f7706a8695e473a7828eac625b1b810af9d9e10b2e164755659d989744e7d041db96839e94d748152184a65c6e8391565bc
-DIST etcd-3.1.8.tar.gz 2524139 SHA256 f68700f710dfd9c5fefb41a60e96f9d0c7907e6abe21518ab0a05f6e425a3d4e SHA512 8228f4556501fbc860eb381df9ec806be0973cc92550e1285f88800575760ee7f0bc277edb6c32eb3b7c6bea7af3a1074986c9ceb6b4d97166623f16bc3dc36a WHIRLPOOL 1edca7e720d76f4b532a805e096cc33289c2fc981b11fc37d4327aead394aaddc89f199f65392e0b3b2caa14bc9c8e6abf62895fd0fbf8eaef8e9c74ba09f4b9

dev-db/etcd/etcd-2.3.7.ebuild

@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user systemd
-
-KEYWORDS="~amd64"
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/coreos/etcd/"
-SRC_URI="https://github.com/coreos/etcd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc"
-DEPEND=">=dev-lang/go-1.4:="
-RDEPEND="!dev-db/etcdctl"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
-		-e 's|-ldflags "-s.*"|-v -x|' \
-		-e 's|-ldflags "-s|-v -x "|' \
-		-i build || die
-	sed -e 's|go test|\0 -v|'\
-		-i test || die
-}
-
-src_compile() {
-	./build || die
-}
-
-src_install() {
-	insinto /etc/${PN}
-	doins "${FILESDIR}/${PN}.conf"
-	dobin bin/*
-	dodoc README.md
-	use doc && dodoc -r Documentation
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	dodir /var/lib/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN}
-	fperms 755 /var/lib/${PN}
-	dodir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	fperms 755 /var/log/${PN}
-}
-
-src_test() {
-	./test || die
-}

dev-db/etcd/etcd-3.1.0.ebuild

@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-EGO_PN=github.com/coreos/etcd
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://${EGO_PN}/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc"
-DEPEND=">=dev-lang/go-1.6:="
-RDEPEND="!dev-db/etcdctl"
-
-src_prepare() {
-	eapply_user
-	sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
-		-i "${S}"/src/${EGO_PN}/build || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_compile() {
-	export GOPATH=${S}
-	cd "${S}"/src/${EGO_PN} || die
-	./build || die
-}
-
-src_install() {
-	cd "${S}"/src/${EGO_PN} || die
-	insinto /etc/${PN}
-	doins "${FILESDIR}/${PN}.conf"
-	dobin bin/*
-	dodoc README.md
-	use doc && dodoc -r Documentation
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	dodir /var/lib/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN}
-	fperms 755 /var/lib/${PN}
-	dodir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	fperms 755 /var/log/${PN}
-}
-
-src_test() {
-	cd "${S}"/src/${EGO_PN} || die
-	./test || die
-}

dev-db/etcd/etcd-3.2.0.ebuild

@@ -6,7 +6,7 @@ EAPI=6
 inherit user systemd golang-vcs-snapshot
 
 KEYWORDS="~amd64"
-EGO_PN=github.com/coreos/etcd
+EGO_PN="github.com/coreos/etcd"
 DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
 HOMEPAGE="https://github.com/coreos/etcd"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit eutils cmake-utils flag-o-matic multilib
 DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
 HOMEPAGE="http://dev.mysql.com/downloads/connector/cpp/"
 URI_DIR="Connector-C++"
-SRC_URI="mirror://mysql/Downloads/${URI_DIR}/${P}.tar.gz"
+SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"

dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit eutils cmake-utils flag-o-matic multilib
 DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
 HOMEPAGE="http://dev.mysql.com/downloads/connector/cpp/"
 URI_DIR="Connector-C++"
-SRC_URI="mirror://mysql/Downloads/${URI_DIR}/${P}.tar.gz"
+SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"

dev-db/mysql-connector-c++/mysql-connector-c++-1.1.8.ebuild

@@ -8,7 +8,7 @@ inherit cmake-utils flag-o-matic
 DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
 HOMEPAGE="http://dev.mysql.com/downloads/connector/cpp/"
 URI_DIR="Connector-C++"
-SRC_URI="mirror://mysql/Downloads/${URI_DIR}/${P}.tar.gz"
+SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"

dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://dev.mysql.com/downloads/connector/c/"
 LICENSE="GPL-2"
 
-SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
 S="${WORKDIR}/${P}-src"
 KEYWORDS="~amd64 ~x86"
 

dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://dev.mysql.com/downloads/connector/c/"
 LICENSE="GPL-2"
 
-SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
 S="${WORKDIR}/${P}-src"
 KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86"
 

dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://dev.mysql.com/downloads/connector/c/"
 LICENSE="GPL-2"
 
-SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
 S="${WORKDIR}/${P}-src"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc64 ~x86"
 

dev-db/mysql-connector-c/mysql-connector-c-6.1.9-r1.ebuild

@@ -16,7 +16,7 @@ DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://dev.mysql.com/downloads/connector/c/"
 LICENSE="GPL-2"
 
-SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
 S="${WORKDIR}/${P}-src"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc64 ~x86"
 

dev-db/mysql-connector-c/mysql-connector-c-6.1.9.ebuild

@@ -16,7 +16,7 @@ DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://dev.mysql.com/downloads/connector/c/"
 LICENSE="GPL-2"
 
-SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
 S="${WORKDIR}/${P}-src"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc64 ~x86"
 

dev-db/sqlite/Manifest

@@ -2,11 +2,14 @@ DIST sqlite-autoconf-3160200.tar.gz 2508179 SHA256 65cc0c3e9366f50c0679c5ccd3143
 DIST sqlite-autoconf-3170000.tar.gz 2515143 SHA256 a4e485ad3a16e054765baf6371826b5000beed07e626510896069c0bf013874c SHA512 bebf2693ade1c99b6a178bbe663f64911bf7751932a2524506994cbbb19ab254e7febe3693a76084e55853c1ea85db9e4ece87192422583555fbe569915a2ca8 WHIRLPOOL c3ddeb9691470dfd10950ef36bca8f05f06faa171e3ee87da66d431ba364b7dd903b1350b8ab1aae445a2696ea56dd3f0c50e07d25bc83a09d673a9b92c84e3f
 DIST sqlite-autoconf-3180000.tar.gz 2533004 SHA256 3757612463976e7d08c5e9f0af3021613fc24bbcfe1c51197d6776b9ece9ac5c SHA512 4c2efda1d63d1849f7a351cc57c02cc1820efe3c19f88460a131a1d6ae4f7411e4b7672a5581055e581093df29f65cebd9ff5b24125c18802523b17477dce1ef WHIRLPOOL 5424d028af1649cedeb9192d86939753000bb94676b0578d5bdd33591ddd064f2e9ca60a1abc6e185a8fbbfd13c04361e7bfd82945b3b7c01073b8e79e985031
 DIST sqlite-autoconf-3190200.tar.gz 2542613 SHA256 ca5361fb01cc3ad63d6fd4eb2cb0b6398e629595896d3558f7e121d37dac2ffc SHA512 fc9fbb76a741a22d620902868d5db6c8954db8a2692c8e91080ab96f41b4e18a4d27aa8f549c8fac62aaf5ad20c908abd01ecc0fdf7204310bf0cb6d1a2e5e14 WHIRLPOOL 003b4600a4689d94b690f9122e749401371deb39e0a04ffcdf161fc72b8d89349a7e9cf9883d54064c23ea08a72cac190d1d14fb586349c528a033d72b139a84
+DIST sqlite-autoconf-3190300.tar.gz 2542682 SHA256 06129c03dced9f87733a8cba408871bd60673b8f93b920ba8d815efab0a06301 SHA512 7896c99726da75818f1027d5675b24724bc89c738874c868868e60c09d4509ad5a6da93f54cfcecb3a1052e4f164f7cb864ede333b9ccfb4f6b811b052ca1d3d WHIRLPOOL 8881e2077a2f443e849e1c1bc4d824e8dfdf3f47f505288f00772e6f7f64b927ae8df0d2d63f240f8b344d729b8258c797073786d3ef75c40e668784c8a8f1c4
 DIST sqlite-doc-3160200.zip 5521023 SHA256 c13ffbb6019f3849b251c22358f31ccb862a842c0a2379f552f2935600157dcb SHA512 b79d21074d1ab154e3b324fb2943f24321ad5cdbc6e2030f1d21940ae46538462af049e0e0cd7c6cf96dec2c59708eaf70aa4cb3c84ba1a0e87238ffcf31fca2 WHIRLPOOL 4d07279b8f186c4a015324021d60f3e76840594a35a2466cc023cd3ef32b5b01572d8a83db5d96f7281c617a8384485bdef60d390e1c12c4ecbc7e0223e1a194
 DIST sqlite-doc-3170000.zip 5533032 SHA256 3102d9eab879074776216357e4c9e272f63d0cda975a0819ec5baba5e0922ff6 SHA512 6a7813be301416dc59401b7732733f44efad60b458ded0f4ed8d845aab0843a1123dd20d1e6f209dd32184a87bcd7e68e213e3676c43d1d05d2df5acc2c64b74 WHIRLPOOL dc1c9b6802985be34ac7819e08883c456a0a76fb1822eff46b26613760063b72888d34323cf15f0f48be69555c0b07b99424a85f29ac580c4ad8fa46b990b723
 DIST sqlite-doc-3180000.zip 5552381 SHA256 6f763eba9f51cb1096d1d40fbdd7ff974203060ddb892fc735adb2d7d42f1dad SHA512 7b65130cb2174d823842cddc912432d206044a8b276fdc2eef437854de7d0b05b8eb5d7aec0ead5c3f88bb7788ae5f1c42ffb1e43ab00774a68f6f7fea72d517 WHIRLPOOL be95f25105aea7f553145b371d64d1192057a2931551758bea418dd41b2ead6e9c07368347320bb041a59051c89ca2c84e3cd4e1f95806cad30dca3adec6042b
 DIST sqlite-doc-3190200.zip 5577171 SHA256 0d136abeea8d045ab7acef64ce84028dacb418584fa5a259e7ab4233ef21ff46 SHA512 f81b8719a54cd5e7f993f3dbd76821fc39651ef20b12cfd19c6d58fcb948e7fa00aa97e2f25cab421ba85d27d10b12822a87d1ae49e33c004c83b8f68cbc781c WHIRLPOOL fd8d25184a1e291ea597d42ce76ce5959db8a974e90934e637851806021d054fdda0a37d33db159478158331d52024b8ad5de11410dad5eb595b590ddda1c657
+DIST sqlite-doc-3190300.zip 5649351 SHA256 62cda70d5285e35144ddfd4629df8fadc2bae8dbcb43d0638aa874c1c03de101 SHA512 4f99b6797f76dab1859eaf4596c42d6b10a80a1ad9dcb33b82fcc4ef80a8e8299ac24c0d2a0f41debf9e82d43c9ecf9675547eb6163756f29afe847613ef75f3 WHIRLPOOL 4c259efcccca513a55150a349410a9c05cd2faa84a41a2f70f9c9311e3cb24d9e028bb2061a03c4dc6dfebfa3ff7738b571c7bd961b0f4aff5b329183b5e9d7b
 DIST sqlite-src-3160200.zip 10081950 SHA256 ee77c2cc5cc4a7b0a746a1d4496f7aee0d71c558a3bbfcf8e9e0b35416910337 SHA512 db49551c09830cf4d8997f0a623deeed9f85db5f27e6ca9d8aa5812a23c1466bbcdf8bb56cf009511f72cafec8f09a305127123f54d90437b28770dac34a0897 WHIRLPOOL b8cc52d5111bde34dae02391be8d83f9e703672b2101b36f5409e9acc23743c00561b02bd14b098e29972077fa1866a506d6343b58e4897ca07dac0bb60f4367
 DIST sqlite-src-3170000.zip 10120844 SHA256 86754bee6bcaf1f2a6bf4a02676eb3a43d22d4e5d8339e217424cb2be6b748c3 SHA512 e60381de33fbf566507454e4f1dfb7d3ada554e5c919f05f0dd2f96a6f266adaa62681437f21fdea1c24de57fb6141b798f97854918faa189b507f12f11e0d36 WHIRLPOOL 535c598f7bb9ddbecdd1ca841c0ecf398831c494c99c38542d1cbb756d8333260d6891aa36167aeba75df83fbaf402465dc65c9b3a7fb6685fa54420cb1a1342
 DIST sqlite-src-3180000.zip 10166686 SHA256 eab4d137abd5aa1164244a5d558c9a02122071daf36984b236f8441d749b9ba6 SHA512 b82c5388066f2e905c067d75e890bf2ff03a522733b8c8e0ebdfffe1804d7ecb39b72f6d808fce59133ac8c645f8b6e163e3dff7bbb0d66bbe8748e069ca7a84 WHIRLPOOL b92890b587761dfd550b39fbd64c4fddaf58e495c0f2b7526a624c3415147494648add3fa6968a09411e73c9b0653ec541a49a34daeb7ad2ae4840e829528380
 DIST sqlite-src-3190200.zip 10193843 SHA256 899c370b162a3b1febc644be5363433789a629bd07f5f80231defb5603d1abc1 SHA512 026b97bfc73b6ecf4c48b344a13adfb1c484d76a4fe78fd06bc4d175bb516c324483c6a647eaffc989469b3134c1874a1869b2d6a7d4112e685d75317992deb1 WHIRLPOOL 8af9215bfb2e2c2b418ff19f5e6a31d9ce68c47a3ec5d31fa2747e6de1936a32844fa6d500d876f77038a50dd332d73740594a2a7a9141eff32bc5bf523c5966
+DIST sqlite-src-3190300.zip 10193997 SHA256 5595bbf59e7bb6bb43a6e816b9dd2ee74369c6ae3cd60284e24d5f7957286120 SHA512 514c3de6346bdea359036a79c880133f0eeed4cdfc9e811d662dc343f91ea43edda0f9760405a48e7f61ea1dd3478980cc7d3b5409ef27adcb5311a06e36297e WHIRLPOOL 14491a9f14b7f180781ea78010783709e0539b970d0fadec10a3e0afd9fdda8d417dd14811ad10f98b9b8ec5cb491422bc4e9ebad7720a1733fef11e759908c7

dev-db/sqlite/sqlite-3.19.3.ebuild

@@ -0,0 +1,261 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+
+SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
+DOC_PV="${SRC_PV}"
+# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
+
+DESCRIPTION="A SQL Database Engine in a C Library"
+HOMEPAGE="https://sqlite.org/"
+SRC_URI="doc? ( https://sqlite.org/2017/${PN}-doc-${DOC_PV}.zip )
+	tcl? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip )
+	test? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip )
+	tools? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip )
+	!tcl? ( !test? ( !tools? ( https://sqlite.org/2017/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+
+LICENSE="public-domain"
+SLOT="3"
+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="debug doc icu +readline secure-delete static-libs tcl test tools"
+
+RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	tcl? ( app-arch/unzip )
+	test? (
+		app-arch/unzip
+		dev-lang/tcl:0[${MULTILIB_USEDEP}]
+	)
+	tools? ( app-arch/unzip )"
+
+full_tarball() {
+	use tcl || use test || use tools
+}
+
+pkg_setup() {
+	if full_tarball; then
+		S="${WORKDIR}/${PN}-src-${SRC_PV}"
+	else
+		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+	fi
+}
+
+src_prepare() {
+	if full_tarball; then
+		eapply -p0 "${FILESDIR}/${PN}-3.18.0-full_tarball-build.patch"
+
+		eapply_user
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed"
+	else
+		eapply -p0 "${FILESDIR}/${PN}-3.16.0-nonfull_tarball-build.patch"
+
+		eapply_user
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed \
+			-e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \
+			-e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
+			-i configure.ac || die "sed failed"
+	fi
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local CPPFLAGS="${CPPFLAGS}" options=()
+
+	options+=(
+		--enable-$(full_tarball && echo load-extension || echo dynamic-extensions)
+		--enable-threadsafe
+	)
+	if ! full_tarball; then
+		options+=(--disable-static-shell)
+	fi
+
+	# Support detection of misuse of SQLite API.
+	# https://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support column metadata functions.
+	# https://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support dbstat virtual table.
+	# https://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support comments in output of EXPLAIN.
+	# https://sqlite.org/compile.html#enable_explain_comments
+	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# https://sqlite.org/fts3.html
+	# https://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=(--enable-fts5)
+
+	# Support hidden columns.
+	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+	# Support JSON1 extension.
+	# https://sqlite.org/json1.html
+	append-cppflags -DSQLITE_ENABLE_JSON1
+
+	# Support memsys5 memory allocator.
+	# https://sqlite.org/malloc.html#memsys5
+	append-cppflags -DSQLITE_ENABLE_MEMSYS5
+
+	# Support Resumable Bulk Update extension.
+	# https://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# https://sqlite.org/rtree.html
+	append-cppflags -DSQLITE_ENABLE_RTREE
+
+	# Support scan status functions.
+	# https://sqlite.org/c3ref/stmt_scanstatus.html
+	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support Session extension.
+	# https://sqlite.org/sessionintro.html
+	options+=(--enable-session)
+
+	# Support unknown() function.
+	# https://sqlite.org/compile.html#enable_unknown_sql_function
+	append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+
+	# Support unlock notification.
+	# https://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support soundex() function.
+	# https://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# debug USE flag.
+	if full_tarball; then
+		options+=($(use_enable debug))
+	else
+		if use debug; then
+			append-cppflags -DSQLITE_DEBUG
+		else
+			append-cppflags -DNDEBUG
+		fi
+	fi
+
+	# icu USE flag.
+	if use icu; then
+		# Support ICU extension.
+		# https://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		if full_tarball; then
+			sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		else
+			sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		fi
+	fi
+
+	# readline USE flag.
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+	if full_tarball && use readline; then
+		options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
+	fi
+
+	# secure-delete USE flag.
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# https://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	# static-libs USE flag.
+	options+=($(use_enable static-libs static))
+
+	# tcl, test, tools USE flags.
+	if full_tarball; then
+		options+=(--enable-tcl)
+	fi
+
+	if [[ "${CHOST}" == *-mint* ]]; then
+		append-cppflags -DSQLITE_OMIT_WAL
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake changeset dbdump dbhash rbu scrub showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		install_tool() {
+			if [[ -f ".libs/${1}" ]]; then
+				newbin ".libs/${1}" "${2}"
+			else
+				newbin "${1}" "${2}"
+			fi
+		}
+
+		install_tool changeset sqlite3-changeset
+		install_tool dbdump sqlite3-db-dump
+		install_tool dbhash sqlite3-db-hash
+		install_tool rbu sqlite3-rbu
+		install_tool scrub sqlite3-scrub
+		install_tool showdb sqlite3-show-db
+		install_tool showjournal sqlite3-show-journal
+		install_tool showstat4 sqlite3-show-stat4
+		install_tool showwal sqlite3-show-wal
+		install_tool sqldiff sqlite3-diff
+		install_tool sqlite3_analyzer sqlite3-analyzer
+
+		unset -f install_tool
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+
+	doman sqlite3.1
+
+	if use doc; then
+		rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt}
+		(
+			docinto html
+			dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
+		)
+	fi
+}

dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild

@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator java-pkg-2 java-pkg-simple
+
+MAJOR=v$(get_version_component_range 3-4)
+MAJOR=$(replace_version_separator 1 ur ${MAJOR})
+MY_PV=${MAJOR}-b$(get_version_component_range 5)
+MY_PN=${PN/-//}
+ZIP="glassfish-${MY_PV}-src.zip"
+
+DESCRIPTION="Java Transaction API"
+HOMEPAGE="https://glassfish.dev.java.net/"
+
+SRC_URI="http://download.java.net/javaee5/${MAJOR}/promoted/source/${ZIP}"
+
+LICENSE="|| ( CDDL GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_PN}"
+
+src_unpack() {
+	default
+	unzip \
+		-q -o -f \
+		"${DISTDIR}/${ZIP}" \
+		"${MY_PN}/*" "glassfish/bootstrap/*" || die "unpacking failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+}

dev-java/jansi/jansi-1.5-r2.ebuild

@@ -1,25 +1,28 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
+
 JAVA_PKG_IUSE="source doc"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="A library that allows you to use ANSI escape sequences in your console output"
+DESCRIPTION="Java library to output ANSI escape sequences in console"
 HOMEPAGE="http://jansi.fusesource.org/"
 SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 CDEPEND="dev-java/jansi-native:0"
 
-DEPEND="${CDEPEND}
+DEPEND="
+	${CDEPEND}
 	>=virtual/jdk-1.6"
 
-RDEPEND="${CDEPEND}
+RDEPEND="
+	${CDEPEND}
 	>=virtual/jre-1.6"
 
 S="${WORKDIR}/${PN}-${P}"
@@ -27,6 +30,7 @@ S="${WORKDIR}/${PN}-${P}"
 JAVA_GENTOO_CLASSPATH="jansi-native"
 JAVA_SRC_DIR="src"
 
-java_prepare() {
+src_prepare() {
-	rm -rf src/test || die
+	default
+	rm -rv src/test || die
 }

dev-java/jansi/jansi-1.5.ebuild

@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="source test doc"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A library that allows you to use ANSI escape sequences in your console output"
-HOMEPAGE="http://jansi.fusesource.org/"
-SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-CDEPEND="dev-java/jansi-native:0"
-
-DEPEND="${CDEPEND}
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/junit:4
-	)
-	>=virtual/jdk-1.6"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${PN}-${P}"
-
-EANT_GENTOO_CLASSPATH="jansi-native"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-EANT_TEST_GENTOO_CLASSPATH="ant-junit4,junit-4"
-
-src_test() {
-	EANT_EXTRA_ARGS="-Djunit.present=true"
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar "target/${P}.jar" "${PN}.jar"
-	use source && java-pkg_dosrc src/main/java/org
-	use doc && java-pkg_dojavadoc target/site/apidocs
-}

dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="MySQL JDBC driver"
 HOMEPAGE="http://www.mysql.com/products/connector/j/"
-SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-J/${MY_P}.tar.gz"
 
 LICENSE="GPL-2-with-MySQL-FLOSS-exception"
 SLOT="0"

dev-java/laf-plugin/Manifest

@@ -1,3 +1,2 @@
-DIST laf-plugin-0.2-src.tar.bz2 13799 SHA256 e2252f74efbaa1f0c32a475c320283e614932e3af2d98a65462bf0e1f8cc00ba SHA512 91ac3f9f5ebfcd70e7cc76f2e028e9578c6113a848b0ccdc6b001fff006bf5aaa12af08b1752851693d218d4b2d7d053f62461481e49d5a0bde21e5a7d086331 WHIRLPOOL 6aaea36bbcc22eca1704185faf866fba1b723cd3d6ff02197f28287ded67fc43bb4c2f9cbe8a2dce9e82eaa88774b1fdb4c66e54cdc4f09ad946718641cb1334
 DIST laf-plugin-0.2.tar.bz2 13799 SHA256 e2252f74efbaa1f0c32a475c320283e614932e3af2d98a65462bf0e1f8cc00ba SHA512 91ac3f9f5ebfcd70e7cc76f2e028e9578c6113a848b0ccdc6b001fff006bf5aaa12af08b1752851693d218d4b2d7d053f62461481e49d5a0bde21e5a7d086331 WHIRLPOOL 6aaea36bbcc22eca1704185faf866fba1b723cd3d6ff02197f28287ded67fc43bb4c2f9cbe8a2dce9e82eaa88774b1fdb4c66e54cdc4f09ad946718641cb1334
 DIST laf-plugin-1.1.jar 8105 SHA256 2b7919c502906983307b556284d6e86df2034b69ebf3394f303490e99936500d SHA512 2ca265d23ac95e5d194e4905ead4c975cb8739a0aa30096c028d2f6467b148de2ac0ff71c6730752a666eee53551867d9d8c852d25238a873fbd4bd994cf80c0 WHIRLPOOL cda35e80834745d00ab2e1a3f3531ecc0e5cf4b140c5a167b86ffd213ccf9cdf0bb76d4582ec1745d738fbccd5fa81e1267e6f54a7a330521cd78fb6897d6e3d

dev-java/laf-plugin/laf-plugin-0.2-r1.ebuild

@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A generic plugin framework for look-and-feels"
-HOMEPAGE="http://laf-plugin.dev.java.net/"
-SRC_URI="mirror://gentoo/${P}-src.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
-
-EANT_BUILD_TARGET="dist"
-
-java_prepare() {
-	cp "${FILESDIR}/${P}-build.xml" build.xml || die
-}
-
-src_install() {
-	java-pkg_dojar "dist/${PN}.jar"
-
-	use doc && java-pkg_dojavadoc api
-	use source && java-pkg_dosrc src/org
-}

dev-java/laf-plugin/laf-plugin-0.2-r2.ebuild

@@ -10,9 +10,10 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Look'n'feel Java library"
 HOMEPAGE="http://laf-plugin.dev.java.net/"
 SRC_URI="mirror://gentoo/${P}-src.tar.bz2 -> ${P}.tar.bz2"
-LICENSE="BSD"
+
+KEYWORDS="amd64 x86"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"

dev-java/skinlf/skinlf-6.7-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,12 +11,12 @@ inherit eutils java-pkg-2 java-ant-2
 MY_P="${P}-20060722"
 
 DESCRIPTION="Skin Look and Feel - Skinning Engine for the Swing toolkit"
-HOMEPAGE="http://${PN}.l2fprod.com/"
+HOMEPAGE="http://skinlf.l2fprod.com/"
 SRC_URI="https://${PN}.dev.java.net/files/documents/66/37801/${MY_P}.zip"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="dev-java/laf-plugin:0
 	dev-java/xalan:0"

dev-lang/go/go-1.8.3.ebuild

@@ -39,7 +39,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
 		# The upstream tests fail under portage but pass if the build is
 		# run according to their documentation [1].
 		# I am restricting the tests on released versions until this is

dev-lang/php/php-7.0.19.ebuild

@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"

dev-lang/vala/vala-0.34.8.ebuild

@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.34"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="

dev-libs/atk/atk-2.22.0.ebuild

@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="+introspection nls test"
 
 RDEPEND="

dev-libs/ffcall/ffcall-1.10-r2.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils flag-o-matic
@@ -7,7 +7,7 @@ inherit eutils flag-o-matic
 CLISP_PACKAGE="clisp-2.41"
 
 DESCRIPTION="foreign function call libraries"
-HOMEPAGE="http://www.haible.de/bruno/packages-ffcall.html"
+HOMEPAGE="https://www.haible.de/bruno/packages-ffcall.html"
 SRC_URI="mirror://sourceforge/clisp/${CLISP_PACKAGE}.tar.bz2"
 
 # "Ffcall is under GNU GPL. As a special exception, if used in GNUstep

dev-libs/ffcall/ffcall-1.10-r5.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic toolchain-funcs
 CLISP_PACKAGE="clisp-2.41"
 
 DESCRIPTION="foreign function call libraries"
-HOMEPAGE="http://www.haible.de/bruno/packages-ffcall.html"
+HOMEPAGE="https://www.haible.de/bruno/packages-ffcall.html"
 SRC_URI="mirror://sourceforge/clisp/${CLISP_PACKAGE}.tar.bz2"
 
 # "Ffcall is under GNU GPL. As a special exception, if used in GNUstep