+Date: Mon, 17 Aug 2020 21:28:03 +0200
+Subject: [PATCH] Python 3.8 fixes for endpoint and tests (#37)
+
+* fix endpoint exception lists for Python 3.8
+Author: @maximbaz according to #33
+
+* fix test_writer_bad_message
+not only windows can have problems with serializing datetime
+
+Co-authored-by: Carlos Cordoba
+Co-authored-by: Marko Bakovic
+---
+ pyls_jsonrpc/endpoint.py | 1 +
+ test/test_endpoint.py | 4 ++--
+ test/test_streams.py | 19 +++++++++----------
+ 3 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/pyls_jsonrpc/endpoint.py b/pyls_jsonrpc/endpoint.py
+index e8bfb5b..0caf612 100644
+--- a/pyls_jsonrpc/endpoint.py
++++ b/pyls_jsonrpc/endpoint.py
+@@ -236,6 +236,7 @@ class Endpoint(object):
+ if error is not None:
+ log.debug("Received error response to message %s: %s", msg_id, error)
+ request_future.set_exception(JsonRpcException.from_dict(error))
++ return
+
+ log.debug("Received result for message %s: %s", msg_id, result)
+ request_future.set_result(result)
+diff --git a/test/test_endpoint.py b/test/test_endpoint.py
+index 47a038b..b954732 100644
+--- a/test/test_endpoint.py
++++ b/test/test_endpoint.py
+@@ -115,9 +115,9 @@ def test_request_cancel(endpoint, consumer):
+ 'params': {'id': MSG_ID}
+ })
+
+- with pytest.raises(exceptions.JsonRpcException) as exc_info:
++ with pytest.raises((exceptions.JsonRpcException, futures.CancelledError)) as exc_info:
+ assert future.result(timeout=2)
+- assert exc_info.type == exceptions.JsonRpcRequestCancelled
++ assert exc_info.type in (exceptions.JsonRpcRequestCancelled, futures.CancelledError)
+
+
+ def test_consume_notification(endpoint, dispatcher):
+diff --git a/test/test_streams.py b/test/test_streams.py
+index 8c2e93e..480a73b 100644
+--- a/test/test_streams.py
++++ b/test/test_streams.py
+@@ -97,7 +97,8 @@ def test_writer(wfile, writer):
+
+ def test_writer_bad_message(wfile, writer):
+ # A datetime isn't serializable(or poorly serializable),
+- # ensure the write method doesn't throw
++ # ensure the write method doesn't throw, but the result could be empty
++ # or the correct datetime
+ import datetime
+ writer.write(datetime.datetime(
+ year=2019,
+@@ -108,12 +109,10 @@ def test_writer_bad_message(wfile, writer):
+ second=1,
+ ))
+
+- if os.name == 'nt':
+- assert wfile.getvalue() == b''
+- else:
+- assert wfile.getvalue() == (
+- b'Content-Length: 10\r\n'
+- b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n'
+- b'\r\n'
+- b'1546304461'
+- )
++ assert wfile.getvalue() in [
++ b'',
++ b'Content-Length: 10\r\n'
++ b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n'
++ b'\r\n'
++ b'1546304461'
++ ]
+--
+2.26.2
+
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
index d4423e655f56..637c726e751e 100644
--- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
+++ b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8} )
inherit distutils-r1
@@ -26,6 +26,9 @@ DEPEND="test? (
dev-python/pylint[${PYTHON_USEDEP}]
)"
-PATCHES=( "${FILESDIR}/${P}-remove-pytest-cov-dep.patch" )
+PATCHES=(
+ "${FILESDIR}"/${P}-remove-pytest-cov-dep.patch
+ "${FILESDIR}"/${P}-Python-3.8-fixes-for-endpoint-and-tests-37.patch
+)
distutils_enable_tests pytest
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index cd2661637eac..5c951a26f31a 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -3,5 +3,5 @@ DIST python-language-server-0.32.0.tar.gz 67137 BLAKE2B 83611541c36ab70ab16fd381
DIST python-language-server-0.34.1.tar.gz 70238 BLAKE2B 55ec41875907bb6c09f682c8ce6165e7e2fab5d03c3d4758bcbe658968aeeee7f0316a472efe68ddd87872b0e2d34908c8a7e9528aa5eec6d3359b2565a2cbbc SHA512 12404753f4271ec3606cee535ba8e886037bf0c61cc5c4415358066be837e2248f6393124340551387cba7351dee924b4f5ebc9c4e35b1ab0943067968967a90
EBUILD python-language-server-0.31.10.ebuild 2474 BLAKE2B a9f1911fab56648c24617ceccc095d3c6cf391587a37a70880a231c26284b240897fff46108c02a3ddb3ad5e048644ee693eca3e1e3649ebcd59e232a61cebc1 SHA512 eeffee6200461c962d062dda9e4229095c90c6bde37f5880c6e707f521a6315b7713f8784b3d607cec88197a1b5d18f75d578aae5dfafda99e9514e41a86a52e
EBUILD python-language-server-0.32.0.ebuild 2325 BLAKE2B 01063d168199941889c222fece5b7b519da44b694bd93ca52780800a75cf0d602c6d1ef8d6b2240bfcbd87888b276802ab140681b859e61e890d30b67fff0306 SHA512 c6ca86d2618161a90c0e9a6b1d215169bf6c61547b5f277fb52083df1b51b0a02c1b5815dcfc8667e54a81c1d2595d6eaab5e3b8b24493a4a62720535f4ce1d9
-EBUILD python-language-server-0.34.1.ebuild 2325 BLAKE2B 01063d168199941889c222fece5b7b519da44b694bd93ca52780800a75cf0d602c6d1ef8d6b2240bfcbd87888b276802ab140681b859e61e890d30b67fff0306 SHA512 c6ca86d2618161a90c0e9a6b1d215169bf6c61547b5f277fb52083df1b51b0a02c1b5815dcfc8667e54a81c1d2595d6eaab5e3b8b24493a4a62720535f4ce1d9
+EBUILD python-language-server-0.34.1.ebuild 2329 BLAKE2B a91a2877912e64dcd1561cf5770fdd12e71c175cc2179c27983f4dbf3b76b4d1afc941c64ff80e5f7846781e2a9172c8d27b413bcc32164ee74c1ddc46878f0f SHA512 40af5bcda777ae3645ec2f551fceb68613bae70cfa2f86b8c57d822f4c330a5bd14fd6902e02fc0fb775a50a7312322955faa7627830367a42255a17b1f52f29
MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/python-language-server/python-language-server-0.34.1.ebuild b/dev-python/python-language-server/python-language-server-0.34.1.ebuild
index d96d7cc61a17..ecdf65416d5b 100644
--- a/dev-python/python-language-server/python-language-server-0.34.1.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.34.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8} )
DISTUTILS_USE_SETUPTOOLS=rdepend
diff --git a/dev-python/python-markdown-math/Manifest b/dev-python/python-markdown-math/Manifest
index fa0da45a9395..e540c848c4f5 100644
--- a/dev-python/python-markdown-math/Manifest
+++ b/dev-python/python-markdown-math/Manifest
@@ -1,5 +1,5 @@
DIST python-markdown-math-0.6.tar.gz 6406 BLAKE2B 43172ba4b36b697f196bd569c93d56d1a3a05aaa306b1f149f3b70372e624e35fc0d3f3ea3c58c6b86e00c68408a5ebfe9fcc6562fe5065c7f8a7aa8683ee084 SHA512 af5773dc5b6d8968d811487a86fd027042d381b8b5b37683b519f03f21097bafd3d174881d8201cb6524e0975cd6868781e116cec6406fa20ffd3c6b9f9d4e87
DIST python-markdown-math-0.7.tar.gz 8320 BLAKE2B b402a6c1c3ef93f8716b88c0ba356109e6b483ce26b4a7923c16642a7a7fe69b25ee00e4f537d26b6fa743e81fef05871c447f9e5d3a986ff52bf7095bcdd436 SHA512 05bfff71c758785591c388a95b176205a8707428cbda91734c4f1b5d39cd030d9106782e92aca8f1de18be227b1489ad2cb09981b4455ba1d1177974cd0cbecd
EBUILD python-markdown-math-0.6-r1.ebuild 880 BLAKE2B 10826ea731911c3ee9a738d657a8b70782b4cb69cf8b7ec2f5b0f4ced04a8fa71f36a8926a4b6a5a07e9dc708f5489676bc6556a26f280fa1db21f791e38d8f7 SHA512 8015a0539d943f83d0ed0e84c37451e894d758da8a50af0b98afb4f48899105405fba3a936c69ad9d68c52f425b175d6631179ec389f84f9675da6b2cbc4170d
-EBUILD python-markdown-math-0.7.ebuild 890 BLAKE2B 4146c6b4e70bd196236570c40cf4ec1d77f6696657e62cbcd5284c428229a6b5829dcdd1e0bef07326b2fdc5ecb633be81b63c47495957a5afc966ab8116d2ee SHA512 e8465e9fe5215e589f620b4ed99113d93d59b714540e924d76116433167c25931ab752778dcf03565d3cadc1c73ad6436bc2e524793e44eb7828b53b00fb1ce7
+EBUILD python-markdown-math-0.7.ebuild 888 BLAKE2B 828efca52077d8c74862db193696afc84dc4352a13f886167a0cd606b92d19f3b0c3ff5f8c451fa0335097f8d7c01d21cf15c036830f5d6bfe4a7abbba4daf67 SHA512 2b47515689a808624cecc0c17d4c15dad5859d5c88fc6f713fd4d99d9d2462afd4d83a5b1028940823c2d6387a8ed6531830c8251fc0a467e512c6c9ce10a96a
MISC metadata.xml 618 BLAKE2B 38507a41b254385cc67fc807c7bc9597c22f65bf7ccad19a128d619d1b1ee86aeef3244fa01c90ab652179a9999146f02ac5bed4f57fec308f82c03356bf88a1 SHA512 cfdc0f283f5351aa12165bf85cd9e428f8d1d4c80eda12bacacbcf11d2b195d6306bc406b64ddd7dbdc3b086c7d2fbde70a424e0169751a9b92ae48e02544802
diff --git a/dev-python/python-markdown-math/python-markdown-math-0.7.ebuild b/dev-python/python-markdown-math/python-markdown-math-0.7.ebuild
index be5802d79954..101a75936a83 100644
--- a/dev-python/python-markdown-math/python-markdown-math-0.7.ebuild
+++ b/dev-python/python-markdown-math/python-markdown-math-0.7.ebuild
@@ -18,7 +18,7 @@ then
EGIT_REPO_URI="https://github.com/mitya57/python-markdown-math.git"
else
SRC_URI="mirror://pypi/${MY_PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="BSD"
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 1234d03430b3..0a98d9476a6d 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -3,5 +3,5 @@ DIST python-nbxmpp-1.0.0.tar.bz2 111378 BLAKE2B 1dd0fff8e14bb438727a05ba0bd3db36
DIST python-nbxmpp-1.0.1.tar.bz2 112700 BLAKE2B ea0d271961a7e15a374cafa42678429b9f3395a8921f7cb92ff20664adf17f0482235240f0f849e8492d20aeb23d99eabfb1375eaeb48d55bf81aed4e3d702a6 SHA512 f3bda30b08e48ce59c19b705d45efe13286b4f8a27f44a60fe5759f9e7915beb655166d240ed1f875615f5995764a28a3c5f676e84068aab870f32ecb7d684a5
EBUILD python-nbxmpp-0.6.10-r1.ebuild 540 BLAKE2B 749d38849761b31533cb8216b168d70d713ae63b8e94174b4ac270679837283081aabea5565f96df77b2d155bad7faaf37d6a49ec3f2c6767a74422a03bbb414 SHA512 517b329bfb4ef46c6d370f6fe909fcdeb0a0c5306ce15176062bd2565ed1ccf9f936285c4a31be3154102942cbb825e69abff82d64b1d8faf990d15ff974633f
EBUILD python-nbxmpp-1.0.0.ebuild 542 BLAKE2B 4bf7d26b351b76f4f4d22b9218d7a86ca565f10628aa422468579065ff7ec7394ff10606b834ac357ad2788ad4951b850a49c47dbf09d197c29977946ce2079f SHA512 41c82248248fcfd63ed1aee3a08440edbaf65edb0ce702f5fa1b3022109481ee1f5f68d3017eac19fa0730fe34e9631bd1144851256beb8b1cc53a253f163e16
-EBUILD python-nbxmpp-1.0.1.ebuild 545 BLAKE2B 68d4f61e2e3be31c8be2c57a0eaf50f390c365e829e1f1d10803d7e80e03917d065900ccb11c5336290242819c7869127184326b09d3d07e67fbc41acb4c470a SHA512 b8d6c915c3fc2a28110146bc2b07e44d886c1e05cf0231adc290e0d62990555c3c6b0f256300c8f564a7957510e5b37d50c92fc7efd30d1c507d0f34dfb52b9c
+EBUILD python-nbxmpp-1.0.1.ebuild 544 BLAKE2B 99054d04a2461455d0cef5423949a4040fcada83d0580104a9042ade7a56b2826e4de2a6d5180e40c7070e8d4ec1e6c63143041e0172ad66daff51e5d078873a SHA512 0adc03096c96bee643c9f7bd34543e0a8a2367efce88e423e531fd2b3f88d8619e2e180b1dfcb1418cd848c2d5071c2c868490b140bd0a735e065c24552c1233
MISC metadata.xml 425 BLAKE2B 6dbbfb9cbb285e3c60d69855db7d3d6f098c1e7eb9b26e3accc70b79e440450add7984d64271bac57aaa029ac375e3b98f028866bb70043ff12dc010de6eaa51 SHA512 7f93c232860052e3ddbcf369a7234790125a2ab1831624f80a07a1b34a11c261f67fa88ca13549b1cce774d6b58899d2b6f2e0ae60c0fdecc6d1b4861d2c41ab
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild
index c012f15db6d3..fb10afe54623 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild
@@ -13,5 +13,5 @@ SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/python
SLOT="0"
LICENSE="GPL-3"
-KEYWORDS="~alpha amd64 arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
diff --git a/dev-python/python-sshpubkeys/Manifest b/dev-python/python-sshpubkeys/Manifest
index a3e44e6a72f6..23132cbb771b 100644
--- a/dev-python/python-sshpubkeys/Manifest
+++ b/dev-python/python-sshpubkeys/Manifest
@@ -1,3 +1,3 @@
DIST python-sshpubkeys-3.1.0.tar.gz 55289 BLAKE2B bf1836c173b542f0edc8dc0635a1f5bf109ef95936ffbabf6bbb79ac3bc34c10a769733d622c338b1f3a87d5be84b89ea9779f7fa293cad706f364d5e8867afc SHA512 4f07cb7bd2b1839a63bff842660499cee816e8675d8fde1e84ee567e354c82677a69e539b99505c6d1c5e0e7a5962a36175eb0cfcc763886a33952d2346c3405
-EBUILD python-sshpubkeys-3.1.0.ebuild 555 BLAKE2B 1c6f48c6ec6d9d967051ec39b68b9da68e01024891dbe288ea4f253d1f95ffee0ad80db6c9446453cc6ea60dc9705d6a221c8949d26e8465334c4e6365cedef7 SHA512 4b9c7a8c954deb449701c02c097bea3c33be6d32c9aea90bc8954dc57f75d3420aed9b61dd85f6e217956e201d2da6b42ec854c2e5fa864bbc167dfecd77f1a9
+EBUILD python-sshpubkeys-3.1.0.ebuild 567 BLAKE2B b3dfe117fe342c64e7b6e4fa06e01cc7f87c6a9d3c6546ff19a70399292f6107bdaa9ff4f5340293fba2aa307c84bd9aa5c005129440633be93f53ca639fa651 SHA512 c2b0dc091bae51779057e54c646648d3e72e9e6387c3e95dfdef731dcb7b1fbe1011a0452113388f8e5005889e7f09a5b98995527f1a7c91d7bddc66c93f1b6d
MISC metadata.xml 362 BLAKE2B 789c599311180046c3d8d7332e1c11989cde2dedc8abf68d6c72ef5924a8e9a15847426fc71a5c57905c022910e2db735879de2cf20c4b8f770a4ee51118a031 SHA512 78963cc8668296c4b984155d1cd7169a89da8b4950a1c3c95f2d1782c197d40e68e0e5e9c6b3b59b72bfad056986be367dcbfbcba489c915eb79a4f5770b56e0
diff --git a/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild b/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
index 295c1da3eca1..ea892d761ed5 100644
--- a/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
+++ b/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ojarva/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
RDEPEND="
dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 19862681110c..809914cbe1d9 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,5 +1,5 @@
DIST QScintilla-2.11.4.tar.gz 3007719 BLAKE2B b0f88a15a3636a0056d3bdac6e5d5bb05a065461c7de7fe0d5ad1740e87ca78a47bc1fd1af90a8751b553e8e326c830088a4cb38c9ebcad6be8bf9ebdb49bad0 SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd
DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
EBUILD qscintilla-python-2.11.4.ebuild 1772 BLAKE2B 072599706066b5f1aef1f46c66ab400a6eb031bbd22be331135a09e71b90e4e93fd18d39c845d2d8999d512a431d564026b25fff130eca59e6fbc451bd020153 SHA512 04aed92849ee38c7cfd56179b7631f7a5b570de53793287cd4574ee13c174620075963f4b3237870535a3d0ef8342ecfde4b9daee752f380d8fc8f0791bf274f
-EBUILD qscintilla-python-2.11.5.ebuild 1778 BLAKE2B 78991544dc462dfdad804ad5f30ebeb6ed7e895af06787bc048b83915bbc058f1d474954d8664018aa174c1e4a7d76b0dac5d0e17108e94683f3bc42cb10e653 SHA512 27584d74d0d593e7bdfbb5bd0bdf54ae84e03bbe7de720ce66dd32d21d0eaa1ece24fcc100eeb18bd6f3a07b708f304c91c1c9af2e943f1b053d13a062ffa629
+EBUILD qscintilla-python-2.11.5.ebuild 1776 BLAKE2B c444293bdf725fc4c8616614a0d7cb43029279a64980048948906a4e94959387fed7c51ef53711f9e1785835704314837f55b22063ecff97c72e97e198b5d000 SHA512 859eb027fbff13a6d58a9d2aae5bad285ee077199640fbafcb01c052d162d126bd158ffc3cfa3c04a874f7ebf41e3233a90e60d01e4f52b3a9f27e5b8883b47b
MISC metadata.xml 678 BLAKE2B e849d949281fe5162977ac3cba9c3559258f0534ced3e4e160554e2ee166cd20f979545bebae2effb0690231c987abb0ad11ed2090dbcb1c6724fc3389edc195 SHA512 58afaba4b14bf09297c024e29d51bc6b22c9a8290a6ca7f2c8c5fd63dea01037a637eeddb2ad5dfc09f2fd09d92229f74f1ee9cfb200c835110236407296e530
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
index 1ee81a725d37..c04ae33878bb 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
@@ -19,7 +19,7 @@ fi
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
IUSE="debug"
REQUIRED_USE="
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 98d12198ebaf..f2b38e12d02c 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,7 +1,9 @@
DIST qtconsole-4.3.1.tar.gz 416931 BLAKE2B ec47c2ae8527d7aee55d6cb8d2ebea39ab1bfd3a268c46306613b67f72c27904db1de52682a47d075d804dad9cd7c124296163b39532936fb1a497ae606b7ffc SHA512 f0f84d95143b4513c3d12af4712c6a5724143bf8c44e7a3fbc06d7a94e665b8d12072dd13eafb09476a3aa829155f4c75eb517ffb2bd6e8bd3c00af3c764e48f
DIST qtconsole-4.7.4.tar.gz 424884 BLAKE2B 79380a1619498a28eaf7e741a3408a63b58705fe7c0672108b57c5cd9bb7c35d77569ce59a3cdb8dc21b3e403cc41845a534c55838ecf2e82038677132e90fbb SHA512 4564c0ee15b1feaff235ae35a22bfb719497e5f74416ea0ab471018c4d68e13dd05cc4d0180b69151f81817180d4985589340698067b5a2166764a39147255fa
DIST qtconsole-4.7.5.tar.gz 424850 BLAKE2B e2d2ba50ce57b13504bdf8ad1ee3374b76abc980f0b74dfe1177c3f066ba24382bc51f8d3db2614a8d74b198ed20f01fac67c288602ae6e31fe90165e63ab9e9 SHA512 ee57ad2de5b840ee4e7f439be08a3c82fd39ef1bf6113b7eda95fa1aabd132c799ff584a2ac7f7e2c89df4bcd9a9409bbaeee108a6bb49e6197d2e3395336ad7
+DIST qtconsole-4.7.6.tar.gz 424919 BLAKE2B d973b3b94dfad1b38603695e22927bcdcb8a4f2db9f4a638d5fe6a83c24061153dbaa36c26e632708953af32a015af1d40ecbf175dd5314a3b954b15a6625cc0 SHA512 e4e12eb90533e922786b5b6517fba5d9c4dfedf00547f1403c8cd65fb464f5c1a13517df69924e4428e9a8a811dfc359a7768fbaa90adbe02d79cba9a5aa852e
EBUILD qtconsole-4.3.1.ebuild 1694 BLAKE2B 162d3af84f4a593ddaf413bf7e0539deb2124a9751412613393ec8adb7f42b535a28292f5206dc97d49f55b2a27165f6f3fb3dd62a6783889bb7dbf43a956f9a SHA512 6da630c1153e3633e3fc1db6f940f42e500cb8829def36c48fb3082965542d24319af5097b982b3756c7bdff2f3bb49a7651a3f2749f9857c64af10bf4ffde51
EBUILD qtconsole-4.7.4.ebuild 1247 BLAKE2B 04760e03f7cb1d01577755f51ec576a56af0467e11131d2291669c3956eeee34349b00bb61da52866302a410104ecc58c2cae4058ea421a917980f46f94e8b69 SHA512 5e00f9a9a12ad54361337e46397674c04682ef9883407b415de8afa276465fcec6ea5717d845c9d8492d2f2ef7bde914dfa4a6fcae6cf60e0857dcc53ddd450f
EBUILD qtconsole-4.7.5.ebuild 1254 BLAKE2B 15c92570050a4b8552bfb34888d5baec793537525beed4c2e691cf48fb1425a0407ab6d0dbc2b56004acb6c9ae7c1e691aec9839d84be02a90831aceffd531f1 SHA512 ed4edb7506bfcdcc63ca26f9a7ef63069a8d24d4eaee865f1925404fbd7ecf3b01334b2663cc28028a9c4e176f07f7e75506d20fd822a1f8fa6fe9375e1e1055
-MISC metadata.xml 664 BLAKE2B 33ad7b3510f6778cf805068f3edd12fcb235980ceb60d06a94e977be60372f1bb8119545a47ba04fbb636a6cb9c072ae1e2581cbe71d3b7d598cf54c5c99ea83 SHA512 fdb5f97ebbd75a451b1247fa015fea8ded2b428453be34140bd5151d2c0a9cba74cd91258903826dd1e419bf8b818c37f3df74ab2b573119628b9b918f80f69b
+EBUILD qtconsole-4.7.6.ebuild 1254 BLAKE2B 15c92570050a4b8552bfb34888d5baec793537525beed4c2e691cf48fb1425a0407ab6d0dbc2b56004acb6c9ae7c1e691aec9839d84be02a90831aceffd531f1 SHA512 ed4edb7506bfcdcc63ca26f9a7ef63069a8d24d4eaee865f1925404fbd7ecf3b01334b2663cc28028a9c4e176f07f7e75506d20fd822a1f8fa6fe9375e1e1055
+MISC metadata.xml 689 BLAKE2B 65c50141dd002a264402eb90385ad3203ebdec1fc47bfa0d94055a82bd98bbe93cc0cacdd4b0f9cab0cc36ad3ea22f500f53c55398347b6cc1cada2569abdb22 SHA512 40e7ef3f4437946e75f1a2be9373ba06b3c58b4ebae0cef8958e2c101aa855e4c92aa0a426d2a74d8e946d05e176690006324db1d8514598bb574f1071644d81
diff --git a/dev-python/qtconsole/metadata.xml b/dev-python/qtconsole/metadata.xml
index b4be59fbf857..27ca01d55a21 100644
--- a/dev-python/qtconsole/metadata.xml
+++ b/dev-python/qtconsole/metadata.xml
@@ -13,6 +13,7 @@
A rich Qt-based console for working with Jupyter kernels,
supporting rich media output, session export, and more.
+
qtconsole
jupyter/qtconsole
diff --git a/dev-python/qtconsole/qtconsole-4.7.6.ebuild b/dev-python/qtconsole/qtconsole-4.7.6.ebuild
new file mode 100644
index 000000000000..b8f4e1d3bd94
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-4.7.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+ dev-python/ipykernel[${PYTHON_USEDEP}]
+ dev-python/ipython_genutils[${PYTHON_USEDEP}]
+ dev-python/jupyter_core[${PYTHON_USEDEP}]
+ >=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/traitlets[${PYTHON_USEDEP}]
+ dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
+"
+BDEPEND="
+ test? (
+ dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
+ )
+"
+# required by removed tests:
+# dev-python/pytest-qt[${PYTHON_USEDEP}]
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+src_prepare() {
+ # TODO: these tests require virtx; however, running under virtx
+ # causes pytest to segv on exit (even though tests pass)
+ rm qtconsole/tests/test_00_console_widget.py || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index 5ab482abd13e..9243da6f1928 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -2,6 +2,6 @@ DIST readthedocs-sphinx-ext-1.0.4.tar.gz 11686 BLAKE2B 3c188e52682f8c24633f79b9e
DIST readthedocs-sphinx-ext-2.1.0.tar.gz 9961 BLAKE2B a172fb2b7bff930f4ef728c5509e0a303bd46fd07e5da496721896751dcd0fa4fa4ba3b4d3251931598cb6172e186a3f340100f13d88c840bcb6912e5a134185 SHA512 81e60f3b6216e1c0fef12493e668cff561937bc5da965b0dfd06dca2f034f95291dfa977f94f726ec7f0bf048fa57d9fd7887219ec172b14ff2558be5e09a130
DIST readthedocs-sphinx-ext-2.1.1.tar.gz 10181 BLAKE2B 01ca34befd0f18bb747d7f843e0cc394e19db4fe471f2bb21617b6dbdf4c1ad9721047185561f9bfbd8f770e1fefd5b560e65d7c5e2675c1bc8d74e08252eeb1 SHA512 5594e375133477ecdc1d22a78c0d4dac73c5e8c1715f4309a9674497ef860b07e8872bb4ba471fbffacd8bd22bc49741b8df54ad9ca9bb474acd9cdee72c8969
EBUILD readthedocs-sphinx-ext-1.0.4.ebuild 737 BLAKE2B c454efbb516d2b45c56fd90406e549cdf1f8ba04648c3e44d5ab4f32bd9f7cc2c26ba4bee5124ffdd5e7dd17e41a8e1ea0aa05936a147a58e3be72635e03f52b SHA512 4c7c892fcbe2c99ffe18409237b0f399779806e8facbf583f487d10f1721f6ece30e01d6746702f88d8c3aba268ba9d90d4cfc6b5ce7c0c6cde03a589a12d862
-EBUILD readthedocs-sphinx-ext-2.1.0.ebuild 744 BLAKE2B 5dde443b18bf511655f0223083aca5ad11ebcc97840c336dc0ad3ed31ff416642aac3f2f5ce9322123073cdb96055a3db7ec2ff233cbc26ff82fd57ec0f24e36 SHA512 ec5b906cb67edebec5c0be395a80be33d925e6313f8cd2a2b7c6a2bdbb3e49a2b6ee3510ab9d29d54b0fc8c99122c31dace0af5798c0b15252ee9417703ff67b
+EBUILD readthedocs-sphinx-ext-2.1.0.ebuild 737 BLAKE2B c454efbb516d2b45c56fd90406e549cdf1f8ba04648c3e44d5ab4f32bd9f7cc2c26ba4bee5124ffdd5e7dd17e41a8e1ea0aa05936a147a58e3be72635e03f52b SHA512 4c7c892fcbe2c99ffe18409237b0f399779806e8facbf583f487d10f1721f6ece30e01d6746702f88d8c3aba268ba9d90d4cfc6b5ce7c0c6cde03a589a12d862
EBUILD readthedocs-sphinx-ext-2.1.1.ebuild 743 BLAKE2B 6e7da88b3fa326bdc62496fb5473bfb04ac5d37dda1ae10daa02f7c97dd6c7222d88ab98af491369e13b3730cb04ec6e6a140ad56983a8783516622320ae92a2 SHA512 39b9a25537ad2287cbe521864cd2b38ec322bd7aa295d1ec5ae4d56a8d075e1aca47a9838f9f8658d52a58241ee9d45dea40dc17391d6f0d8e63808604970a5e
MISC metadata.xml 271 BLAKE2B 31405284f0b172a72344c5300348da7b62689758b67e08380f46cd0b4d58313324f234550c2d8ffad7cf2c70165edf59c24a8b32ff6aeb82b63f7c40fc4180f5 SHA512 6c24a69f1cf6d89afe9dcea1b07cc8fd3fb9debc3cbfd154dcafa42bb18c84005e83d9204b9a21d91bbb23e952b1069d2f72c753e644926ef9bafd3d86fb4e2a
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.0.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.0.ebuild
index e8bb844066b9..1b290f5a107a 100644
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.0.ebuild
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
RDEPEND="
>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index d556cdf025e2..b8cc1bd77243 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,4 +1,4 @@
DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
DIST reportlab-3.5.42.tar.gz 2883081 BLAKE2B 22f4e7ebc233895a036eeb94c5beb9206be561a8a44895b36291a4f840603a2fec90107ac60e749f99be629202801c63ff67d5034d19b42383f2df12d457104d SHA512 f52717867190bf7812fd566d9ec3044198db809cdd0f53cc9dbfa92503a202540db659369e20bba3de07cd28eb10515d03b85700ac138c9394dc9eed1f08b8f8
-EBUILD reportlab-3.5.42.ebuild 1341 BLAKE2B d87fa7cb343d0b5d306045bc1e69f10566eb0f142b599131350eec98cd984ea91c2db5d20b386723771c206bc2aec88d06acec1fe6d15409d9790f73499ae625 SHA512 cab97db2c7a559bc516d7d9be0340280103294f3d2448939dbe64b3457214329b379aed40637e5f18cd0c07367400bac7d746b74e0e2472d131853493d94ea36
+EBUILD reportlab-3.5.42.ebuild 1347 BLAKE2B 4da7e80b0fcfd338baab66c92ae0d769980174c2bc40bb85f226f30b1cb3dbbf2a8cfdc02f0c7a004732f1957f25ebb0534f1e6ea899c9de81cce72e25ae723e SHA512 f6da0177fc589bc60f8b21b312ed08913fd30f0811f0510a621c46d3f91c125ef8627bce5ddaec9ee2d41042ae4329159fa37fe8461a8617d79fb95bd4c399da
MISC metadata.xml 322 BLAKE2B 64b99a95cfa082f2ae8e3a778cf44d3598f4d3f43f03d58eae011aa4b361af042e1b650eba9eb17421c8c154e654a8340d4a85d60891aa89666861a973a49d15 SHA512 cea3f16d94fb50eb3e505756952d9ee14e170e5354e5a3a186c24dc3a253ce96d6d275505e71586ef360c71e080a9eaf5fb461d8aff4fc18ac6122912bbe1976
diff --git a/dev-python/reportlab/reportlab-3.5.42.ebuild b/dev-python/reportlab/reportlab-3.5.42.ebuild
index 9b97a79d088c..14abd20e320c 100644
--- a/dev-python/reportlab/reportlab-3.5.42.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.42.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index f7260165aec8..6c343ab27e09 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,5 +1,5 @@
DIST responses-0.10.15.tar.gz 25350 BLAKE2B 6d9dff99e2dc18b7361cb2b75f0438c62ab771364b1a572823cf1fb0cdb6175fee8c4cd372ac5d1b27ef31b88e66dd7d1410429213af240f6f743f0c85e36d1b SHA512 513df58b40968e271cfb429ee09ab2ca7c3cf2f6ebe3607276ed1b949670871f8d6993449cfd5871bfd119cda0c0628dce6ebe8ed40595696e550541413f12b0
DIST responses-0.10.16.tar.gz 25420 BLAKE2B a71402d30a30be18a445f2377498760fb00c5ed1fe0f61503675b4d0730bfd305711a0d56dd972a7c1cb439c3202819570eee81b6214fa723725d584f96905db SHA512 ec6738d3f7a33f7e3fbc95b1aaa5a10aa038dcbd8c9fdc4dc0ffc263e0cd613e6f2ce8e2fc2b59c91a30dec9677219fbb2630ec4d5d8d4340526fe72e24bd89f
EBUILD responses-0.10.15.ebuild 679 BLAKE2B d645fc1d382f505a1e6edc028ea85e21aabb3f3af20748affa0cb9ee5da00cd814b6becc8dfe064636ace682c88778620aee83f8716e79f215b1725a752c8312 SHA512 20d427ec114cb68fa7f1a711d21d489797ee8f9d9dbfcdb281be0c99c6e7920d54b7a3376cd8b761cfb7af5f3eceb404d9cfe6475d68f7d607e60f40d4e2e031
-EBUILD responses-0.10.16.ebuild 729 BLAKE2B 0f451fe2403783bbc22041ea6ca7ea52a74c6aa97fefd5cbbbb5b3e5fe5a8d7f44392726345984b00f0542925ac6935e628ae98b5e4332a6861192127b5f8b51 SHA512 0a771fa47b4d0f4158d86e1862d7d100af875c2b81a9b0e54043e533c7d4af78fb00f9061cc509c813390dd0f180057e917b26a93fdc74fb8fe4cf89bd8e7c31
+EBUILD responses-0.10.16.ebuild 741 BLAKE2B f468d5cf7b8ac61d6712938ef415b12d4a92fb82f78bbdce63c67f073a7db5a2a858ed3bdb832e078fa09e4996f32702ae42506a359adfd2618c1fd1d9b1ea2e SHA512 7051cd03689b283a125be6e27f49b50120ebf675f221985f4fcae839a7239ecbcf2006026a56043f7526dc66feff2e3bb778579ddf05bd18cf06f228be5c61f3
MISC metadata.xml 462 BLAKE2B c0afeab502da79631572ffa360f5b5cb19d41be177e9dc028041642cc756e08df0df9685c49825a40f3f343a29defe87f1f1e4805568d1037eab73895606221e SHA512 1b33da0d6d1ea49e0f108362c903f3521704ce8eaf1f328441eeb6950c19900eae5abf08204a0402cf7387077f32da97e5a84b2b6bb7c347a39a38e18032de33
diff --git a/dev-python/responses/responses-0.10.16.ebuild b/dev-python/responses/responses-0.10.16.ebuild
index f0c4bc5a197e..7dc543a4597d 100644
--- a/dev-python/responses/responses-0.10.16.ebuild
+++ b/dev-python/responses/responses-0.10.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-python/s3fs/Manifest b/dev-python/s3fs/Manifest
index 855cc41360c7..566d2defd4d4 100644
--- a/dev-python/s3fs/Manifest
+++ b/dev-python/s3fs/Manifest
@@ -1,5 +1,5 @@
DIST s3fs-0.1.5.tar.gz 27215 BLAKE2B 84f059eafe14a4faf8945c355763d31a49f38c3ae6cb05170dbff0e7ad435f9ea79617fc538d237b565d20a0b11603ea44d9e71339fd40c1ad16ad0af903bbd5 SHA512 5285da6d82de1e68c4cb0fad5a93eeb59fdffba663691d79cafd1b428b60e17fa21e0ff3a50df701cad7f351017cdc538954b0516782e5ddcf6c3d5910f71144
DIST s3fs-0.4.2.tar.gz 57527 BLAKE2B 74836547c270e00daeed55321a4d685a638a30a27ab65ea34ceaf55e0c44f1fac66a0802e602c052a5abc8e4a7bca778df7167751a6cf7a177f6a382012741de SHA512 7571a2d3ad998aab7dceb334bfcdb27035f21bfca04fd0828e75c1d860c2662f0a1c8c49317dabdbf2d7c21371c5dd6983a5aea760d2f71bff5ab0dfa9c9a14a
EBUILD s3fs-0.1.5.ebuild 659 BLAKE2B 87e2fd184266b4ea2c9bc310603e7b8deffeb8e044cd8cd59308885f761e8592e565054788d57d0e8e753687dddcd032ff42e7ec6b25cf2d1dfc22897af078e6 SHA512 c1c253ee6931e1040d9a80672a0d70ea7ae01cee7cc5ae93b40fa58ac0f10f6d73091590d48959596c4c2841fc40dd3003e98e117583e2d306d2fb6349b0de97
-EBUILD s3fs-0.4.2.ebuild 792 BLAKE2B d68f0ce8d9188da8a0deb4a8e9fbf965f7ea343254908bc3e609ceb2e964a1b417cf3b3a1c54b8c63880de4e81fda6267013ef6bc7cb09d17c89dcb5263ee7ff SHA512 880b7afe4abef42cc23e05ede5ec8669d042f33b7c259e140cd10a396cc443186e2b8a95cefe5b521e009f56416fefb5aed026c3d28f2fa560a32a52911ad96a
+EBUILD s3fs-0.4.2.ebuild 804 BLAKE2B 35e5595363b4b212b666af9e95ca7180043f66e7bf14d651c03b97c7b9739fba0f3b45cd5b9af4ec406ecc06929e9d6e28e66140b89c3f567e4078c78c4a3ae2 SHA512 9e9de224e8a9e5609e8aae0158602c39e803e62bbd95560099b5a8cb3e4cc473534c6684f35e5f6e2b9f33193d5aba16c6feb677a466aeeb2c16de9bba6997b5
MISC metadata.xml 383 BLAKE2B dd7df24dbc399b716f8611c1e669109e394371d6dfaa1c5e126c46c18e92d6533a5f8fc6d67e332e4e6e0a5db5e9324b2771fc9111a71a9942ff00b8bc69086e SHA512 e3a9960695a141ba0abe3be9fd8827fe6ac76363c48accdfecd551d876db6089d3c3b595f2a6e0351ab1ea68c59b3e73667a3d757fa0a5b989cbba259e113680
diff --git a/dev-python/s3fs/s3fs-0.4.2.ebuild b/dev-python/s3fs/s3fs-0.4.2.ebuild
index 77bc1e9fc548..091fbd457e52 100644
--- a/dev-python/s3fs/s3fs-0.4.2.ebuild
+++ b/dev-python/s3fs/s3fs-0.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index dcec2d927c0d..d684ade54615 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,4 +1,4 @@
AUX s3transfer-0.3.3-py38.patch 1296 BLAKE2B 8b951643ec020c837c9fbf3678aa60923ab5345615c4868070884223baa59a54251de5c7601cb798fa580e1c58721c0285c5e74f23ace8a207136f2f2067b4e5 SHA512 54c88be4cccc8de33d773d01e4fec613e3d84c3a7e41c19323ea77e5bede433e65253f71469262aa0565258f8cd4f03829815e96741fe26e4bd890001eb9f2b3
DIST s3transfer-0.3.3.tar.gz 118872 BLAKE2B a8e10a135052a29cbc5949bd8dc82d0b7f76840e6dbc6ba5ccdfe23757d363476f1dc330cee36ceb88e5c5287f644a27ed50b518a346f1b6b8ae38a9ca5576c9 SHA512 e258958b47812d8620ea6ef604dadb2a13beef9bbed005e8d38153039a291099786a3cec68511f2ff4372ff57f60440ca700b6783967484d8284b4ad0c1ae754
-EBUILD s3transfer-0.3.3.ebuild 714 BLAKE2B 58df34348f80a0085e353283db7c4b05be53e45a4566cb47aed294e0be05bee2edb5ee1b4b3d2b544274524a293c154350e72f146ac3bc592c9b983a22bebef5 SHA512 bc9715ca8714d1b1ce5ad5615c6493c5045a038f5bd672e6c562c55d01f6781bed387ed10c564e4c904eba14850e4ee6005bb122dde777b9d3e38ff04e03615a
+EBUILD s3transfer-0.3.3.ebuild 719 BLAKE2B f533981558a4dd6124dcde57b877cdad2b23ae0d97e11e58b6134f45d10c8d4a70f3dfbe93eeebcfbab05c65825f92f36ece87b9e588edc85716bd89d09d7862 SHA512 17cf4baf253e4bba89c370cd2db739f0f3ec1b54457e7c947f0473af763a52fed972f3a07fb91cdc99f7ef1a4effc1399e3cc5608571bc4fd23ec85e0adf15a3
MISC metadata.xml 502 BLAKE2B b996c37a4c744bcd72c760026bcc710ab8e70df0f9866167ac2628303edf5bc795943e686947de7c2c01a35c13a0769ce79f43efcb9d369cf0b1f2dc3a2b28a0 SHA512 8dc4c948f34912f6b4160afbffdfd9ed4f148871f4add56010943db1185fcd7d8af27e57e97a0ed293bafbb7c395636958218e023ba4507989aee2eca308ab24
diff --git a/dev-python/s3transfer/s3transfer-0.3.3.ebuild b/dev-python/s3transfer/s3transfer-0.3.3.ebuild
index cd79fbf9584a..8dcfca76eb77 100644
--- a/dev-python/s3transfer/s3transfer-0.3.3.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/botocore[${PYTHON_USEDEP}]
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index 882cd5b44b8c..fe3669684c7b 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,3 +1,3 @@
DIST setproctitle-1.1.10.tar.gz 24042 BLAKE2B acd4ef33ab2a200b5d102fe5ceb78df03deeee47eb5a3c7b50f0a44e095953e5a4e2230278b6b4a5010472e4a5a18b81accbff0461e3a642be478b880d98114e SHA512 c976c5b86f59bc6d0f840f495b8256813169d3d7b9edae70207a24d62e1240bfec954fdc4f67b429ae124e3dc74efd7193404785643a52b2d57b55028bb3c533
-EBUILD setproctitle-1.1.10-r1.ebuild 910 BLAKE2B 2e06441c2007be29447c5383db16da1af3bc72a18a1b0e68261b6ce5faf6935b405179f08e9c68005417a1f774e0bc456060e32c86d860ab3c4e2e8457eb6866 SHA512 1ae15d308a04d36a06d201a221661d16a0b80497905a60f19df2d3a215f521430b7d04ad5612723a98d175b66b401d56293b1d50915266e1f33df5007ce82f88
+EBUILD setproctitle-1.1.10-r1.ebuild 974 BLAKE2B 97d9a2b2637937fc95ff54956f96ef01e327de016777ce5142a8db96e1e7c1dc1bb2bb53fca70599d8522bffb8b1a8a8cec467950c98f4b5e2ef3e567d0c0bf8 SHA512 efb2af33c6f222bf3e62db97d2e2bf3b4108a83529ea07f3fa2de0a2ac739bcba46be0f7a1176fee5ec6cc0c71426528a4e162a3aa2f2017ccf01d8f07a4b6a0
MISC metadata.xml 380 BLAKE2B 136b22ffc942b2b6a6bcbd45ed3cebb105bf91a16014fa1fbc181a3a9055d132e03df3ffa63df79682f1e7369ee264f87ff32e8602a6478d170f4b20a230e9fe SHA512 eaca32091baa4a9fcd8ffbac6d250c135c0237552a7229aafc3cbb8bdf43450c114f26676964f80f73c2146b0b47934d77bdfdaf8411c069958bd898f69e8004
diff --git a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
index a0662118eee3..b6cec2019595 100644
--- a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
inherit distutils-r1 toolchain-funcs
@@ -13,21 +13,22 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# Required for re-write of test suite
-DISTUTILS_IN_SOURCE_BUILD=1
+python_configure_all() {
+ 2to3 -w --no-diffs tests || die
+}
python_test() {
- # prepare embedded executable
- emake \
- CC="$(tc-getCC)" \
- PYINC="$(python_get_CFLAGS)" \
- PYLIB="$(python_get_LIBS)" \
- check
+ if [[ ${EPYTHON} != pypy* ]]; then
+ # prepare executable for embedded interpreter test
+ # (skipped with pypy)
+ rm -f tests/pyrun3 || die
+ emake \
+ CC="$(tc-getCC)" \
+ PYINC="$(python_get_CFLAGS)" \
+ PYLIB="$(python_get_LIBS)" \
+ tests/pyrun3
+ fi
+
+ "${EPYTHON}" tests/setproctitle_test.py -v || die "Tests failed with ${EPYTHON}"
}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 289b96fa67cd..eeff8aaa2bf4 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,22 +1,6 @@
-AUX setuptools-42.0.0-imp-fix.patch 1839 BLAKE2B a11f8fe053a4b0ad8d326be339ba9cc95e3b90441b8fdeb4ad589d8e8248abf63a11f97ff1917aea73d3f3daf054d9fa831e805ad6823f31d474e25d67e15eb9 SHA512 c93a5b24f0169ab64ba3c80aa9c64a70609d89c776ee491de3088dc6dc7149d709836f79affde03aa58e2065e014318182a2359bae753fbb47c98d05fa9bcab3
-DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
-DIST setuptools-49.1.1.zip 2173825 BLAKE2B 44a23a2bb8613b2dcf2368997c7d89ffbd957d7004c1872bbb64631955e5e8ed2f14a49d16fff4c384c42d56b486eb2ee07f2a3e3e72add97502f39309a17fee SHA512 d33c291edb64d015530e3bd66666a612539896018c5f6b6eff65719339ec75967c4f6200be36a60955f885ebc4cb86f9acd5f52d8fd2e1fb1e4919488a986603
-DIST setuptools-49.2.0.zip 2174648 BLAKE2B 03d4d2f4df5e20a39bdf8940610e0e0ad02566bc594ba90f58f476a90882dff32f1126eb02a797027d126e45f0e3092d848214e4d28292850b5042a23cdfe6ea SHA512 72de34b2000fba981eb186b612a6b7ccec920c480966ebec4e178dc024db5628aeefde778c1bbd7dae9d38ae86aa9384a1b7d86f9c358429742daeba72ba9850
-DIST setuptools-49.2.1.zip 2173295 BLAKE2B c80cb7bc0e278e38cdaa87f32684476f1e72b69171213ef6019631011d735de62149635471a87791ffb665afdef0a3b70b57b4275cc4ff6bff8cc3c488229931 SHA512 daa4096d079eef9b234c854ae404a2b0f6f3034008f4c3119b0412adc1cbbbff936c518c8e3aeadaed67426ad83bb651681d63352520910833c5b919147f0fb6
-DIST setuptools-49.3.0.zip 2175616 BLAKE2B bc46992660adbf5aeafa0c3e93c9fa598c6ec61ed379fe07f97d43b77274ce27829bfaac6e706cb943e5e7a5a8e5e2b09551178c04e20af86fa8732d809753be SHA512 954b192b1d3a9deb8b8c9fb7d834d139a630d1951585f7ce9747c65b191c0bbd4747c8840b6297eb20a3755207333e9d921bca5b303ed8de757ddd28fd0b5e07
-DIST setuptools-49.3.1.zip 2175721 BLAKE2B 825fd23e504f2fc4d70c55435862e1080b20ea8d1d279b0d8934c12b9d793665161c07a43770fa2ad92dec7d405b04091d752f09bc2416e7239425dfc2f7e666 SHA512 57c3e31540b89c1356cc23a59c2c158b44a55a45ebc9c087a3a977af59ea387bb38baf54fd3b14ea23033715870a86b965c1828203f3df8b6cdad19fb4ea9249
-DIST setuptools-49.3.2.zip 2175821 BLAKE2B d7160869528bc50085646b7c27e153e406ee0d98e2e5bba1241ea8ca6e07248651b5d54ee2e5cf040858533c1fec6f4b6ffb77ad3f130fd12611ce6280c9adbb SHA512 4474b23a4f62fe5ac9f0b66a639be02da84c8abf22ad86f6436c02c82019f89a2ca14e8f8cbe9dd0932cfb32287a196d0a4735d709b301764bdb8b3d9da42c45
-DIST setuptools-49.4.0.zip 2188110 BLAKE2B 7b31969425ba1200f390428eedef8e2406ec1d209ffefde0b090f0c0137871544623295e01a3b8c672222fca82def36fe638ea70571280ec0932bc9e631d83f8 SHA512 1abe2bc006e7212a6cdbd18fa4aafe1063855e2c39c837649b4ec07226a4bc0d870fa1d0e89660d0b61f793dec5f1c3e8984ff47ad4b39391c83868cb59556c5
DIST setuptools-49.6.0.zip 2188590 BLAKE2B b789386d31c0d5cbc0c899d24e9af35baad371b698b488ed46b768e8831bae7245b391971e1e402799bc555475c1d8b78bd59a224c26bc78ba68b122a06e0154 SHA512 aad6e74b0e276da0f79c9429860a6d1c7860a30e9a02ce55527abbe7671366640423a1e5476da9ecadfc62ae1bf803cb0c664e2a09cf7619a9c8ac3965b9cf31
-EBUILD setuptools-44.1.0.ebuild 2303 BLAKE2B 931ca770bfaf11f45337baf5f0244d439670bf2493ee8316142fd7fd94925f42ac4f40711cd3b5d85701db30f76cc53c17407a2ee861564f5fd160c883f9720d SHA512 36bd81531155cf6bde6a4ff13f7472c0733221c575f599eb7a258d19b9b779c04f894ba712e015081f2619886c9ed1e60201df5947377b52b646c754a55d0e9d
EBUILD setuptools-46.4.0-r1.ebuild 2349 BLAKE2B addf1d5afe6cc50865cab5c470a759a09be4929960fabebb8e76b2f467153bf58939a7800e3b5beb91d2c70a3e8944a9d9968ad68bccbf6dbd3514d2f8b15a4d SHA512 e8dc79476786ec15580f12a272e42cb3f862fa384102bd4928bb3798d341cc5247603f573fa86cdce9d815b20e2c844ded0d969c393cb40fabf464130e219cd4
-EBUILD setuptools-49.1.1.ebuild 2043 BLAKE2B a3ed7a61eebac6fd12c831d2d5f28735ba984b1522c3db39c8608615061b00e10df4601c34dd1d1cefd6870ef997afb2fa025a5ad1783dca1f50eba3bba9cfbc SHA512 985b4e11bba757e58aca75659a32fa7fe0923ff36b0437b506b6e99434ff352968e24d4e417c49464a915fac27dd6585a593de021d172112cdb84a13f484acfb
-EBUILD setuptools-49.2.0.ebuild 2154 BLAKE2B 893b47bf997f9febeae84eaa00e6d98b47adec6aed14395caf2e4cdbf50b5d469f23aa4896b2d9940a267d036c3d15aa662848ca791fe267291a4139f2a18519 SHA512 6f226839db8a3fb3c33eee93d898c371c81f0773254f26afab4c9e279d730455b29678a22ad6b6478da70f322c040e2d1edc2ffee8dc9e9f4ff947e0748ff11d
-EBUILD setuptools-49.2.1.ebuild 2154 BLAKE2B 893b47bf997f9febeae84eaa00e6d98b47adec6aed14395caf2e4cdbf50b5d469f23aa4896b2d9940a267d036c3d15aa662848ca791fe267291a4139f2a18519 SHA512 6f226839db8a3fb3c33eee93d898c371c81f0773254f26afab4c9e279d730455b29678a22ad6b6478da70f322c040e2d1edc2ffee8dc9e9f4ff947e0748ff11d
-EBUILD setuptools-49.3.0.ebuild 2197 BLAKE2B 44f8adcdb268172a865ea7d87507b1053aaf8a8200015af8223c2ff21954ecb9b3ca515c10c61a1f25b59994d7d37b03b09a38acffaf63cb749018a795ebbe26 SHA512 e90f1afec07b6570cf4c5a6a9add7f585aa65a9511b41ade25897ef218b7d73c0eb595940f6d469827986605298b14b9b0c34c8dd806a8faea76eb4a5909ba2a
-EBUILD setuptools-49.3.1.ebuild 2197 BLAKE2B 44f8adcdb268172a865ea7d87507b1053aaf8a8200015af8223c2ff21954ecb9b3ca515c10c61a1f25b59994d7d37b03b09a38acffaf63cb749018a795ebbe26 SHA512 e90f1afec07b6570cf4c5a6a9add7f585aa65a9511b41ade25897ef218b7d73c0eb595940f6d469827986605298b14b9b0c34c8dd806a8faea76eb4a5909ba2a
-EBUILD setuptools-49.3.2.ebuild 2197 BLAKE2B 44f8adcdb268172a865ea7d87507b1053aaf8a8200015af8223c2ff21954ecb9b3ca515c10c61a1f25b59994d7d37b03b09a38acffaf63cb749018a795ebbe26 SHA512 e90f1afec07b6570cf4c5a6a9add7f585aa65a9511b41ade25897ef218b7d73c0eb595940f6d469827986605298b14b9b0c34c8dd806a8faea76eb4a5909ba2a
-EBUILD setuptools-49.4.0.ebuild 2197 BLAKE2B 44f8adcdb268172a865ea7d87507b1053aaf8a8200015af8223c2ff21954ecb9b3ca515c10c61a1f25b59994d7d37b03b09a38acffaf63cb749018a795ebbe26 SHA512 e90f1afec07b6570cf4c5a6a9add7f585aa65a9511b41ade25897ef218b7d73c0eb595940f6d469827986605298b14b9b0c34c8dd806a8faea76eb4a5909ba2a
-EBUILD setuptools-49.6.0.ebuild 2197 BLAKE2B 44f8adcdb268172a865ea7d87507b1053aaf8a8200015af8223c2ff21954ecb9b3ca515c10c61a1f25b59994d7d37b03b09a38acffaf63cb749018a795ebbe26 SHA512 e90f1afec07b6570cf4c5a6a9add7f585aa65a9511b41ade25897ef218b7d73c0eb595940f6d469827986605298b14b9b0c34c8dd806a8faea76eb4a5909ba2a
+EBUILD setuptools-46.4.0-r2.ebuild 2478 BLAKE2B 28b4e7fe8f73e5161ad5ec6d05614e7907115c2c6ea9c2a62da6c3170e55a3e6cd21848726cd28218c84d85b99c5049753eec5f9f7c42d92a7127a17f657727b SHA512 415cbe43a31997249a945fb69635c2e4be07607aca2305a7edda480438fe920c412f9235a41a90fdcf8bda0bdc918e3c1022276a5bd2da768b3800a38461a8bd
+EBUILD setuptools-49.6.0.ebuild 2242 BLAKE2B 55cbd8c45e536ca370d6f28bd5a4378ea04cb91ede8b5842615ed5ccbbdbf2814c0fbd4e62a089c8c16cf431d1f293fa5e5fb7cdb9502396acc51cd3ad6e1a85 SHA512 300664b69a018daf86725ffa2a7c1e293136cc864482b522b7e97e520e4d38b74fad48c2f695846a5525461f39eecc09e924789c31215b16d6e6994471b10d11
MISC metadata.xml 443 BLAKE2B 2b923468b7dc3062ad0f95edd944ffdde6dd4a8303ce8cc9a95730fefeb211e67ea64b7a289e60009003b64731d047ab3bb47cc6c8f0805a05a3a38f57846448 SHA512 2b2b1c7a0647283b069af29be73d0aa9c1e1ec8374d15d8a3b53a44b11d4698cba57a26ef5963795eb8bdbda9602b18a02194c5741485023ffd0b3218c028110
diff --git a/dev-python/setuptools/files/setuptools-42.0.0-imp-fix.patch b/dev-python/setuptools/files/setuptools-42.0.0-imp-fix.patch
deleted file mode 100644
index 5c96016c92c3..000000000000
--- a/dev-python/setuptools/files/setuptools-42.0.0-imp-fix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From bbf825eee764cae0bc44077ccc957a733d53d095 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?=
-
-Date: Fri, 15 Nov 2019 08:52:35 +0100
-Subject: [PATCH] Fix _imp module behaviour if is defined paths in find_spec
- call
-
-fixes #1896
----
- setuptools/_imp.py | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/setuptools/_imp.py b/setuptools/_imp.py
-index a3cce9b28..6ccec5799 100644
---- a/setuptools/_imp.py
-+++ b/setuptools/_imp.py
-@@ -19,7 +19,10 @@
-
- def find_module(module, paths=None):
- """Just like 'imp.find_module()', but with package support"""
-- spec = importlib.util.find_spec(module, paths)
-+ if isinstance(paths, list):
-+ spec = importlib.machinery.PathFinder().find_spec(module, paths)
-+ else:
-+ spec = importlib.util.find_spec(module, paths)
- if spec is None:
- raise ImportError("Can't find %s" % module)
- if not spec.has_location and hasattr(spec, 'submodule_search_locations'):
-@@ -60,14 +63,20 @@ def find_module(module, paths=None):
-
-
- def get_frozen_object(module, paths=None):
-- spec = importlib.util.find_spec(module, paths)
-+ if isinstance(paths, list):
-+ spec = importlib.machinery.PathFinder().find_spec(module, paths)
-+ else:
-+ spec = importlib.util.find_spec(module, paths)
- if not spec:
- raise ImportError("Can't find %s" % module)
- return spec.loader.get_code(module)
-
-
- def get_module(module, paths, info):
-- spec = importlib.util.find_spec(module, paths)
-+ if isinstance(paths, list):
-+ spec = importlib.machinery.PathFinder().find_spec(module, paths)
-+ else:
-+ spec = importlib.util.find_spec(module, paths)
- if not spec:
- raise ImportError("Can't find %s" % module)
- return module_from_spec(spec)
diff --git a/dev-python/setuptools/setuptools-44.1.0.ebuild b/dev-python/setuptools/setuptools-46.4.0-r2.ebuild
similarity index 63%
rename from dev-python/setuptools/setuptools-44.1.0.ebuild
rename to dev-python/setuptools/setuptools-46.4.0-r2.ebuild
index 9e87131b2a19..fe0f241c6160 100644
--- a/dev-python/setuptools/setuptools-44.1.0.ebuild
+++ b/dev-python/setuptools/setuptools-46.4.0-r2.ebuild
@@ -3,24 +3,18 @@
EAPI=7
DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
PYTHON_REQ_USE="xml(+)"
inherit distutils-r1
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
DESCRIPTION="Collection of extensions to Distutils"
HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="MIT"
SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
@@ -37,25 +31,22 @@ BDEPEND="
' -3)
)
"
+# installing plugins apparently breaks stuff at runtime, so let's pull
+# it early
PDEPEND="
- >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+ >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]"
# Force in-source build because build system modifies sources.
DISTUTILS_IN_SOURCE_BUILD=1
DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-PATCHES=(
- # fix regression introduced by reinventing deprecated 'imp'
- # https://github.com/pypa/setuptools/pull/1905
- "${FILESDIR}"/setuptools-42.0.0-imp-fix.patch
-)
-
python_prepare_all() {
- if [[ ${PV} == "9999" ]]; then
- python_setup
- ${EPYTHON} bootstrap.py || die
- fi
+ # silence the py2 warning that is awfully verbose and breaks some
+ # packages by adding unexpected output
+ # (also, we know!)
+ sed -i -e '/py2_warn/d' pkg_resources/__init__.py || die
# disable tests requiring a network connection
rm setuptools/tests/test_packageindex.py || die
@@ -63,6 +54,13 @@ python_prepare_all() {
# don't run integration tests
rm setuptools/tests/test_integration.py || die
+ # xpass-es for me on py3
+ sed -e '/xfail.*710/s:(:(six.PY2, :' \
+ -i setuptools/tests/test_archive_util.py || die
+
+ # avoid pointless dep on flake8
+ sed -i -e 's:--flake8::' pytest.ini || die
+
distutils-r1_python_prepare_all
}
@@ -72,6 +70,7 @@ python_test() {
return
fi
+ distutils_install_for_testing
# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
# It tries to sandbox the test in a tempdir
HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
diff --git a/dev-python/setuptools/setuptools-49.1.1.ebuild b/dev-python/setuptools/setuptools-49.1.1.ebuild
deleted file mode 100644
index 3f1c94d2fb6d..000000000000
--- a/dev-python/setuptools/setuptools-49.1.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- app-arch/unzip
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
- dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
- dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- )
-"
-PDEPEND="
- >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
- # disable tests requiring a network connection
- rm setuptools/tests/test_packageindex.py || die
-
- # don't run integration tests
- rm setuptools/tests/test_integration.py || die
-
- # xpass-es for me on py3
- #sed -e '/xfail.*710/s:(:(six.PY2, :' \
- # -i setuptools/tests/test_archive_util.py || die
-
- # avoid pointless dep on flake8
- sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- distutils_install_for_testing
- # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
- # It tries to sandbox the test in a tempdir
- HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
- export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
- distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-49.2.0.ebuild b/dev-python/setuptools/setuptools-49.2.0.ebuild
deleted file mode 100644
index 05a423b05f07..000000000000
--- a/dev-python/setuptools/setuptools-49.2.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- app-arch/unzip
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
- dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
- dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- )
-"
-PDEPEND="
- >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
- # disable tests requiring a network connection
- rm setuptools/tests/test_packageindex.py || die
-
- # don't run integration tests
- rm setuptools/tests/test_integration.py || die
-
- # xpass-es for me on py3
- #sed -e '/xfail.*710/s:(:(six.PY2, :' \
- # -i setuptools/tests/test_archive_util.py || die
-
- # avoid pointless dep on flake8
- sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die
-
- # disable the code disabling non-existing coverage plugin
- sed -i -e 's:cov = .*:return:' conftest.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- distutils_install_for_testing
- # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
- # It tries to sandbox the test in a tempdir
- HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
- export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
- distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-49.2.1.ebuild b/dev-python/setuptools/setuptools-49.2.1.ebuild
deleted file mode 100644
index 05a423b05f07..000000000000
--- a/dev-python/setuptools/setuptools-49.2.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- app-arch/unzip
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
- dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
- dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- )
-"
-PDEPEND="
- >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
- # disable tests requiring a network connection
- rm setuptools/tests/test_packageindex.py || die
-
- # don't run integration tests
- rm setuptools/tests/test_integration.py || die
-
- # xpass-es for me on py3
- #sed -e '/xfail.*710/s:(:(six.PY2, :' \
- # -i setuptools/tests/test_archive_util.py || die
-
- # avoid pointless dep on flake8
- sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die
-
- # disable the code disabling non-existing coverage plugin
- sed -i -e 's:cov = .*:return:' conftest.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- distutils_install_for_testing
- # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
- # It tries to sandbox the test in a tempdir
- HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
- export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
- distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-49.3.0.ebuild b/dev-python/setuptools/setuptools-49.3.0.ebuild
deleted file mode 100644
index 87b988937299..000000000000
--- a/dev-python/setuptools/setuptools-49.3.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- app-arch/unzip
- test? (
- dev-python/jaraco-envs[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
- dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
- dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- )
-"
-PDEPEND="
- >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
- # disable tests requiring a network connection
- rm setuptools/tests/test_packageindex.py || die
-
- # don't run integration tests
- rm setuptools/tests/test_integration.py || die
-
- # xpass-es for me on py3
- #sed -e '/xfail.*710/s:(:(six.PY2, :' \
- # -i setuptools/tests/test_archive_util.py || die
-
- # avoid pointless dep on flake8
- sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die
-
- # disable the code disabling non-existing coverage plugin
- sed -i -e 's:cov = .*:return:' conftest.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- distutils_install_for_testing
- # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
- # It tries to sandbox the test in a tempdir
- HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
- export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
- distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-49.3.1.ebuild b/dev-python/setuptools/setuptools-49.3.1.ebuild
deleted file mode 100644
index 87b988937299..000000000000
--- a/dev-python/setuptools/setuptools-49.3.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- app-arch/unzip
- test? (
- dev-python/jaraco-envs[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
- dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
- dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- )
-"
-PDEPEND="
- >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
- # disable tests requiring a network connection
- rm setuptools/tests/test_packageindex.py || die
-
- # don't run integration tests
- rm setuptools/tests/test_integration.py || die
-
- # xpass-es for me on py3
- #sed -e '/xfail.*710/s:(:(six.PY2, :' \
- # -i setuptools/tests/test_archive_util.py || die
-
- # avoid pointless dep on flake8
- sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die
-
- # disable the code disabling non-existing coverage plugin
- sed -i -e 's:cov = .*:return:' conftest.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- distutils_install_for_testing
- # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
- # It tries to sandbox the test in a tempdir
- HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
- export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
- distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-49.3.2.ebuild b/dev-python/setuptools/setuptools-49.3.2.ebuild
deleted file mode 100644
index 87b988937299..000000000000
--- a/dev-python/setuptools/setuptools-49.3.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- app-arch/unzip
- test? (
- dev-python/jaraco-envs[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
- dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
- dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- )
-"
-PDEPEND="
- >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
- # disable tests requiring a network connection
- rm setuptools/tests/test_packageindex.py || die
-
- # don't run integration tests
- rm setuptools/tests/test_integration.py || die
-
- # xpass-es for me on py3
- #sed -e '/xfail.*710/s:(:(six.PY2, :' \
- # -i setuptools/tests/test_archive_util.py || die
-
- # avoid pointless dep on flake8
- sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die
-
- # disable the code disabling non-existing coverage plugin
- sed -i -e 's:cov = .*:return:' conftest.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- distutils_install_for_testing
- # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
- # It tries to sandbox the test in a tempdir
- HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
- export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
- distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-49.4.0.ebuild b/dev-python/setuptools/setuptools-49.4.0.ebuild
deleted file mode 100644
index 87b988937299..000000000000
--- a/dev-python/setuptools/setuptools-49.4.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- app-arch/unzip
- test? (
- dev-python/jaraco-envs[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
- dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
- dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- )
-"
-PDEPEND="
- >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
- # disable tests requiring a network connection
- rm setuptools/tests/test_packageindex.py || die
-
- # don't run integration tests
- rm setuptools/tests/test_integration.py || die
-
- # xpass-es for me on py3
- #sed -e '/xfail.*710/s:(:(six.PY2, :' \
- # -i setuptools/tests/test_archive_util.py || die
-
- # avoid pointless dep on flake8
- sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die
-
- # disable the code disabling non-existing coverage plugin
- sed -i -e 's:cov = .*:return:' conftest.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- distutils_install_for_testing
- # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
- # It tries to sandbox the test in a tempdir
- HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
- export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
- distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-49.6.0.ebuild b/dev-python/setuptools/setuptools-49.6.0.ebuild
index 87b988937299..0d8d2e8bfb98 100644
--- a/dev-python/setuptools/setuptools-49.6.0.ebuild
+++ b/dev-python/setuptools/setuptools-49.6.0.ebuild
@@ -31,7 +31,8 @@ BDEPEND="
)
"
PDEPEND="
- >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+ >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]"
# Force in-source build because build system modifies sources.
DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index e80154aeed12..3766863d5f0d 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,5 +1,5 @@
DIST simplejson-3.17.0.tar.gz 83119 BLAKE2B 979dbcb5d50aeb55fd1c16daa398ef915ee1f23ca25a84870a3132c265202d1cd253090157cdea179cecc6603618df293a28adeadc795238ec3ccfceda88ea0a SHA512 383ee4fa3b2f378cd83152ba588ffbb620aa0e7cec80d3e3097edfb406a60e96afd6c5302a5b64adb710d3a52479c609873a2db7ab5756d7ca7a51412029e4c6
DIST simplejson-3.17.2.tar.gz 83210 BLAKE2B 1b9f97a43bfe84f1ad506713d81483ebcd4006d1174558b7a27373f99d014e23ed72a9ec2b2006e64760c61e1e500a4f1ea4547104e7f4c71ba51003df0a5052 SHA512 003b2fbcb3f8e0849bdbd958c78f8b470081d97527bef82306db77940c6734a1cbf3b5dcb0984d2f9c9d14aa525e7865a08e70a10971f8841e138f7ad6476e4a
EBUILD simplejson-3.17.0.ebuild 774 BLAKE2B eaec307788c130d7e32ccc3760379e3712f1407b9180c1a087daab1327ac230caaeab92fe6a32df2d58219c11264b9c24317fc64b536a67e24ebf870fcb49a37 SHA512 69226587cf94ab5de79b4a1a0687ca2554b545807d9796ea23a9c82419b53d0d1ab6f36ef73a51936514a66c773f3655cc6c2b74eb690e1ac1a2763929d6eb03
-EBUILD simplejson-3.17.2.ebuild 783 BLAKE2B d5b387e615ea31826fdf8b5d620f970c98f9cdb1698fcab83dde5cd82fdbe9bf1334005378d8d0fd34603d829ac3c8a68803f7eec81da2d5930ecf7c76e2071b SHA512 8ab86b3c0c26fdbffd7115430aaf84bac3676e817c7453f9b54fa73d6d01930abaa385e049c24f4aa54d8440895ba5b834fe5be2c583b83b49903d5cf6efc835
+EBUILD simplejson-3.17.2.ebuild 782 BLAKE2B c7d57920fb748f3aa75178aa531b11860865d09974e09d6d5db6bcdb4435b2cd3c5eaf0e897c0f278838fca46453f3b21af0ad830a0ded614b06533c98d42473 SHA512 b70fab520921fc7c117e66ac3d495a255b8f31ff2fc57bb254000aeaa0ba6f3fd617ffb4fbf2873f331c5dffbaf7ffc58c7d3ef879079327375fba9bf59173a7
MISC metadata.xml 323 BLAKE2B c21be649394bb8a261a6169a710fd3862f1dd539505381a15f99611f323ea1e5fe4e6e54f1ed73d28bdddc2459812f13e40658ed99c09d0ba0f93f724b4bcfc9 SHA512 7db760ee80a6281bcc370303bafc40aea566465bf3264381336222c6f6002f573bfac205f2e42cca557c7b31855f082e1ed29ec9ab3b1125e455cf84bdaf54ec
diff --git a/dev-python/simplejson/simplejson-3.17.2.ebuild b/dev-python/simplejson/simplejson-3.17.2.ebuild
index 093a002c8044..397fe49c0448 100644
--- a/dev-python/simplejson/simplejson-3.17.2.ebuild
+++ b/dev-python/simplejson/simplejson-3.17.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( MIT AFL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
DOCS=( README.rst CHANGES.txt )
diff --git a/dev-python/sortedcollections/Manifest b/dev-python/sortedcollections/Manifest
index 6d18ae05bd2f..3dd4bd2f2806 100644
--- a/dev-python/sortedcollections/Manifest
+++ b/dev-python/sortedcollections/Manifest
@@ -1,3 +1,3 @@
DIST sortedcollections-0.5.3.tar.gz 7021 BLAKE2B fdef18b938502f0fc7ce1683977b0982c23aa915d79b6bac30cf9cd74aa19af695f2aacb658a8411304497f28d270e9ba95bbdbcc47220f0302cd376edf312d9 SHA512 e0076017d1a97d7dc18b02bc4e3739c535ab001260be739fab2784cb58deac4323957fe21b4c679f55a790d864ca696695a603298709225b04eae740d859ab28
-EBUILD sortedcollections-0.5.3.ebuild 582 BLAKE2B b7e8677827247b44d65105dd8e2bb6de461f5743e60a8b9e46344942748e4fafba11f97924a825f37c6388fbef160517cd413bc3616028662ef94a29820c135e SHA512 ef29f878f32fcdf15b6c32807e9c9befab30dbe5736279ed79f57142ed0650dd1fe4a8625b91cfc98e3fa7ac15008fe87ab6514d5a1ba5d9588d912f9c3f7d18
+EBUILD sortedcollections-0.5.3.ebuild 594 BLAKE2B bababcad1f7c0a7adc8a9abd31659b5830b14a6a4b3456c779a4f5d19870d94ec2aea6a49b24b9397a07760eeee70f7ccdb89a65b94b596a853eee91b29ed5f5 SHA512 3f6678d0d42f8fff823d5814526bdc975105fb1be3abd850b9fffbf47918b38160dd994fc40d7b2cab2cd933234a9db17d4496b253bd9518b80095ef6eaa750f
MISC metadata.xml 498 BLAKE2B 5638984052d38b48773ba3efad23de34d7d22e5de6ab570a0f1c8494918b0f331b2a3f7cd72d976de9d1d24ae623af07370bf9daf6833792019472a1a23c2fc0 SHA512 d332e588cdf6194708c1e3f00e9e8159669eb36cb21b4c6eed8e5af44f09f7e71f12fe437ce889b96599994f7a9c9d7c4fa6642c2ab74cedb0490d21a3165d21
diff --git a/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild b/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
index d21830553a57..e19def8ba3cb 100644
--- a/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
+++ b/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/sphinx-aiohttp-theme/Manifest b/dev-python/sphinx-aiohttp-theme/Manifest
index e73c42c38682..67b3141867ec 100644
--- a/dev-python/sphinx-aiohttp-theme/Manifest
+++ b/dev-python/sphinx-aiohttp-theme/Manifest
@@ -1,3 +1,3 @@
DIST aiohttp-theme-0.1.6.tar.gz 10921 BLAKE2B f1a5a0b82c1a99e0afa2fa118e9b2a13d59d742634c8826c0f67f45bd049c96851f1ac694cb6ebfcee1f66b1e03d445b4a3eef676135076af99a1d30541a0a4e SHA512 58b3b595eed97de546484dae562172c7751a3d4d90a6a1ea885e86a44b78d9017834372179d2881e048c4b2916f2b53d11ddb9368a5474462ac9ef7d75925b7f
-EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 564 BLAKE2B d30c02f298b2018a3b58c99e6d1a53f7f5a575ae52bb20ad530c9a989a76470db91a284c0b3fd6f87974249616cac1f9239afde855315dd9a1ce978edaa0678c SHA512 4db4d0f7cdd222f171aed012b540bcade9545203a444a5954cf7c6d24f3e1f7291c68db358a82dfa9d2bdd3c64f7dfd807e2ae55a2fc25850a1b2b4989d61d66
+EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 577 BLAKE2B d7a11e9af275ec134d26f8dd943f9984a4f2e36abdd9d245b604be30a026c5187a525ebf4776e839268287a198a01df66e58117865f7d385f6c1eb1c9dd30b91 SHA512 00849a488c07eec6b24c955afddca04ccb3fd4bb3086e94da3aa93e33a5eff264f20d06d391f258f7ac2896c9a1a193828d8a3d4a713c55a7868c8fab6cd3524
MISC metadata.xml 356 BLAKE2B c6f21942be22de996083446c4cf4d1d188e582ffc7550975b513475021f7097835512409e58eee10f86b205770734c968234d5fc542ec1a622d3883714685824 SHA512 9130b60a4ba5ad45d7bc2ae275485917c365933b215e9551ab000cd5a34a6932a07b02b7513d0890403fbf6a7cd713dd8cfcaaccd1c4819a0a9f15207f062d9a
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
index 79b697213802..5d7f1a975ba1 100644
--- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~sparc x86"
IUSE=""
RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
index 7bf8191195e8..be5228523381 100644
--- a/dev-python/sphinx-testing/Manifest
+++ b/dev-python/sphinx-testing/Manifest
@@ -1,3 +1,3 @@
DIST sphinx-testing-1.0.1.tar.gz 11513 BLAKE2B 46ede243507a0d90b2ad4b918deadb818491bb0ed15ce41886040c52650f9fd348ff57c03766fd1e7719bbb54726f8915e091cf94a5396da946102ca49fd07b2 SHA512 2d377c0c6fe8e34a463b35e96938507a3ca35fa06cd19a2682eb55825e1b88982a80a02ebb9a02a47f11ca5e8fe6a5b9e5c8114d955fa3b774e0148e82121818
-EBUILD sphinx-testing-1.0.1-r1.ebuild 796 BLAKE2B 03f8ee794d26238a3a4cbb451adc228fdfd1aaf3aefa53456bf3fcf87139319c7042850edfe897d818c252b6671c9cf3f698b8cbef2b6521228618b844802e76 SHA512 c37b1e9a359417a110f3269602e1da45ff28de28a80764fa03a07afb758eb60fa29744562e4b0d6a274ef439534f472b41481d3290366c4451ca466659f74cb0
+EBUILD sphinx-testing-1.0.1-r1.ebuild 802 BLAKE2B 36f682ec517e062edd59e051e99ca97f039904d299ccc8c4046fc6e0a125684afe3df4da52e83413fa4ce4ae0b1b3d4fa21cb1e138c692e443f216c644465502 SHA512 d1a2dfcfec305560e0b061334045099b96b693691286883365ef019bea2a6a5eff5da3bee992e023c0129b369d1754fa179a91f501f7a0513a45a22427f52dba
MISC metadata.xml 340 BLAKE2B 9a1df283aab1420d7818f4661b57f6d60cd734016c3711c633b9a6a11c401c8603503530fa5e1f50940bd28c1fed83196c1c543d16b5217b996f6afef23175a8 SHA512 f5299851dc6aa3c3ad1109123ac6c4eb5b5c7e1177fa1f068da5cef0920bbece63a8f1c424c5b95addf661e5a7d15a05a427676f6c272a54741495c77e316b78
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
index 97e5a1167468..d922c86bad6f 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index 86bca40b40bb..a909cbed67aa 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,3 +1,3 @@
DIST sphinxcontrib-blockdiag-2.0.0.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
-EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1175 BLAKE2B d8357f47bf454ecb5a09391223e4ad92221c2daa566fce2c34ee92f3fcfc0e59e2648e811974c2537548aac158e124978e434889bc12e37cd211bddabd935c92 SHA512 7260d2d332833515bbad47c966eab7ae763267c5db1f4ff8c27a009906e9c033d959231778df9280d73ba73d730802de602013e486deaf10f5c0e0fc3c02f508
+EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1181 BLAKE2B 5fc0896f03f5bbac88d023e89400ad96a0fe9b2efce0bb33358aeb00eb8ab43a02df18f6458c1061e7c69d04688661a8d9cb63f52403904eb0073754fb9a0441 SHA512 1fd706fa608424ce1401b50485d07a68404ae48f9cd578cc5c34c5680236b6967fdf9c257ea4e6e29b975732b1feebe9902d5ebeac2f14f82ddc35b03c920c5b
MISC metadata.xml 416 BLAKE2B 4383283e64d8db0b5576f1defc62412b5c4f4003e5ac75a2755e79d3e2a53f6d7aff82741d6225d2c96f0e2d87df650d47110a31cc91362dee641a86c54b18da SHA512 10fc4ff78fce4beadf8f8b64cfcaf4b71f84c3f74d80bd7299055ef7c2a759bf8d8eaef841e464d72d3272d999fe20ebfbcd382f2025932eef474387e92be6e0
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
index 75e9b6ad5829..40e89f1c6438 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
RDEPEND="
>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index cdb6f3491a78..b6dcfc0e2410 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,5 +1,5 @@
DIST sphinxcontrib-doxylink-1.5.tar.gz 11391 BLAKE2B 569eaba41a2cb802d05b0e7da28a00f41399175e2103979eeae35750e2935f66670c20bb0a560980d553a8a751ab57c0e200d0110983eb474eba60b3a2bfcc10 SHA512 caac418ed2b11f1b72bc3cb2e5c6bd22a680f9e6debecf6c0028bc1e92fc41e017996be05a7ac7c2dc96c907e59ebfda32bf8b7715c92c33c39404ef356c2a13
DIST sphinxcontrib-doxylink-1.6.1.tar.gz 10173 BLAKE2B 2bb341576c459715a8bfc0a6a7b971e76afdcfba6a082b3f95844678e54c248e814e1a45a1a5d63d85407dcc6d2f7e56e4211b9603014b8478c7eb35e8b9a73d SHA512 c27983cbd54d6ff2c4110b0269d630cd81b8aff6bf7f6b1b006dbb18fc3643d59a25ecff0ec9c92785c697e38861e755fb44a95382314b8b2888da9e8e191637
EBUILD sphinxcontrib-doxylink-1.5.ebuild 918 BLAKE2B 3928cc2102a76a26660edea37fb33a821fb7c9801abf7f6d5b38d33a457f0f0df932d237924950e25f05541c5f921d6dfca9c9df0fe0eeb4d0f92ddf8e276d0c SHA512 145ff0353683cb41bc81778716941759ea84c24fd6e6aa258b07c93528b1656461c103ab46770ef4c70dee4b3f56bfbf959b46207cbc6ac7a7a3092918dac4f1
-EBUILD sphinxcontrib-doxylink-1.6.1.ebuild 840 BLAKE2B 0b4a2a87ea9c06e2261c3ff4cf674dd07a1b96bdaca23aba21ff7f33b26bb27326d9aae9746fa4eb6221d2a1fd4e5dca8017913814320fe8d112bb032af6bd54 SHA512 c22f6d905f0c752c03c0e6def013c9d8f82aa388e08ca22e4409cac0c6e7a6e3619b634269047455a43884ed2d815856ac48297cf1dea42541874b01fcde3638
+EBUILD sphinxcontrib-doxylink-1.6.1.ebuild 839 BLAKE2B 39647f55c4278972142cd58d9101a7a98e78776758eb75b8f427d408678071c2aa73f8f5543b3c4fcce10fcbcf6c26a1bc98f45c2f1ff1d58ee44ad77829a398 SHA512 101f28088539b6185683e15999d790006ff2c229b32d53f90a8fae58aedd39c049240c874565a88a0bef773629a12c8e7e2a4afd45171e795855a0fc2fccf273
MISC metadata.xml 594 BLAKE2B 86632671564dcdc1232b188dc82e8b871671a3b45e1f221da4a2ea47129b9435d5a3d4dcd0baaff7df50f63b50c144474ad825f99de2d8a14d50adef761097fd SHA512 8251cbf356a788a1b34d8666007a91471669ff956348b18569c062fa8f09b8dfc685ee27fc6fc5066c41ca8f8da36b42b2a244f5232723bd39e26207148bcabf
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.6.1.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.6.1.ebuild
index 2fe6ca1d56f6..83c37cd9d47f 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.6.1.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-newsfeed/Manifest b/dev-python/sphinxcontrib-newsfeed/Manifest
index 463120860405..9c4777cd37fa 100644
--- a/dev-python/sphinxcontrib-newsfeed/Manifest
+++ b/dev-python/sphinxcontrib-newsfeed/Manifest
@@ -1,3 +1,3 @@
DIST sphinxcontrib-newsfeed-0.1.4.tar.gz 10862 BLAKE2B 708c7a725ac36f54ea735953ba9d230b05da95147eabc91de9d610d3e02ec7d0d1ab8f5882d4e97327da425fc49e1b1a1753e011445ede859edd4f3cd5fb2a16 SHA512 96d9d0c15fca8b62f945bafc8f0eafa62df9c471f7510e2f153e47b66534e5f3041e5c01df772e6c35a9f09baa70064642f7f0fa43ccfd33dd64c2604494f2fc
-EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 815 BLAKE2B a0674498660106f63d69ac39ab3a0df4141fa24be1b0c6b0317e83250938dea90457b99e943fb47bdd4c8b8a6161ea08bb38b2f7984d12b3189c4d0680b12d9c SHA512 38d87300c20f50b1cb5af18e28eb9bbb00273055e6ae6de89f8e5a0fc8e8edc1bf2fde110c709ea8d19c642074c50a08f2099668f115754c4f4b6f8702725d0d
+EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 828 BLAKE2B 37bddb44b4a04608da45d5a971b90fb15ca0872990dbe585873835e65605384da2036cf5de60657e70222a7addb477661cadba37d91f7ef1fb35f6509d3222da SHA512 d7eb78d062e40d04555d8bce86c41961070021e017b65fa6ecdd1605fddf947b94d7e14827aff92670e15b4a34d5b7383453ef121e1ef43d180b0bfe7b9134c1
MISC metadata.xml 326 BLAKE2B ee27050dba4cec236f08ae168f2cae643f35f0e20e20d0803f7783694f4f6c3289faea1df4ae326dba6125eb6b7f8d275f449769b76220eca973bc5fcab11e45 SHA512 e47c6ab16713c27cbd5353250642751d73d39bded06b14a6571c2221f9ced2f73c6f33156acd1622789a1aaab6779a49bb85192c130e77aeb3d05d9a1513c69f
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
index 7c66e8d5cfdf..68cf9b52169f 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index 38295a3e9ac5..c5fdee9dc714 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,7 +1,9 @@
DIST sphinxcontrib-spelling-5.1.2.tar.gz 22962 BLAKE2B c7b15289b4b6dce5e6c5fb529c4be2cd7c1f41d8bfc6ac86daf1a982f711bd2c426d9b3a615471538fe221197b64ccd907efd4620ea2440f6ec07b2a078d6bee SHA512 4a0398b7c79a035e12d9ae96100fcaa4df42aeae07a01a73f7d875ba04fbbeb3d7441c9debe77491876d78b0a3753677cff4cb3a575e3490364fe5780f5a70b2
DIST sphinxcontrib-spelling-5.2.0.tar.gz 43860 BLAKE2B 535ec4d8d6f924c9f01b10599725295b1f96f47e999393fbc603725b0eb4ffccf7f12be636cc2d9d045251cae075a3e851f3de4cee5d64ca24ca2056a5406274 SHA512 a17932c5b656cfb76a1389d7c56d71b41d0dda37fae0449db2e03ae1694a6741d20ce2b057ff8bc5fc4fc26c91e07f5a1106470deeea2633ca7a60bc7537c2aa
DIST sphinxcontrib-spelling-5.2.2.tar.gz 45029 BLAKE2B 4a14ed30155f51a97b8257d0d751cd1a4f504bdbe18243423f86cdd92a2745fb32e88aa1c6b4de5cfdedb2eba9b78ec077c3719a45751f9e601fc0b223d61331 SHA512 442df6e83dc6830a3593ccae9c86965369bb83493c4c8dbae1f1e94e85971533c8cfd69e38846be37fa7333ee1b1c23958097952cf173862f856228e5a72b48b
+DIST sphinxcontrib-spelling-5.3.0.tar.gz 45665 BLAKE2B c44c8c2621aecd74734c6137e1344a763e99fb61b3ce882c8ea70364df17a7e2fac49acc8878753cab1b70df2cf084de5087bed77f8b1bffe311410ecec3504d SHA512 8f3c4718877e55b0ebcd3d8c0f078a6c06c27c2cdd3cc557fd2e0e990f0c8956179fd9a8b3135b280973e45c0c8657f71372746ef4b55319078db8f16c7e00e9
EBUILD sphinxcontrib-spelling-5.1.2.ebuild 941 BLAKE2B d7a4baf4284165354c8689e49e1f9c35d856c2e8bc2d207db2a30b358daefa72a9b70ee7f37b19f0b184646e3f9d6f505e93c55bd7045f229f3c5752f1e3e99e SHA512 70cfa8fd9fd9c229b4b1e3f48016e28e4ca1a5355a47fab5cef9163b3560b76d6483407ddb264189a03c07e72a863658b5f5031fceca6dc74d746565276b5e93
EBUILD sphinxcontrib-spelling-5.2.0.ebuild 1078 BLAKE2B df66d6c875f3060823adf91b7278f5b996d114b35c71dd0649fae1abd123f5c1c2423f6f95339697a051cbd83b7456f03630bc58240706a53b342c458a21182d SHA512 785cfdfecff877c4601f474486a3fef0b00528dc809868b55da04fe06bda804dd7456b21eecfcf3eb1beb1d1dbade5e7bf13d19b5106859aa411b8dc2eaf5130
-EBUILD sphinxcontrib-spelling-5.2.2.ebuild 1078 BLAKE2B df66d6c875f3060823adf91b7278f5b996d114b35c71dd0649fae1abd123f5c1c2423f6f95339697a051cbd83b7456f03630bc58240706a53b342c458a21182d SHA512 785cfdfecff877c4601f474486a3fef0b00528dc809868b55da04fe06bda804dd7456b21eecfcf3eb1beb1d1dbade5e7bf13d19b5106859aa411b8dc2eaf5130
+EBUILD sphinxcontrib-spelling-5.2.2.ebuild 1084 BLAKE2B f9ecc44c2059755168211a5e92f90009ceb360f16c4d585337dd4d3abc322c41223afaa566915f606210327b1b87233eb2998914a68065cdebefe4fe915038df SHA512 60a7d40b6dc3b99372ec43f34d3881d0e4db7da32f691ca30c633fea9aef3f3279bb59e3d5600979b42a7494b131976d3b57a8fab38ec81a6ae1498d047eb6aa
+EBUILD sphinxcontrib-spelling-5.3.0.ebuild 1084 BLAKE2B f9ecc44c2059755168211a5e92f90009ceb360f16c4d585337dd4d3abc322c41223afaa566915f606210327b1b87233eb2998914a68065cdebefe4fe915038df SHA512 60a7d40b6dc3b99372ec43f34d3881d0e4db7da32f691ca30c633fea9aef3f3279bb59e3d5600979b42a7494b131976d3b57a8fab38ec81a6ae1498d047eb6aa
MISC metadata.xml 390 BLAKE2B 8d41fe5d3b7602e6f29d13d8059ae1e942991659b4681c8d2a6e62fa32816690289c4183e28b2cc0abc14ea2078368f87cd1d82e71f1c4ed9fb684fb7d2e1449 SHA512 8407fc4fa34e474aa5f74fc1623004bcfa4f6ba451d56e62704366e8c21919e8617a54b5f7fec31318c4b7b34c4eb064c18c9d448c04d28430aa4e961ceb28af
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.2.2.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.2.2.ebuild
index 9cd2451e0691..f0af7ff34fe1 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.2.2.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
$(python_gen_cond_dep '
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild
new file mode 100644
index 000000000000..f0af7ff34fe1
--- /dev/null
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx spelling extension"
+HOMEPAGE="https://github.com/sphinx-contrib/spelling"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+ >=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
+ ' python3_{6,7})
+ dev-python/pbr[${PYTHON_USEDEP}]
+ dev-python/pyenchant[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ app-dicts/myspell-en
+ >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+ dev-python/testtools[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs/source --no-autodoc
+distutils_enable_tests pytest
+
+RDEPEND+="
+ dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+ distutils-r1_python_install_all
+ find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/spur/Manifest b/dev-python/spur/Manifest
index 5fc7e8c6bba1..c5452b9eefa6 100644
--- a/dev-python/spur/Manifest
+++ b/dev-python/spur/Manifest
@@ -1,3 +1,3 @@
DIST spur.py-0.3.21.gh.tar.gz 17666 BLAKE2B 0628417e6b5f4c744041693445113a59daac4f89776bc39849a2e1fab21826f3c6783bf72bf528a262f05df08d0680044e69f119c367f29ca4d6f0df554fa49d SHA512 7cd49690b989952707629fad5682201dc7f00865d8120da9e84eb9046e7a8fe7b7183785b4c2eac996d2743025cc09508b0ceb7b762b7bddb5447ecbc42d00a4
-EBUILD spur-0.3.21.ebuild 1163 BLAKE2B d66567c0462127ba1ec4353e7853933aa5750f8aa61963a1e596a24d5d6dca4bcade2cf2b417f07afd497f180ba75f50884ad896970f5ecc3e9d3b8840af926f SHA512 595b12747e2463f8f310f2afcd2cdf949dba4a9b8e3321cd0dce9cf2f48e3c44172804aad6e2e956829b3ad4c49f845c7dc9545c16dd19197b7fcd3c485dcd52
+EBUILD spur-0.3.21.ebuild 1175 BLAKE2B d2e7d602a67fc0d1e9efbf8608cc52a637dedec643ec8e5cca1c34f1407037f10b6f9f9ffab4cd4e3faa205c03054d44fa34337fbe113094355b048fe18c6700 SHA512 1e7e2656be35f31865faa8bdc17168714153784db6d97771811b610104f057a3a5bd51c13e990ab91f768e22dee9ac1556bb698efeafb9ed98d0ebfb0ce43742
MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/spur/spur-0.3.21.ebuild b/dev-python/spur/spur-0.3.21.ebuild
index 6ed537d7596e..f4219634c4e0 100644
--- a/dev-python/spur/spur-0.3.21.ebuild
+++ b/dev-python/spur/spur-0.3.21.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
RDEPEND="
dev-python/paramiko[${PYTHON_USEDEP}]"
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index c5ad806f94d1..7f68041394b0 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -2,6 +2,6 @@ AUX statsmodels-0.11.1-tests.patch 1915 BLAKE2B 90c13595a80cf1e59e81c483746f4b7e
DIST statsmodels-0.10.2.tar.gz 14065612 BLAKE2B 0df1268de5e4108b3cc541df87a5b9d2321bd3062d4daf1cc1aa62ab08ee777bace2f10bdfb51f088a66f15287c62cf851b3f43efa7eb1227e71c06632e80d55 SHA512 bd1c0784b0b17a3ca69fef5848f5eea8dcf76b1943599a5e5c285e45b7fcc7e44c0e388f007913d420ff6f3cb66a653d1c43e6e8addef534ff5572fa69ffb54a
DIST statsmodels-0.11.1.tar.gz 15381516 BLAKE2B a40cf9138edd8a9a6707a550d9885e0610f9bc666fcd73a60bd11ade6dcfa806ecd912a725cf2a13902e92f31af2c3e82f244280f70586bb3359dc8fc2842508 SHA512 54afe55a23b431154c159f44d284aa093f3368988f0695c0f3fbb206046cdfb171ab2ba51ce94285d567b8536141f93a1ef404b5f7222f1e61264baf0541926d
EBUILD statsmodels-0.10.2.ebuild 1853 BLAKE2B 3ee1ea4e063f910e9c33864d9bb71287410e754d1b805f5fc82f13415985e41eff0e885b11dc8343b229a4e15cb3841b9de56ce98038200b457a9770e0bdbcf9 SHA512 3486f76fb0197f505f1c3cd140d89664b3aa5a4bd3965c54d77a91dc8dc8083f789aa6687b0e8daa0370af9b87eb0e087558319f43791e5abfa9048a7f5e8369
-EBUILD statsmodels-0.11.1.ebuild 2188 BLAKE2B 624e4b28b3f7877f8d979afc23ab65922815f6862e330d3ddb14044d4c35f5167258ee14b0d0ed647ec8d36eb30313ff080f9c3991a6b3f339abd7d66230c1cd SHA512 e842e493de1af25a2df4e53b093e5e62e7e944fc6900dad834e8b73fba9f6d131832a97a9b4d9934f9063e39caf20b1f2ea8fd9197d7ad34e9e8c4369215783a
+EBUILD statsmodels-0.11.1.ebuild 2200 BLAKE2B 62991021e4489b3923fb03164d8f6ed8176a469543c8d6661abc282d54a4147eeac5981a12e259855d313aa4e1f5e2726498fa6dc30b9b0ef2e4e502190857cb SHA512 ab2ba2a1fa3a151150ba17993e14882f9bc87fdff26492d36cc83447edf118d4e1ef8855c48d9446834c33f3f832e6ee298190a003bc525008a3e1527cbc0da8
EBUILD statsmodels-9999.ebuild 1984 BLAKE2B 7ee4c8dbe27a102107ac29f0438b8608492cadde4bb6740cfc7c70781885ef256164a994f592bbd6a00b75767f3c756f1297e16d8ff4fbb6e752a54f26c0e95a SHA512 8e3bcafaa6251aec5e3bfc40afefc00608a5c13eb80ebe5a9eccbcd2dfb8072f10f88679710cd757c70aaee88865d6abc830b7fd1a0faae1caa0b8b7d80748f1
MISC metadata.xml 1310 BLAKE2B de8c73b0fb91a3bd65b2ee149b3ef01b3f93c78dfaf1642f9c81335e21c0ace42a771a0901a30dfebc7a8bbb80e9fb7057bd047a26035e103c7ece9e9dbef58a SHA512 96bfb2a3e0b677a67c0256bfcdc76b3621eac9d9242c2aaa7d22322bb53be9bb2185ed82a2fa65cb7cd16df7562c1999ac0d936471608700030ecff4de7174b6
diff --git a/dev-python/statsmodels/statsmodels-0.11.1.ebuild b/dev-python/statsmodels/statsmodels-0.11.1.ebuild
index 8082ab0f6305..f7a12631400a 100644
--- a/dev-python/statsmodels/statsmodels-0.11.1.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index 331c49086978..a9e70880e793 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -5,5 +5,5 @@ DIST stevedore-3.2.0.tar.gz 510559 BLAKE2B 69faa75eed9efff36a0dd5f91730dd22936af
EBUILD stevedore-2.0.1.ebuild 975 BLAKE2B a1214a513f6d8e9ce1169a75d78de1acc88d1a18bcca671364ba3431c2293830532967dcbb2f3f6f5b80299d93d41a418272c98b96c3394f4a7ded23581e23a8 SHA512 c72a9db74ad2cbbd020ca4e2f363f836735cdcf6d440517b452661953b62d8207e8ff71928c4849d0e22190ed8bb5061da0a0cf4e3d1688dc6c05e9b00269723
EBUILD stevedore-3.0.0.ebuild 1119 BLAKE2B d17e00401bd3c7ff628a11477445d0f5e4b53bea9bdc50822830f6460fd864734020a534a83e9bfcda9ef73c1af78cf5413c7ee4c8e27fdf96b21241dcee260d SHA512 3fff1943075f920f1d673c4887c8737c6bf66288931b317ff3dac82242c984f1ec95cad1311f6010a13fefa04d6ebf28db42165a53e238b58ef869213695614d
EBUILD stevedore-3.1.0.ebuild 1124 BLAKE2B 128ca4f978a6499ccfe9e7b0c4ea3b2f945785c8c4f36e3d2e9bb7054b5ffb20d67629651cec90599effab949e00466434ae232b0dd47899946380371fb58382 SHA512 1b259c89d92fecd9cf9a2c17a89a9eab047419d346ba37160a5de4e3694dbd89c16b0f625a78cc21280edd68dc044aeb5b8c2d52b28ce40646832e988bfc1d24
-EBUILD stevedore-3.2.0.ebuild 1124 BLAKE2B 128ca4f978a6499ccfe9e7b0c4ea3b2f945785c8c4f36e3d2e9bb7054b5ffb20d67629651cec90599effab949e00466434ae232b0dd47899946380371fb58382 SHA512 1b259c89d92fecd9cf9a2c17a89a9eab047419d346ba37160a5de4e3694dbd89c16b0f625a78cc21280edd68dc044aeb5b8c2d52b28ce40646832e988bfc1d24
+EBUILD stevedore-3.2.0.ebuild 1119 BLAKE2B a542b4e9dba2e54def5cb10ad288ab2c77ba602c52d455ee7ad1435660423df4b81c0d8ef3663a07a6ee0e99fa9509566f61ddbb4046888d67a676046c3cca3f SHA512 9d2cf7d8898db0692176b1b7e6813ee3d9831510156931acca77901ad5743579cdc52c3c4e97c7d3c662b33e4a3f1076ba4f4655d06ed16370ea6c3a46864833
MISC metadata.xml 521 BLAKE2B 6ac47530dc97a775a197bee97ee62ef419c402a134cb6785ba953a9efdd94bf0c4a79f01dbb7142774e9be25087334efbed7ad1f00b68544cdff9de8807078e5 SHA512 549144ae7c90fffb566c473e7301e3a461b47911cf7d2b1c03b5d0a39b1508f3462365e0ab27f5638d08c677556c8d2348a33b5fa018c68a5c64b2965a545fd2
diff --git a/dev-python/stevedore/stevedore-3.2.0.ebuild b/dev-python/stevedore/stevedore-3.2.0.ebuild
index 9bd342f667de..7241a0c841dd 100644
--- a/dev-python/stevedore/stevedore-3.2.0.ebuild
+++ b/dev-python/stevedore/stevedore-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc64 sparc x86"
RDEPEND="
$(python_gen_cond_dep '
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index b6309e11c0a2..77a633f09c92 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -1,3 +1,3 @@
DIST sure-1.4.11.tar.gz 45933 BLAKE2B b2146ee56237f4575cab5122279023066a1b9ba20493ced7d729b1afa456f71a38071b721c39594c3ef2fcc912ba934e85e5cb5da576c3b2d20fa7d4926b56b7 SHA512 ed067385bf9cf317a5d55f6c5fc6ee54ee3d592825be398e47c37d31fc9c010cb9316d4e2bcf1d72d53d7e53fd470792d64348aa2bfa5dc43510daaff97742da
-EBUILD sure-1.4.11.ebuild 702 BLAKE2B ea70941faceeed975bfd36c08d9fab9fb81e25352994ccb8c9ff891ddbbb858876264cae36f1f7c03b714088d54fc85090a4bb9a4c2671a9cb13185b1741982c SHA512 444949d5413ae1f874033740b3845a9f97c898a3150c42ceb56289ff56b2948d6d684f85649f50ed8f03c2f7afb942a62fa3bbaa4ee075aca59d3e68d50dbdbc
+EBUILD sure-1.4.11.ebuild 701 BLAKE2B d0c5072f378145f357415e3b93ed220b25a6739fe0760cf9934bfdde5c0b6f79d940f9c432c2ac166e128c870ee2ea2ae26fad194ece0e1399c0de1abd4f203f SHA512 4d263dcfae644e5769a42d21afde049ed748e4873b249b9a7319d3b250fe7e12cc9a2d2592a340ba39c540a5b7ca0ef685e4a7a906cf710d1f2c2b434d91211d
MISC metadata.xml 580 BLAKE2B fd57ae5f0db3af8fa1a3752dbc6c5c0d2f614b19b3a791e416fae0e4500f0a3ec8f88a45b46b37745f92d7538f54846379b8ccb8d3cf6afb0cbd613b0eb4bf40 SHA512 ac9536e4de1fd74d326af98154065afb9a42e6b29b5ea2bfb22987be15da16236aa2dda813257be53158edb426c021e4e6a0f954299c64fe55be08f5b0f3b8c4
diff --git a/dev-python/sure/sure-1.4.11.ebuild b/dev-python/sure/sure-1.4.11.ebuild
index b8406781cc24..c4e6f87b891f 100644
--- a/dev-python/sure/sure-1.4.11.ebuild
+++ b/dev-python/sure/sure-1.4.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/tblib/Manifest b/dev-python/tblib/Manifest
index b05cc9f3f171..4a6746989114 100644
--- a/dev-python/tblib/Manifest
+++ b/dev-python/tblib/Manifest
@@ -1,5 +1,5 @@
DIST tblib-1.6.0.tar.gz 31450 BLAKE2B a1efccab5c6363c166ef73e8e03750d1f47993684fda662065f9705d115347cf4b2ed3438ef375e3d14a0dbc35ceb234c8357ee33d2ac9e3a94b66bec3670b3a SHA512 3b11b94f341499f648c182e7a9b6c648b5312a18b3f23bf7e5d554052db4ffb7c4a4faa097bc2426b4159e28f0578c6b369ff4d02eb7711726b5359242216d35
DIST tblib-1.7.0.tar.gz 33074 BLAKE2B e05b94b9a36efde4d3fe76e9b72502674554e84e49916ea585de4f6cf9e898d1544535b1a8935fe15ffc100fcbf2b5d4f9edfdcf0ce5c86d479f2f412d3ea83f SHA512 10dcff18a1da386d9dd6bae35608f4a2d3bc8f87c15fcf49d886f98d95a6defd348ef0dc5637e03f4c553a933a0ecb4c215cf15b1e78fca58fea10052f9fb4e9
EBUILD tblib-1.6.0.ebuild 548 BLAKE2B b5cc563baa22a6e78b60c55c6f64d8ec87173c97a439f1c49454385a79857e3221035b1fc2e15211c932b16fd546212e37ff58525650796714197d459dd9e775 SHA512 2f8c68a8ec6205586a7a9e0bfbc0bea2cd3f187a78219e2f6877596054e48c2fd766be266bb591cd697e872e0c8d2cedd2f0db60a991f2e82e11ae3ed57aca1c
-EBUILD tblib-1.7.0.ebuild 551 BLAKE2B fe368d0c1c7701e93039ad0965274b0451add98bf40aac817848e9bb89f4e2edab170e0d66c75a438fccb8e33ce78befac23cfdce6121ed992ded9988778eca9 SHA512 2922715443990a4e6753056a8517a13297973099b32157818656f8a213629f520a9c768bce40d0ee1340eea79f3805e73958ec1f50cddbd0b9e2b118d860588d
+EBUILD tblib-1.7.0.ebuild 556 BLAKE2B 09003f4b734347c8233b915a2ba8c376ad39499d49d8d781ce896215eaca1701ecb3937c5de965263bb38904dfb68bfca108590c9ba1ef63c5052590d540c9b5 SHA512 99c91505c6e42af638441b13bedadcf81434f215335c6a49a30f7e299656208d165719d7005e1fbc070ea12a8068b0f7f840de5ccaee29925424db1debae9378
MISC metadata.xml 380 BLAKE2B 2d2d82601724f6960ddd56f2c45b5e85c30bf1366c6bcfb6b6810e885c87bf974c7dae1cf0a4d01a5bbfcfa9c5b2bb8aca6460047f549786527b5d1742b315c2 SHA512 649b0a9457aeb0b3e211e293305a8bd93f0ae1c91c5c31f2d7d1d94c55eabff5df4f7bda64c19d07b216778cbe7bb68dbdaac3a06d9a627a06b8f205fe818d40
diff --git a/dev-python/tblib/tblib-1.7.0.ebuild b/dev-python/tblib/tblib-1.7.0.ebuild
index bc25d6b359e9..437f2c2d4915 100644
--- a/dev-python/tblib/tblib-1.7.0.ebuild
+++ b/dev-python/tblib/tblib-1.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
BDEPEND="test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 0d4a5f9b7434..aee052137a05 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,5 +1,5 @@
DIST tempora-3.0.0.tar.gz 21500 BLAKE2B 7bf241d5ab60c78c0ea56df6b28e33504200eb5427cdffaf9d5f34da202c3ba4550fa4dcc48874ee870345fa5a10f2b874687fe7de2bbe049b1c14d05161b0e0 SHA512 2d397c1d17bb4c502817ad0278090137fb8ca00273c63a7336200ed7e621a99cd5c954cdc2da00d06eba34ed4f079429f5ddc68b928cc83feacb2335f995e1b7
DIST tempora-4.0.0.tar.gz 47217 BLAKE2B 3f8489c584768c074874fd299d11ca71b51c646f07792ac910dbd3fa76c309a866e599204364bbc06e6589a6fa046d3150bff05c9d3beb9b427ff409e2c27fe6 SHA512 59792bf03b4ccbdd5b849f0f6b9a0b5f2672e1cc3076b85449b8f183524d23de05588c3a8185550cdb9e52cc610e29db18ed151b8c5f5f25438de41015cc595e
EBUILD tempora-3.0.0.ebuild 1512 BLAKE2B bd20ee242a1fa86de4b266670289110e6fe0d11aa7e274fc0650fdc0d323376ccb362fbd070aa972aaf959dd257d3704547874a75be991415045cda19d51a87c SHA512 b36730adbf19e408d2a834f0ae5004850e4422f7a8a2f19aa8db493401d9b664d1e039cbb25273ed14916070f84937ebc673521e54c5c8b4cc0961460c610475
-EBUILD tempora-4.0.0.ebuild 1059 BLAKE2B e649ec1f511e429a8118b7c8990c90ab4f79beba3b7765346a01b7ef0329b6f69938c6dc3b738e0ee55a2c62ad420205518b891ad0ab2b460a8d45754372782c SHA512 e68da120463321622d49cfc193d0b6a7bf3a7af02ff5145fc397d6ea8f10d87a0a668f4651b4de434151f5202a6ef40f70b454f43bda3450127b7cfed8a81cc6
+EBUILD tempora-4.0.0.ebuild 1058 BLAKE2B 26e500842a8e9717745c7cad870f76b6b3a4c3fae85d1a369403b886a499fe4493a08b1ad3ffc5564aafce75af881e5875ebc3929e0af47c412e134e743c8943 SHA512 8ba390ad64db97a54c9c0139891874f2fcdad28c8cba5ea6a0625c19ac034006e9d6348693899ce13ba4e97274388d27c32eea992ddcd6900d68061a094214cb
MISC metadata.xml 615 BLAKE2B d393b579842c51e2dea6da1afde0a5571d5034905a9a4d5f4cbfa70cd80e918157ffbb1f98fbcefed28ee6c1ba20dc64e7583ea7ebd82fc1b8f9d3e57dc796da SHA512 7346fb2daa80f58a819462fe96220fa85d242795e24cc2fce5be013f4f0a678e1201b2b56bdcdd2881d95f0fd93386f47e900492862ed8b54e90ced91dd27f33
diff --git a/dev-python/tempora/tempora-4.0.0.ebuild b/dev-python/tempora/tempora-4.0.0.ebuild
index f6c940e62fbc..07f41649baf6 100644
--- a/dev-python/tempora/tempora-4.0.0.ebuild
+++ b/dev-python/tempora/tempora-4.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="
>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/threadpoolctl/Manifest b/dev-python/threadpoolctl/Manifest
index fb91c4e001ed..7c15ca4ca427 100644
--- a/dev-python/threadpoolctl/Manifest
+++ b/dev-python/threadpoolctl/Manifest
@@ -1,5 +1,5 @@
DIST threadpoolctl-2.0.0.tar.gz 23349 BLAKE2B d7752d862f8de5d61a95dd2e0db9a9cf5b3fde4c13cad9f654c0af4e2277b8bcc36b79028fbdf0e14af35daacee4b01a8778462364e070eaa194af65f4274739 SHA512 8ce823a6aef9f6d6af73e848c7a3bb1c7eee3f94bf480ca056ed5f435655756b9ad26cb71e392689cd8e6a34ee1ddfcf0d8510e424ac9c05bb1eda679d0f7a93
DIST threadpoolctl-2.1.0.tar.gz 25255 BLAKE2B 3afa8e8c44567d3833dee89e761b2f384129c386c5c5b9d8084c1b301f007be7f461f1ef99738e06551f793feefa5c312dce1d608e7012215fd759866a52e2d4 SHA512 09b745b0d164bf3fc4f293bd92f1fd2e02180ec538bf3da1cdb986e31d9336ba3e1301aede72f53700d00298bae7b91b4ec8fa3212accb4cde6c3f5f88ff5c62
EBUILD threadpoolctl-2.0.0.ebuild 619 BLAKE2B 5c9faff51172774d8296258829ae879122a85f01bff37e96bba20657cba754e270ccad837a5d40e7414c1cf31227ec517a8594659b23e8cb66fb6985c4bce388 SHA512 6ac3fc6c4cc6ab9a80380e1cb79a71cfa5618b6bbdfcf0dbd544b0a3b3e4657865d78f42a5f4d18517dd16d470ef49f93b79d8906ad04eaa97eee1b677e710bf
-EBUILD threadpoolctl-2.1.0.ebuild 621 BLAKE2B 399fbf27e2ced60041ef2a949f5d226b7e7355a2ea6b4b5b8aff39278d9e6a4046e31a9a7691e2792bcbb81fdc85aa376c414a195970a4d997242e7c590b4e57 SHA512 a15b51d0b04957348e5c833e23579cb1191a6355ee9689f068d7616208481fa27505d298b7496963de972b25bdf0bcd1f696d1e89675c5dfe2545e1cc17aaa1b
-MISC metadata.xml 338 BLAKE2B e8be381e5e42a081be3637b77a9b5356dd7d74d0352976badfca62bdf7b65c04554552703b3e12e169ec1c4b57d07cedcf75387a0fd65a8177213f0de8bffa9c SHA512 b3e03151085bcaa51e2108d7e69042523148aaba924415421323d53005c1d047103827ed99bf064cda4f02cc313b3ff4e5fc681bccb5f1f23a82b40a744ed9bc
+EBUILD threadpoolctl-2.1.0.ebuild 626 BLAKE2B 8d1716d71614b077ca1fe7b8589094c210804575178f8307836efbcda86b665b541abdb07a2080c61390750de415d06914e6a32268ad573d9b1f329ab3fb429d SHA512 e8fc497082a771ca5557e5bb6dd43211da96b69b0d803ce145eedecc1371ea27ee4d6bc998d44724a0e2a11f171cb1e6781c4a9f0255389776a22a7ff688b134
+MISC metadata.xml 363 BLAKE2B 62e2ff44db5d8b0c5a4fe21c5243ab6fe271bb0d21b40b50e40b58b07de8a6b2a38d7eb728a4e9fad95faea15d7ebd0def9418a5e993f1557e7030f2f8d6b194 SHA512 b90ec23472954157ca06a1142d3b1648b2bc2b46791a2a9a422213508f65fd0ae38225be07606d52097a024564d01963a2ec224781a666b0b8af2ca310b4d5ea
diff --git a/dev-python/threadpoolctl/metadata.xml b/dev-python/threadpoolctl/metadata.xml
index 2541628cf9a8..ff70d6e6ba19 100644
--- a/dev-python/threadpoolctl/metadata.xml
+++ b/dev-python/threadpoolctl/metadata.xml
@@ -8,4 +8,5 @@
chutzpah@gentoo.org
Patrick McLean
+
diff --git a/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
index 1d26d7c49723..0a1bd4af3745 100644
--- a/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
+++ b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/joblib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index 3661e1f3efd1..17027400abfa 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,3 +1,3 @@
DIST toolz-0.10.0.tar.gz 49579 BLAKE2B c323bf1ba1da5c01a1a1d879ef545767b8253c906baba63a0f600d2879c5b7120c4978574447954648c23c22221ba05de2a2c7437eed1eeff31dface1c823f6e SHA512 4ed40c165462440c6004974d2515067f211c625bebcb69ea854fd8837e1fe05febc546215355a6bb9de5916c8ba98a4d297f8aa20e40ffbc8a730b2bb3831a71
-EBUILD toolz-0.10.0.ebuild 424 BLAKE2B d02fe615d0b64ed90fabb2c1b7ff269528492cfd4cb580f0adc2a5301d6f0df6365fcc75585a809a30e2875c54b61a0861715afd4b6cad1cc0f3d69730a7a65d SHA512 3b204f5a470c3ec28ce8f9a382ef56571faec4c55b011df9897016ddf5ecd346955d22f14f888b4ee2d87d075307e474712a169f7a57ea869af18a95dcc7a9be
+EBUILD toolz-0.10.0.ebuild 436 BLAKE2B aa344df77d7e820dcc80e13b084ba150c6ff3c274a681af59e83404db8527846a8801f507442ef40046ba2e3f97f80f5b6d06ff155e388532a860c93a6d5dab0 SHA512 d53cd5b4c4d2ebb70c48f5f03a51173ed65c8b66ca58128a3bf495c1247bb369fbecd695b552e7b4799b779ddc3a1c77711411dc724fb43cdcdd7b6e0af3dc5a
MISC metadata.xml 332 BLAKE2B 36407eae22ccceadca8dd6127b7b6e1d04d65722e2ac88fd8f875807ec6f08f5a62d3570970c7cc85f6fd9bd6998c38b06100712569baa086dffcee98ef0aae2 SHA512 f32abff7501f0aec08df19ecc6f3b3aece597c396d73c7c025cb6e6f6127c9aa498719f02f55c51bfaf6e0d0dd51a150dab04baecdd9586245a2f8a0fbcb19b9
diff --git a/dev-python/toolz/toolz-0.10.0.ebuild b/dev-python/toolz/toolz-0.10.0.ebuild
index 0c486b0291bb..cc4399f2b620 100644
--- a/dev-python/toolz/toolz-0.10.0.ebuild
+++ b/dev-python/toolz/toolz-0.10.0.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
distutils_enable_tests pytest
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index baeaf55e2ef5..2819486493d6 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -11,7 +11,7 @@ EBUILD tox-3.15.0.ebuild 2277 BLAKE2B 4dde45fa512c6b125f506b2ac4e2fff538e49f0c8b
EBUILD tox-3.15.2.ebuild 2231 BLAKE2B f0fd149c97be1b85fac7311a2482da3425429d19aa8e48be2f47c606e114b46c65d9f5070c6f95eff22ebc03c8cb4b2d09ccb29dd378701a2e02df437f9164ec SHA512 e5d1bd84bbf46c180768da8cc674fdcd714f1b5d755b247b5d60c53b0646d0274ba8eb8577d8f5c369b16274f23f15a9512c2fcf2349a6a2002e8656ca5d194a
EBUILD tox-3.16.1.ebuild 2231 BLAKE2B f0fd149c97be1b85fac7311a2482da3425429d19aa8e48be2f47c606e114b46c65d9f5070c6f95eff22ebc03c8cb4b2d09ccb29dd378701a2e02df437f9164ec SHA512 e5d1bd84bbf46c180768da8cc674fdcd714f1b5d755b247b5d60c53b0646d0274ba8eb8577d8f5c369b16274f23f15a9512c2fcf2349a6a2002e8656ca5d194a
EBUILD tox-3.17.0.ebuild 2236 BLAKE2B a23faaf319dc2589304ceb01f48e5a9220d017e7962ad7feb06d2e2c438d3a627e41d84cb8248fbae064073f5eec9a7f021698f567a4de6151382a8f057f04f1 SHA512 0af72e70c86c1844ef67c9a0594e0b2ef5fd79519eb35c01b019de1ce4fcc3c7db575623e1f8dc6f3f70abc8fb679d0eff046bf17f70e73703327312a7b3cbd6
-EBUILD tox-3.17.1.ebuild 2236 BLAKE2B a23faaf319dc2589304ceb01f48e5a9220d017e7962ad7feb06d2e2c438d3a627e41d84cb8248fbae064073f5eec9a7f021698f567a4de6151382a8f057f04f1 SHA512 0af72e70c86c1844ef67c9a0594e0b2ef5fd79519eb35c01b019de1ce4fcc3c7db575623e1f8dc6f3f70abc8fb679d0eff046bf17f70e73703327312a7b3cbd6
+EBUILD tox-3.17.1.ebuild 2229 BLAKE2B 40d7b8dc05367102a5c9442187bd4ef3b1f8a2a0708cd751a9b009723896b67b41bf9705870457d5afc93e05397ff6c944e0b72601b33162377e3ea480bfe5e7 SHA512 f5488902e1a68cabfde1eef47b6180d8ab215ddee2d3788b9f803933b7f4372d9424eaeaaf1bebc653c68bd1dc4722e8e787aa70cdf221ae70c55a11abb2c20a
EBUILD tox-3.18.0.ebuild 2236 BLAKE2B a23faaf319dc2589304ceb01f48e5a9220d017e7962ad7feb06d2e2c438d3a627e41d84cb8248fbae064073f5eec9a7f021698f567a4de6151382a8f057f04f1 SHA512 0af72e70c86c1844ef67c9a0594e0b2ef5fd79519eb35c01b019de1ce4fcc3c7db575623e1f8dc6f3f70abc8fb679d0eff046bf17f70e73703327312a7b3cbd6
EBUILD tox-3.18.1.ebuild 2236 BLAKE2B a23faaf319dc2589304ceb01f48e5a9220d017e7962ad7feb06d2e2c438d3a627e41d84cb8248fbae064073f5eec9a7f021698f567a4de6151382a8f057f04f1 SHA512 0af72e70c86c1844ef67c9a0594e0b2ef5fd79519eb35c01b019de1ce4fcc3c7db575623e1f8dc6f3f70abc8fb679d0eff046bf17f70e73703327312a7b3cbd6
EBUILD tox-3.19.0.ebuild 2236 BLAKE2B a23faaf319dc2589304ceb01f48e5a9220d017e7962ad7feb06d2e2c438d3a627e41d84cb8248fbae064073f5eec9a7f021698f567a4de6151382a8f057f04f1 SHA512 0af72e70c86c1844ef67c9a0594e0b2ef5fd79519eb35c01b019de1ce4fcc3c7db575623e1f8dc6f3f70abc8fb679d0eff046bf17f70e73703327312a7b3cbd6
diff --git a/dev-python/tox/tox-3.17.1.ebuild b/dev-python/tox/tox-3.17.1.ebuild
index 499658c518d4..8fcf947120f9 100644
--- a/dev-python/tox/tox-3.17.1.ebuild
+++ b/dev-python/tox/tox-3.17.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
# doc disabled because of missing deps in tree
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/typing/Manifest b/dev-python/typing/Manifest
index 2b26626d35d7..34d5c05040be 100644
--- a/dev-python/typing/Manifest
+++ b/dev-python/typing/Manifest
@@ -3,5 +3,5 @@ DIST typing-3.7.4.2.tar.gz 78588 BLAKE2B 0e5174d3bee9315cf011f461c7baaaa4cc2bbd7
DIST typing-3.7.4.3.tar.gz 78592 BLAKE2B a47991466db75729620e180d230917cb32158475804b294d2ca956544c575323765bb9d2fd87e723fb8a6c79db4c0c83387fc45fe31f8c55a802bcebe793b997 SHA512 01d3d33bf3264a8929242d58ffa3b6a897a9ce23cb84858871146ed516a6ef2fc222d3001bb5197276da1a374ae243f0ceab0325ae8675ef0ffb76df5065ae1e
EBUILD typing-3.7.4.1.ebuild 948 BLAKE2B a13e23138ae1d295e05c1884d716e0cf644bba9bde947d3d4d3b0f3f56deea4333e298d80082dfeb330876243ddadc21375cfa37a37318dfc4c47f4d7f03a8f3 SHA512 753a04fc7e192d544d0d686ec4b77fa1456d94a9af0e14e9fe280e2232d8e5c33671a69c82299fb008f68563c172b7db4081401718d0e76dd4935ad0ff8b46be
EBUILD typing-3.7.4.2.ebuild 957 BLAKE2B b8163d6e2cc71adeefe32529efb7eda65739ef1fac7416bc375429f3eba102ee37146aa5b81d67aba6a0336dd24f743ab19b908e7e43146e7a7c913f5e7987e6 SHA512 08cc95972dffc040a6e2ecc8f8a5a146a0650b48af21daddfbe53af0add3b0ade0c70a81f3b4ee26fdbf3060c5cf5b858136a919498228334e17ccd647dc8938
-EBUILD typing-3.7.4.3.ebuild 957 BLAKE2B b8163d6e2cc71adeefe32529efb7eda65739ef1fac7416bc375429f3eba102ee37146aa5b81d67aba6a0336dd24f743ab19b908e7e43146e7a7c913f5e7987e6 SHA512 08cc95972dffc040a6e2ecc8f8a5a146a0650b48af21daddfbe53af0add3b0ade0c70a81f3b4ee26fdbf3060c5cf5b858136a919498228334e17ccd647dc8938
+EBUILD typing-3.7.4.3.ebuild 948 BLAKE2B a13e23138ae1d295e05c1884d716e0cf644bba9bde947d3d4d3b0f3f56deea4333e298d80082dfeb330876243ddadc21375cfa37a37318dfc4c47f4d7f03a8f3 SHA512 753a04fc7e192d544d0d686ec4b77fa1456d94a9af0e14e9fe280e2232d8e5c33671a69c82299fb008f68563c172b7db4081401718d0e76dd4935ad0ff8b46be
MISC metadata.xml 333 BLAKE2B 7c8ba2188c6cbc930151cad7d365c6b26677aa23348454bf307f4549f296857681c2d871af330b7c889f38524dd63e3abf782ef5bbd7f5f606adcb60741c3461 SHA512 b411ac2336820d0fc123dd6f1575d92d001f6c472537fb1a4899b489bb2f223955e86c5a5a89f98490374ffac231cfc678472c14faeff56c33705850f3d23e0f
diff --git a/dev-python/typing/typing-3.7.4.3.ebuild b/dev-python/typing/typing-3.7.4.3.ebuild
index 2910bb8fc386..bd25896de668 100644
--- a/dev-python/typing/typing-3.7.4.3.ebuild
+++ b/dev-python/typing/typing-3.7.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 30d29dc12b89..c78f5251f8f5 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -6,9 +6,11 @@ DIST virtualenv-20.0.27.tar.gz 8265353 BLAKE2B 31e0a5fa11d988b5340b130615dc5095a
DIST virtualenv-20.0.28.tar.gz 8265900 BLAKE2B ee07267a0fff59abe4b51091bbc8ff980ad5419375a1049e943622af174a1b533610f6a80876b75d36c3edbd1851767db08085bfd0db8215fa99495ea9a49bb1 SHA512 4984ce046e0787bd44feb3b30f01d53f1840722693643cec086ac3ee61c471ebf619ea31b41a7e20cfd792d59a7ba19ef64b3a6bf3950891bdf15a49747e4712
DIST virtualenv-20.0.29.tar.gz 8277951 BLAKE2B 1f73bcc7420ed37b81f19f97f23d1df658ff74efe2f30c70babc06eb933b1a22ff0c9ad98aafda5570b21047f829b5a7ea5d8fbe76ef39d0319c1fe4a9514cbc SHA512 b1a2375828f3d1e54a2608405b093c7ce912c44bdbe5197abec19958f95bf45820c0e0f585732c15dfe8a52fd7c45857e7dcae1dbf6a7f25556ce59aa80cc50b
DIST virtualenv-20.0.30.tar.gz 8278198 BLAKE2B f25bb4042326aac5af43d3f32bf33e27468c32a8863d2c7e9d8bc73bce0a384b97d406aa275d3a19015b1d46a3210e9ccd8f986d43e87c33f7e537907c94f9d7 SHA512 c75849b274e44b48fcb34f8e61b24c2b67b17d87ab2f1be63b6b49a70d6bfcf31c279f7a60d85f6f58cc7d0a3443debbba6b0e39d01dfa1b0ae5b075c5c9f30f
+DIST virtualenv-20.0.31.tar.gz 8300305 BLAKE2B 1574b553b2bc8e05bf00584379f80c1e5c0ee9798595255830059eedea62f02f02d216c421aa2cb312bc9e60694f6a409d0c2495858a89fc1ad7aaddea7965ff SHA512 46220bda37b3b860e44c4d0775a89c22a7ba775287f05438d1d3698201cc213a05b2718ef40be302627005ae349dc59a3141c7a30cc1dab6dc81f7692c7f16a5
EBUILD virtualenv-16.7.10.ebuild 1901 BLAKE2B e9464ea36c8772c6cbc19df04458ebc53bceafa9cf39a8e13ec2805d9a8c3a38a2e7b1bbae6a589dc5d912256c770e55f54a84b476b81d2c41c2907e495dfbe6 SHA512 586cc1b761b9a46e03a45835a010877aa9e7e29b00e35d722f5bc244a051aa3aad2458ac2f36311749291bf9a3e81671fd77d14fbcd9fe5aace0652d843d0686
EBUILD virtualenv-20.0.27.ebuild 2612 BLAKE2B 1d09906f4570e8dd0bfd8e02569bb58ecbe7790f0afa506bc533b6fdf6f12005ba02b67589bc68fded0b0ef07c2ef063c093507adbef90692b57f7858fb70fc3 SHA512 bb1ee0a4b9a3f68c6e6fc2eae5250e4de465a1a575c4f517e7c52e59007058a939a29203a8480d9c593b0a5fd7a465c0a0e8a6d24b10958960996a21b5b3fdb3
EBUILD virtualenv-20.0.28.ebuild 2612 BLAKE2B 1d09906f4570e8dd0bfd8e02569bb58ecbe7790f0afa506bc533b6fdf6f12005ba02b67589bc68fded0b0ef07c2ef063c093507adbef90692b57f7858fb70fc3 SHA512 bb1ee0a4b9a3f68c6e6fc2eae5250e4de465a1a575c4f517e7c52e59007058a939a29203a8480d9c593b0a5fd7a465c0a0e8a6d24b10958960996a21b5b3fdb3
EBUILD virtualenv-20.0.29.ebuild 2612 BLAKE2B 1d09906f4570e8dd0bfd8e02569bb58ecbe7790f0afa506bc533b6fdf6f12005ba02b67589bc68fded0b0ef07c2ef063c093507adbef90692b57f7858fb70fc3 SHA512 bb1ee0a4b9a3f68c6e6fc2eae5250e4de465a1a575c4f517e7c52e59007058a939a29203a8480d9c593b0a5fd7a465c0a0e8a6d24b10958960996a21b5b3fdb3
EBUILD virtualenv-20.0.30.ebuild 2612 BLAKE2B 1d09906f4570e8dd0bfd8e02569bb58ecbe7790f0afa506bc533b6fdf6f12005ba02b67589bc68fded0b0ef07c2ef063c093507adbef90692b57f7858fb70fc3 SHA512 bb1ee0a4b9a3f68c6e6fc2eae5250e4de465a1a575c4f517e7c52e59007058a939a29203a8480d9c593b0a5fd7a465c0a0e8a6d24b10958960996a21b5b3fdb3
+EBUILD virtualenv-20.0.31.ebuild 2612 BLAKE2B 1d09906f4570e8dd0bfd8e02569bb58ecbe7790f0afa506bc533b6fdf6f12005ba02b67589bc68fded0b0ef07c2ef063c093507adbef90692b57f7858fb70fc3 SHA512 bb1ee0a4b9a3f68c6e6fc2eae5250e4de465a1a575c4f517e7c52e59007058a939a29203a8480d9c593b0a5fd7a465c0a0e8a6d24b10958960996a21b5b3fdb3
MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/virtualenv-20.0.31.ebuild b/dev-python/virtualenv/virtualenv-20.0.31.ebuild
new file mode 100644
index 000000000000..651770201985
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.0.31.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+ https://virtualenv.pypa.io/en/stable/
+ https://pypi.org/project/virtualenv/
+ https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+ >=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+ >=dev-python/filelock-3[${PYTHON_USEDEP}]
+ >=dev-python/setuptools-41[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/contextlib2-0.6.0[${PYTHON_USEDEP}]
+ >=dev-python/pathlib2-2.3.3[${PYTHON_USEDEP}]
+ ' -2)
+ $(python_gen_cond_dep '
+ >=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+ ' -2 python3_{6,7} pypy3)
+ $(python_gen_cond_dep '
+ >=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
+ ' -2 python3_6 pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ $(python_gen_cond_dep '
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/flaky[${PYTHON_USEDEP}]
+ >=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+ >=dev-python/pytest-5[${PYTHON_USEDEP}]
+ >=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+ >=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+ ' 'python3*')
+ )"
+
+distutils_enable_sphinx docs \
+ dev-python/sphinx_rtd_theme \
+ dev-python/towncrier
+
+src_prepare() {
+ # we don't have xonsh
+ rm tests/unit/activation/test_xonsh.py || die
+ # require internet
+ sed -e 's:test_seed_link_via_app_data:_&:' \
+ -i tests/unit/seed/embed/test_boostrap_link_via_app_data.py || die
+ # TODO: investigate
+ sed -e 's:test_cross_major:_&:' \
+ -i tests/unit/create/test_creator.py || die
+
+ distutils-r1_src_prepare
+}
+
+src_configure() {
+ export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+ if ! python_is_python3; then
+ ewarn "Tests are skipped on py2, please test externally"
+ return
+ elif [[ ${EPYTHON} == pypy3 ]]; then
+ # TODO: skip with better granularity
+ ewarn "Skipping broken tests on pypy3"
+ return
+ fi
+
+ distutils_install_for_testing
+
+ pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 08efed5f30eb..9254737bcf08 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -2,5 +2,5 @@ AUX xarray-0.10.8-skip-broken-test.patch 513 BLAKE2B c4d6298732029f509df209679b7
DIST xarray-0.12.1.tar.gz 1745116 BLAKE2B f38380503347a17cfe11e930b5e275912fb4fb3f02de057e61b21ad1515c8f5e2d5c28007ebb20cecda0f4398b7c71ce239fb3d6f25a79600f5da509f0976359 SHA512 f9e8033b9387ec4175c9d65199aff9cdfc442abb9d2736fb47ab6170ab1e1860b4eb693317a64dad560ab6974f08f7c13f24ecf24c087154ae2d71203e584426
DIST xarray-0.16.0.tar.gz 1987841 BLAKE2B 9e191d0c8416b3cbeac484b4bdb12a702314bd6bb982c958f346152ce31832f901c257c59adeca6d32f513de62245648610fd21f4d2ba0e9d6360239c2c4134a SHA512 25a4c967d316eac97389ac4f7e43483655ba93bec0af0f338416f8cd9493dc22b6709c7c66640dc5021f70438d2e26c8f419bda178bb6f27f951b8515b2610fc
EBUILD xarray-0.12.1.ebuild 817 BLAKE2B 2ce5b748c35102f6e46503c99fca8af49f3d7f6ce3a0b2498e7bb896ded6cf086414d7c506953773b495f35cd56ba509825fe73797b8742760dbd3486ac3b1f8 SHA512 689536ab57a3b18f772ab7c406ad37688742bdc5cd0217b013452b63c26626f1fe7350d3390c0528e7e9c7005993dcaea62c4dcd78edc2645aafe88591b69e98
-EBUILD xarray-0.16.0.ebuild 969 BLAKE2B 00d0c6ff5e59dfa73a7d83131f7a0aa9847fa12b62f06a0b7c0a58bd0e3ab72eb5ff4cb5257780574725c702c5bf4c384ae47e5a4b70228018e8410e923dee07 SHA512 15bb0f559d6e3a3ae50939da3fff9cdd94298abf8f08f4a870dfe43312314063937e4e8ca6b30e05d03f0da7ad542f378d251c26e90dc4319a8f3eb961935206
+EBUILD xarray-0.16.0.ebuild 981 BLAKE2B 5dd5b10ccb4034ac19e99860410845fdc47590368e9998aab557c895905c73d50ba8b7799df68c60e616c9df37f670075a0c0d58d69fcdebaae6a2a58e2e7323 SHA512 eb1e285c2d75e2e4417a908b1acd394887532206a29225d48a98d32f8fe4536c17b759acc1264a5342f208ee2900b20dd12ad24d54b4526dd4f725b8b668a8e4
MISC metadata.xml 508 BLAKE2B ec48fcbe3d7ecc1907ba57f065ff83affaf8a449a50d39faed113192bbf1dd60ae145550c4794b0fcc000a20f1701a5e9cebaa01782e294ed5300ed5cd82704d SHA512 937f1589c8b6eaa65f70d7b273e60935eaed889895996e5f952dece64a0982130fa5f50f09f25041a86f88f7646e76ba9ca3580ae8adcefa1f83a4effc5409c3
diff --git a/dev-python/xarray/xarray-0.16.0.ebuild b/dev-python/xarray/xarray-0.16.0.ebuild
index de12d6e85adc..67c0b3aaa1ae 100644
--- a/dev-python/xarray/xarray-0.16.0.ebuild
+++ b/dev-python/xarray/xarray-0.16.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
index 6929cf4f72db..640b54974c8d 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1,3 +1,3 @@
DIST xlrd-1.2.0.tar.gz 554079 BLAKE2B 57c956139a3e2239c9caeae66b36e384458f1f2060422575dcb63fb09b7f9050f669154d1479303640cc45fb5716e027d3b5d07282b08bd866c4e5366861ecef SHA512 eea14845701b86a2679f140c9730e8ee2722b4f859cdd870f86bf54df522d54fc3c78dc4354aeb958c72596a6349995e9d79935efc734de096f6e007945fc1b3
-EBUILD xlrd-1.2.0.ebuild 646 BLAKE2B 9c67ffaf0184999c662054dd8f5ee6394900477f7ec855dc68946d5d1033d24753209079e8caca7a336677fc3a23995c7f745709896375c914213af3eece1745 SHA512 65039e92e0fd1dc45d0a192b3580fdc1f917ceff4b7a07d91f3a05ca88f34f29e227cbf369fb29909c0778086c501d95716f4f81455bf1a6e2bdecd85b402ad1
+EBUILD xlrd-1.2.0.ebuild 658 BLAKE2B b34b4dae617c34f64572c6cd8d102c0bace5fa7086d111cf32aeef80761a8e64d28a304cdc6f819af837c167ed6248cd832842b01ec797b7dddc6ec1aa5781a1 SHA512 16807742ff8cb604088f21b9e5858a85ca8cb6487c136f1f6776fb1d4da515884a6ced8bc3f8b00a97af78599fe594e72effc09f997641708690b0ee7ec6a08a
MISC metadata.xml 551 BLAKE2B 5c29003f7780590817cba46e664cc2475a7b00dff75dddcfb492928bfb8dfe1b3dbfe666beb9a159c3734f7c918e7115f95c79c530bd7b0abbf06a068f0a7411 SHA512 2b3c90ab71ffcca19fd58fb7b6ac173f149497e00a31a8e6c3ed14f512d34c990904f40e2828ddf9babb448094e026ed70c4afb3e76bbb9585c9e4b4b597149e
diff --git a/dev-python/xlrd/xlrd-1.2.0.ebuild b/dev-python/xlrd/xlrd-1.2.0.ebuild
index 04f9088a3b34..8b8925aed733 100644
--- a/dev-python/xlrd/xlrd-1.2.0.ebuild
+++ b/dev-python/xlrd/xlrd-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
distutils_enable_tests unittest
diff --git a/dev-python/zict/Manifest b/dev-python/zict/Manifest
index bb6e8ecec07b..b6ef8fbc267b 100644
--- a/dev-python/zict/Manifest
+++ b/dev-python/zict/Manifest
@@ -1,3 +1,3 @@
DIST zict-0.1.4.tar.gz 11335 BLAKE2B 30a70f04328762687ea9e6805e540469c26a85898278f2d83e1004d2663cd728a03df68e4900cf22b9d3b3ec6efc44a0fae3e5e0ff631a8bb8cc1d8ac510b8ee SHA512 3381c7fd64a99145f80800772dde381ae16225209aa9300f9d1a2c36b5ac1c4281d4068202e607985666ad44cce7d18317d4d8ca4d3ea4f9a227d4f4180e015c
-EBUILD zict-0.1.4.ebuild 665 BLAKE2B 6385d935eb958b071f956adcb7df5f43e7a894289aa6f66474b8cc48710f670ce6a32688b67742bae847022573c4b64a01538cb497ddaa3c2850b4cdb5f9dac8 SHA512 337dcab9d414e97d0553e68bc692cbf6c14b9228ccacdd2eedb69a1662116c8cb008530d944fdefc14bc7151a9a12c2b7ff9f40439d8bf54b20895101a2cb1d5
+EBUILD zict-0.1.4.ebuild 677 BLAKE2B deb5cf96dc66bd32fbeb8b17dc1ea7d1adcddff1c0ddba94c963e6eb39575976c7ac065b09c0ded7b31aebf1f30f4336d0c88928773170b1277d95413408a4cd SHA512 1f01f2bb4e5bd6c8b7e20a4ee3fe5b53df7f9ce5938e6c16bdb3ed53cce7fe999b914e5fe0eec6acd2d87434a5953aaa89a24f3032312ffda651fb69c3363b23
MISC metadata.xml 372 BLAKE2B e0704ea4318d17b85ab75fb9818e2ec6993173823f2b0d8fb92413e9ea83095a5ad95c05e69c4f6ae447c9cc2fe7a2735355b311e84b6036780a6b48ae5e7ff4 SHA512 02db2dbf57dc6d87318e8b79fc845f7aff7c6b98d80ea897bf24dca8f762f80581d69fd8990bca0e0d736997a93f2fd5a24fdad481b352e6a907c4b37a983eb0
diff --git a/dev-python/zict/zict-0.1.4.ebuild b/dev-python/zict/zict-0.1.4.ebuild
index 5fb26c305b97..89cfb9b7afa6 100644
--- a/dev-python/zict/zict-0.1.4.ebuild
+++ b/dev-python/zict/zict-0.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/zope-configuration/Manifest b/dev-python/zope-configuration/Manifest
index 3a7a195f1e72..c85f01710512 100644
--- a/dev-python/zope-configuration/Manifest
+++ b/dev-python/zope-configuration/Manifest
@@ -1,3 +1,5 @@
DIST zope.configuration-4.3.1.tar.gz 83223 BLAKE2B 9c55951932f34484fa6760a6a3cbdf89fbf8723c43b9b4ea2cf909b74716bcdd74d03327fc418f43bcfc8b6b5c17554cf8d062952d8d6880e49e6b270da9c1c8 SHA512 bc8edf84a391cab4f664ea3a4d24b65cb9db351c972b6118e69fe3c726bbe3337121ff59d687dddf463b3672ed6996f21d4437941c81dc456a4e5d837e0945d2
+DIST zope.configuration-4.4.0.tar.gz 83230 BLAKE2B c33dd8cc8192965e3555f8063dbd55b47376696964248583c7479098d00339ec0a7caec8c11e66b9ce133880ba6c04dc8b790f03e18864dc361d3b5d5ed0ddfe SHA512 6383c8e19ddbde098a545b6f22b21eadc860980e8248d05c2e29832971c2060fcde6f5092425d12198e97851f0b7b5edb0b83cc6725cda433867762778c896f9
EBUILD zope-configuration-4.3.1.ebuild 844 BLAKE2B 54e111a78e1f400a77e5a930dd35b9c73cb010de4bc8fcb63e04416b353c445de8fd08b4ef78e73204c8bb0f0070aebe53dcddc757f91a252f880b01a87a22a8 SHA512 6ed039fd1cba3860409bbe5e0482b829587e787c4f83ce5ce76952f5d31f38ef1e66b3fa0975f60a87a95d136e0bb2434b62d3cdc028206f9d1c61d1d5377696
+EBUILD zope-configuration-4.4.0.ebuild 841 BLAKE2B 93d0ba251eac8c8bc331495ddea2d6ec703bb83b9faa54fc993c1388f3c17d3f005153a9917516d134b976f6bd19c8a1f85d24879ea58c68ee48dc24402d3f31 SHA512 0765f05411ef389e88f94e470581270d7c7e6193e5d9030eb8e9d0abcd3b34af6a77875aff0dfbc13ff50fe39a7ebd8be3cbf9620279c3d1f14d9ac12bf5b287
MISC metadata.xml 646 BLAKE2B c556a67d6a337d654d52e94060d0a91587cf3ef8fe95fdc8808f0ed03328a26c2aeb91dc459182fcfbcd1300d38f6f70f8e7489ddd41b788205da6545934cc3b SHA512 a8660b5d1a2619030fe32a06a95ae75e83f923a0c0b63a736a3c1c95137a99aa447c85fc0665efb7196a014a5473cd47a33744ab6cd047a8d9f33deb401e06d6
diff --git a/dev-python/zope-configuration/zope-configuration-4.4.0.ebuild b/dev-python/zope-configuration/zope-configuration-4.4.0.ebuild
new file mode 100644
index 000000000000..e9aa585b0c3f
--- /dev/null
+++ b/dev-python/zope-configuration/zope-configuration-4.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+MY_PN=zope.configuration
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope Configuration Architecture"
+HOMEPAGE="https://github.com/zopefoundation/zope.configuration
+ https://docs.zope.org/zope.configuration/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ >=dev-python/zope-schema-4.9[${PYTHON_USEDEP}]"
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ # remove .pth files since dev-python/namespace-zope handles the ns
+ find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-exceptions/Manifest b/dev-python/zope-exceptions/Manifest
index 42dd28b0bf4f..42971487ef72 100644
--- a/dev-python/zope-exceptions/Manifest
+++ b/dev-python/zope-exceptions/Manifest
@@ -1,3 +1,5 @@
DIST zope.exceptions-4.3.tar.gz 30704 BLAKE2B aa5319c8f9b3555038809f8209d121b4a8944a9df1c683302749c12e1e5097139047583b1f033e6530005232fadc326aed7da64fa585b749ec50cd22cb3411a5 SHA512 348c8edb0246bb2035ca5c1bcfaca7d3be2525157e2c9267a59a061c8ba749b364428e3d6a3aa3f967306abd0a319e4d6fa935b7fc35fff3bb53960015505695
+DIST zope.exceptions-4.4.tar.gz 28243 BLAKE2B 9af0b99826d574218c149c5a378886d3b3ec16935c0b6b883c0e048b22ba5ffee8408597f612a668eb18fc855a236e3810d6320c984faca4b7c5dfb4c76b303b SHA512 6ef175271ad1d62b450533e4c7d8f7380ffac519be5c48be084be297ad21d21fd8be380d9b5e221a8dac6a4c792bab14abc707331415c2df88208cac9c34013e
EBUILD zope-exceptions-4.3.ebuild 933 BLAKE2B c5816ebb7eebb32130399edb8e330f80ef1eee641380cee06531bf3aac38338f74ef1572d95cc9dda348558ed9d570fed02a447a236de89723d9bca831b4d066 SHA512 ff88b09e52b50d3ae08d93d6e7b3a882e2de5a0d6dd73260903048b26ac5669abd3497e9499a43434b9cd4d35fb0c98b0d14c22a0622e0284f29f8c173b81ea6
+EBUILD zope-exceptions-4.4.ebuild 895 BLAKE2B b99ac702e278cbcfe8aa537004900c712cf42ae9be371babf654b0876a002dcd563fa2e01c6df8e8741318a0db8620a2c9b967fc4b34ff3bed40e9f6a61582d6 SHA512 01f17646c5c18768307452c3cb1fef3a63082f85a07e7c084d81ee2446bc387840df33533cc2a3453463297e3e54d91a4caa2c6477aef6f9f01ae41bea57d542
MISC metadata.xml 388 BLAKE2B 81b6980b4187c8b5be0134c006c0327df68b4c4cd251085b132aeea84145894b189fff3bbae36fc685854caa3f3bae79eec6240d2cae2895012ceaab9f75be2a SHA512 8eeba4b9f4529cd57b811fbbab44a10dbb8c98e797def89845975e83f837f1b8c3a4607a4a32ad8450e4f9f046abe9388a54c89b007c5673976b3ba7186e60c9
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
new file mode 100644
index 000000000000..5b427b0dd300
--- /dev/null
+++ b/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="General purpose exceptions for Zope packages"
+HOMEPAGE="https://pypi.org/project/zope.exceptions/ https://github.com/zopefoundation/zope.exceptions"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/zope-testrunner[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ # remove .pth files since dev-python/namespace-zope handles the ns
+ find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-i18nmessageid/Manifest b/dev-python/zope-i18nmessageid/Manifest
index 0e9c385f941c..6ae4bfe8b32d 100644
--- a/dev-python/zope-i18nmessageid/Manifest
+++ b/dev-python/zope-i18nmessageid/Manifest
@@ -1,3 +1,5 @@
DIST zope.i18nmessageid-5.0.0.tar.gz 28220 BLAKE2B 84727f56ce8dd069915b5b31a2f9824ee83b334d82e3b2a958e35e43842cee044ec47879809fe6256b51631a5baf9dfb4432f7e5e494faceca2f7ade479d38ff SHA512 76cf129e266f649ab379d1abea143b34e42f0ce66fdfcbebd1dbbca639a55c11a9d41687a7bb4dd04359fa1465e235035849786d142bafaa68d783c1f7aee2d6
+DIST zope.i18nmessageid-5.0.1.tar.gz 28217 BLAKE2B 67e31a18daa8c2d5ccc16b173d37188fc6154cc75b1fd7cd908d6ee3ebeca0092316546587103f01aa6b39d074aaa207bec86401c4d50f664efba179191c9719 SHA512 31af16581d59ce1b7d5d8fd86c715c56b84aee9a7a0756bb2b7ceac6db30903acc5fdff85d844c0250c0a112cb45ab03be2f56d3d4ca6165272ff76c09d40d8c
EBUILD zope-i18nmessageid-5.0.0.ebuild 811 BLAKE2B fac271aacfeb5a35be7c40c538304f34202e296dcfb5ecf71f3b673471c94db27477f37bee9466d9820d5880df52919015ffc6217888d63596fa79f5a36e72a2 SHA512 369dfca76b4582e0317b427ba60b940a88bae79520adf105e59d52c666205219de58c5dcc2ccc57719662b180857592302152357ea2f51502a1491185db6d1c5
+EBUILD zope-i18nmessageid-5.0.1.ebuild 853 BLAKE2B 58feac7963169c6a0603fdc8ff772dbc0d97ff7dc46b96643bfc54cbfb21568d8f996517f4c1aaf7b17c6f760f99b190a1bb052edb52198af64edab9c85db67b SHA512 fe0a7e056fef131d0d066e351da515e8b3c0164b338afb12dc21debc7318c5e70142e7dd3520aed360be56e38ba6f660bb3a2ce64d0a14edfcb3ee7a1d520867
MISC metadata.xml 487 BLAKE2B 7d59b64c324e8f6d9a38f6d95c2a672fbc8ebc3054e7786a114db8d99082a9d7d10c794c97a6b684f792475c79759a27cf48ed2d4f013201fe8f7b70ba00e3ff SHA512 5f2f2862d427dc342c90d1624ee7dd8d95ccc5f11410532dd892aa79b93c2e79a41bc6ead47e4f1ca43aa718ac619a01bfc03a71bcf7116aa39e2069dfc7da87
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
new file mode 100644
index 000000000000..28c7496bc747
--- /dev/null
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope support for i18nmessageid (tagging source of i18n strings)"
+HOMEPAGE="https://github.com/zopefoundation/zope.i18nmessageid"
+HOMEPAGE+=" http://docs.zope.org/zope.i18nmessageid/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ # remove .pth files since dev-python/namespace-zope handles the ns
+ find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 8d76928900eb..f4160595573f 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1,6 +1,4 @@
AUX 5.1.0-drop-coverage.patch 571 BLAKE2B d5f334b7f5ec5df710174f9a3768c2d7400cefec7c3bb7cb0e4a3fced701b812af738d601ced61df57b78212f1ec621c6a53b906be2bbdf0838c31dc8c6f9e29 SHA512 04b30a85357fd7d0e0a4c52913b0260cc437f7cde2344399d400c2fc0e10cc60261eb4a3201954a515dfd030cfa564c9a222424390af8a3e20349270c89272b6
-DIST zope.interface-4.7.1.tar.gz 151374 BLAKE2B 87900329d4634456287fe0fc78093df02f9b0e27fe2fd9f6dc039253f5814f2a00936e0f49e6001754c192eed323cfad068cf863d3e52ed31bad6352d83e1d0e SHA512 cb99cdf9733cdd2fb6637163167da0073145db1ed1788ae147098a23a9cafb4d661368a1780a44a231a2ea9f1adfa4fd6acac423a4a8d9cf026ee3a603ca7767
DIST zope.interface-5.1.0.tar.gz 225400 BLAKE2B 6ad412bbf3c0327d2b8f37899c1e71fe4bf63c3840c9f2c7e776e3208ec8999c4812aaae89cb9a78724b40ef3dd883323b00eeccab44714eabef6c33c171be48 SHA512 be8319913222ada47a22559e22322ec12dff3adf17f45335d007c5aa3509d84a7d0a7e6c113967b91810b3613344b5c60e002eb740af2bbb454b2807de8dad98
-EBUILD zope-interface-4.7.1.ebuild 1218 BLAKE2B c54224db04b685c17fa2e7b0efa9c0f1889dcbd30bdab3f6e161e18c4a9202650e6fe52f347a7bca280777daf56dd8f7f81c218c7bd746f7d03bab60f6ba920b SHA512 0b6754a822cf4f8180c5fd8930807d1eeb08992a9c527b892394fc71166883dbcf012320a60076eb488082697ed97707888b33a15e2473ffd32b92d06770eb21
EBUILD zope-interface-5.1.0.ebuild 1275 BLAKE2B c5983d70c1a8057c41f8bde60527f94dc269a4d3e18ca23333d1e2f0a25317fec0ba4c206420e4dbbbb7fa44d182e22a153a411025504c7f9ad36bfea95a7e6d SHA512 3fdbe02a25e93106ada616f3121eef6f1e36a6b311cb76a8eee95a13bc310e7e1e468599186d14b45a23bc5c647064828558e51b6d10a86239f5d940aa684eb1
MISC metadata.xml 386 BLAKE2B f8454bc6cb7c55f203d75f44428b0fe404d050e4938f80e5ca1e0504811a3ea73980ab474d12b47f31a87ed508a2f23143d6393eaf2f66eaface7b35a2058a61 SHA512 fc31e083f990006f9a4bdf1cdef5b8efee3e69e8444f614dd5fdcc0d7ddb8291cc1e45c21ab1418668c2e247068a39467e837aa8b869cc050a856635b8789fdd
diff --git a/dev-python/zope-interface/zope-interface-4.7.1.ebuild b/dev-python/zope-interface/zope-interface-4.7.1.ebuild
deleted file mode 100644
index 3e1a770841bb..000000000000
--- a/dev-python/zope-interface/zope-interface-4.7.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Interfaces for Python"
-HOMEPAGE="https://pypi.org/project/zope.interface/ https://github.com/zopefoundation/zope.interface"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
-BDEPEND="=dev-python/zope-interface-5.0.0[${PYTHON_USEDEP}]"
+BDEPEND="test? (
+ dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
+ dev-python/zope-testing[${PYTHON_USEDEP}]
+ dev-python/zope-testrunner[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ # remove .pth files since dev-python/namespace-zope handles the ns
+ find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-testrunner/Manifest b/dev-python/zope-testrunner/Manifest
index 4f241602ebb5..5427050c9dc3 100644
--- a/dev-python/zope-testrunner/Manifest
+++ b/dev-python/zope-testrunner/Manifest
@@ -1,3 +1,5 @@
DIST zope.testrunner-5.1.tar.gz 140679 BLAKE2B 4044b9c77bbda6610b803fbc91cb7bb4d1aaeeb041c32cb91ecd05e05d75a685cd4b6d4531fdcb74380e6ce3fc40f32d21f71ad346491667458a165a90e3a401 SHA512 685d1e1512bd85a00c34f4f89ca1e0f8d1f0939de7b25db0cb43da44e5e41e735e1e9a5ccf2a89b959d7d5f074da71dfe0fd931bd62082159ec65c0b53cd38c1
+DIST zope.testrunner-5.2.tar.gz 141836 BLAKE2B 4a29a2377ece929658afbcf279f51cee445db46432d3ff15be43cb4c1d58b4b809b9077905aeeb5c970cda98bd867258091afe58b525a1716faa2c83e6502ea8 SHA512 8b5bb942f3ca42b6fa4de7db5b7149562aa1047128bbd3498a385f8537335cb0cab1a10934faedcd0a1492a14d57accdeefcb95a57d827ad80fff4e20ffd26ef
EBUILD zope-testrunner-5.1.ebuild 1027 BLAKE2B 221e45fe2b524328ab966545ca7136427dddf230913402b5542533611134cd2942324a533bcde2cd8ac9a244b1620bef91e7f3e9aebab13ed0121e728421236b SHA512 b1f38f469fc09bb42a89a40fcb6c4208e6c07c576a72d107d6066cfaf80cd1472190c37d5086176aa810ff86a18f6883e4b2dc32b028ab18a14a8161c1f3fbf5
+EBUILD zope-testrunner-5.2.ebuild 949 BLAKE2B 95a6f748621a770832fd8b22cfefaacb74be26333c8cc7b06304ac10e5e81892e81ecaac3edbb4aff25748460fb70df2943257e4ff09172e77c9cba5003f73a4 SHA512 0ccd5dd8d303d5790f8573340776a02b1e42ed6dcb051f416c4ad53611b20eb06fb0109a7eb6ddbce7d6d92d58591c6c4eb4be83050782b9b1e34d472284ae04
MISC metadata.xml 388 BLAKE2B 7e19b9134023bf0117cb60760a8579041f1627be3c018be3cad9dfb69d38cc269b1a44350f79a8b282b0ad7035b0328dcaea341a84b09a0a828175d5ee68bac0 SHA512 a6f78bea0ba1c56a15e520c58411503dc976224e7fbf5cc263477f37d5744da29ea3cd4a52c317753a3b68d5efc60e4b3ef8199f9922484ae8b916ff67bd2a32
diff --git a/dev-python/zope-testrunner/zope-testrunner-5.2.ebuild b/dev-python/zope-testrunner/zope-testrunner-5.2.ebuild
new file mode 100644
index 000000000000..a052ac999f6c
--- /dev/null
+++ b/dev-python/zope-testrunner/zope-testrunner-5.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope testrunner script"
+HOMEPAGE="https://pypi.org/project/zope.testrunner/ https://github.com/zopefoundation/zope.testrunner"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND="test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/zope-exceptions[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ # remove .pth files since dev-python/namespace-zope handles the ns
+ find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 1478f28fec29..f9b427cf0bef 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 4ebc234af9d6..587aa8aa7c17 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,11 +1,12 @@
AUX qtwebengine-5.14.1-disable-fatal-warnings.patch 463 BLAKE2B 711aea51b588c899bc45131e05cf14b3d78c8d88e75ed2531ee338cb70924f6a195bc541e3d00883951b04cca94100ef2b5c5c2c27d5d5546f8da40450c788c2 SHA512 c3c13b4e98079f566a4ac5ac3272f2643f9d2fe179922a8d4e964d604e15d8c386c7cd8e13aa960bba64a6fdd6f590e9fd34a4e824e2054a3f6ea7f7f9935f86
AUX qtwebengine-5.14.2-gcc-10.patch 3616 BLAKE2B 079a8ef993b793ddb45a4ff5e3f579f7c4276c122c5c25610a0833e10f870e96282bd5add4e42f4cfa34f023eda04f368b3360ae84342340985b0a605d5ff3f3 SHA512 6c8136c4d6d37a57a1df966f6da18d63599e20e5e78c9fd8b887c689d69306acb33a82f8b7c0f189cda94af7b89318b68f8c647ef78abf0ab8fe83f6c41dae18
AUX qtwebengine-5.14.2-icu67.patch 7348 BLAKE2B b1e4af1fa83c5168600f32c7a58e968dfcbc40016183a41e7df0340742504d441474a2b3f57a5128d32f1b74a2f02a2ee58d14ce34f731fecd19a1e8fef6e540 SHA512 cbcdf51a00c30717ab6aa5d76656138888dc436f278d352a838ac98338613aa0e915114d7a3a0657e2110faaed04af5334077de0c6bc02cea01016d8c2413de7
+AUX qtwebengine-5.15.0-bison-3.7-build.patch 1996 BLAKE2B e84c0d29023d13f348d452847e634d58679d47ed45c58991b4007829c1a547b36f9c19b8e188a83a9b2e9bb4fec3a1e8a3b4139ac0300a21a1fb52ce0f024fc1 SHA512 b4d1cfb77ba7a04a7df325468f52d3267891a1edd93ed5b2e8bcc3ef931b198a0ea3bba88d80bf2d235636650dc88f32bfdadcb9c62fbbde245636c9b1c02bef
AUX qtwebengine-5.15.0-disable-fatal-warnings.patch 414 BLAKE2B 531523ee8c85d6ac51637b3bfd4fbcd56476e1231103c0db62b7c27ace4d5e070becb97beb74526806101c138669adc81a00eefe319ff96582df4743ecabcef8 SHA512 4e3ae727f2738bcc011c9fdd27593d9689206573ff7f17a51fd78d3aa25d427b899af78c098c278f6e7ab4ce88bf415e7382a8a635dd880448a75e6756abc680
AUX qtwebengine-5.15.0-gcc-10.patch 910 BLAKE2B 9cbcb19a0c17fa05cf1ac88e4cb1b80c1049f962844ef79b1d9fa8ef565d9c023cc2de2a7df58814fa060b0c3b037a036baea80406ba4ed7a3763da8587b471b SHA512 d42e08100334aa7b1d19f3d8a5770d5fc1c2c1cf9dcfe68c0e719758013c446575e643f3bad7a924591b72a8425965da2d4f7eba4b9726868c64281fcc45994a
DIST qtwebengine-5.15.0-ppc64.tar.xz 48156 BLAKE2B 6901b04ca869e6980e7f624000dd292fad2b514d8b1853d2796a11fa0e1b1c3a80f284cc1e3c242133b6886bb56329430229645af1ad8cac927371e3941b9fab SHA512 c2613a8d889bb9d7184a65ab6127c8329a945386f23cb860219b8e161d0a43683fa66f69d8d1441f5920fa370fda7c4629865fa452be9ab8a8b1515e5f93504b
DIST qtwebengine-everywhere-src-5.14.2.tar.xz 242467568 BLAKE2B 2b69af846d9f6b1b1bd6380f56868e7fe86c88baf00e4b596e6a825d636472f837c1fc3b9ed41182dcc20dc0ba03360182aba39aee4adca66f407a8346f90fbf SHA512 bcfd9ece04bdbfded5272ce1b3ab482e88349b1f5c5a071f58f6e66fcb9604d1fc38fe909ae3d9631bdf0bf7c081d7590620c3388f1a577b5236f68b084699bf
DIST qtwebengine-everywhere-src-5.15.0.tar.xz 278257432 BLAKE2B 832b15a0a542297f47ecaa057f29e24eb99dd142b314aa15243d864b715c74ec9dfc2ba23aa9be417581151d684d08dfcba173ea2d9311e19ca7af3d941f590b SHA512 11983470f0da9abfffba072406b2c67b475d8cf65412fdcfd925758e2a9449f509780e5b1001fb6868445c2c9540e5aa0e754954b70f1795b47335bad7c749b2
EBUILD qtwebengine-5.14.2.ebuild 4498 BLAKE2B 73e51c2c4f4f9df2ad875de15898e4b8bcd0540a77e81b01988799eae88b130cea8fa8dbdf29d9e337a0ba2493bf4bfc50f6e0d9607f2efafdc1159688b3975f SHA512 fba03353839de8ba680bb1c78c4a9a772d1b6c2454cef505cb16f65c60a92cefe5cf3c2b821e5f927416448d94038dcf220c763031aa2dc6235a9617ed279b9b
-EBUILD qtwebengine-5.15.0.ebuild 4744 BLAKE2B 5cac2753b32824024e43787d093d51bbb7648e1552deb182fdff83b7f8d89bdd101f77fbe0721482874f71456c016f63d34a633a03be7b6e851084b11830bd0c SHA512 01357ac86af5299bb76e1961c9fae117e2003c79f7eb6916f0abd65eceb95dd40acf7fe57a575437b3af3c497050a83cdb0bb1dee9d6d8c79e8beef83dad039c
+EBUILD qtwebengine-5.15.0.ebuild 4799 BLAKE2B 485e73ad91b5ec76f5aba0e7413e24267999b218e5af93c377c3e4f5d53a672b27145574c8b89769a21ddb25685218367c224605e3cad109127688691b69703d SHA512 d7decad9a030d459625df743decf28cb7d0e4f9a90cd80b0d9027ee80cc8bcb7db9375040b87a020ff0cce92ef2479699df56476d20b05ad7bb172f031d53c86
MISC metadata.xml 1269 BLAKE2B f95392929bcecbce9334108e3446d631e2a91d1aceb0fa6347496d2d0eeaff8cff55e08b7c3bb39fb8b51667988a6cc2b8e500143f2ebe0d78e6985a6f7af3c1 SHA512 7949854cf55f26750ded6787ce295762af7fd16600f8b251b25e1c9dd4d643338ed4c3b2a8a3405a2c427ed8b5a9ad13a8566a640161768d4dbf6db7e54811a3
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-bison-3.7-build.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.0-bison-3.7-build.patch
new file mode 100644
index 000000000000..da7a997fe965
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.0-bison-3.7-build.patch
@@ -0,0 +1,54 @@
+From 1a53f5995697f5ac6fd501dbdc0ee39c9488ee66 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen
+Date: Fri, 14 Aug 2020 16:38:48 +0200
+Subject: Fix bison 3.7
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Do a replace run inspired by newer versions of the script.
+
+Fixes: QTBUG-86018
+Change-Id: Ib1dc771e22a662aff0fae842d135ad58fad08bc1
+Reviewed-by: Michael Brüning
+---
+ .../blink/renderer/build/scripts/rule_bison.py | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/chromium/third_party/blink/renderer/build/scripts/rule_bison.py b/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
+index f75e25fd23f..7e0767e951a 100755
+--- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
++++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
+@@ -45,6 +45,19 @@ from utilities import abs
+
+ from blinkbuild.name_style_converter import NameStyleConverter
+
++def modify_file(path, prefix_lines, suffix_lines, replace_list=[]):
++ prefix_lines = map(lambda s: s + '\n', prefix_lines)
++ suffix_lines = map(lambda s: s + '\n', suffix_lines)
++ with open(path, 'r') as f:
++ old_lines = f.readlines()
++ for i in range(len(old_lines)):
++ for src, dest in replace_list:
++ old_lines[i] = old_lines[i].replace(src, dest)
++ new_lines = prefix_lines + old_lines + suffix_lines
++ with open(path, 'w') as f:
++ f.writelines(new_lines)
++
++
+ assert len(sys.argv) == 4 or len(sys.argv) == 5
+
+ inputFile = abs(sys.argv[1])
+@@ -115,3 +128,9 @@ print >>outputHFile, '#define %s' % headerGuard
+ print >>outputHFile, outputHContents
+ print >>outputHFile, '#endif // %s' % headerGuard
+ outputHFile.close()
++
++common_replace_list = [(inputRoot + '.hh',
++ inputRoot + '.h')]
++modify_file(
++ outputCpp, [], [],
++ replace_list=common_replace_list)
+--
+cgit v1.2.1
+
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.0.ebuild
index eb31e0dc68f7..6aa9345fffd0 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.0.ebuild
@@ -85,6 +85,7 @@ PATCHES=(
"${FILESDIR}/${P}-disable-fatal-warnings.patch" # bug 695446
"${FILESDIR}/${PN}-5.14.2-icu67.patch" # bug 720054
"${FILESDIR}/${P}-gcc-10.patch" # bug 721876
+ "${FILESDIR}/${P}-bison-3.7-build.patch" # bug 734356
)
src_prepare() {
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 05d065201986..d7e6769db468 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,3 +1,4 @@
+AUX qtwebkit-5.212.0_pre20200309-bison-3.7.patch 1613 BLAKE2B 0d2d173b5575ed5e1c52a07c5ceb14210bfb0a91e50a064df1e293451d64708822eb54d65947413efb13711d4c0c8e01441869248a4461446bd2bc122f07746b SHA512 cf21eff51e1026f4e506724a512b9925d4619909f5924bf01055244817ec9594e9d3ce105b510cd28ecce4772d122d1393fb7273501e20e16749f43282a3200b
DIST qtwebkit-5.212.0-alpha4.tar.xz 12528508 BLAKE2B 72d7444f270f47b62044cf683ed306803660bfbafe1450440ea29e43e3c0e6e841b6e860dfa8affc1b32b7c539448f04e22a7ae38cce055d37905dfb3240aab0 SHA512 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
-EBUILD qtwebkit-5.212.0_pre20200309-r1.ebuild 3873 BLAKE2B 7b98f9cb7a62f116d6681105190137d2fc54781636d3ad930d50b6c9bd6da8b83ca4f8ae1b5b0e6c233af28cccd648648036848eea15e12030dc6a9e437ea135 SHA512 5e9b013a0d481fef0bbd78483f9d4060d8de5bd6c3598b05ad17f17413763b8bcd4115f720bfea8d731f26daf4e24217e9d1191626e8124d60d64bda6406af54
+EBUILD qtwebkit-5.212.0_pre20200309-r1.ebuild 3934 BLAKE2B b94f1d729667fa6e2abd67951b09dcfb856c38f6e28cfafdeeacac4bc1970db4521ada4c42557ceb1b69815e9491ef8177fae9f4919381acff498a3b22b7428d SHA512 231f042c6f2b258bc908e117f395e02477dfc1f45587e055c26538a31df74a198e61f37cbec0d5eb356b724d75c0a1b9352b3b91a4c0f53314fd9984f771b296
MISC metadata.xml 1152 BLAKE2B 6291c4643d29dd68af56e6054c4db1ebb307fdf2097012182dc77a2754e51bca84c1f53ae7c9f6305ead35cc47334a9e0ca605871aac899ce06482d983c8406f SHA512 28146a11931ab5b106d7bfa08dd3cb38ed3ae1fec003ca27f3f3234887bc9d65a82c76e5ab50334e94de02c3b6455a228acec2574c551e218e53e2005becc6c6
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch
new file mode 100644
index 000000000000..de3bbcfc3ef1
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch
@@ -0,0 +1,46 @@
+From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev
+Date: Tue, 4 Aug 2020 21:04:06 +0300
+Subject: [PATCH] Let Bison generate the header directly, to fix build with
+ Bison 3.7
+
+Starting with Bison 3.7, the generated C++ file #include's the header
+by default, instead of duplicating it. So we should not delete it.
+
+Remove the code to add #ifdef guards to the header, since Bison adds
+them itself since version 2.6.3.
+---
+ Source/WebCore/css/makegrammar.pl | 21 +--------------------
+ 1 file changed, 1 insertion(+), 20 deletions(-)
+
+diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl
+index 5d63b08102eb..9435701c7061 100644
+--- a/Source/WebCore/css/makegrammar.pl
++++ b/Source/WebCore/css/makegrammar.pl
+@@ -73,25 +73,6 @@
+ }
+
+ my $fileBase = File::Spec->join($outputDir, $filename);
+-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
++my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
+ push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives.
+ system(@bisonCommand) == 0 or die;
+-
+-open HEADER, ">$fileBase.h" or die;
+-print HEADER << "EOF";
+-#ifndef CSSGRAMMAR_H
+-#define CSSGRAMMAR_H
+-EOF
+-
+-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die;
+-while () {
+- print HEADER;
+-}
+-close HPP;
+-
+-print HEADER "#endif\n";
+-close HEADER;
+-
+-unlink("$fileBase.cpp.h");
+-unlink("$fileBase.hpp");
+-
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
index dc07eb1bf74c..f7f37face2cb 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
@@ -83,6 +83,8 @@ RDEPEND="${DEPEND}"
CHECKREQS_DISK_BUILD="16G" # bug 417307
+PATCHES=( "${FILESDIR}/${P}-bison-3.7.patch" ) # bug 736499
+
_check_reqs() {
if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0"; then
einfo "Checking for sufficient disk space to build ${PN} with debugging flags"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index ffa1b80d949f..b3389810dc6b 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/jwt/Manifest b/dev-ruby/jwt/Manifest
index 05497c7d79d7..9f6e469781d2 100644
--- a/dev-ruby/jwt/Manifest
+++ b/dev-ruby/jwt/Manifest
@@ -2,8 +2,10 @@ DIST jwt-1.5.6.tar.gz 28586 BLAKE2B d1fa2e735cf93126866c7a5eca14d63ee2646a66b975
DIST jwt-2.1.0.tar.gz 34188 BLAKE2B 0022dbb76cd8570aee84b6590f24639320977ae8d6d5fa53ef1d260da12bc732f9fdc01d59f6c994dc36642a7b67786b607ae76aca8044b7d5f5c60dc300966a SHA512 ad65b6ddd5fb7f33efe0036103f8f7482fd35090b8545219141e8885298fb4809d2386fd6e986c9bca0f85c823c9d4a6500785c0c5964db22d023a99c603ec47
DIST jwt-2.2.0.tar.gz 41060 BLAKE2B 80958a9a88ad0f281f0eb545e584bc1035d1f13ddd0e2c337896300981fcb09849dfdd97828a5820fd241a3387b545c67e600d9148314860380398819f321aff SHA512 66da3ea525041080ed6c1da50e61a7e5ec9c8de70d5dc592c781b89aab7feebcfc419ae4362504b793cdc8857b37797efaf2847eab9425a53628680f5acdc0ce
DIST jwt-2.2.1.tar.gz 41269 BLAKE2B 51a47d07c9386c42dd22832d4b1c5a7c8c1b599dad15801d8192f023ee73336de4ee1c7c61c76ab9e181b26e168c661090cffca2d8db27a7a2f6a8be40dfb6e1 SHA512 cdcbbbb7af4bccc471a8a8ee3341c8b23d634b3f46522585fa51d228963c58305d16b45f3455c811a86bff13d3e4c3911e54d8a2932228d0feb5133ae43949c6
+DIST jwt-2.2.2.tar.gz 43084 BLAKE2B 998c2770e50cc65b5cb687f99f76b64a6a8d58a5c4312c32b642c7280abcf268f43588f7a8421d05c892072f7e39a6b48c1eb57dde950e92372f2bfe5eda9083 SHA512 04ac42afb09ad8648e2c428cb7493f738b1944e5fd273723cd2fc2550d6ab3486c2f3be5ae5bac7e36664e58d2fa913e5b38ba34361a98ebe1259d18008341b9
EBUILD jwt-1.5.6.ebuild 678 BLAKE2B f799859c28ebb2daab33604f350df13bca00e98cf911b2e996000bd10d4b313374536d1e4340cd7e2b28f025d18e7b209559b353066793f5e6f762f8542488ac SHA512 715f7b2cc586536480a9f84889eb999844c448adff10fc55df610f8d1ecc1aade26435f3c0fa66eecbaebf3069f351dc6c2a0f900e2382d44533ba4c33d7a7e9
EBUILD jwt-2.1.0.ebuild 701 BLAKE2B c8b1f519529db9c0fb535196ee063424a062356774ec475226ed0175d00c47f2e8345ebce00c52a9870cc0398fcb03798e05b4efa77709490496263057b816b2 SHA512 c73c0717981c5e52d0904f96499a322fd1cdf8c656bcb66719d200012c8904043d0b927118b3a23b4ebc70351ebb6ca8623abda042830a4a6916a2b0d09f4be0
EBUILD jwt-2.2.0.ebuild 719 BLAKE2B 903dd40cd20dd28355a1bec57146b70460bc8dd48a6ff8f18f4c25ec15fc90373b10cd5bacfa5904b6b947a9e966e0adf9703f9fd97277b55adf904c9f6c64d6 SHA512 9ebc0f372b4464ff435ec080fb7395f63dbb49c9a3704888451a3ac88a4c8d5e11220e944c7f391a4d714b27dcbe5f71bc200ec13c054def1a6a74b63a93c8e9
EBUILD jwt-2.2.1.ebuild 777 BLAKE2B 392b81dba214db80fea2276c86d8a8ea2c92f55e4f96a138c1b1abc38cb84af81b11be686e3c5de33563f5fc84bda7e467bc3c4815b01ebad3d1fff5b0cd6281 SHA512 305b51f60e0f496771402a401d2ad2207fdbf4ce9e64aeed8fe7e4089e465a7cef9a2d3a25408a93388ba32b20ec7d92d35817ff66a649d7af4ec03f227732e0
+EBUILD jwt-2.2.2.ebuild 777 BLAKE2B 392b81dba214db80fea2276c86d8a8ea2c92f55e4f96a138c1b1abc38cb84af81b11be686e3c5de33563f5fc84bda7e467bc3c4815b01ebad3d1fff5b0cd6281 SHA512 305b51f60e0f496771402a401d2ad2207fdbf4ce9e64aeed8fe7e4089e465a7cef9a2d3a25408a93388ba32b20ec7d92d35817ff66a649d7af4ec03f227732e0
MISC metadata.xml 338 BLAKE2B 685874339b4dce29aaee7a4ff92e7df63ebced85bf94bd9011e0f4b6e1ba3fafc0fa0e701bf25fa8c1dec357ebf27f373742d45b12320ff28a496405982860f2 SHA512 700a3cfc122774c85bb6047a68539139d53dd6abe814b20bad12fb65233280e9aeba45bce0551920b0de550adb2744f4ee7e2eb0ba39e98efeea7a23c63e4428
diff --git a/dev-ruby/jwt/jwt-2.2.2.ebuild b/dev-ruby/jwt/jwt-2.2.2.ebuild
new file mode 100644
index 000000000000..36bd96cb600e
--- /dev/null
+++ b/dev-ruby/jwt/jwt-2.2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
+HOMEPAGE="https://github.com/jwt/ruby-jwt"
+SRC_URI="https://github.com/jwt/ruby-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="ruby-jwt-${PV}"
+
+ruby_add_bdepend "test? ( dev-ruby/rbnacl )"
+
+all_ruby_prepare() {
+ sed -i -e "/simplecov/ s:^:#:" \
+ -e '/^SimpleCov.configure/,/^end/ s:^:#:' \
+ -e '/codeclimate/I s:^:#:' \
+ -e '/codacy/I s:^:#:' \
+ spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index e728ecee0e03..4d5338082f56 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -1,7 +1,9 @@
DIST rouge-3.19.0.tar.gz 919603 BLAKE2B 53cffee53d8c6bd8e27dc0278f9ef8e9bff2a01d568d2342847ce0afe71ec72a8394f6e9184f575e38abad7893c61a4553ca73c8072bdcdb91f347ffe63a65e5 SHA512 4a59e5bebfb0c58be82bcc23e7a9906d9ff5cba8a636b47b94be00194ab0ab6cfae4d584586ee037e160245630abada889aa85332398289a214b7a493a8e825d
DIST rouge-3.20.0.tar.gz 938340 BLAKE2B dcb61527f023e34be5c2fdc362f74b64be24cc26e32f88ce7122ab7fbbee5c44f5a29c5c1d8fb5e721ede2df0119cbb2c00b5e178d1462967c54a6d062ae2e53 SHA512 3eaee2d98c5cb252d783c5bae365de4c400d980917a59b943d6fe93490c48e9d36e51b7d92acf468c10e702c942074f1525fa7e1c81c7c37d9b0927e9d4f332b
DIST rouge-3.21.0.tar.gz 945455 BLAKE2B f783bc6750bfc3b463bf63374127be28676428a13335c24b331f8ae327afc85d961c7f06319cfd6f80f31accd3ef874a780e7dd77816d9ff863ae491506f5fb2 SHA512 c71dfceae7902f8c4a02288053baa8d1285ac0570bcf754743bfae045a1d5fca177a13843aa223ded822bc95007d049187b363f4dd8f022336e6325919d2787c
+DIST rouge-3.22.0.tar.gz 943288 BLAKE2B 9daa8166e05002a633ce6a99a794173148336f3f755f2c672879cffe177d1fda1b37723ed540d3bf8613725bab965213257043a4b7dfaa619650568c946378ba SHA512 83032099a0d540e77a25bd79c94481cb7f39c4a33e9b30f9f74d738ee0781ffc0c9bfbf9b90400d4833975df8a857231bed0739678153d08c716fe7e2cd3f8a8
EBUILD rouge-3.19.0.ebuild 971 BLAKE2B 08e80a66dd9ea50b2e5e2f4f09a28fc40b5827b6a9783bcc50642442c15b6e0c1b3d2d0665828c1ab54c2cc4e56cb991f9c7ec1d1bc7f766a62c5e2784bf0930 SHA512 cbe03cc2f1d779dae389556c693be00d812b6bc5ccc1384d9f2d7fb72f0d3a9fa9297e3da274485e46a46b4b64558045c13108ff248c16e289b5878b9be8a9ac
EBUILD rouge-3.20.0.ebuild 975 BLAKE2B f4047fe67e2f67878339557a3a3d2876793828b5e6931cd73064348f9f85bfe1bd56a50de4da7eb1db5cd5d51a4315e635c180e23c2c6975930f184759ed59e5 SHA512 f3559e9d6fe08b095fc13c0dcf27a59a2118a900ce258120479d0ca5cab01020d4323881e67aea25a84a3e1a134def2e1be883e5d4c5f4f609c743807dda2bfb
EBUILD rouge-3.21.0.ebuild 968 BLAKE2B f714fac60256678764f27c1bab8ad4f86ddac1384a93ff7c0da2248edae46282b2c79ab168dff6855205f24933088249e5b71926da467cc1f388edeeee87e3c7 SHA512 fc547adf5c97e162b7a0920320f0c0e3197d381e0348466836d1a12c6415151f1207afecf0451abcca43a800ae80f15c78b4683f95106c3ea6db57b52b195244
+EBUILD rouge-3.22.0.ebuild 968 BLAKE2B f714fac60256678764f27c1bab8ad4f86ddac1384a93ff7c0da2248edae46282b2c79ab168dff6855205f24933088249e5b71926da467cc1f388edeeee87e3c7 SHA512 fc547adf5c97e162b7a0920320f0c0e3197d381e0348466836d1a12c6415151f1207afecf0451abcca43a800ae80f15c78b4683f95106c3ea6db57b52b195244
MISC metadata.xml 337 BLAKE2B 0b11fe43cebeee93ba1543bf3784c624a91373b066b90485698e9f58ad95d2d4ae077fa5d18d097deb5d8678877b915a9df7154899169d35345fc8fc52bb1c44 SHA512 2517857c1be612b98601b4f92e3e20f3e404902faed1965f8e2e0573820ed6dfc12de25a292bc5f5971b498e310cdfe4a3a5aa13f46354f5139c53ae6a53b876
diff --git a/dev-ruby/rouge/rouge-3.22.0.ebuild b/dev-ruby/rouge/rouge-3.22.0.ebuild
new file mode 100644
index 000000000000..7e43cc39b023
--- /dev/null
+++ b/dev-ruby/rouge/rouge-3.22.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
+HOMEPAGE="https://github.com/jneen/rouge"
+SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
+ test? ( dev-ruby/minitest-power_assert )
+ dev-ruby/yard
+"
+
+ruby_add_rdepend "dev-ruby/redcarpet"
+
+all_ruby_prepare() {
+ rm -f tasks/{check/style,update/changelog}.rake || die
+
+ sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
+ sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
+}
diff --git a/dev-ruby/ruby-net-ldap/Manifest b/dev-ruby/ruby-net-ldap/Manifest
index 3c9435ce5d39..da94c40c1782 100644
--- a/dev-ruby/ruby-net-ldap/Manifest
+++ b/dev-ruby/ruby-net-ldap/Manifest
@@ -1,3 +1,5 @@
DIST net-ldap-0.16.2.gem 94208 BLAKE2B aebfc53b29c3bf81eecfc50a7422bd30b7dfe1894f8b7ceaeb82e346ae0e3ecbf463f3f15aab2200d42a391782a07cea8bbbf3f1c0d1cd0ae95959ef77bc8a14 SHA512 5d0e63473b5e1b1133463a49ed1c88fbf00fda06265a9a091fdb513f1d20fb45e5227c6384a9adc82ad71082ef07786cf63143060711b15386ceb7d3bd7b800b
+DIST net-ldap-0.16.3.gem 94208 BLAKE2B 637fe661e1ccf962cfd224ca457c7c4b9b51ec15179d4ca8d429947c45be3ded8dfde1f99b5f4a2c7ecb51682828689086a8ed0598e03905c8b77448bfcb1244 SHA512 18b9b290eb37c2378953011db4d92d41c18d735ae7908a98650b0c941ccc0eb0f44a3686c8ad987066de2a3ff04a58acb9267215dc214212f44ae5fccfcbe30d
EBUILD ruby-net-ldap-0.16.2.ebuild 629 BLAKE2B 153ce9b90e84bd6177e46d1438b78cb61711bf3f2344922fcecb3f8d0d6c8fdb483d007c81de8b6419360a0d694b38bd487856fde0afe9d5428671c599ef8a00 SHA512 2cd38c26412f0d2f4949496a75099611b9914959febfa0917b19bdd8ced5feeb7022d8c558e3ba173d38bb3990c71432bfe4b1a5e981d019aecea5e2a97bed9c
+EBUILD ruby-net-ldap-0.16.3.ebuild 622 BLAKE2B 8670a1ff8d6d2c976da284b9fc65f7a8ae30ebbe141add8d6c766e3131480981febd22bce12a17e397d06b76ea017de54e551a82091af00c5344bf50219f3903 SHA512 25707928cfd629b4efbba14e27eefac31ac9055ec5821b4ee0aea2103a71cf36b18948f3189fcd033e90e44e18bfbc95bfa7fe34035529fc581b084292e7fb7f
MISC metadata.xml 349 BLAKE2B 8048fb25bfc3ecc99fce9301034623a0bb6f946afc23ae87d2308f4cb5e65be2774894573ace6d5808090118105f81a2565cec6a00237a41ccb071170454b7e5 SHA512 522f6bae26a2b7d3ad4876b5fde3e710e07ae82147275a031c3f622df1775311560603960cf6909ba755039f2f62cc2971a3b29871ef7d1320e24d375070bcb3
diff --git a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.3.ebuild b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.3.ebuild
new file mode 100644
index 000000000000..c2909e1f1c21
--- /dev/null
+++ b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test spec"
+RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc"
+
+RUBY_FAKEGEM_NAME="net-ldap"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pure ruby LDAP client implementation"
+HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0 )"
+
+each_ruby_test() {
+ ${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 30dd520d6605..c7486bb7cf72 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/rubber/Manifest b/dev-tex/rubber/Manifest
index 2f7b3662c2a3..7b8b73989af7 100644
--- a/dev-tex/rubber/Manifest
+++ b/dev-tex/rubber/Manifest
@@ -1,5 +1,5 @@
DIST rubber-1.4.tar.gz 109357 BLAKE2B e624674fdadae52890d5599450b741db39c3ddf2ca382a2e87941a87db346cfa33e96e2fb468f052d3f94b7b2086628e675971203a9a4181385c059196fc3df0 SHA512 8b4a9f689702505e19543e5295375c14ae93fb9d6b89d1234fda093d4161551bd58c2485b53678f141d52a140002df08856cfa059f6287721402b74b0ef666f7
DIST rubber-1.5.1.tar.gz 111812 BLAKE2B 4d08527689d669e3ac8dd6e9050fc09766bfb46c53d9923ce10efc0aaf8a62a962cb2f1c27a0e7a19a9be96710edba923d93589d816aa22305eec33fd08aa08c SHA512 ba22eeddc24b4f9abf0bf087604a4261add648877ec558b766555de09538cd20c21c8cfd9731c1421540bb2479501dd6ed066346d250c6bc981529e31efacc40
EBUILD rubber-1.4.ebuild 592 BLAKE2B a9a9de9ce465280cedb04efc859ce865c9bf106181a39a4ebcf48d23495eabf313f4bb75e167727da7378ac12086df091e51fca2a57c203f639a1a04ee9e663d SHA512 41a41cb3f4e1286b6659a1c3182d20230097d633c3ce1ea07487a3e2f5b3d678a83024c01dd57ec97d49128198a103c3f893304962575219a07dd9ea72522e6b
-EBUILD rubber-1.5.1.ebuild 651 BLAKE2B 13d94e09ccacfb9b7f025e9ff553419ceb5c96b7fe0dd17c38a899de71a22982ecbee60f6d51f1f8a5103fa2be39678574b648db0bafce8cd62abcadfffadf9d SHA512 b32abe3c1738a2d147db3d4b711dfdd1f23036a7f30b78f3cd4333268cd0b5b4e9078fe3b09939a1a612695efd791788b5617790f772cc1412906b20e82dbd02
+EBUILD rubber-1.5.1.ebuild 650 BLAKE2B 0935a9dc36cbdf08fca1e28bf998905a068d7454cb5f685b53218d46ab560b62f4ba7177308b8eab89bf5b57a14699e8834c6c8ab1f78285409478494d37d0d4 SHA512 842b0edf6161efb8d07bd78e6cc1b2e2c236db32cecdefa8bafdbcac26994d2a8fce7326e3458a30804f668f81cbc1d8f8a1aa762574b52b06ea6043511cd477
MISC metadata.xml 323 BLAKE2B 46540c17674230be613731fbca57ec01370930462c33976af5d00763468eaa70705959ab5d45312430cab731d33ca04f6d8f74788a94c5de7a7bdd9a977f860b SHA512 038fa245ced154fbe7876039c19b87f414d06db21c9b9114274c2ced4221217ffa52e4cafdde1283c00155a3d4249cd7cddbfbdf24122aa67c1ca0f330f9d517
diff --git a/dev-tex/rubber/rubber-1.5.1.ebuild b/dev-tex/rubber/rubber-1.5.1.ebuild
index ad5baaac89b3..00b3e11f0dce 100644
--- a/dev-tex/rubber/rubber-1.5.1.ebuild
+++ b/dev-tex/rubber/rubber-1.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/rubber/trunk/${PV}/+download/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
RDEPEND="virtual/latex-base"
BDEPEND="${RDEPEND}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index cc7a50c7404b..0f04591bd1cb 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index a0cd92a467aa..d8506679ef1f 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -2,10 +2,13 @@ AUX 0.19.1-no-libevent.patch 2262 BLAKE2B dc743112a7addd9abd0391cad7fd15d0060cf6
DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
DIST bitcoin-0.19.1.knots20200304.patches.tar.xz 399864 BLAKE2B de5591072b62c65c8a0fdcee7a7ed4b74d13614e47b679a05f272207b9ca0a09d476aa8ecb66321f39953a320f4d47f7d2aa62848192d493de02525c3d5abdfa SHA512 3b08023f0788535dc5943e47a595da5637172263ac8c2ad97d42c0707da7468a9843efbf90a2eb6ac99db65e362e99cbe9209ab64785c79de908e20801ba4fe5
DIST bitcoin-0.20.0.knots20200614.patches.tar.xz 392356 BLAKE2B 17c5d5c89e279c870492ac4f98cfde6545fa3c4b5169f42c020e45ca14c133673e271b248e90286ae875aaef6b031e578d14554777a89dca5366aa4bda079012 SHA512 208234b2e7fa46e19da9954dab9828993aa62a7623d85de8e7d43ffd4b367c5e8641e82154357526a11b95c0426ec16039d2910dbbe9187daba9d14a3b2fda92
+DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
DIST bitcoin-v0.19.1.tar.gz 6660702 BLAKE2B 93ed83f663a833f6be40195ddaf62a8ef9fcd86c3f983fe0cf1e75eaf9ae54cdc88fcdfc36d798842f29636dc8037af5b67e82643c90a6c276fa504ed022f863 SHA512 bc1afad7de5b43042d24780b07e3faf73dda69af9ef0c75fa1a32bd25b0b37e315955614ffbb2864fe827b77b63446fd88cae22da3d0706ff73df495a519ba5d
DIST bitcoin-v0.20.0.tar.gz 6984988 BLAKE2B 2c189826b7171276df62fb8cbf713d8b4cb4307de413247f2951950ec173d069930447d7d420d1c73ba0abc97fd613a05fc527bcc796e5e2d2f3dfb57fb29b80 SHA512 7628efb70bf51e4165605d9e77f6119b855994e99d8cb6653dfbd89628304862f3a98cfe352aa8b435913000e74d297565d8a7e3f22a23006d1779b70d04a8cd
+DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
EBUILD bitcoin-tx-0.16.3.ebuild 2427 BLAKE2B c3410c5a84de81fcafedae1236e339f034938e7adf817a4dcdeed76f7ea64cc2c84e529785732de392bca904b34563cd80bf40f755a7f5f4d8afb92fcd97cc4d SHA512 0b277b10e5fd15866a07e06bb33f6f398b6fbf88fd4159ab50b33947f42e88870b67b9fc3e3375cf16dd15fe3828a550cb30067ca03eafcc9aa93fd1ad2bdccf
EBUILD bitcoin-tx-0.19.1.ebuild 2533 BLAKE2B 88b2dfd6f40edb8e66cd9f92dae8cfb395e21e67cce278694395898079e48a7902f35e3f54d30e0f1fdd729f077da4e5de229f3781fc5e90e6eef7e84c566fc6 SHA512 f9b170301f82cf07436a30bb4ef911af0263c422866dd507673316725084c4f1f4782e8904be2d8d48d564b6bbde27e369a4309eeecddc5744b0864331fb1f54
EBUILD bitcoin-tx-0.20.0.ebuild 2529 BLAKE2B 3b273c3e025eed28f0415d0864cd735ce34d0a2923cace7b4c2cad1d5ef58479a5e9762cc0912179e0ec1ea30116c04e9ebc605b78242529280ddc4dcdc91ee4 SHA512 77739c8c5e33e6a2afe92fd2c182c8470c7faa0dd907929b641de3a2aeaf0b01a321896302b246ef348a59bc8cb35b91adfce65148e10ac6aed9a5bd60d2d284
+EBUILD bitcoin-tx-0.20.1.ebuild 2438 BLAKE2B 22e6e37ca91de9a9690f88f0e7ed3b5ab59fbe5fdaf788865f6e9d27d6a647bf427aea8b046eaeac551b903c856efaa668a6a64770a046485cab7833d121d5ca SHA512 32441dd60d320a69873f369cb86fda61ba3983f3d6703d160a212d799a16defbbe9f15feeab58480808e58b9688a86256ddf6f9d9c1746f21e7c600258b2aaa5
MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
new file mode 100644
index 000000000000..48114a6e5290
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="bf0dc356ac4a2bdeda1908af021dea2de0dfb35a"
+KNOTS_PV="${PV}.knots20200815"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+ https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+ https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="knots"
+
+DEPEND="
+ >=dev-libs/boost-1.52.0:=[threads(+)]
+ >dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
+ >=dev-libs/univalue-1.0.4:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ >=sys-devel/autoconf-2.69
+ >=sys-devel/automake-1.13
+"
+
+DOCS=(
+ doc/bips.md
+ doc/release-notes.md
+)
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+ if use knots; then
+ elog "You are building ${PN} from Bitcoin Knots."
+ elog "For more information, see:"
+ elog "https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+ else
+ elog "You are building ${PN} from Bitcoin Core."
+ elog "For more information, see:"
+ elog "https://bitcoincore.org/en/2020/08/01/release-${PV}/"
+ fi
+}
+
+src_prepare() {
+ local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+ eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+ if use knots; then
+ eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+ fi
+
+ eapply_user
+
+ echo '#!/bin/true' >share/genbuild.sh || die
+ mkdir -p src/obj || die
+ echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+ eautoreconf
+ rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+ local my_econf=(
+ --disable-asm
+ --without-qtdbus
+ --without-qrencode
+ --without-miniupnpc
+ --disable-tests
+ --disable-wallet
+ --disable-zmq
+ --enable-util-tx
+ --disable-util-cli
+ --disable-util-wallet
+ --disable-bench
+ --without-libs
+ --without-daemon
+ --without-gui
+ --disable-fuzz
+ --disable-ccache
+ --disable-static
+ --with-system-libsecp256k1
+ --with-system-univalue
+ )
+ econf "${my_econf[@]}"
+}
+
+src_install() {
+ default
+
+ newbashcomp contrib/${PN}.bash-completion ${PN}
+}
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
index 149ff49a3ff7..447263407e33 100644
--- a/dev-util/bustle/Manifest
+++ b/dev-util/bustle/Manifest
@@ -1,3 +1,3 @@
DIST bustle-0.5.4.tar.gz 122720 BLAKE2B b5a2315919644ab5c7712f9e9bde1bdea226b4e8898981f7150558bde648a5c7965be6ad8484c09727665292e5fe3f0cb545544dbb27f2a2553e513910289620 SHA512 56eaeef831fb5929d57a008ae71d8409048ce5d12eaada98830ef742baf3479264203465d77591cb338374096eac2dc2b68b44f075b2761f16df63fad54b91fd
-EBUILD bustle-0.5.4.ebuild 1635 BLAKE2B 4e3e075dc2d7ca51a77112a26c86e975681d35f6ba41b5cf2d3b2d074b1d2d5be59f2bb63c713dfa5fbe5c8f6145c87388159060995897062e37de910d00e348 SHA512 f8b263727d6c917fa5a76f6f4462c07310181bac753763ffb44f5633fbdf7b63580f99eae5268e5f29c83df048ae5dfb37bd5aa49984bd6fefcd95e8f9b84af2
+EBUILD bustle-0.5.4.ebuild 1636 BLAKE2B 0c03d3dfb08c5b9b79b4df1685103cbfefb1c6dd3a2ac1b69fd0a5f026e847df00ea23278f308287624cb3a4212d17a430e525bb7bbb89eb48fc4184b66c36dd SHA512 c86f830a373349f256ab367617f0bd4ef460a843f6fc37f5ca8aa147921a45e211b3e2a025a23a2e43e2efcff278caed4e6335c2f2fdaf668d823e1a731cb264
MISC metadata.xml 502 BLAKE2B 3ab482910acd7936501b8c519d2da5c286d493a04afc6d5302989ca5662a4f166d84142489789cd5f5ea4071b5a5e54bc9d0586e6e6fe273f3f2f6f4c44149b8 SHA512 834e9820081006344e30580673ccb789750d1af67807f908b21fc5fe0cf1b8554b32b446aa592c52a1dd26e4d36f2f91c3cff569b8c4797ded9c5c6ea1bfa65d
diff --git a/dev-util/bustle/bustle-0.5.4.ebuild b/dev-util/bustle/bustle-0.5.4.ebuild
index 3c422fff02f7..6e92a1f7bcb4 100644
--- a/dev-util/bustle/bustle-0.5.4.ebuild
+++ b/dev-util/bustle/bustle-0.5.4.ebuild
@@ -9,7 +9,7 @@ CABAL_FEATURES="bin test-suite"
inherit eutils haskell-cabal toolchain-funcs
DESCRIPTION="Draw sequence diagrams of D-Bus traffic"
-HOMEPAGE="http://hackage.haskell.org/package/bustle"
+HOMEPAGE="https://hackage.haskell.org/package/bustle"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="LGPL-2 GPL-2 GPL-3"
diff --git a/dev-util/comparator/Manifest b/dev-util/comparator/Manifest
index 18ecff81ae4a..58ddf931f315 100644
--- a/dev-util/comparator/Manifest
+++ b/dev-util/comparator/Manifest
@@ -2,5 +2,5 @@ AUX comparator-2.12-gcc10.patch 793 BLAKE2B 0bab88fa6aeaf046ee4dc569aeb0d3344a2a
DIST comparator-2.10.tar.gz 1463175 BLAKE2B 58d6bddc5f785de3768ed2c4845b75af03c1fd7f646fc15efaeec09878a72355c46c64f67866217994797193aaba6d4214685c7be89be9872620dce5930238e8 SHA512 b880f7a4a0fbfad44c53606c6d97509305d8485f0ab76b62bb0d1d1d6d4be9fb81e7a08326e78cabd1a9314e6efbf3a966eb6393e424f59dc657975a63ce2988
DIST comparator-2.12.tar.gz 1463333 BLAKE2B 081251a0a3cb2f99d5b74092a46a868741049d27c367fc9bc3445d35fe01eaaaee75f7afd3674ecdc2569c2ac1ef2d5acd838a546aa307b33c977c4c8a91db12 SHA512 dc5acf3d5900e293e3f0188c0809bc99f2f18edb55df882b2e12e66bc655e7faf030b8daffdd2d175234b398e6a8c125ca6af615933c998651d7f1579734b080
EBUILD comparator-2.10.ebuild 866 BLAKE2B d57e9166f9a0f14ad04c4c2f686198f866699f1ae0eae03a93e256c9d3195bd008844861000b4a45d4b30092be377110067152133d39d07195c3cce705f39682 SHA512 21ed08a933430f6044de705507a60b875786762f9ca413cef8f74814122aeac931676dedd04c3a1b32b7651f9a6f904e878aefe625d4b255d4e84c27d5da0570
-EBUILD comparator-2.12.ebuild 962 BLAKE2B 8d69fef2bfee55ce6f08b0c84dda38241a37812896bf7b7735e9edbfeaff0b98311c2c2618769de5f9d97bca97ef43c73a1894eb1be41ffbd8e0937b4bbf30ab SHA512 03e45c04f677caa8570b840e36fb6c19ab0b131853acccd628a73d064521ce3a02b86da104e41d808c846eb5b1a224e367987c37f43403bdccf185348d51de03
+EBUILD comparator-2.12.ebuild 960 BLAKE2B d1bbfb9c56d4c7c4303010e2a70da1eccadd1e043f86d2bff7957ee9e6ce575d9f79f618139933a1c5389390e5b074474d41caf8772df2f892c7629a93c3d67e SHA512 80e47685cdead18788c9dbf0cfc9528377c5b5ebe1db944fc8cf567154d77ffde63844967006d58ba118703ba904898c23661eb2d5dd7ea87dcc90ee4beb19d7
MISC metadata.xml 434 BLAKE2B 383d68cbb1192908d9a2dbf445852696f4f819564bb414516f8d15ed444ae0dba20ebd59ee6211be104e947dd1c78488c3abfc7a4a040d6fea0165cae853a287 SHA512 d499eae431272e1541f286cba5dc150442c12848469604ce6696ebc2f60f0b394c3376ebee5a5757e884f1372f732415bb169e7393f27c59a4d0faa57952d7e0
diff --git a/dev-util/comparator/comparator-2.12.ebuild b/dev-util/comparator/comparator-2.12.ebuild
index d7b8e04b7ead..ec0bfac3e03e 100644
--- a/dev-util/comparator/comparator-2.12.ebuild
+++ b/dev-util/comparator/comparator-2.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.catb.org/~esr/comparator/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 arm ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 sparc x86"
DEPEND="=app-text/docbook-xml-dtd-4.1.2*
app-text/xmlto"
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 432195f2098e..3b557e07799a 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -2,6 +2,8 @@ AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f19
AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276 SHA512 8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5
DIST glib-2.64.4.tar.xz 4779456 BLAKE2B 2ff69c794689c97011103459cb109e6ca7021db20a605cf3942f57e7b73eda9971034b8f65f03191f357169affb278dfa9bff309b4ca44605fd5a0ba0d135d2a SHA512 f21fe33068a5cabdbfef54ef635b3f810b389416c3b4b66ae4975e84841834f7b7640d2518d52cb7341641af5761919eebd5e7b25bd2946f3bdd002c4902b090
+DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
EBUILD gdbus-codegen-2.62.6.ebuild 2043 BLAKE2B a55f20184ac1bafd3aa391b2d0c79ccefd5c6dc64f7c4619ee505f16f645c479fda199e6c54cd41ac666c5e68ab9431109f642655250b3f16f28c1d8dffc6da6 SHA512 9ad9a9475d431ba44a913f2b0423fa35623105d87ec8eb583b9eb0c67aa8358681b8d7ef1f5856e6c15d873bb29d1d5397788e44ba2e6bd5fbb734c1c503717e
-EBUILD gdbus-codegen-2.64.4.ebuild 2208 BLAKE2B 881b98233993dde7957539d54cc12dac5fc50912a07a23152cad07592673fb1aed701a339a5f32536d8463316d634a07ca8a97452b7a0ef0e1ac90f65a52b4b5 SHA512 5a29228c08c2c6cb67a09113da933fd1fe2dd747de8efa8f94d5b389a27254940229c004e2aaadad17fd3e727ca66652e4bdf61de2417894348a109bfac7f098
+EBUILD gdbus-codegen-2.64.4.ebuild 2207 BLAKE2B 8f3d0a630b70611af94a2d0d9ff3b5b7c4b1291e0efeb5a87a3ff38fc5e2b2790261ab9ae0bc9b5b325e509f031884a1892616d774ed18b8366c03a86de7bf97 SHA512 5decb4a4ef7c5b62bab57bec7a31884c11a66ecc3a7262e53563e53b21600cc10a96a33355902aed395fd68bb046ebc2ab6619c2ba816c2a435729fbb816be7a
+EBUILD gdbus-codegen-2.64.5.ebuild 2210 BLAKE2B 33183b64bb0580f471c75fa8013896e72040482bd17b24bd159418649d6ade174c16d7964732afb86aeebc81bd6692a77e5ed5fc1d4309908abc7dd762075466 SHA512 8a850c678739ca20f6bb55edfad22a2733363784ee7f42aeb8b9775a13d89fd901137a39600ab8921468f2635d8b1c2cb650b5fd696c80e7406ce8a5188da1f5
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild
index 4033ebb783fa..145320a2a9dc 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
new file mode 100644
index 000000000000..7ac039681680
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+ PATCHES=(
+ "${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+ )
+ distutils-r1_python_prepare_all
+
+ local MAJOR_VERSION=$(ver_cut 1)
+ local MINOR_VERSION=$(ver_cut 2)
+ sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+ sed -e "s:@VERSION@:${PV}:" \
+ -e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
+ -e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
+ cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+ sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+do_xsltproc_command() {
+ # Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
+ xsltproc \
+ --nonet \
+ --stringparam man.output.quietly 1 \
+ --stringparam funcsynopsis.style ansi \
+ --stringparam man.th.extra1.suppress 1 \
+ --stringparam man.authors.section.enabled 0 \
+ --stringparam man.copyright.section.enabled 0 \
+ -o "${2}" \
+ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+ "${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+ distutils-r1_src_compile
+ do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
+
+src_test() {
+ einfo "Skipping tests. This package is tested by dev-libs/glib"
+ einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all # no-op, but prevents QA warning
+ doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 37aad1391972..33a73c89d8d3 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,5 +1,7 @@
DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276 SHA512 8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5
DIST glib-2.64.4.tar.xz 4779456 BLAKE2B 2ff69c794689c97011103459cb109e6ca7021db20a605cf3942f57e7b73eda9971034b8f65f03191f357169affb278dfa9bff309b4ca44605fd5a0ba0d135d2a SHA512 f21fe33068a5cabdbfef54ef635b3f810b389416c3b4b66ae4975e84841834f7b7640d2518d52cb7341641af5761919eebd5e7b25bd2946f3bdd002c4902b090
+DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
EBUILD glib-utils-2.62.6.ebuild 2390 BLAKE2B 6160cd993d8ea330b68812082a1e14c6d9c64e4adc2832bb68693e8a8eacc7598541f19e049a7601027b5fc1624485dcdc9745c7095b07d3b004a99a7f612d44 SHA512 4840e214e3283609722803ac6e52b015cce5e1f74168e318bf78bd0f0d2e7332f35063939c843ed39d03b0c9822a6aa738183bd0e0b6ea1067aae5c6b2a57a03
-EBUILD glib-utils-2.64.4.ebuild 2397 BLAKE2B b379ae633c8ce1feb356132508ebf993e2449f957f44efd2d52784eed9c28635328ecccfb2fe6725adaa6917b72417d7f41c0e945113fd01da83220b6f1a16b1 SHA512 b36952b4fd781cdb574f2f431265de8dbfe2c8a29d3514cc873b8532207682259b3009ce7b746d93756c7a60550f2f32a741c82e9bf17374b412dfd6d9ac6b44
+EBUILD glib-utils-2.64.4.ebuild 2396 BLAKE2B 5c5d5edfcfce8d27e9b1abe8623d0ebe913338d0afb1fbd331e8feb5df7b446ca5e2d7952014298467909f042e56dc062bcf4ed948d570db55f03a2b847db15a SHA512 a20b2d9bbf6a1685b2be734238e083cbb0f1adc1bfc1d2c152d682d6c04a2a065aaeacb331fa07688702b897a24683b18278b291a9e9c28cb0425d599555007a
+EBUILD glib-utils-2.64.5.ebuild 2399 BLAKE2B 68065e66c639d695af972944e37e40eb633c6b7033d9d6d4f032f5c016017529cda1ea8d1e264dcaaa6ebdf0c3c2c643b59dae936b87f787c68703f1bb560526 SHA512 15730dd4f08903d49d4c462eb045b557b5c237e581699fcd9253199dc1c953415552dc908e110c701d7ef1803e336a25547509ba15c8bcd95ce8515e1d5914d7
MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.64.4.ebuild b/dev-util/glib-utils/glib-utils-2.64.4.ebuild
index 48ca0ea8f09a..b77b6e37bdac 100644
--- a/dev-util/glib-utils/glib-utils-2.64.4.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.64.4.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="${PYTHON_DEPS}
! gobject/glib-genmarshal || die
+ sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
+ sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
+ do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
+ do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
+ do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
+}
+
+src_install() {
+ python_fix_shebang gobject/glib-genmarshal
+ python_fix_shebang gobject/glib-mkenums
+ python_fix_shebang glib/gtester-report
+ exeinto /usr/bin
+ doexe gobject/glib-genmarshal
+ doexe gobject/glib-mkenums
+ doexe glib/gtester-report
+ doman docs/reference/gobject/glib-genmarshal.1
+ doman docs/reference/gobject/glib-mkenums.1
+ doman docs/reference/glib/gtester-report.1
+}
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index 1a310c027167..71aaaa04433f 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -3,5 +3,5 @@ AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f348
AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
EBUILD gtk-doc-1.32-r1.ebuild 2340 BLAKE2B bd2c6091b9237fe011e29429bf7a515d3e9149667fd8e553319d04da49f0a8983dac1a3aebf0f5aa7df589e03398f1dcbb816fc3381cd10cf2f8da328e4afbd3 SHA512 e70e382d6f2f73de8a9205055f9766b1b18318c4707044c595f6ea8b4f75a53afe0f09c7cf5774a8820ec234f9b31196b2d1a2fa18be6cf6112cb35ea05f8368
-EBUILD gtk-doc-1.32-r2.ebuild 2558 BLAKE2B b67ef7223cb98158175cc6978392b0b10407d2a4e006bd9e6ab030326c08e8428affd99b6e1fe21d7f11d70d01c65e69bcfac55585deeb6c180f663b47de91c0 SHA512 69b163b6ae3d4e10471fb5478b882dea6ee7c74a4f0c9cf4b52ffdbd9113fbc57bcbd5f4ad462a09919a60453d9c751532cf397cd70d1c2e84effbf039005a14
+EBUILD gtk-doc-1.32-r2.ebuild 2557 BLAKE2B bcbe0aab1994af6361449636ac7a1736d609e7bcc7e201340d710ecdcbcab2737040bcc9ef5a10319b1840d30fc2392d7258628de32135d55ea789e9ae325516 SHA512 c7a13bcc30b4fb31bbd484446be1a2933cdc4138b37db9a20a0cbf5ea37123df746607431fc89f6169c28d4a6819a36a017648980479116da0301c5558f22e2c
MISC metadata.xml 490 BLAKE2B 9b4d27b146f567501af858fd704d7713e8eea66caac0b5878d685814b48825f4222a6286acd3a8ec4d8e698ace318c52c74e301dc8eb3eec41bca3d83d24a130 SHA512 0d33e970b5924c264711c8a77aa966ff8f1e6cd2695d34088c0f9af825cd72603173e07e39fb6d6bd22098d76c048b3dc03dd83916b092f2c68c58f94aa95b7a
diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
index 3106ef55ea25..a434b00475f0 100644
--- a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
LICENSE="GPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="debug doc emacs"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index b70d891202e6..08d19c436c34 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -3,8 +3,10 @@ AUX 0.54.2-prefix-dont-strip-rpath.patch 1118 BLAKE2B c28bbb0293c2d15a493bd09c90
DIST meson-0.54.2.tar.gz 1691270 BLAKE2B c1ba552b5d56e0b6b73de46ec6bc90fb520665688d2f5c809baf84749d3bb1dec1fe0131136e1539369fa666ae2427c8fccd5928cbda0b8e3e1edb4a5dc8abbc SHA512 ad5ec826879d3d85088ca40d768599a4c8e66983f2a6a7ebe8ab12051cad18b4ade9a2afd30fe543b0a75900822992c8ef7161d369489e2211dd7a1a8ccc32ed
DIST meson-0.54.3.tar.gz 1690919 BLAKE2B 5d71731fb33397f470e2440d4d45f828d28d56351843a35b575f8b386f0b1c90faf654289e22ba7c2c4bf6c3be72d3dc8a2257d4a688bcbf9a1f2522394e7728 SHA512 2e62bf992bf337ae5a01f7a0fb842ea0cefcdbc81f5675235e41d8182f37df2e003b0a8a90d650c6cca4ff79898f7888474f75e5103a48d7ca14f51a024e4f2b
DIST meson-0.55.0.tar.gz 1742882 BLAKE2B 5ca2c6a881a9db72532849e66a52315273033188531a446ae3571faa37d6f698562e1dbd91770156c0c959e06cc7ba62a9ff274cf0d1745e3849435418755723 SHA512 bf2a5bab19deb433e363bf569527dbd1a9e8c0f77482aa077abbaa480dadc396e43148957473a31ecd9d3965578d2f7b7dc8808839c619ae2c0d419aed72d4e2
+DIST meson-0.55.1.tar.gz 1740517 BLAKE2B faec7973d00e13d82268f04b4dd28888d5196df72db1a63c388d23e03195fe18f54207a7f62dd920f53b6001e08e036950db391656d7074ef90df76b93bcfee3 SHA512 172b4de8c7474d709f172431b89bf2b2b1c2c38bc842039cccf6be075a45bd3509a1dab8512bc5b2ee025d65d8050d2f717dd15c1f9be17fca3b2e7da0d3e889
EBUILD meson-0.54.2.ebuild 2338 BLAKE2B f2cfb920c655509b00c6c5639fc772a049ea37e1f362e8ec84bef7d5920cb4b4be7e9048d02d38597ab8b0f60afecf589b6f290828f2f456bd237379f4a21067 SHA512 193e2c013adc68da916b0cc57650131757adc2e33c5d91e3db689e6af4ccb386d0c1f669f2a2f402bc062a3adb990baacbfc36560c5185205bdb54ae8956e783
EBUILD meson-0.54.3.ebuild 2414 BLAKE2B ce24de29fc68944d3c79a51dd553fc0120c2534b845765d459393c963072f426fa289fadbd506daf611002e7ae8d28c43006c18afb183fcb0edd5149d1f8f6dd SHA512 bba9b7e7f5b4761bfb1498e0fc85deeebd30b914a4c494675d2ac4e50bddedf2068df46a3276037c6bcf036fdf152f42fb104cb71a3ab7a60128991d00846d69
EBUILD meson-0.55.0.ebuild 2286 BLAKE2B 278d16f6f840de9f634f4c8b74b71fb67916b2f89513454c038969a277437bb2db84653345facd71bceefbc70c05a85c526a905646bd9fb88019108e8c5ffbc4 SHA512 fb6207e6e33c2630d29b13fcd044ea2c86843c0802867c0e8c7313e8c2f6c5b8e1464b8409374ff75b0011fa14dc61c325c451efa468399da9d2b6691b8fb58b
+EBUILD meson-0.55.1.ebuild 2286 BLAKE2B 278d16f6f840de9f634f4c8b74b71fb67916b2f89513454c038969a277437bb2db84653345facd71bceefbc70c05a85c526a905646bd9fb88019108e8c5ffbc4 SHA512 fb6207e6e33c2630d29b13fcd044ea2c86843c0802867c0e8c7313e8c2f6c5b8e1464b8409374ff75b0011fa14dc61c325c451efa468399da9d2b6691b8fb58b
EBUILD meson-9999.ebuild 2286 BLAKE2B 278d16f6f840de9f634f4c8b74b71fb67916b2f89513454c038969a277437bb2db84653345facd71bceefbc70c05a85c526a905646bd9fb88019108e8c5ffbc4 SHA512 fb6207e6e33c2630d29b13fcd044ea2c86843c0802867c0e8c7313e8c2f6c5b8e1464b8409374ff75b0011fa14dc61c325c451efa468399da9d2b6691b8fb58b
MISC metadata.xml 423 BLAKE2B d1d1b815b9d2fabe5aaa28b469272420bc1eb0c070de7431ec0d7bc7202b00ca216e6a347e0ebda22fd079d9f0514734c0e0e345788a7e00c8f1ad594259b4a8 SHA512 5c03d82f2fd8009680d4d98c3f62c10dfddb2d66d03e8f9d9ad8e417d0359e43f77ecca067735b31b63ceb778fdcc508196e99d793990286234ff21892e4dab4
diff --git a/dev-util/meson/meson-0.55.1.ebuild b/dev-util/meson/meson-0.55.1.ebuild
new file mode 100644
index 000000000000..38ccf9179e21
--- /dev/null
+++ b/dev-util/meson/meson-0.55.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2016-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ test? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ dev-util/ninja
+ dev-vcs/git
+ sys-libs/zlib[static-libs(+)]
+ virtual/pkgconfig
+ )
+"
+
+python_prepare_all() {
+ local disable_unittests=(
+ # ASAN and sandbox both want control over LD_PRELOAD
+ # https://bugs.gentoo.org/673016
+ -e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+ # ASAN is unsupported on some targets
+ # https://bugs.gentoo.org/692822
+ -e 's/test_pch_with_address_sanitizer/_&/'
+
+ # https://github.com/mesonbuild/meson/issues/7203
+ -e 's/test_templates/_&/'
+
+ # Broken due to python2 wrapper
+ -e 's/test_python_module/_&/'
+ )
+
+ sed -i "${disable_unittests[@]}" run_unittests.py || die
+
+ # Broken due to python2 script created by python_wrapper_setup
+ rm -r "test cases/frameworks/1 boost" || die
+
+ distutils-r1_python_prepare_all
+}
+
+src_test() {
+ tc-export PKG_CONFIG
+ if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+ ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+ else
+ # https://bugs.gentoo.org/687792
+ unset PKG_CONFIG
+ distutils-r1_src_test
+ fi
+}
+
+python_test() {
+ (
+ # test_meson_installed
+ unset PYTHONDONTWRITEBYTECODE
+
+ # test_cross_file_system_paths
+ unset XDG_DATA_HOME
+
+ ${EPYTHON} -u run_tests.py
+ ) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ insinto /usr/share/vim/vimfiles
+ doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+ insinto /usr/share/zsh/site-functions
+ doins data/shell-completions/zsh/_meson
+}
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index bd7d6d456336..928caf16da55 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -1,3 +1,5 @@
DIST patchelf-0.10.tar.bz2 158604 BLAKE2B 6aed9c2e7f37ff0330ca517a9491c46a93212140367b720bf94da4e4ec29a4978c920b53ce306ec333b3f7ac0216ff59637048c6997cfea4a34a87f2a0448796 SHA512 647ad13b7d45b3c5d20683ef8fe9760cb7f213e879231b6c5780bf32771adfbf7c5e5ce694c08e5681dceda63857d7d8a2d53efb60f799d3e7290cebc02ab501
+DIST patchelf-0.11.tar.bz2 159046 BLAKE2B 48d8dd986c681facd8d925d8f471ed6b4cae6a06472d66c1c22a32ded796f50be8d30cefc2847890558c2799707c33beb64ffc5d09f6d142120363bea5e40456 SHA512 ad3a99db6952412a2dac27256640cb9152b8bf5d189f1685b7478b9773bb612e06621511fc7338b2defc435bcdc26f67f79c2d830570a6da70f9d280b123d977
EBUILD patchelf-0.10.ebuild 614 BLAKE2B f8746020ed527d88057d36d819def0266112d58f56f0ac1f7d66b529aa4cabbc17041ea6659cd46a53c6f941920540481d6d4ee4e81973d82fcbf3b24ddefb8e SHA512 9cc306c95e5b5cc72ec93645c829c10df6263d7929b26274c02cd1fda973812dfef85b1ba8f0437a6318a57573f1eabfaf10b318a44a7b40a46eac0fdb38eeb6
+EBUILD patchelf-0.11.ebuild 657 BLAKE2B 805020e7cbd692b91b3db4632a30dab086701bcaffe733ec0f1701c4a9c490188ccf41f3531e7fcffcbe11e317d52fd69137933fd6636e89357a9dd7d0ffa184 SHA512 ea4ddebad53558f5bf31905f55fe2d6147182e673059caf584358731780b3d2db87aa8866a2ab655da8b5dc3efd25f1881e7a8ea9035e05095e43c0849c6e118
MISC metadata.xml 220 BLAKE2B 65b0d9db11c166b2887e1a22962830e288eb917a7f15d0ffcecb3c86a1845491cbcbf4ebc7e661ac7041443a8144b218123b4db7a962191a9e9f894ac086a4ed SHA512 512eee7a953300d5e721b64bade8be9bd1b62984e543552b58a7a72b42cb90973c8c6d557ecfe08c2355cab45f640c88dcd31ab8d116815bc01680a65c7a132c
diff --git a/dev-util/patchelf/patchelf-0.11.ebuild b/dev-util/patchelf/patchelf-0.11.ebuild
new file mode 100644
index 000000000000..ec5c769e0af3
--- /dev/null
+++ b/dev-util/patchelf/patchelf-0.11.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables"
+HOMEPAGE="https://nixos.org/patchelf.html"
+SRC_URI="https://nixos.org/releases/${PN}/${P}/${P}.tar.bz2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-3"
+
+S="${WORKDIR}/${P}.20200609.d6b2a72"
+
+src_prepare() {
+ default
+ rm src/elf.h || die
+
+ sed -i \
+ -e 's:-Werror::g' \
+ configure.ac || die
+
+ eautoreconf
+}
+
+src_test() {
+ emake check \
+ CFLAGS+=" -no-pie" \
+ CXXFLAGS+=" -no-pie"
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 419c7706b854..80dd6b229723 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index c39f414efcd5..0df78ff1a3c4 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1,9 +1,7 @@
-DIST repo-1.26 29829 BLAKE2B c5dc74214d404e6c11189a3d34c9a771ed5689da14e64588b5db144b6ea3ec38a727238d7dc6e609a22edb5b84d350210564615016f6b36599cf9e3fc3b34ef9 SHA512 1398fab95b4fb4a24fda93d4054384a801b5b70e3dca3a794f458d8e19582ef833ef5a3a0f3a571121d2d9172ce0e70f8b3c6719f6c2f47643ffe6de181e34b4
DIST repo-1.27 29945 BLAKE2B 930fa876b8889d64c8d12444f4cd59bebbdf9848d455e114fc9306922d931aa721320db65a07c38f705c39950538a1d5ae5ca66e359d2f2e38061d144ac11cb2 SHA512 a9f651e5fd1da1c74b31aebf32d03cf868183fa529eaf2b079015f9e778a2bb7c1ef49e06564703534c45fa1bd7bc5bd3d91a91477c336e549c1208afa74ace6
-DIST repo-2.4 35152 BLAKE2B a069c095524574ee4a7d18cc5cd023f6d71b9ed9b57941180a6ec3ab3c33b2ed18b5dfc7d225a7bc849b7ebfd28bc0e672f7796eb2bb37af0685539c850cfe34 SHA512 46d7b8f699246ad625d5eb714791c29b949c40793343ba56681554040dc1d6a0a5f049e8d96f1e12ca93d77291e95ffd756f76554ebc1062f9cf6fc014aa116a
DIST repo-2.5 38761 BLAKE2B 26d002bb7e5a24dc958bb4e0653c2cc260b2766d81fd55edf9a0373542365ed89a224805293383e2c16d8fc331038b265d3b2aca3a9a637d893f4a9c8221ce76 SHA512 36e515241fd9705c63beaf662309dc2ab6406552ba845fe020c878ac82e7eb7e1cd73924a076cf5fe4800ea70919bb5ad5d2d43566d5b0a559f81a45f9a58fe8
-EBUILD repo-1.26.ebuild 833 BLAKE2B d72c019f5e48b45f1129b6947f1823cd750d3fcc693efcbaf4ad7be2dfe41f36fdd1fb9fdbe9893b13dc6b7e8ffcbfa82c3747689f3b5ec5ac960777fe1cf2ba SHA512 5ab0f30d198d4e6225f576a348f12eef8f1485272223052311795f214d80a95db1d5f4fafebb22ef53cf8e0d775ed4703d43d8c3c30a28bff35e9979590ce640
+DIST repo-2.8 39134 BLAKE2B af52a2c06e09de83100cb297d585f89bcbe85d6e9e5c358024a371ee4d47c59992745d1088b164fc670cdd9db7394a5f3521967e3eb80840c53993af8b0172b1 SHA512 6d577fce34eb298035a7b98c24fc21521c8c9efbdf02abc37af8a54552893ecf8cdce2db5efbc5398d7f99226408f6cc9ce2f81c2961d9d5dd21fb0264194431
EBUILD repo-1.27.ebuild 823 BLAKE2B 159755dc5fdb25fae05fa1026c3f19ccd4b93a412d6b425a541a4c6f794c7f5922d6ead911177f55ea8e298555b82447668f7439724a12647dabeeb2e8794ea8 SHA512 638ae406a07fae698242a91e4d2aad5fc723fa2236a90c914e30064f018abe4f06a4be832c88148e49eb256c6d73f6a9c961696720afbff92a09f919c37aeb1b
-EBUILD repo-2.4.ebuild 853 BLAKE2B 5123c3b627a65cf07ab9586308676a9c3edb1b5037525d6b2af702203b4223676ebf5a018239d6655aae90c2daef1358995a490b37a0c67bda6e66c000907ae0 SHA512 b5862ce4158e106a6a21138371b5471f6f70bc5844b074de0f1334daf3183238df0d81784afc448c403cdbb027ce240948c0743d9e39a2c19f053112bf578883
-EBUILD repo-2.5.ebuild 859 BLAKE2B 71c1c64a6ea18200b81a0cdd1877179f7cb5427b2e865b562a054f667782bbfd62dec4f054716693269902fb3162c9d4f9b2ad28447c4dfeb36084131432844c SHA512 a7d0f642a33d0c19d8e44ab77ab74cf9d4f913c33ce21422f08e3818ff1543dcee5c7d507063f8f9f53d1d84c865573d3e0c383ffb0f11303d4f2a0b45fe5d00
+EBUILD repo-2.5.ebuild 853 BLAKE2B 5123c3b627a65cf07ab9586308676a9c3edb1b5037525d6b2af702203b4223676ebf5a018239d6655aae90c2daef1358995a490b37a0c67bda6e66c000907ae0 SHA512 b5862ce4158e106a6a21138371b5471f6f70bc5844b074de0f1334daf3183238df0d81784afc448c403cdbb027ce240948c0743d9e39a2c19f053112bf578883
+EBUILD repo-2.8.ebuild 859 BLAKE2B fe8ad85ef67acc2ecfa5ab5a4f84ce25d5b71efda9dd5ebf5d1888e0adb0074ccb5fc5cf374e4adfcd3cd1349bb74fea53f8aeaad087f315f98004720b56b0c4 SHA512 8c12b6b3350b182241dd8b82890a3966dd99938aa344f0df3833df41ec532d09812f0f4b6dddbabcc26abb32cf567b1206a1c0ae74efa288b92e3afdeaefcb86
MISC metadata.xml 338 BLAKE2B 49e4b3e3767754bb7a0661cb388f3e18b372fa713d0e3b92c742cddb2fe21e384b1689fd72b23865d7b363ab01bae90a5a11956593eccc915f1b6c99e52c2718 SHA512 0a83263d882281636f6925d20c9e8b991267a1b7d73d7bd6e545c77372424fd602e28d6c9a82668d0a73500bcb8dd8287f7891b66e3fe1517907001f3fb43cd4
diff --git a/dev-vcs/repo/repo-1.26.ebuild b/dev-vcs/repo/repo-1.26.ebuild
deleted file mode 100644
index 01c4dd2015d8..000000000000
--- a/dev-vcs/repo/repo-1.26.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NB: The $PV tracks the *repo launcher version*, not the last signed release
-# of the repo project. They are confusingly different currently.
-
-EAPI="7"
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit python-r1
-
-DESCRIPTION="Google tool for managing git, particularly multiple repos"
-HOMEPAGE="https://gerrit.googlesource.com/git-repo"
-SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- !app-admin/radmind
- !dev-util/repo"
-
-S=${WORKDIR}
-
-src_install() {
- python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
-}
diff --git a/dev-vcs/repo/repo-2.5.ebuild b/dev-vcs/repo/repo-2.5.ebuild
index 5664a3767c19..a2713bffea7f 100644
--- a/dev-vcs/repo/repo-2.5.ebuild
+++ b/dev-vcs/repo/repo-2.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-vcs/repo/repo-2.4.ebuild b/dev-vcs/repo/repo-2.8.ebuild
similarity index 84%
rename from dev-vcs/repo/repo-2.4.ebuild
rename to dev-vcs/repo/repo-2.8.ebuild
index a2713bffea7f..544acae9a81b 100644
--- a/dev-vcs/repo/repo-2.4.ebuild
+++ b/dev-vcs/repo/repo-2.8.ebuild
@@ -7,7 +7,7 @@
EAPI="7"
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..9} )
inherit python-r1
@@ -17,7 +17,7 @@ SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index e0180be1a22d..c966e52655cb 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/mate.eclass b/eclass/mate.eclass
index db511aedb1f1..27875574ac51 100644
--- a/eclass/mate.eclass
+++ b/eclass/mate.eclass
@@ -29,7 +29,8 @@ esac
# - "yes": will run prune_libtool_files --modules
# - If it is not set, it will run prune_libtool_files
# MATE_LA_PUNT is a stub to GNOME2_LA_PUNT
-GNOME2_LA_PUNT=${MATE_LA_PUNT:-""}
+MATE_LA_PUNT=${MATE_LA_PUNT:-""}
+GNOME2_LA_PUNT="${MATE_LA_PUNT}"
inherit gnome2 autotools mate-desktop.org
@@ -115,7 +116,17 @@ mate_src_prepare() {
# MATE specific configure handling
# Stub to gnome2_src_configure()
mate_src_configure() {
- gnome2_src_configure "$@"
+
+ local mateconf=()
+
+ # Pass --disable-static whenever possible
+ if ! use_if_iuse static-libs; then
+ if grep -q "enable-static" "${ECONF_SOURCE:-.}"/configure; then
+ mateconf+=( --disable-static )
+ fi
+ fi
+
+ gnome2_src_configure "${mateconf[@]} $@"
}
# @FUNCTION: mate_src_install
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 7a4364af4e6b..db02ee6be509 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1785,11 +1785,6 @@ toolchain_src_install() {
# prune empty dirs left behind
find "${ED}" -depth -type d -delete 2>/dev/null
- if ! is_crosscompile && [[ ${PN} != "kgcc64" ]] ; then
- exeinto "${DATAPATH#${EPREFIX}}"
- doexe "${FILESDIR}"/c{89,99} || die
- fi
-
# libstdc++.la: Delete as it doesn't add anything useful: g++ itself
# handles linkage correctly in the dynamic & static case. It also just
# causes us pain: any C++ progs/libs linking with libtool will gain a
@@ -2096,11 +2091,6 @@ toolchain_pkg_postinst() {
rm -f "${EROOT%/}"/sbin/fix_libtool_files.sh
rm -f "${EROOT%/}"/usr/sbin/fix_libtool_files.sh
rm -f "${EROOT%/}"/usr/share/gcc-data/fixlafiles.awk
-
- mkdir -p "${EROOT%/}"/usr/bin
- # Since these aren't critical files and portage sucks with
- # handling of binpkgs, don't require these to be found
- cp "${ROOT%/}${DATAPATH}"/c{89,99} "${EROOT%/}"/usr/bin/ 2>/dev/null
fi
}
@@ -2110,11 +2100,6 @@ toolchain_pkg_postrm() {
eselect compiler-shadow clean all
fi
- # to make our lives easier (and saner), we do the fix_libtool stuff here.
- # rather than checking SLOT's and trying in upgrade paths, we just see if
- # the common libstdc++.la exists in the ${LIBPATH} of the gcc that we are
- # unmerging. if it does, that means this was a simple re-emerge.
-
# clean up the cruft left behind by cross-compilers
if is_crosscompile ; then
if [[ -z $(ls "${EROOT%/}"/etc/env.d/gcc/${CTARGET}* 2>/dev/null) ]] ; then
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index cb33c69c262c..d05b68eccdce 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/dosbox-staging/Manifest b/games-emulation/dosbox-staging/Manifest
index 8a709520b6e9..77bed137ea07 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,3 +1,3 @@
DIST dosbox-staging-0.75.0.tar.gz 1805354 BLAKE2B e376006a2c3890d98efdaa8041634bfca8b95f6c6471f36f8fdd53e319aad8d37f20bd195a20264bade1e6974327f1f888dec6050da493fc8a6e6bb6c5739150 SHA512 2e049ed44928ad4adeaca73d328cf8f415bcb8c1a399306b1e8a5fd2b7cd7c3d3fe10017b47e5d2f3e54c34042ee901b98486f5b47a3d2eaf43f4e13891f8b70
-EBUILD dosbox-staging-0.75.0.ebuild 1049 BLAKE2B c9c3e22d38d50438b48b4d44dcbf1899827972c9fc8c09ea0464117c53edb4c4c7922f1ce18c058128f1cb48055d3dd52dfcb718c7f5bca2b014b058e9c14c3e SHA512 e3763ad4c8f64d773635019df560d80ec64b86447e6b171db17ac357ea6432e7cdc5cd62beecf159d5ef30b27ea7bf4485a40218f2ed2c4b957b71bbc5065be6
+EBUILD dosbox-staging-0.75.0.ebuild 1049 BLAKE2B 177b6ea5ff84054f8c1d8fff96c9285dcd568eb16cc3dac46e4300640cd2e95813a3cae882096dbf1d0c389cfc2245265dc1d13105a6f13aed71fb98ab40c3f1 SHA512 89b941f8bb32a7a6143f6d73ed5237c17bd6329aa0db52b8aed2f7cc4ee61bd2e372eb6ad09ae6aaf1ac9d382eed0d4ae7030e7a45fc82aec2e68cbaa6f21eb9
MISC metadata.xml 550 BLAKE2B 6a9d71dc50af11effc4ddbc97225c70cf7e26ad8268151a22c42f243db366fd06a5c5d7698e4cd2cd7158613dfb9effa765afbee1eb2bbd727bc673a644a6ddd SHA512 df7863f358c9830a70ef57112255c49a8e70393c2b98e268ff727c500a16bfe68981285d2554ca2437bee187af36a8b395758fde9b74a09e49a6cf3c050fdefa
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild
index fb71bdee846b..45521a91d417 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild
@@ -16,7 +16,7 @@ IUSE="alsa debug dynrec opengl opus"
RDEPEND="alsa? ( media-libs/alsa-lib )
debug? ( sys-libs/ncurses:0= )
opengl? ( virtual/opengl )
- opus? ( media-libs/opus )
+ opus? ( media-libs/opusfile )
media-libs/libpng:0=
media-libs/libsdl2[joystick,opengl?,video,X]
media-libs/sdl-net
@@ -43,5 +43,5 @@ src_configure() {
src_install() {
default
doicon contrib/icons/${PN}.svg
- make_desktop_entry dosbox DOSBox-staging ${PN}.svg
+ make_desktop_entry dosbox DOSBox-staging ${PN}
}
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index dbb16074636e..87fe6e12098a 100644
Binary files a/games-simulation/Manifest.gz and b/games-simulation/Manifest.gz differ
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 49ef9a8bbc74..52794929788c 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,13 +1,16 @@
AUX README.gentoo 715 BLAKE2B c7e27f799a33a73dccd75bf2f28882bda609b3ba74fc98ca1b1fcdcbb91290a81a878d10fa1b9b15f0ebebe9ef496a7ac7b8fdfd3a455ca3ebad3dd3df908035 SHA512 c18d5b5950523e2abedd0f9218e71c1f7222615d34eb56c24c69f7dea446e17248086525603d1da63302db6e8c5b642086eb8b154fd531c26db611b9f799d4d8
AUX openrct2-0.2.4-include-additional-paths.patch 1583 BLAKE2B b21e59cfaa37b211501846e2afb14d9d6617c713e487ffd3ef079c8f75b3113252fbc401da25b53ff6498f01b66bd4e9c1b30c51483b4c32c4ae1b338885966c SHA512 945f00ea986ebcfcaa536a5abf1cab608c96fa211bb839e9d577e969b842eb757307b501740c6015623eb10604f7aa6f7e5c736669cbc46676abe1434296e8ae
+AUX openrct2-0.2.6-gtest-1.10.patch 740 BLAKE2B b974fbf84765776018e13700f3c9151fa7613ed4aef76257b3d8d47bdc48d4e13314115ed5eb9e713a09213ca5c43906f13ce7929ef6795a5ab53a0c75000e3b SHA512 0d955664b28e68e39134438034c0559ee56a98fa7cd16dc5b90a1290f59defe700f4653ad053b4ca403f13f35cb822c0b063a0ff3777996c6049cd686a9a724f
AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b
AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409
DIST openrct2-0.2.6.tar.gz 11094308 BLAKE2B 4aed899fee4735a0237558c1c34f67f37ecc9b8138f8a66314a9abc013cf10ad3a9f80fd5159afc5860ded780d4c705fd9e394b38f981aac90c8cee883356996 SHA512 abe7c344b7588b169c95ffe0ab9028f72614d9b5783d81fa4f97f206d90d8cbaa0b91f04314c10926dbd5f68bba166558c428557f598abb343d306800611fb24
+DIST openrct2-0.3.0.tar.gz 11754657 BLAKE2B 66d956fd85829bc6b4825a59db9f3a3eebbb1e4565a4c8afdb8c05d9d7b3f339f75ff1d9fbc0a0f48d3c0673ac3fc335fb6bec5fe458513de2a0611ccfa3d48d SHA512 585bcd7a077114dc5332b95cb44f7c689e47fcbd7cff7c2ab32a24253a4fd87f50e79f40f9428c79ea6bc6d8cd88019b4edfce88509c03bc2d43854926d21317
DIST openrct2-objects-1.0.14.zip 2237331 BLAKE2B 39a0c92674abc0d16fc3dd463b68e2ee8f3f7dd1c2a944d5448173ca58e6c3c4a79092a40e66ac8e919f75be2d2d691a76dc046e41caf7237138815a4e6ad526 SHA512 66e7a55ca894f2ea11af1c6300f934ef00f659137dded06f54bf749f490ff6063f95da800ae3cbfbbffe1c3e7d995e307d1281d57e4454ded6fed5affde84f8e
DIST openrct2-objects-1.0.16.zip 3056214 BLAKE2B 7d8d938ba20ce612f7845dce1038134ec60d7e17e0f7d78a67480ae1ae2e6f8dd043f266742acd2dbd8539390349a2dcd7b8c73859a3caef3b5cd8565a4ec1c7 SHA512 2a8696467320f7894330d0fbb4894dd6effb2d6844fcf643e1f8e15a7b0b45411a7c205b75a9e9d7ea0627bc70b7a7e1e2213e0f7db1c7b489ae8b485670dba5
DIST openrct2-replays-0.0.17.zip 1825315 BLAKE2B 9c22b52302c37abe5e802662eb4b6805fa3e229a71ab9f901b57eee30641ae4b86de9b1315476d158a3feb57c6be2a26c1ccca7c94328fe35bf57b46e2364c32 SHA512 103a8ba5b5b2dd76c18b642720d262553bb15ad26d59892f895327bf5e87b73e476b255af6556286faacb668aae49aa1ee29a14bcca2bb75d855383d12e60f4a
DIST openrct2-replays-0.0.9.zip 1817119 BLAKE2B 3c63a0acf991487e667ae43ac987b8ee936ce77ad4eb75209d09e41f85b72550856c84d93bdbee1541a994ffbf9bc956b5366d77d760ebd7ed1dab0dffbf7885 SHA512 8066a664c12df047e64b9a049e39da6a4e366adfc60824a7a6c33e526c3a5a9afbc05d1dd11ff81eddbec0783445275d2be8cbe8141031fbeaefe8ea95cd1a7b
DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
-EBUILD openrct2-0.2.6.ebuild 3764 BLAKE2B 05936ea2cfee42f825cedd7fcd2fcbaf81f66936a2b45ffafc568993859b50890abaa37db4359e1821c3ef11b01c9a7561c064bf95aa2db1e668ac725c56ba47 SHA512 ecf709870dfa47138b927c68313b4572f250f771f3547d46afb64cf59b80568c6f72862431194c3aaae240158545b178c4eb96a86af473a1f611c8411b81ef8d
-EBUILD openrct2-9999.ebuild 3715 BLAKE2B e68e6103bbab1b6a2b866ab6ba4e7cb66798c196012d949b670ae7fe6ca958c006f6713b8329417d93f0ad9c3fce5ace9b863fc454b0fa237c9cb4960cabec58 SHA512 407bd346216dd5f35d6bcab4b2613588ad150aa6ac91edce6105daddbc5df272a21ed7141428c24d0e5050448daa97b2c4d7185cb5f4028b785cd9798772cc4e
-MISC metadata.xml 1235 BLAKE2B f2e799e2f41467a48bade824354c51b15743dc64931ca4626aa603c3243c07d0e07818bb48af9d2be8aa285f0d9f29108a5055ce59935a4da0e3d32ad7a9fd06 SHA512 513647150ed4c7bdc32278ba90ed75f758a762d6cddabecede66e0048dad623f8da8c6708e6f6a6105e8721f4b9eb5ed20ec6c8e8db41b54ef2bb26613d7a4cf
+EBUILD openrct2-0.2.6.ebuild 3808 BLAKE2B 0e6f14d6e194d58d0247218158492ac5e4694c5c13187706845ed04ccd6bb2f02a7937463ddeba8c68561a5faf0d6936b722e92860a0081654a40e104fa30e87 SHA512 69c87253337dea795269486d7be95ba364508d3f7bebb915ac7193e894e567218f4c2163f73a1ea441d2cd7110e44caf1fc2e828649d1f4128c812942e6a56d2
+EBUILD openrct2-0.3.0.ebuild 3939 BLAKE2B 26751a126f2751c87bf34053d24cccb1a5a7f4ae7d410a97d9bd25a8b5f09cfb8e46fbe1f9acf8688532a4385c529819969a2c691cf547ba1443da6fc68622fa SHA512 9b06f0883fed8c6dce15292666c5645ff3b43e75c912ee7f00f1eed64c97dc43c6bb0813bb5e3f146e79f0eeea8a40237e29b8f046b69730063f55b139bd6173
+EBUILD openrct2-9999.ebuild 3899 BLAKE2B 227af822417f2961bda6e7eca0b2b90e3344b5addefc9e4245262c72fd322ae558b6f0d1ef8f3d6e1df7f6d810a250f4e9056cea9a7aecfeccb9079253942c71 SHA512 f9776de8b7c109549869a51e953d0d20bd1cc01746ec1047c7b0d4eaeeeefe8cf78669fa3f4b5214089b2a72867e9cd7e440ef487222fa68f6c9282d34a8d1d9
+MISC metadata.xml 1351 BLAKE2B 6ca9cf2f5109ad0af23bed39cfedcd77901a342ed4c5e85c79609f80a85792d8f203cabf96ceee46ba7aea47fad4c4713b38cd3712a2c2b820df3aca29ebf406 SHA512 5f0492cc2b92e4593398175db7d3604e2edaadfac95f8759341fbcd9b893025c18cd7666f9fe5c32d7c28900c1ee604858cd8d23a5863986fec853e23d47bc02
diff --git a/games-simulation/openrct2/files/openrct2-0.2.6-gtest-1.10.patch b/games-simulation/openrct2/files/openrct2-0.2.6-gtest-1.10.patch
new file mode 100644
index 000000000000..f0805f408552
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.2.6-gtest-1.10.patch
@@ -0,0 +1,20 @@
+From 8feab6138724722146b1c6d521431556686068d3 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki
+Date: Wed, 19 Aug 2020 22:56:51 +0200
+Subject: [PATCH] ReplayTests: Add support for >=gtest-1.10
+
+Signed-off-by: Conrad Kostecki
+---
+ test/tests/ReplayTests.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/tests/ReplayTests.cpp b/test/tests/ReplayTests.cpp
+index 653aa97657f..1443d1c862d 100644
+--- a/test/tests/ReplayTests.cpp
++++ b/test/tests/ReplayTests.cpp
+@@ -117,4 +117,5 @@ struct PrintReplayParameter
+ }
+ };
+
++GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ReplayTests);
+ INSTANTIATE_TEST_CASE_P(Replay, ReplayTests, testing::ValuesIn(GetReplayFiles()), PrintReplayParameter());
diff --git a/games-simulation/openrct2/metadata.xml b/games-simulation/openrct2/metadata.xml
index 4e87269e0d52..533b34deeec8 100644
--- a/games-simulation/openrct2/metadata.xml
+++ b/games-simulation/openrct2/metadata.xml
@@ -16,6 +16,7 @@
diff --git a/games-simulation/openrct2/openrct2-0.2.6.ebuild b/games-simulation/openrct2/openrct2-0.2.6.ebuild
index 6a7f824c16d3..856708edc6e4 100644
--- a/games-simulation/openrct2/openrct2-0.2.6.ebuild
+++ b/games-simulation/openrct2/openrct2-0.2.6.ebuild
@@ -73,6 +73,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
PATCHES=(
"${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
+ "${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
)
src_unpack() {
diff --git a/games-simulation/openrct2/openrct2-0.3.0.ebuild b/games-simulation/openrct2/openrct2-0.3.0.ebuild
new file mode 100644
index 000000000000..24c511c6a59b
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-0.3.0.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake readme.gentoo-r1 xdg-utils
+
+MY_PN="OpenRCT2"
+MY_PN_OBJ="objects"
+MY_PN_RPL="replays"
+MY_PN_TS="title-sequences"
+MY_PV_OBJ="1.0.16"
+MY_PV_RPL="0.0.17"
+MY_PV_TS="0.1.2c"
+
+DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
+HOMEPAGE="https://openrct2.org/"
+SRC_URI="
+ https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/${MY_PN}/${MY_PN_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.zip
+ https://github.com/${MY_PN}/${MY_PN_TS}/releases/download/v${MY_PV_TS}/${MY_PN_TS}.zip -> ${PN}-${MY_PN_TS}-${MY_PV_TS}.zip
+ test? ( https://github.com/${MY_PN}/${MY_PN_RPL}/releases/download/v${MY_PV_RPL}/${MY_PN_RPL}.zip -> ${PN}-${MY_PN_RPL}-${MY_PV_RPL}.zip )
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="dedicated libressl +lightfx +opengl scripting test +truetype"
+
+COMMON_DEPEND="
+ dev-libs/icu:=
+ dev-libs/jansson
+ dev-libs/libzip:=
+ media-libs/libpng:0=
+ net-misc/curl[ssl]
+ sys-libs/zlib
+ !dedicated? (
+ media-libs/libsdl2
+ media-libs/speexdsp
+ opengl? ( virtual/opengl )
+ )
+ libressl? ( dev-libs/libressl:0= )
+ !libressl? ( dev-libs/openssl:0= )
+ scripting? ( dev-lang/duktape )
+ truetype? (
+ media-libs/fontconfig:1.0
+ media-libs/freetype:2
+ )
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ dedicated? (
+ acct-group/openrct2
+ acct-user/openrct2
+ )
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ test? ( dev-cpp/gtest )
+"
+
+BDEPEND="
+ app-arch/unzip
+ virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
+ "${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
+)
+
+src_unpack() {
+ unpack "${P}".tar.gz
+
+ mkdir -p "${S}"/data/sequence || die
+ cd "${S}"/data/sequence || die
+ unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
+
+ mkdir -p "${S}"/data/object || die
+ cd "${S}"/data/object || die
+ unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip
+
+ if use test; then
+ mkdir -p "${S}"/testdata/replays || die
+ cd "${S}"/testdata/replays || die
+ unpack "${PN}-${MY_PN_RPL}-${MY_PV_RPL}".zip
+ fi
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Don't treat warnings as errors.
+ sed -e 's/-Werror//' -i CMakeLists.txt || die
+}
+
+src_configure() {
+ # Note: There is currently no support for Disord-RPC and Google Benchmark,
+ # as both packages do not exist in Gentoo, so support for them has been disabled.
+ local mycmakeargs=(
+ -DDISABLE_DISCORD_RPC=ON
+ -DDISABLE_GOOGLE_BENCHMARK=ON
+ -DDISABLE_GUI=$(usex dedicated)
+ -DDISABLE_HTTP=OFF
+ -DDISABLE_NETWORK=OFF
+ $(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
+ -DDISABLE_TTF=$(usex !truetype)
+ -DDOWNLOAD_OBJECTS=OFF
+ -DDOWNLOAD_REPLAYS=OFF
+ -DDOWNLOAD_TITLE_SEQUENCES=OFF
+ -DENABLE_LIGHTFX=$(usex lightfx)
+ -DENABLE_SCRIPTING=$(usex scripting)
+ -DOPENRCT2_USE_CCACHE=OFF
+ -DPORTABLE=OFF
+ -DSTATIC=OFF
+ $(usex test "-DSYSTEM_GTEST=ON" "")
+ -DWITH_TESTS=$(usex test)
+ -DUSE_MMAP=ON
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ # Since the tests need the OpenRCT2 data,
+ # we need to symlink them into the build directory,
+ # otherwise some tests will fail, as they don't find the OpenRCT2 data.
+ # It is currently not possible to override that path.
+ # See: https://github.com/OpenRCT2/OpenRCT2/issues/6473
+ ln -s "${S}"/data "${BUILD_DIR}" || die
+
+ cmake_src_test
+}
+
+src_install() {
+ use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
+
+ cmake_src_install
+
+ if use dedicated; then
+ newinitd "${FILESDIR}"/openrct2.initd openrct2
+ newconfd "${FILESDIR}"/openrct2.confd openrct2
+ fi
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+}
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index edadb7382659..f0a1d342c950 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -27,25 +27,23 @@ SRC_URI="
LICENSE="GPL-3"
SLOT="0"
KEYWORDS=""
-IUSE="dedicated libressl +lightfx +opengl test +truetype twitch"
+IUSE="dedicated libressl +lightfx +opengl scripting test +truetype"
COMMON_DEPEND="
- dev-lang/duktape
dev-libs/icu:=
dev-libs/jansson
dev-libs/libzip:=
media-libs/libpng:0=
+ net-misc/curl[ssl]
sys-libs/zlib
!dedicated? (
media-libs/libsdl2
media-libs/speexdsp
opengl? ( virtual/opengl )
- twitch? (
- net-misc/curl[ssl]
- )
)
libressl? ( dev-libs/libressl:0= )
!libressl? ( dev-libs/openssl:0= )
+ scripting? ( dev-lang/duktape )
truetype? (
media-libs/fontconfig:1.0
media-libs/freetype:2
@@ -74,13 +72,14 @@ RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
+ "${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
)
src_unpack() {
git-r3_src_unpack
- mkdir -p "${S}"/data/title || die
- cd "${S}"/data/title || die
+ mkdir -p "${S}"/data/sequence || die
+ cd "${S}"/data/sequence || die
unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
mkdir -p "${S}"/data/object || die
@@ -108,7 +107,7 @@ src_configure() {
-DDISABLE_DISCORD_RPC=ON
-DDISABLE_GOOGLE_BENCHMARK=ON
-DDISABLE_GUI=$(usex dedicated)
- -DDISABLE_HTTP_TWITCH=$(usex !twitch)
+ -DDISABLE_HTTP=OFF
-DDISABLE_NETWORK=OFF
$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
-DDISABLE_TTF=$(usex !truetype)
@@ -116,6 +115,8 @@ src_configure() {
-DDOWNLOAD_REPLAYS=OFF
-DDOWNLOAD_TITLE_SEQUENCES=OFF
-DENABLE_LIGHTFX=$(usex lightfx)
+ -DENABLE_SCRIPTING=$(usex scripting)
+ -DOPENRCT2_USE_CCACHE=OFF
-DPORTABLE=OFF
-DSTATIC=OFF
$(usex test "-DSYSTEM_GTEST=ON" "")
@@ -138,6 +139,8 @@ src_test() {
}
src_install() {
+ use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
+
cmake_src_install
if use dedicated; then
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 9dfd62a015dc..82d8164c528b 100644
Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ
diff --git a/games-util/nml/Manifest b/games-util/nml/Manifest
index 95cf881bd23f..98a063f12a66 100644
--- a/games-util/nml/Manifest
+++ b/games-util/nml/Manifest
@@ -1,6 +1,9 @@
AUX nml-0.4.4-pillow3.patch 288 BLAKE2B 5d1446821d75432002a36439c6e39fa7f644f9a63be0da178c33287893fe65637d6ce66aa55df916227636cb8e0228a08e363a0b682b02dc63823a671b50849c SHA512 cdb6113102fadbf3b3d9cab930b15cfd88d609c9bb09048a3fb247051169933a0796c10d0c29b9d6bf9320ddcf73a4681255d8e1465a7a98268029d3433ba524
AUX nml-0.4.5-pillow6.patch 981 BLAKE2B 56e1f6ed41a6978a021db50880092fed7199d104cd006962a54fb09bcba365a320cac878041b4fe6ee6a6801a2c7e666154105a4dd2b349f030b62da9669d1fe SHA512 de304562bb2ef90b9068a1975a3cb5fd83a9b5e473371f87620fe5a02866b805adba37b46c8c1b40a7a6d304d5c8339ee78ee4a87d683c540126e5fc3ea49303
AUX nml-0.4.5-pillow7.patch 1381 BLAKE2B 8099d451f7bf93fb5b996335852103751b024a47b5b24c054cf77708d6deea6002a053bf92aa245d63ea52bca710620598e6d6544739c0c01d64bf9c0f7938dd SHA512 7dd7a60391a4e316273243468c18d30b7b674c241e3c0fb2a24c3559b0dfbc7a2f3d67baf8b5cda9ec419a7dc1f2a1c0942cdd9d1beedebaeafef76111c4fd19
+AUX nml-0.4.5-python38.patch 1275 BLAKE2B 07fd6888dbc77fe9f0005b524381e35cd80ee108da84b6bcff3f610237e8a72e6c08e5ddc21690edbf5dde3bfeb4357ed013dfcd62cada98c6c8bdbb663c7957 SHA512 0946fa8ce28ed803a85e85f78dd2f25103500147c5fc90d23fcb4bf13bdbe4ff8742d2771cf896772c635ea38309d6e65ee49f98f7fb57f22addda9f7725881d
DIST nml-0.4.5.tar.gz 378578 BLAKE2B 1283cdcabd4cbaf12dda926b89c88a3942e9e4469879812abe372facd2c41ff20af0df792bbdadf71d9d3ad8d72e98e293fd903c880e77d3e4ee8a1b73e36ca9 SHA512 64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952
-EBUILD nml-0.4.5-r2.ebuild 798 BLAKE2B cd95acb191dba0e912fccfb6b6a9847c1c9c80c3e071fdb3654b4593ff486429861fff51765aca9d7784b56f828d9af567ca6940934cebbf0e61277f5b406461 SHA512 f53d919219266fa156cfa0f58ae278115cefa231c1aa83cd8b94ee1d60d5946671c6c61f305bebcb109a68f9be1bddb60a77d555c0d877e6b9cfe6c4c2e9c4d8
+DIST nml-0.5.2.tar.gz 531460 BLAKE2B 02f4e4a190bca0e46380c9075b769ea1925f3eaf655a2f09b8367890d4b9d0494dda9246f144bb735ef27906fcf22a198530fecc5c92e77f1b72f8a73832625e SHA512 edcada26ad011533065f3096b708b343ed6af742968606d187f01298e09f945904e2eba96fc8b37d88e243e7fd4bc6efdc8be614acbec199b06778ee32b5fc3b
+EBUILD nml-0.4.5-r3.ebuild 840 BLAKE2B f69aa3c9135726184e3aa5e1142c431fe13e70e3f4b86510a092f35770e597ce794710aac3d9f712eb33cd63df5820dbc90ba256d6f70d8ec51fe9a988c819fb SHA512 87801e6d5dd7a0e1986a007f00794a2e99db6b1257ab9cfabc056572b4578cf66d856e4d58672085a24f6e0c25b250a0ce859cac4e7e004e2dc4bedb3a394fa3
+EBUILD nml-0.5.2.ebuild 654 BLAKE2B 49381ca954c092faebd4331c620aef547d4479d80e88f2ba05280c39b9e1582dfd93a56ddbb2f216cd4a9267ce513827136203b5d469392928f8c9d7c01742dc SHA512 bc3b177bda53e1d0c85ac97511f7c401908af4791989ca655759c1e5946ae3d128385245ec7fa95b1a70f2bde03d116192b2d3e72656623c52129a28fc201656
MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/nml/files/nml-0.4.5-python38.patch b/games-util/nml/files/nml-0.4.5-python38.patch
new file mode 100644
index 000000000000..526a2e19f262
--- /dev/null
+++ b/games-util/nml/files/nml-0.4.5-python38.patch
@@ -0,0 +1,37 @@
+From 5b8764c3c4079941fab7be8d9086c38a88ae09ba Mon Sep 17 00:00:00 2001
+From: glx22
+Date: Sun, 20 Oct 2019 11:05:25 +0200
+Subject: [PATCH] Fix #52: time.clock() has been removed in python 3.8 (#53)
+
+---
+ nml/generic.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/nml/generic.py b/nml/generic.py
+index ce064b6c..8ee602f1 100644
+--- a/nml/generic.py
++++ b/nml/generic.py
+@@ -295,7 +295,7 @@ def clear_progress():
+ hide_progress()
+
+ if (progress_message is not None) and (verbosity_level >= VERBOSITY_TIMING):
+- print("{} {:.1f} s".format(progress_message, time.clock() - progress_start_time))
++ print("{} {:.1f} s".format(progress_message, time.process_time() - progress_start_time))
+
+ progress_message = None
+ progress_start_time = None
+@@ -324,12 +324,12 @@ def print_progress(msg, incremental = False):
+ progress_message = msg
+
+ if incremental:
+- t = time.clock()
++ t = time.process_time()
+ if (progress_update_time is not None) and (t - progress_update_time < 1):
+ return
+ progress_update_time = t
+ else:
+- progress_start_time = time.clock()
++ progress_start_time = time.process_time()
+
+ print_eol(msg)
+
diff --git a/games-util/nml/nml-0.4.5-r2.ebuild b/games-util/nml/nml-0.4.5-r3.ebuild
similarity index 95%
rename from games-util/nml/nml-0.4.5-r2.ebuild
rename to games-util/nml/nml-0.4.5-r3.ebuild
index 7627ddc1e890..3588cfc60e87 100644
--- a/games-util/nml/nml-0.4.5-r2.ebuild
+++ b/games-util/nml/nml-0.4.5-r3.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.4.4-pillow3.patch
"${FILESDIR}"/${PN}-0.4.5-pillow6.patch
"${FILESDIR}"/${PN}-0.4.5-pillow7.patch
+ "${FILESDIR}"/${PN}-0.4.5-python38.patch
)
src_install() {
diff --git a/games-util/nml/nml-0.5.2.ebuild b/games-util/nml/nml-0.5.2.ebuild
new file mode 100644
index 000000000000..e7fcb7a0ff99
--- /dev/null
+++ b/games-util/nml/nml-0.5.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Compiler of NML files into GRF/NFO files"
+HOMEPAGE="https://github.com/OpenTTD/nml"
+SRC_URI="https://github.com/OpenTTD/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+ dev-python/pillow[zlib,${PYTHON_USEDEP}]
+ dev-python/ply[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( "README.md" "docs/changelog.txt" )
+
+src_install() {
+ distutils-r1_src_install
+
+ doman docs/nmlc.1
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index c3990eed170e..ceed7f99a665 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest
index a562dda8627d..c9d01958b2bc 100644
--- a/gnome-base/gnome-core-apps/Manifest
+++ b/gnome-base/gnome-core-apps/Manifest
@@ -1,3 +1,3 @@
EBUILD gnome-core-apps-3.34.4.ebuild 1653 BLAKE2B 6b8c22a53bfedc16e329549ae6fbc30a8b31ad6fcea7173e4f433d1b2be4d18b6fc2058b0d39384cb6e85c657acb441616121a6ebe0749f5f9946e6220286529 SHA512 bfb58731a1d5d3742738accf92db638a527f66c51ac20d5fc5cb3e1a99a924cafe661a52ef0689a3627873c690350e96875ff580b87ff1a20dd944f8edc15b28
-EBUILD gnome-core-apps-3.36.5.ebuild 1567 BLAKE2B e7065744349326684ad9358587f4b11fd3c30b96453e931f79cdfb3ebb872decb4167657909cf08ad49641aac81e6c2187a60eddda091a6fa5e5da0f45562522 SHA512 ef82ebbfc630e547d1cf02a4d80fdeac91ab4d5f85f41773b06047981b65747e1d5e9063052f2a97501a1c14635f3c47efbb6ea16abc09def94fac2fc74087ff
+EBUILD gnome-core-apps-3.36.5.ebuild 1579 BLAKE2B 3842163c95b9c28da526c652ed9837a31335fa4f52b0fa9203e3d3c2f7495ac337d9bad2d46033b03af3218944e8a0902003545ba4f44c1eccf338c49e2834d3 SHA512 e4156ab6302f4681536ed6e1a55a9aae99a47a94f4123503b084509ed375cc3d4156feb970669c2ba9a1fed889431c86a9abc0eeb1ffbe5f7e78dbe62abe903c
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.36.5.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.36.5.ebuild
index 84365e2f7be6..d03437b836fe 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.36.5.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.36.5.ebuild
@@ -11,7 +11,7 @@ IUSE="+bluetooth cups"
# when unmasking for an arch
# double check none of the deps are still masked !
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
# gnome-color-manager min version enforced here due to control-center pulling it in
# tepl min version for gedit deptree
diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest
index 382b321c8877..ac703925a9ee 100644
--- a/gnome-base/gnome-light/Manifest
+++ b/gnome-base/gnome-light/Manifest
@@ -1,2 +1,3 @@
EBUILD gnome-light-3.34.4.ebuild 2060 BLAKE2B 1b60f2198f285e4c5bf9682aec0cf2bffcd95e349c0e24cc82b1b3f16be506c4322c1acf1d5d63c53b6256f5f4bb256da67133f53ce0affbb49ed30b97b2cbbb SHA512 5593d45f556ad1761cc8039c0b2a412485f1bd5eeec4df6bbd69afe11e3215a7d6adc52aad0757f4c6fdab49568ebf1a7d882f48cf4191f7dbe2f46b443bf7fa
+EBUILD gnome-light-3.36.5.ebuild 1972 BLAKE2B 01ea614087906c40900dbea6692b0689a32e6e19b65e1abb0d593c762b5a2a0b9cf8cb085a9421aeb41694631da72775ef562c45f48ce5e4d2ceefd7e689a717 SHA512 52b32c5e225a4de4ef9be2bc4360bda328142745382702aca20bf3a8604e7e9bd844a82132e2e4b29802369e6e77fdea729f77677d87bc6fe87ef9e342fa9331
MISC metadata.xml 406 BLAKE2B 562a281deb064ec0aa74ffebe4e38c864746809724acc4522df8c9cc0590d80937836923a029e521c5a0eec83adda11f169fa554e9760128408b78e87d916f26 SHA512 04875558c048cf102d8e5ffb17cb363808ca84c350f9b03958536cc5185cfd109b4653bbb4de202f47d092f8fc6d15173d3453a3bc62aa431b0c83cbb699a047
diff --git a/gnome-base/gnome-light/gnome-light-3.36.5.ebuild b/gnome-base/gnome-light/gnome-light-3.36.5.ebuild
new file mode 100644
index 000000000000..c3b29d3732c8
--- /dev/null
+++ b/gnome-base/gnome-light/gnome-light-3.36.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+P_RELEASE="$(ver_cut 1-2)"
+
+DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
+HOMEPAGE="https://www.gnome.org/"
+LICENSE="metapackage"
+SLOT="2.0"
+IUSE="cups +gnome-shell"
+
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+
+# XXX: Note to developers:
+# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
+# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without
+# any apps, but shouldn't be used by users unless they know what they are doing.
+# cantarell minimum version is ensured here as gnome-shell depends on it.
+RDEPEND="
+ >=gnome-base/gnome-core-libs-${PV}[cups?]
+
+ >=gnome-base/gnome-session-3.36.0
+ >=gnome-base/gnome-settings-daemon-3.36.1[cups?]
+ >=gnome-base/gnome-control-center-3.36.4[cups?]
+
+ >=gnome-base/nautilus-3.36.3
+
+ gnome-shell? (
+ >=x11-wm/mutter-${PV}
+ >=dev-libs/gjs-1.64.4
+ >=gnome-base/gnome-shell-${PV}
+ >=media-fonts/cantarell-0.201 )
+
+ >=x11-themes/adwaita-icon-theme-3.36.1
+ >=x11-themes/gnome-themes-standard-3.28
+ >=x11-themes/gnome-backgrounds-${P_RELEASE}
+
+ >=x11-terms/gnome-terminal-3.36.2
+"
+# adwaita-icon-theme kept back on purpose due to brokenness without rust librsvg,
+# in the hope that the old icon package version is good enough for everything too
+# until librsvg gets updated. This dep should be raised to 3.34 with 3.34.5 meta.
+DEPEND=""
+PDEPEND=">=gnome-base/gvfs-1.44.1"
+BDEPEND=""
+S="${WORKDIR}"
+
+pkg_pretend() {
+ if ! use gnome-shell; then
+ # Users probably want to use gnome-flashback, e16, sawfish, etc
+ ewarn "You're not installing GNOME Shell"
+ ewarn "You will have to install and manage a window manager by yourself"
+ fi
+}
+
+pkg_postinst() {
+ # Remember people where to find our project information
+ elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
+ elog "for information about the project and documentation."
+}
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index bd989b9e7880..f201d34a596a 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -3,10 +3,12 @@ AUX 15-xdg-data-gnome-r1 262 BLAKE2B 8ea3192680b1cda2076ebceafd7cd4f340f6f4c5f5b
AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81813bb0bf00620a8b825a90f2b54717ed24ca8c9554c3ae6f8dbd75424f2b4ae8c6f38fcb789e655aa35aad6 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b
AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6
AUX defaults.list-r4 18853 BLAKE2B abf7b422bf6e0e7dc04e26416d54018f3fb04ff6b4bfe8aed122e3b918cf840e5b8df8bb68c5ebb5ffed9d95b530581e10c03f7b4454ffe23fd8993253ce2898 SHA512 1d282ab6a139f6e0f0309263ca736dc2eeca0490f25a740583a24cd4f84a21531aaa0bd916d0809844e928029a434acdb3922305ce1253241ff62938c13c4eae
+AUX defaults.list-r5 19379 BLAKE2B 9299c535bcb3ce6f291ba66dfe655f7e793d554f5fd7a5df5e8db665e43372f8c08a5ea8480e63e318befc5b2e56e4b027ca873947972aa2b19d14ba85f0ec3e SHA512 edee1126e11c3b49ebcea1e1a6929d55a28d09b6c382666d6d6a32271a4cf22af23927f7a5e15ecbd4a4cdaa41ac2f1ffc09350f4e48257e2e5e29ade08635ac
DIST gnome-session-3.34.2-patchset.tar.xz 10196 BLAKE2B f79331c554b3004dc92d6b9d78ecb9575ad9ff071ef443ba4dca47e358e1c9bc2ecad3a43298bec7ad9e33aa85cb3fbc400f0a8739e6b1b1ebcfe3b8fd590ee5 SHA512 50d0d99bc594abdd05b2351c00db7f170282459360aaac0148a224d7e30e99283588596e84ff82bffab647cfd6a01a306a5c951da77d68e50ad8e146d3aae62a
DIST gnome-session-3.34.2.tar.xz 474692 BLAKE2B 5b928a4632966bc12ff94ae76079cd39352dc7008e9a1044ccc63e1ba588d26a6a5812a69a995f86cef6f9f2f18ae2865793dd28335218308ada85969966fb75 SHA512 23388420ee117596b73ac057d2376857db726fb727fdeff4e4f420e7742622e81baef439adb04d8659a6979e5b7043c72ea334c1179974950476489a8c397182
DIST gnome-session-3.36.0-patchset.tar.xz 22624 BLAKE2B 33518973a5e7c810b9aef165bcd62d41641908fa329dcefc784073966514aad5aa8919037722043c6cb0ddca86b4c2444b614d773aa777d737d49fdb3acad8e5 SHA512 c80ae41bcaa876ebb2c2d2a47d7bbcb58a3fe417ce0727e1aa3f384c4ae848bd3f1e27bd706af478f8e93c921efef578085d2c999efd06fd8d7c8704e170a56a
DIST gnome-session-3.36.0.tar.xz 475492 BLAKE2B b539c4646b746198aceba65708f758fc875614d342b66f8b12643a7235dcc043b78d7e2502ca9f45159f5b4080528ff8b92c98b67acb77fe7f71386ec282b773 SHA512 234456e8617524a3b95afb505246823ced4eca3ca009d48fc0bde70f8c620814495b04509c134bfb72760619990cc7cb7363ba13f0d90d9f038e8a43eadb6e9d
EBUILD gnome-session-3.34.2.ebuild 3992 BLAKE2B 0c65c6a8ec8e14cc03a78ead0e84a676e024d42bddb23911847e84de81d9234a1b3b8110ba054f3d6889f13f0932c8b553bf18584b0a7dd6bc49b386fe108a9a SHA512 809e0a482a8149151393f7ece8b544505f4d14a00e703831173eaa6182ae8baf9092acb7232f05dbf9b3e7f7753a6d97594f3d8787c1e2436452962f89e5caa1
+EBUILD gnome-session-3.36.0-r1.ebuild 3885 BLAKE2B 263413e56538345d94380af49071c4952a71642c1cb495b4bd1ac90c60bf5eedf77d2dfccf84bac257ae319f0f66aa84fe6c524b48f15fc4ca5be5accb715aac SHA512 3a7af1c219976a05014122557adb6bd33300408125e24e463317c1154cef96d476c7c47b7d7dd32bcde699af7f543415b22f66a08528768e3b4be854666ea7c6
EBUILD gnome-session-3.36.0.ebuild 3885 BLAKE2B 4e1160342b21bd78bc65b47780e9f62053b28e1628e7cf5a737b3147a4a5aad5eebc69a90104e73f0f95f3e00aefac3273810dfa5340aae0d94cd33830201758 SHA512 0770a77d8ec4abe3b615c68fb4a02074a6ef77900e063cfba4a6cd9eaaecf3888752fe1764dc90a035a7c563e1865d19b82815d134f14a217b5870818d956331
MISC metadata.xml 440 BLAKE2B 83fb0d37323db0c6105b3c231b6ecb7c4344bcd40577f23581af437fb4c4c330a77d2b8b19c9c69a5b586fd4638e55a9153014c32214547bf2437da7c3a161e6 SHA512 93f57253eccec50c77ad84960af623482bb34ad7d1f00463b29ccb54c3f034b95aa1a489acbf5075aa97e37e9303c2973e126cb201c15b2785416d882810378b
diff --git a/gnome-base/gnome-session/files/defaults.list-r5 b/gnome-base/gnome-session/files/defaults.list-r5
new file mode 100644
index 000000000000..9ec18d1b8a63
--- /dev/null
+++ b/gnome-base/gnome-session/files/defaults.list-r5
@@ -0,0 +1,336 @@
+[Default Applications]
+application/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/x-abiword=abiword.desktop;
+text/abiword=abiword.desktop;
+text/richtext=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+text/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+text/x-abiword=abiword.desktop;
+text/x-xml-abiword=abiword.desktop;
+x-content/blank-bd=brasero.desktop;org.gnome.Nautilus.desktop;
+x-content/blank-dvd=brasero.desktop;org.gnome.Nautilus.desktop;
+x-content/blank-cd=brasero.desktop;org.gnome.Nautilus.desktop;
+x-content/blank-hddvd=brasero.desktop;org.gnome.Nautilus.desktop;
+application/x-dia-diagram=dia.desktop;
+image/bmp=org.gnome.eog.desktop;
+image/gif=org.gnome.eog.desktop;
+image/jpeg=org.gnome.eog.desktop;
+image/jpg=org.gnome.eog.desktop;
+image/pjpeg=org.gnome.eog.desktop;
+image/png=org.gnome.eog.desktop;
+image/svg+xml=org.gnome.eog.desktop;
+image/svg+xml-compressed=org.gnome.eog.desktop;
+image/x-bmp=org.gnome.eog.desktop;
+image/x-gray=org.gnome.eog.desktop;
+image/x-icb=org.gnome.eog.desktop;
+image/x-ico=org.gnome.eog.desktop;
+image/x-pcx=org.gnome.eog.desktop;
+image/x-png=org.gnome.eog.desktop;
+image/x-portable-anymap=org.gnome.eog.desktop;
+image/x-portable-bitmap=org.gnome.eog.desktop;
+image/x-portable-graymap=org.gnome.eog.desktop;
+image/x-portable-pixmap=org.gnome.eog.desktop;
+image/x-xbitmap=org.gnome.eog.desktop;
+image/x-xpixmap=org.gnome.eog.desktop;
+image/vnd.wap.wbmp=org.gnome.eog.desktop;
+image/g3fax=gimp.desktop;zzz-gimp.desktop;
+image/x-compressed-xcf=gimp.desktop;zzz-gimp.desktop;
+image/x-fits=gimp.desktop;zzz-gimp.desktop;
+image/x-icon=gimp.desktop;zzz-gimp.desktop;
+image/x-psd=gimp.desktop;zzz-gimp.desktop;
+image/x-sgi=gimp.desktop;zzz-gimp.desktop;
+image/x-sun-raster=gimp.desktop;zzz-gimp.desktop;
+image/x-tga=gimp.desktop;zzz-gimp.desktop;
+image/x-xcf=gimp.desktop;zzz-gimp.desktop;
+image/x-xwindowdump=gimp.desktop;zzz-gimp.desktop;
+application/xhtml+xml=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
+text/html=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
+application/pdf=org.gnome.Evince.desktop;evince.desktop;
+application/x-bzpdf=org.gnome.Evince.desktop;evince.desktop;
+application/x-gzpdf=org.gnome.Evince.desktop;evince.desktop;
+application/postscript=org.gnome.Evince.desktop;evince.desktop;
+application/x-bzpostscript=org.gnome.Evince.desktop;evince.desktop;
+application/x-gzpostscript=org.gnome.Evince.desktop;evince.desktop;
+image/x-eps=org.gnome.Evince.desktop;evince.desktop;
+image/x-bzeps=org.gnome.Evince.desktop;evince.desktop;
+image/x-gzeps=org.gnome.Evince.desktop;evince.desktop;
+application/x-dvi=org.gnome.Evince.desktop;evince.desktop;
+application/x-bzdvi=org.gnome.Evince.desktop;evince.desktop;
+application/x-gzdvi=org.gnome.Evince.desktop;evince.desktop;
+image/vnd.djvu=org.gnome.Evince.desktop;evince.desktop;
+image/tiff=org.gnome.Evince.desktop;evince.desktop;
+application/x-cbr=org.gnome.Evince.desktop;evince.desktop;
+application/x-cbz=org.gnome.Evince.desktop;evince.desktop;
+application/x-cb7=org.gnome.Evince.desktop;evince.desktop;
+application/x-7z-compressed=org.gnome.FileRoller.desktop;
+application/x-7z-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-ace=org.gnome.FileRoller.desktop;
+application/x-alz=org.gnome.FileRoller.desktop;
+application/x-ar=org.gnome.FileRoller.desktop;
+application/x-arj=org.gnome.FileRoller.desktop;
+application/x-bzip=org.gnome.FileRoller.desktop;
+application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-bzip1=org.gnome.FileRoller.desktop;
+application/x-bzip1-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-cabinet=org.gnome.FileRoller.desktop;
+application/x-cd-image=org.gnome.FileRoller.desktop;
+application/x-compress=org.gnome.FileRoller.desktop;
+application/x-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-cpio=org.gnome.FileRoller.desktop;
+application/x-deb=org.gnome.FileRoller.desktop;
+application/x-ear=org.gnome.FileRoller.desktop;
+application/x-gtar=org.gnome.FileRoller.desktop;
+application/x-gzip=org.gnome.FileRoller.desktop;
+application/x-java-archive=org.gnome.FileRoller.desktop;
+application/x-lha=org.gnome.FileRoller.desktop;
+application/x-lhz=org.gnome.FileRoller.desktop;
+application/x-lzip=org.gnome.FileRoller.desktop;
+application/x-lzip-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-lzma=org.gnome.FileRoller.desktop;
+application/x-lzma-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-lzop=org.gnome.FileRoller.desktop;
+application/x-lzop-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-rar=org.gnome.FileRoller.desktop;
+application/x-rar-compressed=org.gnome.FileRoller.desktop;
+application/x-rpm=org.gnome.FileRoller.desktop;
+application/x-rzip=org.gnome.FileRoller.desktop;
+application/x-tar=org.gnome.FileRoller.desktop;
+application/x-tarz=org.gnome.FileRoller.desktop;
+application/x-source-rpm=org.gnome.FileRoller.desktop;
+application/x-stuffit=org.gnome.FileRoller.desktop;
+application/x-war=org.gnome.FileRoller.desktop;
+application/x-xz=org.gnome.FileRoller.desktop;
+application/x-xz-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-zip=org.gnome.FileRoller.desktop;
+application/x-zip-compressed=org.gnome.FileRoller.desktop;
+application/x-zoo=org.gnome.FileRoller.desktop;
+application/zip=org.gnome.FileRoller.desktop;
+multipart/x-zip=org.gnome.FileRoller.desktop;
+text/plain=org.gnome.gedit.desktop;
+text/css=org.gnome.gedit.desktop;
+text/javascript=org.gnome.gedit.desktop;
+text/markdown=org.gnome.gedit.desktop;
+text/mathml=org.gnome.gedit.desktop;
+text/x-csrc=org.gnome.gedit.desktop;
+text/x-chdr=org.gnome.gedit.desktop;
+text/x-dtd=org.gnome.gedit.desktop;
+text/x-java=org.gnome.gedit.desktop;
+text/x-javascript=org.gnome.gedit.desktop;
+text/x-patch=org.gnome.gedit.desktop;
+text/x-perl=org.gnome.gedit.destkop
+text/x-php=org.gnome.gedit.destkop
+text/x-python=org.gnome.gedit.destkop
+text/x-sql=org.gnome.gedit.desktop;
+text/xml=org.gnome.gedit.desktop;
+application/javascript=org.gnome.gedit.destkop
+application/x-cgi=org.gnome.gedit.desktop;
+application/x-javascript=org.gnome.gedit.desktop;
+application/x-perl=org.gnome.gedit.desktop;
+application/x-php=org.gnome.gedit.desktop;
+application/x-python=org.gnome.gedit.desktop;
+application/xml=org.gnome.gedit.desktop;
+application/xml-dtd=org.gnome.gedit.desktop;
+application/x-font-ttf=org.gnome.font-viewer.desktop;
+application/x-font-pcf=org.gnome.font-viewer.desktop;
+application/x-font-type1=org.gnome.font-viewer.desktop;
+application/x-font-otf=org.gnome.font-viewer.desktop;
+application/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-123=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-applix-spreadsheet=gnumeric.desktop;
+application/x-dbase=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-gnumeric=gnumeric.desktop;
+application/x-mps=gnumeric.desktop;
+application/x-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-oleo=gnumeric.desktop;
+application/x-planperfect=gnumeric.desktop;
+application/x-quattropro=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-sc=gnumeric.desktop;
+application/x-sylk=gnumeric.desktop;
+application/x-xbase=gnumeric.desktop;
+application/x-xls=gnumeric.desktop;
+application/xls=gnumeric.desktop;
+text/comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+zz-application/zz-winassoc-xls=gnumeric.desktop;
+x-content/software=nautilus-autorun-software.desktop;
+x-content/unix-software=nautilus-autorun-software.desktop;
+x-directory/gnome-default-handler=org.gnome.Nautilus.desktop;
+x-directory/normal=org.gnome.Nautilus.desktop;
+inode/directory=org.gnome.Nautilus.desktop;
+application/x-gnome-saved-search=org.gnome.Nautilus.desktop;
+application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop;
+application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop;
+application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop;
+application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+x-content/audio-player=rhythmbox.desktop;
+x-content/audio-cdda=org.gnome.SoundJuicer.desktop;
+application/x-shockwave-flash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;
+application/futuresplash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;
+application/mxf=org.gnome.Totem.desktop;
+application/ogg=org.gnome.Totem.desktop;
+application/ram=org.gnome.Totem.desktop;
+application/sdp=org.gnome.Totem.desktop;
+application/smil=org.gnome.Totem.desktop;
+application/smil+xml=org.gnome.Totem.desktop;
+application/vnd.ms-wpl=org.gnome.Totem.desktop;
+application/vnd.rn-realmedia=org.gnome.Totem.desktop;
+application/x-extension-m4a=org.gnome.Totem.desktop;
+application/x-extension-mp4=org.gnome.Totem.desktop;
+application/x-flac=org.gnome.Totem.desktop;
+application/x-flash-video=org.gnome.Totem.desktop;
+application/x-matroska=org.gnome.Totem.desktop;
+application/x-netshow-channel=org.gnome.Totem.desktop;
+application/x-ogg=org.gnome.Totem.desktop;
+application/x-quicktime-media-link=org.gnome.Totem.desktop;
+application/x-quicktimeplayer=org.gnome.Totem.desktop;
+application/x-shorten=org.gnome.Totem.desktop;
+application/x-smil=org.gnome.Totem.desktop;
+application/xspf+xml=org.gnome.Totem.desktop;
+audio/3gpp=org.gnome.Totem.desktop;
+audio/ac3=org.gnome.Totem.desktop;
+audio/AMR=org.gnome.Totem.desktop;
+audio/AMR-WB=org.gnome.Totem.desktop;
+audio/basic=org.gnome.Totem.desktop;
+audio/midi=org.gnome.Totem.desktop;
+audio/mp4=org.gnome.Totem.desktop;
+audio/mpeg=org.gnome.Totem.desktop;
+audio/mpegurl=org.gnome.Totem.desktop;
+audio/ogg=org.gnome.Totem.desktop;
+audio/prs.sid=org.gnome.Totem.desktop;
+audio/vnd.rn-realaudio=org.gnome.Totem.desktop;
+audio/x-ape=org.gnome.Totem.desktop;
+audio/x-flac=org.gnome.Totem.desktop;
+audio/x-gsm=org.gnome.Totem.desktop;
+audio/x-it=org.gnome.Totem.desktop;
+audio/x-m4a=org.gnome.Totem.desktop;
+audio/x-matroska=org.gnome.Totem.desktop;
+audio/x-mod=org.gnome.Totem.desktop;
+audio/x-mp3=org.gnome.Totem.desktop;
+audio/x-mpeg=org.gnome.Totem.desktop;
+audio/x-mpegurl=org.gnome.Totem.desktop;
+audio/x-ms-asf=org.gnome.Totem.desktop;
+audio/x-ms-asx=org.gnome.Totem.desktop;
+audio/x-ms-wax=org.gnome.Totem.desktop;
+audio/x-ms-wma=org.gnome.Totem.desktop;
+audio/x-musepack=org.gnome.Totem.desktop;
+audio/x-pn-aiff=org.gnome.Totem.desktop;
+audio/x-pn-au=org.gnome.Totem.desktop;
+audio/x-pn-realaudio=org.gnome.Totem.desktop;
+audio/x-pn-realaudio-plugin=org.gnome.Totem.desktop;
+audio/x-pn-wav=org.gnome.Totem.desktop;
+audio/x-pn-windows-acm=org.gnome.Totem.desktop;
+audio/x-realaudio=org.gnome.Totem.desktop;
+audio/x-real-audio=org.gnome.Totem.desktop;
+audio/x-sbc=org.gnome.Totem.desktop;
+audio/x-scpls=org.gnome.Totem.desktop;
+audio/x-speex=org.gnome.Totem.desktop;
+audio/x-tta=org.gnome.Totem.desktop;
+audio/x-vorbis=org.gnome.Totem.desktop;
+audio/x-vorbis+ogg=org.gnome.Totem.desktop;
+audio/x-wav=org.gnome.Totem.desktop;
+audio/x-wavpack=org.gnome.Totem.desktop;
+audio/x-xm=org.gnome.Totem.desktop;
+image/vnd.rn-realpix=org.gnome.Totem.desktop;
+image/x-pict=org.gnome.Totem.desktop;
+misc/ultravox=org.gnome.Totem.desktop;
+text/google-video-pointer=org.gnome.Totem.desktop;
+text/x-google-video-pointer=org.gnome.Totem.desktop;
+video/3gpp=org.gnome.Totem.desktop;
+video/dv=org.gnome.Totem.desktop;
+video/fli=org.gnome.Totem.desktop;
+video/flv=org.gnome.Totem.desktop;
+video/mp2t=org.gnome.Totem.desktop;
+video/mp4=org.gnome.Totem.desktop;
+video/mp4v-es=org.gnome.Totem.desktop;
+video/mpeg=org.gnome.Totem.desktop;
+video/msvideo=org.gnome.Totem.desktop;
+video/ogg=org.gnome.Totem.desktop;
+video/quicktime=org.gnome.Totem.desktop;
+video/vivo=org.gnome.Totem.desktop;
+video/vnd.divx=org.gnome.Totem.desktop;
+video/vnd.rn-realvideo=org.gnome.Totem.desktop;
+video/vnd.vivo=org.gnome.Totem.desktop;
+video/webm=org.gnome.Totem.desktop;
+video/x-anim=org.gnome.Totem.desktop;
+video/x-avi=org.gnome.Totem.desktop;
+video/x-flc=org.gnome.Totem.desktop;
+video/x-fli=org.gnome.Totem.desktop;
+video/x-flic=org.gnome.Totem.desktop;
+video/x-flv=org.gnome.Totem.desktop;
+video/x-m4v=org.gnome.Totem.desktop;
+video/x-matroska=org.gnome.Totem.desktop;
+video/x-mpeg=org.gnome.Totem.desktop;
+video/x-ms-asf=org.gnome.Totem.desktop;
+video/x-ms-asx=org.gnome.Totem.desktop;
+video/x-msvideo=org.gnome.Totem.desktop;
+video/x-ms-wm=org.gnome.Totem.desktop;
+video/x-ms-wmv=org.gnome.Totem.desktop;
+video/x-ms-wmx=org.gnome.Totem.desktop;
+video/x-ms-wvx=org.gnome.Totem.desktop;
+video/x-nsv=org.gnome.Totem.desktop;
+video/x-ogm+ogg=org.gnome.Totem.desktop;
+video/x-theora+ogg=org.gnome.Totem.desktop;
+video/x-totem-stream=org.gnome.Totem.desktop;
+x-content/video-dvd=org.gnome.Totem.desktop;
+x-content/video-vcd=org.gnome.Totem.desktop;
+x-content/video-svcd=org.gnome.Totem.desktop;
+x-scheme-handler/ghelp=yelp.desktop;
+x-scheme-handler/help=yelp.desktop;
+x-scheme-handler/http=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
+x-scheme-handler/https=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
+x-scheme-handler/mailto=org.gnome.Evolution.desktop;evolution.desktop;
diff --git a/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild
new file mode 100644
index 000000000000..3e4be186878c
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="consolekit doc elogind systemd"
+# There is a null backend available, thus ?? not ^^
+# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+ >=dev-libs/glib-2.46.0:2
+ >=x11-libs/gtk+-3.18.0:3
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ >=gnome-base/gnome-desktop-3.34.2:3=
+ >=dev-libs/json-glib-0.10
+ media-libs/mesa[egl,gles2,X(+)]
+ media-libs/libepoxy
+ x11-libs/libXcomposite
+
+ systemd? ( >=sys-apps/systemd-183:0= )
+ elogind? ( >=sys-auth/elogind-239.4 )
+ consolekit? ( >=dev-libs/dbus-glib-0.76 )
+"
+
+# Pure-runtime deps from the session files should *NOT* be added here.
+# >=gnome-settings-daemon-3.35.91 for UsbProtection required component.
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+# sys-apps/dbus[X] is needed for session management.
+# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
+RDEPEND="${DEPEND}
+ >=gnome-base/gnome-settings-daemon-3.35.91
+ >=gnome-base/gsettings-desktop-schemas-0.1.7
+ sys-apps/dbus[X]
+ consolekit? ( sys-auth/consolekit )
+
+ x11-misc/xdg-user-dirs
+ x11-misc/xdg-user-dirs-gtk
+"
+BDEPEND="
+ dev-libs/libxslt
+ dev-util/gdbus-codegen
+ >=sys-devel/gettext-0.19.8
+ x11-libs/xtrans
+ virtual/pkgconfig
+ doc? ( app-text/xmlto
+ app-text/docbook-xml-dtd:4.1.2 )
+"
+
+PATCHES=(
+ # Various patches from master (no 3-36 branch yet) + elogind support
+ "${WORKDIR}"/patches/
+)
+
+src_prepare() {
+ xdg_src_prepare
+ # Install USE=doc in $PF if enabled
+ sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Ddeprecation_flags=false
+ $(meson_use elogind)
+ -Dsession_selector=true # gnome-custom-session
+ $(meson_use systemd)
+ -Dsystemd_session=$(usex systemd default disable)
+ $(meson_use systemd systemd_journal)
+ $(meson_use consolekit)
+ $(meson_use doc docbook)
+ -Dman=true
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ dodir /etc/X11/Sessions
+ exeinto /etc/X11/Sessions
+ doexe "${FILESDIR}/Gnome"
+
+ insinto /usr/share/applications
+ newins "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
+
+ dodir /etc/X11/xinit/xinitrc.d/
+ exeinto /etc/X11/xinit/xinitrc.d/
+ newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+ # This should be done here as discussed in bug #270852
+ newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+
+ # Set XCURSOR_THEME from current dconf setting instead of installing
+ # default cursor symlink globally and affecting other DEs (bug #543488)
+ # https://bugzilla.gnome.org/show_bug.cgi?id=711703
+ newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+
+ if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
+ ewarn "If you use a custom .xinitrc for your X session,"
+ ewarn "make sure that the commands in the xinitrc.d scripts are run."
+ fi
+
+ if ! use systemd && ! use elogind && ! use consolekit; then
+ ewarn "You are building without systemd, elogind and/or consolekit support."
+ ewarn "gnome-session won't be able to correctly track and manage your session."
+ fi
+}
+
+pkg_postrm() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 453af7876ba3..01a7a8636775 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/tepl/Manifest b/gui-libs/tepl/Manifest
index 52bff5b4029f..e9f37a5444a1 100644
--- a/gui-libs/tepl/Manifest
+++ b/gui-libs/tepl/Manifest
@@ -1,5 +1,5 @@
DIST tepl-4.2.1.tar.xz 464120 BLAKE2B 74146cdf837923ab1a8e843e189bd83b2c7d7ae9cbf03ce4f3dbbbbfee1f47dffcda537ad8133cdf1b4efd747f0ee60092ddab029a67282b71fdc52d51564dc4 SHA512 c1b848cf1d336efdc2971e16060baf721e9019e6e6827bd755235c9dd37ae47803343e51888d9dd5817b6127bb1ba05a19d4a1be0caab9d2de125bc0cd8175a7
DIST tepl-4.4.0.tar.xz 466576 BLAKE2B fe9d9c625a3febe6fc71e5972b864b0d732b7f75bcc114a391d7f94b2fc242fe7c5199e61d5a69a8ceccb845fffcf830d6071adb1ecda5e223d453d029ed3398 SHA512 2050c28f9564034bea7c44d3fa27784ab87503c2db6cf35e6389c40ca78722b092fbc52df5fdfc85cc1e39a9dc3c0e30fa7993fb63411b0240f3a6ac9607c282
-EBUILD tepl-4.2.1.ebuild 1361 BLAKE2B 3ab71473823444b98de9fe21aca388638bb7404966da79e6ea436ce91a98b4c43668ef7153b7b1b93723b6a4e478c5788cf4425cf5ba615da5d3d156cf60d8d6 SHA512 7374205c677b8376f7619327d336da92278985245817d1ff34c704386cb41c93ad0f939f804664720617c4d80b28c6dcf0b45f8f1711113564be045716f02e2d
-EBUILD tepl-4.4.0.ebuild 1369 BLAKE2B 4004aeda8c855cf423701a92780e6b33cb3546a4d2b98de644c659203ec7d373822baec65aa63fe20d357824ca441032904b95508432ea45d2b16759ea40238b SHA512 c9cef0e96504e206db13dbde70d4daaa1fe4898910d500cf81688e7e42c29802473d3d451cc9964af00334cb686595fd49c529ee64a4def86bf6549200ec346d
+EBUILD tepl-4.2.1.ebuild 1362 BLAKE2B 4f44f0d9c5e34201da5dbb62c59cf93a9dd80ab99ee4fccc6299cb88e82eb72212158b1181738c5ccd8183d87651292ffd5cde7c27515ae0c9d5e8baa29cc9b1 SHA512 aaff7602fd71f69a4306fa39630225d41a2a3f717c4a2dfe177b911e37ac8e30f0276f1c3cba83102f14172e0aa513fb964dcd10632ab9cab30ad9bdc7d29f12
+EBUILD tepl-4.4.0.ebuild 1389 BLAKE2B f82732b3d968ac6a221c18505830382eb99907dc04b32b445d3d3cfd32093c8ba4f64999a452ff41573829b081b838dd84157b3d5d31a62853400d97822f7667 SHA512 b3e677687107facd95edaf66eb58c655be5c84aae6bb9035ebf516e019c5cb74851e09ff4ed303b013c9d8bf64430d7dba199f34f7fdc0dd96f3bdac73737715
MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/tepl/tepl-4.2.1.ebuild b/gui-libs/tepl/tepl-4.2.1.ebuild
index ec3365a0e8c0..7ed6fd412fec 100644
--- a/gui-libs/tepl/tepl-4.2.1.ebuild
+++ b/gui-libs/tepl/tepl-4.2.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit gnome2 virtualx
DESCRIPTION="GtkSourceView-based text editors and IDE helper library"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gtef"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tepl"
LICENSE="LGPL-2.1+"
SLOT="4"
@@ -22,7 +22,7 @@ RDEPEND="
app-i18n/uchardet
introspection? ( >=dev-libs/gobject-introspection-1.42:= )
"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
>=sys-devel/gettext-0.19.6
dev-util/glib-utils
>=dev-util/gtk-doc-am-1.25
diff --git a/gui-libs/tepl/tepl-4.4.0.ebuild b/gui-libs/tepl/tepl-4.4.0.ebuild
index fcaf15bd654c..88a2a5abc727 100644
--- a/gui-libs/tepl/tepl-4.4.0.ebuild
+++ b/gui-libs/tepl/tepl-4.4.0.ebuild
@@ -6,11 +6,11 @@ EAPI=6
inherit gnome2 virtualx
DESCRIPTION="GtkSourceView-based text editors and IDE helper library"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gtef"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tepl"
LICENSE="LGPL-2.1+"
SLOT="4"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86"
IUSE="+introspection"
RDEPEND="
@@ -22,7 +22,7 @@ RDEPEND="
app-i18n/uchardet
introspection? ( >=dev-libs/gobject-introspection-1.42:= )
"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
>=sys-devel/gettext-0.19.6
dev-util/glib-utils
>=dev-util/gtk-doc-am-1.25
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index d29c62df341d..4d339549a001 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/kdeutils-meta/Manifest b/kde-apps/kdeutils-meta/Manifest
index f14a0a87dbe4..01002b2bc495 100644
--- a/kde-apps/kdeutils-meta/Manifest
+++ b/kde-apps/kdeutils-meta/Manifest
@@ -1,3 +1,3 @@
EBUILD kdeutils-meta-20.04.3.ebuild 1207 BLAKE2B d37a63970d4fb2609fa31b0f673642373df75898734d7ad1fac4ab4c9db2752b1e6f35360fb01f32b7f68ed7d00a4c84b2466152015abe890f72439e5aee8ebc SHA512 789c0e7fea9451a8ef5701a13fb8158733a84d70e96b824d6b616987c5fa24c17f69c54215fc3b6b4f18d25b996ff222aea90bc8387ff12eed4ae25dd370ebed
-EBUILD kdeutils-meta-20.08.0.ebuild 1210 BLAKE2B 76a51761fdee5d5a9f60834689b089263442f86e4433ece942649134d117547fb6041574b0b06f31775313e51a7506045dfbdee505ba21572efbe0b28ff1f7c9 SHA512 78093f5f528fd5cdb04cab578d69eb9e83f9a1f05bdbbb6cde73cd391b057906bd02fe9f29b261a762529408dfa27c907f8a6b4cb0cb141727fec483af0731fd
+EBUILD kdeutils-meta-20.08.0-r1.ebuild 1260 BLAKE2B f2c0d4681263ce539ae3ed24b06939357190f7ababeee82a408619dcd33d218721242ad98256eb57e47c9ee1480d7031b69725d3b173b33635e3719155d26767 SHA512 c028d54516ee6d5403de046c67bcfcb9e8446df63cf960f9dcaf1cacd1b458a36fffc9289ceca2e0a0c278d107c7fe7f2eee7ea6122d6889b72d3bdc69af6b1f
MISC metadata.xml 1004 BLAKE2B f2fed1a10b7eb10ba9016b72fe9c4863e853882e6f66790ffe70e21aace4e10b0fc5c699559934121b071c2e260a83b19d50b5d14adc53dff25d933ea0e8eae6 SHA512 d8f248c827327c4c855cc1ba7c6c9d31578b4a89ecca6dbc0ffde3f2b73b10f66d9923a907dde88481ee933a6047fb18089341ef49b8146836a00cb341a23f7a
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-20.08.0.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-20.08.0-r1.ebuild
similarity index 96%
rename from kde-apps/kdeutils-meta/kdeutils-meta-20.08.0.ebuild
rename to kde-apps/kdeutils-meta/kdeutils-meta-20.08.0-r1.ebuild
index 7f7d9347c3da..9cee4e0b22c7 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-20.08.0.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-20.08.0-r1.ebuild
@@ -12,6 +12,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
IUSE="7zip cups floppy gpg lrz rar +webengine"
RDEPEND="
+ >=app-cdr/dolphin-plugins-mountiso-${PV}:${SLOT}
>=kde-apps/ark-${PV}:${SLOT}
>=kde-apps/filelight-${PV}:${SLOT}
>=kde-apps/kate-${PV}:${SLOT}
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index b0d57e2a1db2..a7075e6104f6 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,6 +1,6 @@
AUX kitinerary-20.04.3-poppler-20.08.patch 1115 BLAKE2B a368b6c91b0ad14e99fbdb94110f64692217b51ece3fa592372e3dc9ffcd62fefea0eb7e9f91481b3eacf1c425d0e8d53e5db9d57c6ed5a3d20382326d51cef4 SHA512 d4ee7f4423e2943575925fdde7c8e7056562d5ad485191a38c5a0183a46c2a71d9f6957db334d576be07ff03ad484c535a821cf616a57b37b8de1ae075d384c4
DIST kitinerary-20.04.3.tar.xz 1280676 BLAKE2B 17e02987ed40985b8adcec81f6499ca968a89f22919cd6af2f16d6c5623b8b767fb43142aa4ff93e8d24c6ba483b553e7817d0e74c68bebe8b897d689704e2ca SHA512 eee734fc06373aed09e0eadd7ef232cde5ba07adf4d0996117bc4a0ee16cf80fc7f607ae1dc92033ea404e70eb8afcf5a676ff71e286613272c0d1051d7b7168
DIST kitinerary-20.08.0.tar.xz 1755504 BLAKE2B 9771f5d104bf05f8869408d754c316c9736b7642a63eebc24b20910a8ec1ceed8098d00cf3e8a93455136fb45ced2750a36f40007cd4eacd7a79fec8addc6c78 SHA512 c568992c165ae8cfd48b19141f3bfd0755cdf1a516e816791fc94533a75a4c431fa6528d0322afc56400b33d38f72bbc3febfe0923397e0de25289e2a90a2e5d
-EBUILD kitinerary-20.04.3.ebuild 1084 BLAKE2B e1cc949c1c1df240be214527bc14b4ad53e556594dc1f7d6489ec3972a78dfcd6551f046919952e7a01c2a0f39992450cf095c72037712fad1d46e52562a31b5 SHA512 77d38185fc22fd2259d8990b0ab5662c3d0f282280965313f7acf93e43b41f3aac8a05e7997e7cf4f6aa06ec0b1a43e07cd62863197267f2b42ae1df02ec67e0
-EBUILD kitinerary-20.08.0.ebuild 1022 BLAKE2B b415cbe7f23c911b58c20e80944299790a42826d10cc698c2ba81fc8b1216b2c4a385acbb9fa2f699c4c9bf68e9eda9de0dd8ad19a6db636f35fbf081f0ef386 SHA512 d8cf5141cdf0342938561cdd42d6948b77e69fe6fb21c8a3fd5f83e783dce749f1697b66de5de4d77c1b284d3c7d6b6ee49bf0c54291133f321f2404665c042e
+EBUILD kitinerary-20.04.3.ebuild 1091 BLAKE2B f7ab0838e92215cf2e435d086b0fe74aae97960d57be02da4eaffde866adc672354bdeca3ec1a273325b68dfa9132af073a62c98126261f584fa7ca3efa75fa0 SHA512 ac4d28d69baed98b5724af39166508cc9ef202b8bdecd4a8cb166ed5e7def1e93eaad591e7bd23315591926cd0048f226595bab9044a321f5caaff4f35cec5a9
+EBUILD kitinerary-20.08.0-r1.ebuild 1030 BLAKE2B 8d5bf464363e9a5366d90f249393cede74fb7e73134c3b6cc6b749632e6bafe4b0424eeb752703182cb4bb53f22b0a2764510bdaae74b832d2863aa57229b661 SHA512 0408ed0482f35f0845ed3fd7d08043ff2cf32f9792865bb4357c642a868699c67fbb33b0f322e875b81336948c2dc83c7aa2ae63f015afc0ec53cb9a3570cd7d
MISC metadata.xml 385 BLAKE2B 3831c360aacb09127cbaf52b779ff5b17708424dcbdc59d3c40739cae4742c9d22a95222aae7cbf188e74ddffd22ac58275440ede013b6c18c2f6b8a148bde5f SHA512 3bca0a73900f8dbdd9baf83b3e108d73e074d5713abfbfb5d4ec2923104096f516f409501e05fe9c42c59a949eac333d36ecb1e31b370a2810d7eeec515e86b5
diff --git a/kde-apps/kitinerary/kitinerary-20.04.3.ebuild b/kde-apps/kitinerary/kitinerary-20.04.3.ebuild
index 2026a8ac89f6..3018a3aa73bb 100644
--- a/kde-apps/kitinerary/kitinerary-20.04.3.ebuild
+++ b/kde-apps/kitinerary/kitinerary-20.04.3.ebuild
@@ -28,7 +28,7 @@ DEPEND="
>=kde-frameworks/kcontacts-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
sys-libs/zlib
- barcode? ( media-libs/zxing-cpp )
+ barcode? ( ~media-libs/zxing-cpp-1.0.8 )
pdf? ( app-text/poppler:=[qt5] )
"
RDEPEND="${DEPEND}
diff --git a/kde-apps/kitinerary/kitinerary-20.08.0.ebuild b/kde-apps/kitinerary/kitinerary-20.08.0-r1.ebuild
similarity index 95%
rename from kde-apps/kitinerary/kitinerary-20.08.0.ebuild
rename to kde-apps/kitinerary/kitinerary-20.08.0-r1.ebuild
index 092a4e4d18ad..b8c2bbbd91dc 100644
--- a/kde-apps/kitinerary/kitinerary-20.08.0.ebuild
+++ b/kde-apps/kitinerary/kitinerary-20.08.0-r1.ebuild
@@ -28,7 +28,7 @@ DEPEND="
>=kde-frameworks/kcontacts-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
sys-libs/zlib
- barcode? ( media-libs/zxing-cpp )
+ barcode? ( >=media-libs/zxing-cpp-1.1.0 )
pdf? ( app-text/poppler:=[qt5] )
"
RDEPEND="${DEPEND}
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 030af6bff9f8..85af5d0e0c5b 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,5 +1,5 @@
DIST mailimporter-20.04.3.tar.xz 540412 BLAKE2B 5e7caa62c19a25e5153aa9438b40e75884b1ccacd4f5de2fcb560501e091ea834286538f0621cdd541ccf85ec5541b946ab83cec9d0ffae936ffe79627709864 SHA512 6b43d614cd1ab1cd9bcf24c40e0d077abf65ef9c74d2237c5c7d02115ca6f85b43c1c2933124b69bda7b98e400af5ee4bf54031d3a42702b49e2634a0c7c5ef5
DIST mailimporter-20.08.0.tar.xz 541464 BLAKE2B ac8d4731344b0e1bee647c09c2a258033deb8adfe42545683518887c146b99f35305dc74d8d1526ffd7daffa752e6ebb4b8484b818e8ea3c1dc1667be70b5113 SHA512 1047290c69fc359f761e4a21036e45ced9f4499067844890d7e4f3ba9a8e9f814191ac4a0cb2c32e9c687e002ee6a6e4b911a65b05729408b5ad06040a149861
EBUILD mailimporter-20.04.3.ebuild 749 BLAKE2B 4e79705e501d4553042877fe5551f51a02d4871d9c3a60ac9c1acca64115d4a367febed0e29661a0e6f6952c36634507ab8e712f63c22ccf1d86e9e76efd6c34 SHA512 511c528c3ff9853d045e5ba286ade7b22955d2467b5a1425974341fee994d17c9cdf0eea9759f6b6c74a63909b1b131dc7e140b08c5e0e39c2e7044bf4f0fb22
-EBUILD mailimporter-20.08.0.ebuild 752 BLAKE2B 2c5b4b706316b0cbe1862b178ef38e49eb9b5b396e7a8a8c5b061a35c3a9145b1f3b7a4ab5e57ebcbb93c983c8e28ba16a4b77e796ba718aeaf2b295b77c819d SHA512 b2e461a0100d42674bc0924158f56bd441c3af1cfd96934cca935884244614e3a22e518f2a9f7dd9b80c6d3e2ea8e9434c593fb25284a04d0f03480be01b2e73
+EBUILD mailimporter-20.08.0-r1.ebuild 785 BLAKE2B e6ea05ecf99170bed4c82e0e0a0beaf85e5d5088876e3fe7d87fef7c8b99bafa86cd3db9fd69c61e87e620e5ead1cd5f29d6399a72d87bde4b765b10da943ab5 SHA512 d56b7870dfff7d9b0c24d3b04a79f0604fe63ebd7d20693c4a8d09836171c97a4f3093954b80f26e692c2582a9f13eb6802062b895e930c1dc31ac342b5952ed
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mailimporter/mailimporter-20.08.0.ebuild b/kde-apps/mailimporter/mailimporter-20.08.0-r1.ebuild
similarity index 91%
rename from kde-apps/mailimporter/mailimporter-20.08.0.ebuild
rename to kde-apps/mailimporter/mailimporter-20.08.0-r1.ebuild
index b45e637707ba..ea25af574574 100644
--- a/kde-apps/mailimporter/mailimporter-20.08.0.ebuild
+++ b/kde-apps/mailimporter/mailimporter-20.08.0-r1.ebuild
@@ -24,10 +24,11 @@ DEPEND="
>=kde-apps/akonadi-${PVCUT}:5
>=kde-apps/akonadi-mime-${PVCUT}:5
>=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
"
RDEPEND="${DEPEND}"
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index e46d28380a64..6f9e7e150dde 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,5 @@
DIST messagelib-20.04.3.tar.xz 10511452 BLAKE2B 5e427f1bfe4239a6a49226c4938a5ebf827e399b55c395bc50014587e7caa717efa6c602a96c0383be02ac66fefec935089ed8be4723b44cb21e554852591445 SHA512 3338794643db618fd86295e894e89e21147a2b9e79e4617ad70de6cdc6415414377f0a71f6001a43bfd4480e580e635912ebdc2396a376407b5f4e4edd8d2f77
DIST messagelib-20.08.0.tar.xz 10533988 BLAKE2B 4bd002a42b08d4ac3e66bf5e7b895c1610e70f318db4a8bd28d0ed8682cd7002884bcd7f135824307fa0cd594ca05d26567f561514718216fdc46efad9615258 SHA512 26fe9704ef2b40eb7093911d0439e34d1859122bd1c127b20aaca611299d7d0e4269ea461b689b86cf029ef90e97bbc85b3ba273c79179529be61dccbeda31e8
EBUILD messagelib-20.04.3.ebuild 2134 BLAKE2B 21c2275490becbfe1f2f45d7be09b66023e54cd563c41fe11ee1ed2b93160b0dd921a0c7a1e8bbaef85fb5c6d2831beeb6e761dea83c85665da5554981902326 SHA512 3917c53235cc09fa7f49de9c0b2a056cb9fac933a53bfe5795465c4f39769480f707101c94caa00495fb17a8efca4feca3a675cd17d1d705c35f346e06e4dc63
-EBUILD messagelib-20.08.0.ebuild 2127 BLAKE2B 0f4f27d9dffcde79f4b8d9a96db1a48ef6fafd0fa771080e6ea5f3e1480ae2e4cb9bee0f2e5dc43f1f6952d8d8f8f8c70d15f205d368123ab67f328fe67edadd SHA512 75fd92462b2eb9689469bc5eecf1ba1a5d6e77d07847b80fa0ffd8d1f4db008b115c6fd371c19391b7ccbdcbf0552de9c3351c5872229b4a9081ad53bf74469b
+EBUILD messagelib-20.08.0-r1.ebuild 2165 BLAKE2B c6598bd3209b1bd947fd4e3e5805072553b09519f61f9c89d270981807ca48739c8bf520bd153f1ff5d83285181a686fed83881fdac47649fd986e288cfb0f99 SHA512 5fbae24142e7665d810a3425156a51b07e61d0afc9c57783abb05d0ba66320cd5f352982b9f71dc22fa456bef756a3b5f01dde13a6a3ccc0e0ebfef5214b4162
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/messagelib-20.08.0.ebuild b/kde-apps/messagelib/messagelib-20.08.0-r1.ebuild
similarity index 98%
rename from kde-apps/messagelib/messagelib-20.08.0.ebuild
rename to kde-apps/messagelib/messagelib-20.08.0-r1.ebuild
index 3c2c6b1d266e..a10f6e4a6053 100644
--- a/kde-apps/messagelib/messagelib-20.08.0.ebuild
+++ b/kde-apps/messagelib/messagelib-20.08.0-r1.ebuild
@@ -29,6 +29,7 @@ DEPEND="
>=kde-apps/akonadi-${PVCUT}:5
>=kde-apps/akonadi-contacts-${PVCUT}:5
>=kde-apps/akonadi-mime-${PVCUT}:5
+ >=kde-apps/akonadi-search-${PVCUT}:5
>=kde-apps/grantleetheme-${PVCUT}:5
>=kde-apps/incidenceeditor-${PVCUT}:5
>=kde-apps/kdepim-apps-libs-${PVCUT}:5
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index d57617359d96..4588b1209f2c 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index fadda9f661aa..bcb9f17c522d 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -3,10 +3,12 @@ AUX plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch 1058 BLAKE2B 668
AUX plasma-desktop-5.18.5-animate-column-moves.patch 1133 BLAKE2B 20ae4b0e2188483a8a391ef58865b25c0d6d45019c3a3cfd9f93264b8713a9165a1316f4634909964c7348e1fe6c22ace385a7a74d33aa455fe61209d9276959 SHA512 dcedab90dd0e6cebef4a87a8a8aab3163ed268dd3d5c3223b2bba09edafc184ea8dfd04de202458c1f9789f78580b949976a51fd75e37bfb2e4097968be26703
AUX plasma-desktop-5.18.5-findxorgserver.patch 5195 BLAKE2B b8ebbe59a5a2ef80a6cf5158c33ad58e275a926ea441a90008f8e2a7fc1c175e2b38e72f06d754b131a47f1cf5ef3d2268630816b1a60090c9bab44198ff37b0 SHA512 f81e84c56ddd5591ba59beb1d12654403bef5fd1bb6c51f8d6c404e36ca47cc7fa82a575892627be8aed465253830d3e76c2c89ed6db8ea858b9d705df08184b
AUX plasma-desktop-5.18.5-fix-animate-in-animation.patch 1434 BLAKE2B a84e839180ca1aeb5eddfd07e504d88d8fbfe52ca210d4f976955d753770b5572a5e55c7773368241fa3ff61c38ef7699879b829c19a54e6665d4dbf3fd2570e SHA512 7496b34f1243070160e9875998d1ab5ef5227acb68b4b3545c32f5e4be041459e3234fb56b186c2578cf573dd50251e8be751546bba68b11f6c2d170bb3b7fac
+AUX plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch 6390 BLAKE2B fb0f4c70c94dc583745f92d14f4cb479d71da7c115f58d187ae6931c2dd3435abcfe9c2b773fc851f44fe605f47e2242d801da18a23f7943c025a901da8f28ee SHA512 d5f3820ee21422d46112bd9635bd65ce11068f9cf3bb14cd23c0050f35256b09344d934534794685997e8daeaae709c81e53b5b6ad54e7ecd709c6e5624be040
AUX plasma-desktop-5.18.5-stop-multiplying-duration-values.patch 5184 BLAKE2B 35f25bc8a325b947a44cf64f81e42c53746220329a35335e997a4a6ef8f87834be03f68fff951641e78d322804e08aa4f9e0c76556d41b00335ddf44da4dd643 SHA512 9e604ba5b99bf5e48b2cf1ed5afd7a5a8b413348fbc0c4e7f663660ac27aed8f1f3d268ba2a2b376afe86fee0165e3a27c5c35471ffa7acfae9956a47a50b82f
DIST plasma-desktop-5.18.5.tar.xz 9412644 BLAKE2B cc4ba658e42cf8956f07ef6cdf7e34191d14d922958155ed19a9c5224f6a8dcfc7f1ea0c605066c28eb0d08b714f2f19e321e499bed78055ad2592aa0176d10c SHA512 14f86d1158f976e8f0fbf80fb7f5bea74393febc35592bd95806548883b3bc2e77ee55cc300119275ad322f6b8bcfbed84bb6b78a3a19868ce4695a1fb57a029
DIST plasma-desktop-5.19.4.tar.xz 9423380 BLAKE2B c195d803bf35d928d264e61c7b6e3adb74d5c59c354dd7106c70cb653deaff4792d866786f769ef54363dcfea336021e4be41c8fe952749e10ca0751637c16de SHA512 3885814588dd855ee41246dc26963c9a0718e8737c1bacaaf8b09e0825dc78dd1ab0dafdeb82ab6802a4d4364ab7bce64c2fd6b2a00a537aaf784fe6242f43d1
DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
EBUILD plasma-desktop-5.18.5-r1.ebuild 4865 BLAKE2B 87cf5b0e69bda73c0241cb0059e92b2344a87e625479201b683f20edc96f295dc5e80dfc46b234b5a513721d368c53d26d7df56425a434ee41adad44dc46dec5 SHA512 3290f48cf99c6810874e8c152d171770e57ee8d1400a2acb8d67046dab374c33c2ef2d454464e642b0a1f372742f8d79c9f26af2c4f49be31aab7640386edf46
+EBUILD plasma-desktop-5.18.5-r2.ebuild 4935 BLAKE2B 1334ac02567ae7992a6a8b7f7b94cf54348df407dbe4ef5130dd76bf2df43bcf66949105dfd23ac49aecfd55d63fbdea1026edf43d48d9fc5966fc0ead46ed89 SHA512 a5686e7f768aa87e67b6abbcb20478954027e63d5cea5cd9d545e9ac5699ec1be029d8badad7250b00aab12621b005c196a0b8d64c43b15252e13caaa4c51534
EBUILD plasma-desktop-5.19.4.ebuild 4555 BLAKE2B d47979be2aa2ca62e9c63143719e40135b0966480ea41b323d9f5e351a5651eeae76bfdee4aa964564c7e0b35bf29c5a98aee94ecef02c195fd40a0851b536e8 SHA512 214904acfe78f5438aa6780ef0cb61de8190114616c619a4fb2567ee1bad2d0645a6aae2fcafffaccbe8a4a83f1de450474d250ab8912dd34a01dbec9ea8a2d6
MISC metadata.xml 418 BLAKE2B f68267099811af01f47317ec163041980f834d34a61f6eb5584969e1172b9fa819a635664a1ec8ec49496a42fe0b27ed0cb0de34485e866836719aa185e2d37e SHA512 537579f9f3c1fe8b457826637da7b8fb5ea46986f2a71d28fb2de29fe010d5b08596059bb59160e36f346ba2fea4df18ad16896c27561528e2e9fef139e64ec5
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch
new file mode 100644
index 000000000000..bae49609e52f
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch
@@ -0,0 +1,166 @@
+From e5e5f5ed51aadfac99bfbdf3d2db5be16a12443b Mon Sep 17 00:00:00 2001
+From: Ahmad Samir
+Date: Mon, 10 Aug 2020 13:50:36 +0200
+Subject: [PATCH] kcm_fonts: Make the font selection dialog select the correct
+ "Regular"-like style
+
+Due to KConfig dropping QFont styleName property (for "Regular"-like font
+styles, see [1] for more details), the font selection dialog invoked by the
+KCM could end up selecting the wrong style; this change sets the appropriate
+"Regular" style on the QFont object before invoking the font selection dialog
+to fix/workaround the issue.
+
+Note that in Plasma master branch the issue is handled differently, since
+we switched from QFontDialog to KFontChooserDialog (the latter has that
+logic built-in).
+
+[1] https://phabricator.kde.org/D27735
+
+CCBUG: 420287
+---
+ kcms/fonts/fonts.cpp | 61 +++++++++++++++++--
+ kcms/fonts/fonts.h | 1 +
+ kcms/fonts/package/contents/ui/FontWidget.qml | 7 +--
+ kcms/fonts/package/contents/ui/main.qml | 4 +-
+ 4 files changed, 61 insertions(+), 12 deletions(-)
+
+diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp
+index f771f6e51..c2ccdf777 100644
+--- a/kcms/fonts/fonts.cpp
++++ b/kcms/fonts/fonts.cpp
+@@ -53,23 +53,50 @@
+ /**** DLL Interface ****/
+ K_PLUGIN_FACTORY_WITH_JSON(KFontsFactory, "kcm_fonts.json", registerPlugin();)
+
++// If the styleName property is empty, then we want to set it to
++// the "Regular"-like style provided by the font, so that the font
++// selection dialog selects the correct style from the available styles
++// list; for more details see:
++// https://phabricator.kde.org/D27735 and https://phabricator.kde.org/D27785
++static QFont setRegularFontStyle(const QFont &font)
++{
++ if (!(font.styleName().isEmpty() && font.weight() == QFont::Normal)) {
++ return font;
++ }
++
++ QFont f(font);
++ QFontDatabase fdb;
++ const QStringList styles = fdb.styles(f.family());
++ for (const QString &s : styles) {
++ if (s == QLatin1String("Regular")
++ || s == QLatin1String("Normal")
++ || s == QLatin1String("Book")
++ || s == QLatin1String("Roman")) {
++ f.setStyleName(s);
++ return f;
++ }
++ }
++ return font;
++}
++
+ //from KFontRequester
+ // Determine if the font with given properties is available on the system,
+ // otherwise find and return the best fitting combination.
+ static QFont nearestExistingFont(const QFont &font)
+ {
+- QFontDatabase dbase;
++ QFont _font = setRegularFontStyle(font);
+
++ QFontDatabase dbase;
+ // Initialize font data according to given font object.
+- QString family = font.family();
+- QString style = dbase.styleString(font);
+- qreal size = font.pointSizeF();
++ QString family = _font.family();
++ QString style = dbase.styleString(_font);
++ qreal size = _font.pointSizeF();
+
+ // Check if the family exists.
+ const QStringList families = dbase.families();
+ if (!families.contains(family)) {
+ // Chose another family.
+- family = QFontInfo(font).family(); // the nearest match
++ family = QFontInfo(_font).family(); // the nearest match
+ if (!families.contains(family)) {
+ family = families.count() ? families.at(0) : QStringLiteral("fixed");
+ }
+@@ -614,6 +641,30 @@ bool KFonts::isDefaults() const
+ return m_fontAASettings->isDefaults();
+ }
+
++void KFonts::adjustFont(const QFont &font, const QString &category)
++{
++ QFont _font = setRegularFontStyle(font);
++
++ bool ok = false;
++ QFont selFont = QFontDialog::getFont(&ok, _font, nullptr, i18n("Select Font"));
++
++ if (ok && !m_settings->isImmutable(category)) {
++ if (category == QLatin1String("font")) {
++ m_settings->setFont(selFont);
++ } else if (category == QLatin1String("menuFont")) {
++ m_settings->setMenuFont(selFont);
++ } else if (category == QLatin1String("toolBarFont")) {
++ m_settings->setToolBarFont(selFont);
++ } else if (category == QLatin1String("activeFont")) {
++ m_settings->setActiveFont(selFont);
++ } else if (category == QLatin1String("smallestReadableFont")) {
++ m_settings->setSmallestReadableFont(selFont);
++ } else if (category == QLatin1String("fixed")) {
++ m_settings->setFixed(selFont);
++ }
++ }
++}
++
+ void KFonts::adjustAllFonts()
+ {
+ QFont font = m_settings->font();
+diff --git a/kcms/fonts/fonts.h b/kcms/fonts/fonts.h
+index 51ed2ab60..5959e1995 100644
+--- a/kcms/fonts/fonts.h
++++ b/kcms/fonts/fonts.h
+@@ -153,6 +153,7 @@ public Q_SLOTS:
+ void save() override;
+ void defaults() override;
+ Q_INVOKABLE void adjustAllFonts();
++ Q_INVOKABLE void adjustFont(const QFont &font, const QString &category);
+
+ Q_SIGNALS:
+ void fontsHaveChanged();
+diff --git a/kcms/fonts/package/contents/ui/FontWidget.qml b/kcms/fonts/package/contents/ui/FontWidget.qml
+index b62dd3bf4..5a6be5128 100644
+--- a/kcms/fonts/package/contents/ui/FontWidget.qml
++++ b/kcms/fonts/package/contents/ui/FontWidget.qml
+@@ -57,11 +57,8 @@ FocusScope {
+ Kirigami.MnemonicData.enabled: false
+ focus: true
+ onClicked: {
+- fontDialog.adjustAllFonts = false;
+- fontDialog.currentCategory = root.category
+- fontDialog.font = root.font;
+- fontDialog.currentFont = root.font;
+- fontDialog.open()
++ fontDialog.adjustAllFonts = false
++ kcm.adjustFont(root.font, root.category)
+ }
+ QtControls.ToolTip {
+ visible: parent.hovered
+diff --git a/kcms/fonts/package/contents/ui/main.qml b/kcms/fonts/package/contents/ui/main.qml
+index 4a99c043a..e51fb21ba 100644
+--- a/kcms/fonts/package/contents/ui/main.qml
++++ b/kcms/fonts/package/contents/ui/main.qml
+@@ -264,9 +264,9 @@ KCM.SimpleKCM {
+ property bool adjustAllFonts: false
+ onAccepted: {
+ if (adjustAllFonts) {
+- kcm.adjustAllFonts(font);
++ kcm.adjustAllFonts()
+ } else {
+- kcm.fontsSettings[currentCategory] = font;
++ kcm.adjustFont(font, currentCategory)
+ }
+ }
+ }
+--
+GitLab
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r2.ebuild
new file mode 100644
index 000000000000..5fa672f9e019
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma desktop"
+XORGHDRS="${PN}-override-include-dirs-0"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+fontconfig ibus scim +semantic-desktop"
+
+COMMON_DEPEND="
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/attica-${KFMIN}:5
+ >=kde-frameworks/kactivities-${KFMIN}:5
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kauth-${KFMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kded-${KFMIN}:5
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5
+ >=kde-frameworks/kemoticons-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/krunner-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/plasma-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=kde-frameworks/sonnet-${KFMIN}:5
+ >=kde-plasma/kwin-${PVCUT}:5
+ >=kde-plasma/libksysguard-${PVCUT}:5
+ >=kde-plasma/plasma-workspace-${PVCUT}:5
+ media-libs/phonon[qt5(+)]
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxcb[xkb]
+ x11-libs/libxkbfile
+ fontconfig? (
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libXft
+ x11-libs/xcb-util-image
+ )
+ ibus? (
+ app-i18n/ibus
+ dev-libs/glib:2
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libxcb
+ x11-libs/xcb-util-keysyms
+ )
+ scim? ( app-i18n/scim )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+ >=kde-plasma/breeze-${PVCUT}:5
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
+ >=kde-plasma/oxygen-${PVCUT}:5
+ sys-apps/util-linux
+ x11-apps/setxkbmap
+ !=sys-libs/db-3.2:=
+ !net-mail/vacation"
RDEPEND="${DEPEND}
acct-group/smmsp
acct-user/smmsp
@@ -46,7 +45,7 @@ RDEPEND="${DEPEND}
PDEPEND="!mbox? ( mail-filter/procmail )"
src_prepare() {
- eapply "${FILESDIR}"/"${PN}"-8.14.6-build-system.patch
+ eapply "${FILESDIR}"/"${PN}"-8.16.1-build-system.patch
eapply -p0 "${FILESDIR}"/sendmail-delivered_hdr.patch
local confCC="$(tc-getCC)"
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index c58fbbdbb20f..376672ea7727 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index da3c50b582d9..a51405facbcb 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,3 +1,5 @@
DIST cantarell-fonts-0.111.tar.xz 326216 BLAKE2B dad338329670674cf3815b2045f8f9a739a9e08913189cec67577982e58df8328e0dc185439bffb6bda0529846b844d0b37a3c9615210f23d47616969f7874b2 SHA512 638298a6381a3ede862d1b100fcfea943bebb5e1c0dc4f1597ab2f841e933b484436b139090a669c770c02483a24f2b92bbd12bce71d7a40eb4c325573e3df9e
+DIST cantarell-fonts-0.201.tar.xz 508372 BLAKE2B 5a0fcf66e9c19a54c0051b79305a6b2628a2fa5aa3f67677732ba92a4f7e1ceda0d6c05bc971b1139bb87b8c5fecf8e7a350fb521f56926c072e8a03e35d4399 SHA512 c512244a1ed343b1b9fef3a630c1c678c6ef7f06efcda883af0dbab5478823f31c9bd5fc38b92ad1747704528c6e2589584ab94743f433957644d5386dabdc98
EBUILD cantarell-0.111.ebuild 1268 BLAKE2B 5422c6790d42f2f71805859910b0c7197a4d7a02e042537cc80f421ec6f321f50b7631ff19fdb6db2844a80836b94f897f68fa5fed3b04f92acc8431526ea825 SHA512 945c7dace2e99d4e71f0d586e57887d3c2c9d29479cf6ad4ab306d239ee038a35edf28eb621f7b97187f3cf2ff2453103639eec95a44ab8ed5b1253e78af546d
+EBUILD cantarell-0.201.ebuild 1064 BLAKE2B 7a0da5f3864a5d8f79987be4b5fb6987976d01b536e8c47de1f925b9818c6ca9f52f50e2ab5fb0dd8b691f403df560202c458b185c84b1835cce78bea1af2499 SHA512 1eb8bab44aa6b955fc921aef51e93818c1360f9ed2b9d0853dc3445f5ea3f272a562115a16805907531cbef1d135b564d13c31b71473e18a60fd1d4c5b7c3b54
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-fonts/cantarell/cantarell-0.201.ebuild b/media-fonts/cantarell/cantarell-0.201.ebuild
new file mode 100644
index 000000000000..95dbf3a00a1e
--- /dev/null
+++ b/media-fonts/cantarell/cantarell-0.201.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="${PN}-fonts"
+
+inherit font gnome.org meson
+
+DESCRIPTION="Default fontset for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+BDEPEND="
+ >=sys-devel/gettext-0.20
+ virtual/pkgconfig
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+# Font eclass settings
+FONT_S="${S}/prebuilt"
+FONT_SUFFIX="otf"
+
+src_prepare() {
+ # Leave prebuilt font installation to font.eclass
+ sed -e "/subdir('prebuilt')/d" -i meson.build || die
+
+ default
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dfontsdir=${FONTDIR}
+ -Duseprebuilt=true
+ -Dbuildappstream=true
+ )
+ meson_src_configure
+}
+
+src_install() {
+ font_src_install
+ local DOCS=( NEWS README.md )
+ meson_src_install
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 33a6bd01e926..8b5f5894bb3d 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 933a57453a45..73415ba4f3c6 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -14,6 +14,6 @@ DIST asymptote-2.65.src.tgz 4640419 BLAKE2B a508532b9697a0744d48f8109d5b04ca71eb
DIST asymptote-2.67.src.tgz 4668696 BLAKE2B 30be754a0e5869caad4d605f162dffe688d2dc09a0163a8c37d15fd9d6dd05652b7b0b2710ab31edaa8f4b36484df256d032f8826f3547e755eb90e5dbb179ec SHA512 5854ce51bc7a3d330eeb0887376645c3d292a368b06d01ec84c15ee5beee90ae429abfee1bff5025bdfb51edfa7f66e535c1187f66440df0c6626c79e3de6210
EBUILD asymptote-2.61.ebuild 4627 BLAKE2B e96e10d46b053e2f4e77a7ff95d4462ada1d67c46ada65d5c5f2cf7904c8470ca08a9801a09ea51f3a59e0a2e7371a1a86735b544e25c63ead28ea6f5a9a6879 SHA512 5ad08eabea089f9e96d0f79eb50c1c428a2e3bdb002b0d34417a58af5ed59d4e24eb41adb45241890cbadadc6cb745c00811a0fcd2d5d878e091a210cfcfc095
EBUILD asymptote-2.62.ebuild 4629 BLAKE2B 325473944f50c21e9b7f1336cb406569a1b85c902ff14e37aca970a5586c45adadda1fdeed9c9e9d5858aa2f0ef1d7fd45e8bc4a145d57cda7da4398fb82483f SHA512 31f06d0ca6e5ed329ee76e69ea26fe4868806aecc047a552efa7a1e6cfb06b9f9c2d9fa9f0db16098185342820a997716479361c4ac68b41ad496315283e0bf9
-EBUILD asymptote-2.65.ebuild 4630 BLAKE2B 9a469e084a97cb985a73d008d5a3709bececdf0a6804d844176f34f60de37988c17d366111a865ec428b78e756df360bf949d10feb28a43120cbe37a1cd05243 SHA512 2d64ccb06087ff05cd0e725e376d4709b5df5c38e45a0dd4a687e0d84fc7cc149ce8ceb205e4712cef684bd4891ec13df7a9a8bee890a0a3feda07c7be27e7e4
+EBUILD asymptote-2.65.ebuild 4629 BLAKE2B 2a7ec12b9db7c4ecc297f90488589551bc6c47598f91ef1be2b5769dcdcda3a7bd21fab0ce3c22e2591139b711a375a12e70215d4eb592708a420cfb2f31ee7f SHA512 787257f2b70b8f9f2ccea3b595a967440570aa0a5b4141080c0a383e624dae7d483e11086747e3147de4128e3215bae12f3a2f902e2b25ed6327449717a717d9
EBUILD asymptote-2.67.ebuild 4816 BLAKE2B afc3b823d83c7ad94fba1c04aeba5f77238b9b42e3e8b01950cda82f41aa657c77f6d9235f0e20c8495e85adc73bf008499759148ce5628ddac695e0d5f6e9ac SHA512 82e7b1c5f1add1e1f75e340fb1587c53c65357831800f414e522709042dea0f7373e183f36d981d63b9e681d3d8a5f5adfdb1f5bdb1c03cd7bc58f09fa825a4c
MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee
diff --git a/media-gfx/asymptote/asymptote-2.65.ebuild b/media-gfx/asymptote/asymptote-2.65.ebuild
index 82ccfe7dbec2..be68de6d52cb 100644
--- a/media-gfx/asymptote/asymptote-2.65.ebuild
+++ b/media-gfx/asymptote/asymptote-2.65.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 08bde99afcf5..05913e96c5b3 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -2,11 +2,15 @@ AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096
AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
DIST ImageMagick-6.9.11-23.tar.xz 9077168 BLAKE2B f5b331265d821edd51d22131d466023e20df28ffd5a322cb2fc14de77cc978314d76efe7205e343d91dfdb99cd972c3d7c71691f8f3c5c6bb5e7bf4fb783a704 SHA512 1ef09a542397b35065e160e830a8fcf52f8cf64e23aa7fe14a4a298850c2a0e58ef8e68658a920005f1ef5739a47f801cd6d89af393bd0f3f02f0599dccb70b0
DIST ImageMagick-6.9.11-26.tar.xz 9311964 BLAKE2B 495a481f61817837d323c1652289ebf0fe62fd3d3645f1f4de4c29e1729ba4581f1fe6bb9129c4c289d03cb1ba517f08d56cc23106a421cc77e91fcf045f8176 SHA512 77b0a33c50623efa43a046d177567f0c09a8914cfa19e6a85398929b286cd28faf2cc579028a056b913f42df45362ec8abd715e9f68045038c73afa3c77ed9cc
+DIST ImageMagick-6.9.11-28.tar.xz 9315628 BLAKE2B 8ece7dae4d8c7de695e85b832e5c15c1474e00c9027aeb251a279dc9b51a02f5fd1e96f48987377cd6d937a126e5750e9aef9a11caf64603267b81e6a874f205 SHA512 e2954d1a55a37fa339dd0cbc0ca753e4f783cd77858277e287c033a53ac5f2e96bc5329d069016fc3841d07dc9e8f5b1bb08ecf9ed0224bbc675843132749fdd
DIST ImageMagick-7.0.10-23.tar.xz 9710480 BLAKE2B 9e28cfb497c00c5e20855f7addc9ac053058c2ebfc801b0075b503b667e25eef6a38c203f573dc91d80829439fe627cb09dced31f86ae0c3deb5b93124b7ba6e SHA512 cb20476507f40807fac26f302f4d779f521916bb4e666b6db750deb21c49e8ee6733da4913a3edb4db1c5f8c93f794bea17ded2dd42147b2e9f0f30b951ac180
DIST ImageMagick-7.0.10-27.tar.xz 9708728 BLAKE2B 17a0097cd025c73832d4dc7ddb0d5d06a59f0f8bc9f6dbed23f44cef096c6c596a348db7e136081012f50788aa5c18738df3ec5c975acc2616a1dc245116d4bc SHA512 d7a694ad8cf88d862c071f62b5f779dd82f5a55edac22d6a8ef9c7fef0d61c28a1bbc08d7a52d66b657e19835f06454a2a9ab0c70796e22951d24a461d328849
+DIST ImageMagick-7.0.10-28.tar.xz 9705324 BLAKE2B 0fe890a23b9fc97ceb5253e24ab8236135f4a4f48c1480ad5577c6a2535bf350fcea062b8897fc5e7993ab86716b1e280fabcf664442e3fe9d209e8c2806ea2d SHA512 fcfdacec893bb0a39c4a3caae1ade5ea7d3f6b8909cc73f218260f9f9b354ebe77aecedb2be2e2a64011eceb895c1ecb2fa0f349361387d56fb0f3cde657e158
EBUILD imagemagick-6.9.11.23.ebuild 7049 BLAKE2B a55cac8280b047983a972159734711175d78840a6d29c75ed38366fc07aa4be312c75f523ef4185318f9734df496373e36b0c3170cd89e0859d282935ef3b566 SHA512 524f10eb990b5a5df4af8d0c39e6cf00d30f6d3bda40c0f609a16825d23b2b1b18d5ea10413df97aca1c6a26b0ac05d06c7c902f8a7c0ded4c33106b05566d2b
EBUILD imagemagick-6.9.11.26.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49
+EBUILD imagemagick-6.9.11.28.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49
EBUILD imagemagick-7.0.10.23.ebuild 7338 BLAKE2B c5bd8fa410de6a1fec8a11c9f11d4bc527acf4502ef3d02dfd2f845ee0db2831de6a1734c860aacf224df0e13895aed104d238420b5021b947ba35b91b60149c SHA512 2ff4dc18a4fe408c0aead424af26225f8590607a48a60ac11906603f0cd808e23c0b6b50813f3463f570d3e5c3a9675fb60edc67b2bd8428d073c7ebe0778a17
EBUILD imagemagick-7.0.10.27.ebuild 7346 BLAKE2B 6b3c2522969859e905afddcb92679bed0944d991831822d5bf6e967e0faafed369380f793aa337ac87b3a1af7a1b7290dc0f71094cf6346fdd63d57d49823d97 SHA512 a21b1d1bd706370b2c044c7cd55c290dd7a9ffac55c0c92b86c8f4ac969a14d2d3eca6b9e97decc61099d3f0842e9029f145e0adc4366c1ae153a0333869da74
+EBUILD imagemagick-7.0.10.28.ebuild 7346 BLAKE2B 6b3c2522969859e905afddcb92679bed0944d991831822d5bf6e967e0faafed369380f793aa337ac87b3a1af7a1b7290dc0f71094cf6346fdd63d57d49823d97 SHA512 a21b1d1bd706370b2c044c7cd55c290dd7a9ffac55c0c92b86c8f4ac969a14d2d3eca6b9e97decc61099d3f0842e9029f145e0adc4366c1ae153a0333869da74
EBUILD imagemagick-9999.ebuild 7220 BLAKE2B 12b0db73d15e5d9b5af68912ae1b2907919cc875d73536c261477534fa17363fb8f75b2d63501ab6f844eb9e976893107513968d9e89ccce9d3490cfe93389db SHA512 19ce4536488e465e744a5da210566112de83a6d2df48a1cf9cc44c32a2e9d4ab3a65909ce17ac47e0dc29ccb734a5b52e81f6585dc015a3ad89faa3d72667747
MISC metadata.xml 1106 BLAKE2B e77cabff89df6b98687290ef0ee06d85111a7ddca6f5e1e31f820e6d186a6510c2afd0b85ba31004f102fd7f7b88f46af101f4ba45011aac75afa40b0a714857 SHA512 68a5f9a80b1e3f2e3004252703f9b3176d7c59880a2724ae431fdfd97e8f2adcd7ff7ad2cd8ea8bd35645a3b559052f2c38713647ce7ae889ff1a6061e6b2d92
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.28.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.28.ebuild
new file mode 100644
index 000000000000..02b0c9655fe7
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.28.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+MY_PV="$(ver_rs 3 '-')"
+MY_P="ImageMagick-${MY_PV}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/6.9.11"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+ test? ( corefonts )"
+
+RESTRICT="perl? ( userpriv )
+ !test? ( test )"
+
+RDEPEND="
+ dev-libs/libltdl:0
+ bzip2? ( app-arch/bzip2 )
+ corefonts? ( media-fonts/corefonts )
+ djvu? ( app-text/djvu )
+ fftw? ( sci-libs/fftw:3.0 )
+ fontconfig? ( media-libs/fontconfig )
+ fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+ graphviz? ( media-gfx/graphviz )
+ heif? ( media-libs/libheif:= )
+ jbig? ( >=media-libs/jbigkit-2:= )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+ lcms? ( media-libs/lcms:2= )
+ lqr? ( media-libs/liblqr )
+ opencl? ( virtual/opencl )
+ openexr? ( media-libs/openexr:0= )
+ pango? ( x11-libs/pango )
+ perl? ( >=dev-lang/perl-5.8.8:0= )
+ png? ( media-libs/libpng:0= )
+ postscript? ( app-text/ghostscript-gpl )
+ raw? ( media-libs/libraw:= )
+ svg? (
+ gnome-base/librsvg
+ media-gfx/potrace
+ )
+ tiff? ( media-libs/tiff:0= )
+ truetype? (
+ media-fonts/urw-fonts
+ >=media-libs/freetype-2
+ )
+ webp? ( media-libs/libwebp:0= )
+ wmf? ( media-libs/libwmf )
+ X? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXt
+ )
+ xml? ( dev-libs/libxml2:= )
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+ !media-gfx/graphicsmagick[imagemagick]
+ virtual/pkgconfig
+ X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+#S="${WORKDIR}/ImageMagick6-${MY_PV}"
+
+src_prepare() {
+ default
+
+ # Apply hardening #664236
+ cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+ sed -i -e '/^$/ {
+ r policy-hardening.snippet
+ d
+ }' \
+ config/policy.xml || \
+ die "Failed to apply hardening of policy.xml"
+ einfo "policy.xml hardened"
+
+ elibtoolize # for Darwin modules
+
+ # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+ local mesa_cards ati_cards nvidia_cards render_cards
+ shopt -s nullglob
+ ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+ if test -n "${ati_cards}"; then
+ addpredict "${ati_cards}"
+ fi
+ mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+ if test -n "${mesa_cards}"; then
+ addpredict "${mesa_cards}"
+ fi
+ nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+ if test -n "${nvidia_cards}"; then
+ addpredict "${nvidia_cards}"
+ fi
+ render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+ if test -n "${render_cards}"; then
+ addpredict "${render_cards}"
+ fi
+ shopt -u nullglob
+ addpredict /dev/nvidiactl
+}
+
+src_configure() {
+ local depth=16
+ use q8 && depth=8
+ use q32 && depth=32
+
+ local openmp=disable
+ use openmp && { tc-has-openmp && openmp=enable; }
+
+ use perl && perl_check_env
+
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+ local myeconfargs=(
+ $(use_enable static-libs static)
+ $(use_enable hdri)
+ $(use_enable opencl)
+ --with-threads
+ --with-modules
+ --with-quantum-depth=${depth}
+ $(use_with cxx magick-plus-plus)
+ $(use_with perl)
+ --with-perl-options='INSTALLDIRS=vendor'
+ --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+ $(use_with bzip2 bzlib)
+ $(use_with X x)
+ $(use_with zlib)
+ --without-autotrace
+ $(use_with postscript dps)
+ $(use_with djvu)
+ --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+ $(use_with fftw)
+ $(use_with fpx)
+ $(use_with fontconfig)
+ $(use_with truetype freetype)
+ $(use_with postscript gslib)
+ $(use_with graphviz gvc)
+ $(use_with heif heic)
+ $(use_with jbig)
+ $(use_with jpeg)
+ $(use_with jpeg2k openjp2)
+ $(use_with lcms)
+ $(use_with lqr)
+ $(use_with lzma)
+ $(use_with openexr)
+ $(use_with pango)
+ $(use_with png)
+ $(use_with raw)
+ $(use_with svg rsvg)
+ $(use_with tiff)
+ $(use_with webp)
+ $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+ $(use_with wmf)
+ $(use_with xml)
+ --${openmp}-openmp
+ --with-gcc-arch=no-automagic
+ )
+ CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ # Install default (unrestricted) policy in $HOME for test suite #664238
+ local _im_local_config_home="${HOME}/.config/ImageMagick"
+ mkdir -p "${_im_local_config_home}" || \
+ die "Failed to create IM config dir in '${_im_local_config_home}'"
+ cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+ die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+ local im_command= IM_COMMANDS=()
+ IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+ IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+ IM_COMMANDS+=( "emake check" ) # Run tests
+
+ for im_command in "${IM_COMMANDS[@]}"; do
+ eval "${S}"/magick.sh \
+ ${im_command} || \
+ die "Failed to run \"${im_command}\""
+ done
+}
+
+src_install() {
+ # Ensure documentation installation files and paths with each release!
+ emake \
+ DESTDIR="${D}" \
+ DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+ install
+
+ rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+ dodoc {AUTHORS,README}.txt ChangeLog
+
+ if use perl; then
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+ fi
+
+ find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+ # .la files in parent are not needed, keep plugin .la files
+ rm "${ED}"/usr/$(get_libdir)/*.la || die
+
+ if use opencl; then
+ cat <<-EOF > "${T}"/99${PN}
+ SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+ EOF
+
+ insinto /etc/sandbox.d
+ doins "${T}"/99${PN} #472766
+ fi
+
+ insinto /usr/share/${PN}
+ doins config/*icm
+}
+
+pkg_postinst() {
+ local _show_policy_xml_notice=
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ _show_policy_xml_notice=yes
+ else
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+ # This is an upgrade
+ _show_policy_xml_notice=yes
+
+ # Show this elog only once
+ break
+ fi
+ done
+ fi
+
+ if [[ -n "${_show_policy_xml_notice}" ]]; then
+ elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+ elog "which will prevent the usage of the following coders by default:"
+ elog ""
+ elog " - PS"
+ elog " - PS2"
+ elog " - PS3"
+ elog " - EPS"
+ elog " - PDF"
+ elog " - XPS"
+ fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.28.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.28.ebuild
new file mode 100644
index 000000000000..ac9609f64eff
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.28.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+ inherit git-r3
+ MY_P="imagemagick-9999"
+else
+ MY_PV="$(ver_rs 3 '-')"
+ MY_P="ImageMagick-${MY_PV}"
+ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/7.0.10"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="corefonts? ( truetype )
+ svg? ( xml )
+ test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+ dev-libs/libltdl:0
+ bzip2? ( app-arch/bzip2 )
+ corefonts? ( media-fonts/corefonts )
+ djvu? ( app-text/djvu )
+ fftw? ( sci-libs/fftw:3.0 )
+ fontconfig? ( media-libs/fontconfig )
+ fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+ graphviz? ( media-gfx/graphviz )
+ heif? ( media-libs/libheif:= )
+ jbig? ( >=media-libs/jbigkit-2:= )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+ lcms? ( media-libs/lcms:2= )
+ lqr? ( media-libs/liblqr )
+ opencl? ( virtual/opencl )
+ openexr? ( media-libs/openexr:0= )
+ pango? ( x11-libs/pango )
+ perl? ( >=dev-lang/perl-5.8.8:0= )
+ png? ( media-libs/libpng:0= )
+ postscript? ( app-text/ghostscript-gpl )
+ raw? ( media-libs/libraw:= )
+ svg? (
+ gnome-base/librsvg
+ media-gfx/potrace
+ )
+ tiff? ( media-libs/tiff:0= )
+ truetype? (
+ media-fonts/urw-fonts
+ >=media-libs/freetype-2
+ )
+ webp? ( media-libs/libwebp:0= )
+ wmf? ( media-libs/libwmf )
+ X? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXt
+ )
+ xml? ( dev-libs/libxml2:= )
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+ !media-gfx/graphicsmagick[imagemagick]
+ X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ # Apply hardening #664236
+ cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+ sed -i -e '/^$/ {
+ r policy-hardening.snippet
+ d
+ }' \
+ config/policy.xml || \
+ die "Failed to apply hardening of policy.xml"
+ einfo "policy.xml hardened"
+
+ elibtoolize # for Darwin modules
+
+ # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+ local ati_cards mesa_cards nvidia_cards render_cards
+ shopt -s nullglob
+ ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+ if test -n "${ati_cards}"; then
+ addpredict "${ati_cards}"
+ fi
+ mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+ if test -n "${mesa_cards}"; then
+ addpredict "${mesa_cards}"
+ fi
+ nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+ if test -n "${nvidia_cards}"; then
+ addpredict "${nvidia_cards}"
+ fi
+ render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+ if test -n "${render_cards}"; then
+ addpredict "${render_cards}"
+ fi
+ shopt -u nullglob
+ addpredict /dev/nvidiactl
+}
+
+src_configure() {
+ local depth=16
+ use q8 && depth=8
+ use q32 && depth=32
+
+ local openmp=disable
+ use openmp && { tc-has-openmp && openmp=enable; }
+
+ use perl && perl_check_env
+
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+ local myeconfargs=(
+ $(use_enable static-libs static)
+ $(use_enable hdri)
+ $(use_enable opencl)
+ --with-threads
+ --with-modules
+ --with-quantum-depth=${depth}
+ $(use_with cxx magick-plus-plus)
+ $(use_with perl)
+ --with-perl-options='INSTALLDIRS=vendor'
+ --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+ $(use_with bzip2 bzlib)
+ $(use_with X x)
+ $(use_with zlib)
+ --without-autotrace
+ $(use_with postscript dps)
+ $(use_with djvu)
+ --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+ $(use_with fftw)
+ $(use_with fpx)
+ $(use_with fontconfig)
+ $(use_with truetype freetype)
+ $(use_with postscript gslib)
+ $(use_with graphviz gvc)
+ $(use_with heif heic)
+ $(use_with jbig)
+ $(use_with jpeg)
+ $(use_with jpeg2k openjp2)
+ --without-jxl
+ $(use_with lcms)
+ $(use_with lqr)
+ $(use_with lzma)
+ $(use_with openexr)
+ $(use_with pango)
+ $(use_with png)
+ $(use_with raw)
+ $(use_with svg rsvg)
+ $(use_with tiff)
+ $(use_with webp)
+ $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+ $(use_with wmf)
+ $(use_with xml)
+ --${openmp}-openmp
+ --with-gcc-arch=no-automagic
+ )
+ CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ # Install default (unrestricted) policy in $HOME for test suite #664238
+ local _im_local_config_home="${HOME}/.config/ImageMagick"
+ mkdir -p "${_im_local_config_home}" || \
+ die "Failed to create IM config dir in '${_im_local_config_home}'"
+ cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+ die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+ local im_command= IM_COMMANDS=()
+ if [[ ${PV} == "9999" ]] ; then
+ IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+ else
+ IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+ fi
+ IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+ IM_COMMANDS+=( "emake check" ) # Run tests
+
+ for im_command in "${IM_COMMANDS[@]}"; do
+ eval "${S}"/magick.sh \
+ ${im_command} || \
+ die "Failed to run \"${im_command}\""
+ done
+}
+
+src_install() {
+ # Ensure documentation installation files and paths with each release!
+ emake \
+ DESTDIR="${D}" \
+ DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+ install
+
+ rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+ dodoc {AUTHORS,README}.txt ChangeLog
+
+ if use perl; then
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+ fi
+
+ find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+ # .la files in parent are not needed, keep plugin .la files
+ rm "${ED}"/usr/$(get_libdir)/*.la || die
+
+ if use opencl; then
+ cat <<-EOF > "${T}"/99${PN}
+ SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+ EOF
+
+ insinto /etc/sandbox.d
+ doins "${T}"/99${PN} #472766
+ fi
+
+ insinto /usr/share/${PN}
+ doins config/*icm
+}
+
+pkg_postinst() {
+ local _show_policy_xml_notice=
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ _show_policy_xml_notice=yes
+ else
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+ # This is an upgrade
+ _show_policy_xml_notice=yes
+
+ # Show this elog only once
+ break
+ fi
+ done
+ fi
+
+ if [[ -n "${_show_policy_xml_notice}" ]]; then
+ elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+ elog "which will prevent the usage of the following coders by default:"
+ elog ""
+ elog " - PS"
+ elog " - PS2"
+ elog " - PS3"
+ elog " - EPS"
+ elog " - PDF"
+ elog " - XPS"
+ fi
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 407d7845d448..19c4554ee52e 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/game-music-emu/Manifest b/media-libs/game-music-emu/Manifest
index 9fa4e373465c..d31ec36e057d 100644
--- a/media-libs/game-music-emu/Manifest
+++ b/media-libs/game-music-emu/Manifest
@@ -1,3 +1,4 @@
+AUX game-music-emu-0.6.2-gcc10.patch 546 BLAKE2B ef04c95fbb0fc51afbfaf27d93cb38c689ff07499f3b7362a0c50ccf726082bf68f4b7d6bc36a3abdff9d81a8bb87f650ddac362e989da590471ebbece810e92 SHA512 a09190e164c969760eded45474c965db1ebd53d78485b748d31e067eccc42f32f370ccab80d4ed51bab393d535ccc499ec8212eb4258428417c60b79399691c9
DIST game-music-emu-0.6.2.tar.xz 163052 BLAKE2B 8bce2a5c09eef947f02cfc3521aa380564ddaad5f8a8f40ac38b645fc146332ba1cb6755592892dab00200c169a4d1f94978d80c52976c04e120d9d01c8db9dc SHA512 1808d28b54cbbd8dc5e3240eb27d2e546398fb62ab6577e59430a7543cfdaa06482f70b4750656b73a05f1c1bc0c0254db97d0940271ea2144724e1c44f5da10
-EBUILD game-music-emu-0.6.2.ebuild 465 BLAKE2B aca36bd017df790b3c43169ca2b01730b64adecf43152d7c7877d4fc90c3edc9837bbc1f3669be2d510177ad368b4ff1f6662d0b3a84a10bf8c0db5578c26401 SHA512 6380c5eeeeea1069df97f1a0c55bd3e989256037a4efbd42a31c114434dcf3ca43277ce1e76ceae7f497d78ddc7c28df0eff9bf7fb29fb5b3188456189f61252
+EBUILD game-music-emu-0.6.2.ebuild 526 BLAKE2B c74fa0fd11ceff2781fa702d710f2974c3007228d112cf2b8625eb51183a705ba0c6899cfb0042af73d1e5c5741f6ec0c9003c1612e92f36f30d762929e3bf20 SHA512 0d407ebde76ff506a516a0190c5fd277eba121200bd35ba0901d814aeb69b7bd17007c851581556db69f90d99fd8d3dbfb82a931ab367cd406faf59328643b0b
MISC metadata.xml 400 BLAKE2B 1dd7cab3e13a3364222e52dc2e4c3dcbeb12e4169aaaa4196bc8ab325e42e04aa7b8aaa6fccb64db1de7ed6163d3060fdddb6df21c7243c4c0b3a7b7f28bd3ed SHA512 2abd1362876b6019d1538a6cd6a5740c29c1920037db3f3c622fb7c533a64b6d559ef8cdead9e2fdecc9c64c799fd1d2f8fc5887d493354604e4a99ed77cbf1d
diff --git a/media-libs/game-music-emu/files/game-music-emu-0.6.2-gcc10.patch b/media-libs/game-music-emu/files/game-music-emu-0.6.2-gcc10.patch
new file mode 100644
index 000000000000..620085ca7b78
--- /dev/null
+++ b/media-libs/game-music-emu/files/game-music-emu-0.6.2-gcc10.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,7 +66,7 @@
+ if (__LIBGME_TEST_VISIBILITY)
+ # get the gcc version
+ exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
+- string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++ string (REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" _gcc_version "${_gcc_version_info}")
+
+ # gcc <4.1 had poor support for symbol visibility
+ if ((${_gcc_version} VERSION_GREATER "4.1") OR (${_gcc_version} VERSION_EQUAL "4.1"))
diff --git a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild b/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
index 0ff5dae7ee70..54d6d0478cd6 100644
--- a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
+++ b/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
@@ -15,3 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 x86"
IUSE=""
DOCS=( changes.txt design.txt gme.txt readme.txt )
+
+PATCHES=(
+ "${FILESDIR}/game-music-emu-0.6.2-gcc10.patch"
+)
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 81e0a92cc0ba..0762be6fd09a 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,7 +1,8 @@
AUX ilmbase-2.3.0-fix-bashisms.patch 8531 BLAKE2B e21eb0c1d2ec002867048923f94f6521d9f247854febbc35eb1ba8720491a9f46fff899d68719b3b542524cccf21adae6267703801faa65542c2b93c7d588d40 SHA512 972285da78ad70c9efa6b1477621fc3f73270711a5ffa40cd1d11762f83e846716782124eb9a38adf1b99f6edc5858a66648e7ab8c54946f15b7b93aa19f8f7b
AUX ilmbase-2.3.0-testBox.patch 2826 BLAKE2B ddafd231e641cd518ca864e6aa27f88b24b81f1bed29fe05fe79accc033484479e891482529ead24ddc2b1b931d808eb20a6b960f7281da83357b637c3d937ca SHA512 81eb09823fed3841742ef8b85b262d9d6fbce97ae87fdc5e902c4d85c7f8c7a01b7be08acac23fee5c5cfdb8815f410b200f2af4039ade0cedd31866312015db
+AUX ilmbase-2.5.2-musl.patch 2134 BLAKE2B eb22304535301b717adf2397343b6f43bfcfb900497d0e549cfc19b78ab9af6511c37aeee77a7f8f99e9214e1519b7fbf808bab28eb9fce63be65a04eb9ac177 SHA512 3505444148a3062f853dea35abf5b2e932c7caf72416c5b083e324cb2b1fcb54fee20f240bfb36c4b1c9d226765ad4520f7784feaf9ea4b7c17009480abab486
DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
DIST ilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
EBUILD ilmbase-2.3.0.ebuild 1046 BLAKE2B bc325b9ab9c6d00ba9602f376ddad08034e09124362fd2a2e24ff7aa9ebc3d826d2fd32408f36983696c8a2305def61667d928b9637229aa18ae65b1bc9bf19b SHA512 2b55b35fd05331d8847946b2253ef7467a1b8f1de06dc4966c1a8da02be05f7eb6e91ff6a651f0d28af74955793bd18ec692fd384b5869e7f752f55eede39290
-EBUILD ilmbase-2.5.2.ebuild 1285 BLAKE2B a67eee7bf6e393d793d5d19b09f4e7948bce3fd5b11affcbec2460900adb58ad33dce562a00865e56892623af1623979f6234fdc5f623654962b3b104c6f4ec9 SHA512 2d1587ef4cb691bf6b8b3a876b08ae2eda01604fc62f7544b294e6c137cd18dafd6f365d8bd2b57e961d13173006bf6c565bcef2d6b38dee1322d4eb437651d2
+EBUILD ilmbase-2.5.2.ebuild 1328 BLAKE2B d155d7586a8a6bce9f95727a7176919ab3363fcaef6bf67893a81228723b6b3474255d8814666138d85f9c4ce162699b392909ced91cfff077a12fde770b3648 SHA512 5e56f93bb7853c8dfa8bed4819e5db15f50a5541a3dfcf949227ba7434f6647659e55b230be6b84819e3f73c3ce00d677770735f875bd592c9f57e6e7e7ef4da
MISC metadata.xml 653 BLAKE2B 355a987fbbb2073049234f241a5574b0f023b82c8b7597145bc4242eb084a7499fc13d5a4dff56cc5c608fc56d8d264affa2045bf8f35875a7dae54828a51143 SHA512 bde3f1221e1cde98af0137b166c41b39f0342875217ee002e0c754f66fbb921ab4fc9657befa62ddfc97ee07fd9b53fccc3c12fba2a5ab7788bdf0120109f9d2
diff --git a/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch b/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch
new file mode 100644
index 000000000000..80f11e44c12e
--- /dev/null
+++ b/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch
@@ -0,0 +1,50 @@
+From c7af102e6bce6638add2f38576ffe9c6741ba768 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?=
+Date: Thu, 30 Jul 2020 02:21:07 +0200
+Subject: [PATCH] IexMathFpu.cpp: Fix build on non-glibc (e.g. musl libc).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Originally from:
+https://github.com/void-linux/void-packages/blob/80bbc168faa25448bd3399f4df331b836e74b85c/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+
+Fixes error:
+
+ IlmBase/IexMath/IexMathFpu.cpp: In function ‘void Iex_2_4::FpuControl::restoreControlRegs(const ucontext_t&, bool)’:
+ IlmBase/IexMath/IexMathFpu.cpp:284:38: error: ‘struct _fpstate’ has no member named ‘cw’; did you mean ‘cwd’?
+ 284 | setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
+ | ^~
+ | cwd
+ IlmBase/IexMath/IexMathFpu.cpp:287:20: error: ‘struct Iex_2_4::FpuControl::_fpstate_64’ has no member named ‘magic’
+ 287 | setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
+ | ^~~~~
+
+Signed-off-by: Niklas Hambüchen
+---
+ IlmBase/IexMath/IexMathFpu.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/IlmBase/IexMath/IexMathFpu.cpp b/IlmBase/IexMath/IexMathFpu.cpp
+index ceed658e0..439329e50 100644
+--- a/IexMath/IexMathFpu.cpp
++++ b/IexMath/IexMathFpu.cpp
+@@ -281,10 +281,18 @@ restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
+ inline void
+ restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
+ {
++#if defined(__GLIBC__) || defined(__i386__)
+ setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
++#else
++ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
++#endif
+
+ _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
++#if defined(__GLIBC__) || defined(__i386__)
+ setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
++#else
++ setMxcsr (kfp->mxcsr, clearExceptions);
++#endif
+ }
+
+ #endif
diff --git a/media-libs/ilmbase/ilmbase-2.5.2.ebuild b/media-libs/ilmbase/ilmbase-2.5.2.ebuild
index 47154bbc258f..3e9e28c44118 100644
--- a/media-libs/ilmbase/ilmbase-2.5.2.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.5.2.ebuild
@@ -22,6 +22,8 @@ S="${WORKDIR}/openexr-${PV}/IlmBase"
MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfigInternal.h )
+PATCHES=( "${FILESDIR}"/${P}-musl.patch )
+
multilib_src_configure() {
local mycmakeargs=(
-DBUILD_TESTING=$(usex test)
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 7b620bde3ca0..1762ffd3d6e5 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,10 +1,6 @@
-AUX 1.78.0-gnuplot.patch 672 BLAKE2B 85058c0eab02b289df011f3e4462d91c43e9780591c0991206523d55ce91f02fab85ff47c235522614862e14f078d5e0879fd89b88e70607167f91d57f7b63c0 SHA512 846d5488667b3a21dea81a7059505cdfd2916eff51053dadda978f1520a250ce8ebfdf7b5a820e11630dee4dfb9c0b78340aed9dc109f6fd119e01b855c16554
-AUX 1.79.0-tests.patch 15489 BLAKE2B 8fcc6224c055f24d9ac794f4d18be756e8c15f2a789964a1b5795d0c78411fc946d0ed230be7760d543055bfdf2de1fb63c9dda62613146b46b4036b3c734c32 SHA512 b10137bd865c23a74bd0eac79b97adf6d394bb5e651d524df3dd8cb000bd762230d391212e53f40343863743d52a59e45298b8855b39fc2befb507a3972fc181
AUX baseline_reg.patch 847 BLAKE2B d45b93ba00abffca157438b6140e329de2cafe95be97fafcfc60272fa821fb847984838179cff186babf8931f79decdccb1bfa0a724abc6de675b1551ff0684e SHA512 a35f518aaf384ed35130cbd509e2ae16efc1878a3528d174156105af6d6259a094d205c47084f068b1f42e07ab87e750d6b82113376e00e041e81fedf90dd541
DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
-DIST leptonica-1.78.0.tar.gz 12905925 BLAKE2B 6a7b74e8aa78a3e4fa6429bbf180001e7d362ebd37d4fd179ba90df7a41993e52d708813ea5a2b30dc90516b7bec83e5386735025993d73f279ab595c39f6c9c SHA512 f059ccc8e7b5ff2c796aeb4ab18bd25e133ec4f38c36b9e2ee203db35a1e68cf45b8baf78ebc4acba4e3607328d1374ea0e8425f35cbe06c6c5728a1ec8c3f50
-DIST leptonica-1.79.0.tar.gz 13438669 BLAKE2B 59c126c0bc4690cf48937171f818637f420b4e4c56ebf866ca4c0d2a9a8f2ae2653f6ef7650340138fb1dd2ca2d3826e0f844d44afddb14856e31daf10f41c41 SHA512 4d0830683757004bb47752a17985d80c6758b97c0fd6ec64d23bbf43c9c68b04bee751831574afa4c25f5d5030c0c9f7fc22d9fc8ef932aa990401344f588ba5
+DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c SHA512 f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147
EBUILD leptonica-1.74.4.ebuild 1746 BLAKE2B 3db9bed04781b057ad93acca2d0a1a8ba26627c992e7dd1907a6efc9ce05447378a26efb7062f4b26c3966dcda8b01f63fa8ff4c4ab7b9f14c92ecb4881030ed SHA512 aec17f1f1f49dbee29efca27c2d89d1674a8a5c3de87e77b24fd2708a94debc6c7eda3d3fb721d67468c455457dfa9b7fdaf7291fd6f5142da596c85f757c600
-EBUILD leptonica-1.78.0.ebuild 2022 BLAKE2B c85beb7d51ead3f8d623b3f827960f30be744daad608248c99cb4d26c726b1096d24019b1bdeadf55ce706c4f93d5a18d636f7fa7fd74396948d33ca6c0f45d5 SHA512 963f0a3e72ad715442aee66f6aa4b0f3e1c8efccb1718da3f1799319278afab2e99b12463204ea2a4d99d735063ed069c39d94cf4fe989da1d3bcf3991c59ecc
-EBUILD leptonica-1.79.0-r1.ebuild 2070 BLAKE2B 495d494ba3b2a5d13d5f0c61952d184f3813670e69b9f5988c433251ef88e2f8074c0276603035aceb6883ad1f738fb5e677c505f4a8052b581c06c3ffae25cd SHA512 90efb38a2a75f903842b571c647759f2833a8b7e4160805607c51d517119d8024b6c62afa937f8603bb9505ccda44764af081ee546560b5bfc3299a48f251287
+EBUILD leptonica-1.80.0.ebuild 2024 BLAKE2B a6f08294f1183051c19593538b26912629605bcd7872e3c054199fff7ef953157f2ef4a683a29936087263030dc97bfbe10988caf68e8371d140594447330825 SHA512 25f9a6fea60204f9f7a0c919578a617cab49801f275cdc9ff054fd5e67190c7d3630003c1e27de300f3cafb92c069432c94f31208a04d8683ef79121e6777a60
MISC metadata.xml 518 BLAKE2B 59db99ac81e5c10275950d5c67e1c85c61c48f9eef84d533606a26beb1f3b6b3c1eb844a163687376a74dcd9561dfc91f6b85df4202a20ecf3c58f8e1201b88e SHA512 2a34197102a9d9d90faa90aa2f19e78e8a848e779ad3ad0f1bdb7d3d9d91572749ce2351c402403a0281019af1b59e0fd19c4e1809bd00836cede17647391773
diff --git a/media-libs/leptonica/files/1.78.0-gnuplot.patch b/media-libs/leptonica/files/1.78.0-gnuplot.patch
deleted file mode 100644
index 758b78258dd3..000000000000
--- a/media-libs/leptonica/files/1.78.0-gnuplot.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh
-index cee1f54..f16d980 100755
---- a/prog/reg_wrapper.sh
-+++ b/prog/reg_wrapper.sh
-@@ -31,7 +31,7 @@ TEST_NAME="${TEST##*/}"
- TEST_NAME="${TEST_NAME%_reg*}"
-
- case "${TEST_NAME}" in
-- baseline|boxa[12]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|projection|rankbin|rankhisto|wordboxes)
-+ baseline|boxa[1234]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|projection|rankbin|rankhisto|wordboxes)
- GNUPLOT=$(type -P gnuplot || type -P wgnuplot)
-
- if [ -z "${GNUPLOT}" ] || ! "${GNUPLOT}" -e "set terminal png" 2>/dev/null ; then
diff --git a/media-libs/leptonica/files/1.79.0-tests.patch b/media-libs/leptonica/files/1.79.0-tests.patch
deleted file mode 100644
index eb794240dbd1..000000000000
--- a/media-libs/leptonica/files/1.79.0-tests.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-From b4cdb9256934c8f35cad558bf7288567211a792f Mon Sep 17 00:00:00 2001
-From: James Le Cuirot
-Date: Tue, 24 Mar 2020 20:59:17 +0000
-Subject: [PATCH] Fix parallel running of tests by using unique directories
-
-diff --git a/prog/pdfio2_reg.c b/prog/pdfio2_reg.c
-index 3f2090d..19da5a3 100644
---- a/prog/pdfio2_reg.c
-+++ b/prog/pdfio2_reg.c
-@@ -55,7 +55,7 @@ L_REGPARAMS *rp;
- return 1;
-
- l_pdfSetDateAndVersion(0);
-- lept_mkdir("lept/pdf");
-+ lept_mkdir("lept/pdf2");
-
- /* ---------- pdf convert segmented with image regions ---------- */
- fprintf(stderr, "\n*** Writing segmented images with image regions\n");
-@@ -65,6 +65,12 @@ L_REGPARAMS *rp;
- * small bogus regions at the top, but we'll keep them for
- * the demonstration. */
- pix1 = pixRead("rabi.png");
-+ pix2 = pixScaleToGray2(pix1);
-+ pixWrite("/tmp/lept/pdf2/rabi8.jpg", pix2, IFF_JFIF_JPEG);
-+ pix3 = pixThresholdTo4bpp(pix2, 16, 1);
-+ pixWrite("/tmp/lept/pdf2/rabi4.png", pix3, IFF_PNG);
-+ pixDestroy(&pix2);
-+ pixDestroy(&pix3);
- pixSetResolution(pix1, 300, 300);
- pixGetDimensions(pix1, &w, &h, NULL);
- pix2 = pixGenerateHalftoneMask(pix1, NULL, NULL, NULL);
-@@ -77,41 +83,41 @@ L_REGPARAMS *rp;
-
- /* 1 bpp input */
- convertToPdfSegmented("rabi.png", 300, L_G4_ENCODE, 128, boxa1,
-- 0, 0.25, NULL, "/tmp/lept/pdf/file00.pdf");
-+ 0, 0.25, NULL, "/tmp/lept/pdf2/file00.pdf");
- convertToPdfSegmented("rabi.png", 300, L_JPEG_ENCODE, 128, boxa1,
-- 0, 0.25, NULL, "/tmp/lept/pdf/file01.pdf");
-+ 0, 0.25, NULL, "/tmp/lept/pdf2/file01.pdf");
- convertToPdfSegmented("rabi.png", 300, L_FLATE_ENCODE, 128, boxa1,
-- 0, 0.25, NULL, "/tmp/lept/pdf/file02.pdf");
-+ 0, 0.25, NULL, "/tmp/lept/pdf2/file02.pdf");
-
- /* 8 bpp input, no cmap */
-- convertToPdfSegmented("/tmp/lept/pdf/rabi8.jpg", 150, L_G4_ENCODE, 128,
-- boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file03.pdf");
-- convertToPdfSegmented("/tmp/lept/pdf/rabi8.jpg", 150, L_JPEG_ENCODE, 128,
-- boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file04.pdf");
-- convertToPdfSegmented("/tmp/lept/pdf/rabi8.jpg", 150, L_FLATE_ENCODE, 128,
-- boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file05.pdf");
-+ convertToPdfSegmented("/tmp/lept/pdf2/rabi8.jpg", 150, L_G4_ENCODE, 128,
-+ boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file03.pdf");
-+ convertToPdfSegmented("/tmp/lept/pdf2/rabi8.jpg", 150, L_JPEG_ENCODE, 128,
-+ boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file04.pdf");
-+ convertToPdfSegmented("/tmp/lept/pdf2/rabi8.jpg", 150, L_FLATE_ENCODE, 128,
-+ boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file05.pdf");
-
- /* 4 bpp input, cmap */
-- convertToPdfSegmented("/tmp/lept/pdf/rabi4.png", 150, L_G4_ENCODE, 128,
-- boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file06.pdf");
-- convertToPdfSegmented("/tmp/lept/pdf/rabi4.png", 150, L_JPEG_ENCODE, 128,
-- boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file07.pdf");
-- convertToPdfSegmented("/tmp/lept/pdf/rabi4.png", 150, L_FLATE_ENCODE, 128,
-- boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file08.pdf");
-+ convertToPdfSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_G4_ENCODE, 128,
-+ boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file06.pdf");
-+ convertToPdfSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_JPEG_ENCODE, 128,
-+ boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file07.pdf");
-+ convertToPdfSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_FLATE_ENCODE, 128,
-+ boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file08.pdf");
-
- /* 4 bpp input, cmap, data output */
- data = NULL;
-- convertToPdfDataSegmented("/tmp/lept/pdf/rabi4.png", 150, L_G4_ENCODE,
-+ convertToPdfDataSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_G4_ENCODE,
- 128, boxa2, 0, 0.5, NULL, &data, &nbytes);
-- l_binaryWrite("/tmp/lept/pdf/file09.pdf", "w", data, nbytes);
-+ l_binaryWrite("/tmp/lept/pdf2/file09.pdf", "w", data, nbytes);
- lept_free(data);
-- convertToPdfDataSegmented("/tmp/lept/pdf/rabi4.png", 150, L_JPEG_ENCODE,
-+ convertToPdfDataSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_JPEG_ENCODE,
- 128, boxa2, 0, 0.5, NULL, &data, &nbytes);
-- l_binaryWrite("/tmp/lept/pdf/file10.pdf", "w", data, nbytes);
-+ l_binaryWrite("/tmp/lept/pdf2/file10.pdf", "w", data, nbytes);
- lept_free(data);
-- convertToPdfDataSegmented("/tmp/lept/pdf/rabi4.png", 150, L_FLATE_ENCODE,
-+ convertToPdfDataSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_FLATE_ENCODE,
- 128, boxa2, 0, 0.5, NULL, &data, &nbytes);
-- l_binaryWrite("/tmp/lept/pdf/file11.pdf", "w", data, nbytes);
-+ l_binaryWrite("/tmp/lept/pdf2/file11.pdf", "w", data, nbytes);
- lept_free(data);
- fprintf(stderr, "Segmented images time: %7.3f\n", stopTimer());
-
-@@ -125,17 +131,17 @@ L_REGPARAMS *rp;
-
- pix1 = pixRead("candelabrum.011.jpg");
- pix2 = pixScale(pix1, 3.0, 3.0);
-- pixWrite("/tmp/lept/pdf/candelabrum3.jpg", pix2, IFF_JFIF_JPEG);
-- GetImageMask(pix2, 200, &boxa1, rp, "/tmp/lept/pdf/seg1.jpg");
-- convertToPdfSegmented("/tmp/lept/pdf/candelabrum3.jpg", 200, L_G4_ENCODE,
-+ pixWrite("/tmp/lept/pdf2/candelabrum3.jpg", pix2, IFF_JFIF_JPEG);
-+ GetImageMask(pix2, 200, &boxa1, rp, "/tmp/lept/pdf2/seg1.jpg");
-+ convertToPdfSegmented("/tmp/lept/pdf2/candelabrum3.jpg", 200, L_G4_ENCODE,
- 100, boxa1, 0, 0.25, NULL,
-- "/tmp/lept/pdf/file12.pdf");
-- convertToPdfSegmented("/tmp/lept/pdf/candelabrum3.jpg", 200, L_JPEG_ENCODE,
-+ "/tmp/lept/pdf2/file12.pdf");
-+ convertToPdfSegmented("/tmp/lept/pdf2/candelabrum3.jpg", 200, L_JPEG_ENCODE,
- 100, boxa1, 0, 0.25, NULL,
-- "/tmp/lept/pdf/file13.pdf");
-- convertToPdfSegmented("/tmp/lept/pdf/candelabrum3.jpg", 200, L_FLATE_ENCODE,
-+ "/tmp/lept/pdf2/file13.pdf");
-+ convertToPdfSegmented("/tmp/lept/pdf2/candelabrum3.jpg", 200, L_FLATE_ENCODE,
- 100, boxa1, 0, 0.25, NULL,
-- "/tmp/lept/pdf/file14.pdf");
-+ "/tmp/lept/pdf2/file14.pdf");
-
- pixDestroy(&pix1);
- pixDestroy(&pix2);
-@@ -143,25 +149,25 @@ L_REGPARAMS *rp;
-
- pix1 = pixRead("lion-page.00016.jpg");
- pix2 = pixScale(pix1, 3.0, 3.0);
-- pixWrite("/tmp/lept/pdf/lion16.jpg", pix2, IFF_JFIF_JPEG);
-+ pixWrite("/tmp/lept/pdf2/lion16.jpg", pix2, IFF_JFIF_JPEG);
- pix3 = pixRead("lion-mask.00016.tif");
- boxa1 = pixConnComp(pix3, NULL, 8);
- boxa2 = boxaTransform(boxa1, 0, 0, 3.0, 3.0);
-- convertToPdfSegmented("/tmp/lept/pdf/lion16.jpg", 200, L_G4_ENCODE,
-- 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file15.pdf");
-- convertToPdfSegmented("/tmp/lept/pdf/lion16.jpg", 200, L_JPEG_ENCODE,
-- 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file16.pdf");
-- convertToPdfSegmented("/tmp/lept/pdf/lion16.jpg", 200, L_FLATE_ENCODE,
-- 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file17.pdf");
-+ convertToPdfSegmented("/tmp/lept/pdf2/lion16.jpg", 200, L_G4_ENCODE,
-+ 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file15.pdf");
-+ convertToPdfSegmented("/tmp/lept/pdf2/lion16.jpg", 200, L_JPEG_ENCODE,
-+ 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file16.pdf");
-+ convertToPdfSegmented("/tmp/lept/pdf2/lion16.jpg", 200, L_FLATE_ENCODE,
-+ 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file17.pdf");
-
- /* Quantize the non-image part and flate encode.
- * This is useful because it results in a smaller file than
- * when you flate-encode the un-quantized non-image regions. */
- pix4 = pixScale(pix3, 3.0, 3.0); /* higher res mask, for combining */
- pix5 = QuantizeNonImageRegion(pix2, pix4, 12);
-- pixWrite("/tmp/lept/pdf/lion16-quant.png", pix5, IFF_PNG);
-- convertToPdfSegmented("/tmp/lept/pdf/lion16-quant.png", 200, L_FLATE_ENCODE,
-- 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file18.pdf");
-+ pixWrite("/tmp/lept/pdf2/lion16-quant.png", pix5, IFF_PNG);
-+ convertToPdfSegmented("/tmp/lept/pdf2/lion16-quant.png", 200, L_FLATE_ENCODE,
-+ 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file18.pdf");
- fprintf(stderr, "Color segmented images time: %7.3f\n", stopTimer());
-
- pixDestroy(&pix1);
-@@ -197,8 +203,8 @@ L_REGPARAMS *rp;
-
- startTimer();
- convertFilesToPdf("/tmp/lept/image", "file", 100, 0.8, 0, 75, "4 file test",
-- "/tmp/lept/pdf/file19.pdf");
-- fprintf(stderr, "4-page pdf generated: /tmp/lept/pdf/file19.pdf\n"
-+ "/tmp/lept/pdf2/file19.pdf");
-+ fprintf(stderr, "4-page pdf generated: /tmp/lept/pdf2/file19.pdf\n"
- "Multi-page gen time: %7.3f\n", stopTimer());
- pixDestroy(&pix1);
- pixDestroy(&pix2);
-@@ -208,26 +214,26 @@ L_REGPARAMS *rp;
- pixDestroy(&pix6);
- #endif
-
-- regTestCheckFile(rp, "/tmp/lept/pdf/file00.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file01.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file02.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file03.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file04.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file05.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file06.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file07.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file08.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file09.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file10.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file11.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file12.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file13.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file14.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file15.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file16.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file17.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file18.pdf");
-- regTestCheckFile(rp, "/tmp/lept/pdf/file19.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file00.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file01.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file02.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file03.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file04.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file05.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file06.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file07.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file08.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file09.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file10.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file11.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file12.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file13.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file14.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file15.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file16.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file17.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file18.pdf");
-+ regTestCheckFile(rp, "/tmp/lept/pdf2/file19.pdf");
-
- #if 1
- /* ------------------ Test multipage pdf generation ----------------- */
-@@ -235,9 +241,9 @@ L_REGPARAMS *rp;
-
- /* Generate a multi-page pdf from all these files */
- startTimer();
-- concatenatePdf("/tmp/lept/pdf", "file", "/tmp/lept/pdf/cat_lept.pdf");
-+ concatenatePdf("/tmp/lept/pdf2", "file", "/tmp/lept/pdf2/cat_lept.pdf");
- fprintf(stderr,
-- "All files have been concatenated: /tmp/lept/pdf/cat_lept.pdf\n"
-+ "All files have been concatenated: /tmp/lept/pdf2/cat_lept.pdf\n"
- "Concatenation time: %7.3f\n", stopTimer());
- #endif
-
-@@ -249,7 +255,7 @@ L_REGPARAMS *rp;
- lept_mkdir("lept/good");
- lept_cp("testfile1.pdf", "lept/good", NULL, NULL);
- lept_cp("testfile2.pdf", "lept/good", NULL, NULL);
-- concatenatePdf("/tmp/lept/good", "file", "/tmp/lept/pdf/good.pdf");
-+ concatenatePdf("/tmp/lept/good", "file", "/tmp/lept/pdf2/good.pdf");
-
- /* Make a bad version with the pdf id removed, so that it is not
- * recognized as a pdf */
-@@ -273,8 +279,8 @@ L_REGPARAMS *rp;
- fprintf(stderr, "\nWe attempt to build from a bad directory\n");
- fprintf(stderr, "The next 3 error messages are intentional\n");
- lept_cp("testfile1.pdf", "lept/bad", NULL, NULL);
-- concatenatePdf("/tmp/lept/bad", "file", "/tmp/lept/pdf/bad.pdf");
-- filesAreIdentical("/tmp/lept/pdf/good.pdf", "/tmp/lept/pdf/bad.pdf", &same);
-+ concatenatePdf("/tmp/lept/bad", "file", "/tmp/lept/pdf2/bad.pdf");
-+ filesAreIdentical("/tmp/lept/pdf/good.pdf", "/tmp/lept/pdf2/bad.pdf", &same);
- if (same)
- fprintf(stderr, "Fixed: files are the same\n"
- "Attempt succeeded\n");
-@@ -290,8 +296,8 @@ L_REGPARAMS *rp;
- l_int32 ret;
-
- fprintf(stderr, "\n*** pdftk writes multipage pdfs from images\n");
-- tempfile1 = genPathname("/tmp/lept/pdf", "file*.pdf");
-- tempfile2 = genPathname("/tmp/lept/pdf", "cat_pdftk.pdf");
-+ tempfile1 = genPathname("/tmp/lept/pdf2", "file*.pdf");
-+ tempfile2 = genPathname("/tmp/lept/pdf2", "cat_pdftk.pdf");
- snprintf(buffer, sizeof(buffer), "pdftk %s output %s",
- tempfile1, tempfile2);
- ret = system(buffer); /* pdftk */
-diff --git a/prog/webpanimio_reg.c b/prog/webpanimio_reg.c
-index 8f61aab..3938e16 100644
---- a/prog/webpanimio_reg.c
-+++ b/prog/webpanimio_reg.c
-@@ -75,8 +75,8 @@ L_REGPARAMS *rp;
- return 0;
- #endif /* abort */
-
-- lept_rmdir("lept/webp");
-- lept_mkdir("lept/webp");
-+ lept_rmdir("lept/webpanim");
-+ lept_mkdir("lept/webpanim");
-
- niters = 5;
- duration = 250; /* ms */
-@@ -85,9 +85,9 @@ L_REGPARAMS *rp;
- pixa = pixaCreate(6);
- pixaAddPix(pixa, pix1, L_COPY);
- pixaAddPix(pixa, pix2, L_COPY);
-- pixaWriteWebPAnim("/tmp/lept/webp/margeanim.webp", pixa, niters,
-+ pixaWriteWebPAnim("/tmp/lept/webpanim/margeanim.webp", pixa, niters,
- duration, 80, 0);
-- regTestCheckFile(rp, "/tmp/lept/webp/margeanim.webp");
-+ regTestCheckFile(rp, "/tmp/lept/webpanim/margeanim.webp");
- pixaDestroy(&pixa);
- pixDestroy(&pix1);
- pixDestroy(&pix2);
-diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh
-index 94a6fa3..804954c 100755
---- a/prog/reg_wrapper.sh
-+++ b/prog/reg_wrapper.sh
-@@ -31,7 +31,7 @@ TEST_NAME="${TEST##*/}"
- TEST_NAME="${TEST_NAME%_reg*}"
-
- case "${TEST_NAME}" in
-- baseline|boxa[1234]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|projection|rankbin|rankhisto|wordboxes)
-+ baseline|boxa[1234]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|pixa1|projection|rankbin|rankhisto|wordboxes)
- GNUPLOT=$(which gnuplot || which wgnuplot)
-
- if [ -z "${GNUPLOT}" ] || ! "${GNUPLOT}" -e "set terminal png" 2>/dev/null ; then
---
-2.25.1
diff --git a/media-libs/leptonica/leptonica-1.78.0.ebuild b/media-libs/leptonica/leptonica-1.78.0.ebuild
deleted file mode 100644
index 12157b1bdd76..000000000000
--- a/media-libs/leptonica/leptonica-1.78.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="C library for image processing and analysis"
-HOMEPAGE="http://www.leptonica.org/"
-SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
-RESTRICT="!test? ( test )"
-
-# N.B. Tests need some features enabled:
-REQUIRED_USE="test? ( jpeg png tiff zlib )"
-
-RDEPEND="gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}]
- sys-libs/zlib:=[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
- test? ( media-libs/tiff:0[zlib] )"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-gnuplot.patch
-)
-
-ECONF_SOURCE="${S}"
-DOCS=( README version-notes )
-
-src_prepare() {
- default
-
- # unhtmlize docs
- local X
- for X in ${DOCS[@]}; do
- awk '/<\/pre>/{s--} {if (s) print $0} //{s++}' \
- "${X}.html" > "${X}" || die 'awk failed'
- rm -f -- "${X}.html"
- done
-}
-
-multilib_src_configure() {
- econf \
- --enable-shared \
- $(use_with gif giflib) \
- $(use_with jpeg) \
- $(use_with jpeg2k libopenjpeg) \
- $(use_with png libpng) \
- $(use_with tiff libtiff) \
- $(use_with webp libwebp) \
- $(use_with zlib) \
- $(use_enable static-libs static) \
- $(multilib_native_use_enable utils programs)
-}
-
-multilib_src_test() {
- default
-
- # ${TMPDIR} is not respected. It used to be but it lead to issues
- # and there have been long debates with upstream about it. :(
- rm -rf /tmp/lept/ || die
-}
-
-multilib_src_install_all() {
- # libtool archives covered by pkg-config.
- find "${D}" -name "*.la" -delete || die
-}
diff --git a/media-libs/leptonica/leptonica-1.79.0-r1.ebuild b/media-libs/leptonica/leptonica-1.80.0.ebuild
similarity index 97%
rename from media-libs/leptonica/leptonica-1.79.0-r1.ebuild
rename to media-libs/leptonica/leptonica-1.80.0.ebuild
index 52aa41650f9f..5cf65cc4ca80 100644
--- a/media-libs/leptonica/leptonica-1.79.0-r1.ebuild
+++ b/media-libs/leptonica/leptonica-1.80.0.ebuild
@@ -29,10 +29,6 @@ RDEPEND="gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
DEPEND="${RDEPEND}
test? ( media-libs/tiff:0[zlib] )"
-PATCHES=(
- "${FILESDIR}"/${PV}-tests.patch
-)
-
ECONF_SOURCE="${S}"
DOCS=( README version-notes )
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index 24922ca6105a..dc633dbc1463 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,5 +1,5 @@
DIST libmatroska-1.5.2.tar.xz 64996 BLAKE2B 6af202b9817ed54feca76c0a9ed60a0eca0431ffc4ebc9aeae2df191066501c16fb7bb8dc37cb6353eb22c87dfe9fa22420cbbf18d3a6a6edeec4900a59bc0cf SHA512 122b71b91ae89e2a7cc89db17655a006248d58f18d913b4f9ffc885aef7e39681a3a16eed43cd8ecd949c570a939007797c79829f5ee87d08562aee3f0224ba2
DIST libmatroska-1.6.2.tar.xz 65460 BLAKE2B f746f0dd519b8e3b4f98057d3f83e23a79595ab95e71f0c45c1128b2cbe093d5955a38d9d0565be9336f3d53279e20bddf0a2b4a54378c78faf4ee8f94586686 SHA512 c0b2b475f01e01b064348e96a4cd25f594e93b21ab6f66236d6872d1242b6076d501c155a19dedd642ded8338c0a71be09450fc086e77802099413c8849abab1
EBUILD libmatroska-1.5.2.ebuild 629 BLAKE2B aaf34a4ca644f26de0d426c9757457f0b96186319cf6b1f8463c5ed695c2e0723ad7b5c3319c93a09dbed57bd102f51df39cc65c83af8d1a55aa84c89169176f SHA512 9f822cd754e842f9f3f5e240e28ec65f063795007190f8f6ff946ba881fb2bf9c473ff10a75ce5d10186bb9979e71b9a3412bf7dc874192ffa8872c8e047e540
-EBUILD libmatroska-1.6.2.ebuild 632 BLAKE2B 0576a5f2f4077ce69c32263bd154b437ec1af6255d0ba77ed84f5bdd0732212e82f901b4b3cea5b0cbe5c9017a3cb94cc67d173cea8361c90a3103ad6e5cda10 SHA512 4d71d775b3ed8164dcfacf39f861d0e913085d33d96f6b7074bfe90cb0ffc7a0cb9b0e52f03faef6a202530cb1b343ebf87a49b0978cb73c4155f146145ebf89
+EBUILD libmatroska-1.6.2.ebuild 631 BLAKE2B 17b993ed03d564d703b5663cebf1299a27e21bad39daf9ac2f3d801236341fcc451e7076597e63b604bc9cb86f7ffc23514784f67a0e2b628d140ec253545310 SHA512 51ee6bd1f7c72c85d7caad5fd0166c5e6be79e1bb546ed0c40ac2e4e8103db90d9a65b8f66da129086f984f26da059e621d92ec3b61c5dc396b3202b005ff597
MISC metadata.xml 320 BLAKE2B edd6b2e35a7833d3510edec80f3771a319cbb257cbb203e0f71f33636431496c620cb3307b2bebb44360d6932a7e4376b0d134f3f42d26fc9271423c2eed11f6 SHA512 5c1dad06e1fef24b1ec68fb6b12d0d17b4bd05f22b1953f713c25a513340cb08540eebaec32fbe7c6607ba2142a057b8e6e5743a929b7368665d91bc014f35a9
diff --git a/media-libs/libmatroska/libmatroska-1.6.2.ebuild b/media-libs/libmatroska/libmatroska-1.6.2.ebuild
index 5f98f2125f56..88c5a7898a88 100644
--- a/media-libs/libmatroska/libmatroska-1.6.2.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0/7" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~x86-linux"
IUSE=""
RDEPEND=">=dev-libs/libebml-1.4.0:="
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index 35be7dfe2aca..bd3e759ace1d 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.5.0+release.autotools.tar.gz 1463179 BLAKE2B 666862b67cd5c57877af0bde71960894ac109e57bb53bc0aac953b769823e73e4ac78766d6c8d1f039decc9df271d48ebb0e941913b198e27e6285d264c41825 SHA512 1b62e67deb1541eeeba91b87c393b0bb8a5412e2f4718bad341f14167238bbea0084de9a7c20e5bdd9621ecf5ed78b08924b41526c7148435c0ee5ba31ca9d82
-EBUILD libopenmpt-0.5.0.ebuild 1536 BLAKE2B 2f59ecb70c771eed92cd902cd663a8ffd0449e8d4f9b28a22d26a2073d54abfa825500f3a46f581ec9ba85667f75c5a05c867197ecd6e321db4146ebf9b438c5 SHA512 0e30994bcbe5413137f0ee080162f1d57a0b69b0e110d27c4b8653c184737ab23ea548a85df5aae037e8f88cd92910c86c3b60cac167124d8ed2779e58b2ed84
+DIST libopenmpt-0.5.1+release.autotools.tar.gz 1465318 BLAKE2B 142aca3b946e5ee82fbba0f18360896baac5195412eb3f72f8f69a8ac99ba623e14ccf269bbca9cdbfba146520a14950e12fc7e427cbd930e7243512a10dbf18 SHA512 570787cfcf0b85ca10e753fe49b8a94ff69e1c881ffec5a1aee27a2bc1e142a62ae8cd79de5ab8cf4c7536688de13e9cb675b559a0aa755ad994a24010433a9f
+EBUILD libopenmpt-0.5.1.ebuild 1536 BLAKE2B 2f59ecb70c771eed92cd902cd663a8ffd0449e8d4f9b28a22d26a2073d54abfa825500f3a46f581ec9ba85667f75c5a05c867197ecd6e321db4146ebf9b438c5 SHA512 0e30994bcbe5413137f0ee080162f1d57a0b69b0e110d27c4b8653c184737ab23ea548a85df5aae037e8f88cd92910c86c3b60cac167124d8ed2779e58b2ed84
MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-libs/libopenmpt/libopenmpt-0.5.0.ebuild b/media-libs/libopenmpt/libopenmpt-0.5.1.ebuild
similarity index 100%
rename from media-libs/libopenmpt/libopenmpt-0.5.0.ebuild
rename to media-libs/libopenmpt/libopenmpt-0.5.1.ebuild
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 5095c51f9b40..8c8a29def379 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -4,5 +4,5 @@ AUX libsdl2-2.0.12-vulkan-headers.patch 536 BLAKE2B 5bc6f494aa3afb6c117605519350
DIST SDL2-2.0.10.tar.gz 5550762 BLAKE2B b51eb0b256da683586889a648f62363935f5c70b31172999aa9b80bac9f3e761bc34a3fc379c02f5dbc50734cde53743d297ca7f79d30b0272ddf0313c8752af SHA512 f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798
DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0 SHA512 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317
EBUILD libsdl2-2.0.10-r1.ebuild 5322 BLAKE2B 7687d35d0c741bf72b64ec3ed3571e386ed9f15a210eccd18a97f65dea4c0808c40cba2e1e26bfba3b3e2e96b972b331db027a8a5f61f36767061ade72116681 SHA512 87ec70467329f2d0d41396628c538a4dc60e072b58398fd8cfbc9b79479654691932d1fc550cc36b48d8ce71c37e4fc8b80b0c8fceb8f4ef2a21f1addbed4d13
-EBUILD libsdl2-2.0.12-r1.ebuild 5512 BLAKE2B c3c9dde9762b6f87c81ada9f693c9a926ff23ec27c37e6837ae16821745e4cc0b2511e190fe7b76b3a9cb84afbe80a24e5499a39558df00f871e30ed7ca536aa SHA512 3623760f76ad15142b8fda87a9b92eb9aba780bd73a634e1c4ca79840104ab5a68ff2bb0d66fc3cff0a60c3f31dce64425e0d8500a03ac3bd55ec04a4061f633
+EBUILD libsdl2-2.0.12-r1.ebuild 5510 BLAKE2B f43b856d1f56747958a0b141810f8ed56d14d0de00da191170edc68a9277ed532790e7206ebf8b352181fb0ee080e1ba15e21f41a5ec2560c5e66def1e8c14d1 SHA512 a11787328ee616df8f6ea07d66a62cb0e9591de8a87b8ac017830c0e8f35c9d157198823fe7803b5a53fda2ead7f984abe0f87195d1759cf1b45f65d6c0e3886
MISC metadata.xml 1658 BLAKE2B 5c902cca2bed60d10864bd4d3524035b9472599f63a5a739348231c2471a01f40dd99ba49b63b710cffbfa51c870f06a1aa5a1d56a6a5dc6a2a3059550506443 SHA512 7c832d7bc52638ad658c4b53ffc1faf34486d551728240007b8af5f569dfa893a076df9b7ecc118c29795d1792b55e953401b2dbf81d831d002fc0cb0f28687c
diff --git a/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild
index 505e3fc78fb9..8121283a7c6b 100644
--- a/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus gles2 haptic jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
REQUIRED_USE="
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 9d07eb0cf63b..35a5d7076ac8 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,12 +1,8 @@
DIST mesa-20.0.8.tar.xz 12360736 BLAKE2B 19e3f8a40b34b5f17ed76077c5d92f728a134b2479c43d86674ed1818ab99639a9b732041f67488251df808564f6abe5b587d756ef9c7c13dcada87cd0fc05de SHA512 d906330c412899907dd05a84034a929107fccaf3044814c4b1f30ba5690cbcf1587b5f17534c6345111f3cb7cf292afd5984a60486643ff6f534b57cec615374
-DIST mesa-20.1.4.tar.xz 12758452 BLAKE2B 2f4e4563382a455f7fd6ac0bb32c91901c4ca4fa297da7769b40722713316ba9a6b8acc7bd5ae9df46b9ffea6bee13cdf2a8dd4fe747ac61dc052391aeae18d9 SHA512 f4d79694cda8531e7560147caf5d18bce5c685cd6c61264dced5adaa9043be9c83d3a2bd623ebffedc8d4258b9b1f97d84d9aeea307aa77cf99d0bc47c987155
-DIST mesa-20.1.5.tar.xz 12783368 BLAKE2B f452832b3ed3468d01b7129cd782f3b58752a6de511679c9bd7eca7a5728630202a185e61f435c172f84d4ef6ffd05bbf7873e5f8c4cc64572d3b5a38e5ebf28 SHA512 47796bf2cccfd054ff25f571747754e0ab9b42fe87644ea320b3d9497d63b3013e9b7e59ea0516bbd1a38b5594e0d185bf5a36230ea5c5974e7ff889cee2601e
-DIST mesa-20.2.0-rc1.tar.xz 13521940 BLAKE2B 6e9fdc8fa9d2b0f9bd72b033d710b0cbc10d4434adc5d702576cc08559ad32f83983cb3ba44f96a1f740c626429cc386a4e14ee4fa5549c2f3dbb942243b1641 SHA512 d86e52a985d94e3d5b5ef7799acf4fced72df6cd68b29e1fef2c7755144d9633d74f648d8434699497d38b50f0d1a12d12a135a45ea5bc4cf22f2033a3651aac
+DIST mesa-20.1.6.tar.xz 12805724 BLAKE2B d652b59e4987436d2e05de9138f2e2fb4a8bf435c24d9c7ad08bcb82a3bf7c9c64bc71b15b4b6d334f8b574341719f372aa1b893283abc21191a4d71d9d30fee SHA512 5ef28334ecb7effaaf597ea3efe0406af62419e6fa629e835d843161ab8d83515626ec0f0495c4cc66af9e5669398ac96c16ca626e4965a9831e1704c995fb09
DIST mesa-20.2.0-rc2.tar.xz 13528208 BLAKE2B 6505446829ec2c01c0de7a7d9c1187db874111402da5ffe2f9f5872df7b6a5e53a3b628c190172bb9a806851b3b85aa0e3b53a4fcfb40f99adfc48cc3876c9f5 SHA512 36d9a74db50335bd31a8d5c47f7c657f05eeda044530fe123c06c472ed27c9b5dff19716d11d95256449223e82dde38895547cf6ae60b7460d3b1e9ed440704a
EBUILD mesa-20.0.8.ebuild 14701 BLAKE2B 0109666f0c0db0a7333dad36a01e7bedda6b03eafcc5c0a2061ec48047bdbb3793bcd643195de0a5db39217011c88a4b558a3b665109b1ed32feb62d97683d12 SHA512 5958cc5ed07cc4308eeba3d68ae537de8645564db15ea095cd1daa10453f950a6ca8caa60635cb18f9d66262f8732a94e3df2f721d9ff7376f4cb8ae53dc8c68
-EBUILD mesa-20.1.4.ebuild 14758 BLAKE2B 3f690d44497b3fb7c9767e1a9d35f9cd94a429bafff94746436d924aa4cbb60c0340c34d00050789e619dfea9d034512c8704960b5f0193a080639fbb6168506 SHA512 4975ff0b154dbc29543dab2cb9ab45680edefb76d0039a200982a840b6dfa4d6dbec39354957964af22790fbcf6e758d6c028956c22515abf75e04b4533c3786
-EBUILD mesa-20.1.5.ebuild 14719 BLAKE2B ad71c0427076d83142f05791f1c5a580b6ab89b470ff093c7a951aa7a7e6cb76c070521d545a6d54a11ae4ebb2fc43fb414ad12c7293f1e45f4318be5501171b SHA512 b7eeff6340a2a85cb73145d603e02ef574474f71cfcc1d4133aaf0160e4856327c67b3ba667863f38a096136920901c48da86245f91d3ec6a938d4a9cd219ad4
-EBUILD mesa-20.2.0_rc1.ebuild 15007 BLAKE2B f7556854d2f44f501b844857a36b7193cfb9c30d566b9152251c5aacc573603558476bb0a064860b13638e58dda1eabdc7c0094ba91a1d8d0dd66cc9cdcd5c0e SHA512 30e71290d99484430143a584e30dc336d4c8d2b344025ece7ef4efe3c0356dd1ecf713c5a46c9297cbdd76d74660efc840938bf9af20edaee3a46c35d7f09c92
+EBUILD mesa-20.1.6.ebuild 14719 BLAKE2B ad71c0427076d83142f05791f1c5a580b6ab89b470ff093c7a951aa7a7e6cb76c070521d545a6d54a11ae4ebb2fc43fb414ad12c7293f1e45f4318be5501171b SHA512 b7eeff6340a2a85cb73145d603e02ef574474f71cfcc1d4133aaf0160e4856327c67b3ba667863f38a096136920901c48da86245f91d3ec6a938d4a9cd219ad4
EBUILD mesa-20.2.0_rc2.ebuild 15007 BLAKE2B f7556854d2f44f501b844857a36b7193cfb9c30d566b9152251c5aacc573603558476bb0a064860b13638e58dda1eabdc7c0094ba91a1d8d0dd66cc9cdcd5c0e SHA512 30e71290d99484430143a584e30dc336d4c8d2b344025ece7ef4efe3c0356dd1ecf713c5a46c9297cbdd76d74660efc840938bf9af20edaee3a46c35d7f09c92
EBUILD mesa-9999.ebuild 15007 BLAKE2B f7556854d2f44f501b844857a36b7193cfb9c30d566b9152251c5aacc573603558476bb0a064860b13638e58dda1eabdc7c0094ba91a1d8d0dd66cc9cdcd5c0e SHA512 30e71290d99484430143a584e30dc336d4c8d2b344025ece7ef4efe3c0356dd1ecf713c5a46c9297cbdd76d74660efc840938bf9af20edaee3a46c35d7f09c92
MISC metadata.xml 1953 BLAKE2B 809b2ae05dadf1ef3b78c8c0353032c77aaba205530a51e6e099170d186bc9fdaf289b135e68984aef8f71f69970f9e63a38de816f04199dc2e9965e71e940d0 SHA512 09b322501feafc80de4b81c7a30e1d6f4565247069dc7d80218684382a68b285ca1b80733b6f3126bd15c777cc5a896062686f06fc1822039595b3fed9bcb9e6
diff --git a/media-libs/mesa/mesa-20.1.4.ebuild b/media-libs/mesa/mesa-20.1.4.ebuild
deleted file mode 100644
index 058a206a5ffe..000000000000
--- a/media-libs/mesa/mesa-20.1.4.ebuild
+++ /dev/null
@@ -1,558 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit llvm meson multilib-minimal python-any-r1 linux-info
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
- inherit git-r3
-else
- SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
- !test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
- lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
- vulkan-overlay wayland +X xa xvmc +zstd"
-
-REQUIRED_USE="
- d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
- gles1? ( egl )
- gles2? ( egl )
- vulkan? ( dri3
- video_cards_radeonsi? ( llvm ) )
- vulkan-overlay? ( vulkan )
- wayland? ( egl gbm )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_iris? ( gallium )
- video_cards_lima? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_panfrost? ( gallium )
- video_cards_radeon? ( || ( classic gallium )
- gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_vc4? ( gallium )
- video_cards_virgl? ( gallium )
- video_cards_vivante? ( gallium gbm )
- video_cards_vmware? ( gallium )
- xa? ( X )
- xvmc? ( X )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-RDEPEND="
- !app-eselect/eselect-mesa
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
- libglvnd? (
- >=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
- !app-eselect/eselect-opengl
- )
- !libglvnd? (
- >=app-eselect/eselect-opengl-1.3.0
- )
- gallium? (
- unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
- llvm? (
- video_cards_radeonsi? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- video_cards_r600? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- video_cards_radeon? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- )
- lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
- opencl? (
- >=virtual/opencl-3[${MULTILIB_USEDEP}]
- dev-libs/libclc
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- vaapi? (
- >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
- )
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- )
- selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
- wayland? (
- >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
- >=dev-libs/wayland-protocols-1.8
- )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
- video_cards_intel? (
- !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- )
- video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- )
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-RDEPEND="${RDEPEND}
- video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="10"
-LLVM_DEPSTR="
- || (
- sys-devel/llvm:10[${MULTILIB_USEDEP}]
- sys-devel/llvm:9[${MULTILIB_USEDEP}]
- sys-devel/llvm:8[${MULTILIB_USEDEP}]
- )
- =sys-devel/gcc-4.6
- )
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- usr/lib*/libglapi.so.0.0.0
- usr/lib*/libGLESv1_CM.so.1.1.0
- usr/lib*/libGLESv2.so.2.0.0
- usr/lib*/libGL.so.1.2.0
- usr/lib*/libOSMesa.so.8.0.0
- libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
-)"
-
-llvm_check_deps() {
- local flags=${MULTILIB_USEDEP}
- if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
- then
- flags+=",llvm_targets_AMDGPU(-)"
- fi
-
- if use opencl; then
- has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
- fi
- has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
- if use vulkan; then
- if ! use video_cards_i965 &&
- ! use video_cards_iris &&
- ! use video_cards_radeonsi; then
- ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, or radeonsi"
- fi
- fi
-
- if use opencl; then
- if ! use video_cards_r600 &&
- ! use video_cards_radeonsi; then
- ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi"
- fi
- fi
-
- if use vaapi; then
- if ! use video_cards_r600 &&
- ! use video_cards_radeonsi &&
- ! use video_cards_nouveau; then
- ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
- fi
- fi
-
- if use vdpau; then
- if ! use video_cards_r300 &&
- ! use video_cards_r600 &&
- ! use video_cards_radeonsi &&
- ! use video_cards_nouveau; then
- ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
- fi
- fi
-
- if use xa; then
- if ! use video_cards_freedreno &&
- ! use video_cards_nouveau &&
- ! use video_cards_vmware; then
- ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
- fi
- fi
-
- if use xvmc; then
- if ! use video_cards_r600 &&
- ! use video_cards_nouveau; then
- ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau"
- fi
- fi
-
- if ! use gallium; then
- use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
- use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium"
- use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium"
- use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium"
- use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium"
- use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium"
- use xa && ewarn "Ignoring USE=xa since USE does not contain gallium"
- use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium"
- fi
-
- if ! use llvm; then
- use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm"
- fi
-}
-
-python_check_deps() {
- has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- if use video_cards_i965 ||
- use video_cards_iris ||
- use video_cards_radeonsi; then
- CONFIG_CHECK="~CHECKPOINT_RESTORE"
- linux-info_pkg_setup
- fi
-
- if use gallium && use llvm; then
- llvm_pkg_setup
- fi
- python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
- local emesonargs=()
-
- if use classic; then
- # Intel code
- dri_driver_enable video_cards_i915 i915
- dri_driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- dri_driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- dri_driver_enable video_cards_nouveau nouveau
-
- # ATI code
- dri_driver_enable video_cards_r100 r100
- dri_driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- dri_driver_enable video_cards_radeon r100 r200
- fi
- fi
-
- emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
-
- if use gallium; then
- emesonargs+=(
- $(meson_use llvm)
- $(meson_use lm-sensors lmsensors)
- $(meson_use unwind libunwind)
- )
-
- if use video_cards_iris ||
- use video_cards_r300 ||
- use video_cards_r600 ||
- use video_cards_radeonsi ||
- use video_cards_nouveau ||
- use video_cards_vmware; then
- emesonargs+=($(meson_use d3d9 gallium-nine))
- else
- emesonargs+=(-Dgallium-nine=false)
- fi
-
- if use video_cards_r600 ||
- use video_cards_radeonsi ||
- use video_cards_nouveau; then
- emesonargs+=($(meson_use vaapi gallium-va))
- use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
- else
- emesonargs+=(-Dgallium-va=false)
- fi
-
- if use video_cards_r300 ||
- use video_cards_r600 ||
- use video_cards_radeonsi ||
- use video_cards_nouveau; then
- emesonargs+=($(meson_use vdpau gallium-vdpau))
- else
- emesonargs+=(-Dgallium-vdpau=false)
- fi
-
- if use video_cards_freedreno ||
- use video_cards_nouveau ||
- use video_cards_vmware; then
- emesonargs+=($(meson_use xa gallium-xa))
- else
- emesonargs+=(-Dgallium-xa=false)
- fi
-
- if use video_cards_r600 ||
- use video_cards_nouveau; then
- emesonargs+=($(meson_use xvmc gallium-xvmc))
- else
- emesonargs+=(-Dgallium-xvmc=false)
- fi
-
- if use video_cards_freedreno ||
- use video_cards_lima ||
- use video_cards_panfrost ||
- use video_cards_vc4 ||
- use video_cards_vivante; then
- gallium_enable -- kmsro
- fi
-
- gallium_enable video_cards_lima lima
- gallium_enable video_cards_panfrost panfrost
- gallium_enable video_cards_vc4 vc4
- gallium_enable video_cards_vivante etnaviv
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
-
- # Only one i915 driver (classic vs gallium). Default to classic.
- if ! use classic; then
- gallium_enable video_cards_i915 i915
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
- fi
-
- gallium_enable video_cards_iris iris
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- gallium_enable video_cards_freedreno freedreno
- gallium_enable video_cards_virgl virgl
-
- # opencl stuff
- emesonargs+=(
- -Dgallium-opencl="$(usex opencl icd disabled)"
- )
- fi
-
- if use vulkan; then
- vulkan_enable video_cards_i965 intel
- vulkan_enable video_cards_iris intel
- vulkan_enable video_cards_radeonsi amd
- fi
-
- if use gallium; then
- gallium_enable -- swrast
- emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
- else
- dri_driver_enable -- swrast
- emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
- fi
-
- driver_list() {
- local drivers="$(sort -u <<< "${1// /$'\n'}")"
- echo "${drivers//$'\n'/,}"
- }
-
- emesonargs+=(
- $(meson_use test build-tests)
- -Dglx=$(usex X dri disabled)
- -Dshared-glapi=true
- $(meson_use dri3)
- $(meson_use egl)
- $(meson_use gbm)
- $(meson_use gles1)
- $(meson_use gles2)
- $(meson_use libglvnd glvnd)
- $(meson_use selinux)
- $(meson_use zstd)
- -Dvalgrind=$(usex valgrind auto false)
- -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
- -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
- -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
- $(meson_use vulkan vulkan-device-select-layer)
- $(meson_use vulkan-overlay vulkan-overlay-layer)
- --buildtype $(usex debug debug plain)
- -Db_ndebug=$(usex debug false true)
- )
- meson_src_configure
-}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-}
-
-multilib_src_test() {
- meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
- if ! use libglvnd; then
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
- fi
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
- if [[ $1 == -- ]] || use $1; then
- shift
- DRI_DRIVERS+=("$@")
- fi
-}
-
-gallium_enable() {
- if [[ $1 == -- ]] || use $1; then
- shift
- GALLIUM_DRIVERS+=("$@")
- fi
-}
-
-vulkan_enable() {
- if [[ $1 == -- ]] || use $1; then
- shift
- VULKAN_DRIVERS+=("$@")
- fi
-}
diff --git a/media-libs/mesa/mesa-20.1.5.ebuild b/media-libs/mesa/mesa-20.1.6.ebuild
similarity index 100%
rename from media-libs/mesa/mesa-20.1.5.ebuild
rename to media-libs/mesa/mesa-20.1.6.ebuild
diff --git a/media-libs/mesa/mesa-20.2.0_rc1.ebuild b/media-libs/mesa/mesa-20.2.0_rc1.ebuild
deleted file mode 100644
index ebb32fce460a..000000000000
--- a/media-libs/mesa/mesa-20.2.0_rc1.ebuild
+++ /dev/null
@@ -1,565 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit llvm meson multilib-minimal python-any-r1 linux-info
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
- inherit git-r3
-else
- SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
- !test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
- lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
- vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
- d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
- gles1? ( egl )
- gles2? ( egl )
- vulkan? ( dri3
- video_cards_radeonsi? ( llvm ) )
- vulkan-overlay? ( vulkan )
- wayland? ( egl gbm )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_iris? ( gallium )
- video_cards_lima? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_panfrost? ( gallium )
- video_cards_radeon? ( || ( classic gallium )
- gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_v3d? ( gallium )
- video_cards_vc4? ( gallium )
- video_cards_virgl? ( gallium )
- video_cards_vivante? ( gallium gbm )
- video_cards_vmware? ( gallium )
- xa? ( X )
- xvmc? ( X )
- zink? ( gallium vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-RDEPEND="
- !app-eselect/eselect-mesa
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
- libglvnd? (
- >=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
- !app-eselect/eselect-opengl
- )
- !libglvnd? (
- >=app-eselect/eselect-opengl-1.3.0
- )
- gallium? (
- unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
- llvm? (
- video_cards_radeonsi? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- video_cards_r600? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- video_cards_radeon? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- )
- lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
- opencl? (
- >=virtual/opencl-3[${MULTILIB_USEDEP}]
- dev-libs/libclc
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- vaapi? (
- >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
- )
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- )
- selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
- wayland? (
- >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
- >=dev-libs/wayland-protocols-1.8
- )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
- video_cards_intel? (
- !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- )
- video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- )
- zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-RDEPEND="${RDEPEND}
- video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="10"
-LLVM_DEPSTR="
- || (
- sys-devel/llvm:10[${MULTILIB_USEDEP}]
- sys-devel/llvm:9[${MULTILIB_USEDEP}]
- )
- =sys-devel/gcc-4.6
- )
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- usr/lib*/libglapi.so.0.0.0
- usr/lib*/libGLESv1_CM.so.1.1.0
- usr/lib*/libGLESv2.so.2.0.0
- usr/lib*/libGL.so.1.2.0
- usr/lib*/libOSMesa.so.8.0.0
- libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
-)"
-
-llvm_check_deps() {
- local flags=${MULTILIB_USEDEP}
- if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
- then
- flags+=",llvm_targets_AMDGPU(-)"
- fi
-
- if use opencl; then
- has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
- fi
- has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
- if use vulkan; then
- if ! use video_cards_i965 &&
- ! use video_cards_iris &&
- ! use video_cards_radeonsi; then
- ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, or radeonsi"
- fi
- fi
-
- if use opencl; then
- if ! use video_cards_r600 &&
- ! use video_cards_radeonsi; then
- ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi"
- fi
- fi
-
- if use vaapi; then
- if ! use video_cards_r600 &&
- ! use video_cards_radeonsi &&
- ! use video_cards_nouveau; then
- ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
- fi
- fi
-
- if use vdpau; then
- if ! use video_cards_r300 &&
- ! use video_cards_r600 &&
- ! use video_cards_radeonsi &&
- ! use video_cards_nouveau; then
- ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
- fi
- fi
-
- if use xa; then
- if ! use video_cards_freedreno &&
- ! use video_cards_nouveau &&
- ! use video_cards_vmware; then
- ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
- fi
- fi
-
- if use xvmc; then
- if ! use video_cards_r600 &&
- ! use video_cards_nouveau; then
- ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau"
- fi
- fi
-
- if ! use gallium; then
- use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
- use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium"
- use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium"
- use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium"
- use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium"
- use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium"
- use xa && ewarn "Ignoring USE=xa since USE does not contain gallium"
- use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium"
- fi
-
- if ! use llvm; then
- use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm"
- fi
-}
-
-python_check_deps() {
- has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- if use video_cards_i965 ||
- use video_cards_iris ||
- use video_cards_radeonsi; then
- CONFIG_CHECK="~CHECKPOINT_RESTORE"
- linux-info_pkg_setup
- fi
-
- if use gallium && use llvm; then
- llvm_pkg_setup
- fi
- python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
- local emesonargs=()
-
- if use classic; then
- # Intel code
- dri_driver_enable video_cards_i915 i915
- dri_driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- dri_driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- dri_driver_enable video_cards_nouveau nouveau
-
- # ATI code
- dri_driver_enable video_cards_r100 r100
- dri_driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- dri_driver_enable video_cards_radeon r100 r200
- fi
- fi
-
- local platforms
- use X && platforms+="x11"
- use wayland && platforms+=",wayland"
- [[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
-
- if use gallium; then
- emesonargs+=(
- $(meson_feature llvm)
- $(meson_feature lm-sensors lmsensors)
- $(meson_feature unwind libunwind)
- )
-
- if use video_cards_iris ||
- use video_cards_r300 ||
- use video_cards_r600 ||
- use video_cards_radeonsi ||
- use video_cards_nouveau ||
- use video_cards_vmware; then
- emesonargs+=($(meson_use d3d9 gallium-nine))
- else
- emesonargs+=(-Dgallium-nine=false)
- fi
-
- if use video_cards_r600 ||
- use video_cards_radeonsi ||
- use video_cards_nouveau; then
- emesonargs+=($(meson_feature vaapi gallium-va))
- use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
- else
- emesonargs+=(-Dgallium-va=disabled)
- fi
-
- if use video_cards_r300 ||
- use video_cards_r600 ||
- use video_cards_radeonsi ||
- use video_cards_nouveau; then
- emesonargs+=($(meson_feature vdpau gallium-vdpau))
- else
- emesonargs+=(-Dgallium-vdpau=disabled)
- fi
-
- if use video_cards_freedreno ||
- use video_cards_nouveau ||
- use video_cards_vmware; then
- emesonargs+=($(meson_feature xa gallium-xa))
- else
- emesonargs+=(-Dgallium-xa=disabled)
- fi
-
- if use video_cards_r600 ||
- use video_cards_nouveau; then
- emesonargs+=($(meson_feature xvmc gallium-xvmc))
- else
- emesonargs+=(-Dgallium-xvmc=disabled)
- fi
-
- if use video_cards_freedreno ||
- use video_cards_lima ||
- use video_cards_panfrost ||
- use video_cards_v3d ||
- use video_cards_vc4 ||
- use video_cards_vivante; then
- gallium_enable -- kmsro
- fi
-
- gallium_enable video_cards_lima lima
- gallium_enable video_cards_panfrost panfrost
- gallium_enable video_cards_v3d v3d
- gallium_enable video_cards_vc4 vc4
- gallium_enable video_cards_vivante etnaviv
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable zink zink
-
- # Only one i915 driver (classic vs gallium). Default to classic.
- if ! use classic; then
- gallium_enable video_cards_i915 i915
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
- fi
-
- gallium_enable video_cards_iris iris
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- gallium_enable video_cards_freedreno freedreno
- gallium_enable video_cards_virgl virgl
-
- # opencl stuff
- emesonargs+=(
- -Dgallium-opencl="$(usex opencl icd disabled)"
- )
- fi
-
- if use vulkan; then
- vulkan_enable video_cards_i965 intel
- vulkan_enable video_cards_iris intel
- vulkan_enable video_cards_radeonsi amd
- fi
-
- if use gallium; then
- gallium_enable -- swrast
- emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
- else
- dri_driver_enable -- swrast
- emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
- fi
-
- driver_list() {
- local drivers="$(sort -u <<< "${1// /$'\n'}")"
- echo "${drivers//$'\n'/,}"
- }
-
- emesonargs+=(
- $(meson_use test build-tests)
- -Dglx=$(usex X dri disabled)
- -Dshared-glapi=enabled
- $(meson_feature dri3)
- $(meson_feature egl)
- $(meson_feature gbm)
- $(meson_feature gles1)
- $(meson_feature gles2)
- $(meson_use libglvnd glvnd)
- $(meson_use selinux)
- $(meson_feature zstd)
- -Dvalgrind=$(usex valgrind auto false)
- -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
- -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
- -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
- $(meson_use vulkan vulkan-device-select-layer)
- $(meson_use vulkan-overlay vulkan-overlay-layer)
- --buildtype $(usex debug debug plain)
- -Db_ndebug=$(usex debug false true)
- )
- meson_src_configure
-}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-}
-
-multilib_src_test() {
- meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
- if ! use libglvnd; then
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
- fi
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
- if [[ $1 == -- ]] || use $1; then
- shift
- DRI_DRIVERS+=("$@")
- fi
-}
-
-gallium_enable() {
- if [[ $1 == -- ]] || use $1; then
- shift
- GALLIUM_DRIVERS+=("$@")
- fi
-}
-
-vulkan_enable() {
- if [[ $1 == -- ]] || use $1; then
- shift
- VULKAN_DRIVERS+=("$@")
- fi
-}
diff --git a/media-libs/rlottie/Manifest b/media-libs/rlottie/Manifest
index 02d498fab0ca..91d01b24cb45 100644
--- a/media-libs/rlottie/Manifest
+++ b/media-libs/rlottie/Manifest
@@ -1,4 +1,6 @@
AUX rlottie-0.1-disable-werror.patch 381 BLAKE2B 26afddff05d0cfda88617473ec4affca4a721f081e393c31b409fc6a3e73efe73e4e661caf13aeaf5394f31533390b1439492e066ad19087d76b984b6304f421 SHA512 2363100f6b0ab09f3ad9ae46dd02dffd2a5ca2124ae1b4f3791c88b3b7563e9cafd68da4ee719f9460d781aab80b4a83f21f0d788db2eefa5cd9d2cab0ab69ce
DIST rlottie-0.1-1.tar.gz 3370181 BLAKE2B 7ba580af961f2af7b92c40b4640f8b515c21a354ef5e639c5f00b0ea26fd3e2929dbf2e926b58d39ad3f48228511ba42a42a24d4b7bb914389a7e43df810d667 SHA512 ab9b913d9e0bc938a878a6847851cd6965dc61efbf8ef71761b83d6ff577479cf0c0b214c36e58ddd6a29927a1954c3d3db9db427779b5a2d472c8962cd45ff1
+DIST rlottie-0.2-1.tar.gz 3516947 BLAKE2B d5f6b643c910e0b831be223be4fcff3d42cde8239b01d413f2805eeccf2665abfbd209ee6877358c2434d3bc82ea7c5b3849f4dca1d0796436e47ffa6bcfed64 SHA512 1f645ae998ddbe83e4911addf28ec24ae3ff33f6439a9fb6c1e56986b46ac17dba155773ab02a59712e781febb31709a99075a3fbcda6136a0cb43dbd7c753de
EBUILD rlottie-0.1-r1.ebuild 936 BLAKE2B f72f77bd577b7b548591f23fc041d06f11a11e800ed3d4d24118ee3e7e559d2039f1c6cb6728a5375884ff680228d4e6e3cf68d8865e979cc402096b8a89f6a6 SHA512 d33157089ec5d865ae0d67d0889d18df3c4119f4191658fa72d65367183c7931e36d05f307d706f6ef723ee066d1fcad26d3e594600660257937b3cddf18dd10
+EBUILD rlottie-0.2.ebuild 874 BLAKE2B a30fabe786b1ae03f2b5310c510231595d81f5d9166b63bbc43f351d3bc5ddccc03f73f3d91dde2b4efc6713af2d616e2e1a115c30bce529f5fbb7d7e9fd93c2 SHA512 b0b37628d325cf11ab457ca71352a354def3028c08e22316398100eab6bdc159a8b1933a8e106a022b633b5faf2ac62932c29b1c3ff9030ad1447a0fe888138a
MISC metadata.xml 901 BLAKE2B 0f2b146bafcbff57e44a91a21176114d15c9d81a076cc42f3d57e3849d1b3af3d46eb45bc74cf6e524679677b5394f440dc762c87ddc3652d0b754ebd62907b5 SHA512 f7e80a3946b2462a3718f508be57cdbbc3c85c632778b58393f467cfa5c4e80b96f3f264251d9fbb9ce4cf26e4907e534ee758c77661504f05f73577c4c06fab
diff --git a/media-libs/rlottie/rlottie-0.2.ebuild b/media-libs/rlottie/rlottie-0.2.ebuild
new file mode 100644
index 000000000000..c5da30c238e1
--- /dev/null
+++ b/media-libs/rlottie/rlottie-0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="A platform independent standalone library that plays Lottie Animations"
+HOMEPAGE="https://www.tizen.org/ https://github.com/Samsung/rlottie"
+SRC_URI="https://github.com/Samsung/rlottie/archive/v${PV}.tar.gz -> ${P}-1.tar.gz"
+
+LICENSE="BSD FTL JSON MIT"
+SLOT="0/0.2"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug examples test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+src_configure() {
+ local emesonargs=(
+ -D cache=true
+ -D module=true
+ -D thread=true
+
+ -D cmake=false
+ -D example=false
+
+ $(meson_use debug dumptree)
+ $(meson_use debug log)
+ $(meson_use test)
+ )
+
+ meson_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}" || die "Failed to switch into BUILD_DIR."
+ eninja test
+}
diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index 1c7571f4ea25..8f4662562128 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,5 +1,9 @@
AUX zxing-cpp-1.0.8-pkgconfig.patch 302 BLAKE2B 9b1588b618a1ddd829c2bbc8ed9f8a19c2d69e1e7a2c7903a190d36e4672f8ff0979e8d6afd7f3ebecccf06e86421e2a7ff35120e1090620277210cacda446b9 SHA512 f43ed72a23d955d3e621e261c80ec409538b80bb2b046dcf24c37e09ecea1b4208f3d4227afbfbfeda9764f23b69cf87363a3a85a3057fef40f1a7199e1f69ac
AUX zxing-cpp-1.0.8-version.patch 671 BLAKE2B f44f0b4a3f253f8f856d6c4b957ee8a636b0d8caaf567e6e4587005c50119db64fc7a0f1a62537af8a394f3268c4a82aca516fb3a3ba1779c63f8dec6b98cc20 SHA512 ed8fae42db39c49eaaac7a352aa6832d0b493c5a6c40a8acb36863222dce2232a545004f600b007d5f61abcfd6142f238773f30c7d476323809eebced1de202d
+AUX zxing-cpp-1.1.0-pkgconfig-libs.patch 632 BLAKE2B 27367f7dad02ec2189b3dc61caf455753eda158aef4db62b040199e489a3b721856997032b4ab4c253278656bde883c0133d73a6eb918177e309266cf9d19aa2 SHA512 07f73599203ab2c025279ac1efaeb7edf305a4ddbf6d3a25a92a2b2c4f462d6d16206f9c550f5882b874d36560c02057384dd56ec408cbb05c86f0fb8e6ee1ef
+AUX zxing-cpp-1.1.0-pkgconfig-version.patch 293 BLAKE2B 272ee10ff2db01e76a13da2b7f6a05cd1005f54dc8892939af2134e2670510f9b2f927ab95b9b592e493e62b8dcfc89077e5c24c4515864d71ae45f4d093eebd SHA512 2205f78792ad5d7b4a3d5de4fc38281eb882de052d83c91bac81e5c3a047628ab50e2311038cb8fde70f54dacdb768f5fcedfc3316fe8645992fd2fc50cdce0d
DIST zxing-cpp-1.0.8.tar.gz 128506816 BLAKE2B 5f9e70c5cd123c27ee779a955cc112449094069c5be3defac57a906ea6a301e8f04886c7cb51b79007456e517db06f9f61c39228f8d8bb6a520602cac70aa7a4 SHA512 0749b3bd4d810ef024f2d8045ecf3024bba6d1816be3f5baeb3325724ac5a7359bec72b4070f8e34fbc1bc5ba2636e488b17cc8b35578b0703352d448c9d22f6
+DIST zxing-cpp-1.1.0.tar.gz 128856890 BLAKE2B 4ef93efc9e5d81c222b008b2dc7991cdb2dd38c297970b7bcaa7095323581445c32890bd20c9a3ad02013b41d0de5aaab6038b8aff892236c327bb27f922dc84 SHA512 8ae6d0c2bd21de0af99c1baa470afcdd8b0375eb1d4166bb20ad67632c39ef63e1ea07b8a691cf0bc076c87d73a8d8b0ca05007c65a09bc79697aa294dc1f44f
EBUILD zxing-cpp-1.0.8-r1.ebuild 501 BLAKE2B 0eae08515984a7afa9fc1034fd7513f5a7b14198eba294f07ed87e98352a13eeee385a9d69f89245b8624e9e0f7c109db5b11170483b931b3589bb5230362051 SHA512 3ca7f943c841043d95f7bfd100f8f1f36e447265791307154f40dc2628123cb5a9115c5fb4c36c87390a1daed210808d3b831071242bc62fb85cc8501bfc2e1b
+EBUILD zxing-cpp-1.1.0.ebuild 519 BLAKE2B c13098e538dabcf6ad635d5b2d54f876ce4ce34dc8c1f1dcad7aaf3ea3396cba63c6ef4f36809588a34c5c492ca902345ab110c38af4255f4e57f65d744599cc SHA512 9f9e093e002b02cd31e5093386205ca865daf5487ec14b41480eb6107afe8de247e422bdad18025d309a25724d4f7f18261be58cc0f0812577ec584f081a4bd9
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-libs.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-libs.patch
new file mode 100644
index 000000000000..48d6e814ad04
--- /dev/null
+++ b/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-libs.patch
@@ -0,0 +1,20 @@
+From 877b6db1613ddae58e570801920f089c0f64b97f Mon Sep 17 00:00:00 2001
+From: Axel Waggershauser
+Date: Mon, 3 Aug 2020 08:48:58 +0200
+Subject: [PATCH] Fix regression in pkgconfig file generation
+
+---
+ zxing.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/zxing.pc.in b/zxing.pc.in
+index b62fd15..3f429f4 100644
+--- a/zxing.pc.in
++++ b/zxing.pc.in
+@@ -6,5 +6,5 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+ Name: ZXing
+ Description: ZXing library set
+ Version: @VERSION@
+-Libs: -L${libdir} -l@TARGET_ZXING@
++Libs: -L${libdir} -lZXing
+ Cflags: -I${includedir} -I${includedir}/ZXing
diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-version.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-version.patch
new file mode 100644
index 000000000000..c448d00a3094
--- /dev/null
+++ b/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-version.patch
@@ -0,0 +1,10 @@
+--- a/zxing.pc.in 2020-04-09 11:43:22.494219440 -0400
++++ b/zxing.pc.in 2020-04-09 11:49:03.884867034 -0400
+@@ -5,6 +5,6 @@
+
+ Name: ZXing
+ Description: ZXing library set
+-Version: @VERSION@
++Version: @PROJECT_VERSION@
+ Libs: -L${libdir} -lZXing
+ Cflags: -I${includedir} -I${includedir}/ZXing
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.1.0.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.1.0.ebuild
new file mode 100644
index 000000000000..3441bcd60098
--- /dev/null
+++ b/media-libs/zxing-cpp/zxing-cpp-1.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="C++ Multi-format 1D/2D barcode image processing library"
+HOMEPAGE="https://github.com/nu-book/zxing-cpp"
+SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+PATCHES=(
+ "${FILESDIR}/${P}-pkgconfig-libs.patch" # git master
+ "${FILESDIR}/${P}-pkgconfig-version.patch" # bug 716818
+)
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 19958fee762c..4257f45459d8 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index aaf0991da444..1b41510c035e 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,8 +1,8 @@
AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fce5cade63163376f9b6400a1a4aaed90a09b8c87650e90f1c84f98199844e32f05b0d387ba3db4971e SHA512 6ddf5c4e82d30c1c56cdcdd0207d353dca4398d2e7e5e514b9dc1dd55bf1053876d0c12b3fd77dd7dff2c348b60bcf6f215f57f0c72aaf1b29e735e86f060406
-AUX bluealsa-init.d 368 BLAKE2B 62558866adfed1fffafa47f15d0704d228d31e38529c542093b21dc1e82d459068a545e3e033cec32ec2ac9c8185459365846ce97a4f1264535533a6e55a186f SHA512 d0ffcd77d6aa7fd97d72b3cdb4b938c98a59344c8e710e6063adcf46091a9c33077edc913caecd65443ff5e9062998b1299b20b5c3866825640f33f662d8c88d
+AUX bluealsa-init.d 365 BLAKE2B e94570ce6b6e25b0c9e2d2aec573c1b4a698d94117825b3708c1e046808787f97f2ef0d5bb0b1aa87910bbc33bbd9b997b6c30b90940d40fa9acd3e31505848d SHA512 b8d6b81e6ea0480975685396a3fbc349d6da7dc5a5c386271b1facdfc91ed0c2ffa79e1f78b54b530b28d413ff786ad1578ab504875905499dc5f8f075641f4d
AUX bluealsa.service 184 BLAKE2B 94d33842a6d677b6e6078e2159e13198daede77be2e5ac435836f5b20056deac75cbfd9828bd2fe22ea30e544e2846f61be1194c555a166303514bbb48e4107a SHA512 108a86070b215d16e092c0f8fb869c969bc99b6aa479cb81c894fc6ae0c9e16655b14da27ee49c7f50549e4de7aa43a855954cc0dfe7430cdcf8822a97a4d889
AUX bluez-alsa-2.1.0-gcc10.patch 4802 BLAKE2B f57c2920deaec93bf57e56440c20f01a23e58300e062f9d8f83b56719cbc8620dfac8e1420639db7cabc589a231e9f33ff6f2de6e8ad7ba9b2d9b2c18fa35b32 SHA512 e26c4cf6b4184c99ba85f9640f5f5db38ae66999560147af91aff1d9aebb10ef534dd631f8a8421164431401ee2a35da529c298deff6b955bd6747fc7a9f5605
DIST bluez-alsa-2.1.0.tar.gz 129650 BLAKE2B 6ab1b618828b5ad6f35c62a711cd24a51536ae4e013227addff8193bb522e0e7322d054fa8e688b5322ec59f6d08a654760ebb5792a637fa11536afc41c5dba5 SHA512 8b6d520f5733799b1c509052ac527377cbe5e0106b75180f783f83071246937b5dc7a22c2d27f3e9e331c52c74be59f3bc6d78caab97b41f06cfd6ed5191b584
-EBUILD bluez-alsa-2.1.0.ebuild 1930 BLAKE2B 32a79bd8fbdc218bc2e968d77b1fbc9ef79a97aaf67b377687202d43150f6ac61419cf4507175627b90d519af028dbcfa1c50bf582764fc3d98af63b5ac22424 SHA512 740f21e0a17acc513cfe776361808782d047399219bab175a8aeeae5a6aa71d99ab31a74d173ca40c37a744b1c175afec6c6585f28b7e5b5b0b379c70eaf8057
-EBUILD bluez-alsa-9999.ebuild 1877 BLAKE2B f499f35e7e189820ea2554c576ea2ebae05c5fadf7386d76e4abbbbb2ffa057544cc6b12af313ae3ec48331d4bcdc98d087adc93323dd7adccc5cd64b59bb57e SHA512 a1e2c29746fdc1701b8ae6d7c0384466fd21a44e052d08e8be46b9d93de2eeaee71fb931babc1ef472e4480fbd6e6bea82fe46c7787c7bc7f472d84bbacae479
+EBUILD bluez-alsa-2.1.0-r1.ebuild 2079 BLAKE2B c8afe0a62b080c7ceebee187a74b4b20984af36dd75b5e242a03152e9156b2f49ece65b5c9b95a053910fa0c78fff1e6c362932dad3a224116a7be41874fa078 SHA512 e14c61377b2b91147b1550acad42215ef9147397be9ce2a5f73af7a6b077b34c37ef55a91c98f3d7171b877fd94ae300384a241d831e62d41abb1040f36ed874
+EBUILD bluez-alsa-9999.ebuild 2026 BLAKE2B e5115749f9ebc28173b3723f8f1b7d3d3c6099391f570f6864dff4d7fa696024827ef6531f8c3a3f990c5d53457d49c2151cb2ae995f60fc0c58166f4b98f3c1 SHA512 55eaa80957c9bcb2466213dcde9ae9993ef7ff469a902fc9855e5e34367322e2a1b20cce02588c031cea8563da95ee6d79ae655f4c5ac1c23174db5513ffb1c7
MISC metadata.xml 583 BLAKE2B 169737f9ae65bf26204a56b0fbcd1479911895ccfc20433c01a8ea1711ceb75939531f395f7e882149ffde427f43d8410d19392040e5288f5dbca2e4f86fa71f SHA512 b767355e099b5c60ad8d439ba7db224a11638a3fca4a7cd7b3efaa3152a0660ca96176a08d8e352fece334e7a48cebcce555fe12cf9959749491eed360772054
diff --git a/media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild
similarity index 92%
rename from media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild
rename to media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild
index c0b3a72b1abb..e81144df9d11 100644
--- a/media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild
@@ -71,6 +71,10 @@ multilib_src_install_all() {
newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
systemd_dounit "${FILESDIR}"/bluealsa.service
+
+ # Add config file to alsa datadir as well to preserve changes in /etc
+ insinto "/usr/share/alsa/alsa.conf.d/"
+ doins "src/asound/20-bluealsa.conf"
}
pkg_postinst() {
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index fc03fb3b79e0..a399d0042c61 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -67,6 +67,10 @@ multilib_src_install_all() {
newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
systemd_dounit "${FILESDIR}"/bluealsa.service
+
+ # Add config file to alsa datadir as well to preserve changes in /etc
+ insinto "/usr/share/alsa/alsa.conf.d/"
+ doins "src/asound/20-bluealsa.conf"
}
pkg_postinst() {
diff --git a/media-sound/bluez-alsa/files/bluealsa-init.d b/media-sound/bluez-alsa/files/bluealsa-init.d
index 9b6a3178b63a..087b35386eb6 100644
--- a/media-sound/bluez-alsa/files/bluealsa-init.d
+++ b/media-sound/bluez-alsa/files/bluealsa-init.d
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
pidfile="/var/run/bluealsa.pid"
diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index 099a2efd979a..630b22c126eb 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.5.0+release.autotools.tar.gz 1463179 BLAKE2B 666862b67cd5c57877af0bde71960894ac109e57bb53bc0aac953b769823e73e4ac78766d6c8d1f039decc9df271d48ebb0e941913b198e27e6285d264c41825 SHA512 1b62e67deb1541eeeba91b87c393b0bb8a5412e2f4718bad341f14167238bbea0084de9a7c20e5bdd9621ecf5ed78b08924b41526c7148435c0ee5ba31ca9d82
-EBUILD openmpt123-0.5.0.ebuild 1712 BLAKE2B 5b8bb32084d73e031546eefbe4089acfb73a1cc65a1386061367e9aa3dd00bbe6af7418b7396582e3ba901e11472dc0f3bd92d4918b5180e9ca0b468e5aeea56 SHA512 3a063ea27298a6bd564a9db574754efa0470c9ece0c6094060fbb945a0567725ba7028143a28e138eecd5169aee627df3ceb03be132368e34d40c74072571c98
+DIST libopenmpt-0.5.1+release.autotools.tar.gz 1465318 BLAKE2B 142aca3b946e5ee82fbba0f18360896baac5195412eb3f72f8f69a8ac99ba623e14ccf269bbca9cdbfba146520a14950e12fc7e427cbd930e7243512a10dbf18 SHA512 570787cfcf0b85ca10e753fe49b8a94ff69e1c881ffec5a1aee27a2bc1e142a62ae8cd79de5ab8cf4c7536688de13e9cb675b559a0aa755ad994a24010433a9f
+EBUILD openmpt123-0.5.1.ebuild 1712 BLAKE2B 5b8bb32084d73e031546eefbe4089acfb73a1cc65a1386061367e9aa3dd00bbe6af7418b7396582e3ba901e11472dc0f3bd92d4918b5180e9ca0b468e5aeea56 SHA512 3a063ea27298a6bd564a9db574754efa0470c9ece0c6094060fbb945a0567725ba7028143a28e138eecd5169aee627df3ceb03be132368e34d40c74072571c98
MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-sound/openmpt123/openmpt123-0.5.0.ebuild b/media-sound/openmpt123/openmpt123-0.5.1.ebuild
similarity index 100%
rename from media-sound/openmpt123/openmpt123-0.5.0.ebuild
rename to media-sound/openmpt123/openmpt123-0.5.1.ebuild
diff --git a/media-sound/scmpc/Manifest b/media-sound/scmpc/Manifest
index bd34850a51f4..61dde7bded61 100644
--- a/media-sound/scmpc/Manifest
+++ b/media-sound/scmpc/Manifest
@@ -1,4 +1,5 @@
+AUX scmpc-0.4.1-fno-common.patch 1953 BLAKE2B 37a5009a622a9b192867db03a66ac434f775c54b62cad308e4edaf9b26a3edeaa249fb94ef1a39009b37ff8dfbbc96e6f39353f0ffda179676eaf8db280ae5b2 SHA512 9cc2df98bbb571506b196b78d77e60fad1c556fd656370d4cfcb24b32117b130386f40d2fbf569e1e44749663358de59a0607aa035c97ba1a7b467f9270d5731
AUX scmpc-2.init 317 BLAKE2B 4b6f9aad5b4f993b5e34ec35aaf1af67a2407e815ba51942e3634451b0bb814e6dec10004e9df43df5aa3ffae4f1ef84899438dd704748d0e5925e4a6156481c SHA512 58cd9269acbdb92bd4ab0ae23c1f5a07909debf9b37131824827089aece9552493b984f5d73c654a7f6ef47e7bb496e424cbe3885db932ab5554bee9f296f0df
DIST scmpc-0.4.1.tar.bz2 88288 BLAKE2B 6502b21b512604e611f2d6a3210b3f5d64d3dd476b5c17e7e92480478b1488220147ccaa3b43f838fcae646c6c501f6b4bdaaf543df05151782f46bf689cd25d SHA512 7d9f8aad29d58f2227a6149a6b4c9bfc4d400946ac316cbb34482feffd71619c1f311cb1ce6f02c22912793e866661e4d976c8f4ee99ffd1e76be65c9a06d876
-EBUILD scmpc-0.4.1.ebuild 633 BLAKE2B 1c610892a7f1ba3e68fc3f57f0e5a4095fe3a32de4dbd6a16cb6696dce01a14d5de25a83c2707e3c52a7b778223c56a8bcd38f1e36fed64769b9c11175a15f87 SHA512 a08429f1c4f8e7da4b8b7e9b1050f36978feef9c450f75015f53638540b5b7d304e881b15b1cfff64018e6e833643afe21a3646648228bd34d2cc256b1ec9c08
+EBUILD scmpc-0.4.1.ebuild 689 BLAKE2B c9048555227ed15468b535392c4650275bcf56ad9bb8da54fc06e67a2875e2753ff7e501df902bf3738584f4bd9e5663014f713f2f592ed8bcefa3864ce14442 SHA512 f4c7347814996f9b4f122a7be939ab2194e504f40bb3875442ae1de7606c3335a0a6bd3bff131f0308c29b5b5a13798849298a90303cacb76cdc615d47fff9cc
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-sound/scmpc/files/scmpc-0.4.1-fno-common.patch b/media-sound/scmpc/files/scmpc-0.4.1-fno-common.patch
new file mode 100644
index 000000000000..22cd4621e745
--- /dev/null
+++ b/media-sound/scmpc/files/scmpc-0.4.1-fno-common.patch
@@ -0,0 +1,103 @@
+--- a/src/audioscrobbler.c
++++ b/src/audioscrobbler.c
+@@ -50,6 +50,9 @@
+ #define API_KEY "3ec5638071c41a864bf0c8d451566476"
+ #define API_SECRET "365e18391ccdee3bf820cb3d2ba466f6"
+
++static struct as_conn_t as_conn;
++gchar *buffer;
++
+ gboolean as_connection_init(void)
+ {
+ as_conn.handle = curl_easy_init();
+--- a/src/audioscrobbler.h
++++ b/src/audioscrobbler.h
+@@ -37,19 +37,19 @@
+ /**
+ * Last.fm connection data
+ */
+-struct {
++struct as_conn_t {
+ gchar *session_id;
+ gint64 last_auth;
+ gint64 last_fail;
+ connection_status status;
+ CURL *handle;
+ struct curl_slist *headers;
+-} as_conn;
++};
+
+ /**
+ * cURL data buffer
+ */
+-gchar *buffer;
++extern gchar *buffer;
+
+ /**
+ * Initialize cURL
+--- a/src/mpd.c
++++ b/src/mpd.c
+@@ -37,6 +37,8 @@
+ static gboolean mpd_parse(GIOChannel *source, GIOCondition condition,
+ gpointer data);
+
++struct mpd_t mpd;
++
+ gboolean mpd_connect(void)
+ {
+ mpd.conn = mpd_connection_new(prefs.mpd_hostname, prefs.mpd_port,
+--- a/src/mpd.h
++++ b/src/mpd.h
+@@ -32,7 +32,7 @@
+ /**
+ * MPD connection data
+ */
+-struct {
++struct mpd_t {
+ struct mpd_connection *conn;
+ struct mpd_status *status;
+ struct mpd_song *song;
+@@ -42,7 +42,9 @@
+ guint idle_source;
+ guint check_source;
+ guint reconnect_source;
+-} mpd;
++};
++
++extern struct mpd_t mpd;
+
+ /**
+ * Connect to MPD
+--- a/src/preferences.c
++++ b/src/preferences.c
+@@ -36,6 +36,8 @@
+ #include "scmpc.h"
+ #include "preferences.h"
+
++struct prefs_t prefs;
++
+ static gint cf_log_level(cfg_t *cfg, cfg_opt_t *opt, const gchar *value,
+ void *result);
+ static gint cf_validate_num(cfg_t *cfg, cfg_opt_t *opt);
+--- a/src/preferences.h
++++ b/src/preferences.h
+@@ -32,7 +32,7 @@
+ /**
+ * scmpc settings
+ */
+-struct {
++struct prefs_t {
+ gchar *mpd_hostname;
+ gushort mpd_port;
+ gushort mpd_timeout;
+@@ -48,7 +48,9 @@
+ gchar *cache_file;
+ guint queue_length;
+ guint cache_interval;
+-} prefs;
++};
++
++extern struct prefs_t prefs;
+
+ /**
+ * Initialize preferences
diff --git a/media-sound/scmpc/scmpc-0.4.1.ebuild b/media-sound/scmpc/scmpc-0.4.1.ebuild
index 7eee1b1aa5be..2b76d4155534 100644
--- a/media-sound/scmpc/scmpc-0.4.1.ebuild
+++ b/media-sound/scmpc/scmpc-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,6 +18,9 @@ RDEPEND="
net-misc/curl:="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.4.1-fno-common.patch
+)
src_install() {
default
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 7082280eb0d4..69a4d5595934 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,6 +1,6 @@
DIST strawberry-0.6.13.tar.xz 10156576 BLAKE2B 04d27d8a96a8664348623c11f393324b410f8224b22089e200947cfd90eaafe04c3aa13cc5345a7c95d83d24ed04ec9221a8badfb2e3dc42922739b568fc2e90 SHA512 b3db58a30d50f74b313c0af5a492ea809d631c4152f856b19debb5f811688eb21d97ba35b58f3f1d00779fcd76220d88b4dafc32520416f7e749c6680257ad49
-DIST strawberry-0.7.1.tar.xz 10123748 BLAKE2B 6914d10868291b1435834a1462dfc200a214908d8bd552d563fa626cf527fd805b30f28f55d85d0a404adb1f307efa4f3aecb7b6f34daf0b70c7f9744f2db241 SHA512 25723b5db77190223ba19fbc7d805cac898876a6f3222b1cea18e53b6511594d3428611ec9ca91e02bf739b6af6005e081c2fc891f2aac07cf788d052e514f91
+DIST strawberry-0.7.2.tar.xz 10123596 BLAKE2B cfd3384ded94bc5e638d79e4dea8e4a04a42abcc36d1d34da5d39150c2f20e785fd5f199c91ca515d02391e90acd23d1a5d90602ec07f52fdfa711d3ec88bc0e SHA512 d664ce81c2eef2e1bbbbdda40e420142c6c0bf6df42a785cc1c7f572f9b7521e44161f93c4694434db8752d7056df946e6e2aa064a62f45b143da6860f007483
EBUILD strawberry-0.6.13.ebuild 2864 BLAKE2B 1b35982666541292b3c1a38e53aca7c5c14d84f96d6a9da6f0660b1e7b9e00b260d3862663b30c7cbf6ca4b9dde3cc7832cb7403be34ecef6daba4f2e40de162 SHA512 8554f8920f8bf96d3790c85413a0b16dfcf74b91c0e0d0fffa99c9ce2e5a9f6d8ce07bc5f127da62cec3049d95d25f275e7a5a420b62bce2f98de444b0837eb0
-EBUILD strawberry-0.7.1.ebuild 2881 BLAKE2B 3ed68acb3a623358385395f8b3d57cee870ccb1eaac21e18552dc7bd69960ac17794c5f7fd8b0b739b7083535a2f2d5a3bcb5d5005b54c8f95af5ae68d8f94be SHA512 d3bda0b638d85d5a1a17a2056acc2fca64b27b28ae3993004eb20b2a2f536fafae0f150583be169eb5213b92d8bc9769b3eae7887a6c22ae4834425128ef6a39
+EBUILD strawberry-0.7.2.ebuild 2881 BLAKE2B 3ed68acb3a623358385395f8b3d57cee870ccb1eaac21e18552dc7bd69960ac17794c5f7fd8b0b739b7083535a2f2d5a3bcb5d5005b54c8f95af5ae68d8f94be SHA512 d3bda0b638d85d5a1a17a2056acc2fca64b27b28ae3993004eb20b2a2f536fafae0f150583be169eb5213b92d8bc9769b3eae7887a6c22ae4834425128ef6a39
EBUILD strawberry-9999.ebuild 2881 BLAKE2B 3ed68acb3a623358385395f8b3d57cee870ccb1eaac21e18552dc7bd69960ac17794c5f7fd8b0b739b7083535a2f2d5a3bcb5d5005b54c8f95af5ae68d8f94be SHA512 d3bda0b638d85d5a1a17a2056acc2fca64b27b28ae3993004eb20b2a2f536fafae0f150583be169eb5213b92d8bc9769b3eae7887a6c22ae4834425128ef6a39
MISC metadata.xml 448 BLAKE2B b29c1b35e64c59667f04698cb2d1c039fc7557aa7ad99fb1a8625b68d960b0e7af62e016aaf1ec68d5c44c77126f71047b046164c29a0e80d49cdcda0973ca6d SHA512 2c5af38b8518b1de981bae14422bf5931b76831c0b52b1fce29e187d9ceb25a947d8d0f7db1e7844e90ec14657cc8ab484726b31c89667e89d9fcfb6d2e7dfe7
diff --git a/media-sound/strawberry/strawberry-0.7.1.ebuild b/media-sound/strawberry/strawberry-0.7.2.ebuild
similarity index 100%
rename from media-sound/strawberry/strawberry-0.7.1.ebuild
rename to media-sound/strawberry/strawberry-0.7.2.ebuild
diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest
index a6078b786b27..4965224d93c9 100644
--- a/media-sound/whipper/Manifest
+++ b/media-sound/whipper/Manifest
@@ -1,4 +1,4 @@
AUX whipper-0.7.0-cdparanoia-name-fix.patch 2036 BLAKE2B 54d0c70f0ccf89e46607e67d3b1bd3288dc0c34da27d6111df98810d85369c51f953e415a6415c0c08649a2e7fed10cfea77e3a7695f8c4f03445948a8f83c64 SHA512 13edc4bd713409e8fa6d871ce5f9316895edb0156eeed7eef401e72c19f188a8067c45c16a3fe1c3e21209fd8ec6bdf2478e4d4376f210d535993c7ef1575453
DIST whipper-0.9.0.tar.gz 200836 BLAKE2B 197567d476bcfa448bee7d6ba2d1b980355f792e6591840d1291800c3ae205496dc58579394870adf171f11f31d7042b48d070cf03d203e45e7c369500c500ef SHA512 49e66ad2c6e8450199a53a28bb71725704daac86ce2cbf68080d4dee1c2357cf8367ddb4735a07f2ffe612d84f016661e5b6f94efa9d5a7d6b8cf56ee32b0ae7
-EBUILD whipper-0.9.0.ebuild 1281 BLAKE2B 694cedbf147e060019c23fa24ce13c1e02a202dc76dcf381cffaa84bb33910b8aabb9aeccea0c807f1bdcf1f91c2b26f41f8b1823225491e75b9fb26bfcbdd83 SHA512 29daecfa45df1ac6f021952f76ead81e8c3a37ec7fb9ea55eb1274f337e92b1a43cc9bf1040df3a103ee4918638191eee1a2f55f8e7119fa9b202a547a13fac7
+EBUILD whipper-0.9.0.ebuild 1283 BLAKE2B c29c0d57c34cdc42542fce17cd5b06a9f265c54c6a0dd3a36cc8eb295893a33b013cb558e903827391f58df4d01d8b564d3babaa6f43de635e6e5f2f67144790 SHA512 d1e9db4884c59d60d47a76187157e7928f491cdc2d0847cada325be85a4d2d5d1235f8dead9eee67c3653e80a70fa37687043dbee0bf5d84a93de2c7d7cb11c8
MISC metadata.xml 530 BLAKE2B 8cf5640fc05fc9b327e3b6d5d621987cdc74b816e372817fe9d63ac83c37e1669f6b07873eba61439b5d00d26975bc5dd850c649f80454f51f800cba8d7c340c SHA512 87970186262167b583d1a90dbe5016f11368d123f6ff81782c8bffa7217c8eda42440fca4c65ccfbbf75971acf292b1067838024c2bc536cd8b6116fc2cd4172
diff --git a/media-sound/whipper/whipper-0.9.0.ebuild b/media-sound/whipper/whipper-0.9.0.ebuild
index c89a9f317c12..8875ed087dc4 100644
--- a/media-sound/whipper/whipper-0.9.0.ebuild
+++ b/media-sound/whipper/whipper-0.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 6371112ca798..67fec1709aa9 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 5cf67d50c7b1..e78de5d6a112 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,8 +1,10 @@
AUX handbrake-1.3.0-dont-search-for-python.patch 691 BLAKE2B 623654494bf61cedb531df3f9b3e64aa17a2a3d03cf9d71577ba1961961d3d058dfa383ef3bb5215eba8a2c84231531b35f1a331850070ae0bcc5b5fa1586c67 SHA512 044b0cb7d9302f74e1ef92e37162135b8ac76d96bf7d647c269ef19b5cf2a8771ce0cc76cbc8817b2480cc3e40af6bafd717888a3982b3e679d831519aad4e64
AUX handbrake-1.3.2-x265-link.patch 585 BLAKE2B aa46591f144e787212194e937ea594f29b55cac79c7bb659010775c09a4c5e1d9b1345047b377a6bfc0db5ee17e57a41670ad72373f0d01d390cf21b1d2c10b4 SHA512 ea13eab2a080f1d0080247f5a25cb09e2d495077caddd2ad3ce473f79d7bc611795dd1e13847cd982b0a19eddfddc96dbdd3deae8928bb9597d1a6627f17396a
+AUX handbrake-1.3.3-x265-link.patch 277 BLAKE2B 6e5f7d5f59601ebf3c36116f595040d6e884637c8dc9a900774db9db07d1c0686a1b5c2db9276ca1c14612615e3974a7f9b05cb48c23f8f30ed0851238b92c32 SHA512 a74a2d20972a01b89dbfd7b81c070608d57e646de2ce63d9ae2d2e1486d31ca63e96d5ec803052b52e68bee157d5a1882914e0009ae480d1f8192031d79852eb
AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0
AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc
DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a SHA512 a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c
+EBUILD handbrake-1.3.3-r1.ebuild 4248 BLAKE2B cf150d3f99321b3e207e03e8c7848daecb3169515f3a3a209a8c830b0730874ee75deba489a261f9fcbbc38ba4105714511c2a49ddfc0477f6d462de1378391b SHA512 353c1965d4be68265adb6deaa6f9bf3d74747e32d9600705ea78960c1b2bd156aafc1ff0230482eb8003f3ae874e97b4d65c47c410e838545bd3a8e2754b4d8e
EBUILD handbrake-1.3.3.ebuild 4210 BLAKE2B ce314d9b36abaa3585ae77e29857dd00c6a2e1de5ef59a0a25fbff200d19ac6bb01f5b0e19839af3a9dac014493e38346a912acbfe1f660bde0a497a16eee35a SHA512 34e6de849f3536f2a432c54de9f97a1e36fa16a80edc37f2e2ed6d890747d070bad8dd06035cc8d6c1a62da6507eba865c8b5379c28abc2a44ed5d53802f14df
EBUILD handbrake-9999.ebuild 4141 BLAKE2B 6da162374851a5a0283c9404587e17386913dca3e39c747831007eeb8a102e4d68d828de48e99876c90848679ae0451fb62f5b7c870f676c91de6ef3847a6cbb SHA512 df20db4d5da687c300af75302890028141b9a7acbe7e09dfded90d6454dec6b1579a6ff832e3c7a6ace6377ac88d12cf8902db8e56580162296d18227f48c081
MISC metadata.xml 1019 BLAKE2B 041873a5db7246fc3a6c6b5544fc4c28b981e6e15996c68c53413fabc46ada335333936e4e6ab160f6fad2b9eafafdb9f37d6651cb692e0d69f814acb02557f5 SHA512 41bb1e4656da0cf4a99fd158da5dcf9ccef2b4355f2cdb8e0017a84d8a65cc21ab382734dd967eaeeaf2d55c11e617e6dabe28eeb0bdd40388e8325a8e4ae42a
diff --git a/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch b/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch
new file mode 100644
index 000000000000..6a1464571ec3
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch
@@ -0,0 +1,13 @@
+--- a/test/module.defs 2020-06-13 15:05:35.000000000 +0100
++++ a/test/module.defs 2020-07-03 11:15:53.951205608 +0100
+@@ -30,6 +30,10 @@
+ endif
+ endif
+
++ifeq (1,$(FEATURE.x265))
++ TEST.GCC.l += x265
++endif
++
+ ifeq (1,$(FEATURE.flatpak))
+ TEST.GCC.l += glib-2.0
+ endif
diff --git a/media-video/handbrake/handbrake-1.3.3-r1.ebuild b/media-video/handbrake/handbrake-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..2dccc821812d
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.3.3-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ MY_P="HandBrake-${PV}"
+ SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
+ S="${WORKDIR}/${MY_P}"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
+HOMEPAGE="http://handbrake.fr/"
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
+
+REQUIRED_USE="^^ ( fdk libav-aac )"
+
+RDEPEND="
+ app-arch/xz-utils
+ media-libs/speex
+ dev-libs/jansson
+ dev-libs/libxml2
+ media-libs/a52dec
+ media-libs/libass:=
+ >=media-libs/libbluray-1.0
+ >=media-libs/dav1d-0.5.1
+ media-libs/libdvdnav
+ media-libs/libdvdread:=
+ media-libs/libsamplerate
+ media-libs/libtheora
+ media-libs/libvorbis
+ >=media-libs/libvpx-1.8
+ nvenc? ( media-libs/nv-codec-headers )
+ media-libs/opus
+ media-libs/x264:=
+ media-sound/lame
+ sys-libs/zlib
+ >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/gst-plugins-good:1.0
+ media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-ugly:1.0
+ media-plugins/gst-plugins-a52dec:1.0
+ media-plugins/gst-plugins-libav:1.0
+ media-plugins/gst-plugins-x264:1.0
+ media-plugins/gst-plugins-gdkpixbuf:1.0
+ )
+ gtk? (
+ >=x11-libs/gtk+-3.10
+ dev-libs/dbus-glib
+ dev-libs/glib:2
+ dev-libs/libgudev:=
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/libnotify
+ x11-libs/pango
+ )
+ fdk? ( media-libs/fdk-aac )
+ x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
+ "
+
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-lang/nasm
+ dev-util/cmake
+ dev-util/intltool
+ dev-util/meson
+ sys-devel/automake"
+
+PATCHES=(
+ # Remove libdvdnav duplication and call it on the original instead.
+ # It may work this way; if not, we should try to mimic the duplication.
+ "${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
+
+ # Remove faac dependency; TODO: figure out if we need to do this at all.
+ "${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+
+ # Use whichever python is set by portage
+ "${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
+
+ # Fix x265 linkage... again again #730034
+ "${FILESDIR}/${PN}-1.3.3-x265-link.patch"
+)
+
+src_prepare() {
+ # Get rid of leftover bundled library build definitions,
+ sed -i 's:.*\(/contrib\|contrib/\).*::g' \
+ "${S}"/make/include/main.defs \
+ || die "Contrib removal failed."
+
+ default
+
+ cd "${S}/gtk"
+ # Don't run autogen.sh.
+ sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+ eautoreconf
+}
+
+src_configure() {
+ # Libav was replaced in 1.2 with ffmpeg by default
+ # but I've elected to not make people change their use flags for AAC
+ # as its the same code anyway
+ ./configure \
+ --force \
+ --verbose \
+ --prefix="${EPREFIX}/usr" \
+ --disable-gtk-update-checks \
+ --disable-flatpak \
+ --disable-gtk4 \
+ $(use_enable libav-aac ffmpeg-aac) \
+ $(use_enable fdk fdk-aac) \
+ $(usex !gtk --disable-gtk) \
+ $(usex !gstreamer --disable-gst) \
+ $(use_enable numa) \
+ $(use_enable nvenc) \
+ $(use_enable x265) || die "Configure failed."
+}
+
+src_compile() {
+ emake -C build
+
+ # TODO: Documentation building is currently broken, try to fix it.
+ #
+ # if use doc ; then
+ # emake -C build doc
+ # fi
+}
+
+src_install() {
+ emake -C build DESTDIR="${D}" install
+
+ dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
+}
+
+pkg_postinst() {
+ einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
+ einfo "do not use the bundled (and often patched) upstream libraries."
+ einfo ""
+ einfo "Please do not raise bugs with upstream because of these ebuilds,"
+ einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
+
+ einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
+ if use gtk ; then
+ einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
+ fi
+
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index c70c9bffe66a..5fa9080c62f5 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -3,6 +3,6 @@ DIST mkvtoolnix-47.0.0.tar.xz 7532248 BLAKE2B 7b2c8763a2b2b038933dc96a58e000f130
DIST mkvtoolnix-48.0.0.tar.xz 7476388 BLAKE2B 995c468f9e2069204b539cdc3200d5543ed159c2e969bce207af828ff2ab9bd56767a10359486ed3717efcf28e1aa13f2d6b538af58fcbbc965ee5c050310739 SHA512 33cd028eb990a01433b511416b613ae0c44b398a80c4f2d56a8d419b0b76fde2c36f04024a182402d7e787ff369222df7f22873db34efe7af03746c1c2def80d
EBUILD mkvtoolnix-37.0.0.ebuild 2633 BLAKE2B 4bb1bc4c3defb6dfd672ca24322f9c220155b29ee11a355720de0aea495b9dc5d9a9a21f76c75bf7a91df8d96ed52850ac8e8b371efee6a4fbc9eda4770b0028 SHA512 22ec4a4753909bd92426841c2e2025ace80b3bc6de57e00182c67ab1c2bc8d1e7d03acd0312123f6979b09f6756ecb511ec1f2f97b6e939a591476a03f40bc7b
EBUILD mkvtoolnix-47.0.0.ebuild 2708 BLAKE2B fcae224ed255e1e3ae82e78d901b14e7e230fc9ac77d02901df03b9ca3f866af9695313ac1337ccf3f3b2480c7f71639926b98422388ec8c033d2146a3bb5ebb SHA512 aee260c756079917131a64721a109b65358081f9a5eb2098034e15fac7f601b69e35811efd28da20c601765505194a8d1f30af2aca66a0ccbe0292ab8152951f
-EBUILD mkvtoolnix-48.0.0.ebuild 2708 BLAKE2B d9c6520146200fb45b1456aa9417edfe6f6b6f5667b163b7037eda33fd4db22b0bde922f5c46319f81f1b165a09177eb6a22274b34ce23a0cbabfc6aa7ef017d SHA512 d124b69b119da04e650fe207ca5c70803ce499574aef5b4b703f6cc9f5aeecc42b46039db6ce20044b50c0ba50f9a7853a7f0a6473fc37b89f22b383c2e73bb8
+EBUILD mkvtoolnix-48.0.0.ebuild 2707 BLAKE2B d977cedbb81588bdece6120bee5ec49bfd619c15ad484695f90cb869686e2d6204385b9974d7b69a1e163877974a141a5112d9c85bfe2560e5acd04ba28d8df8 SHA512 399f3defae7b119054247da866c572859d93474125f694a6b65281511e057e9c4bb52eaf892dba3fa8ade7b98523428d755e9504c2e5024a769ac8590153d5eb
EBUILD mkvtoolnix-9999.ebuild 2708 BLAKE2B d9c6520146200fb45b1456aa9417edfe6f6b6f5667b163b7037eda33fd4db22b0bde922f5c46319f81f1b165a09177eb6a22274b34ce23a0cbabfc6aa7ef017d SHA512 d124b69b119da04e650fe207ca5c70803ce499574aef5b4b703f6cc9f5aeecc42b46039db6ce20044b50c0ba50f9a7853a7f0a6473fc37b89f22b383c2e73bb8
MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
index 4f1a6f2c0455..152c14dec85e 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit autotools git-r3
else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Tools to create, alter, and inspect Matroska files"
diff --git a/media-video/plasma-mediacenter/Manifest b/media-video/plasma-mediacenter/Manifest
deleted file mode 100644
index 265cae2577ff..000000000000
--- a/media-video/plasma-mediacenter/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST plasma-mediacenter-5.7.5.tar.xz 162076 BLAKE2B 6001c11ee96e989e9b9366e74637816e3f7d778a225d89c6414ae7b9cc0f3649b460d0e39ed3eb3f9daa6b3cee4d96e42fb71102d500cf2546e4c4af757d8990 SHA512 47a5b015364a1ffd1fd1b1dd3720e5ae8ebc38e4aee03e55d042c6b9aeea2579e1b7a31f1b0fcef74c4c19c470c7a380694d9c93624a75337eb58080f5b8d09b
-EBUILD plasma-mediacenter-5.7.5.ebuild 1370 BLAKE2B 78db35e59fe2ef108253053afd393b483aaea010e36a863c465d501da7e118531eb54a985f6c06eb98f904bce5926a026186e37a178565faf19a9a9ddbbed85d SHA512 b304542a9ee868d941eecdf015edd320370f1c6b168ce7f4c018a08b3f8e5ebd6c0f6f804e13772e03cca748b039d84dcb3cfa2a89e2af07866b4da12ab4ab90
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild b/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
deleted file mode 100644
index 08802ebedeae..000000000000
--- a/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Unified media experience for any device capable of running KDE Plasma"
-HOMEPAGE="https://community.kde.org/Plasma/Plasma_Media_Center"
-SRC_URI="mirror://kde/stable/plasma-mediacenter/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm x86"
-IUSE="semantic-desktop"
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- media-libs/taglib
- semantic-desktop? (
- >=kde-frameworks/baloo-${KFMIN}:5
- >=kde-frameworks/kfilemetadata-${KFMIN}:5
- )
-"
-RDEPEND="${DEPEND}
- >=dev-qt/qtmultimedia-${QTMIN}:5[qml]
- >=kde-plasma/plasma-workspace-5.15.5:5
- !media-video/plasma-mediacenter:0
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package semantic-desktop KF5Baloo)
- )
-
- ecm_src_configure
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 6d2a74597ed6..a2659701fd4f 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ef9dc9a2361a..b714a998f2e2 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Aug 2020 05:08:30 +0000
+Thu, 20 Aug 2020 05:38:32 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 28adef579bb3..99f4c4ff0bc5 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 480671 BLAKE2B 71710a5f99177ec46fe0694fc9b804fd7cf44e47446a21c2611d9b0f86c89bb6adcccf3cabfb8848870fb4eef2d3b3b218819cd809ffc6981b15b3b074e68526 SHA512 8e72c73d5f1757b4286b4c472d2869966d17194e9bdc50b00452ac106672fb7310276706815981b112910bc5faa38697e48a066f45d039aff8e9ed511d40176c
-TIMESTAMP 2020-08-18T05:08:34Z
+MANIFEST Manifest.files.gz 480829 BLAKE2B 7b875550bc3942bd6cddbe0c5c0ece578516314fe4a0a5cdd538e929c903b557ac2af9e301d5f7232331b35fdd266cec7820aab259fc68aadddb4451bc4fefc7 SHA512 3370d43afeebe4815706a4ff51c9176617549d872cfd990d379873d58909952b19ef588fb91c7597fe9a2d900bf73a12b47d7fb29760d1f6faf5537993cac3a5
+TIMESTAMP 2020-08-20T05:38:35Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl87YlJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8+DFtfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAGfA//fZcDoEYxq1OZm2YdCbNe9/4w0nQ75b9ND1MweByREctnZoQLiHoEeGx0
-vQPJmPgKccX+nZNN/uIuFVIqGWy5+FTW0xNaNPPRwuhaa6n/po2zgj8VbEOo3wxy
-3aMFq2xyb0Et3+9UeEd5iyFO5r88PH5etjqQEGOL3pKxoEI3NV0LVi9fO+hihfmb
-Uc7uHPOcZtlQCLXX7v8pwNrMN2QmLLUKlv8TMap+ln2O06HcPrIhNo63HM09fr98
-4H28C4ME2F8BNdGJYXMMoGqbIWPwkHRxo/BLMMRfPzqVIvSDSgUwGI2LsLAv3PyO
-PDiHoa2LqWtKeZJL/+MBG7IMb5DlsIa7W8YQ2453K0MF6Vdo07NdAHqbEoYdlYH4
-X+JPb2DuuEZ+PKr5BrgxowCfe8g3mWE7eLIcZ1D+De1uwFJIn10KhPtFlyFFvMYB
-URfF86j+PhwYMyWAnWVwAwnfkyz8IV8xNXGTKoqcQ5ezzNPXzBeWX1wroorHZOCg
-zaGu+3AK7YVJFlhlndEXZXZqzt0SHa8ZWFy5O3JEZk4xJ4PM9v0RjwcdS529f6FZ
-8Y+p6yN1L26QmfVuVt9q5CgYP6pNvaNIvsWaEPj9E5GTtc1JUotj3K6rIh1kycWS
-6fqeMvMEFtPzAuDKpE7Cr06ucR58I9zVjGNeoOvVPqbrQwPOrfs=
-=wcP+
+klBJWA//WZpK/7/fY+GKKmuABZ7aIv8bSK6R+RhXzVqpNyT7zr9fXsSQbQ7YI8D3
+XXYD3NRtR1xqC2RX8fwyJZTlx2VWeLnYABvGY+IDSYK836MdI/a87qStEdQUuCyH
+LHxhL4QwsMyX/zqofssUrw1GFht+FDb4KfliAAmTu9REI6VU2wtc4UMi8TmFyGiV
+7RZ2lKfW6YFlLM/fw4UEJP8ndbryqzSLpJxgCa9IOHtB8OHzJf8YKvPPjIqPACo+
+A1xv+j2PsV0l1HeoqG8vw0NP2sEVRLyJQFAFf2GBboLaimnuY7lyHz/77X9Uwx84
+7oUKLLma8o8sLUnUFXEBGLZPBcM3ZSetYeQgzA6+E2UJVqDJwMcMKkOzHJmfAgdn
+G3CA5dKd2VNtulZYW32NYRs8Hq04sKhr4P+54ShmuHm5esUmTvSGQzD+JY1R25hJ
+nOfWgaOGwYtuM0YVCglDGh4FFyn6Qg4WHhxHTTJixiHIFlxUUP68zOAg/whQlv1G
+mO6vG/93cOA4+k+bprAaoKtagJjEbHOUAmbfFOlBKLu+QxzxgAQCwCvvaZITpCsv
+gQvXFahGuJrLKi25pLCk3bGobMKK1Bmj5wRPrENi050rQhmj0mDh/Owtg7CKeMj/
+OFlSws6biTTfD5ADYrH+usiv/Sj3yDLVz7eG1eUI//CmLAIF6lo=
+=UcR9
-----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index e0673d89ed37..769ddee349ad 100644
Binary files a/metadata/glsa/Manifest.files.gz and b/metadata/glsa/Manifest.files.gz differ
diff --git a/metadata/glsa/glsa-202008-08.xml b/metadata/glsa/glsa-202008-08.xml
new file mode 100644
index 000000000000..52d74e694184
--- /dev/null
+++ b/metadata/glsa/glsa-202008-08.xml
@@ -0,0 +1,51 @@
+
+
+
+ Mozilla Network Security Service (NSS): Multiple vulnerabilities
+ NSS has multiple information disclosure vulnerabilities when
+ handling secret key material.
+
+ nss
+ 2020-08-19
+ 2020-08-19
+ 734986
+ local, remote
+
+
+ 3.55
+ 3.55
+
+
+
+ The Mozilla Network Security Service (NSS) is a library implementing
+ security features like SSL v.2/v.3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS
+ #12, S/MIME and X.509 certificates.
+
+
+
+ Multiple vulnerabilities have been discovered in NSS. Please review the
+ CVE identifiers referenced below for details.
+
+
+
+ An attacker may be able to obtain information about secret key material.
+
+
+ There is no known workaround at this time.
+
+
+ All NSS users should upgrade to the latest version:
+
+
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=dev-libs/nss-3.55"
+
+
+
+ CVE-2020-12400
+ CVE-2020-12401
+ CVE-2020-12403
+
+ sam_c
+ sam_c
+
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 9e8b82b32004..b714a998f2e2 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Aug 2020 05:08:31 +0000
+Thu, 20 Aug 2020 05:38:32 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 2044c4543fa9..f48ce2bd341f 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-9e88e4d3add589d3e6068027d614349f1675a506 1597556257 2020-08-16T05:37:37+00:00
+46214b1b461f1f9ad005b644d885569d46e4e959 1597835404 2020-08-19T11:10:04+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index a9cc7eeee97c..629327eaf2c7 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index 754da122a55d..8770335d5862 100644
Binary files a/metadata/md5-cache/acct-group/Manifest.gz and b/metadata/md5-cache/acct-group/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/grafana-0 b/metadata/md5-cache/acct-group/grafana-0
new file mode 100644
index 000000000000..f753cb8755e4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/grafana-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=grafana program group
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group b2fc98881af84e4c35840090037852e1 user 7b7fc6ec5eb1c1eee55b0609f01e7362 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=d618b2da8969f2890ff2e5a89d74701f
diff --git a/metadata/md5-cache/acct-group/monkeysphere-0 b/metadata/md5-cache/acct-group/monkeysphere-0
new file mode 100644
index 000000000000..c4c70e41c4c2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/monkeysphere-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=monkeysphere program group
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group b2fc98881af84e4c35840090037852e1 user 7b7fc6ec5eb1c1eee55b0609f01e7362 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=2e21df9eebb5ce23b63d3e08ad3f6743
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index eca618b87b8a..a9ae4036f66f 100644
Binary files a/metadata/md5-cache/acct-user/Manifest.gz and b/metadata/md5-cache/acct-user/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/grafana-0 b/metadata/md5-cache/acct-user/grafana-0
new file mode 100644
index 000000000000..c34dcc7d1fa2
--- /dev/null
+++ b/metadata/md5-cache/acct-user/grafana-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=grafana program user
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/grafana
+SLOT=0
+_eclasses_=acct-user 17ea51dbbada9829d84e966f92df9297 user 7b7fc6ec5eb1c1eee55b0609f01e7362 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=8c20a07a72bc54b680266ca29c1dc64c
diff --git a/metadata/md5-cache/acct-user/monkeysphere-0 b/metadata/md5-cache/acct-user/monkeysphere-0
new file mode 100644
index 000000000000..a77e874ebda2
--- /dev/null
+++ b/metadata/md5-cache/acct-user/monkeysphere-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=monkeysphere program user
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/monkeysphere
+SLOT=0
+_eclasses_=acct-user 17ea51dbbada9829d84e966f92df9297 user 7b7fc6ec5eb1c1eee55b0609f01e7362 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=cf64c76963a0f387e27ab91660a22138
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index ab21c5d1f9c9..136053edee3f 100644
Binary files a/metadata/md5-cache/app-accessibility/Manifest.gz and b/metadata/md5-cache/app-accessibility/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/brltty-6.0-r1 b/metadata/md5-cache/app-accessibility/brltty-6.0-r1
index 8ecfdca3f83f..2e300891d8c5 100644
--- a/metadata/md5-cache/app-accessibility/brltty-6.0-r1
+++ b/metadata/md5-cache/app-accessibility/brltty-6.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Daemon that provides access to the Linux/Unix console for a blind pe
EAPI=7
HOMEPAGE=https://brltty.app/
IUSE=+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu java louis +midi ncurses nls ocaml +pcm policykit python usb systemd +speech tcl xml X elibc_FreeBSD java split-usr python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86
LICENSE=GPL-2 LGPL-2.1
RDEPEND=java? ( >=virtual/jre-1.4 ) app-accessibility/at-spi2-core:2 dev-libs/libpcre2[pcre32] sys-apps/dbus bluetooth? ( net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) louis? ( dev-libs/liblouis:= ) midi? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0= ) pcm? ( media-libs/alsa-lib ) policykit? ( sys-auth/polkit ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) speech? ( app-accessibility/espeak app-accessibility/flite app-accessibility/speech-dispatcher ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) usb? ( virtual/libusb:0 ) xml? ( dev-libs/expat ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libXtst ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api || ( python_targets_python3_6 python_targets_python3_7 ) ) tcl? ( api )
SLOT=0
SRC_URI=https://brltty.app/archive/brltty-6.0.tar.xz
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 findlib 17c71a5d96323df925f9f6db1215668a flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 16d46032afaca1d6d0621f82084880cb libtool f143db5a74ccd9ca28c1234deffede96 multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6 usr-ldscript 7c918d239d0f9098867d0c8e33348fc9
-_md5_=0cd9b500f9c49be6a0139616f94a4e7a
+_md5_=c90e368b780a5605d15e3a1155683eb4
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index f4bfc4e4e071..7d193d4b7de8 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/cpulimit-2.4 b/metadata/md5-cache/app-admin/cpulimit-2.4
index e0294f868970..fbb398dcd1fb 100644
--- a/metadata/md5-cache/app-admin/cpulimit-2.4
+++ b/metadata/md5-cache/app-admin/cpulimit-2.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Limits the CPU usage of a process
EAPI=6
HOMEPAGE=http://cpulimit.sourceforge.net
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/limitcpu/cpulimit-2.4.tar.gz
_eclasses_=multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=9e8de91210ca76aa531953c85e30b505
+_md5_=dbd596c281a1f0f34debc9de91a2d65a
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.6.1 b/metadata/md5-cache/app-admin/keepassxc-2.6.1
new file mode 100644
index 000000000000..0a6f7a1104ae
--- /dev/null
+++ b/metadata/md5-cache/app-admin/keepassxc-2.6.1
@@ -0,0 +1,15 @@
+BDEPEND=ccache? ( dev-util/ccache ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) keeshare? ( dev-libs/quazip ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
+EAPI=7
+HOMEPAGE=https://keepassxc.org
+IUSE=autotype browser ccache debug keeshare +network test yubikey
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1 GPL-2 GPL-3
+RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) keeshare? ( dev-libs/quazip ) yubikey? ( sys-auth/ykpers )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.6.1/keepassxc-2.6.1-src.tar.xz
+_eclasses_=cmake f274d2f953f93e2d88cd3e0b2ce376a9 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=fc58fa78e3473871e1570c335d0113a2
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index ad6e571bcc58..643b0cef2507 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/engrampa-1.22.3-r1 b/metadata/md5-cache/app-arch/engrampa-1.22.3-r1
index 75df80369c0f..a1217ec19118 100644
--- a/metadata/md5-cache/app-arch/engrampa-1.22.3-r1
+++ b/metadata/md5-cache/app-arch/engrampa-1.22.3-r1
@@ -9,5 +9,5 @@ LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/json-glib-0.14 virtual/libintl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[X] x11-libs/pango caja? ( >=mate-base/caja-1.17.1 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/engrampa-1.22.3.tar.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate d3e8bf8e7ba75eb2a344574e81344eca mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=dbde220b479872545fbb4dfd13d84225
diff --git a/metadata/md5-cache/app-arch/engrampa-1.24.0-r1 b/metadata/md5-cache/app-arch/engrampa-1.24.0-r1
index 1c590d869ce6..2e39c420f041 100644
--- a/metadata/md5-cache/app-arch/engrampa-1.24.0-r1
+++ b/metadata/md5-cache/app-arch/engrampa-1.24.0-r1
@@ -9,5 +9,5 @@ LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/json-glib-0.14 virtual/libintl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[X] x11-libs/libSM x11-libs/pango caja? ( >=mate-base/caja-1.17.1 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) virtual/libintl !!app-arch/mate-file-archiver
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.24/engrampa-1.24.0.tar.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate d3e8bf8e7ba75eb2a344574e81344eca mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=e214f57ea313fa8f02845b92527d0e2f
diff --git a/metadata/md5-cache/app-arch/gzip-1.10 b/metadata/md5-cache/app-arch/gzip-1.10
index e64ab43b74ea..26def75f19e1 100644
--- a/metadata/md5-cache/app-arch/gzip-1.10
+++ b/metadata/md5-cache/app-arch/gzip-1.10
@@ -3,9 +3,9 @@ DESCRIPTION=Standard GNU compressor
EAPI=6
HOMEPAGE=https://www.gnu.org/software/gzip/
IUSE=pic static
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-3
SLOT=0
SRC_URI=mirror://gnu/gzip/gzip-1.10.tar.xz mirror://gnu-alpha/gzip/gzip-1.10.tar.xz mirror://gentoo/gzip-1.10.tar.xz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0d50cf437a713fa325ec6015346f161b
+_md5_=d22a6ad03c4949436ddc6c3e96b0f0f3
diff --git a/metadata/md5-cache/app-arch/pixz-1.0.6-r1 b/metadata/md5-cache/app-arch/pixz-1.0.6-r1
index 1fa28f5bd823..45c6254ab621 100644
--- a/metadata/md5-cache/app-arch/pixz-1.0.6-r1
+++ b/metadata/md5-cache/app-arch/pixz-1.0.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Parallel Indexed XZ compressor
EAPI=6
HOMEPAGE=https://github.com/vasi/pixz
IUSE=static
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
LICENSE=BSD-2
RDEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 )
SLOT=0
SRC_URI=https://github.com/vasi/pixz/releases/download/v1.0.6/pixz-1.0.6.tar.xz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4aa925a02fb2e9ae9605529c6d540c7d
+_md5_=49f2e6ed1767e8397440bf8bbf59c0a3
diff --git a/metadata/md5-cache/app-arch/pixz-1.0.7 b/metadata/md5-cache/app-arch/pixz-1.0.7
new file mode 100644
index 000000000000..b64d329eda7a
--- /dev/null
+++ b/metadata/md5-cache/app-arch/pixz-1.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare test
+DEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 ) static? ( >=app-arch/libarchive-2.8:=[static-libs(+)] >=app-arch/xz-utils-5[static-libs(+)] )
+DESCRIPTION=Parallel Indexed XZ compressor
+EAPI=7
+HOMEPAGE=https://github.com/vasi/pixz
+IUSE=static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 )
+SLOT=0
+SRC_URI=https://github.com/vasi/pixz/releases/download/v1.0.7/pixz-1.0.7.tar.xz
+_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=109dc9d9ee65c82f5285264079e31c4f
diff --git a/metadata/md5-cache/app-arch/pixz-9999 b/metadata/md5-cache/app-arch/pixz-9999
index 7a097cd5a596..b5f88213785a 100644
--- a/metadata/md5-cache/app-arch/pixz-9999
+++ b/metadata/md5-cache/app-arch/pixz-9999
@@ -1,12 +1,13 @@
-DEFINED_PHASES=configure prepare unpack
-DEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 ) static? ( >=app-arch/libarchive-2.8:=[static-libs(+)] >=app-arch/xz-utils-5[static-libs(+)] ) app-text/asciidoc >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=app-text/asciidoc >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare test unpack
+DEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 ) static? ( >=app-arch/libarchive-2.8:=[static-libs(+)] >=app-arch/xz-utils-5[static-libs(+)] )
DESCRIPTION=Parallel Indexed XZ compressor
-EAPI=6
+EAPI=7
HOMEPAGE=https://github.com/vasi/pixz
IUSE=static
LICENSE=BSD-2
PROPERTIES=live
RDEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 )
SLOT=0
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 git-r3 8ec5b53812bce105ae7943930e4660f8 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a3bae37a2cca2078a6faabbfcc814d37
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 git-r3 8ec5b53812bce105ae7943930e4660f8 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=109dc9d9ee65c82f5285264079e31c4f
diff --git a/metadata/md5-cache/app-arch/zip-3.0-r4 b/metadata/md5-cache/app-arch/zip-3.0-r4
index f627539b8908..3b7c7b5d1a63 100644
--- a/metadata/md5-cache/app-arch/zip-3.0-r4
+++ b/metadata/md5-cache/app-arch/zip-3.0-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Info ZIP (encryption support)
EAPI=7
HOMEPAGE=http://www.info-zip.org/
IUSE=bzip2 crypt natspec unicode
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
LICENSE=Info-ZIP
RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
SLOT=0
SRC_URI=mirror://sourceforge/infozip/zip30.zip
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=846b3541a16769b860111cfb8950575a
+_md5_=71ede9bdb87db91239a4c87ef47d35c2
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 1f88ff65d3f0..b1f41e7245a8 100644
Binary files a/metadata/md5-cache/app-cdr/Manifest.gz and b/metadata/md5-cache/app-cdr/Manifest.gz differ
diff --git a/metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-20.08.0 b/metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-20.08.0
index c249fcd06b96..0ec480737a49 100644
--- a/metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-20.08.0
+++ b/metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-20.08.0
@@ -5,10 +5,10 @@ DESCRIPTION=Dolphin plugin for ISO loopback device mounting
EAPI=7
HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
IUSE=debug
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
LICENSE=GPL-2
RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/dolphin-20.08.0:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
SLOT=5
SRC_URI=mirror://kde/stable/release-service/20.08.0/src/dolphin-plugins-20.08.0.tar.xz
_eclasses_=cmake f274d2f953f93e2d88cd3e0b2ce376a9 ecm f6ac7d31239fbaacf94ec10be0fb8066 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 kde.org 555930b8ec632651fb9acbd983a96e3f multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c2675d2668e88ba6834e64fb446eb3e
+_md5_=5703effb7b485043883f292a532f8f41
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index aece07fef4b6..d86e8683125b 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/gcr-3.36.0 b/metadata/md5-cache/app-crypt/gcr-3.36.0
new file mode 100644
index 000000000000..4f532bf765ec
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/gcr-3.36.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) gtk? ( dev-libs/libxml2:2 ) dev-util/gdbus-codegen dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.9 app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/libgcrypt-1.2.2:0= >=app-crypt/p11-kit-0.19.0 gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] ) >=sys-apps/dbus-1 introspection? ( >=dev-libs/gobject-introspection-1.58:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Libraries for cryptographic UIs and accessing PKCS#11 modules
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gcr
+IUSE=gtk gtk-doc +introspection +vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/libgcrypt-1.2.2:0= >=app-crypt/p11-kit-0.19.0 gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] ) >=sys-apps/dbus-1 introspection? ( >=dev-libs/gobject-introspection-1.58:= ) app-crypt/gnupg
+REQUIRED_USE=vala? ( introspection )
+SLOT=0/1
+SRC_URI=mirror://gnome/sources/gcr/3.36/gcr-3.36.0.tar.xz
+_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2-utils 893e828f0f25f070f0b38d20c83c7670 meson 71d293a701d6362387e1214da368c848 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 54a3178500786b0a7ede4a23b7f2a6ad python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vala 2cd99cd72bb91f3f190fa4ca576be580 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=85f162ceccc9a411c8bf69ba8a21887e
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.44 b/metadata/md5-cache/app-crypt/monkeysphere-0.44
new file mode 100644
index 000000000000..91ec06853499
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.44
@@ -0,0 +1,12 @@
+DEFINED_PHASES=postinst prepare
+DEPEND=acct-group/monkeysphere acct-user/monkeysphere >=app-crypt/gnupg-2.1.17:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
+DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
+EAPI=7
+HOMEPAGE=http://web.monkeysphere.info/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=acct-group/monkeysphere acct-user/monkeysphere >=app-crypt/gnupg-2.1.17:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0= net-misc/openssh
+RESTRICT=test
+SLOT=0/0
+SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.44.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.44.orig.tar.gz
+_md5_=79ca1cc9286f8f3bfa851280c725ad86
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 8302238c08ea..79295ce30f3f 100644
Binary files a/metadata/md5-cache/app-dicts/Manifest.gz and b/metadata/md5-cache/app-dicts/Manifest.gz differ
diff --git a/metadata/md5-cache/app-dicts/libydpdict-1.0.4 b/metadata/md5-cache/app-dicts/libydpdict-1.0.4
new file mode 100644
index 000000000000..58bb4c34e9f3
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/libydpdict-1.0.4
@@ -0,0 +1,11 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DESCRIPTION=Library for handling the Collins Dictionary database
+EAPI=7
+HOMEPAGE=https://github.com/wojtekka/libydpdict
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://github.com/wojtekka/libydpdict/archive/1.0.4.tar.gz -> libydpdict-1.0.4.tar.gz
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=ea634325cd148d5abc3e1b9702f4ca55
diff --git a/metadata/md5-cache/app-dicts/ydpdict-1.0.3 b/metadata/md5-cache/app-dicts/ydpdict-1.0.3
new file mode 100644
index 000000000000..036ee3286672
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/ydpdict-1.0.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=app-dicts/libydpdict sys-libs/ncurses[unicode] ao? ( media-libs/libao )
+DESCRIPTION=Interface for the Collins Dictionary
+EAPI=7
+HOMEPAGE=https://github.com/wojtekka/ydpdict
+IUSE=ao
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-dicts/libydpdict sys-libs/ncurses[unicode] ao? ( media-libs/libao )
+SLOT=0
+SRC_URI=https://github.com/wojtekka/ydpdict/archive/1.0.3.tar.gz -> ydpdict-1.0.3.tar.gz
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=078b612b97d2dc1bd6cfd41adc16bc20
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 225d90cb3227..3d4a8ad7ba7a 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/zeal-0.6.1 b/metadata/md5-cache/app-doc/zeal-0.6.1
deleted file mode 100644
index 2db437a6b9b0..000000000000
--- a/metadata/md5-cache/app-doc/zeal-0.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-arch/libarchive dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/extra-cmake-modules:5 >=x11-libs/xcb-util-keysyms-0.3.9
-DESCRIPTION=Offline documentation browser inspired by Dash
-EAPI=7
-HOMEPAGE=https://zealdocs.org/
-IUSE=vanilla
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-arch/libarchive dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/extra-cmake-modules:5 >=x11-libs/xcb-util-keysyms-0.3.9 x11-themes/hicolor-icon-theme
-SLOT=0
-SRC_URI=https://github.com/zealdocs/zeal/archive/v0.6.1.tar.gz -> zeal-0.6.1.tar.gz
-_eclasses_=cmake f274d2f953f93e2d88cd3e0b2ce376a9 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=f8e70634d579fe8e3ff05f6c7ded789e
diff --git a/metadata/md5-cache/app-doc/zeal-0.6.1_p20200815 b/metadata/md5-cache/app-doc/zeal-0.6.1_p20200815
new file mode 100644
index 000000000000..62c481734f0f
--- /dev/null
+++ b/metadata/md5-cache/app-doc/zeal-0.6.1_p20200815
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-arch/libarchive:= dev-db/sqlite:3 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/extra-cmake-modules:5 x11-libs/libX11 x11-libs/libxcb:= >=x11-libs/xcb-util-keysyms-0.3.9
+DESCRIPTION=Offline documentation browser inspired by Dash
+EAPI=7
+HOMEPAGE=https://zealdocs.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-arch/libarchive:= dev-db/sqlite:3 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/extra-cmake-modules:5 x11-libs/libX11 x11-libs/libxcb:= >=x11-libs/xcb-util-keysyms-0.3.9 x11-themes/hicolor-icon-theme
+SLOT=0
+SRC_URI=https://github.com/zealdocs/zeal/archive/994cc5f6b6bfffddd5faaaafdb4fed483c38188f.tar.gz -> zeal-0.6.1_p20200815.tar.gz
+_eclasses_=cmake f274d2f953f93e2d88cd3e0b2ce376a9 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=e72efcc7ec55391d74d66317592002ec
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index d5c55fdcb90d..b19fd8d43bb2 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/gedit-3.36.2 b/metadata/md5-cache/app-editors/gedit-3.36.2
index 9c0cad847e81..2f915574c4a0 100644
--- a/metadata/md5-cache/app-editors/gedit-3.36.2
+++ b/metadata/md5-cache/app-editors/gedit-3.36.2
@@ -5,11 +5,11 @@ DESCRIPTION=A text editor for the GNOME desktop
EAPI=7
HOMEPAGE=https://wiki.gnome.org/Apps/Gedit
IUSE=+introspection +python gtk-doc spell vala python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~ia64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86
LICENSE=GPL-2+ CC-BY-SA-3.0
RDEPEND=>=dev-libs/glib-2.52:2 >=dev-libs/libpeas-1.14.1[gtk] >=x11-libs/gtk+-3.22.0:3[introspection?] >=x11-libs/gtksourceview-4.0.2:4[introspection?] >=gui-libs/tepl-4.4:4 x11-libs/libX11 spell? ( >=app-text/gspell-0.2.5:0= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pycairo[python_targets_python3_6(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_6(-)] dev-libs/libpeas[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_7(-)] dev-libs/libpeas[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_8(-)] dev-libs/libpeas[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ) x11-themes/adwaita-icon-theme gnome-base/gsettings-desktop-schemas gnome-base/gvfs
REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
SLOT=0
SRC_URI=mirror://gnome/sources/gedit/3.36/gedit-3.36.2.tar.xz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2-utils 893e828f0f25f070f0b38d20c83c7670 meson 71d293a701d6362387e1214da368c848 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vala 2cd99cd72bb91f3f190fa4ca576be580 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a9d88fbb7100f621ce998e9d5b402f6
+_md5_=997d27caf44a59b9d42633ad76df50a4
diff --git a/metadata/md5-cache/app-editors/pluma-1.22.2 b/metadata/md5-cache/app-editors/pluma-1.22.2
index e3e719fa37e1..d07834a15c76 100644
--- a/metadata/md5-cache/app-editors/pluma-1.22.2
+++ b/metadata/md5-cache/app-editors/pluma-1.22.2
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 )
RESTRICT=test
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/pluma-1.22.2.tar.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate d3e8bf8e7ba75eb2a344574e81344eca mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=820b132aafdd40715cc2faa721513029
diff --git a/metadata/md5-cache/app-editors/pluma-1.24.0 b/metadata/md5-cache/app-editors/pluma-1.24.0
index f436b71c0404..9bf693a6fc2d 100644
--- a/metadata/md5-cache/app-editors/pluma-1.24.0
+++ b/metadata/md5-cache/app-editors/pluma-1.24.0
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
RESTRICT=test
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.24/pluma-1.24.0.tar.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate d3e8bf8e7ba75eb2a344574e81344eca mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=f07db1af04ba854e310786ced7242d30
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 709dfa582510..c50be62b647d 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/ddskk-17.1 b/metadata/md5-cache/app-emacs/ddskk-17.1
new file mode 100644
index 000000000000..7c380619cac0
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/ddskk-17.1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-24.3:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=One Japanese input methods on Emacs
+EAPI=7
+HOMEPAGE=http://openlab.ring.gr.jp/skk/
+IUSE=ruby
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-3+
+RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) >=app-editors/emacs-24.3:*
+SLOT=0
+SRC_URI=https://github.com/skk-dev/ddskk/archive/ddskk-17.1_Neppu.tar.gz -> ddskk-17.1.tar.gz
+_eclasses_=elisp 00840e1f4eb277c757dbfa5abf73c4c7 elisp-common cae18e9c43c86703b074d0b15dcdb9e2 ruby-single e6530f43a549f120f9396ccb852288f5 ruby-utils 9991225e034c8185d67fbc7a8816559f vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
+_md5_=6ed8c92ef22c211af77e1191372f6083
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 00b2daeba18d..1aa944980ef5 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/cloud-init-20.1 b/metadata/md5-cache/app-emulation/cloud-init-20.1
index d824a33524b9..00708379271d 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-20.1
+++ b/metadata/md5-cache/app-emulation/cloud-init-20.1
@@ -5,7 +5,7 @@ DESCRIPTION=Cloud instance initialisation magic
EAPI=7
HOMEPAGE=https://launchpad.net/cloud-init
IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
LICENSE=GPL-3
RDEPEND=dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/oauthlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyserial[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/configobj-5.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jsonpatch[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jsonschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] net-analyzer/macchanger sys-apps/iproute2 sys-fs/growpart virtual/logger python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://launchpad.net/cloud-init/trunk/20.1/+download/cloud-init-20.1.tar.gz
_eclasses_=distutils-r1 eb92d1a6d9057e2422cc9610f79f919c multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=73c4d0d994438ef30dd0bf0501c8b0b7
+_md5_=ca50c0caeeae86a6b2db6a08aaf17638
diff --git a/metadata/md5-cache/app-emulation/cri-o-1.10.6 b/metadata/md5-cache/app-emulation/cri-o-1.10.6
deleted file mode 100644
index fdb42ad42fc9..000000000000
--- a/metadata/md5-cache/app-emulation/cri-o-1.10.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-util/ostree ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sys-libs/libselinux:= ) dev-go/go-md2man >=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=OCI-based implementation of Kubernetes Container Runtime Interface
-EAPI=6
-HOMEPAGE=https://cri-o.io/
-IUSE=btrfs +device-mapper ostree seccomp selinux
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
-RDEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-util/ostree ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sys-libs/libselinux:= )
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes-incubator/cri-o/archive/v1.10.6.tar.gz -> cri-o-1.10.6.tar.gz
-_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 2477ebe553d3e4d2c606191fe6c33602 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=45edaef3bffd795ca5f92beec966cde8
diff --git a/metadata/md5-cache/app-emulation/cri-o-1.13.9 b/metadata/md5-cache/app-emulation/cri-o-1.13.9
deleted file mode 100644
index 2e839b9fdf66..000000000000
--- a/metadata/md5-cache/app-emulation/cri-o-1.13.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-util/ostree ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sys-libs/libselinux:= ) dev-go/go-md2man
-DESCRIPTION=OCI-based implementation of Kubernetes Container Runtime Interface
-EAPI=7
-HOMEPAGE=https://cri-o.io/
-IUSE=btrfs +device-mapper ostree seccomp selinux
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
-RDEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-util/ostree ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sys-libs/libselinux:= )
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes-sigs/cri-o/archive/v1.13.9.tar.gz -> cri-o-1.13.9.tar.gz
-_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 2477ebe553d3e4d2c606191fe6c33602 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=9fa0da00030e3f6e21496049a9d2134f
diff --git a/metadata/md5-cache/app-emulation/cri-o-1.15.1 b/metadata/md5-cache/app-emulation/cri-o-1.15.1
deleted file mode 100644
index 9bfb98aa4ee2..000000000000
--- a/metadata/md5-cache/app-emulation/cri-o-1.15.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 sys-libs/libseccomp:= btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) selinux? ( sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=OCI-based implementation of Kubernetes Container Runtime Interface
-EAPI=7
-HOMEPAGE=https://cri-o.io/
-IUSE=btrfs +device-mapper selinux systemd
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
-RDEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 sys-libs/libseccomp:= btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) selinux? ( sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= ) ! cri-o-1.15.1.tar.gz
-_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b
-_md5_=13b2b816ba1b1d252442755b5dc324e6
diff --git a/metadata/md5-cache/app-emulation/cri-o-1.15.2 b/metadata/md5-cache/app-emulation/cri-o-1.15.2
deleted file mode 100644
index b842b5ab78d2..000000000000
--- a/metadata/md5-cache/app-emulation/cri-o-1.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 sys-libs/libseccomp:= btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) selinux? ( sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=OCI-based implementation of Kubernetes Container Runtime Interface
-EAPI=7
-HOMEPAGE=https://cri-o.io/
-IUSE=btrfs +device-mapper selinux systemd
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
-RDEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 sys-libs/libseccomp:= btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) selinux? ( sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= ) ! cri-o-1.15.2.tar.gz
-_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b
-_md5_=13b2b816ba1b1d252442755b5dc324e6
diff --git a/metadata/md5-cache/app-emulation/cri-o-1.16.3 b/metadata/md5-cache/app-emulation/cri-o-1.16.3
deleted file mode 100644
index 5e88a46d5399..000000000000
--- a/metadata/md5-cache/app-emulation/cri-o-1.16.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=app-crypt/gpgme:= app-emulation/conmon app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 sys-libs/libseccomp:= btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) selinux? ( sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=OCI-based implementation of Kubernetes Container Runtime Interface
-EAPI=7
-HOMEPAGE=https://cri-o.io/
-IUSE=btrfs +device-mapper selinux systemd
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
-RDEPEND=app-crypt/gpgme:= app-emulation/conmon app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 sys-libs/libseccomp:= btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) selinux? ( sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= ) ! cri-o-1.16.3.tar.gz
-_eclasses_=go-module 45394825d9260b479aa1cf252ea58e01
-_md5_=514eb315b499fd748d2df6b5c96143a7
diff --git a/metadata/md5-cache/app-emulation/cri-o-1.17.0 b/metadata/md5-cache/app-emulation/cri-o-1.18.3
similarity index 90%
rename from metadata/md5-cache/app-emulation/cri-o-1.17.0
rename to metadata/md5-cache/app-emulation/cri-o-1.18.3
index 7b6ad852c363..811793b23c24 100644
--- a/metadata/md5-cache/app-emulation/cri-o-1.17.0
+++ b/metadata/md5-cache/app-emulation/cri-o-1.18.3
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
RDEPEND=app-crypt/gpgme:= app-emulation/conmon app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 sys-libs/libseccomp:= btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) selinux? ( sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= ) ! cri-o-1.17.0.tar.gz
+SRC_URI=https://github.com/cri-o/cri-o/archive/v1.18.3.tar.gz -> cri-o-1.18.3.tar.gz
_eclasses_=go-module 45394825d9260b479aa1cf252ea58e01
-_md5_=8d71d907596c5368d615635af312588a
+_md5_=1eb2d413a6b7b33dc15fc30fd0a23338
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index 0ae53720e1b7..1e3b52cd59ba 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -11,4 +11,4 @@ RDEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-li
REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
SLOT=0
_eclasses_=bash-completion-r1 e5f9c3faab3ab3d1e7e007daa8c736ef eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 8ec5b53812bce105ae7943930e4660f8 linux-info c90a203b1c14cfa77bd3e37a0e96c955 meson 71d293a701d6362387e1214da368c848 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 54a3178500786b0a7ede4a23b7f2a6ad python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=89c8df4a79ecd62ebd2bc346f921bf46
+_md5_=387edb39df365aed41ff0875d77f5e34
diff --git a/metadata/md5-cache/app-emulation/qemu-5.0.0-r2 b/metadata/md5-cache/app-emulation/qemu-5.0.0-r2
index 8ae6ac208b21..07a13e84e536 100644
--- a/metadata/md5-cache/app-emulation/qemu-5.0.0-r2
+++ b/metadata/md5-cache/app-emulation/qemu-5.0.0-r2
@@ -5,7 +5,7 @@ DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
EAPI=7
HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug doc +fdt glusterfs gnutls gtk infiniband iscsi io-uring jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs +xkb zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 +filecaps
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc ~ppc64 ~x86
LICENSE=GPL-2 LGPL-2 BSD-2
RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 xkb? ( x11-libs/libxkbcommon ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.12.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu ) filecaps? ( sys-libs/libcap )
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) virtfs? ( caps xattr ) vte? ( gtk ) plugins? ( !static !static-user )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://download.qemu.org/qemu-5.0.0.tar.xz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 fcaps da689a8e04bbbb3518888ff668fee45b l10n 97f2753e3f1f3753d53d856c7c0bbb0b linux-info c90a203b1c14cfa77bd3e37a0e96c955 multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=ffb5c829ad0ff477066fba68a596b7f2
+_md5_=3c68f11bf6a7fa895d590c19eb7a3e7b
diff --git a/metadata/md5-cache/app-emulation/spice-0.14.3 b/metadata/md5-cache/app-emulation/spice-0.14.3
index fb302558b5df..48a1db618408 100644
--- a/metadata/md5-cache/app-emulation/spice-0.14.3
+++ b/metadata/md5-cache/app-emulation/spice-0.14.3
@@ -5,10 +5,10 @@ DESCRIPTION=SPICE server
EAPI=7
HOMEPAGE=https://www.spice-space.org/
IUSE=libressl lz4 sasl smartcard static-libs gstreamer
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
LICENSE=LGPL-2.1
RDEPEND=dev-lang/orc[static-libs(+)?] >=dev-libs/glib-2.22:2[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0=[static-libs(+)?] ) libressl? ( dev-libs/libressl:0=[static-libs(+)?] ) lz4? ( app-arch/lz4:0=[static-libs(+)?] ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
SLOT=0
SRC_URI=https://www.spice-space.org/download/releases/spice-server/spice-0.14.3.tar.bz2
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 python-any-r1 54a3178500786b0a7ede4a23b7f2a6ad python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=d7f316a212a739234149d4004b870964
+_md5_=377c2f289c404f1f896199cea5b7ba85
diff --git a/metadata/md5-cache/app-emulation/spice-protocol-0.14.1 b/metadata/md5-cache/app-emulation/spice-protocol-0.14.1
index 24160efdb721..a0bae3047f95 100644
--- a/metadata/md5-cache/app-emulation/spice-protocol-0.14.1
+++ b/metadata/md5-cache/app-emulation/spice-protocol-0.14.1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
DESCRIPTION=Headers defining the SPICE protocol
EAPI=7
HOMEPAGE=https://www.spice-space.org/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
LICENSE=BSD
SLOT=0
SRC_URI=https://www.spice-space.org/download/releases/spice-protocol-0.14.1.tar.bz2
-_md5_=a651d476d8ef3cb99fec2faee8ce2a22
+_md5_=25b519eabcca768000799beb00306202
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index bfe66cdb5327..2251fb736a71 100644
Binary files a/metadata/md5-cache/app-eselect/Manifest.gz and b/metadata/md5-cache/app-eselect/Manifest.gz differ
diff --git a/metadata/md5-cache/app-eselect/eselect-iptables-20200508 b/metadata/md5-cache/app-eselect/eselect-iptables-20200508
index 5839007e3187..dd5ed7821d2c 100644
--- a/metadata/md5-cache/app-eselect/eselect-iptables-20200508
+++ b/metadata/md5-cache/app-eselect/eselect-iptables-20200508
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
DESCRIPTION=Manages the {,/usr}/sbin/iptables symlink
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86
LICENSE=GPL-2
RDEPEND=app-admin/eselect
SLOT=0
SRC_URI=https://dev.gentoo.org/~chutzpah/dist/iptables/eselect-iptables-20200508.tar.xz
-_md5_=5ff6ca0aabf8399f1f7e5a5068ec98b8
+_md5_=051d6af3f37d334373e40e507d1fd57e
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index dbbd9e7d77ab..04227ea59cf0 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.11.0 b/metadata/md5-cache/app-i18n/ibus-table-1.11.0
new file mode 100644
index 000000000000..5d3ca66e48f6
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-table-1.11.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) virtual/libiconv nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Tables engines for IBus
+EAPI=7
+HOMEPAGE=https://github.com/ibus/ibus/wiki
+IUSE=nls python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) virtual/libiconv nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.11.0/ibus-table-1.11.0.tar.gz
+_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 multilib 2477ebe553d3e4d2c606191fe6c33602 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=e72b984a5f14372a30152f5a19eba28a
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.9.18-r1 b/metadata/md5-cache/app-i18n/ibus-table-1.9.18-r1
deleted file mode 100644
index 2e7041ba01a1..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-table-1.9.18-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) virtual/libiconv nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Tables engines for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=nls +python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) virtual/libiconv nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.9.18/ibus-table-1.9.18.tar.gz
-_eclasses_=multilib 2477ebe553d3e4d2c606191fe6c33602 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=70c4b0c4151b7f7c26bdd95e69420b07
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.9.21-r1 b/metadata/md5-cache/app-i18n/ibus-table-1.9.21-r1
deleted file mode 100644
index 9baa740a382f..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-table-1.9.21-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) virtual/libiconv nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Tables engines for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=nls +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) virtual/libiconv nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.9.21/ibus-table-1.9.21.tar.gz
-_eclasses_=multilib 2477ebe553d3e4d2c606191fe6c33602 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=309cd9021c1fba0e9474e8b96a7ff2b2
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.9.21-r2 b/metadata/md5-cache/app-i18n/ibus-table-1.9.21-r2
new file mode 100644
index 000000000000..269a98b36ea5
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-table-1.9.21-r2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) virtual/libiconv nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Tables engines for IBus
+EAPI=7
+HOMEPAGE=https://github.com/ibus/ibus/wiki
+IUSE=nls python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) virtual/libiconv nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.9.21/ibus-table-1.9.21.tar.gz
+_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 multilib 2477ebe553d3e4d2c606191fe6c33602 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=988b90c80638a2605682e03b81e728e1
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 81319f59a5db..689e8ad368ec 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/dateutils-0.4.6 b/metadata/md5-cache/app-misc/dateutils-0.4.6
index 40c60903cfbc..2255374c0113 100644
--- a/metadata/md5-cache/app-misc/dateutils-0.4.6
+++ b/metadata/md5-cache/app-misc/dateutils-0.4.6
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile test
-DEPEND=app-arch/xz-utils sys-libs/timezone-data
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=configure prepare
+DEPEND=sys-libs/timezone-data
DESCRIPTION=command line date and time utilities
EAPI=7
-HOMEPAGE=https://www.fresse.org/dateutils/
+HOMEPAGE=https://www.fresse.org/dateutils/ https://github.com/hroptatyr/dateutils
KEYWORDS=~amd64 ~x86
LICENSE=BSD
-RDEPEND=!sys-fabric/dapl
+RDEPEND=sys-libs/timezone-data !sys-fabric/dapl
SLOT=0
-SRC_URI=https://bitbucket.org/hroptatyr/dateutils/downloads/dateutils-0.4.6.tar.xz
-_md5_=6ac8b1b2a8138e1a2e5e71ae405e4609
+SRC_URI=https://github.com/hroptatyr/dateutils/releases/download/v0.4.6/dateutils-0.4.6.tar.xz
+_md5_=2362b2a473adc6555605f248609653b8
diff --git a/metadata/md5-cache/app-misc/dateutils-0.4.7 b/metadata/md5-cache/app-misc/dateutils-0.4.7
new file mode 100644
index 000000000000..c516e82ff99c
--- /dev/null
+++ b/metadata/md5-cache/app-misc/dateutils-0.4.7
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=configure prepare
+DEPEND=sys-libs/timezone-data
+DESCRIPTION=command line date and time utilities
+EAPI=7
+HOMEPAGE=https://www.fresse.org/dateutils/ https://github.com/hroptatyr/dateutils
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=sys-libs/timezone-data !sys-fabric/dapl
+SLOT=0
+SRC_URI=https://github.com/hroptatyr/dateutils/releases/download/v0.4.7/dateutils-0.4.7.tar.xz
+_md5_=b3fba2fcd4ee100b2eeb03fc6db01112
diff --git a/metadata/md5-cache/app-misc/dateutils-9999 b/metadata/md5-cache/app-misc/dateutils-9999
new file mode 100644
index 000000000000..9a59a1ae52e5
--- /dev/null
+++ b/metadata/md5-cache/app-misc/dateutils-9999
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/xz-utils >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure prepare unpack
+DEPEND=sys-libs/timezone-data
+DESCRIPTION=command line date and time utilities
+EAPI=7
+HOMEPAGE=https://www.fresse.org/dateutils/ https://github.com/hroptatyr/dateutils
+LICENSE=BSD
+PROPERTIES=live
+RDEPEND=sys-libs/timezone-data !sys-fabric/dapl
+SLOT=0
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 git-r3 8ec5b53812bce105ae7943930e4660f8 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=abc1166904401481e1249f71ec28ae88
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 755e3adcf0e8..3782167e8f29 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/ledger-3.2.0 b/metadata/md5-cache/app-office/ledger-3.2.0
index a7d50f764f25..a039558ace0c 100644
--- a/metadata/md5-cache/app-office/ledger-3.2.0
+++ b/metadata/md5-cache/app-office/ledger-3.2.0
@@ -5,7 +5,7 @@ DESCRIPTION=Double-entry accounting system with a command-line reporting interfa
EAPI=7
HOMEPAGE=https://www.ledger-cli.org/
IUSE=debug doc python python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=dev-libs/boost:=[python?] dev-libs/gmp:0= dev-libs/mpfr:0= python? ( python_single_target_python3_6? ( dev-libs/boost:=[python_targets_python3_6(-)] dev-python/cheetah3:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] dev-python/cheetah3:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] dev-python/cheetah3:=[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/ledger/ledger/archive/v3.2.0.tar.gz -> ledger-3.2.0.tar.gz
_eclasses_=bash-completion-r1 e5f9c3faab3ab3d1e7e007daa8c736ef check-reqs 7e3fd1855a5e1b50bb9e80827b3f672d cmake f274d2f953f93e2d88cd3e0b2ce376a9 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=63d730acdf1134864b7ae9ce9c5ffe01
+_md5_=1296b181070acbe008de2fef7da1b654
diff --git a/metadata/md5-cache/app-office/libreoffice-6.4.6.2 b/metadata/md5-cache/app-office/libreoffice-6.4.6.2
new file mode 100644
index 000000000000..8c6da228dcab
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-6.4.6.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig odk? ( >=app-doc/doxygen-1.8.4 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.15.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 dev-util/mdds:1/1.5 media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.8 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+IUSE=accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND==app-office/libreoffice-l10n-6.4*
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.15.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.8 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) base? ( firebird java ) bluetooth? ( dbus ) gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.4.6.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.4.6.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.4.6//libreoffice-6.4.6.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.4.6//libreoffice-help-6.4.6.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.4.6.2/src/libreoffice-6.4.6.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.4.6.2/src/libreoffice-help-6.4.6.2.tar.xz https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 bash-completion-r1 e5f9c3faab3ab3d1e7e007daa8c736ef check-reqs 7e3fd1855a5e1b50bb9e80827b3f672d estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 16d46032afaca1d6d0621f82084880cb libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=8fef94f56e5c2d5e888deac69ea82547
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-6.4.6.2 b/metadata/md5-cache/app-office/libreoffice-l10n-6.4.6.2
new file mode 100644
index 000000000000..dfd45f98e19c
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-6.4.6.2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DEFINED_PHASES=compile configure install prepare unpack
+DESCRIPTION=Translations for the Libreoffice suite
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+RDEPEND=app-text/hunspell
+RESTRICT=strip
+SLOT=0
+SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/6.4.6/rpm/x86_64/LibreOffice_6.4.6_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.6/rpm/x86_64/LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_zu.tar.gz )
+_eclasses_=estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 rpm 760ff223c2c4299b68ea901e24c4cabd
+_md5_=5c458135ec135f80aaa17412dc305fe2
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 8669e4d5b950..8f2ac00ca72d 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/fquery-0.2.3 b/metadata/md5-cache/app-portage/fquery-0.2.3
index a673b7d33075..1f9f305c37c2 100644
--- a/metadata/md5-cache/app-portage/fquery-0.2.3
+++ b/metadata/md5-cache/app-portage/fquery-0.2.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/hashtables:= dev-haskell/parsec:= dev-haskell/regex-compat:= >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6
DESCRIPTION=Installed package query tool for Gentoo Linux
EAPI=5
-HOMEPAGE=http://hackage.haskell.org/package/fquery
+HOMEPAGE=https://hackage.haskell.org/package/fquery
KEYWORDS=~amd64 ~x86
LICENSE=ZLIB
RDEPEND=dev-haskell/hashtables:= dev-haskell/parsec:= dev-haskell/regex-compat:= >=dev-lang/ghc-7.4.1:=
SLOT=0
SRC_URI=https://hackage.haskell.org/package/fquery-0.2.3/fquery-0.2.3.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=67b1ef261bd0a1a9e8c22f42da4901b7
+_md5_=79081b3a69ce1aae49cebbe429b09418
diff --git a/metadata/md5-cache/app-portage/fquery-0.2.3-r1 b/metadata/md5-cache/app-portage/fquery-0.2.3-r1
index c150a62e9313..b093114aeac6 100644
--- a/metadata/md5-cache/app-portage/fquery-0.2.3-r1
+++ b/metadata/md5-cache/app-portage/fquery-0.2.3-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
DEPEND=dev-haskell/hashtables:= dev-haskell/parsec:= dev-haskell/regex-compat:= >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6
DESCRIPTION=Installed package query tool for Gentoo Linux
EAPI=6
-HOMEPAGE=http://hackage.haskell.org/package/fquery
+HOMEPAGE=https://hackage.haskell.org/package/fquery
KEYWORDS=~amd64 ~x86
LICENSE=ZLIB
RDEPEND=dev-haskell/hashtables:= dev-haskell/parsec:= dev-haskell/regex-compat:= >=dev-lang/ghc-7.4.1:=
SLOT=0
SRC_URI=https://hackage.haskell.org/package/fquery-0.2.3/fquery-0.2.3.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=02fe674ab8a387072147e64f5ca1561c
+_md5_=e0629fdc36fc818aa5191e45de023043
diff --git a/metadata/md5-cache/app-portage/gemato-14.5 b/metadata/md5-cache/app-portage/gemato-14.5
new file mode 100644
index 000000000000..aad7b5d88a2b
--- /dev/null
+++ b/metadata/md5-cache/app-portage/gemato-14.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( gpg? ( >=app-crypt/gnupg-2.2.20-r1 ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Stand-alone Manifest generation & verification tool
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/gemato
+IUSE=+gpg tools test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=gpg? ( >=app-crypt/gnupg-2.2.20-r1 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/g/gemato/gemato-14.5.tar.gz
+_eclasses_=distutils-r1 eb92d1a6d9057e2422cc9610f79f919c multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=a83a1cae6554de8ae51ab73e081d8773
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.5.0 b/metadata/md5-cache/app-portage/gentoolkit-0.5.0
index c7b9ffeb4527..76f740daf7eb 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.5.0
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.5.0
@@ -5,7 +5,7 @@ DESCRIPTION=Collection of administration scripts for Gentoo
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.5.0.tar.gz
_eclasses_=distutils-r1 eb92d1a6d9057e2422cc9610f79f919c multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=4fd24c778b0f961d44f5b8dfa9be27ee
+_md5_=44376828ad4a7b56b2e020383c851fac
diff --git a/metadata/md5-cache/app-portage/hackport-0.6.3 b/metadata/md5-cache/app-portage/hackport-0.6.3
index b32724ef3a78..3af384cc836f 100644
--- a/metadata/md5-cache/app-portage/hackport-0.6.3
+++ b/metadata/md5-cache/app-portage/hackport-0.6.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=app-portage/repoman dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= dev-haskell/text:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit )
DESCRIPTION=Hackage and Portage integration tool
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/hackport
+HOMEPAGE=https://hackage.haskell.org/package/hackport
IUSE=test
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://hackage.haskell.org/package/hackport-0.6.3/hackport-0.6.3.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=573bab6ecf929a74caa7ccc8d329ff01
+_md5_=50e363dfb733b31d9b5d262a9e5c0e21
diff --git a/metadata/md5-cache/app-portage/hackport-0.6.6 b/metadata/md5-cache/app-portage/hackport-0.6.6
index ea0c00822304..13f0b0de69c9 100644
--- a/metadata/md5-cache/app-portage/hackport-0.6.6
+++ b/metadata/md5-cache/app-portage/hackport-0.6.6
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=app-portage/repoman >=dev-haskell/async-2.0:= >=dev-haskell/base16-bytestring-0.1.1:= >=dev-haskell/base64-bytestring-1.0:= >=dev-haskell/cryptohash-sha256-0.11:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= >=dev-haskell/hashable-1.0:= >=dev-haskell/http-4000.1.5:= >=dev-haskell/lukko-0.1:= >=dev-haskell/mtl-2.1:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= >=dev-haskell/old-locale-1.0:= >=dev-haskell/parsec-3.1.13:= >=dev-haskell/random-1.0:= dev-haskell/split:= >=dev-haskell/stm-2.0:= >=dev-haskell/tar-0.5:= >=dev-haskell/text-1.2.3.0:= >=dev-haskell/xml-1.3.7:= >=dev-haskell/zlib-0.5.3:= >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/doctest-0.8 >=dev-haskell/hspec-2.0 >=dev-haskell/quickcheck-2.0 )
DESCRIPTION=Hackage and Portage integration tool
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/hackport
+HOMEPAGE=https://hackage.haskell.org/package/hackport
IUSE=test
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://hackage.haskell.org/package/hackport-0.6.6/hackport-0.6.6.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=80449fcb84d445ea5a4926413dcbee04
+_md5_=5687c286fbd8c2669a632933b8cdbfb0
diff --git a/metadata/md5-cache/app-portage/repoman-3.0.0 b/metadata/md5-cache/app-portage/repoman-3.0.1
similarity index 95%
rename from metadata/md5-cache/app-portage/repoman-3.0.0
rename to metadata/md5-cache/app-portage/repoman-3.0.1
index 381e32ea6951..708f50f35332 100644
--- a/metadata/md5-cache/app-portage/repoman-3.0.0
+++ b/metadata/md5-cache/app-portage/repoman-3.0.1
@@ -1,15 +1,15 @@
BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-apps/portage-3.0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-3.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEPEND=>=sys-apps/portage-3.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-3.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-3.0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-3.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=>=sys-apps/portage-3.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-3.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
SLOT=0
-SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-3.0.0.tar.bz2
+SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-3.0.1.tar.bz2
_eclasses_=distutils-r1 eb92d1a6d9057e2422cc9610f79f919c multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=3d7a774df458fcf9d85d28335e8394ce
+_md5_=8598abcbe0ec841b05b82725b64a73a9
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 3245a1010d03..03fca46b3b0b 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/autojump-22.2.4-r4 b/metadata/md5-cache/app-shells/autojump-22.2.4-r4
deleted file mode 100644
index 94b00f62c65a..000000000000
--- a/metadata/md5-cache/app-shells/autojump-22.2.4-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=test? ( dev-python/flake8 dev-python/tox )
-DESCRIPTION=change directory command that learns
-EAPI=5
-HOMEPAGE=https://github.com/joelthelion/autojump
-IUSE=ipython test python_targets_python3_6
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=ipython? ( python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=ipython? ( || ( python_targets_python3_6 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/joelthelion/autojump/archive/release-v22.2.4.tar.gz -> autojump-22.2.4.tar.gz
-_eclasses_=bash-completion-r1 e5f9c3faab3ab3d1e7e007daa8c736ef desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
-_md5_=02e58fe96bd4cf8ead4f5226d6226476
diff --git a/metadata/md5-cache/app-shells/autojump-22.5.1 b/metadata/md5-cache/app-shells/autojump-22.5.1
deleted file mode 100644
index 1b5593130198..000000000000
--- a/metadata/md5-cache/app-shells/autojump-22.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=change directory command that learns
-EAPI=6
-HOMEPAGE=https://github.com/wting/autojump
-IUSE=ipython test python_targets_python3_6
-KEYWORDS=~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=ipython? ( python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=ipython? ( || ( python_targets_python3_6 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/wting/autojump/archive/release-v22.5.1.tar.gz -> autojump-22.5.1.tar.gz
-_eclasses_=bash-completion-r1 e5f9c3faab3ab3d1e7e007daa8c736ef multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
-_md5_=c5a42491a049f32aba1b510f67bc24fe
diff --git a/metadata/md5-cache/app-shells/autojump-22.5.3 b/metadata/md5-cache/app-shells/autojump-22.5.3
index 9173852a54cd..845f6a6b4e67 100644
--- a/metadata/md5-cache/app-shells/autojump-22.5.3
+++ b/metadata/md5-cache/app-shells/autojump-22.5.3
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
DESCRIPTION=change directory command that learns
EAPI=6
HOMEPAGE=https://github.com/wting/autojump
-IUSE=ipython test python_targets_python3_6 python_targets_python3_7
+IUSE=ipython test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
KEYWORDS=amd64 ~hppa ~mips ~ppc ~ppc64 x86 ~x64-macos
LICENSE=GPL-3
-RDEPEND=ipython? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-REQUIRED_USE=ipython? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
+RDEPEND=ipython? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+REQUIRED_USE=ipython? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/wting/autojump/archive/release-v22.5.3.tar.gz -> autojump-22.5.3.tar.gz
_eclasses_=bash-completion-r1 e5f9c3faab3ab3d1e7e007daa8c736ef multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 prefix c2993e4c430c1ee24f278983d6189501 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
-_md5_=8f2d0466c382aaaa8807d0131648a2be
+_md5_=3374e6a1298028cf84e1f60b4c65cacd
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index bf4f193bd061..0b5a0bfaa064 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/asciidoc-9.0.0_rc2 b/metadata/md5-cache/app-text/asciidoc-9.0.2
similarity index 67%
rename from metadata/md5-cache/app-text/asciidoc-9.0.0_rc2
rename to metadata/md5-cache/app-text/asciidoc-9.0.2
index 81e35fa71e55..3b7ded031449 100644
--- a/metadata/md5-cache/app-text/asciidoc-9.0.0_rc2
+++ b/metadata/md5-cache/app-text/asciidoc-9.0.2
@@ -1,16 +1,16 @@
BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=test? ( python_single_target_pypy3? ( >=dev-python/pypy3-7.3.0:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-text/dvipng app-text/dvisvgm dev-texlive/texlive-latex dev-util/source-highlight media-gfx/graphviz media-gfx/imagemagick media-sound/lilypond )
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=test? ( python_single_target_pypy3? ( >=dev-python/pypy3-7.3.0:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/dvipng app-text/dvisvgm dev-texlive/texlive-latex dev-util/source-highlight media-gfx/graphviz media-gfx/imagemagick media-sound/lilypond )
DESCRIPTION=A plain text human readable/writable document format
EAPI=7
HOMEPAGE=https://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/
-IUSE=examples test python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=doc test python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
-RDEPEND=python_single_target_pypy3? ( >=dev-python/pypy3-7.3.0:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt dev-libs/libxml2:2
-REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RDEPEND=python_single_target_pypy3? ( >=dev-python/pypy3-7.3.0:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt dev-libs/libxml2:2
+REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
RESTRICT=!test? ( test )
SLOT=0
-SRC_URI=https://github.com/asciidoc/asciidoc-py3/archive/9.0.0rc2.tar.gz -> asciidoc-9.0.0_rc2.tar.gz
+SRC_URI=https://github.com/asciidoc/asciidoc-py3/archive/9.0.2.tar.gz -> asciidoc-9.0.2.tar.gz
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=30e6d097e47af41b0fa93778e01769fb
+_md5_=297945b93f3fb8184da10e56566af85f
diff --git a/metadata/md5-cache/app-text/atril-1.22.3 b/metadata/md5-cache/app-text/atril-1.22.3
index b5125d78334c..bb771920c2d0 100644
--- a/metadata/md5-cache/app-text/atril-1.22.3
+++ b/metadata/md5-cache/app-text/atril-1.22.3
@@ -11,5 +11,5 @@ REQUIRED_USE=t1lib? ( dvi )
RESTRICT=test
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/atril-1.22.3.tar.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate d3e8bf8e7ba75eb2a344574e81344eca mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=d71489b4daa548b0525d8eb3dec93139
diff --git a/metadata/md5-cache/app-text/atril-1.24.0-r1 b/metadata/md5-cache/app-text/atril-1.24.0-r1
index b979a92e2d4a..4f7a2380944b 100644
--- a/metadata/md5-cache/app-text/atril-1.24.0-r1
+++ b/metadata/md5-cache/app-text/atril-1.24.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=t1lib? ( dvi )
RESTRICT=test
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.24/atril-1.24.0.tar.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate d3e8bf8e7ba75eb2a344574e81344eca mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=d0ab4789bbf44a4ed03ded304ed226b3
diff --git a/metadata/md5-cache/app-text/fb2edit-0.1.0 b/metadata/md5-cache/app-text/fb2edit-0.1.0
index 2c9764ddb0c7..c316a1506ae2 100644
--- a/metadata/md5-cache/app-text/fb2edit-0.1.0
+++ b/metadata/md5-cache/app-text/fb2edit-0.1.0
@@ -1,12 +1,13 @@
-BDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-qt/linguist-tools:5 dev-libs/libxml2:2 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
+BDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-libs/libxml2:2 dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Create and edit fb2 books
EAPI=7
HOMEPAGE=https://github.com/vitlav/fb2edit
KEYWORDS=~amd64
LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-qt/linguist-tools:5 dev-libs/libxml2:2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-libs/libxml2:2
SLOT=0
SRC_URI=https://github.com/vitlav/fb2edit/archive/0.1.0.tar.gz -> fb2edit-0.1.0.tar.gz
-_eclasses_=cmake f274d2f953f93e2d88cd3e0b2ce376a9 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=19ba47ad7c3a565926ccc13ef9024255
+_eclasses_=cmake f274d2f953f93e2d88cd3e0b2ce376a9 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=43f3f9a68b9bbd638050e2efdba00e61
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.52-r1 b/metadata/md5-cache/app-text/ghostscript-gpl-9.52-r1
index 313a006bc18d..165967e38477 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.52-r1
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.52-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Interpreter for the PostScript language and PDF
EAPI=7
HOMEPAGE=https://ghostscript.com/
IUSE=cups dbus gtk l10n_de static-libs tiff unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 s390 sparc x86
LICENSE=AGPL-3 CPL-1.0
RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.16:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/openjpeg-2.1.0:2= >=sys-libs/zlib-1.2.7 virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) unicode? ( net-dns/libidn:0= ) tiff? ( >=media-libs/tiff-4.0.1:0= ) X? ( x11-libs/libXt x11-libs/libXext ) app-text/poppler-data >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts )
SLOT=0
SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/ghostscript-9.52.tar.xz https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/ghostscript-gpl-9.52-patchset-01.tar.xz
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=7926e01e84aba06013a028d2c5e88df9
+_md5_=98688e8293f6de20639b708fdf570904
diff --git a/metadata/md5-cache/app-text/pinfo-0.6.13 b/metadata/md5-cache/app-text/pinfo-0.6.13
index e74b3ef4a521..9dfa361f0e85 100644
--- a/metadata/md5-cache/app-text/pinfo-0.6.13
+++ b/metadata/md5-cache/app-text/pinfo-0.6.13
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= nls? ( virtual/libintl )
SLOT=0
SRC_URI=https://github.com/baszoetekouw/pinfo/archive/v0.6.13.tar.gz -> pinfo-0.6.13.tar.gz
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=a02324106cf74bce4e27d941de055618
+_md5_=4e56e747717ab59bc4e4eb3edcfdc588
diff --git a/metadata/md5-cache/app-text/pinfo-99999 b/metadata/md5-cache/app-text/pinfo-99999
index 9a02523e8f42..9e5b793899d9 100644
--- a/metadata/md5-cache/app-text/pinfo-99999
+++ b/metadata/md5-cache/app-text/pinfo-99999
@@ -10,4 +10,4 @@ PROPERTIES=live
RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= nls? ( virtual/libintl )
SLOT=0
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 git-r3 8ec5b53812bce105ae7943930e4660f8 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=91df80f8bf946085b4eb81b9611bedf6
+_md5_=41b240e39456e14a3a3b815adbd8f738
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index ad9e87c8a924..859f18e7b0f3 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.24 b/metadata/md5-cache/dev-db/etcd-3.3.24
new file mode 100644
index 000000000000..73fe7a3fe95c
--- /dev/null
+++ b/metadata/md5-cache/dev-db/etcd-3.3.24
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare test unpack
+DEPEND=server? ( acct-group/etcd acct-user/etcd )
+DESCRIPTION=Highly-available key value store for shared configuration and service discovery
+EAPI=7
+HOMEPAGE=https://github.com/etcd-io/etcd
+IUSE=doc +server
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 MIT
+RDEPEND=server? ( acct-group/etcd acct-user/etcd ) !dev-db/etcdctl
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/etcd-io/etcd/archive/v3.3.24.tar.gz -> etcd-3.3.24.tar.gz
+_eclasses_=go-module 45394825d9260b479aa1cf252ea58e01 multilib 2477ebe553d3e4d2c606191fe6c33602 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=2d909614712bc0edb80af62bc2675df4
diff --git a/metadata/md5-cache/dev-db/etcd-3.4.11 b/metadata/md5-cache/dev-db/etcd-3.4.11
new file mode 100644
index 000000000000..7d15f8799999
--- /dev/null
+++ b/metadata/md5-cache/dev-db/etcd-3.4.11
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare test unpack
+DEPEND=server? ( acct-group/etcd acct-user/etcd )
+DESCRIPTION=Highly-available key value store for shared configuration and service discovery
+EAPI=7
+HOMEPAGE=https://github.com/etcd-io/etcd
+IUSE=doc +server
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 MIT
+RDEPEND=server? ( acct-group/etcd acct-user/etcd ) !dev-db/etcdctl
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/etcd-io/etcd/archive/v3.4.11.tar.gz -> etcd-3.4.11.tar.gz
+_eclasses_=go-module 45394825d9260b479aa1cf252ea58e01 multilib 2477ebe553d3e4d2c606191fe6c33602 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=2f194aca0ad667bfc4656adb6cb250de
diff --git a/metadata/md5-cache/dev-db/mariadb-10.5.5 b/metadata/md5-cache/dev-db/mariadb-10.5.5
index bec01bbd25cb..0251bcf359d1 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.5.5
+++ b/metadata/md5-cache/dev-db/mariadb-10.5.5
@@ -14,4 +14,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
SLOT=10.5/18
SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.5.5/source/mariadb-10.5.5.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.5.5-patches-02.tar.xz
_eclasses_=cmake f274d2f953f93e2d88cd3e0b2ce376a9 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 16d46032afaca1d6d0621f82084880cb multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=0361144e5ceadf1e8b0f56e71dc9d437
+_md5_=6a09dc99597f298d15b681b1d0613196
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.21 b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.21-r1
similarity index 98%
rename from metadata/md5-cache/dev-db/mysql-connector-c-8.0.21
rename to metadata/md5-cache/dev-db/mysql-connector-c-8.0.21-r1
index 5964a45fa0c6..7aac7989bc0c 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.21
+++ b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.21-r1
@@ -11,4 +11,4 @@ RDEPEND=>=app-arch/lz4-0_p131:= sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,ab
SLOT=0/21
SRC_URI=https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-8.0.21.tar.gz
_eclasses_=cmake-multilib b396704c8c04bb210b7b45dff5c67fea cmake-utils 77cd39e6009811bf97a59d91ffd5b54f eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build 8ad5b5535b73a8971881f09277b939f4 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=67f45829724d672df74a5a29998a85c0
+_md5_=c565727e9d2d5e907974a1a465608b79
diff --git a/metadata/md5-cache/dev-db/postgis-2.5.5 b/metadata/md5-cache/dev-db/postgis-2.5.5
new file mode 100644
index 000000000000..f4626adb4bb0
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgis-2.5.5
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0:= >=sci-libs/gdal-1.10.0 address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 ) mapbox? ( dev-libs/protobuf-c:= ) virtual/pkgconfig doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt virtual/imagemagick-tools[png] ) test? ( dev-util/cunit )
+DESCRIPTION=Geographic Objects for PostgreSQL
+EAPI=7
+HOMEPAGE=https://postgis.net
+IUSE=address-standardizer doc gtk mapbox static-libs test topology postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0:= >=sci-libs/gdal-1.10.0 address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 ) mapbox? ( dev-libs/protobuf-c:= )
+REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.osgeo.org/postgis/source/postgis-2.5.5.tar.gz
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 postgres 9613fb90112e2a521b6a8315187c2966 postgres-multi b784ac6c30437f2ded3f16482b56374c toolchain-funcs 605c126bed8d87e4378d5ff1645330cb user 7b7fc6ec5eb1c1eee55b0609f01e7362 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=f2dcd553fa9a5989bf6d6a533491e1c1
diff --git a/metadata/md5-cache/dev-db/postgis-3.0.2 b/metadata/md5-cache/dev-db/postgis-3.0.2
new file mode 100644
index 000000000000..53b78f30b615
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgis-3.0.2
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c:= >=sci-libs/geos-3.6.0 >=sci-libs/proj-4.9.0:= >=sci-libs/gdal-1.10.0:= address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt virtual/imagemagick-tools[png] ) test? ( dev-util/cunit )
+DESCRIPTION=Geographic Objects for PostgreSQL
+EAPI=7
+HOMEPAGE=https://postgis.net
+IUSE=address-standardizer doc gtk static-libs test topology postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c:= >=sci-libs/geos-3.6.0 >=sci-libs/proj-4.9.0:= >=sci-libs/gdal-1.10.0:= address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 )
+REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.osgeo.org/postgis/source/postgis-3.0.2.tar.gz
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 postgres 9613fb90112e2a521b6a8315187c2966 postgres-multi b784ac6c30437f2ded3f16482b56374c toolchain-funcs 605c126bed8d87e4378d5ff1645330cb user 7b7fc6ec5eb1c1eee55b0609f01e7362 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=848ab87ed98c847c82c0859715e6d8fc
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 2ae844a58e78..a6f2f86176ec 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/freecell-solver-6.0.1 b/metadata/md5-cache/dev-games/freecell-solver-6.0.1
new file mode 100644
index 000000000000..45c2fdb53310
--- /dev/null
+++ b/metadata/md5-cache/dev-games/freecell-solver-6.0.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pysol_cards[python_targets_python3_6(-)] dev-python/random2[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pysol_cards[python_targets_python3_7(-)] dev-python/random2[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pysol_cards[python_targets_python3_8(-)] dev-python/random2[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] ) tcmalloc? ( dev-util/google-perftools ) dev-perl/Moo dev-perl/Path-Tiny dev-perl/Template-Toolkit
+DESCRIPTION=C library for automatically solving Freecell and some other solitaire variants
+EAPI=7
+HOMEPAGE=https://fc-solve.shlomifish.org/
+IUSE=tcmalloc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pysol_cards[python_targets_python3_6(-)] dev-python/random2[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pysol_cards[python_targets_python3_7(-)] dev-python/random2[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pysol_cards[python_targets_python3_8(-)] dev-python/random2[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] ) tcmalloc? ( dev-util/google-perftools )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-6.0.1.tar.xz
+_eclasses_=cmake f274d2f953f93e2d88cd3e0b2ce376a9 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=3e29340b0979e75821de57bba90d445c
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index e88246d473ce..856c9cd304b6 100644
Binary files a/metadata/md5-cache/dev-haskell/Manifest.gz and b/metadata/md5-cache/dev-haskell/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-haskell/alex-tools-0.4 b/metadata/md5-cache/dev-haskell/alex-tools-0.4
index d14ca939d48c..5e3b39aed9ce 100644
--- a/metadata/md5-cache/dev-haskell/alex-tools-0.4
+++ b/metadata/md5-cache/dev-haskell/alex-tools-0.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
DEPEND=>=dev-haskell/text-1.2:=[profile?] =dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=A set of functions for a common use case of Alex
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/alex-tools
+HOMEPAGE=https://hackage.haskell.org/package/alex-tools
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=ISC
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/text-1.2:=[profile?] =d
SLOT=0/0.4
SRC_URI=https://hackage.haskell.org/package/alex-tools-0.4/alex-tools-0.4.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=c587beb26f88c6d6c102200bb1e7dff9
+_md5_=5a7761ed4a1fd56021b8e0493fcecaff
diff --git a/metadata/md5-cache/dev-haskell/base-compat-0.11.1 b/metadata/md5-cache/dev-haskell/base-compat-0.11.1
index 53bf25b8029c..b582dfe2188c 100644
--- a/metadata/md5-cache/dev-haskell/base-compat-0.11.1
+++ b/metadata/md5-cache/dev-haskell/base-compat-0.11.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=A compatibility layer for base
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/base-compat
+HOMEPAGE=https://hackage.haskell.org/package/base-compat
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=MIT
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
SLOT=0/0.11.1
SRC_URI=https://hackage.haskell.org/package/base-compat-0.11.1/base-compat-0.11.1.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=4f083e672213baae1285a0c2d4b33b38
+_md5_=3c4e9cccf5b2a94228a85ea01b36f933
diff --git a/metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1 b/metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1
index 4171c913c947..5d79a6c18d2a 100644
--- a/metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1
+++ b/metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=~dev-haskell/base-compat-0.11.1:=[profile?] >=dev-haskell/bifunctors-5.5.2:=[profile?] =dev-haskell/contravariant-1.5:=[profile?] =dev-haskell/fail-4.9.0.0:=[profile?] =dev-haskell/nats-1.1.2:=[profile?] =dev-haskell/semigroups-0.18.4:=[profile?] =dev-haskell/transformers-compat-0.6:=[profile?] =dev-haskell/type-equality-1:=[profile?] =dev-haskell/void-0.7.2:=[profile?] =dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.8 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=base-compat with extra batteries
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/base-compat-batteries
+HOMEPAGE=https://hackage.haskell.org/package/base-compat-batteries
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=MIT
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.11.1
SRC_URI=https://hackage.haskell.org/package/base-compat-batteries-0.11.1/base-compat-batteries-0.11.1.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=51075954b80c3fbd68f3a5f97da3b9c4
+_md5_=ccf08d266b226a39f37bd2528cdc620c
diff --git a/metadata/md5-cache/dev-haskell/bencode-0.6.1.1 b/metadata/md5-cache/dev-haskell/bencode-0.6.1.1
index 2b6001335fce..d86930b6fc83 100644
--- a/metadata/md5-cache/dev-haskell/bencode-0.6.1.1
+++ b/metadata/md5-cache/dev-haskell/bencode-0.6.1.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/parsec:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Parser and printer for bencoded data
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/bencode
+HOMEPAGE=https://hackage.haskell.org/package/bencode
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.6.1.1
SRC_URI=https://hackage.haskell.org/package/bencode-0.6.1.1/bencode-0.6.1.1.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=0b07048f6b5f58a2296c1aafd54b873d
+_md5_=82186cf79d64aeb3c3e1a402c52391fb
diff --git a/metadata/md5-cache/dev-haskell/binary-orphans-1.0.1 b/metadata/md5-cache/dev-haskell/binary-orphans-1.0.1
index 07440e381c9d..0d617568e635 100644
--- a/metadata/md5-cache/dev-haskell/binary-orphans-1.0.1
+++ b/metadata/md5-cache/dev-haskell/binary-orphans-1.0.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
DEPEND=>=dev-haskell/fail-4.9:=[profile?] =dev-haskell/nats-1.1.2:=[profile?] =dev-haskell/semigroups-0.18.5:=[profile?] >=dev-haskell/void-0.7.3:=[profile?] =dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-2.13.1 =dev-haskell/quickcheck-instances-0.3.21 =dev-haskell/tagged-0.8.6 =dev-haskell/tasty-0.10.1.2 =dev-haskell/tasty-quickcheck-0.8.3.2 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Orphan instances for binary
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/binary-orphans
+HOMEPAGE=https://hackage.haskell.org/package/binary-orphans
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/1.0.1
SRC_URI=https://hackage.haskell.org/package/binary-orphans-1.0.1/binary-orphans-1.0.1.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=403a02601700e5988f33d2eb50a7ba1a
+_md5_=7e4c26653aad86d38f35ec165b7b37f8
diff --git a/metadata/md5-cache/dev-haskell/biocore-0.3.1 b/metadata/md5-cache/dev-haskell/biocore-0.3.1
index 8e6957a30aa9..82a75650d224 100644
--- a/metadata/md5-cache/dev-haskell/biocore-0.3.1
+++ b/metadata/md5-cache/dev-haskell/biocore-0.3.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/stringable:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=A bioinformatics library
EAPI=6
-HOMEPAGE=http://hackage.haskell.org/package/biocore
+HOMEPAGE=https://hackage.haskell.org/package/biocore
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1
@@ -10,4 +10,4 @@ RDEPEND=dev-haskell/stringable:=[profile?] >=dev-lang/ghc-6.10.4:=
SLOT=0/0.3.1
SRC_URI=https://hackage.haskell.org/package/biocore-0.3.1/biocore-0.3.1.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e3f8f95a608fb7128f1ad41be3635066
+_md5_=63b817f99576d441cf4df298025a466c
diff --git a/metadata/md5-cache/dev-haskell/boundedchan-1.0.3.0 b/metadata/md5-cache/dev-haskell/boundedchan-1.0.3.0
index ff02e3be3a9b..4ad5be370dbd 100644
--- a/metadata/md5-cache/dev-haskell/boundedchan-1.0.3.0
+++ b/metadata/md5-cache/dev-haskell/boundedchan-1.0.3.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Implementation of bounded channels
EAPI=5
-HOMEPAGE=http://hackage.haskell.org/package/BoundedChan
+HOMEPAGE=https://hackage.haskell.org/package/BoundedChan
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
SLOT=0/1.0.3.0
SRC_URI=https://hackage.haskell.org/package/BoundedChan-1.0.3.0/BoundedChan-1.0.3.0.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aa9e2db5b5bbda794ac0e4deacf358fe
+_md5_=d0e248fbdbf49676bab45173eadbb5c6
diff --git a/metadata/md5-cache/dev-haskell/bzlib-0.5.1.0 b/metadata/md5-cache/dev-haskell/bzlib-0.5.1.0
index 5af26edbdc2c..215ef1c6315f 100644
--- a/metadata/md5-cache/dev-haskell/bzlib-0.5.1.0
+++ b/metadata/md5-cache/dev-haskell/bzlib-0.5.1.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=app-arch/bzip2 >=dev-haskell/fail-4.9:=[profile?] =dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Compression and decompression in the bzip2 format
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/bzlib
+HOMEPAGE=https://hackage.haskell.org/package/bzlib
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=app-arch/bzip2 >=dev-haskell/fail-4.9:=[profile?] =dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Client for Casa
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/casa-client
+HOMEPAGE=https://hackage.haskell.org/package/casa-client
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-has
SLOT=0/0.0.1
SRC_URI=https://hackage.haskell.org/package/casa-client-0.0.1/casa-client-0.0.1.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=2a0416ebdf5da759a7562628ca7bab63
+_md5_=fc75c0ebacb6b07da6b500cf870b4776
diff --git a/metadata/md5-cache/dev-haskell/casa-types-0.0.1 b/metadata/md5-cache/dev-haskell/casa-types-0.0.1
index 8b0c2a66e7f1..fda91ed7cb33 100644
--- a/metadata/md5-cache/dev-haskell/casa-types-0.0.1
+++ b/metadata/md5-cache/dev-haskell/casa-types-0.0.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/path-pieces:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Types for Casa
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/casa-types
+HOMEPAGE=https://hackage.haskell.org/package/casa-types
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-has
SLOT=0/0.0.1
SRC_URI=https://hackage.haskell.org/package/casa-types-0.0.1/casa-types-0.0.1.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=c0f84f29046445e5860adfc17b9496a2
+_md5_=ac0d7469aeb3f502bb1441882f67bbb0
diff --git a/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.1.9 b/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.1.9
index 0b0513d09817..002083aefa48 100644
--- a/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.1.9
+++ b/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.1.9
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/mtl-2:=[profile?] =dev-haskell/quickcheck-2.10:2=[profile?] =dev-haskell/random-1.0:=[profile?] =dev-haskell/syb-0.1.0.2:=[profile?] =dev-lang/ghc-7.6.2:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=For testing partial and infinite values
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/ChasingBottoms
+HOMEPAGE=https://hackage.haskell.org/package/ChasingBottoms
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=MIT
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/1.3.1.9
SRC_URI=https://hackage.haskell.org/package/ChasingBottoms-1.3.1.9/ChasingBottoms-1.3.1.9.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=89a5f4ad48ceaaa417a176a5ee3185e8
+_md5_=3118f6e3fdf9a7b8a0efd446f39b6b9e
diff --git a/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11 b/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11
index 329e2ec5639a..2cdbfe738566 100644
--- a/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11
+++ b/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/ansi-terminal-0.9.1:=[profile?] =dev-haskell/async-2.0:=[profile?] =dev-haskell/exceptions-0.6.0:=[profile?] =dev-haskell/stm-2.0:=[profile?] =dev-haskell/terminal-size-0.3.0:=[profile?] =dev-haskell/text-0.11.0:=[profile?] =dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Ungarble output from several threads or commands
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/concurrent-output
+HOMEPAGE=https://hackage.haskell.org/package/concurrent-output
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD-2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/ansi-terminal-0.9.1:=[profile?] =dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=O(ND) diff algorithm in haskell
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/Diff
+HOMEPAGE=https://hackage.haskell.org/package/Diff
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.4.0
SRC_URI=https://hackage.haskell.org/package/Diff-0.4.0/Diff-0.4.0.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=32247afcd35db708761faab20cd0c3de
+_md5_=2a56b1c1176383ee5a1ef2ffcc7fe803
diff --git a/metadata/md5-cache/dev-haskell/dns-4.0.1 b/metadata/md5-cache/dev-haskell/dns-4.0.1
index 0dfa853a81b2..90e27bac39ce 100644
--- a/metadata/md5-cache/dev-haskell/dns-4.0.1
+++ b/metadata/md5-cache/dev-haskell/dns-4.0.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/async:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/auto-update:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/hourglass:=[profile?] >=dev-haskell/iproute-1.3.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/psqueues:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-2.0 test? ( dev-haskell/doctest dev-haskell/hspec >=dev-haskell/quickcheck-2.9 dev-haskell/word8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=DNS library in Haskell
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/dns
+HOMEPAGE=https://hackage.haskell.org/package/dns
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0/4.0.1
SRC_URI=https://hackage.haskell.org/package/dns-4.0.1/dns-4.0.1.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=b53849786ec9fc0f896b65c7be1a9641
+_md5_=79c3b1343a56de748500c7dd32c524a6
diff --git a/metadata/md5-cache/dev-haskell/drbg-0.5.5 b/metadata/md5-cache/dev-haskell/drbg-0.5.5
index 887770ccb7f4..92c7051606f7 100644
--- a/metadata/md5-cache/dev-haskell/drbg-0.5.5
+++ b/metadata/md5-cache/dev-haskell/drbg-0.5.5
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/cereal-0.5:=[profile?] =dev-haskell/cipher-aes128-0.6:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] >=dev-haskell/cryptohash-cryptoapi-0.1:=[profile?] dev-haskell/entropy:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] =dev-haskell/tagged-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/binary dev-haskell/crypto-api-tests dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Deterministic random bit generator (aka PRNG) based HMACs, Hashes, and Ciphers
EAPI=5
-HOMEPAGE=http://hackage.haskell.org/package/DRBG
+HOMEPAGE=https://hackage.haskell.org/package/DRBG
IUSE=test doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0/0.5.5
SRC_URI=https://hackage.haskell.org/package/DRBG-0.5.5/DRBG-0.5.5.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cfc4128894af651bcfc50c618517f126
+_md5_=7aa58dbe906e85083c0a8728704a1b2a
diff --git a/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0 b/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
index e122a34c162e..b55e6e186c66 100644
--- a/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
+++ b/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/base-orphans:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.5 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=An orphan Eq instance for ErrorCall
EAPI=5
-HOMEPAGE=http://hackage.haskell.org/package/errorcall-eq-instance
+HOMEPAGE=https://hackage.haskell.org/package/errorcall-eq-instance
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=MIT
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.3.0
SRC_URI=https://hackage.haskell.org/package/errorcall-eq-instance-0.3.0/errorcall-eq-instance-0.3.0.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=46e0423a1006cec432673d256be97740
+_md5_=3d5062c0429d31697e24f166500ead03
diff --git a/metadata/md5-cache/dev-haskell/errors-2.3.0 b/metadata/md5-cache/dev-haskell/errors-2.3.0
index c6deb3ea938d..8225dd89fb41 100644
--- a/metadata/md5-cache/dev-haskell/errors-2.3.0
+++ b/metadata/md5-cache/dev-haskell/errors-2.3.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/exceptions-0.6:=[profile?] =dev-haskell/safe-0.3.3:=[profile?] =dev-haskell/transformers-compat-0.4:=[profile?] =dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Simplified error-handling
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/errors
+HOMEPAGE=https://hackage.haskell.org/package/errors
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] =dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Martin Erwig's Functional Graph Library
EAPI=5
-HOMEPAGE=http://web.engr.oregonstate.edu/~erwig/fgl/haskell
+HOMEPAGE=https://hackage.haskell.org/package/fgl
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:=
SLOT=0/5.4.2.4
SRC_URI=https://hackage.haskell.org/package/fgl-5.4.2.4/fgl-5.4.2.4.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cb8f2ba88f544cbdaffdea7711bfb3bd
+_md5_=4bc224d580a5888bdc241361967f575d
diff --git a/metadata/md5-cache/dev-haskell/fgl-5.5.0.1 b/metadata/md5-cache/dev-haskell/fgl-5.5.0.1
index 9ed4b888a2f8..8202af810b1c 100644
--- a/metadata/md5-cache/dev-haskell/fgl-5.5.0.1
+++ b/metadata/md5-cache/dev-haskell/fgl-5.5.0.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Martin Erwig's Functional Graph Library
EAPI=5
-HOMEPAGE=http://web.engr.oregonstate.edu/~erwig/fgl/haskell
+HOMEPAGE=https://hackage.haskell.org/package/fgl
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
SLOT=0/5.5.0.1
SRC_URI=https://hackage.haskell.org/package/fgl-5.5.0.1/fgl-5.5.0.1.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f7cef5e6920bf4bd5e96bb38d5a0b23e
+_md5_=c0bd39a5d0f57c10c4a6710957b793e8
diff --git a/metadata/md5-cache/dev-haskell/fgl-5.7.0.2 b/metadata/md5-cache/dev-haskell/fgl-5.7.0.2
index 1fe4b8490227..6a38e9c0f75b 100644
--- a/metadata/md5-cache/dev-haskell/fgl-5.7.0.2
+++ b/metadata/md5-cache/dev-haskell/fgl-5.7.0.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.1 =dev-haskell/quickcheck-2.8 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Martin Erwig's Functional Graph Library
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/fgl
+HOMEPAGE=https://hackage.haskell.org/package/fgl
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/5.7.0.2
SRC_URI=https://hackage.haskell.org/package/fgl-5.7.0.2/fgl-5.7.0.2.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=10f599d30dfe74a4484207f383dbace4
+_md5_=5b47a57593ac412e5e07f1fbd4b74c47
diff --git a/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.6 b/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.6
index 27c8c99a9b5c..703fa96fe5a1 100644
--- a/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.6
+++ b/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.6
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 test? ( >=dev-haskell/quickcheck-2.7 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Library for manipulating RawFilePaths in a cross platform way
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/filepath-bytestring
+HOMEPAGE=https://hackage.haskell.org/package/filepath-bytestring
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/1.4.2.1.6
SRC_URI=https://hackage.haskell.org/package/filepath-bytestring-1.4.2.1.6/filepath-bytestring-1.4.2.1.6.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=f36ed1cd0f35c41636d313273511a529
+_md5_=9709e4cbb08f917bc7fbc6da00d9c180
diff --git a/metadata/md5-cache/dev-haskell/filestore-0.6.4 b/metadata/md5-cache/dev-haskell/filestore-0.6.4
index 080c8bde4075..90ff69b9d023 100644
--- a/metadata/md5-cache/dev-haskell/filestore-0.6.4
+++ b/metadata/md5-cache/dev-haskell/filestore-0.6.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/diff-0.4:=[profile?] =dev-haskell/old-locale-1.0:=[profile?] =dev-haskell/parsec-2:=[profile?] =dev-haskell/split-0.1:=[profile?] =dev-haskell/utf8-string-0.3:=[profile?] =dev-haskell/xml-1.3:=[profile?] =dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/hunit-1.2 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Interface for versioning file stores
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/filestore
+HOMEPAGE=https://hackage.haskell.org/package/filestore
IUSE=+maxcount doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0/0.6.4
SRC_URI=https://hackage.haskell.org/package/filestore-0.6.4/filestore-0.6.4.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=24b8ad804e3cc2d7e0f6294d72033678
+_md5_=9191c2047268b86b62e496467805660d
diff --git a/metadata/md5-cache/dev-haskell/foldl-1.4.7 b/metadata/md5-cache/dev-haskell/foldl-1.4.7
index 4333f902c078..65cc8db34fc5 100644
--- a/metadata/md5-cache/dev-haskell/foldl-1.4.7
+++ b/metadata/md5-cache/dev-haskell/foldl-1.4.7
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/comonad-4.0:=[profile?] =dev-haskell/mwc-random-0.13.1.0:=[profile?] =dev-haskell/semigroupoids-1.0:=[profile?] =dev-haskell/semigroups-0.17:=[profile?] =dev-haskell/text-0.11.2.0:=[profile?] =dev-haskell/vector-0.7:=[profile?] =dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/doctest-0.16 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Composable, streaming, and efficient left folds
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/foldl
+HOMEPAGE=https://hackage.haskell.org/package/foldl
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0/1.4.7
SRC_URI=https://hackage.haskell.org/package/foldl-1.4.7/foldl-1.4.7.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=1f48ac6021c5835185e148322a2ece8d
+_md5_=970b3371361b142bde28f9be235af11b
diff --git a/metadata/md5-cache/dev-haskell/generics-sop-0.5.1.0 b/metadata/md5-cache/dev-haskell/generics-sop-0.5.1.0
index 99b1e5a1f7f0..a9bb900b4788 100644
--- a/metadata/md5-cache/dev-haskell/generics-sop-0.5.1.0
+++ b/metadata/md5-cache/dev-haskell/generics-sop-0.5.1.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/sop-core-0.5.0:=[profile?] =dev-haskell/th-abstraction-0.3:=[profile?] =dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Generic Programming using True Sums of Products
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/generics-sop
+HOMEPAGE=https://hackage.haskell.org/package/generics-sop
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.5.1.0
SRC_URI=https://hackage.haskell.org/package/generics-sop-0.5.1.0/generics-sop-0.5.1.0.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=4326571af02dd2b24a26ec5e24a6d477
+_md5_=e2d58767f0cd5ccf8fd2c654bcd753fe
diff --git a/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1 b/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1
index 36348ee9a3b6..b01a4934e879 100644
--- a/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1
+++ b/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 =dev-lang/ghc-7.4.1:=
SLOT=0/0.1.0.12
SRC_URI=https://hackage.haskell.org/package/ghc-paths-0.1.0.12/ghc-paths-0.1.0.12.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=dfd170f92f9869789a3d98b9c1a0b07f
+_md5_=c90ab037922e62e7f6558e98a46797fb
diff --git a/metadata/md5-cache/dev-haskell/git-lfs-1.1.0 b/metadata/md5-cache/dev-haskell/git-lfs-1.1.0
index 57799adc1f6d..1cbbaa06e396 100644
--- a/metadata/md5-cache/dev-haskell/git-lfs-1.1.0
+++ b/metadata/md5-cache/dev-haskell/git-lfs-1.1.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/aeson-1.3:=[profile?] <=dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/case-insensitive-1.2:=[profile?] <=dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/http-client-0.5:=[profile?] <=dev-haskell/http-client-0.7:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <=dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <=dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/text-1.2:=[profile?] <=dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.6.3:= >=dev-haskell/cabal-2.4.0.1 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=git-lfs protocol
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/git-lfs
+HOMEPAGE=https://hackage.haskell.org/package/git-lfs
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=AGPL-3
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/aeson-1.3:=[profile?] <=dev-haskell/aeson-1.5:=[profile?]
SLOT=0/1.1.0
SRC_URI=https://hackage.haskell.org/package/git-lfs-1.1.0/git-lfs-1.1.0.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=8554527bfe34d326fd5dd006ae66e8cd
+_md5_=7420ec3a16b69f1e6e9618a9152f812b
diff --git a/metadata/md5-cache/dev-haskell/githash-0.1.3.3 b/metadata/md5-cache/dev-haskell/githash-0.1.3.3
index 25037ee3cffd..c0f97f5048f0 100644
--- a/metadata/md5-cache/dev-haskell/githash-0.1.3.3
+++ b/metadata/md5-cache/dev-haskell/githash-0.1.3.3
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-8.0.2:= >=dev-haskell/cabal-1.24.2.0 test? ( dev-haskell/hspec dev-haskell/temporary dev-haskell/unliftio ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-8.0.2:= dev-vcs/git >=dev-haskell/cabal-1.24.2.0 test? ( dev-haskell/hspec dev-haskell/temporary dev-haskell/unliftio ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Compile git revision info into Haskell projects
EAPI=7
HOMEPAGE=https://github.com/snoyberg/githash#readme
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-8.0.2:=
+RDEPEND=>=dev-lang/ghc-8.0.2:= dev-vcs/git
RESTRICT=!test? ( test )
SLOT=0/0.1.3.3
SRC_URI=https://hackage.haskell.org/package/githash-0.1.3.3/githash-0.1.3.3.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=5a61c7f6208ed5dd4359f3b862c74694
+_md5_=237ad6a6dc3c40f19ccc880839eee2a8
diff --git a/metadata/md5-cache/dev-haskell/hans-3.0.1 b/metadata/md5-cache/dev-haskell/hans-3.0.1
index 264acb3c690b..9b5af61b13dd 100644
--- a/metadata/md5-cache/dev-haskell/hans-3.0.1
+++ b/metadata/md5-cache/dev-haskell/hans-3.0.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/boundedchan:=[profile?] >=dev-haskell/cereal-0.5.0.0:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/heaps:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/monadlib:=[profile?] dev-haskell/psqueues:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 test? ( dev-haskell/quickcheck >=dev-haskell/tasty-0.11 dev-haskell/tasty-ant-xml dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Network Stack
EAPI=6
-HOMEPAGE=http://hackage.haskell.org/package/hans
+HOMEPAGE=https://hackage.haskell.org/package/hans
IUSE=examples doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0/3.0.1
SRC_URI=https://hackage.haskell.org/package/hans-3.0.1/hans-3.0.1.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=960d6087048b607cd78477e3d93ef170
+_md5_=cea083b8eee31f98d095e89d31ae9de1
diff --git a/metadata/md5-cache/dev-haskell/hashable-time-0.2.0.2-r1 b/metadata/md5-cache/dev-haskell/hashable-time-0.2.0.2-r1
index 0adbc3c8449c..0a43e3ce108a 100644
--- a/metadata/md5-cache/dev-haskell/hashable-time-0.2.0.2-r1
+++ b/metadata/md5-cache/dev-haskell/hashable-time-0.2.0.2-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
DEPEND=>=dev-haskell/hashable-1.2.3.3:=[profile?] <=dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] =dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Hashable instances for Data.Time
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/hashable-time
+HOMEPAGE=https://hackage.haskell.org/package/hashable-time
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/hashable-1.2.3.3:=[profile?] <=dev-haskell/hashable-1.4:=[
SLOT=0/0.2.0.2
SRC_URI=https://hackage.haskell.org/package/hashable-time-0.2.0.2/hashable-time-0.2.0.2.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=a2c2717715e3c803c664604ff6cfabce
+_md5_=6d8e4c2d3912748364b14ac2c56c4173
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-meta-0.8.5-r1 b/metadata/md5-cache/dev-haskell/haskell-src-meta-0.8.5-r1
index 71bb3a8bca69..ebc0d5bd7bfa 100644
--- a/metadata/md5-cache/dev-haskell/haskell-src-meta-0.8.5-r1
+++ b/metadata/md5-cache/dev-haskell/haskell-src-meta-0.8.5-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
DEPEND=>=dev-haskell/haskell-src-exts-1.18:=[profile?] =dev-haskell/syb-0.1:=[profile?] =dev-haskell/th-orphans-0.12:=[profile?] =dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Parse source to template-haskell abstract syntax
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/haskell-src-meta
+HOMEPAGE=https://hackage.haskell.org/package/haskell-src-meta
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0/0.8.5
SRC_URI=https://hackage.haskell.org/package/haskell-src-meta-0.8.5/haskell-src-meta-0.8.5.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=2d9bf3af4376cf779a1a14ae844233cd
+_md5_=434d503b2ad7464a2778ff9b5ca4357d
diff --git a/metadata/md5-cache/dev-haskell/hex-0.1.2 b/metadata/md5-cache/dev-haskell/hex-0.1.2
index 52f2a0a5720e..ab15d75296a0 100644
--- a/metadata/md5-cache/dev-haskell/hex-0.1.2
+++ b/metadata/md5-cache/dev-haskell/hex-0.1.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-lang/ghc-8.8.1:= dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Convert strings into hexadecimal and back
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/hex
+HOMEPAGE=https://hackage.haskell.org/package/hex
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-8.8.1:=
SLOT=0/0.1.2
SRC_URI=https://hackage.haskell.org/package/hex-0.1.2/hex-0.1.2.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=b4b1e0a1ff83a2c1cb6cb23448b991d5
+_md5_=c5723cd033e8747e681641ded79772d4
diff --git a/metadata/md5-cache/dev-haskell/hostname-1.0-r1 b/metadata/md5-cache/dev-haskell/hostname-1.0-r1
index b5a82d5dfe94..681beebe8121 100644
--- a/metadata/md5-cache/dev-haskell/hostname-1.0-r1
+++ b/metadata/md5-cache/dev-haskell/hostname-1.0-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=A a cross-platform means of determining the hostname
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/hostname
+HOMEPAGE=https://hackage.haskell.org/package/hostname
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
SLOT=0/1.0
SRC_URI=https://hackage.haskell.org/package/hostname-1.0/hostname-1.0.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=9970d6067f5a3c896f23322f4322465b
+_md5_=a4c7da7a22c107fa32b06fcb12f7612f
diff --git a/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.3 b/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.3
index 71b833e02956..3dd47df13bcd 100644
--- a/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.3
+++ b/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/connection-0.2.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-client-0.6:=[profile?] =dev-haskell/http-client-tls-0.3.2:=[profile?] =dev-haskell/network-3.0.0.0:=[profile?] dev-haskell/network-bsd:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=restricting the servers that http-client will use
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/http-client-restricted
+HOMEPAGE=https://hackage.haskell.org/package/http-client-restricted
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=MIT
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/connection-0.2.5:=[profile?] dev-haskell/data-default:=[pr
SLOT=0/0.0.3
SRC_URI=https://hackage.haskell.org/package/http-client-restricted-0.0.3/http-client-restricted-0.0.3.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=71468fd566d03593bb92493a8e6ae043
+_md5_=4fa8eb38be64aef405f44eac68a4277b
diff --git a/metadata/md5-cache/dev-haskell/http-date-0.0.6.1 b/metadata/md5-cache/dev-haskell/http-date-0.0.6.1
index ebb8b7d4de89..fc451cb6fcb6 100644
--- a/metadata/md5-cache/dev-haskell/http-date-0.0.6.1
+++ b/metadata/md5-cache/dev-haskell/http-date-0.0.6.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/attoparsec:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.8 dev-haskell/hspec dev-haskell/old-locale ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=HTTP Date parser/formatter
EAPI=5
-HOMEPAGE=http://hackage.haskell.org/package/http-date
+HOMEPAGE=https://hackage.haskell.org/package/http-date
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.0.6.1
SRC_URI=https://hackage.haskell.org/package/http-date-0.0.6.1/http-date-0.0.6.1.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6572520711a1e8a968750c00ff9cf2f7
+_md5_=d2730d53e76b498cf6159ac24d74cb70
diff --git a/metadata/md5-cache/dev-haskell/http-date-0.0.8 b/metadata/md5-cache/dev-haskell/http-date-0.0.8
index d7d896ad8f0b..2a8e6a92f2c8 100644
--- a/metadata/md5-cache/dev-haskell/http-date-0.0.8
+++ b/metadata/md5-cache/dev-haskell/http-date-0.0.8
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/attoparsec:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.8 dev-haskell/hspec dev-haskell/old-locale ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=HTTP Date parser/formatter
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/http-date
+HOMEPAGE=https://hackage.haskell.org/package/http-date
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0/0.0.8
SRC_URI=https://hackage.haskell.org/package/http-date-0.0.8/http-date-0.0.8.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=73074c7148de32de0d24086da41bad8f
+_md5_=db7a744ea5b5ba0ceb69c2da96f18f04
diff --git a/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1 b/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1
index 88fc95a7e5f9..9f06844ecefd 100644
--- a/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1
+++ b/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/network-2.3:=[profile?] =dev-haskell/network-uri-2.5:=[profile?] =dev-haskell/network-bsd-2.7:=[profile?] =dev-haskell/network-2.7:=[profile?] ) !network-bsd? ( =dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/network-2.6:=[profile?] ) !network-uri? ( =dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=A simple web-server with an interact style API
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/httpd-shed
+HOMEPAGE=https://hackage.haskell.org/package/httpd-shed
IUSE=buildexamples +network-bsd +network-uri doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/network-2.3:=[profile?] =dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=ID3v2 (tagging standard for MP3 files) library
EAPI=6
-HOMEPAGE=http://hackage.haskell.org/package/idiii
+HOMEPAGE=https://hackage.haskell.org/package/idiii
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0/0.1.3.3
SRC_URI=https://hackage.haskell.org/package/idiii-0.1.3.3/idiii-0.1.3.3.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d4cc54236b12bfe5c94447ff083bef20
+_md5_=fbf603c72635faba798935250358e155
diff --git a/metadata/md5-cache/dev-haskell/infer-license-0.2.0 b/metadata/md5-cache/dev-haskell/infer-license-0.2.0
index abf53864be97..f1276588fb23 100644
--- a/metadata/md5-cache/dev-haskell/infer-license-0.2.0
+++ b/metadata/md5-cache/dev-haskell/infer-license-0.2.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/text:=[profile?] >=dev-haskell/text-metrics-0.3.0:=[profile?] =dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/hspec-2 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Infer software license from a given license file
EAPI=6
-HOMEPAGE=http://hackage.haskell.org/package/infer-license
+HOMEPAGE=https://hackage.haskell.org/package/infer-license
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=MIT
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.2.0
SRC_URI=https://hackage.haskell.org/package/infer-license-0.2.0/infer-license-0.2.0.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5601f8662ae7b8ccce4a0263a6f414f4
+_md5_=ae0e78bd6b45c43f27b115d07cf81b7b
diff --git a/metadata/md5-cache/dev-haskell/ipynb-0.1 b/metadata/md5-cache/dev-haskell/ipynb-0.1
index 5335d3d995b7..09798fdbce04 100644
--- a/metadata/md5-cache/dev-haskell/ipynb-0.1
+++ b/metadata/md5-cache/dev-haskell/ipynb-0.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] =dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/aeson-diff dev-haskell/microlens dev-haskell/microlens-aeson dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/vector ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Data structure for working with Jupyter notebooks (ipynb)
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/ipynb
+HOMEPAGE=https://hackage.haskell.org/package/ipynb
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.1
SRC_URI=https://hackage.haskell.org/package/ipynb-0.1/ipynb-0.1.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=68af2f023828c55bab98f76211d9b076
+_md5_=9ae4e4d7643aefb1c9ca7c993cc7e206
diff --git a/metadata/md5-cache/dev-haskell/language-css-0.0.3 b/metadata/md5-cache/dev-haskell/language-css-0.0.3
index 4570fa08e6da..4e7f1f0a83f6 100644
--- a/metadata/md5-cache/dev-haskell/language-css-0.0.3
+++ b/metadata/md5-cache/dev-haskell/language-css-0.0.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=CSS 2.1 syntax
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/language-css
+HOMEPAGE=https://hackage.haskell.org/package/language-css
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
SLOT=0/0.0.3
SRC_URI=https://hackage.haskell.org/package/language-css-0.0.3/language-css-0.0.3.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=730f450247be411eb5182112d669442f
+_md5_=30ba5e8f44374314fb6f44c12fbd85fc
diff --git a/metadata/md5-cache/dev-haskell/language-dot-0.1.1 b/metadata/md5-cache/dev-haskell/language-dot-0.1.1
index 4c5e67f2fa3a..392a39bf7d2a 100644
--- a/metadata/md5-cache/dev-haskell/language-dot-0.1.1
+++ b/metadata/md5-cache/dev-haskell/language-dot-0.1.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/parsec-3:=[profile?] =dev-lang/ghc-7.4.1:= >=dev-haskell/mtl-1:=[profile?] =dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=A library for the analysis and creation of Graphviz DOT files
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/language-dot
+HOMEPAGE=https://hackage.haskell.org/package/language-dot
IUSE=+executable doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.1.1
SRC_URI=https://hackage.haskell.org/package/language-dot-0.1.1/language-dot-0.1.1.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=a7a755d9cb9e2c09fab3b51d582a9c84
+_md5_=542dc636fae2fd1d22678a63c95c0992
diff --git a/metadata/md5-cache/dev-haskell/language-glsl-0.3.0 b/metadata/md5-cache/dev-haskell/language-glsl-0.3.0
index a1d1115426f3..152e3cb5fe9f 100644
--- a/metadata/md5-cache/dev-haskell/language-glsl-0.3.0
+++ b/metadata/md5-cache/dev-haskell/language-glsl-0.3.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/parsec:=[profile?] dev-haskell/prettyclass:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=GLSL abstract syntax tree, parser, and pretty-printer
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/language-glsl
+HOMEPAGE=https://hackage.haskell.org/package/language-glsl
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.3.0
SRC_URI=https://hackage.haskell.org/package/language-glsl-0.3.0/language-glsl-0.3.0.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=888a6d5f158e5cd3e9ea917d972f4025
+_md5_=20057eb1752002052f7a6ebbe8ed69c5
diff --git a/metadata/md5-cache/dev-haskell/lens-family-1.2.3 b/metadata/md5-cache/dev-haskell/lens-family-1.2.3
index 5d2fde70619e..39bf9a37d43a 100644
--- a/metadata/md5-cache/dev-haskell/lens-family-1.2.3
+++ b/metadata/md5-cache/dev-haskell/lens-family-1.2.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/lens-family-core-1.2.2:=[profile?] =dev-haskell/mtl-2.1:=[profile?] =dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Lens Families
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/lens-family
+HOMEPAGE=https://hackage.haskell.org/package/lens-family
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/lens-family-core-1.2.2:=[profile?] =dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Haskell 98 Lens Families
EAPI=6
-HOMEPAGE=http://hackage.haskell.org/package/lens-family-core
+HOMEPAGE=https://hackage.haskell.org/package/lens-family-core
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-8.2.1:=
SLOT=0/1.2.3
SRC_URI=https://hackage.haskell.org/package/lens-family-core-1.2.3/lens-family-core-1.2.3.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d3590444e6cc714b8a49220ccb2ab74d
+_md5_=1371c247a191c34aaae2baa904fda4ff
diff --git a/metadata/md5-cache/dev-haskell/lukko-0.1.1.2 b/metadata/md5-cache/dev-haskell/lukko-0.1.1.2
index d035597eca2a..59bff0c7777f 100644
--- a/metadata/md5-cache/dev-haskell/lukko-0.1.1.2
+++ b/metadata/md5-cache/dev-haskell/lukko-0.1.1.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-2.2 test? ( >=dev-haskell/async-2.2.2 =dev-haskell/singleton-bool-0.1.5 =dev-haskell/tagged-0.8.5 =dev-haskell/tasty-1.2.3 =dev-haskell/tasty-expected-failure-0.11.1.2 =dev-haskell/tasty-hunit-0.10.0.2 =dev-haskell/temporary-1.3 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=File locking
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/lukko
+HOMEPAGE=https://hackage.haskell.org/package/lukko
IUSE=+ofd-locking doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.1.1.2
SRC_URI=https://hackage.haskell.org/package/lukko-0.1.1.2/lukko-0.1.1.2.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=c16e9b913654662790d8e501619507df
+_md5_=dcfa161554584fa3bfcf5915316334fd
diff --git a/metadata/md5-cache/dev-haskell/missingh-1.2.0.2 b/metadata/md5-cache/dev-haskell/missingh-1.2.0.2
index 2e7833d466e4..c0b236f19471 100644
--- a/metadata/md5-cache/dev-haskell/missingh-1.2.0.2
+++ b/metadata/md5-cache/dev-haskell/missingh-1.2.0.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpa
DEPEND=dev-haskell/hslogger:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-lang/ghc-6.12.1:= virtual/libiconv >=dev-haskell/cabal-1.8.0.2 test? ( dev-haskell/quickcheck dev-haskell/testpack ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Large utility library
EAPI=5
-HOMEPAGE=http://software.complete.org/missingh
+HOMEPAGE=https://hackage.haskell.org/package/MissingH
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86 ~amd64-linux
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/1.2.0.2
SRC_URI=https://hackage.haskell.org/package/MissingH-1.2.0.2/MissingH-1.2.0.2.tar.gz
_eclasses_=base 2ec5c64f5de125f0c65a927c4c128fef desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8db7865b0a98ed0bded4b31a04ca66a5
+_md5_=b1ecf988eb6c028237db85d3e6f69e1d
diff --git a/metadata/md5-cache/dev-haskell/missingh-1.2.1.0 b/metadata/md5-cache/dev-haskell/missingh-1.2.1.0
index 0ed60ead4aa7..264b957f3e0c 100644
--- a/metadata/md5-cache/dev-haskell/missingh-1.2.1.0
+++ b/metadata/md5-cache/dev-haskell/missingh-1.2.1.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/hslogger:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 test? ( dev-haskell/errorcall-eq-instance dev-haskell/quickcheck dev-haskell/testpack ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Large utility library
EAPI=5
-HOMEPAGE=http://software.complete.org/missingh
+HOMEPAGE=https://hackage.haskell.org/package/MissingH
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86 ~amd64-linux
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/1.2.1.0
SRC_URI=https://hackage.haskell.org/package/MissingH-1.2.1.0/MissingH-1.2.1.0.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=37d2dd636115047287722ee132063b24
+_md5_=6ee3775a9d52f98953e0ce16a1399abd
diff --git a/metadata/md5-cache/dev-haskell/missingh-1.4.3.0 b/metadata/md5-cache/dev-haskell/missingh-1.4.3.0
index 78573aa4f8ec..00b3a0d0062f 100644
--- a/metadata/md5-cache/dev-haskell/missingh-1.4.3.0
+++ b/metadata/md5-cache/dev-haskell/missingh-1.4.3.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/hslogger-1.3.0.0:=[profile?] =dev-haskell/mtl-1.1.1.0:=[profile?] =dev-haskell/old-locale-1.0:=[profile?] =dev-haskell/old-time-1.1:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-haskell/random-1.0.1.1:=[profile?] =dev-haskell/regex-compat-0.95.1:=[profile?] =dev-lang/ghc-7.4.1:= network-3? ( >=dev-haskell/network-3.0:=[profile?] =dev-haskell/network-bsd-2.8.1:=[profile?] =dev-haskell/network-2.6.3.1:=[profile?] =dev-haskell/cabal-1.12 test? ( >=dev-haskell/errorcall-eq-instance-0.3 =dev-haskell/hunit-1.6 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Large utility library
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/MissingH
+HOMEPAGE=https://hackage.haskell.org/package/MissingH
IUSE=+network-3 doc hscolour profile test
KEYWORDS=~amd64 ~x86 ~amd64-linux
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0/1.4.3.0
SRC_URI=https://hackage.haskell.org/package/MissingH-1.4.3.0/MissingH-1.4.3.0.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=a394593a90eccd50ab2675914fd1e07b
+_md5_=01104d6fc11fb05ffedc05f34afe1fc8
diff --git a/metadata/md5-cache/dev-haskell/mmorph-1.1.3 b/metadata/md5-cache/dev-haskell/mmorph-1.1.3
index af88baecd30a..6a0faddf9a76 100644
--- a/metadata/md5-cache/dev-haskell/mmorph-1.1.3
+++ b/metadata/md5-cache/dev-haskell/mmorph-1.1.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/mtl-2.1:=[profile?] =dev-haskell/transformers-compat-0.3:=[profile?] =dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Monad morphisms
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/mmorph
+HOMEPAGE=https://hackage.haskell.org/package/mmorph
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] =dev
SLOT=0/1.1.3
SRC_URI=https://hackage.haskell.org/package/mmorph-1.1.3/mmorph-1.1.3.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=9b9a83d88539695cddd4fcd8c07f5316
+_md5_=ad3e1e1d3f43217a0cdee0c0a8fc8ff5
diff --git a/metadata/md5-cache/dev-haskell/monadrandom-0.5.1.2 b/metadata/md5-cache/dev-haskell/monadrandom-0.5.1.2
index 4a9d7f81a3ce..905d0ee11024 100644
--- a/metadata/md5-cache/dev-haskell/monadrandom-0.5.1.2
+++ b/metadata/md5-cache/dev-haskell/monadrandom-0.5.1.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/fail-4.9:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] =dev-haskell/primitive-0.6:=[profile?] =dev-haskell/random-1.0:=[profile?] =dev-haskell/transformers-compat-0.4:=[profile?] =dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Random-number generation monad
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/MonadRandom
+HOMEPAGE=https://hackage.haskell.org/package/MonadRandom
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] =dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/doctest ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Network byte order utilities
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/network-byte-order
+HOMEPAGE=https://hackage.haskell.org/package/network-byte-order
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.1.4.0
SRC_URI=https://hackage.haskell.org/package/network-byte-order-0.1.4.0/network-byte-order-0.1.4.0.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=810a19b0008ea7621608fc1ce580cbc1
+_md5_=d5b5823019bd67e9639115103d311bf8
diff --git a/metadata/md5-cache/dev-haskell/network-multicast-0.3.2 b/metadata/md5-cache/dev-haskell/network-multicast-0.3.2
index 65510a16c461..162d5e7f2fc8 100644
--- a/metadata/md5-cache/dev-haskell/network-multicast-0.3.2
+++ b/metadata/md5-cache/dev-haskell/network-multicast-0.3.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/network:=[profile?] dev-haskell/network-bsd:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Simple multicast library
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/network-multicast
+HOMEPAGE=https://hackage.haskell.org/package/network-multicast
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=public-domain
@@ -10,4 +10,4 @@ RDEPEND=dev-haskell/network:=[profile?] dev-haskell/network-bsd:=[profile?] >=de
SLOT=0/0.3.2
SRC_URI=https://hackage.haskell.org/package/network-multicast-0.3.2/network-multicast-0.3.2.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=fc6cf86c92d69fe357683a97bb1bb14f
+_md5_=cd4af9e13d89a196f97ef5013fc58221
diff --git a/metadata/md5-cache/dev-haskell/only-0.1 b/metadata/md5-cache/dev-haskell/only-0.1
index 555b6295a6ac..96900ed96843 100644
--- a/metadata/md5-cache/dev-haskell/only-0.1
+++ b/metadata/md5-cache/dev-haskell/only-0.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=The 1-tuple type or single-value "collection"
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/Only
+HOMEPAGE=https://hackage.haskell.org/package/Only
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
SLOT=0/0.1
SRC_URI=https://hackage.haskell.org/package/Only-0.1/Only-0.1.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=0a88328c73fa979a5aa44434177a4494
+_md5_=7815da8c093351298cd580275b3c167f
diff --git a/metadata/md5-cache/dev-haskell/pango-0.13.8.1 b/metadata/md5-cache/dev-haskell/pango-0.13.8.1
new file mode 100644
index 000000000000..f3dd8120f875
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/pango-0.13.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] =dev-haskell/glib-0.13.0.0:=[profile?] =dev-haskell/text-0.11.0.6:=[profile?] =dev-lang/ghc-7.4.1:= x11-libs/cairo x11-libs/pango >=dev-haskell/cabal-1.24 =dev-haskell/gtk2hs-buildtools-0.13.2.0 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the Pango text rendering engine
+EAPI=7
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] =dev-haskell/glib-0.13.0.0:=[profile?] =dev-haskell/text-0.11.0.6:=[profile?] =dev-lang/ghc-7.4.1:= x11-libs/cairo x11-libs/pango
+SLOT=0/0.13.8.1
+SRC_URI=https://hackage.haskell.org/package/pango-0.13.8.1/pango-0.13.8.1.tar.gz
+_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=d6a605213ced28f546406a4e96c0eaf8
diff --git a/metadata/md5-cache/dev-haskell/parallel-3.2.2.0 b/metadata/md5-cache/dev-haskell/parallel-3.2.2.0
index 629013da8c5c..bf5423d924e6 100644
--- a/metadata/md5-cache/dev-haskell/parallel-3.2.2.0
+++ b/metadata/md5-cache/dev-haskell/parallel-3.2.2.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Parallel programming library
EAPI=6
-HOMEPAGE=http://hackage.haskell.org/package/parallel
+HOMEPAGE=https://hackage.haskell.org/package/parallel
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
SLOT=3/3.2.2.0
SRC_URI=https://hackage.haskell.org/package/parallel-3.2.2.0/parallel-3.2.2.0.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3409dffb91e139e1881fd61f72e00178
+_md5_=f77fccabb463156d82b15a279bc83242
diff --git a/metadata/md5-cache/dev-haskell/path-0.7.0 b/metadata/md5-cache/dev-haskell/path-0.7.0
index c8f136bc1fa8..4481ff2187cf 100644
--- a/metadata/md5-cache/dev-haskell/path-0.7.0
+++ b/metadata/md5-cache/dev-haskell/path-0.7.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] =dev-haskell/hashable-1.2:=[profile?] =dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( >=dev-haskell/genvalidity-0.8 >=dev-haskell/genvalidity-hspec-0.7 >=dev-haskell/genvalidity-property-0.4 >=dev-haskell/hspec-2.0 =dev-haskell/mtl-2.0 =dev-haskell/validity-0.8.0.0 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Support for well-typed paths
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/path
+HOMEPAGE=https://hackage.haskell.org/package/path
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.7.0
SRC_URI=https://hackage.haskell.org/package/path-0.7.0/path-0.7.0.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=73a325658592b394f8aced22d0e706b1
+_md5_=354970f70e5aa8c5a35b60ed99721367
diff --git a/metadata/md5-cache/dev-haskell/patience-0.1.1-r1 b/metadata/md5-cache/dev-haskell/patience-0.1.1-r1
index 489bcef52b0b..406ab29db2f1 100644
--- a/metadata/md5-cache/dev-haskell/patience-0.1.1-r1
+++ b/metadata/md5-cache/dev-haskell/patience-0.1.1-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Patience diff and longest increasing subsequence
EAPI=6
-HOMEPAGE=http://hackage.haskell.org/package/patience
+HOMEPAGE=https://hackage.haskell.org/package/patience
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
SLOT=0/0.1.1
SRC_URI=https://hackage.haskell.org/package/patience-0.1.1/patience-0.1.1.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6dc5ab9fcf5ad89db1dbf252fc1259fd
+_md5_=cdc3b78334ca531edc23f09f2751bf5e
diff --git a/metadata/md5-cache/dev-haskell/pipes-4.3.14 b/metadata/md5-cache/dev-haskell/pipes-4.3.14
index 2c0dfc51e15c..a167a474351e 100644
--- a/metadata/md5-cache/dev-haskell/pipes-4.3.14
+++ b/metadata/md5-cache/dev-haskell/pipes-4.3.14
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/exceptions-0.4:=[profile?] =dev-haskell/fail-4.9:=[profile?] =dev-haskell/mmorph-1.0.4:=[profile?] =dev-haskell/mtl-2.2.1:=[profile?] =dev-haskell/semigroups-0.17:=[profile?] =dev-haskell/void-0.4:=[profile?] =dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/quickcheck-2.4 =dev-haskell/test-framework-0.4 =dev-haskell/test-framework-quickcheck2-0.2.0 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Compositional pipelines
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/pipes
+HOMEPAGE=https://hackage.haskell.org/package/pipes
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/4.3.14
SRC_URI=https://hackage.haskell.org/package/pipes-4.3.14/pipes-4.3.14.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=f4f757e13bb9e580d57e17a2ba27918d
+_md5_=c249236618da15d0872e84a514d593eb
diff --git a/metadata/md5-cache/dev-haskell/pqueue-1.4.1.3 b/metadata/md5-cache/dev-haskell/pqueue-1.4.1.3
index 12fe41d95dd7..07d23c04840f 100644
--- a/metadata/md5-cache/dev-haskell/pqueue-1.4.1.3
+++ b/metadata/md5-cache/dev-haskell/pqueue-1.4.1.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/quickcheck-2.5 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Reliable, persistent, fast priority queues
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/pqueue
+HOMEPAGE=https://hackage.haskell.org/package/pqueue
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/1.4.1.3
SRC_URI=https://hackage.haskell.org/package/pqueue-1.4.1.3/pqueue-1.4.1.3.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=062dbf3f16c6307baa817fdbed50b231
+_md5_=3e2d28211a9f19d030b2ca63f8429ca6
diff --git a/metadata/md5-cache/dev-haskell/psqueue-1.1.0.1 b/metadata/md5-cache/dev-haskell/psqueue-1.1.0.1
index 3725a8ef66c0..1aa1f427e1ee 100644
--- a/metadata/md5-cache/dev-haskell/psqueue-1.1.0.1
+++ b/metadata/md5-cache/dev-haskell/psqueue-1.1.0.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Priority Search Queue
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/PSQueue
+HOMEPAGE=https://hackage.haskell.org/package/PSQueue
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
SLOT=0/1.1.0.1
SRC_URI=https://hackage.haskell.org/package/PSQueue-1.1.0.1/PSQueue-1.1.0.1.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=a2ae5f6542d8571c1dd83e1f71395fef
+_md5_=89c339921429eaeea3f8db526e55b8b5
diff --git a/metadata/md5-cache/dev-haskell/psqueues-0.2.7.2 b/metadata/md5-cache/dev-haskell/psqueues-0.2.7.2
index 00c12f75e9a4..68353929a893 100644
--- a/metadata/md5-cache/dev-haskell/psqueues-0.2.7.2
+++ b/metadata/md5-cache/dev-haskell/psqueues-0.2.7.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] =dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 =dev-haskell/quickcheck-2.7 =dev-haskell/tasty-1.2 =dev-haskell/tasty-hunit-0.9 =dev-haskell/tasty-quickcheck-0.8 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Pure priority search queues
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/psqueues
+HOMEPAGE=https://hackage.haskell.org/package/psqueues
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.2.7.2
SRC_URI=https://hackage.haskell.org/package/psqueues-0.2.7.2/psqueues-0.2.7.2.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=f0ef29faf4c5a77ebc99814181ccd64b
+_md5_=24cca263868c4c7e48226f832b796846
diff --git a/metadata/md5-cache/dev-haskell/regex-compat-0.95.1-r1 b/metadata/md5-cache/dev-haskell/regex-compat-0.95.1-r1
index 1e41c8891855..23a12315b94a 100644
--- a/metadata/md5-cache/dev-haskell/regex-compat-0.95.1-r1
+++ b/metadata/md5-cache/dev-haskell/regex-compat-0.95.1-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-haskell/regex-posix-0.95.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Replaces/Enhances Text.Regex
EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/lazy-regex
+HOMEPAGE=https://hackage.haskell.org/package/regex-compat
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-haskell/regex-posix-0.95
SLOT=0/0.95.1
SRC_URI=https://hackage.haskell.org/package/regex-compat-0.95.1/regex-compat-0.95.1.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9cc09ba3a116a87540095958fc50617
+_md5_=28d79034fff0e4fce2bffd6e03a8775f
diff --git a/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.0 b/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.0
index 84c78c779310..b530d49e347a 100644
--- a/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.0
+++ b/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
DEPEND=>=dev-haskell/regex-base-0.94:=[profile?] =dev-haskell/regex-posix-0.96:=[profile?] =dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Replaces/Enhances Text.Regex
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/regex-compat
+HOMEPAGE=https://hackage.haskell.org/package/regex-compat
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/regex-base-0.94:=[profile?] =dev-haskell/fail-4.9:=[profile?] =dev-haskell/regex-base-0.94:=[profile?] =dev-lang/ghc-7.4.1:= dev-libs/libpcre >=dev-haskell/cabal-1.12 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Replaces/Enhances Text.Regex
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/regex-pcre
+HOMEPAGE=https://hackage.haskell.org/package/regex-pcre
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] =
SLOT=0/0.95.0.0
SRC_URI=https://hackage.haskell.org/package/regex-pcre-0.95.0.0/regex-pcre-0.95.0.0.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=10512e97821f397f5b781ecef0fdb675
+_md5_=c1fb6c761f7fb6943c7c7b2542f6af8b
diff --git a/metadata/md5-cache/dev-haskell/regex-posix-0.95.2 b/metadata/md5-cache/dev-haskell/regex-posix-0.95.2
index 8839acdbea03..613af1ccfaf1 100644
--- a/metadata/md5-cache/dev-haskell/regex-posix-0.95.2
+++ b/metadata/md5-cache/dev-haskell/regex-posix-0.95.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpa
DEPEND=>=dev-haskell/regex-base-0.93[profile?] >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Replaces/Enhances Text.Regex
EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/lazy-regex
+HOMEPAGE=https://hackage.haskell.org/package/regex-posix
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/regex-base-0.93[profile?] >=dev-lang/ghc-6.8.2
SLOT=0
SRC_URI=https://hackage.haskell.org/package/regex-posix-0.95.2/regex-posix-0.95.2.tar.gz
_eclasses_=base 2ec5c64f5de125f0c65a927c4c128fef desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4ccccf08a55a15c78ad7e1eddf7a95d1
+_md5_=c4738ac7079feb0bdd1e4e3b32665777
diff --git a/metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0 b/metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0
index 04848c8ed0aa..65e96eaac6c1 100644
--- a/metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0
+++ b/metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
DEPEND=>=dev-haskell/fail-4.9:=[profile?] =dev-haskell/regex-base-0.94:=[profile?] =dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Replaces/Enhances Text.Regex
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/regex-posix
+HOMEPAGE=https://hackage.haskell.org/package/regex-posix
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] =
SLOT=0/0.96.0.0
SRC_URI=https://hackage.haskell.org/package/regex-posix-0.96.0.0/regex-posix-0.96.0.0.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=a78e0a3d846bbaa487714df1ba12e45d
+_md5_=8a0b54843a4853d8e4e8cc77480d63dc
diff --git a/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.1.0 b/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.1.0
index 75b00373a8bd..a3bcc130b544 100644
--- a/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.1.0
+++ b/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.1.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
DEPEND=>=dev-haskell/fail-4.9:=[profile?] =dev-haskell/mtl-2.1.3:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-haskell/regex-base-0.94:=[profile?] =dev-haskell/text-1.2.3:=[profile?] =dev-lang/ghc-7.4.1:= >=dev-haskell/semigroups-0.18:=[profile?] =dev-haskell/cabal-1.12 test? ( dev-haskell/semigroups >=dev-haskell/utf8-string-1.0.1 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Replaces/Enhances Text.Regex
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/regex-tdfa
+HOMEPAGE=https://hackage.haskell.org/package/regex-tdfa
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/1.3.1.0
SRC_URI=https://hackage.haskell.org/package/regex-tdfa-1.3.1.0/regex-tdfa-1.3.1.0.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=6f33ad91f18e5c2f796f1edd935f244d
+_md5_=c248c4889282ded7907804ef482cbf6c
diff --git a/metadata/md5-cache/dev-haskell/resolv-0.1.2.0 b/metadata/md5-cache/dev-haskell/resolv-0.1.2.0
index 1d468f04487c..42c40a018c37 100644
--- a/metadata/md5-cache/dev-haskell/resolv-0.1.2.0
+++ b/metadata/md5-cache/dev-haskell/resolv-0.1.2.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/base16-bytestring-0.1:=[profile?] =dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-2.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Domain Name Service (DNS) lookup via the libresolv standard library routines
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/resolv
+HOMEPAGE=https://hackage.haskell.org/package/resolv
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0/0.1.2.0
SRC_URI=https://hackage.haskell.org/package/resolv-0.1.2.0/resolv-0.1.2.0.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=b961d740c0230b82afa43e336ed05440
+_md5_=8b521b04c076c6f703d67a1f19b7c75c
diff --git a/metadata/md5-cache/dev-haskell/rsa-2.3.1 b/metadata/md5-cache/dev-haskell/rsa-2.3.1
index f77bbc0de704..8012766247d4 100644
--- a/metadata/md5-cache/dev-haskell/rsa-2.3.1
+++ b/metadata/md5-cache/dev-haskell/rsa-2.3.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/crypto-api-0.10:=[profile?] =dev-haskell/crypto-pubkey-types-0.2:=[profile?] =dev-haskell/sha-1.6.4.1:=[profile?] =dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/crypto-pubkey-types-0.4 =dev-haskell/drbg-0.5.2 =dev-haskell/quickcheck-2.5 =dev-haskell/tagged-0.2 =dev-haskell/test-framework-0.8.0.3 =dev-haskell/test-framework-quickcheck2-0.3.0.2 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Implementation of RSA, using the padding schemes of PKCS#1 v2.1
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/RSA
+HOMEPAGE=https://hackage.haskell.org/package/RSA
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/2.3.1
SRC_URI=https://hackage.haskell.org/package/RSA-2.3.1/RSA-2.3.1.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=0565c2189e38817d4605a69b197b9386
+_md5_=7172540117e9ba54a5f70fef4ef7e8f2
diff --git a/metadata/md5-cache/dev-haskell/sandi-0.5 b/metadata/md5-cache/dev-haskell/sandi-0.5
index cd38d1186f91..00bbbd8230e8 100644
--- a/metadata/md5-cache/dev-haskell/sandi-0.5
+++ b/metadata/md5-cache/dev-haskell/sandi-0.5
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-lang/ghc-7.4.1:= conduit? ( >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/exceptions:=[profile?] ) >=dev-haskell/cabal-1.12 test? ( dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck dev-haskell/tasty-th ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Data encoding library
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/sandi
+HOMEPAGE=https://hackage.haskell.org/package/sandi
IUSE=+conduit doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.5
SRC_URI=https://hackage.haskell.org/package/sandi-0.5/sandi-0.5.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=a76ab6e96233f8a6dba6d29d70c9ee03
+_md5_=06574ea4e076e29606eaaed4f64d38a8
diff --git a/metadata/md5-cache/dev-haskell/sop-core-0.5.0.1 b/metadata/md5-cache/dev-haskell/sop-core-0.5.0.1
index 81eb1e03d840..9b6df5e34c2a 100644
--- a/metadata/md5-cache/dev-haskell/sop-core-0.5.0.1
+++ b/metadata/md5-cache/dev-haskell/sop-core-0.5.0.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=True Sums of Products
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/sop-core
+HOMEPAGE=https://hackage.haskell.org/package/sop-core
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-8.0.1:=
SLOT=0/0.5.0.1
SRC_URI=https://hackage.haskell.org/package/sop-core-0.5.0.1/sop-core-0.5.0.1.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=48ef9d32b29d3a56e8fb4114780cae6c
+_md5_=afdc0bb356980cd81f2ea8f1a253a97f
diff --git a/metadata/md5-cache/dev-haskell/split-0.2.3.4 b/metadata/md5-cache/dev-haskell/split-0.2.3.4
index 1c6f4949b771..8856531fa4fe 100644
--- a/metadata/md5-cache/dev-haskell/split-0.2.3.4
+++ b/metadata/md5-cache/dev-haskell/split-0.2.3.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Combinator library for splitting lists
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/split
+HOMEPAGE=https://hackage.haskell.org/package/split
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86 ~ppc-macos ~x86-macos
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.2.3.4
SRC_URI=https://hackage.haskell.org/package/split-0.2.3.4/split-0.2.3.4.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=c54d80c6f7a4b9a456b31ee05513c938
+_md5_=9ea97f646c73ab217cfa2606b780187d
diff --git a/metadata/md5-cache/dev-haskell/splitmix-0.0.4 b/metadata/md5-cache/dev-haskell/splitmix-0.0.4
index 9c030cb77bbc..9bfd2c96e0d0 100644
--- a/metadata/md5-cache/dev-haskell/splitmix-0.0.4
+++ b/metadata/md5-cache/dev-haskell/splitmix-0.0.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-lang/ghc-7.4.1:= random? ( >=dev-haskell/random-1.0:=[profile?] =dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Fast Splittable PRNG
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/splitmix
+HOMEPAGE=https://hackage.haskell.org/package/splitmix
IUSE=optimised-mixer +random doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0/0.0.4
SRC_URI=https://hackage.haskell.org/package/splitmix-0.0.4/splitmix-0.0.4.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=22554bc7263a9df903bb228d8642257f
+_md5_=933e939552dffd8030e321225d39dc76
diff --git a/metadata/md5-cache/dev-haskell/stmonadtrans-0.4.4 b/metadata/md5-cache/dev-haskell/stmonadtrans-0.4.4
index efc05dc831ac..d963a155ed04 100644
--- a/metadata/md5-cache/dev-haskell/stmonadtrans-0.4.4
+++ b/metadata/md5-cache/dev-haskell/stmonadtrans-0.4.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/fail:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/tasty-0.11.0.4 =dev-haskell/tasty-hunit-0.9.2 =dev-haskell/tasty-quickcheck-0.8.4 =dev-haskell/transformers-0.4 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=A monad transformer version of the ST monad
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/STMonadTrans
+HOMEPAGE=https://hackage.haskell.org/package/STMonadTrans
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.4.4
SRC_URI=https://hackage.haskell.org/package/STMonadTrans-0.4.4/STMonadTrans-0.4.4.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=2bb91ec27e7f76c46aee03e0023eb4fc
+_md5_=21c3af352ebc0e83b96cde3dd713c950
diff --git a/metadata/md5-cache/dev-haskell/string-qq-0.0.4 b/metadata/md5-cache/dev-haskell/string-qq-0.0.4
index 93cec88a1905..350ac1c0b64b 100644
--- a/metadata/md5-cache/dev-haskell/string-qq-0.0.4
+++ b/metadata/md5-cache/dev-haskell/string-qq-0.0.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.6 =dev-haskell/text-1.2 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=QuasiQuoter for non-interpolated strings, texts and bytestrings
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/string-qq
+HOMEPAGE=https://hackage.haskell.org/package/string-qq
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=public-domain
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.0.4
SRC_URI=https://hackage.haskell.org/package/string-qq-0.0.4/string-qq-0.0.4.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=a3ed27065542b401e3f5c8f6ebec3b80
+_md5_=5184c8ecb47230c67175c68c972959a2
diff --git a/metadata/md5-cache/dev-haskell/stringbuilder-0.5.1 b/metadata/md5-cache/dev-haskell/stringbuilder-0.5.1
index 1175ab0b56f2..142e51d23cb3 100644
--- a/metadata/md5-cache/dev-haskell/stringbuilder-0.5.1
+++ b/metadata/md5-cache/dev-haskell/stringbuilder-0.5.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=A writer monad for multi-line string literals
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/stringbuilder
+HOMEPAGE=https://hackage.haskell.org/package/stringbuilder
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=MIT
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.5.1
SRC_URI=https://hackage.haskell.org/package/stringbuilder-0.5.1/stringbuilder-0.5.1.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=60f313f18f8d78d2b63c77c46ada37f4
+_md5_=1d6f746a4a3771c5a0aba6b3278d6a88
diff --git a/metadata/md5-cache/dev-haskell/text-short-0.1.3 b/metadata/md5-cache/dev-haskell/text-short-0.1.3
index a60c0a53af23..1e67e00b2e12 100644
--- a/metadata/md5-cache/dev-haskell/text-short-0.1.3
+++ b/metadata/md5-cache/dev-haskell/text-short-0.1.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
DEPEND=>=dev-haskell/hashable-1.2.6:=[profile?] =dev-haskell/semigroups-0.18.2:=[profile?] =dev-haskell/text-1.0:=[profile?] =dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-instances-0.3.14 =dev-haskell/tasty-1.0.0 =dev-haskell/tasty-hunit-0.10.0 =dev-haskell/tasty-quickcheck-0.10 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Memory-efficient representation of Unicode text strings
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/text-short
+HOMEPAGE=https://hackage.haskell.org/package/text-short
IUSE=asserts doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.1.3
SRC_URI=https://hackage.haskell.org/package/text-short-0.1.3/text-short-0.1.3.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=9e83de88c7602666fb894ff2115e2900
+_md5_=872f8aa09e5b72a0c22f7c806b7fff1c
diff --git a/metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4 b/metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4
index 8c96e12901c3..369b6ae512ea 100644
--- a/metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4
+++ b/metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/auto-update:=[profile?] dev-haskell/basement:=[profile?] dev-haskell/clock:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/psqueues-0.2.3:=[profile?] dev-haskell/tls:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=In-memory TLS session manager
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/tls-session-manager
+HOMEPAGE=https://hackage.haskell.org/package/tls-session-manager
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=dev-haskell/auto-update:=[profile?] dev-haskell/basement:=[profile?] dev
SLOT=0/0.0.4
SRC_URI=https://hackage.haskell.org/package/tls-session-manager-0.0.4/tls-session-manager-0.0.4.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=f3f119ed69b6af5ebe7eeb43eac205d9
+_md5_=2622ce5de60e89b9b4da7376ee68dff5
diff --git a/metadata/md5-cache/dev-haskell/unix-time-0.4.7 b/metadata/md5-cache/dev-haskell/unix-time-0.4.7
index 13d7ca2a9f73..8197c68ccd4c 100644
--- a/metadata/md5-cache/dev-haskell/unix-time-0.4.7
+++ b/metadata/md5-cache/dev-haskell/unix-time-0.4.7
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 test? ( >=dev-haskell/doctest-0.9.3 >=dev-haskell/hspec-2.6 dev-haskell/old-locale dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Unix time parser/formatter and utilities
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/unix-time
+HOMEPAGE=https://hackage.haskell.org/package/unix-time
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0/0.4.7
SRC_URI=https://hackage.haskell.org/package/unix-time-0.4.7/unix-time-0.4.7.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=715a4baa3f0b69c7669f689895303b2b
+_md5_=ee53de5436accc6a89209231fbef6960
diff --git a/metadata/md5-cache/dev-haskell/wai-logger-2.3.6 b/metadata/md5-cache/dev-haskell/wai-logger-2.3.6
index 74507b3d622e..c4d3a7c989f2 100644
--- a/metadata/md5-cache/dev-haskell/wai-logger-2.3.6
+++ b/metadata/md5-cache/dev-haskell/wai-logger-2.3.6
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=dev-haskell/byteorder:=[profile?] >=dev-haskell/fast-logger-3:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/wai-2.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 >=dev-haskell/cabal-doctest-1.0.6 =dev-haskell/doctest-0.10.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=A logging system for WAI
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/wai-logger
+HOMEPAGE=https://hackage.haskell.org/package/wai-logger
IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0/2.3.6
SRC_URI=https://hackage.haskell.org/package/wai-logger-2.3.6/wai-logger-2.3.6.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=34278dd7675257714e0c721161a5b872
+_md5_=6c6a46e6207d09a4426ed585a6224042
diff --git a/metadata/md5-cache/dev-haskell/wl-pprint-text-1.2.0.1 b/metadata/md5-cache/dev-haskell/wl-pprint-text-1.2.0.1
index 96ad0fc3ca33..ea1a5ccab77b 100644
--- a/metadata/md5-cache/dev-haskell/wl-pprint-text-1.2.0.1
+++ b/metadata/md5-cache/dev-haskell/wl-pprint-text-1.2.0.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-haskell/base-compat-0.10:=[profile?] =dev-haskell/text-0.11.0.0:=[profile?] =dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=A Wadler/Leijen Pretty Printer for Text values
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/wl-pprint-text
+HOMEPAGE=https://hackage.haskell.org/package/wl-pprint-text
IUSE=doc hscolour profile
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/base-compat-0.10:=[profile?] dev-haskell/split-0:=[profile?] >=dev-haskell/wxdirect-0.90.1.1:3.0=[profile?] x11-libs/wxGTK:3.0=[X,gstreamer?,opengl] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.23
+DESCRIPTION=wxHaskell C++ wrapper
+EAPI=6
+HOMEPAGE=https://wiki.haskell.org/WxHaskell
+IUSE=gstreamer profile
+KEYWORDS=~amd64 ~x86
+LICENSE=wxWinLL-3.1
+RDEPEND=>dev-haskell/split-0:=[profile?] >=dev-haskell/wxdirect-0.90.1.1:3.0=[profile?] x11-libs/wxGTK:3.0=[X,gstreamer?,opengl] >=dev-lang/ghc-7.6.1:=
+SLOT=3.0/0.92.3.0
+SRC_URI=https://hackage.haskell.org/package/wxc-0.92.3.0/wxc-0.92.3.0.tar.gz
+_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 wxwidgets e1e6e1eb5b3d911b3abd712f611e2312
+_md5_=2d93dc694c703d5436b738163374812e
diff --git a/metadata/md5-cache/dev-haskell/zlib-0.6.2.2 b/metadata/md5-cache/dev-haskell/zlib-0.6.2.2
index 71cc4082b966..9341fb873a97 100644
--- a/metadata/md5-cache/dev-haskell/zlib-0.6.2.2
+++ b/metadata/md5-cache/dev-haskell/zlib-0.6.2.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
DEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib >=dev-haskell/cabal-1.10 virtual/pkgconfig test? ( >=dev-haskell/quickcheck-2 =dev-haskell/tasty-0.8 =dev-haskell/tasty-hunit-0.8 =dev-haskell/tasty-quickcheck-0.8 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Compression and decompression in the gzip and zlib formats
EAPI=7
-HOMEPAGE=http://hackage.haskell.org/package/zlib
+HOMEPAGE=https://hackage.haskell.org/package/zlib
IUSE=bundled-c-zlib non-blocking-ffi doc hscolour profile test
KEYWORDS=~amd64 ~x86 ~ppc-macos ~x86-macos
LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0/0.6.2.2
SRC_URI=https://hackage.haskell.org/package/zlib-0.6.2.2/zlib-0.6.2.2.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=a097b9dc0af81525d74b31bc85e258d3
+_md5_=333b9ec3832a4756b16247e2083d1caf
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 025abd820b08..c7a4ae5c3335 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/elixir-1.9.4 b/metadata/md5-cache/dev-lang/elixir-1.9.4
deleted file mode 100644
index 9a5ea1b23840..000000000000
--- a/metadata/md5-cache/dev-lang/elixir-1.9.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/erlang-18[ssl]
-DESCRIPTION=Elixir programming language
-EAPI=7
-HOMEPAGE=https://elixir-lang.org
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0 ErlPL-1.1
-RDEPEND=>=dev-lang/erlang-18[ssl] !!sci-biology/phylip
-SLOT=0
-SRC_URI=https://github.com/elixir-lang/elixir/archive/v1.9.4.tar.gz -> elixir-1.9.4.tar.gz
-_md5_=0fd9e0fae962f68b5d6057d28c67ec01
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2016-r4 b/metadata/md5-cache/dev-lang/gnat-gpl-2016-r4
index 4ed1d0ee657b..140c30235720 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2016-r4
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2016-r4
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:4.9.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
RESTRICT=!test? ( test )
SLOT=4.9.4
SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f -> gnat-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db -> gcc-4.9-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d -> gcc-interface-4.9-gpl-2016-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain 144d9005ff306dc50b531f19fd6f0f57 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain df8e87e565d293e005a3c21d5ee72db6 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=8656cce49186fcace677463b71036141
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
index 02cc6ad80bab..991127c27a3c 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:6.3.0 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
RESTRICT=!test? ( test )
SLOT=6.3.0
SRC_URI=http://mirrors.cdn.adacore.com/art/591adbb4c7a4473fcc4532a3 -> gnat-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adb65c7a4473fcbb153ac -> gcc-6-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adbc5c7a4473fcbb153ae -> gcc-interface-6-gpl-2017-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain 144d9005ff306dc50b531f19fd6f0f57 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain df8e87e565d293e005a3c21d5ee72db6 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=dd8678d553374954e85eebd8b67ea874
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3 b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
index d9874ed649b1..83215e017c9d 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:7.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
RESTRICT=!test? ( test )
SLOT=7.3.1
SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5 -> gnat-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7 -> gcc-7-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6 -> gcc-interface-7-gpl-2018-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.8.tar.bz2
-_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain 144d9005ff306dc50b531f19fd6f0f57 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain df8e87e565d293e005a3c21d5ee72db6 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=13d2fb63cd8e6365bd1e5e2f11ff6488
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2019-r2 b/metadata/md5-cache/dev-lang/gnat-gpl-2019-r2
index aa6de14c293c..630958eb498c 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2019-r2
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2019-r2
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:8.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
RESTRICT=test
SLOT=8.3.1
SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf865331e87aa2cdf16b49 -> gnat-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf8a0731e87a8f1d425049 -> gcc-8-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf87cc31e87aa2cdf16b50 -> gcc-interface-8-2019-20190510-18F59-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-4.tar.bz2
-_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain 144d9005ff306dc50b531f19fd6f0f57 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain df8e87e565d293e005a3c21d5ee72db6 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=face89fe7b4787f7a7118717808a901a
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.31 b/metadata/md5-cache/dev-lang/orc-0.4.31
index dd3bc26c23d3..cf1c6256f32a 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.31
+++ b/metadata/md5-cache/dev-lang/orc-0.4.31
@@ -4,10 +4,10 @@ DESCRIPTION=The Oil Runtime Compiler, a just-in-time compiler for array operatio
EAPI=7
HOMEPAGE=https://gstreamer.freedesktop.org/
IUSE=gtk-doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD BSD-2
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://gstreamer.freedesktop.org/src/orc/orc-0.4.31.tar.xz
_eclasses_=meson 71d293a701d6362387e1214da368c848 multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build 8ad5b5535b73a8971881f09277b939f4 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=1737e15bec7c52d220648435dd833806
+_md5_=90a09f07dec597ac70067a7045e5fe36
diff --git a/metadata/md5-cache/dev-lang/python-3.6.11-r2 b/metadata/md5-cache/dev-lang/python-3.6.11-r2
index ee026cc76f8c..bf4bb6b97ed5 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.11-r2
+++ b/metadata/md5-cache/dev-lang/python-3.6.11-r2
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1
RESTRICT=!test? ( test )
SLOT=3.6/3.6m
SRC_URI=https://www.python.org/ftp/python/3.6.11/Python-3.6.11.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.11-r3.tar.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=bca424de98ea86ccd621bfd25d5bff73
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=98d590dba7ed57ab9cb2150ba88b77c7
diff --git a/metadata/md5-cache/dev-lang/python-3.6.12 b/metadata/md5-cache/dev-lang/python-3.6.12
new file mode 100644
index 000000000000..b7ba0683cb33
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.6.12
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/
+IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=PSF-2
+PDEPEND=>=app-eselect/eselect-python-20140125-r1
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.6/3.6m
+SRC_URI=https://www.python.org/ftp/python/3.6.12/Python-3.6.12.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.12.tar.xz
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=88a38bded27a83eef728ce7064311de2
diff --git a/metadata/md5-cache/dev-lang/python-3.7.8-r2 b/metadata/md5-cache/dev-lang/python-3.7.8-r2
index fc839708e22a..12cf58716781 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.8-r2
+++ b/metadata/md5-cache/dev-lang/python-3.7.8-r2
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
RESTRICT=!test? ( test )
SLOT=3.7/3.7m
SRC_URI=https://www.python.org/ftp/python/3.7.8/Python-3.7.8.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.8-r3.tar.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=859d67e9f0b33e7f425364e4b6f4e890
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=a898012976eb768ec3e910b7e1d092e9
diff --git a/metadata/md5-cache/dev-lang/python-3.9.0_beta4-r1 b/metadata/md5-cache/dev-lang/python-3.7.9
similarity index 70%
rename from metadata/md5-cache/dev-lang/python-3.9.0_beta4-r1
rename to metadata/md5-cache/dev-lang/python-3.7.9
index 8a5decc35e25..f7bc9479c805 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.0_beta4-r1
+++ b/metadata/md5-cache/dev-lang/python-3.7.9
@@ -1,5 +1,5 @@
BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
-DEFINED_PHASES=compile configure install prepare pretend setup test
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
DESCRIPTION=An interpreted, interactive, object-oriented programming language
EAPI=7
@@ -10,7 +10,7 @@ LICENSE=PSF-2
PDEPEND=>=app-eselect/eselect-python-20140125-r1
RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
RESTRICT=!test? ( test )
-SLOT=3.9
-SRC_URI=https://www.python.org/ftp/python/3.9.0/Python-3.9.0b4.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.0b4.tar.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 check-reqs 7e3fd1855a5e1b50bb9e80827b3f672d eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=f726725e653807294cdd977e3baa433b
+SLOT=3.7/3.7m
+SRC_URI=https://www.python.org/ftp/python/3.7.9/Python-3.7.9.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.9.tar.xz
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=1aaff948af45cdcb3904a0e26bdb57d2
diff --git a/metadata/md5-cache/dev-lang/python-3.8.5 b/metadata/md5-cache/dev-lang/python-3.8.5
index cd5ffca2f117..07672ebaee14 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.5
+++ b/metadata/md5-cache/dev-lang/python-3.8.5
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
RESTRICT=!test? ( test )
SLOT=3.8
SRC_URI=https://www.python.org/ftp/python/3.8.5/Python-3.8.5.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.5.tar.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=258430c3897b82caeea0ff524253ce4a
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=a5af17ef1ff739068533bc5502448fac
diff --git a/metadata/md5-cache/dev-lang/python-3.9.0_beta3 b/metadata/md5-cache/dev-lang/python-3.9.0_beta3
deleted file mode 100644
index bad64f86e361..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.9.0_beta3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-PDEPEND=>=app-eselect/eselect-python-20140125-r1
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.9
-SRC_URI=https://www.python.org/ftp/python/3.9.0/Python-3.9.0b3.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.0b3.tar.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 check-reqs 7e3fd1855a5e1b50bb9e80827b3f672d eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=8b74e543343270b8055ae798825f3bba
diff --git a/metadata/md5-cache/dev-lang/python-3.9.0_beta4 b/metadata/md5-cache/dev-lang/python-3.9.0_beta4
deleted file mode 100644
index 3c8e7fad3782..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.9.0_beta4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-PDEPEND=>=app-eselect/eselect-python-20140125-r1
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.9
-SRC_URI=https://www.python.org/ftp/python/3.9.0/Python-3.9.0b4.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.0b3-r1.tar.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 check-reqs 7e3fd1855a5e1b50bb9e80827b3f672d eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=62b94a1152ec0b1e7a42cbce9d8adaaa
diff --git a/metadata/md5-cache/dev-lang/python-3.9.0_beta5 b/metadata/md5-cache/dev-lang/python-3.9.0_beta5
deleted file mode 100644
index 3f20fab57b81..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.9.0_beta5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-PDEPEND=>=app-eselect/eselect-python-20140125-r1
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.9
-SRC_URI=https://www.python.org/ftp/python/3.9.0/Python-3.9.0b5.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.0b5.tar.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 check-reqs 7e3fd1855a5e1b50bb9e80827b3f672d eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=2ef5abdb9c70f700968328f7a11f9113
diff --git a/metadata/md5-cache/dev-lang/python-3.9.0_rc1 b/metadata/md5-cache/dev-lang/python-3.9.0_rc1
index 6adb17f2a559..8e5a3b47bc3f 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.0_rc1
+++ b/metadata/md5-cache/dev-lang/python-3.9.0_rc1
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
RESTRICT=!test? ( test )
SLOT=3.9
SRC_URI=https://www.python.org/ftp/python/3.9.0/Python-3.9.0rc1.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.0rc1.tar.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 check-reqs 7e3fd1855a5e1b50bb9e80827b3f672d eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=51412a2a31b6b10793c11f62441e2fc1
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 check-reqs 7e3fd1855a5e1b50bb9e80827b3f672d eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=0dcf05ad2d6f4b802716675528e48183
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r9 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r9
index 1ba5ecbd461d..56b4009d8bb6 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r9
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r9
@@ -4,11 +4,11 @@ DESCRIPTION=Stand-alone JavaScript C library
EAPI=6
HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
IUSE=debug minimal static-libs test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 x86 ~x64-macos
LICENSE=NPL-1.1
RDEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc )
RESTRICT=!test? ( test )
SLOT=0/mozjs185
SRC_URI=https://archive.mozilla.org/pub/js/js185-1.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot0-patches-02.tar.xz
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 estack 686eaab303305a908fd57b2fd7617800 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-any-r1 54a3178500786b0a7ede4a23b7f2a6ad python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb versionator 2352c3fc97241f6a02042773c8287748
-_md5_=04ea6dd0ec7ef994d698d404d8113447
+_md5_=2a290cf6e8ce8a2f5f2eb5e2ffdda3c9
diff --git a/metadata/md5-cache/dev-lang/yasm-1.2.0-r1 b/metadata/md5-cache/dev-lang/yasm-1.2.0-r1
deleted file mode 100644
index 47fbdd08af82..000000000000
--- a/metadata/md5-cache/dev-lang/yasm-1.2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare test
-DEPEND=nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nls? ( sys-devel/gettext ) python? ( >=dev-python/cython-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An assembler for x86 and x86_64 instruction sets
-EAPI=5
-HOMEPAGE=http://yasm.tortall.net/
-IUSE=nls python python_targets_python2_7
-KEYWORDS=-* amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )
-RDEPEND=nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz mirror://gentoo/yasm-1.2.0-x32.patch.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=401688f7fc7ff2aa5f0e1dc30dfd684b
diff --git a/metadata/md5-cache/dev-lang/yasm-1.3.0-r1 b/metadata/md5-cache/dev-lang/yasm-1.3.0-r1
new file mode 100644
index 000000000000..2f8564ea1d21
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/yasm-1.3.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure prepare test
+DEPEND=nls? ( virtual/libintl )
+DESCRIPTION=An assembler for x86 and x86_64 instruction sets
+EAPI=7
+HOMEPAGE=http://yasm.tortall.net/
+IUSE=nls
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )
+RDEPEND=nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz
+_eclasses_=multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=6103cfbb2789ab679d6ee65efd09e2a3
diff --git a/metadata/md5-cache/dev-lang/yasm-9999 b/metadata/md5-cache/dev-lang/yasm-9999
index 7add893e3476..3fe0bf503f3d 100644
--- a/metadata/md5-cache/dev-lang/yasm-9999
+++ b/metadata/md5-cache/dev-lang/yasm-9999
@@ -1,14 +1,13 @@
-BDEPEND=nls? ( sys-devel/gettext ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( >=dev-python/cython-0.14[python_targets_python2_7(-)] ) ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure prepare setup test unpack
+BDEPEND=nls? ( sys-devel/gettext ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 dev-lang/python >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure prepare test unpack
DEPEND=nls? ( virtual/libintl )
DESCRIPTION=An assembler for x86 and x86_64 instruction sets
EAPI=7
HOMEPAGE=http://yasm.tortall.net/
-IUSE=nls python +python_single_target_python2_7
+IUSE=nls
LICENSE=BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )
PROPERTIES=live
-RDEPEND=nls? ( virtual/libintl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
+RDEPEND=nls? ( virtual/libintl )
SLOT=0
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 git-r3 8ec5b53812bce105ae7943930e4660f8 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=70e09e0cb5c37a4da4eb0c9d7daf2313
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 git-r3 8ec5b53812bce105ae7943930e4660f8 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=6103cfbb2789ab679d6ee65efd09e2a3
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index b682540a4d4f..57d84afeb962 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/apr-1.7.0-r1 b/metadata/md5-cache/dev-libs/apr-1.7.0-r1
index 7e5d640eabdd..8dc204e1f541 100644
--- a/metadata/md5-cache/dev-libs/apr-1.7.0-r1
+++ b/metadata/md5-cache/dev-libs/apr-1.7.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Apache Portable Runtime Library
EAPI=7
HOMEPAGE=https://apr.apache.org/
IUSE=doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) selinux? ( sec-policy/selinux-base-policy )
SLOT=1/1.7
SRC_URI=mirror://apache/apr/apr-1.7.0.tar.bz2
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=5f489050749d0467ab6fd4cdf37f4384
+_md5_=3144fdb30645e05d7837e4ecd43ea8ee
diff --git a/metadata/md5-cache/dev-libs/botan-2.15.0 b/metadata/md5-cache/dev-libs/botan-2.15.0
index f7fc4221e902..f6f0fd7492aa 100644
--- a/metadata/md5-cache/dev-libs/botan-2.15.0
+++ b/metadata/md5-cache/dev-libs/botan-2.15.0
@@ -5,11 +5,11 @@ DESCRIPTION=C++ crypto library
EAPI=7
HOMEPAGE=https://botan.randombit.net/
IUSE=bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-macos
+KEYWORDS=amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-macos
LICENSE=BSD-2
RDEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
SLOT=2/2.15
SRC_URI=https://botan.randombit.net/releases/Botan-2.15.0.tar.xz
_eclasses_=multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=bc3cd3bc82618263de67c6c3d2fee744
+_md5_=783d2bebf212dd49d1740707c6c0ac1a
diff --git a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14-r1 b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14-r2
similarity index 69%
rename from metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14-r1
rename to metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14-r2
index 967786a4f901..c213307e0861 100644
--- a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14-r1
+++ b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14-r2
@@ -1,14 +1,14 @@
BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup
+DEFINED_PHASES=compile configure install prepare
DEPEND=sys-apps/pcsc-lite usb? ( virtual/libusb:1 ) udev? ( virtual/udev ) xml? ( dev-libs/libxml2:2= )
DESCRIPTION=REINER SCT cyberJack USB chipcard reader user space driver
EAPI=7
HOMEPAGE=https://www.reiner-sct.de/
-IUSE=static-libs threads tools +udev +usb xml kernel_linux
+IUSE=static-libs threads tools +udev +usb xml
KEYWORDS=amd64 x86
LICENSE=GPL-2+ LGPL-2.1+
RDEPEND=sys-apps/pcsc-lite usb? ( virtual/libusb:1 ) udev? ( virtual/udev ) xml? ( dev-libs/libxml2:2= )
SLOT=0
SRC_URI=https://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP14/pcsc-cyberjack_3.99.5final.SP14.tar.gz -> pcsc-cyberjack_3.99.5final.SP14.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6
-_md5_=e4ab119839f2493272edd7cec5bdeae6
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6
+_md5_=5334e087e24d64b7cbb94fbba7053a79
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
index 07a667a266bf..b330c87c1967 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
@@ -5,11 +5,11 @@ DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
EAPI=7
HOMEPAGE=https://www.cyrusimap.org/sasl/
IUSE=authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 elibc_FreeBSD java
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD-with-attribution
RDEPEND=net-mail/mailbase virtual/libcrypt:= authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mysql? ( dev-db/mysql-connector-c:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( >=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jdk-1.6:= ) selinux? ( sec-policy/selinux-sasl ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=ldapdb? ( openldap )
SLOT=2
SRC_URI=https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.27/cyrus-sasl-2.1.27.tar.gz
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 db-use 501a5d0963e0d17f30260023f292ae8e eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 16d46032afaca1d6d0621f82084880cb libtool f143db5a74ccd9ca28c1234deffede96 multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build 8ad5b5535b73a8971881f09277b939f4 multilib-minimal 8bddda43703ba94d8341f4e247f97566 pam a1771fc1e5831c201eaf18451747d94b systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=f3bf71573b2ca746f08326bc3013f93e
+_md5_=cb8934894ad44cf6ae460a1fa6eb7dc2
diff --git a/metadata/md5-cache/dev-libs/glib-2.64.4 b/metadata/md5-cache/dev-libs/glib-2.64.4
index 1625d3ca03da..36d0e25d08c8 100644
--- a/metadata/md5-cache/dev-libs/glib-2.64.4
+++ b/metadata/md5-cache/dev-libs/glib-2.64.4
@@ -5,7 +5,7 @@ DESCRIPTION=The GLib library of C routines
EAPI=7
HOMEPAGE=https://www.gtk.org/
IUSE=dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1+
PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
RDEPEND=!=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !kernel_Winnt? ( virtual/libelf:0= ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=2
SRC_URI=mirror://gnome/sources/glib/2.64/glib-2.64.4.tar.xz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2-utils 893e828f0f25f070f0b38d20c83c7670 linux-info c90a203b1c14cfa77bd3e37a0e96c955 meson 71d293a701d6362387e1214da368c848 multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build 8ad5b5535b73a8971881f09277b939f4 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 54a3178500786b0a7ede4a23b7f2a6ad python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=b4a09e61f25854b1e0ef8cbf4ffbe915
+_md5_=ac3ae28d5d059b7c258fac9909fe6e8b
diff --git a/metadata/md5-cache/dev-libs/glib-2.64.5 b/metadata/md5-cache/dev-libs/glib-2.64.5
new file mode 100644
index 000000000000..beb4a6fa8218
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/glib-2.64.5
@@ -0,0 +1,16 @@
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.8 gtk-doc? ( >=dev-util/gtk-doc-1.32-r2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) systemtap? ( >=dev-util/systemtap-1.3 ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=!=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !kernel_Winnt? ( virtual/libelf:0= ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=The GLib library of C routines
+EAPI=7
+HOMEPAGE=https://www.gtk.org/
+IUSE=dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1+
+PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
+RDEPEND=!=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !kernel_Winnt? ( virtual/libelf:0= ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gnome/sources/glib/2.64/glib-2.64.5.tar.xz
+_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2-utils 893e828f0f25f070f0b38d20c83c7670 linux-info c90a203b1c14cfa77bd3e37a0e96c955 meson 71d293a701d6362387e1214da368c848 multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build 8ad5b5535b73a8971881f09277b939f4 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 54a3178500786b0a7ede4a23b7f2a6ad python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=04bf2b4285e0adeaf79aa14c2b9212e5
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.64.1-r1 b/metadata/md5-cache/dev-libs/gobject-introspection-1.64.1-r1
index c8ac101b6ea8..085f82974590 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.64.1-r1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.64.1-r1
@@ -1,6 +1,6 @@
BDEPEND=app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/gobject-introspection-common-1.64.1 >=dev-libs/glib-2.58.0:2 dev-libs/libffi:= doctool? ( python_single_target_python3_6? ( dev-python/mako[python_targets_python3_6(-)] dev-python/markdown[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ) virtual/pkgconfig python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) gtk-doc? ( >=dev-util/gtk-doc-1.19 app-text/docbook-xml-dtd:4.3 app-text/docbook-xml-dtd:4.5 ) sys-devel/bison sys-devel/flex test? ( x11-libs/cairo[glib] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/gobject-introspection-common-1.64.1 >=dev-libs/glib-2.58.0:2 dev-libs/libffi:= doctool? ( python_single_target_python3_6? ( dev-python/mako[python_targets_python3_6(-)] dev-python/markdown[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ) virtual/pkgconfig python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) gtk-doc? ( >=dev-util/gtk-doc-1.19 app-text/docbook-xml-dtd:4.3 app-text/docbook-xml-dtd:4.5 ) sys-devel/bison sys-devel/flex test? ( x11-libs/cairo[glib] python_single_target_python3_6? ( dev-python/mako[python_targets_python3_6(-)] dev-python/markdown[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Introspection system for GObject-based libraries
EAPI=7
HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://gnome/sources/gobject-introspection/1.64/gobject-introspection-1.64.1.tar.xz
_eclasses_=gnome.org 532d56d07b9eace4831aaa817d2b756a meson 71d293a701d6362387e1214da368c848 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c342edc1756b10af2f5b1501e27c063
+_md5_=ab7b05592a9364cc4344ebba530d6b1f
diff --git a/metadata/md5-cache/dev-libs/libebml-1.4.0 b/metadata/md5-cache/dev-libs/libebml-1.4.0
index 55be9eeb7d18..40ef559a7cc5 100644
--- a/metadata/md5-cache/dev-libs/libebml-1.4.0
+++ b/metadata/md5-cache/dev-libs/libebml-1.4.0
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=Extensible binary format library (kinda like XML)
EAPI=7
HOMEPAGE=https://www.matroska.org/ https://github.com/Matroska-Org/libebml/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=LGPL-2.1
SLOT=0/5
SRC_URI=https://dl.matroska.org/downloads/libebml/libebml-1.4.0.tar.xz
_eclasses_=cmake f274d2f953f93e2d88cd3e0b2ce376a9 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=785e649f8c86f6885cadeaec1788e03e
+_md5_=46db24970a2384cb1007c3a4177efdad
diff --git a/metadata/md5-cache/dev-libs/libfmt-7.0.3 b/metadata/md5-cache/dev-libs/libfmt-7.0.3
index 4d0ce464c8d8..8655d94ad070 100644
--- a/metadata/md5-cache/dev-libs/libfmt-7.0.3
+++ b/metadata/md5-cache/dev-libs/libfmt-7.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=Small, safe and fast formatting library
EAPI=7
HOMEPAGE=https://github.com/fmtlib/fmt
IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
LICENSE=MIT
RESTRICT=!test? ( test )
SLOT=0/7
SRC_URI=https://github.com/fmtlib/fmt/archive/7.0.3.tar.gz -> libfmt-7.0.3.tar.gz
_eclasses_=cmake f274d2f953f93e2d88cd3e0b2ce376a9 cmake-multilib b396704c8c04bb210b7b45dff5c67fea eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build 8ad5b5535b73a8971881f09277b939f4 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=2dbbbb6686d553283c1d5bee45436f26
+_md5_=897ced096e4f2e44be6b31b127541d5a
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.38 b/metadata/md5-cache/dev-libs/libgpg-error-1.38
index 7657d8e52679..d6e5c7499538 100644
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.38
+++ b/metadata/md5-cache/dev-libs/libgpg-error-1.38
@@ -5,10 +5,10 @@ DESCRIPTION=Contains error handling functions used by GnuPG software
EAPI=7
HOMEPAGE=http://www.gnupg.org/related_software/libgpg-error
IUSE=common-lisp nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2 LGPL-2.1
RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0
SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.38.tar.bz2 https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob_plain;f=src/gen-lock-obj.sh;hb=libgpg-error-1.38 -> gen-lock-obj-1.38.sh
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build 8ad5b5535b73a8971881f09277b939f4 multilib-minimal 8bddda43703ba94d8341f4e247f97566 prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=621be01bc0e5f088badb41638f7fd061
+_md5_=c5a709a7968c7511ac0d098006a090eb
diff --git a/metadata/md5-cache/dev-libs/liblouis-3.13.0 b/metadata/md5-cache/dev-libs/liblouis-3.13.0
index 3fca7533ad03..41f6c05f295e 100644
--- a/metadata/md5-cache/dev-libs/liblouis-3.13.0
+++ b/metadata/md5-cache/dev-libs/liblouis-3.13.0
@@ -5,7 +5,7 @@ DESCRIPTION=An open-source braille translator and back-translator
EAPI=7
HOMEPAGE=https://github.com/liblouis/liblouis
IUSE=python test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86
LICENSE=LGPL-2.1+
RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0/20
SRC_URI=https://github.com/liblouis/liblouis/releases/download/v3.13.0/liblouis-3.13.0.tar.gz
_eclasses_=distutils-r1 eb92d1a6d9057e2422cc9610f79f919c multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=6436e9263df18dd4ef5c277016ee7a1e
+_md5_=8481cfb02e622871a390f870e5b640e8
diff --git a/metadata/md5-cache/dev-libs/libmateweather-1.22.0-r1 b/metadata/md5-cache/dev-libs/libmateweather-1.22.0-r1
index c1abc484e519..989edd11e5fc 100644
--- a/metadata/md5-cache/dev-libs/libmateweather-1.22.0-r1
+++ b/metadata/md5-cache/dev-libs/libmateweather-1.22.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.34:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 >=x11-libs/gtk+-3.22:3
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/libmateweather-1.22.0.tar.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate d3e8bf8e7ba75eb2a344574e81344eca mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=c8c30aedca4698c4eb89fde504d62ae1
diff --git a/metadata/md5-cache/dev-libs/libmateweather-1.22.1 b/metadata/md5-cache/dev-libs/libmateweather-1.22.1
index 970b18943f0d..48261e4f24f9 100644
--- a/metadata/md5-cache/dev-libs/libmateweather-1.22.1
+++ b/metadata/md5-cache/dev-libs/libmateweather-1.22.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.34:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 >=x11-libs/gtk+-3.22:3
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/libmateweather-1.22.1.tar.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate d3e8bf8e7ba75eb2a344574e81344eca mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=82be01e398f3ed39edf73b545d03d2bc
diff --git a/metadata/md5-cache/dev-libs/libmateweather-1.24.0 b/metadata/md5-cache/dev-libs/libmateweather-1.24.0
index 2d38868ac4f2..bfedac37458b 100644
--- a/metadata/md5-cache/dev-libs/libmateweather-1.24.0
+++ b/metadata/md5-cache/dev-libs/libmateweather-1.24.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.54:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 virtual/libintl
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.24/libmateweather-1.24.0.tar.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate d3e8bf8e7ba75eb2a344574e81344eca mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=6229e83e5a3bdc22b4fbba7fb4389d1d
diff --git a/metadata/md5-cache/dev-libs/libmateweather-1.24.0-r1 b/metadata/md5-cache/dev-libs/libmateweather-1.24.0-r1
index b441ae39d43e..9d254756f18d 100644
--- a/metadata/md5-cache/dev-libs/libmateweather-1.24.0-r1
+++ b/metadata/md5-cache/dev-libs/libmateweather-1.24.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.54:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 virtual/libintl
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.24/libmateweather-1.24.0.tar.xz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate d3e8bf8e7ba75eb2a344574e81344eca mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=5f97d0735b94a6027109a64ebfcefda4
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.44 b/metadata/md5-cache/dev-libs/libpcre-8.44
index 6b0ea577e55c..8e5a059a43c9 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.44
+++ b/metadata/md5-cache/dev-libs/libpcre-8.44
@@ -5,11 +5,11 @@ DESCRIPTION=Perl-compatible regular expression library
EAPI=7
HOMEPAGE=http://www.pcre.org/
IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=BSD
RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= )
REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
SLOT=3
SRC_URI=mirror://sourceforge/pcre/pcre-8.44.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.44.tar.bz2
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build 8ad5b5535b73a8971881f09277b939f4 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb usr-ldscript 7c918d239d0f9098867d0c8e33348fc9
-_md5_=21cbedc2305ae72d76b5591e477fe7d9
+_md5_=4d87f3f10ea3d9dd98d4b456bca73c24
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.35 b/metadata/md5-cache/dev-libs/libpcre2-10.35
index b06fe26de548..43c9e383b348 100644
--- a/metadata/md5-cache/dev-libs/libpcre2-10.35
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.35
@@ -5,11 +5,11 @@ DESCRIPTION=Perl-compatible regular expression library
EAPI=7
HOMEPAGE=https://www.pcre.org/
IUSE=bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=bzip2? ( app-arch/bzip2 ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) zlib? ( sys-libs/zlib )
REQUIRED_USE=?? ( libedit readline )
SLOT=0
SRC_URI=mirror://sourceforge/pcre/pcre2-10.35.tar.bz2 https://ftp.pcre.org/pub/pcre/pcre2-10.35.tar.bz2 https://dev.gentoo.org/~whissi/dist/libpcre2/libpcre2-10.34-patchset-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/libpcre2-10.34-patchset-01.tar.xz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 libtool f143db5a74ccd9ca28c1234deffede96 multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build 8ad5b5535b73a8971881f09277b939f4 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb usr-ldscript 7c918d239d0f9098867d0c8e33348fc9
-_md5_=a823c8d3402ea01d9adf62493efd56d5
+_md5_=e42c3cb967064bf55d9b2e46ef70859b
diff --git a/metadata/md5-cache/dev-libs/libspt-1.1-r4 b/metadata/md5-cache/dev-libs/libspt-1.1-r4
index 82085e11f57f..bf72e30c094c 100644
--- a/metadata/md5-cache/dev-libs/libspt-1.1-r4
+++ b/metadata/md5-cache/dev-libs/libspt-1.1-r4
@@ -5,11 +5,11 @@ DESCRIPTION=Library for handling root privilege
EAPI=7
HOMEPAGE=http://www.j10n.org/libspt/
IUSE=suid
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
LICENSE=BSD-2
RDEPEND=net-libs/libtirpc
RESTRICT=test
SLOT=0
SRC_URI=http://www.j10n.org/libspt/libspt-1.1.tar.bz2
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=d1bf996794f790ad9c69fc1c23464652
+_md5_=53d9a039baa32768e7c8a3cac730c18b
diff --git a/metadata/md5-cache/dev-libs/libtommath-1.2.0 b/metadata/md5-cache/dev-libs/libtommath-1.2.0
index be14a8a3f50c..5ee004c34c38 100644
--- a/metadata/md5-cache/dev-libs/libtommath-1.2.0
+++ b/metadata/md5-cache/dev-libs/libtommath-1.2.0
@@ -2,11 +2,11 @@ BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16
DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=Optimized and portable routines for integer theoretic applications
EAPI=7
-HOMEPAGE=http://www.libtom.net/
+HOMEPAGE=https://www.libtom.net/
IUSE=doc examples static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=Unlicense
SLOT=0
SRC_URI=https://github.com/libtom/libtommath/releases/download/v1.2.0/ltm-1.2.0.tar.xz
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=eb0b8ac05d33eda32f9ccd06be26a330
+_md5_=8d0a1047e50c8acbd81ea1292e0f7ba5
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.1.12 b/metadata/md5-cache/dev-libs/libxmlb-0.1.12
deleted file mode 100644
index 29059cbf1bc7..000000000000
--- a/metadata/md5-cache/dev-libs/libxmlb-0.1.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/meson-0.47.0 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.7 dev-python/setuptools[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/setuptools[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install setup test
-DEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer ) doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection )
-DESCRIPTION=Library to help create and query binary XML blobs
-EAPI=7
-HOMEPAGE=https://github.com/hughsie/libxmlb
-IUSE=doc introspection stemmer test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hughsie/libxmlb/archive/0.1.12.tar.gz -> libxmlb-0.1.12.tar.gz
-_eclasses_=meson 71d293a701d6362387e1214da368c848 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 54a3178500786b0a7ede4a23b7f2a6ad python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=9356a2573f7beda0e5b5ee04402f9d92
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.1.14 b/metadata/md5-cache/dev-libs/libxmlb-0.2.0
similarity index 90%
rename from metadata/md5-cache/dev-libs/libxmlb-0.1.14
rename to metadata/md5-cache/dev-libs/libxmlb-0.2.0
index 940de6d15e3e..5451e7e962f7 100644
--- a/metadata/md5-cache/dev-libs/libxmlb-0.1.14
+++ b/metadata/md5-cache/dev-libs/libxmlb-0.2.0
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=LGPL-2.1+
RDEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer )
RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hughsie/libxmlb/archive/0.1.14.tar.gz -> libxmlb-0.1.14.tar.gz
+SLOT=0/2
+SRC_URI=https://github.com/hughsie/libxmlb/archive/0.2.0.tar.gz -> libxmlb-0.2.0.tar.gz
_eclasses_=meson 71d293a701d6362387e1214da368c848 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 54a3178500786b0a7ede4a23b7f2a6ad python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=a384f01331e0f33a5ddf00610fcdf9f6
+_md5_=18a8d9f24ad031b8ab5c00849fcc0134
diff --git a/metadata/md5-cache/dev-libs/mpc-1.2.0 b/metadata/md5-cache/dev-libs/mpc-1.2.0
new file mode 100644
index 000000000000..a5caeef647d0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/mpc-1.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/gmp-5.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-4.1.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
+DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
+EAPI=7
+HOMEPAGE=http://mpc.multiprecision.org/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/gmp-5.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-4.1.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
+SLOT=0/3
+SRC_URI=mirror://gnu/mpc/mpc-1.2.0.tar.gz
+_eclasses_=multibuild b2c915190b051f55a23b9354b9849847 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build 8ad5b5535b73a8971881f09277b939f4 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=34dde96e273d5653ee4544fa64b2f615
diff --git a/metadata/md5-cache/dev-libs/npth-1.6-r1 b/metadata/md5-cache/dev-libs/npth-1.6-r1
index 3c224cfe5e06..bf06c1c28fb2 100644
--- a/metadata/md5-cache/dev-libs/npth-1.6-r1
+++ b/metadata/md5-cache/dev-libs/npth-1.6-r1
@@ -4,9 +4,9 @@ DESCRIPTION=New GNU Portable Threads Library
EAPI=7
HOMEPAGE=https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git
IUSE=static-libs
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=LGPL-2.1+
SLOT=0
SRC_URI=mirror://gnupg/npth/npth-1.6.tar.bz2
_eclasses_=libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=9a0c8d34a42262bb994003faf6d8ed88
+_md5_=35166370a2b1ce184d7002e52155dbfd
diff --git a/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r1 b/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r1
index db34bb37dd9c..5dd1e29146b9 100644
--- a/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r1
+++ b/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Language bindings for Redland
EAPI=7
HOMEPAGE=http://librdf.org/bindings/
IUSE=lua perl python php ruby test php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-linux
LICENSE=Apache-2.0 GPL-2 LGPL-2.1
RDEPEND=>=dev-libs/redland-1.0.14 lua? ( >=dev-lang/lua-5.1 ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ruby? ( dev-lang/ruby dev-ruby/log4r ) php? ( php_targets_php7-2? ( dev-lang/php:7.2[-threads] ) php_targets_php7-3? ( dev-lang/php:7.3[-threads] ) php_targets_php7-4? ( dev-lang/php:7.4[-threads] ) ) php? ( php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) php? ( || ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://download.librdf.org/source/redland-bindings-1.0.17.1.tar.gz
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 php-ext-source-r3 a700d476900e6b3556f80fe0655c4303 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=ef116779e9b39d4cf494127f3de665c7
+_md5_=7d11896554f35636d73dfb287eb1f284
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.7.0 b/metadata/md5-cache/dev-libs/spdlog-1.7.0
index ca01bd525808..7e7ca45f35c3 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.7.0
+++ b/metadata/md5-cache/dev-libs/spdlog-1.7.0
@@ -5,11 +5,11 @@ DESCRIPTION=Very fast, header only, C++ logging library
EAPI=7
HOMEPAGE=https://github.com/gabime/spdlog
IUSE=test
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
LICENSE=MIT
RDEPEND=>=dev-libs/libfmt-6.1.2:=
RESTRICT=!test? ( test )
SLOT=0/1
SRC_URI=https://github.com/gabime/spdlog/archive/v1.7.0.tar.gz -> spdlog-1.7.0.tar.gz
_eclasses_=cmake f274d2f953f93e2d88cd3e0b2ce376a9 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=44ddc4d7fd7d8673b3c71f14839ee097
+_md5_=a3ae381456c46ca8bb8e84e00eab0b0f
diff --git a/metadata/md5-cache/dev-libs/xerces-c-3.2.3 b/metadata/md5-cache/dev-libs/xerces-c-3.2.3
index 0849e5f730e5..d3df5d6136c6 100644
--- a/metadata/md5-cache/dev-libs/xerces-c-3.2.3
+++ b/metadata/md5-cache/dev-libs/xerces-c-3.2.3
@@ -4,11 +4,11 @@ DESCRIPTION=A validating XML parser written in a portable subset of C++
EAPI=6
HOMEPAGE=https://xerces.apache.org/xerces-c/
IUSE=cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=Apache-2.0
RDEPEND=icu? ( dev-libs/icu:0= ) curl? ( net-misc/curl ) virtual/libiconv
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://apache/xerces/c/3/sources/xerces-c-3.2.3.tar.gz
_eclasses_=cmake-utils 77cd39e6009811bf97a59d91ffd5b54f desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=eff53eab05d9ecd8c74b385b7090fa59
+_md5_=216f903b94bb60ebd3274d312f28a4e2
diff --git a/metadata/md5-cache/dev-libs/xmlsec-1.2.30 b/metadata/md5-cache/dev-libs/xmlsec-1.2.30
index e4bf151b16fe..2ce763b62204 100644
--- a/metadata/md5-cache/dev-libs/xmlsec-1.2.30
+++ b/metadata/md5-cache/dev-libs/xmlsec-1.2.30
@@ -5,11 +5,11 @@ DESCRIPTION=Command line tool for signing, verifying, encrypting and decrypting
EAPI=7
HOMEPAGE=https://www.aleksey.com/xmlsec
IUSE=doc gcrypt gnutls libressl nss +openssl static-libs test
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~sparc x86
LICENSE=MIT
RDEPEND=>=dev-libs/libxml2-2.7.4:= >=dev-libs/libxslt-1.0.20:= gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= ) gnutls? ( >=net-libs/gnutls-2.8.0:= ) nss? ( >=dev-libs/nspr-4.4.1:= >=dev-libs/nss-3.9:= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
REQUIRED_USE=|| ( gcrypt gnutls nss openssl ) gnutls? ( gcrypt )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.30.tar.gz
-_md5_=c8173bf05292b1b1291ae11a70ed2af8
+_md5_=8352f15e49251a827e0edb6f45630bce
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.71 b/metadata/md5-cache/dev-libs/zziplib-0.13.71
index 614686fe5cc1..6b4f919a28ea 100644
--- a/metadata/md5-cache/dev-libs/zziplib-0.13.71
+++ b/metadata/md5-cache/dev-libs/zziplib-0.13.71
@@ -1,15 +1,15 @@
-BDEPEND=doc? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 ) ) test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 ) app-arch/zip ) dev-util/ninja dev-util/cmake
+BDEPEND=doc? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) app-arch/zip ) dev-util/ninja dev-util/cmake
DEFINED_PHASES=compile configure install prepare setup test
DEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
DESCRIPTION=Lightweight library for extracting data from files archived in a single zip file
EAPI=7
HOMEPAGE=http://zziplib.sourceforge.net/
IUSE=doc sdl static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( LGPL-2.1 MPL-1.1 )
RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/gdraheim/zziplib/archive/v0.13.71.tar.gz -> zziplib-0.13.71.tar.gz
_eclasses_=cmake f274d2f953f93e2d88cd3e0b2ce376a9 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 54a3178500786b0a7ede4a23b7f2a6ad python-utils-r1 bae936266b68e0c374a74f2b0d0aaa44 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=a14857032c88d7964ca6a95f4008af3c
+_md5_=203d7a2abd66fe908088e05605c63643
diff --git a/metadata/md5-cache/dev-perl/Config-General-2.630.0 b/metadata/md5-cache/dev-perl/Config-General-2.630.0
index 862f9f2953d9..62f36b09160a 100644
--- a/metadata/md5-cache/dev-perl/Config-General-2.630.0
+++ b/metadata/md5-cache/dev-perl/Config-General-2.630.0
@@ -4,10 +4,10 @@ DESCRIPTION=Config file parser module
EAPI=6
HOMEPAGE=https://metacpan.org/release/Config-General
IUSE=examples
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=
SLOT=0
SRC_URI=mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.63.tar.gz
_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2c44b243f8b8155dc67b6e31e9af1402
+_md5_=98012ea0abd7af101b2d8b47b325b560
diff --git a/metadata/md5-cache/dev-perl/DBD-MariaDB-1.210.0 b/metadata/md5-cache/dev-perl/DBD-MariaDB-1.210.0
deleted file mode 100644
index 9822f049025f..000000000000
--- a/metadata/md5-cache/dev-perl/DBD-MariaDB-1.210.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/DBI-1.608.0 virtual/perl-XSLoader mysql? ( dev-db/mysql-connector-c:0= ) mariadb? ( dev-db/mariadb-connector-c:0= ) virtual/perl-Data-Dumper >=dev-perl/Devel-CheckLib-1.120.0 virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec virtual/perl-Getopt-Long test? ( !minimal? ( >=dev-perl/Net-SSLeay-1.430.0 dev-perl/Proc-ProcessTable virtual/perl-Storable ) virtual/perl-Encode virtual/perl-File-Temp dev-perl/Test-Deep >=virtual/perl-Test-Harness-3.310.0 >=virtual/perl-Test-Simple-0.900.0 virtual/perl-Time-HiRes virtual/perl-bignum ) dev-lang/perl
-DESCRIPTION=MariaDB and MySQL driver for the Perl5 Database Interface (DBI)
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/DBD-MariaDB
-IUSE=test +mariadb mysql minimal
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/DBI-1.608.0 virtual/perl-XSLoader mysql? ( dev-db/mysql-connector-c:0= ) mariadb? ( dev-db/mariadb-connector-c:0= ) dev-lang/perl:=
-REQUIRED_USE=^^ ( mysql mariadb )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PA/PALI/DBD-MariaDB-1.21.tar.gz
-_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9a12a240017e9ce9ea701163350640eb
diff --git a/metadata/md5-cache/dev-perl/DBD-Pg-3.6.2 b/metadata/md5-cache/dev-perl/DBD-Pg-3.6.2
deleted file mode 100644
index e6e7b27b013e..000000000000
--- a/metadata/md5-cache/dev-perl/DBD-Pg-3.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-version >=dev-perl/DBI-1.614.0 dev-db/postgresql:* virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=PostgreSQL database driver for the DBI module
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/DBD-Pg
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-version >=dev-perl/DBI-1.614.0 dev-db/postgresql:* dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.6.2.tar.gz
-_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7eec0c6775b362c3387f65a9eba8d59e
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r2 b/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r2
deleted file mode 100644
index 3a46bbc1cacf..000000000000
--- a/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/DBI-1.609.0 mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[ssl(+)?] ) virtual/perl-ExtUtils-MakeMaker virtual/perl-Data-Dumper test? ( dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.900.0 virtual/perl-Time-HiRes ) dev-lang/perl
-DESCRIPTION=MySQL driver for the Perl5 Database Interface (DBI)
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/DBD-mysql
-IUSE=mariadb +mysql test +ssl
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/DBI-1.609.0 mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[ssl(+)?] ) dev-lang/perl:=
-REQUIRED_USE=^^ ( mysql mariadb )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.044.tar.gz
-_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6bfbd46ed2ff99e4b64778a809a82484
diff --git a/metadata/md5-cache/dev-perl/DBIx-Simple-1.350.0-r1 b/metadata/md5-cache/dev-perl/DBIx-Simple-1.350.0-r1
deleted file mode 100644
index 4725177b4a06..000000000000
--- a/metadata/md5-cache/dev-perl/DBIx-Simple-1.350.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/DBI-1.210.0 virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=dev-perl/DBD-SQLite-1.0.0 ) ) dev-lang/perl
-DESCRIPTION=Very complete easy-to-use OO interface to DBI
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/DBIx-Simple
-IUSE=test minimal
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( AFL-3.0 AGPL-3 APL-1.0 Apache-2.0 BSD-2 Boost-1.0 CDDL CPAL-1.0 EPL-1.0 ECL-2.0 EUPL-1.1 GPL-2 GPL-3 LGPL-2.1 LGPL-3 HPND IBM IPAfont ISC LPPL-1.3c 9base MIT MPL-2.0 NOSA nethack PHP-3 POSTGRESQL PYTHON CNRI QPL-1.0 OFL-1.1 Sleepycat Watcom-1.0 W3C wxWinLL-3 ZLIB libpng )
-RDEPEND=>=dev-perl/DBI-1.210.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JU/JUERD/DBIx-Simple-1.35.tar.gz
-_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ee2c6344727f8920441e3a045d9e072c
diff --git a/metadata/md5-cache/dev-perl/DB_File-Lock-0.50.0-r1 b/metadata/md5-cache/dev-perl/DB_File-Lock-0.50.0-r1
deleted file mode 100644
index 591da6051e0c..000000000000
--- a/metadata/md5-cache/dev-perl/DB_File-Lock-0.50.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-DB_File dev-lang/perl:=[-build(-)]
-DESCRIPTION=Locking with flock wrapper for DB_File
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/DB_File-Lock
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-DB_File dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DH/DHARRIS/DB_File-Lock-0.05.tar.gz
-_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e2434993a590110839a5739889c4cfa7
diff --git a/metadata/md5-cache/dev-perl/Data-Dump-Streamer-2.400.0 b/metadata/md5-cache/dev-perl/Data-Dump-Streamer-2.400.0
deleted file mode 100644
index 1f886cfce69e..000000000000
--- a/metadata/md5-cache/dev-perl/Data-Dump-Streamer-2.400.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/B-Utils virtual/perl-Data-Dumper virtual/perl-Exporter virtual/perl-IO virtual/perl-IO-Compress virtual/perl-MIME-Base64 virtual/perl-Text-Balanced dev-perl/PadWalker virtual/perl-XSLoader dev-perl/Module-Build virtual/perl-Carp virtual/perl-ExtUtils-CBuilder dev-perl/ExtUtils-Depends test? ( virtual/perl-Test-Simple dev-perl/JSON-XS ) dev-lang/perl
-DESCRIPTION=Accurately serialize a data structure as Perl code
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Data-Dump-Streamer
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/B-Utils virtual/perl-Data-Dumper virtual/perl-Exporter virtual/perl-IO virtual/perl-IO-Compress virtual/perl-MIME-Base64 virtual/perl-Text-Balanced dev-perl/PadWalker virtual/perl-XSLoader dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/Data-Dump-Streamer-2.40.tar.gz
-_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8fe9250840cca467e84c8731e1645e0a
diff --git a/metadata/md5-cache/dev-perl/Data-Serializer-0.600.0-r1 b/metadata/md5-cache/dev-perl/Data-Serializer-0.600.0-r1
deleted file mode 100644
index 05b88fbaf8ee..000000000000
--- a/metadata/md5-cache/dev-perl/Data-Serializer-0.600.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-AutoLoader virtual/perl-Data-Dumper virtual/perl-Digest-SHA virtual/perl-Exporter virtual/perl-File-Spec dev-perl/Module-Build test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Modules that serialize data structures
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Data-Serializer
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-2 )
-RDEPEND=virtual/perl-AutoLoader virtual/perl-Data-Dumper virtual/perl-Digest-SHA virtual/perl-Exporter dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.60.tar.gz
-_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83
-_md5_=19c4dc041236509cdc5399bf0c20d8fa
diff --git a/metadata/md5-cache/dev-perl/Data-Stream-Bulk-0.110.0-r1 b/metadata/md5-cache/dev-perl/Data-Stream-Bulk-0.110.0-r1
deleted file mode 100644
index d4ba47d08262..000000000000
--- a/metadata/md5-cache/dev-perl/Data-Stream-Bulk-0.110.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.31 test? ( dev-perl/Moose dev-perl/Sub-Exporter dev-perl/Path-Class dev-perl/namespace-clean dev-perl/Test-Requires ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=N at a time iteration API
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Data-Stream-Bulk
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Moose dev-perl/Sub-Exporter dev-perl/Path-Class dev-perl/namespace-clean dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Data-Stream-Bulk-0.11.tar.gz
-_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=47b1137c892c00fe6761353d415d0cfc
diff --git a/metadata/md5-cache/dev-perl/Data-URIEncode-0.110.0-r1 b/metadata/md5-cache/dev-perl/Data-URIEncode-0.110.0-r1
deleted file mode 100644
index d5020c9fa568..000000000000
--- a/metadata/md5-cache/dev-perl/Data-URIEncode-0.110.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Allow complex data structures to be encoded using flat URIs
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Data-URIEncode
-KEYWORDS=~amd64 ~x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RH/RHANDOM/Data-URIEncode-0.11.tar.gz
-_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=11a84521a6f105b294ed03bf3590f65f
diff --git a/metadata/md5-cache/dev-perl/DateTime-1.210.0 b/metadata/md5-cache/dev-perl/DateTime-1.210.0
deleted file mode 100644
index acf1f19f0f51..000000000000
--- a/metadata/md5-cache/dev-perl/DateTime-1.210.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp >=dev-perl/DateTime-Locale-0.410.0 >=dev-perl/DateTime-TimeZone-1.740.0 >=dev-perl/Params-Validate-1.30.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny virtual/perl-XSLoader >=dev-perl/Module-Build-0.280.0 test? ( virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec virtual/perl-Storable dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 >=dev-perl/Test-Warnings-0.5.0 ) dev-lang/perl
-DESCRIPTION=A date and time object
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/DateTime
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=Artistic-2
-RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-Locale-0.410.0 >=dev-perl/DateTime-TimeZone-1.740.0 >=dev-perl/Params-Validate-1.30.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny virtual/perl-XSLoader dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.21.tar.gz
-_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83
-_md5_=dff991ad379695bfa9c08268aff8fb83
diff --git a/metadata/md5-cache/dev-perl/DateTime-1.360.0 b/metadata/md5-cache/dev-perl/DateTime-1.360.0
deleted file mode 100644
index b16b36db9f12..000000000000
--- a/metadata/md5-cache/dev-perl/DateTime-1.360.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!<=dev-perl/DateTime-Format-Mail-0.402.0 virtual/perl-Carp >=dev-perl/DateTime-Locale-1.50.0 >=dev-perl/DateTime-TimeZone-2.0.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Params-Validate-1.30.0 virtual/perl-Scalar-List-Utils >=dev-perl/Specio-0.180.0 dev-perl/Try-Tiny virtual/perl-XSLoader >=dev-perl/namespace-autoclean-0.190.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-CPAN-Meta-Requirements >=dev-perl/CPAN-Meta-Check-0.11.0 virtual/perl-File-Spec virtual/perl-Storable dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 >=dev-perl/Test-Warnings-0.5.0 ) dev-lang/perl
-DESCRIPTION=A date and time object
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/DateTime
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=Artistic-2
-RDEPEND=!<=dev-perl/DateTime-Format-Mail-0.402.0 virtual/perl-Carp >=dev-perl/DateTime-Locale-1.50.0 >=dev-perl/DateTime-TimeZone-2.0.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Params-Validate-1.30.0 virtual/perl-Scalar-List-Utils >=dev-perl/Specio-0.180.0 dev-perl/Try-Tiny virtual/perl-XSLoader >=dev-perl/namespace-autoclean-0.190.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.36.tar.gz
-_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2628e3942eaea0f40c5b74a666f712e4
diff --git a/metadata/md5-cache/dev-perl/DateTime-1.420.0 b/metadata/md5-cache/dev-perl/DateTime-1.420.0
deleted file mode 100644
index 46f7e09ccd1a..000000000000
--- a/metadata/md5-cache/dev-perl/DateTime-1.420.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!<=dev-perl/DateTime-Format-Mail-0.402.0 virtual/perl-Carp >=dev-perl/DateTime-Locale-1.60.0 >=dev-perl/DateTime-TimeZone-2.20.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Params-ValidationCompiler-0.130.0 virtual/perl-Scalar-List-Utils >=dev-perl/Specio-0.180.0 dev-perl/Try-Tiny virtual/perl-XSLoader >=dev-perl/namespace-autoclean-0.190.0 virtual/perl-parent virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-CPAN-Meta-Requirements >=dev-perl/CPAN-Meta-Check-0.11.0 virtual/perl-File-Spec virtual/perl-Storable dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 >=dev-perl/Test-Warnings-0.5.0 ) dev-lang/perl
-DESCRIPTION=A date and time object
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/DateTime
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=Artistic-2
-RDEPEND=!<=dev-perl/DateTime-Format-Mail-0.402.0 virtual/perl-Carp >=dev-perl/DateTime-Locale-1.60.0 >=dev-perl/DateTime-TimeZone-2.20.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Params-ValidationCompiler-0.130.0 virtual/perl-Scalar-List-Utils >=dev-perl/Specio-0.180.0 dev-perl/Try-Tiny virtual/perl-XSLoader >=dev-perl/namespace-autoclean-0.190.0 virtual/perl-parent dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.42.tar.gz
-_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e95f95ad21cd08c03489f614aa3c7133
diff --git a/metadata/md5-cache/dev-perl/Exception-Warning-0.40.100-r2 b/metadata/md5-cache/dev-perl/Exception-Warning-0.40.100-r2
new file mode 100644
index 000000000000..8d7f0422af08
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Exception-Warning-0.40.100-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Exception-Base-0.210.0 dev-perl/Module-Build test? ( >=dev-perl/Test-Assert-0.50.0 >=dev-perl/Test-Unit-Lite-0.120.0 virtual/perl-parent ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Module-Build dev-lang/perl
+DESCRIPTION=Convert simple warn into real exception object
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Exception-Warning
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Exception-Base-0.210.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Exception-Warning-0.0401.tar.gz
+_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83
+_md5_=04c42a030c10e49ccfbba61795053b87
diff --git a/metadata/md5-cache/dev-perl/Exporter-Cluster-0.310.0-r2 b/metadata/md5-cache/dev-perl/Exporter-Cluster-0.310.0-r2
new file mode 100644
index 000000000000..3eaa24c23204
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Exporter-Cluster-0.310.0-r2
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Extension for easy multiple module imports
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Exporter-Cluster
+KEYWORDS=~amd64 ~ia64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DH/DHAGEMAN/Exporter-Cluster-0.31.tar.gz
+_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83
+_md5_=32b68d17a892fbe505683431223f6ba7
diff --git a/metadata/md5-cache/dev-perl/Exporter-Tiny-1.2.2 b/metadata/md5-cache/dev-perl/Exporter-Tiny-1.2.2
new file mode 100644
index 000000000000..99ab997d86e6
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Exporter-Tiny-1.2.2
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.170.0 test? ( dev-perl/Test-Fatal dev-perl/Test-Warnings >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=An exporter with the features of Sub::Exporter but only core dependencies
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Exporter-Tiny
+IUSE=test examples
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002002.tar.gz
+_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83
+_md5_=78fc96f6ec5c05b36373634b5570bafc
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-CppGuess-0.140.0 b/metadata/md5-cache/dev-perl/ExtUtils-CppGuess-0.140.0
new file mode 100644
index 000000000000..e7b6804ed0a2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/ExtUtils-CppGuess-0.140.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Capture-Tiny virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Path virtual/perl-Data-Dumper virtual/perl-ExtUtils-Manifest virtual/perl-File-Spec dev-perl/Module-Build >=virtual/perl-Test-Simple-0.880.0 virtual/perl-autodie ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Guess C++ compiler and flags
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/ExtUtils-CppGuess
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Capture-Tiny dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.14.tar.gz
+_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83
+_md5_=82b2ae695835000b622bffadb8593ca0
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-CppGuess-0.210.0 b/metadata/md5-cache/dev-perl/ExtUtils-CppGuess-0.210.0
new file mode 100644
index 000000000000..ce9df3e62d43
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/ExtUtils-CppGuess-0.210.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Capture-Tiny >=virtual/perl-ExtUtils-ParseXS-3.350.0 virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Path virtual/perl-Data-Dumper >=virtual/perl-ExtUtils-CBuilder-0.280.231 virtual/perl-ExtUtils-Manifest dev-perl/Module-Build >=virtual/perl-Test-Simple-0.880.0 virtual/perl-autodie ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Guess C++ compiler and flags
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/ExtUtils-CppGuess
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Capture-Tiny >=virtual/perl-ExtUtils-ParseXS-3.350.0 virtual/perl-File-Spec virtual/perl-File-Temp dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.21.tar.gz
+_eclasses_=multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=71922aa6a457dec056927b9b92658e36
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.800.0 b/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.800.0
new file mode 100644
index 000000000000..dda152db694c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.800.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-IO virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Easily build XS extensions that depend on XS extensions
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/ExtUtils-Depends
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.8000.tar.gz
+_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83
+_md5_=bdaceae1b6a92fc4e35ac5f8fc4759fd
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-F77-1.240.0 b/metadata/md5-cache/dev-perl/ExtUtils-F77-1.240.0
new file mode 100644
index 000000000000..696d8ce47e3e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/ExtUtils-F77-1.240.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-perl/File-Which virtual/perl-Scalar-List-Utils virtual/perl-Text-ParseWords virtual/fortran virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Facilitate use of FORTRAN from Perl/XS code
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/ExtUtils-F77
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/File-Which virtual/perl-Scalar-List-Utils virtual/perl-Text-ParseWords virtual/fortran dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KG/KGB/ExtUtils-F77-1.24.tar.gz
+_eclasses_=multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=abad0db7e0acdf85a89a885cdcbca2dd
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.12.0 b/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.12.0
new file mode 100644
index 000000000000..56d094b8aa9e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.12.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=dev-perl/ExtUtils-Config-0.2.0 virtual/perl-File-Spec virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-File-Spec-0.830.0 virtual/perl-File-Temp virtual/perl-Test-Simple ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Build.PL install path logic made easy
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/ExtUtils-InstallPaths
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=dev-perl/ExtUtils-Config-0.2.0 virtual/perl-File-Spec dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.012.tar.gz
+_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83
+_md5_=700fc5b0b11838fec6b153c75246964d
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index b0fd70dde25b..6fd3ebfc673b 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index aba9816d3a41..d9cd5d4fa4d0 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.2 b/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.2
index 063a900bd032..4c232d9190f8 100644
--- a/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.2
+++ b/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.2
@@ -1,5 +1,5 @@
DEFINED_PHASES=install prepare test
-DEPEND=test? ( app-crypt/gnupg dev-lang/php:*[posix,unicode] dev-php/PEAR-Console_CommandLine dev-php/PEAR-Exception dev-php/phpunit )
+DEPEND=test? ( app-crypt/gnupg dev-lang/php:*[posix,unicode] dev-php/PEAR-Console_CommandLine dev-php/PEAR-Exception =dev-php/PEAR-Text_Wiki-1.2.2_p20170904 dev-php/phpunit )
+DEPEND=test? ( >=dev-php/PEAR-Text_Wiki-1.2.2_p20170904 Text_Wiki_Mediawiki-0.2.0_p20140604.tar.gz
_eclasses_=php-pear-r2 479e8a084e98f4d730da647bba3e589e vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
-_md5_=f10506355cd8debe2ede4ad47afafb1c
+_md5_=a60c8fa33e634993f2bab8de258d94d6
diff --git a/metadata/md5-cache/dev-php/PEAR-VersionControl_SVN-0.5.2_p20180314 b/metadata/md5-cache/dev-php/PEAR-VersionControl_SVN-0.5.2_p20180314
index 5c82d307fda2..b2f5d41f662f 100644
--- a/metadata/md5-cache/dev-php/PEAR-VersionControl_SVN-0.5.2_p20180314
+++ b/metadata/md5-cache/dev-php/PEAR-VersionControl_SVN-0.5.2_p20180314
@@ -1,5 +1,5 @@
DEFINED_PHASES=install postinst postrm prepare test unpack
-DEPEND=test? ( dev-vcs/subversion dev-php/phpunit )
+DEPEND=test? ( dev-vcs/subversion PEAR-VersionControl_SVN-0.5.2_p20180314.tar.gz
_eclasses_=php-pear-r2 479e8a084e98f4d730da647bba3e589e vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
-_md5_=1e9149a1dc2fcd5de39e7f62cc14b077
+_md5_=8eac8158352c469789766acf0a23c1b6
diff --git a/metadata/md5-cache/dev-php/awl-0.61 b/metadata/md5-cache/dev-php/awl-0.61
index 839fec26ee43..13612b20c66c 100644
--- a/metadata/md5-cache/dev-php/awl-0.61
+++ b/metadata/md5-cache/dev-php/awl-0.61
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-php/phpunit )
+BDEPEND=test? ( awl-0.61.tar.xz
-_md5_=98c6c5191ae76e8faa6cda1fd1fdc023
+_md5_=2a2b2685e1915e398d9e6b790237d17e
diff --git a/metadata/md5-cache/dev-php/pecl-imagick-3.4.4 b/metadata/md5-cache/dev-php/pecl-imagick-3.4.4
index 3f4ba662ceff..48a34b80f573 100644
--- a/metadata/md5-cache/dev-php/pecl-imagick-3.4.4
+++ b/metadata/md5-cache/dev-php/pecl-imagick-3.4.4
@@ -1,6 +1,6 @@
BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,truetype] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
+DEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,svg,truetype,xml] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
DESCRIPTION=PHP wrapper for the ImageMagick library
EAPI=7
HOMEPAGE=https://pecl.php.net/imagick https://github.com/mkoppanen/imagick
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://pecl.php.net/get/imagick-3.4.4.tgz
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 a700d476900e6b3556f80fe0655c4303 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=a18ed39485163328bc031271a1691fc0
+_md5_=b06049aac118e4f68071dedbcae5c70f
diff --git a/metadata/md5-cache/dev-php/php-redmine-api-1.5.16 b/metadata/md5-cache/dev-php/php-redmine-api-1.5.16
index 8e15c75434b2..e22153987d00 100644
--- a/metadata/md5-cache/dev-php/php-redmine-api-1.5.16
+++ b/metadata/md5-cache/dev-php/php-redmine-api-1.5.16
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-lang/php:*[curl,json,simplexml] >=dev-php/phpunit-4 )
+BDEPEND=test? ( dev-lang/php:*[curl,json,simplexml] php-redmine-api-1.5.16.tar.gz
-_md5_=9c79d03091ed28a930ae55d703697ceb
+_md5_=f9c686615412b6af9bcaa085157edcba
diff --git a/metadata/md5-cache/dev-php/php-redmine-api-1.5.9 b/metadata/md5-cache/dev-php/php-redmine-api-1.5.9
index 934859cc8a50..43a436ba44e4 100644
--- a/metadata/md5-cache/dev-php/php-redmine-api-1.5.9
+++ b/metadata/md5-cache/dev-php/php-redmine-api-1.5.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=install postinst test
-DEPEND=test? ( dev-lang/php:*[curl,json,simplexml] >=dev-php/phpunit-4 )
+DEPEND=test? ( dev-lang/php:*[curl,json,simplexml] php-redmine-api-1.5.9.tar.gz
-_md5_=3408ad9b986a9bfc31110d9e8d6eea2a
+_md5_=d5f54276b565e90de5ad67c1cc225dfe
diff --git a/metadata/md5-cache/dev-php/phpspec-prophecy-1.10.3 b/metadata/md5-cache/dev-php/phpspec-prophecy-1.10.3-r1
similarity index 92%
rename from metadata/md5-cache/dev-php/phpspec-prophecy-1.10.3
rename to metadata/md5-cache/dev-php/phpspec-prophecy-1.10.3-r1
index 9f3ff2c8fd41..f03048860978 100644
--- a/metadata/md5-cache/dev-php/phpspec-prophecy-1.10.3
+++ b/metadata/md5-cache/dev-php/phpspec-prophecy-1.10.3-r1
@@ -7,4 +7,4 @@ LICENSE=MIT
RDEPEND=dev-php/fedora-autoloader =dev-lang/php-5.6:*
SLOT=0
SRC_URI=https://github.com/phpspec/prophecy/archive/v1.10.3.tar.gz -> phpspec-prophecy-1.10.3.tar.gz
-_md5_=8256ba8f1861881afa5a0368a83a503e
+_md5_=988f2020bdc588e94e5104abb2a213a6
diff --git a/metadata/md5-cache/dev-php/phptal-1.3.1 b/metadata/md5-cache/dev-php/phptal-1.3.1
index 9c1eb50a6a62..2dc0ea69675d 100644
--- a/metadata/md5-cache/dev-php/phptal-1.3.1
+++ b/metadata/md5-cache/dev-php/phptal-1.3.1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile install test
-DEPEND=test? ( dev-lang/php:* dev-php/phpunit )
+DEPEND=test? ( dev-lang/php:*