diff --git a/Manifest.files.gz b/Manifest.files.gz
index 813c28304089..30e90a04bcdf 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index a333d92f8a09..283681ac7c27 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/dev-python/namespace-jaraco/Manifest b/acct-group/postgrey/Manifest
similarity index 100%
rename from dev-python/namespace-jaraco/Manifest
rename to acct-group/postgrey/Manifest
diff --git a/acct-group/postgrey/metadata.xml b/acct-group/postgrey/metadata.xml
new file mode 100644
index 000000000000..6356cbc03fb9
--- /dev/null
+++ b/acct-group/postgrey/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ sam@gentoo.org
+ Sam James
+
+
diff --git a/acct-group/postgrey/postgrey-0.ebuild b/acct-group/postgrey/postgrey-0.ebuild
new file mode 100644
index 000000000000..333c0f29bfd2
--- /dev/null
+++ b/acct-group/postgrey/postgrey-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the postgrey mail daemon"
+ACCT_GROUP_ID=360
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 7df778f09920..d1da5719e674 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/virtual/cdrtools/Manifest b/acct-user/postgrey/Manifest
similarity index 100%
rename from virtual/cdrtools/Manifest
rename to acct-user/postgrey/Manifest
diff --git a/acct-user/postgrey/metadata.xml b/acct-user/postgrey/metadata.xml
new file mode 100644
index 000000000000..6356cbc03fb9
--- /dev/null
+++ b/acct-user/postgrey/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ sam@gentoo.org
+ Sam James
+
+
diff --git a/acct-user/postgrey/postgrey-0.ebuild b/acct-user/postgrey/postgrey-0.ebuild
new file mode 100644
index 000000000000..635b6617c408
--- /dev/null
+++ b/acct-user/postgrey/postgrey-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the postgrey mail daemon"
+ACCT_USER_ID=360
+ACCT_USER_GROUPS=( postgrey )
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 02a3377a900f..5edd49d07544 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index 730ec65accc8..3e5b7a0d5013 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1 +1,2 @@
DIST orca-3.36.5.tar.xz 3578288 BLAKE2B d9711720b7a104bc86c97f1821566dd710f0bd318a5409fc5bd5624e7f35a81e9cd0a3d9fd1337c58b09d1ed8fe1c9eeb5b0822e45f7a711a44405bcb8f54db6 SHA512 87756ab5ea962c715f1a00ba80a30cf2e812bab87cf6f13b437b45b39bb763b684fe69b8847a3ed543c398f79a4d2d3ed33b61f88414f432b473c0892453a4f0
+DIST orca-3.36.6.tar.xz 3465112 BLAKE2B 227610b5a01027c292cf9a99ecc54f76ad6053d6923325825ed5f81183b39e1e38e70e7a7d88561f0b0c4d212f16465542d57bf4aeed2fa893b8893fa1d3dd49 SHA512 be2752267d46077310eccc4d76dc5e87ce8e1715cc33ff6f8f15b83c9891a2ba98a2d681f893c88df5b0c5ffd8a1ebadc3a4286debf0ff14ba17803d20f902db
diff --git a/app-accessibility/orca/orca-3.36.6.ebuild b/app-accessibility/orca/orca-3.36.6.ebuild
new file mode 100644
index 000000000000..7e5ba2f05844
--- /dev/null
+++ b/app-accessibility/orca/orca-3.36.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Extensible screen reader that provides access to the desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="+braille"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=app-accessibility/at-spi2-atk-2.34:2
+ >=app-accessibility/at-spi2-core-2.36:2[introspection]
+ >=dev-libs/atk-2.36
+ >=dev-libs/glib-2.28:2
+ media-libs/gstreamer:1.0[introspection]
+ >=x11-libs/gtk+-3.6.2:3[introspection]
+ $(python_gen_cond_dep '
+ dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pygobject-3.18:3[${PYTHON_MULTI_USEDEP}]
+ ')
+ braille? (
+ $(python_gen_cond_dep '
+ >=app-accessibility/brltty-5.0-r3[python,${PYTHON_MULTI_USEDEP}]
+ dev-libs/liblouis[python,${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ dev-libs/atk[introspection]
+ $(python_gen_cond_dep '
+ >=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pyatspi-2.36[${PYTHON_MULTI_USEDEP}]
+ dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+ ')
+ x11-libs/libwnck:3[introspection]
+ x11-libs/pango[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+# app-text/yelp-tools
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_with braille liblouis)
+}
+
+src_install() {
+ gnome2_src_install
+ python_optimize
+}
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2ef96199f3bf..4690015cc5d6 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible/ansible-2.10.4.ebuild b/app-admin/ansible/ansible-2.10.4.ebuild
index 86e5af4dd8f5..cfb7d42b3a3d 100644
--- a/app-admin/ansible/ansible-2.10.4.ebuild
+++ b/app-admin/ansible/ansible-2.10.4.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="GPL-3"
SLOT="0"
-IUSE="doc test"
+IUSE="test"
RESTRICT="test"
RDEPEND="
@@ -41,11 +41,6 @@ RDEPEND="
DEPEND="
>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
app-admin/ansible-base
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
- )
test? (
${RDEPEND}
dev-python/nose[${PYTHON_USEDEP}]
@@ -61,19 +56,6 @@ python_compile() {
distutils-r1_python_compile
}
-python_compile_all() {
- if use doc; then
- cd docs/docsite || die
- export CPUS=4
- emake -f Makefile.sphinx html
- fi
-}
-
python_test() {
nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index d3bff29efe2f..04de5dc07690 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -24,7 +24,7 @@ fi
LICENSE="GPL-3"
SLOT="0"
KEYWORDS=""
-IUSE="doc test"
+IUSE="test"
RESTRICT="test"
RDEPEND="
@@ -43,11 +43,6 @@ RDEPEND="
DEPEND="
!app-admin/ansible-base
>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
- )
test? (
${RDEPEND}
dev-python/nose[${PYTHON_USEDEP}]
@@ -63,19 +58,6 @@ python_compile() {
distutils-r1_python_compile
}
-python_compile_all() {
- if use doc; then
- cd docs/docsite || die
- export CPUS=4
- emake -f Makefile.sphinx html
- fi
-}
-
python_test() {
nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/app-admin/clsync/clsync-0.4.5.ebuild b/app-admin/clsync/clsync-0.4.5.ebuild
index ba4c91c7f45d..2d61d65f2f08 100644
--- a/app-admin/clsync/clsync-0.4.5.ebuild
+++ b/app-admin/clsync/clsync-0.4.5.ebuild
@@ -6,10 +6,10 @@ EAPI=7
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/clsync/clsync.git"
inherit git-r3
- KEYWORDS="x86"
+ KEYWORDS="amd64 x86"
else
SRC_URI="https://github.com/clsync/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 x86"
+ KEYWORDS="amd64 x86"
fi
inherit autotools linux-info systemd
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 594fc3f3393d..8c2b51274cb3 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -3,11 +3,12 @@ DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.zip 2508208 BLAKE2B d17c22f3d8e3f0b52b
DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip 2721920 BLAKE2B f3fde8f5cc53496dc314bcae822a415cf00950da0a03b968de00685371e7a2e84ffa304fb176e791c85c930728859687e768ff785829f0751ae919546bd3326d SHA512 8981a08b1ba0226854567b0977d8a349abe2b58420421ab1dccdaf9c98e7657cb2140ad1a38767d25cb54249b61f162ecd51d401374a29f7368a550b19196595
+DIST consul-1.7.11.tar.gz 22803471 BLAKE2B 05f839d4ca025600d56833534872dc2207b561c0b44643d788baa791b02137cbd7146223145d53697fa20e5ff707a3cfcc01fed993b7d6558b82579919667e6b SHA512 82dab9baef3ff48dd83dd0fd3e7d5d989af8bdd142cf4e169e6de7610bd51d00cce5e76b60e6e6827ec606c2d6d2c1d46ac0502d493b13dd7fc4d42441fc1c79
DIST consul-1.7.4.tar.gz 22787889 BLAKE2B cb7a813beac2fd752858046d5a92f898662ea986f09d660c65173eb68e7523e9f1c6a8fc267275b2170490dc1e897d9c8d0df57dd898e58f0197e835c759919a SHA512 50466c6ded9d46ade57df252cda3cfc24ff321c13455d789dc7ea300ba037386aca73c6a47be9c5817985ff9678e04daa3295aff5ae83c97afa297451456bc4b
-DIST consul-1.7.7.tar.gz 22797355 BLAKE2B 659fec61fa9933c19d49c406a13305f2e33c064d9ff1df3d2c3dc28ca7f2e98be02aabcc110f741a2819022c6199d42284c8002c12594798be544295d7a2a23b SHA512 9a97ee452bac2cdf4cf9dbdab3b7b769f38d0d8082b419dbcc5b11a6041945f62ec7bbbd15f11e49c117215ff2ea6b986d754dbb50806631d6a0771741965d4f
DIST consul-1.7.8.tar.gz 22799862 BLAKE2B 94a091dab7eb4a2379b4c426fa47e0baeaa016066fb161fba540af2cf6811fdc225d18181d99d8d0e674c9503ae6d9facc15e0e35dccbad509ba143aa1b9f497 SHA512 2ca89bdcf576910697a4c52040cd0eebd5b0600a717e2170132c65c2f66696dcad23ab9923c43c8c9213263d8da1dc681ef2fc52f97d9f582643c036473fb10e
-DIST consul-1.8.3.tar.gz 24240809 BLAKE2B ac3740541e37dd0546e719a359b3943ddd5c330b2c7e35dead1a8c849a434e935566edb1898d15a95892b35509885e02ba406d0bbeb4969e96146386c8b7e760 SHA512 841c21319b8937d1bccfc49c254db4d040368e678884c12fa67e8918e36c030c855c2b10fa7e372125c86345f0c6623fe7de54a4e657334db4a305752b7fd369
DIST consul-1.8.4.tar.gz 28576916 BLAKE2B b5d65831e569dc1e997617642f82d040f0d3a1490c8a31f10e94ba50ca1a0b3abb4a3bcf57e369c7afacf8c31949ab0f7e687d887bb1c51641d9ee266e333b87 SHA512 f8bf566cfcad21e26c39e88667c383dc07569376b00c326938b685b082fe79f4e312c37132018a65f37ee2a70d2260c6a2e5dffb81cc8aaae77b3318e82fd7cd
+DIST consul-1.8.7.tar.gz 28519088 BLAKE2B 998ed12f6eae674f02616cc5e3fbe076a0ee81d538abee8fc2abca2cbc35482c0e0ed08455a22650bea7563a8daafcac7edd1ecc78496ff9062dcefa93826289 SHA512 508dcb195c964e6145a8256c747bba11e46c53f137e72e4ec23e539938f6dfeb858f74da60529206b5f6f1cb8b68520ec331105bb52512b2d655c2832c848907
+DIST consul-1.9.1.tar.gz 31240160 BLAKE2B 22d4e76eea9a113b9798048d565d33df3fca88c6a289f6e5ba61d7e8cfbbd98b0ae1a77c74eedb0eb2c861fc2501b3d475c307c07deba71c5f739793570505ca SHA512 9b983fed98499f642ac1bd8d183c2d76cbe321b8d1f7d318257c392185654e4037f7d80d39935011c0d97eb45c6686bd7c34c08908d5ad23d2c99bcee5e1fa74
DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.zip 16060635 BLAKE2B 6c358031305d8c8245b52bc58ed08cea5cb07c3e80cb3043f369ac6faf893a95d66c31fec38f07fe9029f53239c509bc060cfdebda8ac8d5ae556dfa0d6851e3 SHA512 bfd8f9859e519d6e45f2324e3907f88a1e661ca597f8bb3b7ae772246ba9972e09d0883abc887346fed55928f5d8422cf4212e32377e9900137cd63f0f9a93b8
DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
@@ -59,6 +60,8 @@ DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod 37 BLAKE2B 9aad8d876b
DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod 37 BLAKE2B 28c9393f5171487d23b732afcbb1d3d835d13d1a63b7e852fd3205925742fcf5a686c39b0600359e9052770360e9396f6bfe52a0000ecb51e3ed0a23611a2853 SHA512 a2b3211e3520fdef3d5c1991b5ad4b3745f4bb1b49be3afc5b1936c82b2a3058231b6cc17c63c85402cae0b80f037a70051d42738e89a708865e43dabf7b7b8a
DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod 36 BLAKE2B e15c1ef74374320cc49b3509a1fa8d7f63c8566920ba56f8b6f293e3d331f5587d45b35284af52b40f329e116f570543a7df50ab1888c4238b28c2ea583d2fda SHA512 83f296ee872570bab84dc3e3f7984f155f5a9a4f95ca7b23a5f39dd47b54eb87ceb2eaa4db00a3966def5b41fb0250de18bcde32610c350206b6d0e744353fd7
DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip 14852 BLAKE2B 33a7c997772bc0ab89312c06940938a0e447b81d5613c95585ec3cf395189edaa92a8e9801649f91ebf9e65dad30af94725436d5849ca1277ec4126989d3b023 SHA512 55765137bbfcb45b4c9962044502458f1e7944487946604fbc7604d48b9b576c522b9316a99cb14dacc3c613c99ddb9c51f1a9cd92f4a729bdf76b834d7d2fba
+DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod 36 BLAKE2B e15c1ef74374320cc49b3509a1fa8d7f63c8566920ba56f8b6f293e3d331f5587d45b35284af52b40f329e116f570543a7df50ab1888c4238b28c2ea583d2fda SHA512 83f296ee872570bab84dc3e3f7984f155f5a9a4f95ca7b23a5f39dd47b54eb87ceb2eaa4db00a3966def5b41fb0250de18bcde32610c350206b6d0e744353fd7
+DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip 14905 BLAKE2B 9aa626472e6bebbcb1d454f892ebf3c5f953ccf952e6ca7e60715211d418ab9c8d54832f9949824702278cd753758425dda72867e61ece209da688196d13d2ef SHA512 82818b2eb7e8f7265b814f202c420e5a187fd5e9a43536a062715e1a3d1d5717acc8d2daeb1f678dd13bf5703545309ad9d4b4e78fbb6e9befd9bb7370ddaa3b
DIST github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod 31 BLAKE2B 6ff35fdee07deeeee5ac0412b923e2a76ffb19646b121dcfa6b3bda5400b9813375f7659a42b8141ffa6c29e79a4f1009a946ad3bcbe943889f20550bba73627 SHA512 975a6684c6f7eebaec8a757656fb51a4bd9e7ebedce12bca267fd69ae505bd81fd6296fcec6a3b45973f841982defb9311e405aa349b2c7e664384ca05a920f0
DIST github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip 7070 BLAKE2B 8a387a04a8d6cf7d548f2032820a02dfa7f0a078f3ad04b97643ff46ca3436776692d620e5424f51504519551a8c4e48135e37e47eb73bfa7f7de254ab9c9838 SHA512 05b98a368bd2a312fcc487a5d17cd051318f2234a570ef416464206193e62fd1a43169a150a5194f7416692771fc53132fc5352f05872cf95fc1e9402cea21ee
DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
@@ -72,12 +75,16 @@ DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.m
DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip 37264 BLAKE2B 13a34ae8ce6866da183bb7f9f5dcdb702ffe846a3c5e789e99f6e112a1e64b1dbbe8777727e5678b4bdcac75ec32ddc52ff303b95b5ee3fd22423eaab44809c2 SHA512 e1b8ad2c09c16599c6e5053f871df9f66698c7a632276c1e68c80c9737216751939b7b7024449ed63da0a292688b4d7a441d64512aa4bd8684e418f4e5da4446
DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod 582 BLAKE2B 92aab40d86d733eb8f751fb23e40621b5b3bbfbd8b1d194bc6e689b6df763b4030aa83ab78654dc8e536274af6de247b8fc7e4e35e6cbf2f6fb5532291deec6b SHA512 aa43d2e262a603661ac3dc7aef111aea6e348e11c5384840d2be06224a6c2c580fcc0e3c6645a0d48b48826b0aff92562f0c6504eae980ff5610d2ffd2255d88
DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip 41353 BLAKE2B 850ec7d356246c8b47c8594aaba8db95d979ca7fb50b383ec02c6802faf089bb170ea7e86f7e1fe8f95fbed4208c6f39c307871d74b8052de5ccd9d6ae29d49e SHA512 b533a51ecc7709cb74da88cd3dea70b3605e75a88b93d16aca5aafa100352002f5b1c1c6d9c33d6c93ce74663d27b7cf82c8fa8db7aadca4d42e8a7f6354f78e
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod 753 BLAKE2B 5d81e99f1c39cafd4dd39f7202f71ea5fa3eba3f1c970e9c51e674e9aba8ce527034679105ed92843c7c69caec3770ef6fad38cc172df670f1643270300fb821 SHA512 8a04b0f60d9393afdc4b106413a1022e213509cadc222d592b8a98cc06188eda9ab8b7fdc346e8e70e15f40294ed41fe5510205d64ff40c427a6fbbcbd16f530
DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip 44812 BLAKE2B ba556ac48b565838fd1686825e0bf8417d0473cdd1d0c9f28ce88cbda83b9e61bdfc9cc8b86351d0ad1d57b2aeb978800200bb023d9cd1bdbd013237e1813d92 SHA512 6a71cedd6356d9e17ffa7af4e005a7d17f1c004b6b68f487ac75b13668d22f18c06ea0c0e4c9b62d5d60b27054a3afa0e73d4adbab6ad46ede4b4387500c27d4
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.5-0.20201104215618-6fd5a4ddf425.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.5-0.20201104215618-6fd5a4ddf425.zip 48822 BLAKE2B 9fadcb6b1b9d7d0acfea5724db7f50c7a1a201ecf0383d96d7ebb085412c2a4a4b3beb766edc610b9803812839f44a1a4429825967cc679ffe249ecd9e854b29 SHA512 fb565518e3c593f9453f1fef49924144084793ff215dbe18c06ffe372785444e3d916a23aef30b508e750ac5df7108206749d773813b0fdac9d77d3831c99386
DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip 7271 BLAKE2B 4590233953ed1577a41ef4425403585d5cf9d0bf770bc00d38de4601015911eb56f695145beb53739ba7a64ae0113686fae54842a61504005f5f1a519e98ff53 SHA512 6936a577297949e1a146e3efdbe88e9c81205ccac46974f092846bcfbd533a2c8f0f161bc74da60d7a0d8aa6c5d2b1591fa294320c3e97854626407f0f838423
DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip 7144 BLAKE2B d223f96d7bdb87d77573fde857a61d518336b60ab04e2a3cafbbfde23ecd65511553d9bd6360b1a9c17b394f77c7cd37e3c74df827a65b0e79580e1695723652 SHA512 c3d4056c34241f73d9f79801ea6a6d03697f2a6f151ceb5239458cf50c715dab693ccc0b5593f51cde8e2fff5f4959c72ab4e95197be3f65cae8185b6cbda06d
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.37.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip 13988218 BLAKE2B af9b087b7c9fdf75ef92dadbfa49ad427238a49426bb50269cf3ffc72dbb15e5bfd9975308b0260bc507bebedf683ba78428d33e03780fd2895224b929e680f6 SHA512 a019196698556d6877dda5757f8bd062d2f4320b0e81c7a4fb92140e85623d95ff7d52fa42ecc88a762db53d29068d63e654ac3affb0efbcc0d49a1800711955
DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
@@ -155,21 +162,29 @@ DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 11987 BLAKE2B bb585868c568466b
DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip 12428 BLAKE2B caf7a05e79d8b7dca069966765705619ee15800d8276d968bdf4385bc1141cc06b24755ac49c65caafdde5d8b34869df1f7e42ca302ee6a80b9ac7edd8a803d2 SHA512 c757f8455ce261c06749eda03ba807ba8b2427f0a14b0b62a6ee4e9d1ba220986e6f122b061fed6f44d68e4802864a988c722604b52989a4e31761e0e7ea8163
DIST github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod 32 BLAKE2B a73ae1e577fbb84fd72de422c367c1003355c117a9660cadbb5d6d52fcd0c102fa3b22c7c7dfb6e149dc14ddcb9b5fef847fb2a7b9379a35405c7bd9d83ff1b5 SHA512 2ef8ab60b4320b9358614a28a02b4207f3986c4a06798c3e253a79bfb63692dfb1765476e9d154e15f9d5e30983609c98b6ee39ae910c678a3773fddca208cee
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.mod 121 BLAKE2B 3b2b42800cf70cdfcc5a34ccde0b38f8bb16756e47fd83215563e653667a993416007880ac26a9f41f1f18318d9803b9ee90eaa98b2d4de16edcb7b74eb54760 SHA512 1a666d5599c4bbdfc3c174047e187af75d1a3e66e344ae76d714b387c39dda9632bb6c7ea1ead5a830a2aea1c5a5e2d051d552535cc7e0bc3dbf71383a1c4e5b
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.zip 49672 BLAKE2B 792273745cd9cdb2913387fc305cb0a5e9c444c5e97bd469fdd94f91f6bb0a6a2c9223a9a5fd8798db79922e6056c9b266df2a7091fba4e81d783339c1b78284 SHA512 04ab61faa2934ec2ff4dccc43e74a20457874cf091ed182d28c13db97072b953a4040a0109daa8d2ed740069e89e4e0076f1c0246d7c93ba3119ebda1d659f0e
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.1.mod 121 BLAKE2B 3b2b42800cf70cdfcc5a34ccde0b38f8bb16756e47fd83215563e653667a993416007880ac26a9f41f1f18318d9803b9ee90eaa98b2d4de16edcb7b74eb54760 SHA512 1a666d5599c4bbdfc3c174047e187af75d1a3e66e344ae76d714b387c39dda9632bb6c7ea1ead5a830a2aea1c5a5e2d051d552535cc7e0bc3dbf71383a1c4e5b
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.1.zip 49890 BLAKE2B 738ff71723727e7950bd225a765e5f6ff47eaea5942d2e437b015103f1a06405f6c050b6a7222c2b6ab41506adf6b6768c4c2e7345a9503bbd7d737bb355b2e4 SHA512 c4331256ead0f5ef5684e155cdcd053cacd01123bb049edcf2c1a6692ad3c2c3653da6420d0e625b96ffaad0e429980590778370075d4857fee5c7b60e33d2d3
DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 41278 BLAKE2B e0b440a81efbe3c7c16ad276b4509652fd58bc94cd162b9ab13bb37c1e6edcd561e3fbb999e55619d58c8e3279b785b8eb67fa4e200b38fe6fcb60f0918e6e8a SHA512 9b1075ccd3d1f53773db97687e06fb777741d6c3b228bcc329be580562fb3c34006768eb3f989f92367ca116c597140045b3c345fe36065f5015d1d4652633c3
DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip 13436 BLAKE2B ddd82721096e3dfc8c70543b4324d02f1137d9eac13c1eec1236c4ff537bbebc2ce5f205af07e8ecc16a909c4415e764d87324bad3efd5c878aecc9f8b105647 SHA512 722683483b8071b58508a7de9a9c9826d4a33c874948c1a6612c89195cceadfbd0ee0b56635d408f0af09aa2e904b0ae3c86a06e9b8f86c502080ce04c756e42
+DIST github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod 48 BLAKE2B dc30053a3f292ba19e5dcf7d7f287a15a970703b98bc83525dad946a8719b42e5a12575baa4206ed4237a202f1c4d57874813badff88aa80723d743a61c5e86f SHA512 e129ba3d01fa1a966c010ec4b453dccdb191dd7f8cf4f8295294e0a69f1a03d9d8cbc738d3fd3347a28beaccb205e443a40786866953f1c4dd761ebd2c889bbc
DIST github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod 33 BLAKE2B f3047b593a38c87128a1304a48b8bdcaf8d5c06d275460f5e0908eb499259b2228754404015935d871f529697b1153c3a86a151cab4fa7aded7d109b4c40f48c SHA512 ea09ddecc4d78f7e9e0407c02de1e3754c68f5efcefa2ea075086f26c203c6cb9551a4d4fd0241b86b14000dd9501bac8e3d9857a98b56445c371a882caeaf28
DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
DIST github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.mod 31 BLAKE2B ad0f7f1eefdcb8962e8a70fc9d27b8c4618a2374e588db1afa039cdaa34b0b612b7249adba1cf61147e46da5dbad1edcab05085d503c7babe31745de553c7f39 SHA512 42b1f72e0d2eade3b2ff4d6689be08a404e8ee9e565f2f9e141d20e11d2f6865052fa5b829712647662204f496cad00a57fade2003c321b76929773a2777e4ab
DIST github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.zip 55812 BLAKE2B 404048ef7688e941201d56f92e82c122e33b680bb31b35dcb0ebfafe45ae2fb27d1392198a0b6006cf6769fee17857ad87d8662da0fcc5dbc5d52ae253c1a5c3 SHA512 3aa4ffedc9412d199b82e68581e1cd357b23e1b89531ba3014c341e5c446a230c21baab253fdb7aaf6e4a1cd5d7c489cfc30d8697ec6f650a0743b6b0e038bc7
+DIST github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod 91 BLAKE2B 4aa00d10dbc5cf003c458093f8a81e56c440ddfb3e060c40cebcbeea3f04b152c19a6c879460a164e07e7df2b9a6ed86e16cef70ca34396e8fcf384907d5c606 SHA512 7ef69b0fa12691253fc58e94d67162abb06b86a762aaec858611cd1885bab3b60f14ccdf9cf75eefd24c0018aded83408461d7d709580fc89c123ee5a2e64614
DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
DIST github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod 31 BLAKE2B d141d98fd2673b422369b754fbd430a465f08bcdb07fbbf1ed626304ecd0843255fd2e909fc395b04c7adec18a15dea65ede0c64689be98b7491729d13363db7 SHA512 45bbb63ae2dda8c2ea63c9e38405b379708326c3f2e7963e3589ea53d06fd3bdce1613b5a0c1ef66f9c6ddc21374b1669218bd6b3210918df0a4b205116f3e14
DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod 32 BLAKE2B 165b3724097f123b839b3f65d2e401caf6d8046fe822d3d9b9f15d74e1da21c45b77706f79716fc1b9c5322127bec754b2dd35442fe077dad4f3e301cd168ca2 SHA512 14e60a75a483ff4a1f6313a7a8a1dbfbc6ed4c223c7a9d18c0b355e84261084204a22ef1125a40e30acb1b43abfc97e60c045dd91a16d2b4068a78a54d854d28
DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip 78166 BLAKE2B 1a7b655abbaad2d27ca38c60ebd39a1b186fc49c9ef7bbdcd2610603af1074f0df7777e480eb5d9b5deb09edee32ec959daccc0f5fd33a8f18c85e219367a144 SHA512 69395f0457365d57b43086d52ca9c77ead9d74c52bb66c9687fb4c26164eedbf4322c129d55408ba96c9985b081ea8335be1587a63f29d53183f542130a409ec
+DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod 41 BLAKE2B 62bb3af3f58b23321cc389ceca36d28e4f32cb1470b6c54c4af55ef927ba84284858765b5b333c3bbdb042826550fe4f0d22022078e2b34e340098465e21f3e8 SHA512 1e8d650a965637bd0974b8f42e207155dd1bac307e9ecf4d294cb4ee0f1c694276062d46318d113326b9c1bfdc379a7d8b8fa2c18e4a08ed9baefcae67db88d2
+DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip 79799 BLAKE2B 1677e3977fcf1499a1d6d3b0dda2f990b12a9f5464ff8a7aca6752951b395038ea2e3a38224d24eff0e6df6a2cc92f5da47daef9ceb237433bd2370d70eb7737 SHA512 9a67b0101fc1afba75179246e1498c41254d8379f78ef65877166bf9a5b7f7ac9e29f270e9186f13a26891389ab4e9ef309c4e90b2e79bffc3ade49e39fe2af1
DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod 41 BLAKE2B f496cc326aeee2c6f1547b802fa1ea13a578144331451bb772a33e2934dcc655c9355f06f7845684130c6647d00decfa937c839909baa01a6d84f6e601a427e8 SHA512 56fe1d995f8f51197d68494fb2edc2d5c5cc863c881ed640a74ba80e292a54a0600f10c727b3dc8a209fc33c750d92ad658374d0dc3d083fa9750bb7174f5613
DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod 43 BLAKE2B ab024fc86c325a82315f5a99c39e1fc08440ee35d81fe09959816a0fff09aa5d852431fcc370dde082963ccbd0d79d74d987f1bacdd4796d6d1d11eb80089d63 SHA512 b3548cd55d406b9148e992e276f7178d68116825198f359971f22a1d9e7e2548cdf9605a1b8b6f04b3b66d92faa906dae781a53624344733fc471452f16f4312
DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod 34 BLAKE2B da7fc8b2c3dd4e49dc2efc50ae5d50571e906f68ebbaaeb863f4b3f6f03160a381d7b0e743863cb4253ba36afa2f5d7e518ac08fb4d6c08566d9931396d87fa9 SHA512 b75a0212825e9e0554f7654b1da4050ddda233853ddd86fcfeaac0202dcc4605f0608f3e5ea90056407ccef504330ac407493187a759a36fd716f508b20dc60c
@@ -200,6 +215,8 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e8
DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip 461624 BLAKE2B 37b2bbde9cd1153fe5811ae008983179820ce40fd6816155fc7b7d040e29b8725509f68c30b5099b686e9a6ff31a2d029188aa526ada6375fb9c7a236b8a7d1a SHA512 a99c2150515bc3deef1d7887644497fc4aaa96ed6c2aaeae91aabfaee6668c144b34a2c75ca829636c7e88d59b297601867b0f188ac048de452b5e0767480608
DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod 42 BLAKE2B 5e9f93d89d4f9aa6ac98c9fcf3f44177e95f08fa3d86789f56b6c52afa19c663fb36ec477a04611be15f51e8862ba90641fef9bac7c09b1baa7321b71b5c31e6 SHA512 603005008f167e32ed8984657a85676cc140d57adf0177895f6f4282a301c7f1fa2d826abddc0c59c725c810cf2356c820ac7fd64c6ccb2be132bead79603090
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip 458317 BLAKE2B df49024ad50c301d81d451351fec1ce0e3706c602de5068deeda6a0614412e49c0d230b47cd630cdc90a6a5bd4761e66f4f38554fd4b60b8896aec768cb98e19 SHA512 bc1c7eeac13afd27ba62c1343b697480a61812ab15231efae740c716f0a6abe2b53c8a40787601624af9017cd36463cc7cb5e895f4fed0de6e52a3c248bd0a9e
DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip 69641 BLAKE2B 7d5306ebb893e705188699f7b5e690c375bda9e0ab4c904aec10560dd75f278016c9f69ce4973260a4e5a8d8d7dd7c2f12a59f98e96a4456af6f23fd0db224c2 SHA512 fa400e3e1b6f57e29c93ecfb1dd94ccb1e4e4924f3b62ae125ad0bd88d56b5c48080ad78dbf545c1056bcacf860b93363a27780dbce2b812c5b58ca3c74fd11e
DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
@@ -213,6 +230,8 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip 99332 BLAKE2B d95e04036796b0
DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 105396 BLAKE2B 8b45b030824cf6ad208a00e36c7098b59e89c2725702926092baa11e82bd395d52b5daf26af57cd5edb01bee6ac2b8c4e3379e357e3a6cef69550d9403090c53 SHA512 bd13e72e46a82b149661a61dfc36dc6e0471dd4161f2291f301e871811e5b2a7976a49cf2af10eee1b7b2f6ad68583c240cba007ec163cea157f24bbe51d3b3a
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip 127156 BLAKE2B 1d06924d2e9fadaefa1a506c16830c88e983c3d14b3bb9a82c216879531ffb664dc90de8fbf3b6025ae8b5e7cee1a9ecb900a7eabb85f6144d304fab7cacf21f SHA512 365bb5271fded39749a69bdfaee6e29740b26b84e0a737fedab3e50cc0416a098f0ed0a14704dc1ec9bc1eb81b8827de4a151024f5ea3e6c75a9fb9abfc14d62
DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.zip 9257 BLAKE2B 4082e7b230ac5242c79ba7e1c2ed5d51e76b5cfab0e0b366aac04daeb99d77ce6d2e78fc9ba5d6b7b470cad128bba917a914b6a11ed532559d108e8a0aed3cf1 SHA512 05954f59ae284c142a0526af3b155e78f3b9728fc016e9fb7a8294214139a6268fa8012a8be993f5ce4854022e15eb5d58ba1b1c7811305d575fb69878149ff2
DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
@@ -222,12 +241,16 @@ DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod
DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.zip 16817 BLAKE2B a3592faa6456fa855094ab193d3d09d8729d8e9dc9c1dfee62698bfe1e20306860009106626e356a0582e5a8f29dad2dbe454b1d13fda38b9ad6f0f1489b8f44 SHA512 669d022eade451baf0504b024b88024571ece521d223a908b2369e1de0a6b71199789b909961838f4eb2aba4508f6cb983511d01c33e157828f44ccee2b1602c
DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip 16584 BLAKE2B 91b7f51050c2ee0261447144d1f86c7952cdd5f3096d72040b069dd2737c008084bb456b57400d3fa5cd26ce3bb34265c0cfcee94c4dace3468ef13b62d73c74 SHA512 6e265617828739486750cb8c5a8337f3e17f83664821208778528d93e608bd142902aaefcd64d4e6fb8542e5b0938b12191ea070fb5deefbff946daa146e9278
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.zip 22166 BLAKE2B 32c6a771070fe4da18b8cffb964f6d983244c79e33f50fe0b2cfe47eab04a6bfa8cff977fe7c200b73af264ef347bc24aebd1f88c8a22d3a30b0aa9e0b5497be SHA512 883f2d065ef1834580284954c9df239f3db3b40de7fc925baf563be9d4da4f0d873e156814b3eb99b6a1fad7cd3257a574f271679f783301595a12bec5b62175
DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
DIST github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod 34 BLAKE2B 2ccba8347a642af8518a868d34286011a61a2f540151a9ee37cb20a821041af46d787f1e59e55f428a380d8a27d0beee4494ee7a514a7f90dab18d06f67b8ea8 SHA512 5cc997fe8abd3a4ebaea6f2a023f3b9aa7d31de3f57d1b2693efbef17a93b5a9937403c4c7ac06b78951f04d517ad59e41b171b3fefe0330db88a705d74e94c1
DIST github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip 39658 BLAKE2B 16dd91d050b8e32594fc01e02ed1cfb23e4b33e922af6c94ba17ac18d419337217cb231b864eb5bd5cd0a6d9a19e73f8c5405cf283cb111cb9dfaa4a84f7ab1b SHA512 f74c5dbacf2e1c5899b66c9ce1aa0298be7e36a04e493cbb8ef65254013c6f00caddf203c20638a9ff229637144e26b892ea16bd546c8eff0bd2f101d3d9f4b1
DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d
DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip 596836 BLAKE2B 09db31490155fba99fa74f0aa3198dc94c113a3c8478fb366426b61922d74eecda5648fbe5172a315d450238f8f3b92873eaddfdb05b4f6d391bc6fd8ca13374 SHA512 c27b14bc8afb6cba3d835aa91a011747849800a2716722f6f4b9a1fefd03aa34da2cd098fb9bac60901af9dfcb1d344db5bf066372afc2b5d07cdf40e3843ef3
@@ -249,11 +272,15 @@ DIST github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod 81 BLAKE2B 27c4787e73bf
DIST github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip 53549 BLAKE2B fccfd0782faf862498508cc67dfc0ec6b0bd9edd7fdb07970b87fa3ba99b834a1ea8021f045a0cd64f7e27d7c838fd596bad3fddcb62935d266009c04d446130 SHA512 ce3431175bcfa657e79846e64bcdbe1fe82115f336d2d2cbf3af514997ae8b6dd1acb263d9ec83068554b4303f8b3c235107dfd8661c208b708cc17c1fc7502f
DIST github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.mod 42 BLAKE2B affc467ae757490be75fe62bd307b777b71b0a2af48143ef514c70ad2e85d44ecf2c75495d7cff038eb40c0b9822ad06707c6d34237073d0cbe477c82e767114 SHA512 aaafa6983405f30bc9318ec18f78aabea8c2d51935b7611ac3b4927e9648a4cd7225acab9868944170885caae02d84cd7be2e68e1d6068175514095683c43ebf
DIST github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.zip 12168 BLAKE2B b3865963c203d955b55c8762155630385b002d8bab7f3ca59a1dd6383ee47e712dd93112378231f030a69dc1cdf8efe04a80638c7ef544682692fb4afa388540 SHA512 516ecadd02b88d33b421912956ae1fb7d83b9fe476659c87223a2dbfda32b391483f498d7c42a7b9c9b55109b9cb8c7ede158ef77f0bb046bc604a014b4311b9
+DIST github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod 134 BLAKE2B 484477f336780669d2467c673d49aba38a44868ae2e3535282c19631fc7767c36bf3bb46d3ce27aa8173e1167e7d56a206303f73b671b49e999839832b14ae17 SHA512 32745c37e703a050b2d475ba122956a1278450a852f1b101e5900f62f0d0fc2e499f2e156b3640e76b2c4c368e3eacb8bf215b4ece5c55b7f8db3fa941309bda
+DIST github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip 15916 BLAKE2B f206df5f4f898d04fccc38e95a4d2d05cde33762f1585aa673b60fb7f4b7c1d5b9d103ac7b07ddf9aa34e3a79c90a51c6434a1a9542341f050f0422135786340 SHA512 25e6d14319a8b26bba1fae08123aea772246aabe9c7bc0bd401226bfbfff6662c28c694231d8ed9b7c0a1d41b7b6d50a889f09dfd58f09121bbc8715b2838f9d
DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip 9560 BLAKE2B 2c8039854037c0f11590c80605cd30bce58baed3e8ba11840e98e8b450d0b2303704d1a55252589529021af473fe1f47f7bf6a3edab5ecab4de4888088843b2a SHA512 d439e95bfd858cf71659e8ce905748749e9e15cf577b98b66d7d8dd6adbff8262219d0c26bbbe9a24021ed5d683d7b81dc560eec4a97f09a1b44fb8983a4177b
DIST github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.mod 146 BLAKE2B 22e9af8c710fd531f641b7dcca5341312623409b3e70ebde5c7ded86ba237cee14d1d1f6d645b1d96b874f7c2e274aec4aaab894d55bde45098a8e38987c71c4 SHA512 379b39171f176146f7020b2a871e9e66d77e26c417e6e81a92edb1ec609fb55e4d6417a6e12b17fe9a4e3be6551c4f28381232b20f9a9f0807f25cfbea1863e1
DIST github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.zip 9823 BLAKE2B e5903b074df6b1b2d94ff628cb927ef3a718bc3fdcbb5172231ac490deb0be75243f9cd365886ac985f44deae884e3541d22e27b2b6826900c4199f70c50a20c SHA512 49f21614fd2d2bf704828d93003e8fbdd687dd18db7e4377b3571d7bf867e0bb94d67df08867fcb64857a9b2a7e570d5e2a74da981448856ce61c78b771e5339
+DIST github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.mod 146 BLAKE2B 22e9af8c710fd531f641b7dcca5341312623409b3e70ebde5c7ded86ba237cee14d1d1f6d645b1d96b874f7c2e274aec4aaab894d55bde45098a8e38987c71c4 SHA512 379b39171f176146f7020b2a871e9e66d77e26c417e6e81a92edb1ec609fb55e4d6417a6e12b17fe9a4e3be6551c4f28381232b20f9a9f0807f25cfbea1863e1
+DIST github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.zip 16296 BLAKE2B 8e6e588b2d0bcc8ef3b6def22a0e0b7d1474321cb4b48c716be5a8a52b3c0ade6a9bc062ec4bf8f65f0cc0b016ce2dcc8d42c1eefe2b2ef0dadab82cb980e0bc SHA512 b85d89cd3ff65d27933b81dde7c0c7ddfaca19a68dc7aa0835b709c9c0ba3059d15adaf9ad27ea06e078ed5e4f203bbbdd52f3f24ec3b23c93e08e5dcfa7e01a
DIST github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.mod 3970 BLAKE2B b88c72783696107ae26fa0b15d1b3df2b200a51e138a1f0a0aab739e7645bf9338e40c50a0d2a529f067f2c91cf77f1b2e7dbca3634fa82d251cce6f7d7b00fc SHA512 53e72b9d5ba2aa02af996c7f21a1c34ba25aa5421aaf9991e41ee8c39c4f2b25e55cba874c52355bfa173ed69d176e4ab3e7db411c5033afdb2d6fda26f26ddc
DIST github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.zip 91411 BLAKE2B 69926327b0e4dd7d82dfb50bde7962d46b16ca1b3664107ce2d9ed5255be72dda1f6dfd35ef4575d3e585cab51a96897facd840e0342e29f5cd2a1ffdd00a9e8 SHA512 83156da81791810d6471475f89af3f47a74eb3859be9d0a6c14d747baee746ef9130bda36471fe360a930368f8862ce5e748e4d359526bd8cb4c33a2b018bcb5
DIST github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.mod 2222 BLAKE2B 96cebe381605e123a48d1ab2733a9bfb351441178579caf6a31b6e1276b2fbdf956da85c563fcde295d9380abf49b5678677278af8ec5db648297da1d85a22d0 SHA512 fa31fb1ac7931846abfc67ce547135b6d76050054c26a67f8c81ffc829ca43585278e5a9906c1e9a95c440bb3701ff3b416cb1ad06f376eec2083c22a8cd7220
@@ -261,17 +288,25 @@ DIST github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde
DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod 37 BLAKE2B 3e6a6550c5fd7b237c484b2d7ff9d4fdcf02eeef8be89f18169d50c0ca7c58849c362d363428893035a5720d094cceb407c8565ed680ff248c305cd4acf886b2 SHA512 f2a0acca0b74daa85f1b49e2a56bf2d58c17570379d80c696428e31c028ace8436bd734b032996b2e3a52396d90cfaf3c0a99fd414c10fe1d67727a0da962ac0
DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip 42172 BLAKE2B ff4b18df1f223c00368c8be01634c08d8433e3993ac90c7243ca1c32c7871ee2222f25346a2c234b4d8f47ea4d6f62dc34c3eec86438d2cf95c8315779ff8391 SHA512 7305cb1a2a729c091267b1d4f1d59634c8cdafc39ae3355230e205e9aac960f321f6b07fdc3f3cd67f7f64daeaf287e214115df480bb7a318dcf51241260f642
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.zip 30671 BLAKE2B 4e9d64059a74036d71a06344d4cc1d7593c9757c6bf364b05dfe3c990e4a6a01faff3700a9af31c8cfdd6ab6f90fc9f0e07bd4e05c2ca9cdc47079ece6d770b3 SHA512 1bcd649feb0ee9b1210b17b249eccad8ca175b16c9af8f8fa16dc034761f62bad27c6bbdbffeca83c2992ce6d49124a29cc302b9b3c94324d6fec9340d722a83
DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.zip 34982 BLAKE2B 182c247773cc6c2ad4ae42f255fb4e1c7f2e9664b07141e36bd763e498afa315e34e24007b6a8e857422dae46a99c199666effa09d1935888d2c96fd2fcc5bd9 SHA512 98eb544687e67eecfca40a285133e306402cade215b9776f5276c16113c0da1484795195894b0b0eb6a965909c1658ce0acafd3d98864cf2d2fa246fe5b18d94
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip 23003 BLAKE2B fa553bc49f3f28624830aa0323b0c668db17d7628ca24b280eb718711c240e67fa6ec86b61c7fb5799b63085b570238d07c925a8cbc13e95b9d73d00e4a2ff65 SHA512 91c7b40e4125c3350ac4700bab85547840a8cc848f01bab06bde2eb51693a6dfd584fff718bd2425c67b15757e6e3f8a779cdbb051afff2094444f4bcb080ba8
DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.zip 26063 BLAKE2B a8905f3ce68e07fa295a303cdb9ac8f78f746da9f82e32e44a227dc57608e21dc2a95d7e33f1daf1f91d5dff32e1dfa3a95eae3730e590cb3723f46afe51ec56 SHA512 b374cab2eea5ff0b1b314822094f872df5c07479553611722fc4dce1aff98dd36919f8c1e8d8d36ac7c7da9a51e95e2f6ba971d2f0575ac5f1cad1ceec3d9f13
DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.zip 27085 BLAKE2B 43d07f0c6f351d78cc4bba75c1392574b537a5b8c52b1a86311092ae01cef11c2debc002d1cfb3f71bb74d262e2c24745ae3467d92d6264b5cc4f381a362fc74 SHA512 d5b1da656921ab950265b0789a70232e287b263c61e46122cf0ff2fc7fb294d018909bbdc6988577be990870381c65999f8c9df0d05ed48efe4fc313a28e8f90
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip 31729 BLAKE2B cc35c143559499bb19e8802039ee32f1ba2db84cd4b6e7209feb9b4a9a36f2a7b21e817c40c82d75abd94dc02f4e3e89b38692c93fbca987a1ac16f2a43676e4 SHA512 b7a8bde64b16c032ab4ed47c7ec11da6661293d231d7e100b4fdf9db88a1ed2fb9f48b95f7a6c44fd14e033a5a02244c894496cac57fcefe8bcddc73f4755508
+DIST github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod 61 BLAKE2B f43ec3c9c450f07eeb5c08107e6320e5d98cc68b0bd388df850fe5c61ddc18b871956a75df797984b3f63d24b4ac5612d322d577e5ea371d24cd05cb0b4eb91c SHA512 9d86ce1de4bd2d4b32f76f69d0ce1f01c7db8b1a2555ae8b789c24fa5391e9e477bdd1d82719003f37205b102a845bce0b65611fd10cf52df4d49b6471f7e39e
DIST github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.mod 102 BLAKE2B a2c5aaa93abab3743458479bbaf9ac71dc111ad72793721fadda1c55bd0c6c28b26ff797f0d79c5a045a6893566447aaff76685f73a0204c9bdf7ec52ad6e56e SHA512 8d73ddc435d2a93ce4daecda7fb2eec3a8cb0ab4a1b5c83f14a514046ccdb52358762c70e72da91a15ad1b970bfae8cc9fa775ce4f87b9e4afbe54075961306d
DIST github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.zip 39600 BLAKE2B 134b58a09e3417ff72b1568d798d63d621d15a069c69852dabc9950dc8567d2f6eed06a0110fd058b9e9f289fbe9213b35977293faf770b0bc1e887161aef0a9 SHA512 b22f0255a075b7666f10b542fa810d99ab2cd15bd49697330e83199c63d2fe21c317247ae03f3814d5ceb4194a9afac96f4b39422f12d669a9086f96d7e2d28e
+DIST github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.0.mod 159 BLAKE2B b8decf11dd5318f6752c4fbf259b036737c0bed14d6764fa95966b73b8d0becd7ebda90b6f504401eee6a78e2dea0f252bfea08ef0394183da6e5954265bcd29 SHA512 caa11c7fcae8cf29369b1276911a7ce1f18c86af25ff4bd5e0949fff63dbcb99f57322ea335dff159f00653d1eeaaeb9f130efa8967ca440dc1e8417520aca81
+DIST github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.0.zip 45061 BLAKE2B c89e9877a6c93f5dd0bd88ba1caaa390cf645f5ad16e29feb364643f4ff35e152332b6c381caf93db0176bd7b32fb3b412d78e5746487964c9c8f786186f5e67 SHA512 9c6541984800816462813a6fec63e19aa01ccc7888c8551d357ad08a85f9d7debfb513384e28363932cbd9a2865f4b69831b76a47a6289db7b33169a97152e33
DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip 63182 BLAKE2B 6f6ca7aef3a60232a715cecb6f2a4f642fc32388229890699371d7a901498726bace0e37c800db4096769c65cebef01dc4abff9a111daa3cae8fd8352ff18174 SHA512 a50702f312dc7b0a9dc95c3415980e51d082e0c36820917b7ff5bc0965e06d5ead6d7749cf8c87c7671456e9c07e9625e342b644aa6f49a10b4483a198f845b4
@@ -285,6 +320,10 @@ DIST github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip 20140 BLAKE2B 21
DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b
DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b
DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip 17666 BLAKE2B 17ec61e27967762f6f2d29e8dc23f4fba5c4ba0ee5acf7dd342e7437956af4348096da9df87c47c24bdc5f0d11544a1e5638125e888a9f163c97086259cbd888 SHA512 62644e1aad01d8475a0fe8878492477f11c5ac26cb0142a69b0afaf46a74ef3e3658b199ee6f505941f19d9ede170d62237422758e2800d81b251f365ac8bbbd
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod 147 BLAKE2B a87a317948074210158c83c25aa1e287c613665f0008c6337a41cde6fb7e1a0758c38762d8467fa508e0178fee74781f1db49a05a388d46f8871700fa3c85c92 SHA512 7ff5a339ab0da7023d7548056aa96eaf1fa9a0a36f9deb098f99910a9a77fbab43137b6e305b35cfbc4ab9d50adabda10b53c279bc701ffdf97e928fd19c7888
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.zip 22283 BLAKE2B c4c50530c98e584d408da87abf3d41470211b02dd1fdbedc7f06671fd8bdb9176a286414c0530975b44651f2a263230d7c450e35ffd435aeca100795e895f0f5 SHA512 d3cc4de24a8fc43b1efffb2e18fa5879bf57f2220f4a890fa3e357a3c05111ac55a36aea22fcddec115d50b19d04a9d452d28d6c05a60c39be301b11d8391558
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod 147 BLAKE2B a87a317948074210158c83c25aa1e287c613665f0008c6337a41cde6fb7e1a0758c38762d8467fa508e0178fee74781f1db49a05a388d46f8871700fa3c85c92 SHA512 7ff5a339ab0da7023d7548056aa96eaf1fa9a0a36f9deb098f99910a9a77fbab43137b6e305b35cfbc4ab9d50adabda10b53c279bc701ffdf97e928fd19c7888
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip 24036 BLAKE2B 30e48b301ee1aabd326394047f39d4ee2208aac617b2c3435d24c10735862c1fbd021aaa62f22e10ac07834e30e329d80aa5aa75267658b26c7a64112d0eed63 SHA512 4e72d97d59cb97db89cc6457b443ec4be7294e678d0edfefa0f76ee545c3663bafb223d9f7b2dc2e67c19429816e084e9da65e542788abcadea13657272ec8be
DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod 98 BLAKE2B d536f017d021aa2e43bdef41de97b002d8e08e2767ae5222ad7d05ae23af04c4920fa2663b553ee803d72751ae0772b4e8ab7dd5243aae1c35d53c0f6ed85d24 SHA512 97ad4c83d3c61a8b878871c886a1fcd6e3e954623b56e0775897160368b08a243d325991956d557b5d8741b0609d758b2da0277049e57163e18248594ce3cdb6
DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod 98 BLAKE2B d536f017d021aa2e43bdef41de97b002d8e08e2767ae5222ad7d05ae23af04c4920fa2663b553ee803d72751ae0772b4e8ab7dd5243aae1c35d53c0f6ed85d24 SHA512 97ad4c83d3c61a8b878871c886a1fcd6e3e954623b56e0775897160368b08a243d325991956d557b5d8741b0609d758b2da0277049e57163e18248594ce3cdb6
DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip 15463 BLAKE2B 88fb544a56eb6266a2ed75b3b6380f52d11d725e8711f2fbe321bd30494201d43db01398348fca95ef76ebb46ce26f3f523be67bc2d56f264f5c9fc3ac1cb8c1 SHA512 891f2adbadf938d7d070d80198f50a62e187a6aa6fa6b489e0055b98a9b2547b43cda11ee983815026b1e6f0f8864d695bf7e72d70290423ff53b4872d310735
@@ -302,6 +341,8 @@ DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod 39 BLAKE2B 65fa1ffbb1
DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip 15533 BLAKE2B 68044230c48b4076c3d87d9c46cd96d3b0f293683129f72c6612f0091aac8e7d722945ade6e689c4174baabe37a9f9cd78d722d9a61bc304034525e8605522d9 SHA512 b0d8eb07cb45a5d0e048956fad5c1c822e15d4b5544f59eb2ce925d8e9cc14a8de072f3f4a1792706b293b1d9a0530391f2243234dbeead9bdd77f229ebfba8c
DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip 15917 BLAKE2B 66bf9607834472667be4da679727ff2b004e95dc52e4c69d1470586244387b3cb2afb792b8f7d858c4edb3f73151771eed8d7509c7da91ad31655a945ac4d326 SHA512 b1267266cdb9895cfc0707dcfbb3dbcc8e3a53adb297811ee70d20f6a77d080f5cb0c4b8438e68d933a7ebf701c0c3e3f9a1b881916fbdf5b4832d5ae790ebe8
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip 16706 BLAKE2B 3077f81adf72f995a24e9e8e0fd90e0457d5c210cba7b820dfed7a2cddb06eef4ad4747ff0da2e663419ba891df9fa7ff374e1bc73f2326faddcde17bd3e6bae SHA512 c44bca4c63fc38ebd97c2abb7b5bfa2af635548723697d9533590242b936f1b55b119d0f4a327f1b02c546d571cd0d085f727c00057634d8c2316d1c7249fecd
DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1
DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
@@ -312,10 +353,14 @@ DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331
DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip 121655 BLAKE2B 071d008723f19fcac3ee740e1b4898414cf09a2813bdb6922705cdcad5913d7fe4682d11219ef10d8bd3921fcf93c7d568daadd33b8e7c307a55eea6ac0d54ca SHA512 19403c36137b6ec9247fab3a9255dc98ad9dc46ba03ad3788e11298f8a310756b24dbfd3a0d9893ad93dc111dd228c421f96daae09e2058438c3c7c58386a71b
DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.mod 32 BLAKE2B fc55666bc550b3f1fb19c148ddcee24a0bde3bd4fac2e7e651bdc300d6bdb5ae0ac88c51b19c905520498e1ccd7bf4846bdfa4d2cd6464ef7dd564dad2fc06cb SHA512 b584d1f966117184e44883b0c057f3a51323e9a6f5a4223655ee1c4e7b5928631d3121abce2505e2a58219cf531d75ad63d3e7e05c12982d73095d4cce21736f
DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip 58035 BLAKE2B 7e29dde7d2d36e3d6854f56b4d253bfcce1dc78845cd60ea52c8d50a3a64d391667de99fd96ae94101650f850b834c72b3509a9f02594fb46c49daea2ec9342a SHA512 4975a066f8b65dda7f51516347889b666aa930d016270100d0ffb9dd46aa7656dabe8a4ff84751d77ee807e9ebc51fdd882bb6e873bf00b1fcfe88289b04aa46
+DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.mod 128 BLAKE2B 1eb83fbb14a562b773bab2b3a7935d400cfc3921c643e9854c593bef8b55a82e19d88f0bdcf5fb814536a85d52a8ba53a55295631dbd5d6aac9d51a547d1b966 SHA512 107d9cdeca3151466c4b6833d8b39808ac5f3e05308ce9d78bb8afa18623bb91248ebd156f78343c4af95ddb91bbeab33515d7e414f5244753970b8b9948b498
+DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.zip 76818 BLAKE2B cd424057541a171dfbb35273ed72f55d6a9aeeddb9c067da8712f85114e7a0ff9b9c20efcc8da77b5e26da09fd844c7e5137e18f7e15392dd68200381a830e69 SHA512 b68047c19a41e5293a7591d40f66421f1fd9755a2e58d53cddc055cdd377ea6cf313da8b3e53628ff6bed401e0d7c7deb865ca15ceec6abf828b6f71bc7cff59
DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod 328 BLAKE2B 5d3c1f5b839250a69efe71d633601e076be84d2adbf5f69067118851ec76b6044728cfe23644a8fba03502e476bc40ee79ef3e0c3385ab8ee2c3103321753deb SHA512 ed46a1036f3f7a7c2c5d55440ac93f468b5b4282fb5bee31a0c1a746b00426922544acd55ca6ca539d9d6927a23888e81aa360d2140036e84dc895b5a97c9b43
DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip 14557 BLAKE2B 7b306a1151cda04a778b2606fbd7e5257a80da359ee6f02374bcf7199f16e3513be56c706d8af2fe2e683c46b80f9680e6831f0e022f3c8dbc5e0c16020d7a72 SHA512 96125081b3fe8233d3c2885c52cbd46c7091f4dbe7ff3e542f934c21c75f498b6bbb89200f9ed27dcc572b16dcb31bd400bb4d74b4e75e171c565ce7c1ecb3cd
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.3.mod 138 BLAKE2B 2a2a4f66f7beaeebc4fd09c010c1070dffaa86c881b1341259841a883b95b10616af9495a6c53fe7a726fd6e62ef6cafa2ed15c24a5a1d9491bffc76938c69b5 SHA512 eed5b88b29d831010236dde8569d3eb79d0c21cddc92ba6db576eac4100eff994f65df9e0a55cd4c71b30150e88db90a8b4be4d243aef67b0fdf0abc84557336
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.3.zip 14927 BLAKE2B 4fbeb6d31ee733b7c3cff2a48af43b4799b3f210c8f69a7318c1f5bb0df9ae1b4118d246ebc2f0615e786ac67dff22f33317e77232e2256282c2f19eb538076e SHA512 537bc4fb3b398efed9878a4155d988a896c298cd08b74e6c9bc6418d01abb8163b98b6868feb2adb2d481b86e2dacbdd7c23ca0e6a08dd8a76ca62f7c8586f39
DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip 114585 BLAKE2B 846541b55472ef94a8d2606e9cccc82fc52d189e48bd94aef69871455088915595bcc21224ef7728750ac1ba8e3caef7c303446671416f71b74d03de647a3f23 SHA512 13275b8246248b1c3001acba9ea6178a10263fb8ff3cc205d2cccb86682eccad96695bac455a32f2407f7fbd9a4bc3b68cacab722bcc242c606248753efba3d1
@@ -324,6 +369,10 @@ DIST github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a1
DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d
DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d
DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip 156422 BLAKE2B 18071e2808ed442be205365d206d4f36042953663db3b219b4a54e90e723e42d753d465ba86614732495f0d3d06c6ae577cfc0ae8d0f715ad4a88c8bb340ec73 SHA512 dc554594229ea4caebdc7dfe34ddd5fc054ee59f8717a6afe2d32197ccf9b357a7f66c30d019c6d7b89685869e0e04c0dbcecbdaaf79e47c766c7573dad54d4d
+DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d
+DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.zip 157790 BLAKE2B 29623bc436d2a1f1057532b98858f3e3309a0ae1cb209ca9e242d56eba97b84ac2b2f3533a542df9cbc8dd5521c5a09747adee1e38d3f3ec2b6a5517a0713684 SHA512 c689267a27346d83ac054c5202746c69bf79e5accc69a07c833ab00fe4f2a780ccbf41ed62d50e411322e62ba6603031134662c9e0dca18cd1ec3a52179a062b
+DIST github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.1.mod 202 BLAKE2B ed53e26428c0b7de6d212cd66333f6dca4d0c27f5f64df696dc2cc4c174f0e65b4a31ff71ab747d0a7e48994840bd7b4c955f325e3cb819fb2dd8364df407695 SHA512 438c4d83a271735fcab4b4dc92eefb8690be9f4695aecd6f3c65f8eb6040603172acf89c888df73f47cf03b2a206b8fb9ba6fcfd9ce39ad7601c5194f7b926e9
+DIST github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.1.zip 53103 BLAKE2B fb87d523eb80bb560145d051ce2425b7655909820e95c05facf2fd77291c4b592be95cc44553fbb7ff26a1d09318f33b17ec87ad44e6bdbc8db2677fde8207e5 SHA512 464d65d2521316a766d5659570aa81a5cd25a1a03939bfbe856608d6a952fd1eb63391852f92b28b35d3283bd659efa7906f940eeca7fbe25e11f20b005baa9e
DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod 40 BLAKE2B 77f35128903a84139dfc23055bf87c4fd8b4843953c764f0ec004a8a2b10599de19bd767a569080422179bd8ad66218d3639025cf1d83eb5cab22599b5da2c3a SHA512 76ce93f04caa8045ed49fccbbbfe76fc278bb7d94c973e408d0695e8c9c5e569b3dc9d4af8722f13c4718753aa72fea76a238dc8243aff34bbfd10d4b684e38a
DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip 12245 BLAKE2B a83d39eea2c911303550703d23c6c6be3e71c47c008d9bfc947303b5efe87f60983ba00a5fa3d28359959940ccf299a82971cc4cea9ab0bc28e7214db83398df SHA512 6b88063dd61b36a5bce08e49fa630d2a59d9e3617c9f9b5b747993cc66029209597e296dcdb38c126559226139bacb57dacf451bda3e50d6e85c7b4953e4dc80
DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
@@ -333,15 +382,23 @@ DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.mod 831 BLAKE2B dd6e545fc4ad948
DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.zip 550154 BLAKE2B e085f5b4c23e656f548e9d92cc3ecddb47a2431569240977ff7d7c2786c090115d5e360d478c3faa30b16a31a99f05959777144b9225f32afef69d77d9a9ab57 SHA512 818dfed4d0813bcc28c4b383daf039515593039e9171e1d970809e4fc5688dbf053bdb5b8b068ea9159397e0c240efacf0138d464699451406178569f77b6148
DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.zip 550550 BLAKE2B e871add76e92ff6d4f3a708ffe644e99f61126ee6008260249f1e76372a5449832e14583ee1b54109d52d6678f1267bff795fc5a7b0298cb63c8eb751433cab1 SHA512 487de808f4ee33a22ffe1b6c3c57e102e54c2162ad1016fdb243a16f2dd1555dc8d978d636b03d2ec5eff30fa436771ade7719c4a650472533b36c0868c418c6
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip 553094 BLAKE2B 87ad7b11fc8edf2edd2a619f1cc262f2caecab0ec3c626f30e809ad9c366476e49049e8f6adb7f55c9a719ec19505eebf2db55d93559ec134f42479e78cbe968 SHA512 0daaf5d99ee54e7ff0ea882e77a38ab344cb427a8833a5c7fa30936d401d4c9edd6ea603b48821c072b6dabb2d9f31d74ea38180e23cc0949756b8e828ea0070
DIST github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.mod 577 BLAKE2B 6966cd924bfb433dee02347599c131e85701a7ad37be76369b3a72ba8d6d3927abf1337426eb508a5a27c77f5005240a08ade70e93e546ed752a70fee483a3ef SHA512 78b71a31222bb3bcb5310c929587b13f19343f6aae9284654bdc3ebee9249c9a8440d428af8273acba18ff144265bcb2e8cccbcec6e18b9cbec2fb0f73dd3abf
DIST github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.zip 72918 BLAKE2B 13c10ae1ffb312d91cc1a4dbcb072ca3e9ab4cba3758a04c6c4ea0d7b875453819fa8188861bf6f284f57e44a70f8d6c436699289f44a33082ed8088b1323bd3 SHA512 c4d0ef607d0116b64507ebf631d5190bc6cd2c5508ccf060b226ab7c4798a45b595fae0d132968918ccdb644cf05335d7de76c84ac7a188f4b7aafe8068d725d
+DIST github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.mod 639 BLAKE2B 3573ac4768f18bbb167c0d524d4a51b9cd31ace23ec4e9dd1c6980eb84dd3120b6a336fa164ec3983a7f4b32a5531819dd3d2e7b6c9829ca3714302ae1820e0d SHA512 44a1ac2d2408a9cf14670e9fe4f32fd0df797d60d0de05030f41a7887503f03c79fe06cd49755c9083a914c126d76c716d8c2bee70d1edd44d3a9bd38d3d1406
+DIST github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.zip 103305 BLAKE2B d5c8a1952f46d435943fc9f40ea001699d2ec26df8405e89797994be0d5afe6603909dfef88a7f7899a17298a73652e90693f49eb660ff29504621fd034b9625 SHA512 7d3ee8537b3390db69a83a4fdca5a883705d81270bcadc3ce82b6396e7751af40da2e38ea3d2d7d2eab05ac0828b367d60e2892d7838a28d5cdd53400b5f5ef9
DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.mod 1594 BLAKE2B c6b069c73847f3b115faacacc323ab407df86f81a9056347ebbd15eb12ac642d8e8a7b0410afbd076f18b704c18830144a4bed5a98e6f31d67c14fd1219fa7a0 SHA512 c4a38235e1b91838e6743f4bff89ba737e6427a65e9a2d34c750b63a75ea86b7ce13243b93d13d34f9f384dbf678fbae5c5b5e056eeece9d17511b9e197444e9
DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.zip 317301 BLAKE2B b4763083e5d6e71330e880a5daa29192dc20db6217b869f9714a29967f8a606ea6e8e8190b26fdd553017045069123fec3bc2ab7884eaf0cde2f328fda16dc56 SHA512 93290fae6c7317919fbb85229e00ac7e56728aa1a226bf1cb57a6defde4491cb8032c4d0c022ef4e06056af47fc2b1a6944521069cf9336dfba4a57227343075
+DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.mod 1198 BLAKE2B 6c06f699d99ae4b389918fd96bf7df7e61c573cddfd261ded88aabc7535a79bb62feb2c1a9ef61ea81cbc3df979de97c87093d8e06fe5341f09cea49f6b08f63 SHA512 eb9a9bead036c59a35e051874d86749b1a17f08a6bcdbbc4bffdbecd403c49121335599fcd0b9bc4e932c0b55363eff5f95908c0208d5bc9d6ee2470486cfb0e
+DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.zip 357137 BLAKE2B 3e39351e122e878d3d18859f7bc5d5bc2991a5efb0b42c67e73626c46c2d16ceee8a1135e4129a4e12111dd18006a9ffe8307b8a015eb67dd7c913425ef12a1f SHA512 17fad4f469ecfa0a48ca4fc6e89373a595ba379902c243decbe4ab6819736e629f8499fc414429837f2b07361b3788ecdbdc8dbf29e380b397f58f196242e907
DIST github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod 32 BLAKE2B 40839230d4a1fd6d28597a39b0d98ac4aace76a96dcf2d222f073554b8df6de4fab48c0613b7bc2da1b4912e338ede282043a3f615a87c246bfd71488a671337 SHA512 614955fd74641e34555d843e335d5e35cf79dcc6e3b4d43bb0ba4fd6fed7d332365eb874d6bdb7c3b5be576dc3d09356c8206d1aa4d70378581001342f4f7310
DIST github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip 24656835 BLAKE2B e4c0912be7d396374a372afbebe32d279f7585ed598f3c5e0edcc68e08cb91ba4e0c18df99eda33a2dbf2684c497e3a9e33010eb93039c0dd651ee4d1bb842f0 SHA512 671654641a1ed413628c14b6406cf68c6b6f95d6db9aaf4510b08b9c30042d478718e48077c1414e13d0c66e6a592731872ea7e4249d7fdae2068cad6588e551
DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip 28730 BLAKE2B dac64266297648a7f3519e13bae1dbfb4d46f818d02cb1da520a1888b085ce31028e274e5085ea58d8786e9f39144880ece626ba46b50b68d37dc17d730ecdc4 SHA512 1949e95d8f3d259b27e0152824e25aea2ada28f33b56282a62bed9a6076a25dbcf664a945c5fc3015247c6d3f470192fd22273d60bbeb155288574bdac6e2e8a
+DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20200609203250-aecfd211c9ce.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
+DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20200609203250-aecfd211c9ce.zip 28949 BLAKE2B 5b32b51af5020eb8e48a78bd2307952b576c91f1b7f4667ac9f8eb9ffcefda3e177db0d2139f5a6f388b048b49e10c64dd3bebc38d4fe42af0bf7ada96f0c56e SHA512 8004b328f3162fa52314dbfcaf6eb880e1ecd205960176ba54812e0b8632cfd1b1977abbb559086f4bba867b027357fd4776d7bb58b10138bc09f27af294e072
DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a
DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
@@ -382,6 +439,8 @@ DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 B
DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip 11505 BLAKE2B a0c7e576801c150d9eccd27e0a36304a931f9ed53da6e47f69882cf78cadb4e61096d2c748d1ae5bd5ebad26f5f4c2f37cb0b6e15de0a7b9aefb0aab86ce4134 SHA512 0dd52dadb4327839bd37391c19a9e008b2345f9a61356323ac79fa0abd54e23223d7e5568562f26d937ed05171a3b63fb273510867e612e2eb1cbc44ce0d8928
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip 11508 BLAKE2B 609b34f41f3c1579ae15bbdd5f9632dd58e9082917acce355ffc5402c33ea45bb0bda32d009a0a58c6cd60327aa87008453e0c4c36ed2a1be41c4f5337de72d9 SHA512 0f792e6f960b0cb8f9a30c25d3a3f30e7c459a05d7f03f68c98cb581967fc48b377314cb83b990c9509cde5680389bee0ce2b0b1efedbceb5592f38a9ae6a3ec
DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
@@ -414,6 +473,9 @@ DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 4437
DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod 371 BLAKE2B 3ff3ff24a8fa567c715a8698c5a636f3eb2b1bf95263dc71a57d506a8fdf9e25cd741b8d0564ba95c04c696ba536ba44149da16572e13c1b5134c24dd0edddec SHA512 5a25ee9f24cf52fccb76de4ca0d1ee7bf309044e6700d48273bc1ceba948831320a51a7013584f60496df642284a4a282b2ed44e7d6290e96927927a220619d6
DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip 214127 BLAKE2B 305af1bdb26a01095cb780a27be74f6a3d53c72b1af1b6388dc284290271c6a2cd39e06b6d8856d81584b35be6c2ff1ee38d79175502a9e2bab782f29cb855ae SHA512 2ac387028c1ffe54d5223a0325e2c36c827ad93e24c628ac353da6b4b97df9ccbb3f8d0440449d3b190f30ffcfd7fb865e3e030b882dcbdea116f20e3184fcf5
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.27.mod 333 BLAKE2B 8d0eee290f65ec90aa77494795ca379d6e0dc3c1a3e040b045309e1ddcac7623330a140fccbf829cbd32cd6788195f3446d340144d5757340734804504203f86 SHA512 838358c8d40bce54c7010bf6c141e2022f2036ba91129166dbf27e2fbf355b8c32392fe8fd6edece94934c460c1b9bc73c496627b4b7efd63341d7086fd0b114
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.mod 333 BLAKE2B 8d0eee290f65ec90aa77494795ca379d6e0dc3c1a3e040b045309e1ddcac7623330a140fccbf829cbd32cd6788195f3446d340144d5757340734804504203f86 SHA512 838358c8d40bce54c7010bf6c141e2022f2036ba91129166dbf27e2fbf355b8c32392fe8fd6edece94934c460c1b9bc73c496627b4b7efd63341d7086fd0b114
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.zip 224434 BLAKE2B 7719d75840f11f1c547a91228ea7472b1774560966f9b456aaa3c19095e9bfc51c4e8655aa0a0a02590a52f0b06c2ad6ce3c0994d23d64f5a324539d7a98eb0d SHA512 d60802ce85252ea35f932efa2c04e10ab19bb94d56e6e7c84b1c41b9a43124b9b9e082f0eaa1ac7c903f31d70da9b8bb1f537edc71c0dfb19626226860d52a4f
DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod 425 BLAKE2B 8e9c5ee0d4795def5f031ec58ce255227d2d17c80e0ebe028218e3022bb7c5b2cb831981a3247279a5405f36a061e7f0ec717f7d71ae96f33b56d20d0dbea520 SHA512 743b2f950677b8d24423a2491cfd67edcfb45d032e6995a743ebb1f3d6ec6f407f2e4d1d56b2bd14cbe4c519523ee83470f3e594f2da6e0b3fe7c2dfbad9c961
DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip 30608 BLAKE2B 68db36e6420be62aa1594d415cc95da064c3f80e220891bc747ab61d1bada168fa8c33875bb8f5a1b3cbfcae6b9f48cc28fd792b884f7378b797f5f7445c268a SHA512 41d05b304a7325dbb01dc2704407f5a7c7f7c1255c58cfde66b1d9668b15e1b5e83b5159b25a6ad7d6fed90e64446b32c1633135a018bbb4357c495e3efc8a83
@@ -439,6 +501,7 @@ DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f7304
DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip 25943 BLAKE2B 9cf08441a9bb45da31ac429a372a969a822a0c5de569352bc25403cdc3e8559a7110dd2612cc9b93c91882973aefdc70f8ddadf44c1488eb0c3f5bc62cca2b73 SHA512 43d57d9ca99ee6af49e8a39be4d65799afccc8cb077a8c5b473a9147eba30d4653a8a4cb86abce66d4c8639d1eb0d961c4a50907ce9af2b2864acb615a2ecfc8
DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.zip 28419 BLAKE2B 401adf54267565490e3df3de54063893cdc3dec5babdd5ac4410a85ef16a65dbe13168ffe85a78ed9cf13d02cc873fde44fe5927c691b99587a96dd49aa3ce22 SHA512 33509ea85f0e0b364d5844f27ee5616d53b4665b75851a6a860169d5cb08f9c1e531ffa0b7108dfac4098e17b0d641dfe6ff824ae7abd0a9ee4c1ab47848a1ab
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip 31024 BLAKE2B 0764e170ebb5ee0b3c4a827b6df9eb62d6804202375a3c37b115879f7c716c026f80aa08118b6bb7ac1a1572070efe8acb235e1ae2e1a4f154a5cff4f4a4bc80 SHA512 e61765ecbb25ee639710d666f5523cbdca9ac5792782926d5ae7e0b13545e0bc5d0aa5d090bfb5e2b6ea218b55fa3fe4ceb8a51e5ac432f7d6e5c9eb86aa043c
DIST github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod 104 BLAKE2B 22fb94f808eec8235c32993a7348c9ccaaaadb1d425ed711b42b30c4f72c214ded4b00f09a0801a07132944675da4b5150c76992b38e3c09c6b33ea9dda995b3 SHA512 bd4fe6712436e85787eea6bcbfa7eb9d4b63e06fa1bcfe357778fdce536d8cd5080b00a41f98f1634b26c1e1e0f2444255fcfab11d0a168678bac405532de5b9
@@ -482,6 +545,8 @@ DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B
DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip 22487 BLAKE2B 93907f2e048ce0d8be7636d9ddbfb61f051c6142402f725609692a1644cfb4b504ebc36efeb36ef1e70463b54c809b7c71b9596705a0b0e1dc5f7a52252be5cb SHA512 1619cb9a2613384fa025772cba512f24c29947945bf1d85e476a52be8f5711d4bcb670750dae0554741de3c9190f70ea2a2c60e6b04e5e5fe4bb653269f5a849
DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip 3703141 BLAKE2B 0c8b5a768e298b8bdf314459aeb938a4a05dfa22bdee1b0a2d65e7b02edbf2be6b73ee51a331f4b1d14caef6bd9a001b11a72b85f5de3efcc044501fc2e0d3ce SHA512 b5352137315ec28c2f40f201629a4e60ac26a218a3c75666cf56959cff953fbb6153123413fd1518a1a636d10edac9022ba9f38065274b9f88a89e937283eefd
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip 20573582 BLAKE2B 4c5dd3e4f8ff6edabbd14b78486d6213064a8ee351a45efae43bab610899148060dba9143998f37667d8170a90a70187558b9eba9db36ef6cec5e18df020c466 SHA512 fda30f0b48b9561870599645cb9dc0a788d0f1fb8217e813ecbcf9a36d29d2185a53670bf81e21709484b22b851c0b46ae99265327f4af4c78eb5e95821d8264
DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515
@@ -546,6 +611,10 @@ DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29
DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip 4415 BLAKE2B f50a9fd1f74506625ae9460c6071bbbd1dd3ad3d83264fb7def028c757e8ad8f865fc7255db6e9b5cdb7a1744ac1f741bc6184f064eee7108f6fc0facc81f639 SHA512 acd19ece301ac146ae50dd784e3dc1c2cbc0c00a562fc5d2759b7b8a4acf0b5bf83d5bcd54122130877a1568a13709c28ab7e1cc7ba269ec91aa1b1a86c2065a
DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.zip 205379 BLAKE2B 7e069cea8b9950e7302c3568f9793664cfe7c0c1264b552930c4876f4d0d5365744a5098eed1670fec1b8f595a22c593d4cfa6d67c1fb24dba57adba2245e778 SHA512 00afbae051f41af4efe229cf2851a923c7e9570e24e8b1a01d5e395f9abfaabce590e9998e185391c38970faaba6911a1a6139e2851a5bed2b4a20c27c352a2c
+DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.9+incompatible.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
+DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.9+incompatible.zip 237135 BLAKE2B 9e8ab4f0dc1539b578ad21a2b74bb5a64460912bdd1f8508a390d7c4790d4482a02993e31ab2c94572b9e68d86b8d50beea52e17c777301e2c1c7562afabacac SHA512 dde9012abcc21ee5ac43b962a0e55693d456171b4d0e71388efbc3376880dfc6973991cca66da28488f46ca5ee862b8b2c08472f26835ffa34b8c47dec5d428e
+DIST github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.mod 258 BLAKE2B 45e0afcb6b9fd29005ea523e2576e5c5e82f62095a8abb059e7a9b13de9e23d2cd743ae15ae8bea50a07d7c172b03836eea887ca5d381f947c50a655c2cecb7b SHA512 65f7f3695c82e7039187709df388db8049aff76aae334427e78cf224cce118835df370b4d59430fa87f652fb1f6980a92586a081e32c866159d42dd5ede26a70
+DIST github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.zip 232475 BLAKE2B 25d425cf72f811b9dc03c023e401dc78094366d223f48c5d751a006fb494d595e1c1014afc4292843368b9e93e4e2aecf5f6a77b19d7f4fd92bbe3b253d6f599 SHA512 46d27a762b8d27799904150ed77755a530be4e8eb47c61ab63c545915c682765b5adf885af9911004a7015a821eb86d7ba2b81188f3cc3031855e784d72b6964
DIST github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod 29 BLAKE2B 5a64bc6a74e308dc780f55617c18661ee4a570f5c536a1d8470ae197f5bde87ba88412e360585c3e7191289a2c478ec7c96c18cdd7ab9e10fc92cb8b098281b0 SHA512 54b48a0f515bb99c21f86f0cc9dfe9e06dff5bf8de3a453b1d91816e28d04fe64a52d01c2c5a651b51cf21d328fba8f97a3cba92e23d66e229034f8aed23a545
DIST github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.zip 54143 BLAKE2B b408a5d554b816351ce754904755e90525b4bf74b7e529d0dd378fa8eae70a64677cae34f1efa9477d865fa752fd88ee9d1e5d420608e03078ed0f7d1aaaab4b SHA512 b06876629d4ff5d9145a1608ea513baa72b04087dd8ef5e4ae1ea611480770bb041be9b84d19a66855fc57596cec861e70e53660bb63c9385b0e72462fe913da
DIST github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod 37 BLAKE2B 9945435440e0d3be57cdb12cab697382fe91c56329289bbde332bbd1fd15928a5101d7fcadd89064ecbd103130514a1cad383db097d02d596138fad0348c15d0 SHA512 7f46d39bc8f24a5c5c1ff513c0f0018d5341a008526a49bf0b3694008c272b3080b0386a44ba6c27f2894bef19dfbec5095c9189ed222ed5a55797788668315e
@@ -584,6 +653,8 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0
DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod 51 BLAKE2B 08863dd989e6100eeb94aea780331caed21f93fa1ccc6dcb4c77050afe0b8ede362f40e0a8271668e2ca0e328a3594dfb6481640ff3d5f1d1ad3e6b4e7747e11 SHA512 dcbae023694dbb97fa3e1cd6bc20ab7eee364117c45a45912e6d782744a54e0b2292936cce6e807af0dff179a495993e19ff86360b27d3a79c90a1f81b6e22b6
DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip 1101286 BLAKE2B fedec4637e5f7bdc4edcc0cbbf3aa451125c95f932d81316351554bbce5b45b68ad359936afbc5d46d602e5cab4a7534fc8a80216a713ee8b364e000ceef8d65 SHA512 6d848faf0c554bd0a1818108b58f15dac2ea8378f5dae46bc1943e48319f9dbc87e2ba2efcfbd45b5c74e3f70ee8702c28b521e3fb2442b52c949bbabdf85d84
DIST github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod 36 BLAKE2B 5eebb18ea03bc58198d1b18c741aef83b26e69166ad294d9fd109990b528bf96e38ac47e03ad7dc2bf74f763ac292bee5745f8e12e087330225363be9c528bfe SHA512 15a75be7ae2d3696bc36a1bc1f4f26628d9b0af57fe5845df5ac329690be5d0f60ee88ddc43cde47bdbec74afe8d0e3b9a6ed531be640ef8bced3b3cea85f4fc
@@ -596,6 +667,7 @@ DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod 33 BLAKE2B cd0b56c3105d5a3
DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip 1438412 BLAKE2B 6f7e05eebdc4f364300d20eae130ed0fa9cc26ce2827bcd6d28b79329126b21dd1007401f05341f9c0d1139efe5d58aff826ad2e48176aeaf9ff18f7233d68f0 SHA512 f9bb8f16b0c4b19d4fbee534281dbcbf74782f9bdd3ea06f9be9b967c6f5e4629e42453394ea7fb58624f45db44dd80b19360c68074c763c00d73d52226726c3
DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
@@ -603,6 +675,8 @@ DIST go.opencensus.io%2F@v%2Fv0.22.0.zip 291484 BLAKE2B ca3bfc9c9864a2218ec373d7
DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
DIST go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod 312 BLAKE2B 16bf4900b2afadc331814e16a34fa8cae0cfdc78c7ea9704312f121e166c93b7811db3604f6c167fc526faefdd1eb0ffca1dd09581094bfea4847fe0f62ecd91 SHA512 8814a6b8138027c366f3ebeea9033a71019990faf1cb613d75a25498a3a74d61fa2ba662302254150370a49a2a6f56da5c54889d4465117cf8afed4ec6cd9f63
DIST go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip 24023 BLAKE2B 4e847da3c0de521f65e74beb03b24f9f3707abf1ccc6740b18e9109a28dd0300effc7ec181546b5cae7a8fdd5e5358b753d69e0a17ce5f18151e6e2c6c930ff9 SHA512 d8bb8553e96f2c7e4feb404db453a35c1ad42590f36a6e294f238282c8c02bbae2e8f524767341ac20ca6d864b58c46572c3e2236c24cb8d10c710528f18161e
+DIST go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod 312 BLAKE2B 16bf4900b2afadc331814e16a34fa8cae0cfdc78c7ea9704312f121e166c93b7811db3604f6c167fc526faefdd1eb0ffca1dd09581094bfea4847fe0f62ecd91 SHA512 8814a6b8138027c366f3ebeea9033a71019990faf1cb613d75a25498a3a74d61fa2ba662302254150370a49a2a6f56da5c54889d4465117cf8afed4ec6cd9f63
+DIST go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip 24823 BLAKE2B 25394ce97a80093bcc7113c651d95fc383863a5efbb47825d053890ee2946f04ba4b9c4bb708458183b91f195133d22fb4bde840a25b6150c1c6a756ef417fd5 SHA512 cad58d0a0f37a7ba9ce7fc5d4598d511eda4bc675689f968b1d02c4b2e95d15976b6aae9d4b8655d2aa85e255308414e474fa6d42e4f49b31092e2b943648b36
DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
@@ -610,13 +684,20 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BL
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod 88 BLAKE2B 22568b660b7e13eed0dd423bfb6b033adf659a2c2b59c6ab12d707aca9f6f7317b7b438640caf6233dea4d9840aec4eb997eff5fcccbcdb193ba81db52d814d7 SHA512 fcfc8d63d333065f1193e9c27efe32a1fab270e450fbe1db533156e00427a13c75691163cd1bc7e9aa26b84d4142625c9fbd755535c575f83d63d82d7a276066
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod 146 BLAKE2B be8899d39fa75a36aa5a09db22d890466433efdd5310fbe61e7672f3c008a9aa34d038f844ca92450e9b8dde8c7d4d3649984f5edcb02abc34c71f46ce584c76 SHA512 173aab1e733ef5c18c3d259720c9fd7e46681d525ec934b4dc29a56beb91a362216768c28b50891b6230be003bb8e38636974e941d4fe6270a016798675fddea
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.zip 1845086 BLAKE2B 967aa93280eeac0b9ce3e269d135ee547cbcf007d6411e94eb8b7a6b32dbec501fef102f908e977c670e57c60672b0fc91ea16d17d106cc526d91ddf4427897e SHA512 86b0caeffaa24b588f4439370b3b5b2bb087c9a76e409dfdef278d42a2f21d57aa8ee019353b75178f72441339eb796cacaec5706f9bc73e820743137ab531b8
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.zip 1867651 BLAKE2B 7e9654d95bf03c5462d4d6420e676bd4a0e8769c5cb7954797a66c89298ed16063581391294b7c3e7c1e735ba0cfe3b60e899fbd2821b98179b2669740271a68 SHA512 a0560b1c03857faee4e6f6d959d042258f30bea2bb86af07c701a21c7a6d7e44a8929acd3e42503daed070c3597abede768af32814e252441f85823f330e573f
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip 1876176 BLAKE2B 84ea067e58783d36780037272d669162fce90fac23d5bb6090898e14ed6753ebd4bafc001b3e3ec792a29a2a802d57763a365a3f89f1acfc37f18e320aee42e6 SHA512 1a94d4b9e787a0f322cf9ee223c3b01d8dbd34b59381330808d2682ae05de0cdad62c31e085c554033e852bc5fe49d789993a668a2d75bd7eb8b2389ac774e65
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200930160638-afb6bcd081ae.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200930160638-afb6bcd081ae.zip 1876107 BLAKE2B 26a90e5dcfe05fac82496bac10442319680f5ab9f7f8e0f48f3994b677d2187f9cf735bb7da92ec74ce280f5c4bbf24893aefe4c859137c198118a3ebfc5557e SHA512 fd50b978909b5b2259da0cc5d4db8fe582b003f4b9c2e387a9491f2648521475c640a21a80d375ba006f0892595cd14c4e1c130a31e7da5a2cbd8b8673feec87
DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
@@ -625,6 +706,9 @@ DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAK
DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip 45710 BLAKE2B 7349ff19c5695071b04342199b7694af51d7a63b2a9940c72abdc8e2a03da41260da0ae09b039f1cf2c3752c7f2256164a3f0f4ce00410adcd5389cdc07e5cb9 SHA512 00ae7262d6a4f5839915a648e09a51fd939300b9f0404f2c13c062412d059b8278e3c40b2db2a927bffe74a940295834c18b77fb7dc58e88401e0b7606c13aeb
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip 126236 BLAKE2B 48caec10f6bf4b8da7028b0358645ab0414b5526004479ceececbd68380586bfbc5b4cfb9d43f8c608565f30521a0dbfe005669db7d5e245a1b63ddc8171d3e3 SHA512 2735c124a735b4cba606e4e3de5bb39c889aae2516525f778764d987b58677dd263cb286604fee63bc45636662c11e3dcc2c9726dcaf85a26e072ccd56597b93
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
@@ -646,6 +730,13 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAK
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip 1423356 BLAKE2B 412d4c362e9d11899790082861e26002ed0fe500b4d5d0b9caa1a00ee9363337d1e47cdc6a232d858d00ff10da2b581c000d20208539098a8fe1f83d012fb00e SHA512 dbd74ce99432faf080dc0980624adfea31cd74d53949a4b747e14d6464632c48e78c40a1b862305bb5650cfb1b202f2c024f44f9ffdcc104555e9f42b4eae30f
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.zip 1422609 BLAKE2B 9d879e8be7102a414510c297e078d409982052dea09b5990d3c2618e8f0ec94ba220c972356b1dc7dcce4941b7d5ba6dfc2e0490a37bccdd34e63bd4f71810c7 SHA512 d0608d4fa986159af8c4977c62d99e9b98cef21cbab548246deef3e1b054941f1576b6243e65de6855740869907098721be140fcdbff6bae9e523af736979fb6
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.zip 1503269 BLAKE2B afc7425e8a2354a2ea7de4b9e007d7091796edc22fe2783f2ec1cac2d0554d87aafbcf49fb838b1ae4f0193f936fc4cbb87fad4ceb4e5cf4e2b020b73db7c648 SHA512 66fe99252beeb16a4a8b3e37da32343955f1727043bde2ab9e5797d1e6b65b85c97292b43ba0f19587e03e02d6bffa7b8cb0986ebb714e992b9d91571dfdfa6b
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.zip 1505530 BLAKE2B b26f3f943953ecb17996f44c0e8278b56c7d01648227cc0b73cbb17e9fc44b40bbbac34ac4996fb88115a6451178d3c94f4c17a43cedd30f9c147312fd7e04ce SHA512 7b36db6f767f03d0a14ee599c6d1bcc7cf5cb8df69b9dd46d7544aac59ff6aa1bdf38af0f3f31328f02b7643f7655b375f8116f829b22993ae49951ab28cbef9
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200930145003-4acb6c075d10.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200930145003-4acb6c075d10.zip 1504583 BLAKE2B 053f287d785b3bf1bb908bd2e43c1891e2947c28a705f441b50657d40ee2889d121c81704aa14a73a9af36b616b2b22a3e59f3ceb8ea3a1e73979d61cafd81cb SHA512 c20133e196db03e0cdd5d7f770cc011b8cf29d8ddcd39a27d44586f7fd080bb17224d1d0736792c51d9dc6f8f11b13cd8bc07cf95fbe1c8f11095653b9633585
DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20170807180024-9a379c6b3e95.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip 81780 BLAKE2B 48e9b7ec89ad3f9cec88fe6c62ce64348a9217a134aab7306a07fd8cb28eeff91b15cf6f59ffec36df23a086195322f28e76fc16c026f33d2f419dcd3f84de04 SHA512 c7656f3c10140a5cb08620ce0647d0b2026272ec41bcd9df346dd2b5de5bd2236835ea117091646151a991f8f3aeeebd0cdfc1f784015d140162db5dc49f7325
@@ -660,6 +751,8 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAK
DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip 25620 BLAKE2B 770b7dc9bdd8999123fb58cfd951dcbd5592172fd394f1a70abc918e3d7adee5273da1c757f95be15a0ede27f4fd00804564828251ab308d6fc4b116415ac144 SHA512 5a9db9d294b5f2121f3de994da38161f013a0512ad64aaf51f1c7a94b7cdb1ec4102f7c457d29f9bde209e8c254f6ad034c294af3649dbd10d5349c05874f74c
DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip 27020 BLAKE2B 0ba91b5129426896f009357980019a5e1c4cd5568108e615346a2d65421a6a595035069e6366d98af40260a020f90f6b55214e273a7dc92a80d3faee540bc0d0 SHA512 a9408e27c31248e5e6b24c0f255512c97e73e0a972a94e0bf0b0181eae42c1213e02e6988a71178abb05c2624da2e6b7beb12f2a494b630753a083dc3133b58d
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
@@ -692,18 +785,28 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod 33 BLAKE
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.zip 1914030 BLAKE2B 7c223aa748649c75cfd8e921bcb10cdae7b52fd8d9096c7a5a0b0a167a307a4813e7b0976647e2d70c658f1a75e9821f78f0969c9ef73da3d498d6755d504f2f SHA512 43ed7210474ffec7b4f9a0dc29e9f4ae5f2ab6ecc5b9f02ed28d9751d8f11e3cc27700e5b0838a76f450d9bfe074d56176d5140daa3f3d40b287695ebd3dec18
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.zip 1490646 BLAKE2B 5114099217e143e032f735ca97dec7aa76515d49d08fdc2058612f1d8aaa0d4500c077c9df6521e94b84edf50983fc146ff5363a0811d4b60aba5145ed8f036e SHA512 0e1627eaa50ccfada08460b02929f5c2c91945a4082b2f2a9c70060d40dfca25d87bc2b056380960158226ea892f5f885bb012e686ff9177d57426486df34def
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.zip 1496293 BLAKE2B 5e4cd198d7a461db0dff9b387afd229472214ab6d204c4d55c6bf36ee851a07cd73b61a249603d7f1e7d917097bd9e118ff78b94f45f9d15834ba5b6df897c58 SHA512 167e2b6faac57e06c420b9c7bb7d16db9c30811337176488893807e5ff88aa0b24e90e1ec10ab6e282f1b4fa2e91f2e3d72d12b276da8a85bcf29b7e2df4e25d
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip 11671 BLAKE2B 0a73cd55380594ca4bac71bee0207b51979e62407ec3c828f975e8091a20e2b9a6cc331dea88cf0ff44ff3a6c7d1cfd2844651acd1d957c0d725de525a58985f SHA512 ccd129fd4ce8e4067d0ad4b164cd8c4fb7ba65d5022bb656dfdb50dd2d467152bb83760f3d94c465b6d4c29c29931c8be6c697e1634ccbab4eb3a53edca7dc4a
DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.zip 11992 BLAKE2B f5b83bee24babf643a85b1ad338c9cda760634c279e495f2faae96138854cf433abd98552ecf7e4fb815bce96f38a8cb2601dcca0966f244d6e55e9622a95542 SHA512 3b325af08ffac024bf39a06676e4daf051b82bc765803224fd14c3251b87c5d4376269eb4ad6f2a511b72e065b062bc41823400cde602013cc1d3e687509f85c
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip 12009 BLAKE2B 62af63a123635afd495a0e621ed365f31b284aba1f891d09f4334d63d46a5dc0387aa055901e6e74bf358e1757ae91ed8515d3e2c9b9388f7f356841eb6543ab SHA512 a1727535cbe56fd9c94619ef7821c06d1b2f2cc386a839451aec9b1d101118b0f1e64ee78e7aaa72660f9a780e1c74e0fed3f07bc8f8b4dae9f7bcab4323ea01
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -717,7 +820,12 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BL
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.zip 2908944 BLAKE2B ed5521ac56f8fb0bdd6404dcbdf90bb0281367b3afe1075784e09681a9a2e24bfdca192b77ac0870f50df900b3fb3e3116cce6ad109f75f4fe0286c820c46cf3 SHA512 8cb13d39ad71c10de694ae288d5c2374426e8b674d6968b02da1fec13d2c7637bc105d2ab509acdd856c747ab8c804fb5fd2a1ccdbc73def16dfc568ef1732e5
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.zip 3126124 BLAKE2B 9e774521f22e4aee369dd03497702dd04dc6a83fb2e94d49428281d99892e8b7cad13c840231d721b0f338fdcc930812b374b5e4eb9db96e5fd8d81239252826 SHA512 b009aa0668073fa9872f10bd5a6ae95d55ea2b9187b074d21bac30fbdf587e574e24b75e491124973185a62a8de725a742d0524c0509b237ff4b6a51f4f5bb23
DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
DIST google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.mod 29 BLAKE2B 411ad882e1d61d9e7a02f83256abf55c6a9557a980b89d7fd1a8981cd44f81182c17659e2fec1f4a587163a16556076418f166e90118a04041a8c488f9bb69dd SHA512 f2367919f017863362525d492f3c7f9e36aa311a55f96533ad6a2db1dcbdc9628f516ca435a43cd63a09c677c3528c2fe386907fda1da7dcb69ac2f6c95bfdc1
@@ -725,6 +833,8 @@ DIST google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.zip 10163
DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.zip 12958909 BLAKE2B 9ffceb4fe3e735aac577decb8f9db46c431c76a121c9ff946d19ad36081c67119c3f35e7c0825b761f206edd906eb95cd33f83ac3af24aa1c08e46d58b276b87 SHA512 00e929de2fc5da89f64d434ac2a4ca0252f7ef24926dc0c8c43bdbc84348522801b98346739b387c0b17c88bdb822875301b32a5007b8ecd54a443e0c4ec3057
+DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip 13193468 BLAKE2B 26449251871cda35dedc488c3c8c8fc4dc14b1bf79dfa5160b44e6890d5b350111277b1791b18d91a42bd91b6f382baf3caf62584e41c4a928afe17d564e2e6a SHA512 85d4096a7d867d8f4bcc1b3cc582512d94c626023d8abd20ca343009e62b600150076f161f3582ec88c6263695fec0c11de69290a6c6cd04a177272740132be8
DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip 408151 BLAKE2B 9f815084675da034d639cf3e8648ee5dd2d1282d2bb6937ffc91956b5cfa46809499441a39636e4f0565c4307854977201ecc8cfaf38b46557c3e715cef0722e SHA512 1eeb760cf1057c306f2301ef4c7065cdd6dc18cdeefefd3a1cc8cc22efa312ee5ba7da6b79a4e7666bc09429d1ca73d7bc1db574f9cd33d271a72700a070a219
@@ -770,6 +880,8 @@ DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod 34 BLAKE2B 618a69c0e95948b
DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip 343284 BLAKE2B a4f4f886636b920a987942524f504c0049ca3c9d9ca5be16101109235e77e9a8a14106fee9fb2d02d403a056dcf5f42b0a4e4f57d33dbc78a88e0df5682162f8 SHA512 0b212e847ef8972bbc9dc96685c9fafcef5552e96c622134cb1aac903aa3f6f5a1aa65a2f179e93396fcf32ea4139a34f46c4e6fb3558c9da8579282095d1baa
DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.zip 348295 BLAKE2B 00276bc79832e003d0a5880fe6d24d1252d45d55170cdd29e1c380ed07e070a2320549c179fd905292b3c148e33d9222ba9f37ff6d09c187d1fa3ead8feebbb2 SHA512 267dfa1a02e23d3fe266a03936a11afb962ce091d6fc1f0416ba5f0af91ed32e013f540000e1b62fe9c41d70b10b65e91e7e783ed7dce6daded9dd6474bd462a
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip 353844 BLAKE2B e4d24ee5a99951c19c32328d6eef3fd6c886338bc7189eec9e60c99fe89e5728b3f00824d0f321bbc921738a40900d8d90ab4d9879e8efee529ed4273df0c2a1 SHA512 7ec385824affaaa72aca2b5af052dc7e941a24b1712e0e1945fe6276df3b02ca9eaaf79fdc0888e398aaf10ce3b261f0d23b2c6485184e6a6587e1d04f1c8742
DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a
DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
@@ -779,6 +891,8 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
diff --git a/app-admin/consul/consul-1.7.11.ebuild b/app-admin/consul/consul-1.7.11.ebuild
new file mode 100644
index 000000000000..f8f883f790eb
--- /dev/null
+++ b/app-admin/consul/consul-1.7.11.ebuild
@@ -0,0 +1,581 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=5ed69b69a
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+
+# Upstream doesn't use "-mod=vendor" in their build system, and the
+# vendor directory is incomplete.
+# On the next bump, remove this if they have added "-mod=vendor"
+EGO_SUM=(
+"cloud.google.com/go v0.26.0"
+"cloud.google.com/go v0.26.0/go.mod"
+"github.com/Azure/azure-sdk-for-go v16.0.0+incompatible"
+"github.com/Azure/azure-sdk-for-go v16.0.0+incompatible/go.mod"
+"github.com/Azure/go-autorest v10.7.0+incompatible/go.mod"
+"github.com/Azure/go-autorest v10.15.3+incompatible"
+"github.com/Azure/go-autorest v10.15.3+incompatible/go.mod"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/DataDog/datadog-go v2.2.0+incompatible"
+"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+"github.com/DataDog/datadog-go v3.2.0+incompatible"
+"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+"github.com/Microsoft/go-winio v0.4.3"
+"github.com/Microsoft/go-winio v0.4.3/go.mod"
+"github.com/NYTimes/gziphandler v1.0.1"
+"github.com/NYTimes/gziphandler v1.0.1/go.mod"
+"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
+"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
+"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310"
+"github.com/armon/go-metrics v0.3.4"
+"github.com/armon/go-metrics v0.3.4/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/armon/go-radix v1.0.0"
+"github.com/armon/go-radix v1.0.0/go.mod"
+"github.com/aws/aws-sdk-go v1.25.41"
+"github.com/aws/aws-sdk-go v1.25.41/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/boltdb/bolt v1.3.1"
+"github.com/boltdb/bolt v1.3.1/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+"github.com/circonus-labs/circonusllhist v0.1.3"
+"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
+"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
+"github.com/coredns/coredns v1.1.2"
+"github.com/coredns/coredns v1.1.2/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/digitalocean/godo v1.1.1"
+"github.com/digitalocean/godo v1.1.1/go.mod"
+"github.com/digitalocean/godo v1.10.0"
+"github.com/digitalocean/godo v1.10.0/go.mod"
+"github.com/dimchansky/utfbom v1.1.0"
+"github.com/dimchansky/utfbom v1.1.0/go.mod"
+"github.com/dnaeon/go-vcr v1.0.1"
+"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+"github.com/docker/go-connections v0.3.0"
+"github.com/docker/go-connections v0.3.0/go.mod"
+"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
+"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.5"
+"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/fatih/color v1.7.0"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.9.0"
+"github.com/fatih/color v1.9.0/go.mod"
+"github.com/fatih/structs v1.1.0/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/ghodss/yaml v1.0.0"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-ldap/ldap v3.0.2+incompatible"
+"github.com/go-ldap/ldap v3.0.2+incompatible/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-ole/go-ole v1.2.1"
+"github.com/go-ole/go-ole v1.2.1/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
+"github.com/go-test/deep v1.0.2"
+"github.com/go-test/deep v1.0.2/go.mod"
+"github.com/gogo/protobuf v1.1.1"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.1"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/mock v1.1.1"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/protobuf v1.2.0"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/snappy v0.0.1"
+"github.com/golang/snappy v0.0.1/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/go-cmp v0.2.0"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135"
+"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
+"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf"
+"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
+"github.com/google/gofuzz v1.0.0"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/googleapis/gnostic v0.2.0"
+"github.com/googleapis/gnostic v0.2.0/go.mod"
+"github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca"
+"github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca/go.mod"
+"github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c"
+"github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+"github.com/hashicorp/errwrap v1.0.0"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/go-bexpr v0.1.2"
+"github.com/hashicorp/go-bexpr v0.1.2/go.mod"
+"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de"
+"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-connlimit v0.2.0"
+"github.com/hashicorp/go-connlimit v0.2.0/go.mod"
+"github.com/hashicorp/go-discover v0.0.0-20191202160150-7ec2cfbda7a2"
+"github.com/hashicorp/go-discover v0.0.0-20191202160150-7ec2cfbda7a2/go.mod"
+"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+"github.com/hashicorp/go-hclog v0.8.0/go.mod"
+"github.com/hashicorp/go-hclog v0.9.1"
+"github.com/hashicorp/go-hclog v0.9.1/go.mod"
+"github.com/hashicorp/go-hclog v0.12.0"
+"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.1.0"
+"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.2.0"
+"github.com/hashicorp/go-immutable-radix v1.2.0/go.mod"
+"github.com/hashicorp/go-memdb v1.0.3"
+"github.com/hashicorp/go-memdb v1.0.3/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.5"
+"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-multierror v1.1.0"
+"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+"github.com/hashicorp/go-plugin v1.0.1/go.mod"
+"github.com/hashicorp/go-raftchunking v0.6.1"
+"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.4"
+"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.2"
+"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.2"
+"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go-version v1.1.0"
+"github.com/hashicorp/go-version v1.1.0/go.mod"
+"github.com/hashicorp/go.net v0.0.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.4"
+"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+"github.com/hashicorp/hcl v1.0.0"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5"
+"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.1"
+"github.com/hashicorp/mdns v1.0.1/go.mod"
+"github.com/hashicorp/memberlist v0.2.2"
+"github.com/hashicorp/memberlist v0.2.2/go.mod"
+"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
+"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
+"github.com/hashicorp/raft v1.1.1/go.mod"
+"github.com/hashicorp/raft v1.1.2"
+"github.com/hashicorp/raft v1.1.2/go.mod"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
+"github.com/hashicorp/serf v0.9.3"
+"github.com/hashicorp/serf v0.9.3/go.mod"
+"github.com/hashicorp/vault/api v1.0.4"
+"github.com/hashicorp/vault/api v1.0.4/go.mod"
+"github.com/hashicorp/vault/sdk v0.1.13"
+"github.com/hashicorp/vault/sdk v0.1.13/go.mod"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
+"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+"github.com/hpcloud/tail v1.0.0"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/imdario/mergo v0.3.6"
+"github.com/imdario/mergo v0.3.6/go.mod"
+"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
+"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
+"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62"
+"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
+"github.com/json-iterator/go v1.1.5"
+"github.com/json-iterator/go v1.1.5/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.9"
+"github.com/json-iterator/go v1.1.9/go.mod"
+"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pretty v0.2.0"
+"github.com/kr/pretty v0.2.0/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
+"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
+"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
+"github.com/likexian/gokit v0.20.16/go.mod"
+"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
+"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
+"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
+"github.com/linode/linodego v0.7.1"
+"github.com/linode/linodego v0.7.1/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-colorable v0.1.6"
+"github.com/mattn/go-colorable v0.1.6/go.mod"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.10/go.mod"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-isatty v0.0.12"
+"github.com/mattn/go-isatty v0.0.12/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/miekg/dns v1.1.26"
+"github.com/miekg/dns v1.1.26/go.mod"
+"github.com/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/cli v1.1.0"
+"github.com/mitchellh/cli v1.1.0/go.mod"
+"github.com/mitchellh/copystructure v1.0.0"
+"github.com/mitchellh/copystructure v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.0"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.3"
+"github.com/mitchellh/go-testing-interface v1.0.3/go.mod"
+"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
+"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/mitchellh/mapstructure v1.2.3"
+"github.com/mitchellh/mapstructure v1.2.3/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.1"
+"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
+"github.com/oklog/run v1.0.0/go.mod"
+"github.com/onsi/ginkgo v1.6.0"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/gomega v1.4.1/go.mod"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pascaldekloe/goe v0.1.0"
+"github.com/pascaldekloe/goe v0.1.0/go.mod"
+"github.com/peterbourgon/diskv v2.0.1+incompatible"
+"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.0.5+incompatible"
+"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/posener/complete v1.1.1/go.mod"
+"github.com/posener/complete v1.2.3"
+"github.com/posener/complete v1.2.3/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.2"
+"github.com/prometheus/client_golang v0.9.2/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.4.0"
+"github.com/prometheus/client_golang v1.4.0/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275"
+"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.9.1"
+"github.com/prometheus/common v0.9.1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a"
+"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.8"
+"github.com/prometheus/procfs v0.0.8/go.mod"
+"github.com/rboyer/safeio v0.2.1"
+"github.com/rboyer/safeio v0.2.1/go.mod"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/ryanuber/columnize v2.1.0+incompatible"
+"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+"github.com/ryanuber/go-glob v1.0.0"
+"github.com/ryanuber/go-glob v1.0.0/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880"
+"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod"
+"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4"
+"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
+"github.com/sirupsen/logrus v1.0.6"
+"github.com/sirupsen/logrus v1.0.6/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.2"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/smartystreets/assertions v0.0.0-20180820201707-7c9eb446e3cf/go.mod"
+"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
+"github.com/spf13/pflag v1.0.2/go.mod"
+"github.com/spf13/pflag v1.0.3"
+"github.com/spf13/pflag v1.0.3/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
+"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+"github.com/vmware/govmomi v0.18.0"
+"github.com/vmware/govmomi v0.18.0/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+"golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4"
+"golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190923162816-aa69164e4478"
+"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+"golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
+"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
+"golang.org/x/text v0.3.2"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
+"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+"google.golang.org/api v0.0.0-20180829000535-087779f1d2c9"
+"google.golang.org/api v0.0.0-20180829000535-087779f1d2c9/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107"
+"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/grpc v1.14.0/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.22.0/go.mod"
+"google.golang.org/grpc v1.23.0"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.25.1"
+"google.golang.org/grpc v1.25.1/go.mod"
+"gopkg.in/airbrake/gobrake.v2 v2.0.9"
+"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2"
+"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+"gopkg.in/inf.v0 v0.9.1"
+"gopkg.in/inf.v0 v0.9.1/go.mod"
+"gopkg.in/resty.v1 v1.12.0"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.3.1"
+"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.2.8"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"k8s.io/api v0.0.0-20180806132203-61b11ee65332/go.mod"
+"k8s.io/api v0.0.0-20190325185214-7544f9db76f6"
+"k8s.io/api v0.0.0-20190325185214-7544f9db76f6/go.mod"
+"k8s.io/apimachinery v0.0.0-20180821005732-488889b0007f/go.mod"
+"k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841"
+"k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841/go.mod"
+"k8s.io/client-go v8.0.0+incompatible"
+"k8s.io/client-go v8.0.0+incompatible/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_SUM_SRC_URI}"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+ acct-group/consul
+ acct-user/consul"
+ DEPEND="${COMMON_DEPEND}"
+ RDEPEND="${COMMON_DEPEND}"
+
+src_compile() {
+ # The dev target sets causes build.sh to set appropriate XC_OS
+ # and XC_ARCH, and skips generation of an unused zip file,
+ # avoiding a dependency on app-arch/zip.
+ GIT_DESCRIBE="v${PV}" \
+ GIT_DIRTY="" \
+ GIT_COMMIT="${GIT_COMMIT}" \
+ emake dev-build
+}
+
+src_install() {
+ dobin bin/consul
+
+ keepdir /etc/consul.d
+ insinto /etc/consul.d
+ doins "${FILESDIR}/"*.json.example
+
+ keepdir /var/log/consul
+ fowners consul:consul /var/log/consul
+
+ newinitd "${FILESDIR}/consul.initd" "${PN}"
+ newconfd "${FILESDIR}/consul.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/consul/consul-1.7.7.ebuild b/app-admin/consul/consul-1.7.7.ebuild
deleted file mode 100644
index 8fa970e6543a..000000000000
--- a/app-admin/consul/consul-1.7.7.ebuild
+++ /dev/null
@@ -1,581 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-GIT_COMMIT=fdba2d0f7
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-
-# Upstream doesn't use "-mod=vendor" in their build system, and the
-# vendor directory is incomplete.
-# On the next bump, remove this if they have added "-mod=vendor"
-EGO_SUM=(
- "cloud.google.com/go v0.26.0"
- "cloud.google.com/go v0.26.0/go.mod"
- "github.com/Azure/azure-sdk-for-go v16.0.0+incompatible"
- "github.com/Azure/azure-sdk-for-go v16.0.0+incompatible/go.mod"
- "github.com/Azure/go-autorest v10.7.0+incompatible/go.mod"
- "github.com/Azure/go-autorest v10.15.3+incompatible"
- "github.com/Azure/go-autorest v10.15.3+incompatible/go.mod"
- "github.com/BurntSushi/toml v0.3.1/go.mod"
- "github.com/DataDog/datadog-go v2.2.0+incompatible"
- "github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
- "github.com/DataDog/datadog-go v3.2.0+incompatible"
- "github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
- "github.com/Microsoft/go-winio v0.4.3"
- "github.com/Microsoft/go-winio v0.4.3/go.mod"
- "github.com/NYTimes/gziphandler v1.0.1"
- "github.com/NYTimes/gziphandler v1.0.1/go.mod"
- "github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
- "github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
- "github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
- "github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
- "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
- "github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
- "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
- "github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
- "github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
- "github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
- "github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
- "github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
- "github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
- "github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
- "github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310"
- "github.com/armon/go-metrics v0.3.4"
- "github.com/armon/go-metrics v0.3.4/go.mod"
- "github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
- "github.com/armon/go-radix v1.0.0"
- "github.com/armon/go-radix v1.0.0/go.mod"
- "github.com/aws/aws-sdk-go v1.25.41"
- "github.com/aws/aws-sdk-go v1.25.41/go.mod"
- "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
- "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
- "github.com/beorn7/perks v1.0.0/go.mod"
- "github.com/beorn7/perks v1.0.1"
- "github.com/beorn7/perks v1.0.1/go.mod"
- "github.com/bgentry/speakeasy v0.1.0"
- "github.com/bgentry/speakeasy v0.1.0/go.mod"
- "github.com/boltdb/bolt v1.3.1"
- "github.com/boltdb/bolt v1.3.1/go.mod"
- "github.com/census-instrumentation/opencensus-proto v0.2.1"
- "github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
- "github.com/cespare/xxhash/v2 v2.1.1"
- "github.com/cespare/xxhash/v2 v2.1.1/go.mod"
- "github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
- "github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
- "github.com/circonus-labs/circonusllhist v0.1.3"
- "github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
- "github.com/client9/misspell v0.3.4/go.mod"
- "github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
- "github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
- "github.com/coredns/coredns v1.1.2"
- "github.com/coredns/coredns v1.1.2/go.mod"
- "github.com/davecgh/go-spew v1.1.0/go.mod"
- "github.com/davecgh/go-spew v1.1.1"
- "github.com/davecgh/go-spew v1.1.1/go.mod"
- "github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
- "github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
- "github.com/dgrijalva/jwt-go v3.2.0+incompatible"
- "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
- "github.com/digitalocean/godo v1.1.1"
- "github.com/digitalocean/godo v1.1.1/go.mod"
- "github.com/digitalocean/godo v1.10.0"
- "github.com/digitalocean/godo v1.10.0/go.mod"
- "github.com/dimchansky/utfbom v1.1.0"
- "github.com/dimchansky/utfbom v1.1.0/go.mod"
- "github.com/dnaeon/go-vcr v1.0.1"
- "github.com/dnaeon/go-vcr v1.0.1/go.mod"
- "github.com/docker/go-connections v0.3.0"
- "github.com/docker/go-connections v0.3.0/go.mod"
- "github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
- "github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
- "github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
- "github.com/envoyproxy/go-control-plane v0.9.5"
- "github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
- "github.com/envoyproxy/protoc-gen-validate v0.1.0"
- "github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
- "github.com/fatih/color v1.7.0"
- "github.com/fatih/color v1.7.0/go.mod"
- "github.com/fatih/color v1.9.0"
- "github.com/fatih/color v1.9.0/go.mod"
- "github.com/fatih/structs v1.1.0/go.mod"
- "github.com/fsnotify/fsnotify v1.4.7"
- "github.com/fsnotify/fsnotify v1.4.7/go.mod"
- "github.com/ghodss/yaml v1.0.0"
- "github.com/ghodss/yaml v1.0.0/go.mod"
- "github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod"
- "github.com/go-kit/kit v0.8.0/go.mod"
- "github.com/go-kit/kit v0.9.0/go.mod"
- "github.com/go-ldap/ldap v3.0.2+incompatible"
- "github.com/go-ldap/ldap v3.0.2+incompatible/go.mod"
- "github.com/go-logfmt/logfmt v0.3.0/go.mod"
- "github.com/go-logfmt/logfmt v0.4.0/go.mod"
- "github.com/go-ole/go-ole v1.2.1"
- "github.com/go-ole/go-ole v1.2.1/go.mod"
- "github.com/go-stack/stack v1.8.0/go.mod"
- "github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
- "github.com/go-test/deep v1.0.2"
- "github.com/go-test/deep v1.0.2/go.mod"
- "github.com/gogo/protobuf v1.1.1"
- "github.com/gogo/protobuf v1.1.1/go.mod"
- "github.com/gogo/protobuf v1.2.1"
- "github.com/gogo/protobuf v1.2.1/go.mod"
- "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
- "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
- "github.com/golang/mock v1.1.1"
- "github.com/golang/mock v1.1.1/go.mod"
- "github.com/golang/protobuf v1.2.0"
- "github.com/golang/protobuf v1.2.0/go.mod"
- "github.com/golang/protobuf v1.3.1"
- "github.com/golang/protobuf v1.3.1/go.mod"
- "github.com/golang/protobuf v1.3.2"
- "github.com/golang/protobuf v1.3.2/go.mod"
- "github.com/golang/snappy v0.0.1"
- "github.com/golang/snappy v0.0.1/go.mod"
- "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c"
- "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
- "github.com/google/go-cmp v0.2.0"
- "github.com/google/go-cmp v0.2.0/go.mod"
- "github.com/google/go-cmp v0.3.1/go.mod"
- "github.com/google/go-cmp v0.4.0"
- "github.com/google/go-cmp v0.4.0/go.mod"
- "github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135"
- "github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
- "github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf"
- "github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
- "github.com/google/gofuzz v1.0.0"
- "github.com/google/gofuzz v1.0.0/go.mod"
- "github.com/googleapis/gnostic v0.2.0"
- "github.com/googleapis/gnostic v0.2.0/go.mod"
- "github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca"
- "github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca/go.mod"
- "github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c"
- "github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod"
- "github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
- "github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
- "github.com/hashicorp/errwrap v1.0.0"
- "github.com/hashicorp/errwrap v1.0.0/go.mod"
- "github.com/hashicorp/go-bexpr v0.1.2"
- "github.com/hashicorp/go-bexpr v0.1.2/go.mod"
- "github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de"
- "github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod"
- "github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
- "github.com/hashicorp/go-cleanhttp v0.5.1"
- "github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
- "github.com/hashicorp/go-connlimit v0.2.0"
- "github.com/hashicorp/go-connlimit v0.2.0/go.mod"
- "github.com/hashicorp/go-discover v0.0.0-20191202160150-7ec2cfbda7a2"
- "github.com/hashicorp/go-discover v0.0.0-20191202160150-7ec2cfbda7a2/go.mod"
- "github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
- "github.com/hashicorp/go-hclog v0.8.0/go.mod"
- "github.com/hashicorp/go-hclog v0.9.1"
- "github.com/hashicorp/go-hclog v0.9.1/go.mod"
- "github.com/hashicorp/go-hclog v0.12.0"
- "github.com/hashicorp/go-hclog v0.12.0/go.mod"
- "github.com/hashicorp/go-immutable-radix v1.0.0"
- "github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
- "github.com/hashicorp/go-immutable-radix v1.1.0"
- "github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
- "github.com/hashicorp/go-immutable-radix v1.2.0"
- "github.com/hashicorp/go-immutable-radix v1.2.0/go.mod"
- "github.com/hashicorp/go-memdb v1.0.3"
- "github.com/hashicorp/go-memdb v1.0.3/go.mod"
- "github.com/hashicorp/go-msgpack v0.5.3/go.mod"
- "github.com/hashicorp/go-msgpack v0.5.5"
- "github.com/hashicorp/go-msgpack v0.5.5/go.mod"
- "github.com/hashicorp/go-multierror v1.0.0"
- "github.com/hashicorp/go-multierror v1.0.0/go.mod"
- "github.com/hashicorp/go-multierror v1.1.0"
- "github.com/hashicorp/go-multierror v1.1.0/go.mod"
- "github.com/hashicorp/go-plugin v1.0.1/go.mod"
- "github.com/hashicorp/go-raftchunking v0.6.1"
- "github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
- "github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
- "github.com/hashicorp/go-retryablehttp v0.5.4"
- "github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
- "github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
- "github.com/hashicorp/go-rootcerts v1.0.2"
- "github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
- "github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
- "github.com/hashicorp/go-sockaddr v1.0.2"
- "github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
- "github.com/hashicorp/go-syslog v1.0.0"
- "github.com/hashicorp/go-syslog v1.0.0/go.mod"
- "github.com/hashicorp/go-uuid v1.0.0/go.mod"
- "github.com/hashicorp/go-uuid v1.0.1"
- "github.com/hashicorp/go-uuid v1.0.1/go.mod"
- "github.com/hashicorp/go-version v1.1.0"
- "github.com/hashicorp/go-version v1.1.0/go.mod"
- "github.com/hashicorp/go.net v0.0.1/go.mod"
- "github.com/hashicorp/golang-lru v0.5.0/go.mod"
- "github.com/hashicorp/golang-lru v0.5.1"
- "github.com/hashicorp/golang-lru v0.5.1/go.mod"
- "github.com/hashicorp/golang-lru v0.5.4"
- "github.com/hashicorp/golang-lru v0.5.4/go.mod"
- "github.com/hashicorp/hcl v1.0.0"
- "github.com/hashicorp/hcl v1.0.0/go.mod"
- "github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5"
- "github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod"
- "github.com/hashicorp/logutils v1.0.0/go.mod"
- "github.com/hashicorp/mdns v1.0.0/go.mod"
- "github.com/hashicorp/mdns v1.0.1"
- "github.com/hashicorp/mdns v1.0.1/go.mod"
- "github.com/hashicorp/memberlist v0.2.2"
- "github.com/hashicorp/memberlist v0.2.2/go.mod"
- "github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
- "github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
- "github.com/hashicorp/raft v1.1.1/go.mod"
- "github.com/hashicorp/raft v1.1.2"
- "github.com/hashicorp/raft v1.1.2/go.mod"
- "github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
- "github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
- "github.com/hashicorp/serf v0.9.3"
- "github.com/hashicorp/serf v0.9.3/go.mod"
- "github.com/hashicorp/vault/api v1.0.4"
- "github.com/hashicorp/vault/api v1.0.4/go.mod"
- "github.com/hashicorp/vault/sdk v0.1.13"
- "github.com/hashicorp/vault/sdk v0.1.13/go.mod"
- "github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
- "github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
- "github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
- "github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
- "github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
- "github.com/hpcloud/tail v1.0.0"
- "github.com/hpcloud/tail v1.0.0/go.mod"
- "github.com/imdario/mergo v0.3.6"
- "github.com/imdario/mergo v0.3.6/go.mod"
- "github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
- "github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
- "github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
- "github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
- "github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62"
- "github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
- "github.com/json-iterator/go v1.1.5"
- "github.com/json-iterator/go v1.1.5/go.mod"
- "github.com/json-iterator/go v1.1.6/go.mod"
- "github.com/json-iterator/go v1.1.9"
- "github.com/json-iterator/go v1.1.9/go.mod"
- "github.com/jtolds/gls v4.2.1+incompatible/go.mod"
- "github.com/julienschmidt/httprouter v1.2.0/go.mod"
- "github.com/kisielk/errcheck v1.1.0/go.mod"
- "github.com/kisielk/gotool v1.0.0/go.mod"
- "github.com/konsorten/go-windows-terminal-sequences v1.0.1"
- "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
- "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
- "github.com/kr/pretty v0.1.0/go.mod"
- "github.com/kr/pretty v0.2.0"
- "github.com/kr/pretty v0.2.0/go.mod"
- "github.com/kr/pty v1.1.1/go.mod"
- "github.com/kr/text v0.1.0"
- "github.com/kr/text v0.1.0/go.mod"
- "github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
- "github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
- "github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
- "github.com/likexian/gokit v0.20.16/go.mod"
- "github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
- "github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
- "github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
- "github.com/linode/linodego v0.7.1"
- "github.com/linode/linodego v0.7.1/go.mod"
- "github.com/mattn/go-colorable v0.0.9/go.mod"
- "github.com/mattn/go-colorable v0.1.4/go.mod"
- "github.com/mattn/go-colorable v0.1.6"
- "github.com/mattn/go-colorable v0.1.6/go.mod"
- "github.com/mattn/go-isatty v0.0.3/go.mod"
- "github.com/mattn/go-isatty v0.0.8/go.mod"
- "github.com/mattn/go-isatty v0.0.10/go.mod"
- "github.com/mattn/go-isatty v0.0.11/go.mod"
- "github.com/mattn/go-isatty v0.0.12"
- "github.com/mattn/go-isatty v0.0.12/go.mod"
- "github.com/matttproud/golang_protobuf_extensions v1.0.1"
- "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
- "github.com/miekg/dns v1.0.14/go.mod"
- "github.com/miekg/dns v1.1.26"
- "github.com/miekg/dns v1.1.26/go.mod"
- "github.com/mitchellh/cli v1.0.0/go.mod"
- "github.com/mitchellh/cli v1.1.0"
- "github.com/mitchellh/cli v1.1.0/go.mod"
- "github.com/mitchellh/copystructure v1.0.0"
- "github.com/mitchellh/copystructure v1.0.0/go.mod"
- "github.com/mitchellh/go-homedir v1.0.0/go.mod"
- "github.com/mitchellh/go-homedir v1.1.0"
- "github.com/mitchellh/go-homedir v1.1.0/go.mod"
- "github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
- "github.com/mitchellh/go-testing-interface v1.0.0"
- "github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
- "github.com/mitchellh/go-testing-interface v1.0.3"
- "github.com/mitchellh/go-testing-interface v1.0.3/go.mod"
- "github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
- "github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
- "github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
- "github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
- "github.com/mitchellh/mapstructure v1.1.2/go.mod"
- "github.com/mitchellh/mapstructure v1.2.3"
- "github.com/mitchellh/mapstructure v1.2.3/go.mod"
- "github.com/mitchellh/reflectwalk v1.0.0/go.mod"
- "github.com/mitchellh/reflectwalk v1.0.1"
- "github.com/mitchellh/reflectwalk v1.0.1/go.mod"
- "github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
- "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
- "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
- "github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
- "github.com/modern-go/reflect2 v1.0.1"
- "github.com/modern-go/reflect2 v1.0.1/go.mod"
- "github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
- "github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
- "github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
- "github.com/oklog/run v1.0.0/go.mod"
- "github.com/onsi/ginkgo v1.6.0"
- "github.com/onsi/ginkgo v1.6.0/go.mod"
- "github.com/onsi/gomega v1.4.1/go.mod"
- "github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
- "github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
- "github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
- "github.com/pascaldekloe/goe v0.1.0"
- "github.com/pascaldekloe/goe v0.1.0/go.mod"
- "github.com/peterbourgon/diskv v2.0.1+incompatible"
- "github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
- "github.com/pierrec/lz4 v2.0.5+incompatible"
- "github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
- "github.com/pkg/errors v0.8.0/go.mod"
- "github.com/pkg/errors v0.8.1"
- "github.com/pkg/errors v0.8.1/go.mod"
- "github.com/pmezard/go-difflib v1.0.0"
- "github.com/pmezard/go-difflib v1.0.0/go.mod"
- "github.com/posener/complete v1.1.1/go.mod"
- "github.com/posener/complete v1.2.3"
- "github.com/posener/complete v1.2.3/go.mod"
- "github.com/prometheus/client_golang v0.9.1/go.mod"
- "github.com/prometheus/client_golang v0.9.2"
- "github.com/prometheus/client_golang v0.9.2/go.mod"
- "github.com/prometheus/client_golang v1.0.0/go.mod"
- "github.com/prometheus/client_golang v1.4.0"
- "github.com/prometheus/client_golang v1.4.0/go.mod"
- "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910"
- "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
- "github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
- "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
- "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
- "github.com/prometheus/client_model v0.2.0"
- "github.com/prometheus/client_model v0.2.0/go.mod"
- "github.com/prometheus/common v0.0.0-20181126121408-4724e9255275"
- "github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
- "github.com/prometheus/common v0.4.1/go.mod"
- "github.com/prometheus/common v0.9.1"
- "github.com/prometheus/common v0.9.1/go.mod"
- "github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
- "github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a"
- "github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
- "github.com/prometheus/procfs v0.0.2/go.mod"
- "github.com/prometheus/procfs v0.0.8"
- "github.com/prometheus/procfs v0.0.8/go.mod"
- "github.com/rboyer/safeio v0.2.1"
- "github.com/rboyer/safeio v0.2.1/go.mod"
- "github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
- "github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
- "github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
- "github.com/ryanuber/columnize v2.1.0+incompatible"
- "github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
- "github.com/ryanuber/go-glob v1.0.0"
- "github.com/ryanuber/go-glob v1.0.0/go.mod"
- "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
- "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
- "github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880"
- "github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod"
- "github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4"
- "github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
- "github.com/sirupsen/logrus v1.0.6"
- "github.com/sirupsen/logrus v1.0.6/go.mod"
- "github.com/sirupsen/logrus v1.2.0/go.mod"
- "github.com/sirupsen/logrus v1.4.2"
- "github.com/sirupsen/logrus v1.4.2/go.mod"
- "github.com/smartystreets/assertions v0.0.0-20180820201707-7c9eb446e3cf/go.mod"
- "github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
- "github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
- "github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
- "github.com/spf13/pflag v1.0.2/go.mod"
- "github.com/spf13/pflag v1.0.3"
- "github.com/spf13/pflag v1.0.3/go.mod"
- "github.com/stretchr/objx v0.1.0/go.mod"
- "github.com/stretchr/objx v0.1.1"
- "github.com/stretchr/objx v0.1.1/go.mod"
- "github.com/stretchr/testify v1.2.2/go.mod"
- "github.com/stretchr/testify v1.3.0/go.mod"
- "github.com/stretchr/testify v1.4.0"
- "github.com/stretchr/testify v1.4.0/go.mod"
- "github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
- "github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
- "github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
- "github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
- "github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
- "github.com/vmware/govmomi v0.18.0"
- "github.com/vmware/govmomi v0.18.0/go.mod"
- "golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
- "golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
- "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
- "golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
- "golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4"
- "golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4/go.mod"
- "golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
- "golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
- "golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
- "golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
- "golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
- "golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
- "golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
- "golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
- "golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
- "golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
- "golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
- "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
- "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
- "golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
- "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
- "golang.org/x/net v0.0.0-20190923162816-aa69164e4478"
- "golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
- "golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod"
- "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be"
- "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
- "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
- "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
- "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
- "golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
- "golang.org/x/sync v0.0.0-20190423024810-112230192c58"
- "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
- "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
- "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
- "golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
- "golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
- "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
- "golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
- "golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
- "golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
- "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
- "golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
- "golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
- "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
- "golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
- "golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
- "golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
- "golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
- "golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
- "golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
- "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
- "golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
- "golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
- "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
- "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
- "golang.org/x/text v0.3.0/go.mod"
- "golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
- "golang.org/x/text v0.3.2"
- "golang.org/x/text v0.3.2/go.mod"
- "golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
- "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
- "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
- "golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
- "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
- "golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
- "golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
- "golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
- "golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
- "golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
- "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
- "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
- "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
- "google.golang.org/api v0.0.0-20180829000535-087779f1d2c9"
- "google.golang.org/api v0.0.0-20180829000535-087779f1d2c9/go.mod"
- "google.golang.org/appengine v1.1.0/go.mod"
- "google.golang.org/appengine v1.4.0"
- "google.golang.org/appengine v1.4.0/go.mod"
- "google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
- "google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107"
- "google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod"
- "google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
- "google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
- "google.golang.org/grpc v1.14.0/go.mod"
- "google.golang.org/grpc v1.19.0/go.mod"
- "google.golang.org/grpc v1.22.0/go.mod"
- "google.golang.org/grpc v1.23.0"
- "google.golang.org/grpc v1.23.0/go.mod"
- "google.golang.org/grpc v1.25.1"
- "google.golang.org/grpc v1.25.1/go.mod"
- "gopkg.in/airbrake/gobrake.v2 v2.0.9"
- "gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
- "gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
- "gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
- "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
- "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
- "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
- "gopkg.in/fsnotify.v1 v1.4.7"
- "gopkg.in/fsnotify.v1 v1.4.7/go.mod"
- "gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2"
- "gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
- "gopkg.in/inf.v0 v0.9.1"
- "gopkg.in/inf.v0 v0.9.1/go.mod"
- "gopkg.in/resty.v1 v1.12.0"
- "gopkg.in/resty.v1 v1.12.0/go.mod"
- "gopkg.in/square/go-jose.v2 v2.3.1"
- "gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
- "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
- "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
- "gopkg.in/yaml.v2 v2.2.1/go.mod"
- "gopkg.in/yaml.v2 v2.2.2/go.mod"
- "gopkg.in/yaml.v2 v2.2.4/go.mod"
- "gopkg.in/yaml.v2 v2.2.5/go.mod"
- "gopkg.in/yaml.v2 v2.2.8"
- "gopkg.in/yaml.v2 v2.2.8/go.mod"
- "honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
- "honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
- "k8s.io/api v0.0.0-20180806132203-61b11ee65332/go.mod"
- "k8s.io/api v0.0.0-20190325185214-7544f9db76f6"
- "k8s.io/api v0.0.0-20190325185214-7544f9db76f6/go.mod"
- "k8s.io/apimachinery v0.0.0-20180821005732-488889b0007f/go.mod"
- "k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841"
- "k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841/go.mod"
- "k8s.io/client-go v8.0.0+incompatible"
- "k8s.io/client-go v8.0.0+incompatible/go.mod"
- )
-go-module_set_globals
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
- ${EGO_SUM_SRC_URI}"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
- acct-group/consul
- acct-user/consul"
- DEPEND="${COMMON_DEPEND}"
- RDEPEND="${COMMON_DEPEND}"
-
-src_compile() {
- # The dev target sets causes build.sh to set appropriate XC_OS
- # and XC_ARCH, and skips generation of an unused zip file,
- # avoiding a dependency on app-arch/zip.
- GIT_DESCRIBE="v${PV}" \
- GIT_DIRTY="" \
- GIT_COMMIT="${GIT_COMMIT}" \
- emake dev-build
-}
-
-src_install() {
- dobin bin/consul
-
- keepdir /etc/consul.d
- insinto /etc/consul.d
- doins "${FILESDIR}/"*.json.example
-
- keepdir /var/log/consul
- fowners consul:consul /var/log/consul
-
- newinitd "${FILESDIR}/consul.initd" "${PN}"
- newconfd "${FILESDIR}/consul.confd" "${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.8.3.ebuild b/app-admin/consul/consul-1.8.3.ebuild
deleted file mode 100644
index 6eb67f4883cc..000000000000
--- a/app-admin/consul/consul-1.8.3.ebuild
+++ /dev/null
@@ -1,756 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-GIT_COMMIT=a9322b9c7
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-
-# Upstream doesn't use "-mod=vendor" in their build system, and the
-# vendor directory is incomplete.
-# On the next bump, remove this if they have added "-mod=vendor"
-EGO_SUM=(
- "cloud.google.com/go v0.26.0/go.mod"
- "cloud.google.com/go v0.34.0/go.mod"
- "cloud.google.com/go v0.38.0"
- "cloud.google.com/go v0.38.0/go.mod"
- "github.com/Azure/azure-sdk-for-go v40.3.0+incompatible"
- "github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod"
- "github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
- "github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
- "github.com/Azure/go-autorest/autorest v0.10.0"
- "github.com/Azure/go-autorest/autorest v0.10.0/go.mod"
- "github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
- "github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
- "github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
- "github.com/Azure/go-autorest/autorest/adal v0.8.2"
- "github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
- "github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
- "github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
- "github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
- "github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
- "github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
- "github.com/Azure/go-autorest/autorest/date v0.2.0"
- "github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
- "github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
- "github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
- "github.com/Azure/go-autorest/autorest/mocks v0.3.0"
- "github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
- "github.com/Azure/go-autorest/autorest/to v0.3.0"
- "github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
- "github.com/Azure/go-autorest/autorest/validation v0.2.0"
- "github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
- "github.com/Azure/go-autorest/logger v0.1.0"
- "github.com/Azure/go-autorest/logger v0.1.0/go.mod"
- "github.com/Azure/go-autorest/tracing v0.5.0"
- "github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
- "github.com/BurntSushi/toml v0.3.1"
- "github.com/BurntSushi/toml v0.3.1/go.mod"
- "github.com/DataDog/datadog-go v2.2.0+incompatible"
- "github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
- "github.com/DataDog/datadog-go v3.2.0+incompatible"
- "github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
- "github.com/Microsoft/go-winio v0.4.3"
- "github.com/Microsoft/go-winio v0.4.3/go.mod"
- "github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
- "github.com/NYTimes/gziphandler v1.0.1"
- "github.com/NYTimes/gziphandler v1.0.1/go.mod"
- "github.com/OneOfOne/xxhash v1.2.2/go.mod"
- "github.com/PuerkitoBio/purell v1.0.0/go.mod"
- "github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
- "github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
- "github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
- "github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
- "github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
- "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
- "github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
- "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
- "github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
- "github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
- "github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
- "github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
- "github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
- "github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
- "github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
- "github.com/armon/go-metrics v0.3.4"
- "github.com/armon/go-metrics v0.3.4/go.mod"
- "github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
- "github.com/armon/go-radix v1.0.0"
- "github.com/armon/go-radix v1.0.0/go.mod"
- "github.com/aws/aws-sdk-go v1.25.41"
- "github.com/aws/aws-sdk-go v1.25.41/go.mod"
- "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
- "github.com/beorn7/perks v1.0.0"
- "github.com/beorn7/perks v1.0.0/go.mod"
- "github.com/beorn7/perks v1.0.1"
- "github.com/beorn7/perks v1.0.1/go.mod"
- "github.com/bgentry/speakeasy v0.1.0"
- "github.com/bgentry/speakeasy v0.1.0/go.mod"
- "github.com/boltdb/bolt v1.3.1"
- "github.com/boltdb/bolt v1.3.1/go.mod"
- "github.com/census-instrumentation/opencensus-proto v0.2.1"
- "github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
- "github.com/cespare/xxhash v1.1.0"
- "github.com/cespare/xxhash v1.1.0/go.mod"
- "github.com/cespare/xxhash/v2 v2.1.1"
- "github.com/cespare/xxhash/v2 v2.1.1/go.mod"
- "github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
- "github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
- "github.com/circonus-labs/circonusllhist v0.1.3"
- "github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
- "github.com/client9/misspell v0.3.4/go.mod"
- "github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
- "github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
- "github.com/cockroachdb/apd v1.1.0/go.mod"
- "github.com/coredns/coredns v1.1.2"
- "github.com/coredns/coredns v1.1.2/go.mod"
- "github.com/coreos/bbolt v1.3.2/go.mod"
- "github.com/coreos/etcd v3.3.10+incompatible/go.mod"
- "github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
- "github.com/coreos/go-oidc v2.1.0+incompatible"
- "github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
- "github.com/coreos/go-semver v0.2.0/go.mod"
- "github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
- "github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
- "github.com/cpuguy83/go-md2man v1.0.10/go.mod"
- "github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
- "github.com/davecgh/go-spew v1.1.0/go.mod"
- "github.com/davecgh/go-spew v1.1.1"
- "github.com/davecgh/go-spew v1.1.1/go.mod"
- "github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
- "github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
- "github.com/dgrijalva/jwt-go v3.2.0+incompatible"
- "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
- "github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
- "github.com/digitalocean/godo v1.1.1/go.mod"
- "github.com/digitalocean/godo v1.10.0"
- "github.com/digitalocean/godo v1.10.0/go.mod"
- "github.com/dimchansky/utfbom v1.1.0"
- "github.com/dimchansky/utfbom v1.1.0/go.mod"
- "github.com/dnaeon/go-vcr v1.0.1"
- "github.com/dnaeon/go-vcr v1.0.1/go.mod"
- "github.com/docker/go-connections v0.3.0"
- "github.com/docker/go-connections v0.3.0/go.mod"
- "github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
- "github.com/dustin/go-humanize v1.0.0/go.mod"
- "github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
- "github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
- "github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
- "github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
- "github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
- "github.com/envoyproxy/go-control-plane v0.9.5"
- "github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
- "github.com/envoyproxy/protoc-gen-validate v0.1.0"
- "github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
- "github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
- "github.com/fatih/color v1.7.0/go.mod"
- "github.com/fatih/color v1.9.0"
- "github.com/fatih/color v1.9.0/go.mod"
- "github.com/fatih/structs v1.1.0/go.mod"
- "github.com/fsnotify/fsnotify v1.4.7/go.mod"
- "github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
- "github.com/ghodss/yaml v1.0.0"
- "github.com/ghodss/yaml v1.0.0/go.mod"
- "github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod"
- "github.com/go-kit/kit v0.8.0/go.mod"
- "github.com/go-kit/kit v0.9.0/go.mod"
- "github.com/go-ldap/ldap v3.0.2+incompatible/go.mod"
- "github.com/go-logfmt/logfmt v0.3.0/go.mod"
- "github.com/go-logfmt/logfmt v0.4.0/go.mod"
- "github.com/go-logr/logr v0.1.0/go.mod"
- "github.com/go-ole/go-ole v1.2.1"
- "github.com/go-ole/go-ole v1.2.1/go.mod"
- "github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
- "github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
- "github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
- "github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
- "github.com/go-stack/stack v1.8.0/go.mod"
- "github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
- "github.com/go-test/deep v1.0.2"
- "github.com/go-test/deep v1.0.2/go.mod"
- "github.com/gogo/protobuf v1.1.1/go.mod"
- "github.com/gogo/protobuf v1.2.1/go.mod"
- "github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
- "github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
- "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
- "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
- "github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
- "github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
- "github.com/golang/mock v1.1.1/go.mod"
- "github.com/golang/mock v1.2.0/go.mod"
- "github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
- "github.com/golang/protobuf v1.2.0/go.mod"
- "github.com/golang/protobuf v1.3.1"
- "github.com/golang/protobuf v1.3.1/go.mod"
- "github.com/golang/protobuf v1.3.2"
- "github.com/golang/protobuf v1.3.2/go.mod"
- "github.com/golang/snappy v0.0.1"
- "github.com/golang/snappy v0.0.1/go.mod"
- "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
- "github.com/google/btree v1.0.0"
- "github.com/google/btree v1.0.0/go.mod"
- "github.com/google/go-cmp v0.2.0/go.mod"
- "github.com/google/go-cmp v0.3.0"
- "github.com/google/go-cmp v0.3.0/go.mod"
- "github.com/google/go-cmp v0.3.1/go.mod"
- "github.com/google/go-cmp v0.4.0"
- "github.com/google/go-cmp v0.4.0/go.mod"
- "github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
- "github.com/google/go-querystring v1.0.0"
- "github.com/google/go-querystring v1.0.0/go.mod"
- "github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
- "github.com/google/gofuzz v1.0.0"
- "github.com/google/gofuzz v1.0.0/go.mod"
- "github.com/google/martian v2.1.0+incompatible/go.mod"
- "github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
- "github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
- "github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
- "github.com/google/uuid v1.1.1/go.mod"
- "github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
- "github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
- "github.com/googleapis/gnostic v0.2.0"
- "github.com/googleapis/gnostic v0.2.0/go.mod"
- "github.com/gophercloud/gophercloud v0.1.0"
- "github.com/gophercloud/gophercloud v0.1.0/go.mod"
- "github.com/gorilla/websocket v1.4.0/go.mod"
- "github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
- "github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
- "github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
- "github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
- "github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
- "github.com/hashicorp/errwrap v1.0.0"
- "github.com/hashicorp/errwrap v1.0.0/go.mod"
- "github.com/hashicorp/go-bexpr v0.1.2"
- "github.com/hashicorp/go-bexpr v0.1.2/go.mod"
- "github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de"
- "github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod"
- "github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
- "github.com/hashicorp/go-cleanhttp v0.5.1"
- "github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
- "github.com/hashicorp/go-connlimit v0.2.0"
- "github.com/hashicorp/go-connlimit v0.2.0/go.mod"
- "github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088"
- "github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088/go.mod"
- "github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
- "github.com/hashicorp/go-hclog v0.8.0/go.mod"
- "github.com/hashicorp/go-hclog v0.9.1/go.mod"
- "github.com/hashicorp/go-hclog v0.12.0"
- "github.com/hashicorp/go-hclog v0.12.0/go.mod"
- "github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
- "github.com/hashicorp/go-immutable-radix v1.1.0"
- "github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
- "github.com/hashicorp/go-immutable-radix v1.2.0"
- "github.com/hashicorp/go-immutable-radix v1.2.0/go.mod"
- "github.com/hashicorp/go-memdb v1.0.3"
- "github.com/hashicorp/go-memdb v1.0.3/go.mod"
- "github.com/hashicorp/go-msgpack v0.5.3/go.mod"
- "github.com/hashicorp/go-msgpack v0.5.5"
- "github.com/hashicorp/go-msgpack v0.5.5/go.mod"
- "github.com/hashicorp/go-multierror v1.0.0"
- "github.com/hashicorp/go-multierror v1.0.0/go.mod"
- "github.com/hashicorp/go-multierror v1.1.0"
- "github.com/hashicorp/go-multierror v1.1.0/go.mod"
- "github.com/hashicorp/go-plugin v1.0.1/go.mod"
- "github.com/hashicorp/go-raftchunking v0.6.1"
- "github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
- "github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
- "github.com/hashicorp/go-retryablehttp v0.5.4"
- "github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
- "github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
- "github.com/hashicorp/go-rootcerts v1.0.2"
- "github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
- "github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
- "github.com/hashicorp/go-sockaddr v1.0.2"
- "github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
- "github.com/hashicorp/go-syslog v1.0.0"
- "github.com/hashicorp/go-syslog v1.0.0/go.mod"
- "github.com/hashicorp/go-uuid v1.0.0/go.mod"
- "github.com/hashicorp/go-uuid v1.0.1"
- "github.com/hashicorp/go-uuid v1.0.1/go.mod"
- "github.com/hashicorp/go-uuid v1.0.2"
- "github.com/hashicorp/go-uuid v1.0.2/go.mod"
- "github.com/hashicorp/go-version v1.1.0/go.mod"
- "github.com/hashicorp/go-version v1.2.0"
- "github.com/hashicorp/go-version v1.2.0/go.mod"
- "github.com/hashicorp/golang-lru v0.5.0/go.mod"
- "github.com/hashicorp/golang-lru v0.5.1"
- "github.com/hashicorp/golang-lru v0.5.1/go.mod"
- "github.com/hashicorp/golang-lru v0.5.4"
- "github.com/hashicorp/golang-lru v0.5.4/go.mod"
- "github.com/hashicorp/hcl v1.0.0"
- "github.com/hashicorp/hcl v1.0.0/go.mod"
- "github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5"
- "github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod"
- "github.com/hashicorp/logutils v1.0.0/go.mod"
- "github.com/hashicorp/mdns v1.0.1"
- "github.com/hashicorp/mdns v1.0.1/go.mod"
- "github.com/hashicorp/memberlist v0.2.2"
- "github.com/hashicorp/memberlist v0.2.2/go.mod"
- "github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
- "github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
- "github.com/hashicorp/raft v1.1.1/go.mod"
- "github.com/hashicorp/raft v1.1.2"
- "github.com/hashicorp/raft v1.1.2/go.mod"
- "github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
- "github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
- "github.com/hashicorp/serf v0.9.3"
- "github.com/hashicorp/serf v0.9.3/go.mod"
- "github.com/hashicorp/vault/api v1.0.4"
- "github.com/hashicorp/vault/api v1.0.4/go.mod"
- "github.com/hashicorp/vault/sdk v0.1.13"
- "github.com/hashicorp/vault/sdk v0.1.13/go.mod"
- "github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
- "github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
- "github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
- "github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
- "github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
- "github.com/hpcloud/tail v1.0.0/go.mod"
- "github.com/imdario/mergo v0.3.5/go.mod"
- "github.com/imdario/mergo v0.3.6"
- "github.com/imdario/mergo v0.3.6/go.mod"
- "github.com/inconshreveable/mousetrap v1.0.0/go.mod"
- "github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
- "github.com/jackc/pgx v3.3.0+incompatible/go.mod"
- "github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
- "github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
- "github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
- "github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
- "github.com/jonboulle/clockwork v0.1.0/go.mod"
- "github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
- "github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
- "github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
- "github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
- "github.com/json-iterator/go v1.1.6/go.mod"
- "github.com/json-iterator/go v1.1.7"
- "github.com/json-iterator/go v1.1.7/go.mod"
- "github.com/json-iterator/go v1.1.9"
- "github.com/json-iterator/go v1.1.9/go.mod"
- "github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
- "github.com/julienschmidt/httprouter v1.2.0/go.mod"
- "github.com/kisielk/errcheck v1.1.0/go.mod"
- "github.com/kisielk/errcheck v1.2.0/go.mod"
- "github.com/kisielk/gotool v1.0.0/go.mod"
- "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
- "github.com/konsorten/go-windows-terminal-sequences v1.0.2"
- "github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
- "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
- "github.com/kr/pretty v0.1.0/go.mod"
- "github.com/kr/pretty v0.2.0"
- "github.com/kr/pretty v0.2.0/go.mod"
- "github.com/kr/pty v1.1.1/go.mod"
- "github.com/kr/text v0.1.0"
- "github.com/kr/text v0.1.0/go.mod"
- "github.com/lib/pq v1.1.1/go.mod"
- "github.com/linode/linodego v0.7.1"
- "github.com/linode/linodego v0.7.1/go.mod"
- "github.com/magiconair/properties v1.8.0/go.mod"
- "github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
- "github.com/mattn/go-colorable v0.0.9/go.mod"
- "github.com/mattn/go-colorable v0.1.4"
- "github.com/mattn/go-colorable v0.1.4/go.mod"
- "github.com/mattn/go-colorable v0.1.6"
- "github.com/mattn/go-colorable v0.1.6/go.mod"
- "github.com/mattn/go-isatty v0.0.3/go.mod"
- "github.com/mattn/go-isatty v0.0.8/go.mod"
- "github.com/mattn/go-isatty v0.0.10/go.mod"
- "github.com/mattn/go-isatty v0.0.11/go.mod"
- "github.com/mattn/go-isatty v0.0.12"
- "github.com/mattn/go-isatty v0.0.12/go.mod"
- "github.com/mattn/go-runewidth v0.0.3/go.mod"
- "github.com/matttproud/golang_protobuf_extensions v1.0.1"
- "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
- "github.com/miekg/dns v1.0.14/go.mod"
- "github.com/miekg/dns v1.1.26"
- "github.com/miekg/dns v1.1.26/go.mod"
- "github.com/mitchellh/cli v1.0.0/go.mod"
- "github.com/mitchellh/cli v1.1.0"
- "github.com/mitchellh/cli v1.1.0/go.mod"
- "github.com/mitchellh/copystructure v1.0.0"
- "github.com/mitchellh/copystructure v1.0.0/go.mod"
- "github.com/mitchellh/go-homedir v1.1.0"
- "github.com/mitchellh/go-homedir v1.1.0/go.mod"
- "github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
- "github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
- "github.com/mitchellh/go-testing-interface v1.14.0"
- "github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
- "github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
- "github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
- "github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
- "github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
- "github.com/mitchellh/mapstructure v1.1.2"
- "github.com/mitchellh/mapstructure v1.1.2/go.mod"
- "github.com/mitchellh/mapstructure v1.3.3"
- "github.com/mitchellh/mapstructure v1.3.3/go.mod"
- "github.com/mitchellh/pointerstructure v1.0.0"
- "github.com/mitchellh/pointerstructure v1.0.0/go.mod"
- "github.com/mitchellh/reflectwalk v1.0.0/go.mod"
- "github.com/mitchellh/reflectwalk v1.0.1"
- "github.com/mitchellh/reflectwalk v1.0.1/go.mod"
- "github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
- "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
- "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
- "github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
- "github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
- "github.com/modern-go/reflect2 v1.0.1"
- "github.com/modern-go/reflect2 v1.0.1/go.mod"
- "github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
- "github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
- "github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
- "github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
- "github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
- "github.com/oklog/run v1.0.0/go.mod"
- "github.com/oklog/ulid v1.3.1/go.mod"
- "github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
- "github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
- "github.com/onsi/ginkgo v1.6.0/go.mod"
- "github.com/onsi/ginkgo v1.8.0/go.mod"
- "github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
- "github.com/onsi/gomega v1.5.0/go.mod"
- "github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
- "github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
- "github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
- "github.com/pascaldekloe/goe v0.1.0"
- "github.com/pascaldekloe/goe v0.1.0/go.mod"
- "github.com/patrickmn/go-cache v2.1.0+incompatible"
- "github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
- "github.com/pelletier/go-toml v1.2.0/go.mod"
- "github.com/peterbourgon/diskv v2.0.1+incompatible"
- "github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
- "github.com/pierrec/lz4 v2.0.5+incompatible"
- "github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
- "github.com/pkg/errors v0.8.0/go.mod"
- "github.com/pkg/errors v0.8.1"
- "github.com/pkg/errors v0.8.1/go.mod"
- "github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
- "github.com/pmezard/go-difflib v1.0.0"
- "github.com/pmezard/go-difflib v1.0.0/go.mod"
- "github.com/posener/complete v1.1.1"
- "github.com/posener/complete v1.1.1/go.mod"
- "github.com/posener/complete v1.2.3"
- "github.com/posener/complete v1.2.3/go.mod"
- "github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35"
- "github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod"
- "github.com/prometheus/client_golang v0.9.1/go.mod"
- "github.com/prometheus/client_golang v0.9.2/go.mod"
- "github.com/prometheus/client_golang v0.9.3/go.mod"
- "github.com/prometheus/client_golang v1.0.0"
- "github.com/prometheus/client_golang v1.0.0/go.mod"
- "github.com/prometheus/client_golang v1.4.0"
- "github.com/prometheus/client_golang v1.4.0/go.mod"
- "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
- "github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
- "github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
- "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
- "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
- "github.com/prometheus/client_model v0.2.0"
- "github.com/prometheus/client_model v0.2.0/go.mod"
- "github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
- "github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
- "github.com/prometheus/common v0.4.0/go.mod"
- "github.com/prometheus/common v0.4.1"
- "github.com/prometheus/common v0.4.1/go.mod"
- "github.com/prometheus/common v0.9.1"
- "github.com/prometheus/common v0.9.1/go.mod"
- "github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
- "github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
- "github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
- "github.com/prometheus/procfs v0.0.2"
- "github.com/prometheus/procfs v0.0.2/go.mod"
- "github.com/prometheus/procfs v0.0.8"
- "github.com/prometheus/procfs v0.0.8/go.mod"
- "github.com/prometheus/tsdb v0.7.1/go.mod"
- "github.com/rboyer/safeio v0.2.1"
- "github.com/rboyer/safeio v0.2.1/go.mod"
- "github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
- "github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
- "github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
- "github.com/rs/zerolog v1.4.0/go.mod"
- "github.com/russross/blackfriday v1.5.2/go.mod"
- "github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
- "github.com/ryanuber/columnize v2.1.0+incompatible"
- "github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
- "github.com/ryanuber/go-glob v1.0.0"
- "github.com/ryanuber/go-glob v1.0.0/go.mod"
- "github.com/satori/go.uuid v1.2.0/go.mod"
- "github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
- "github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
- "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
- "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
- "github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880"
- "github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod"
- "github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4"
- "github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
- "github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
- "github.com/sirupsen/logrus v1.0.6/go.mod"
- "github.com/sirupsen/logrus v1.2.0/go.mod"
- "github.com/sirupsen/logrus v1.4.2"
- "github.com/sirupsen/logrus v1.4.2/go.mod"
- "github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
- "github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
- "github.com/soheilhy/cmux v0.1.4/go.mod"
- "github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
- "github.com/spf13/afero v1.1.2/go.mod"
- "github.com/spf13/afero v1.2.1/go.mod"
- "github.com/spf13/afero v1.2.2/go.mod"
- "github.com/spf13/cast v1.3.0/go.mod"
- "github.com/spf13/cobra v0.0.5/go.mod"
- "github.com/spf13/jwalterweatherman v1.0.0/go.mod"
- "github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
- "github.com/spf13/pflag v1.0.3/go.mod"
- "github.com/spf13/pflag v1.0.5"
- "github.com/spf13/pflag v1.0.5/go.mod"
- "github.com/spf13/viper v1.3.2/go.mod"
- "github.com/spf13/viper v1.4.0/go.mod"
- "github.com/stretchr/objx v0.1.0/go.mod"
- "github.com/stretchr/objx v0.1.1"
- "github.com/stretchr/objx v0.1.1/go.mod"
- "github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
- "github.com/stretchr/testify v1.2.2/go.mod"
- "github.com/stretchr/testify v1.3.0/go.mod"
- "github.com/stretchr/testify v1.4.0"
- "github.com/stretchr/testify v1.4.0/go.mod"
- "github.com/stretchr/testify v1.5.1"
- "github.com/stretchr/testify v1.5.1/go.mod"
- "github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
- "github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
- "github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
- "github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
- "github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
- "github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
- "github.com/ugorji/go v1.1.4/go.mod"
- "github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
- "github.com/vmware/govmomi v0.18.0"
- "github.com/vmware/govmomi v0.18.0/go.mod"
- "github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
- "github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
- "go.etcd.io/bbolt v1.3.2/go.mod"
- "go.opencensus.io v0.21.0/go.mod"
- "go.opencensus.io v0.22.0"
- "go.opencensus.io v0.22.0/go.mod"
- "go.uber.org/atomic v1.4.0/go.mod"
- "go.uber.org/goleak v1.0.0"
- "go.uber.org/goleak v1.0.0/go.mod"
- "go.uber.org/multierr v1.1.0/go.mod"
- "go.uber.org/zap v1.10.0/go.mod"
- "golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
- "golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
- "golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
- "golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
- "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
- "golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
- "golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
- "golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
- "golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975"
- "golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
- "golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
- "golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
- "golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
- "golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
- "golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
- "golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
- "golang.org/x/lint v0.0.0-20190930215403-16217165b5de"
- "golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
- "golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
- "golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
- "golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
- "golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
- "golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
- "golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
- "golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
- "golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
- "golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
- "golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
- "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
- "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
- "golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
- "golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
- "golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
- "golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
- "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
- "golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
- "golang.org/x/net v0.0.0-20191004110552-13f9640d40b9"
- "golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
- "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
- "golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
- "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
- "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
- "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
- "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
- "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
- "golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
- "golang.org/x/sync v0.0.0-20190423024810-112230192c58"
- "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
- "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
- "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
- "golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
- "golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
- "golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
- "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
- "golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
- "golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
- "golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
- "golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
- "golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
- "golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
- "golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
- "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
- "golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
- "golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
- "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
- "golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
- "golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
- "golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
- "golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
- "golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
- "golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
- "golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
- "golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
- "golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
- "golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
- "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
- "golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
- "golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9"
- "golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
- "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
- "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
- "golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
- "golang.org/x/text v0.3.0/go.mod"
- "golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
- "golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
- "golang.org/x/text v0.3.2"
- "golang.org/x/text v0.3.2/go.mod"
- "golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
- "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
- "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
- "golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
- "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
- "golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
- "golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
- "golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
- "golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
- "golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
- "golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
- "golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
- "golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
- "golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
- "golang.org/x/tools v0.0.0-20191108193012-7d206e10da11"
- "golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
- "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
- "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
- "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
- "google.golang.org/api v0.4.0/go.mod"
- "google.golang.org/api v0.7.0"
- "google.golang.org/api v0.7.0/go.mod"
- "google.golang.org/appengine v1.1.0/go.mod"
- "google.golang.org/appengine v1.4.0/go.mod"
- "google.golang.org/appengine v1.5.0/go.mod"
- "google.golang.org/appengine v1.6.0"
- "google.golang.org/appengine v1.6.0/go.mod"
- "google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
- "google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
- "google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod"
- "google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
- "google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
- "google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
- "google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
- "google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
- "google.golang.org/grpc v1.14.0/go.mod"
- "google.golang.org/grpc v1.19.0/go.mod"
- "google.golang.org/grpc v1.20.1/go.mod"
- "google.golang.org/grpc v1.21.0/go.mod"
- "google.golang.org/grpc v1.22.0/go.mod"
- "google.golang.org/grpc v1.23.0"
- "google.golang.org/grpc v1.23.0/go.mod"
- "google.golang.org/grpc v1.25.1"
- "google.golang.org/grpc v1.25.1/go.mod"
- "gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
- "gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
- "gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
- "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
- "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
- "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
- "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
- "gopkg.in/fsnotify.v1 v1.4.7/go.mod"
- "gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
- "gopkg.in/inf.v0 v0.9.1"
- "gopkg.in/inf.v0 v0.9.1/go.mod"
- "gopkg.in/resty.v1 v1.12.0"
- "gopkg.in/resty.v1 v1.12.0/go.mod"
- "gopkg.in/square/go-jose.v2 v2.3.1"
- "gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
- "gopkg.in/square/go-jose.v2 v2.4.1"
- "gopkg.in/square/go-jose.v2 v2.4.1/go.mod"
- "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
- "gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
- "gopkg.in/yaml.v2 v2.2.1/go.mod"
- "gopkg.in/yaml.v2 v2.2.2/go.mod"
- "gopkg.in/yaml.v2 v2.2.4/go.mod"
- "gopkg.in/yaml.v2 v2.2.5/go.mod"
- "gopkg.in/yaml.v2 v2.2.8"
- "gopkg.in/yaml.v2 v2.2.8/go.mod"
- "honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
- "honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
- "honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
- "honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
- "k8s.io/api v0.16.9"
- "k8s.io/api v0.16.9/go.mod"
- "k8s.io/apimachinery v0.16.9"
- "k8s.io/apimachinery v0.16.9/go.mod"
- "k8s.io/client-go v0.16.9"
- "k8s.io/client-go v0.16.9/go.mod"
- "k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
- "k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
- "k8s.io/klog v0.3.0/go.mod"
- "k8s.io/klog v1.0.0"
- "k8s.io/klog v1.0.0/go.mod"
- "k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
- "k8s.io/utils v0.0.0-20190801114015-581e00157fb1"
- "k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod"
- "sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
- "sigs.k8s.io/yaml v1.1.0"
- "sigs.k8s.io/yaml v1.1.0/go.mod"
- )
-go-module_set_globals
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
- ${EGO_SUM_SRC_URI}"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
- acct-group/consul
- acct-user/consul"
- DEPEND="${COMMON_DEPEND}"
- RDEPEND="${COMMON_DEPEND}"
-
-src_compile() {
- # The dev target sets causes build.sh to set appropriate XC_OS
- # and XC_ARCH, and skips generation of an unused zip file,
- # avoiding a dependency on app-arch/zip.
- GIT_DESCRIBE="v${PV}" \
- GIT_DIRTY="" \
- GIT_COMMIT="${GIT_COMMIT}" \
- emake dev-build
-}
-
-src_install() {
- dobin bin/consul
-
- keepdir /etc/consul.d
- insinto /etc/consul.d
- doins "${FILESDIR}/"*.json.example
-
- keepdir /var/log/consul
- fowners consul:consul /var/log/consul
-
- newinitd "${FILESDIR}/consul.initd" "${PN}"
- newconfd "${FILESDIR}/consul.confd" "${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.8.7.ebuild b/app-admin/consul/consul-1.8.7.ebuild
new file mode 100644
index 000000000000..15562895507e
--- /dev/null
+++ b/app-admin/consul/consul-1.8.7.ebuild
@@ -0,0 +1,796 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=cbe8f01e9
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+
+# Upstream doesn't use "-mod=vendor" in their build system, and the
+# vendor directory is incomplete.
+# On the next bump, remove this if they have added "-mod=vendor"
+EGO_SUM=(
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"cloud.google.com/go v0.38.0"
+"cloud.google.com/go v0.38.0/go.mod"
+"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible"
+"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+"github.com/Azure/go-autorest/autorest v0.10.0"
+"github.com/Azure/go-autorest/autorest v0.10.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.2.0"
+"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/to v0.3.0"
+"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.2.0"
+"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
+"github.com/Azure/go-autorest/logger v0.1.0"
+"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+"github.com/Azure/go-autorest/tracing v0.5.0"
+"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+"github.com/BurntSushi/toml v0.3.1"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/DataDog/datadog-go v2.2.0+incompatible"
+"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+"github.com/DataDog/datadog-go v3.2.0+incompatible"
+"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+"github.com/Microsoft/go-winio v0.4.3"
+"github.com/Microsoft/go-winio v0.4.3/go.mod"
+"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+"github.com/NYTimes/gziphandler v1.0.1"
+"github.com/NYTimes/gziphandler v1.0.1/go.mod"
+"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
+"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
+"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+"github.com/armon/go-metrics v0.3.0/go.mod"
+"github.com/armon/go-metrics v0.3.4"
+"github.com/armon/go-metrics v0.3.4/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/armon/go-radix v1.0.0"
+"github.com/armon/go-radix v1.0.0/go.mod"
+"github.com/aws/aws-sdk-go v1.25.37/go.mod"
+"github.com/aws/aws-sdk-go v1.25.41"
+"github.com/aws/aws-sdk-go v1.25.41/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/boltdb/bolt v1.3.1"
+"github.com/boltdb/bolt v1.3.1/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/cespare/xxhash v1.1.0"
+"github.com/cespare/xxhash v1.1.0/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+"github.com/circonus-labs/circonusllhist v0.1.3"
+"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
+"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
+"github.com/cockroachdb/apd v1.1.0/go.mod"
+"github.com/coredns/coredns v1.1.2"
+"github.com/coredns/coredns v1.1.2/go.mod"
+"github.com/coreos/bbolt v1.3.2/go.mod"
+"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+"github.com/coreos/go-oidc v2.1.0+incompatible"
+"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+"github.com/coreos/go-semver v0.2.0/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+"github.com/digitalocean/godo v1.1.1/go.mod"
+"github.com/digitalocean/godo v1.10.0"
+"github.com/digitalocean/godo v1.10.0/go.mod"
+"github.com/dimchansky/utfbom v1.1.0"
+"github.com/dimchansky/utfbom v1.1.0/go.mod"
+"github.com/dnaeon/go-vcr v1.0.1"
+"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+"github.com/docker/go-connections v0.3.0"
+"github.com/docker/go-connections v0.3.0/go.mod"
+"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+"github.com/dustin/go-humanize v1.0.0/go.mod"
+"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
+"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
+"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.5"
+"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.9.0"
+"github.com/fatih/color v1.9.0/go.mod"
+"github.com/fatih/structs v1.1.0/go.mod"
+"github.com/frankban/quicktest v1.11.1"
+"github.com/frankban/quicktest v1.11.1/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+"github.com/ghodss/yaml v1.0.0"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod"
+"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-ldap/ldap/v3 v3.1.3/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-logr/logr v0.1.0/go.mod"
+"github.com/go-ole/go-ole v1.2.1"
+"github.com/go-ole/go-ole v1.2.1/go.mod"
+"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
+"github.com/go-test/deep v1.0.2"
+"github.com/go-test/deep v1.0.2/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
+"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/mock v1.2.0/go.mod"
+"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/snappy v0.0.1"
+"github.com/golang/snappy v0.0.1/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.5.2"
+"github.com/google/go-cmp v0.5.2/go.mod"
+"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
+"github.com/google/go-querystring v1.0.0"
+"github.com/google/go-querystring v1.0.0/go.mod"
+"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+"github.com/google/gofuzz v1.0.0"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
+"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
+"github.com/google/uuid v1.1.1/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.5"
+"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+"github.com/googleapis/gnostic v0.2.0"
+"github.com/googleapis/gnostic v0.2.0/go.mod"
+"github.com/gophercloud/gophercloud v0.1.0"
+"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+"github.com/gorilla/websocket v1.4.0/go.mod"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+"github.com/hashicorp/errwrap v1.0.0"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/go-bexpr v0.1.2"
+"github.com/hashicorp/go-bexpr v0.1.2/go.mod"
+"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de"
+"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-connlimit v0.2.0"
+"github.com/hashicorp/go-connlimit v0.2.0/go.mod"
+"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088"
+"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088/go.mod"
+"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+"github.com/hashicorp/go-hclog v0.9.1/go.mod"
+"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+"github.com/hashicorp/go-hclog v0.12.0"
+"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.1.0"
+"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.2.0"
+"github.com/hashicorp/go-immutable-radix v1.2.0/go.mod"
+"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod"
+"github.com/hashicorp/go-memdb v1.0.3"
+"github.com/hashicorp/go-memdb v1.0.3/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.5"
+"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-multierror v1.1.0"
+"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+"github.com/hashicorp/go-plugin v1.0.1/go.mod"
+"github.com/hashicorp/go-raftchunking v0.6.1"
+"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.6"
+"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.7"
+"github.com/hashicorp/go-retryablehttp v0.6.7/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.2"
+"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.2"
+"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go-uuid v1.0.2"
+"github.com/hashicorp/go-uuid v1.0.2/go.mod"
+"github.com/hashicorp/go-version v1.1.0/go.mod"
+"github.com/hashicorp/go-version v1.2.0"
+"github.com/hashicorp/go-version v1.2.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.4"
+"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+"github.com/hashicorp/hcl v1.0.0"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5"
+"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.1"
+"github.com/hashicorp/mdns v1.0.1/go.mod"
+"github.com/hashicorp/memberlist v0.2.2"
+"github.com/hashicorp/memberlist v0.2.2/go.mod"
+"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
+"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
+"github.com/hashicorp/raft v1.1.1/go.mod"
+"github.com/hashicorp/raft v1.1.2"
+"github.com/hashicorp/raft v1.1.2/go.mod"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
+"github.com/hashicorp/serf v0.9.3"
+"github.com/hashicorp/serf v0.9.3/go.mod"
+"github.com/hashicorp/serf v0.9.4"
+"github.com/hashicorp/serf v0.9.4/go.mod"
+"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086"
+"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086/go.mod"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267/go.mod"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
+"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/imdario/mergo v0.3.5/go.mod"
+"github.com/imdario/mergo v0.3.6"
+"github.com/imdario/mergo v0.3.6/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
+"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
+"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
+"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
+"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+"github.com/jonboulle/clockwork v0.1.0/go.mod"
+"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
+"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
+"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
+"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.7"
+"github.com/json-iterator/go v1.1.7/go.mod"
+"github.com/json-iterator/go v1.1.9"
+"github.com/json-iterator/go v1.1.9/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/errcheck v1.2.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pretty v0.2.0"
+"github.com/kr/pretty v0.2.0/go.mod"
+"github.com/kr/pretty v0.2.1"
+"github.com/kr/pretty v0.2.1/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/lib/pq v1.1.1/go.mod"
+"github.com/linode/linodego v0.7.1"
+"github.com/linode/linodego v0.7.1/go.mod"
+"github.com/magiconair/properties v1.8.0/go.mod"
+"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.4"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-colorable v0.1.6"
+"github.com/mattn/go-colorable v0.1.6/go.mod"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.10/go.mod"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-isatty v0.0.12"
+"github.com/mattn/go-isatty v0.0.12/go.mod"
+"github.com/mattn/go-runewidth v0.0.3/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/miekg/dns v1.1.26"
+"github.com/miekg/dns v1.1.26/go.mod"
+"github.com/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/cli v1.1.0"
+"github.com/mitchellh/cli v1.1.0/go.mod"
+"github.com/mitchellh/copystructure v1.0.0"
+"github.com/mitchellh/copystructure v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/go-testing-interface v1.14.0"
+"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
+"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
+"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/mitchellh/mapstructure v1.3.2/go.mod"
+"github.com/mitchellh/mapstructure v1.3.3"
+"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+"github.com/mitchellh/pointerstructure v1.0.0"
+"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.1"
+"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
+"github.com/oklog/run v1.0.0/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/ginkgo v1.8.0/go.mod"
+"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+"github.com/onsi/gomega v1.5.0/go.mod"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pascaldekloe/goe v0.1.0"
+"github.com/pascaldekloe/goe v0.1.0/go.mod"
+"github.com/patrickmn/go-cache v2.1.0+incompatible"
+"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
+"github.com/pelletier/go-toml v1.2.0/go.mod"
+"github.com/peterbourgon/diskv v2.0.1+incompatible"
+"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.0.5+incompatible"
+"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.5.2+incompatible"
+"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/posener/complete v1.1.1"
+"github.com/posener/complete v1.1.1/go.mod"
+"github.com/posener/complete v1.2.3"
+"github.com/posener/complete v1.2.3/go.mod"
+"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35"
+"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.2/go.mod"
+"github.com/prometheus/client_golang v0.9.3/go.mod"
+"github.com/prometheus/client_golang v1.0.0"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.4.0"
+"github.com/prometheus/client_golang v1.4.0/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+"github.com/prometheus/common v0.4.0/go.mod"
+"github.com/prometheus/common v0.4.1"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.9.1"
+"github.com/prometheus/common v0.9.1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+"github.com/prometheus/procfs v0.0.2"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.8"
+"github.com/prometheus/procfs v0.0.8/go.mod"
+"github.com/prometheus/tsdb v0.7.1/go.mod"
+"github.com/rboyer/safeio v0.2.1"
+"github.com/rboyer/safeio v0.2.1/go.mod"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/rs/zerolog v1.4.0/go.mod"
+"github.com/russross/blackfriday v1.5.2/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/ryanuber/columnize v2.1.0+incompatible"
+"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+"github.com/ryanuber/go-glob v1.0.0"
+"github.com/ryanuber/go-glob v1.0.0/go.mod"
+"github.com/satori/go.uuid v1.2.0/go.mod"
+"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
+"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/shirou/gopsutil v2.20.9+incompatible"
+"github.com/shirou/gopsutil v2.20.9+incompatible/go.mod"
+"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
+"github.com/sirupsen/logrus v1.0.6/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.2"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+"github.com/spf13/afero v1.1.2/go.mod"
+"github.com/spf13/afero v1.2.1/go.mod"
+"github.com/spf13/afero v1.2.2/go.mod"
+"github.com/spf13/cast v1.3.0/go.mod"
+"github.com/spf13/cobra v0.0.5/go.mod"
+"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+"github.com/spf13/pflag v1.0.3/go.mod"
+"github.com/spf13/pflag v1.0.5"
+"github.com/spf13/pflag v1.0.5/go.mod"
+"github.com/spf13/viper v1.3.2/go.mod"
+"github.com/spf13/viper v1.4.0/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/stretchr/testify v1.5.1"
+"github.com/stretchr/testify v1.5.1/go.mod"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
+"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+"github.com/ugorji/go v1.1.4/go.mod"
+"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+"github.com/vmware/govmomi v0.18.0"
+"github.com/vmware/govmomi v0.18.0/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+"github.com/yuin/goldmark v1.1.27/go.mod"
+"go.etcd.io/bbolt v1.3.2/go.mod"
+"go.opencensus.io v0.21.0/go.mod"
+"go.opencensus.io v0.22.0"
+"go.opencensus.io v0.22.0/go.mod"
+"go.uber.org/atomic v1.4.0/go.mod"
+"go.uber.org/goleak v1.0.0"
+"go.uber.org/goleak v1.0.0/go.mod"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/zap v1.10.0/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
+"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975"
+"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a"
+"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+"golang.org/x/mod v0.2.0"
+"golang.org/x/mod v0.2.0/go.mod"
+"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9"
+"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200602114024-627f9648deb9"
+"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
+"golang.org/x/net v0.0.0-20200904194848-62affa334b73"
+"golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a"
+"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
+"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
+"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
+"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20201007082116-8445cc04cbdf"
+"golang.org/x/sys v0.0.0-20201007082116-8445cc04cbdf/go.mod"
+"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+"golang.org/x/text v0.3.2"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/text v0.3.3"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1"
+"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
+"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11"
+"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20200513154647-78b527d18275"
+"golang.org/x/tools v0.0.0-20200513154647-78b527d18275/go.mod"
+"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+"google.golang.org/api v0.4.0/go.mod"
+"google.golang.org/api v0.9.0"
+"google.golang.org/api v0.9.0/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.5.0/go.mod"
+"google.golang.org/appengine v1.6.0"
+"google.golang.org/appengine v1.6.0/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/grpc v1.14.0/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.20.1/go.mod"
+"google.golang.org/grpc v1.21.0/go.mod"
+"google.golang.org/grpc v1.22.0/go.mod"
+"google.golang.org/grpc v1.23.0"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.25.1"
+"google.golang.org/grpc v1.25.1/go.mod"
+"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+"gopkg.in/inf.v0 v0.9.1"
+"gopkg.in/inf.v0 v0.9.1/go.mod"
+"gopkg.in/resty.v1 v1.12.0"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.5.1"
+"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.2.8"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"k8s.io/api v0.16.9"
+"k8s.io/api v0.16.9/go.mod"
+"k8s.io/apimachinery v0.16.9"
+"k8s.io/apimachinery v0.16.9/go.mod"
+"k8s.io/client-go v0.16.9"
+"k8s.io/client-go v0.16.9/go.mod"
+"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+"k8s.io/klog v0.3.0/go.mod"
+"k8s.io/klog v1.0.0"
+"k8s.io/klog v1.0.0/go.mod"
+"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
+"k8s.io/utils v0.0.0-20190801114015-581e00157fb1"
+"k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod"
+"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+"sigs.k8s.io/yaml v1.1.0"
+"sigs.k8s.io/yaml v1.1.0/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_SUM_SRC_URI}"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+ acct-group/consul
+ acct-user/consul"
+ DEPEND="${COMMON_DEPEND}"
+ RDEPEND="${COMMON_DEPEND}"
+
+src_compile() {
+ # The dev target sets causes build.sh to set appropriate XC_OS
+ # and XC_ARCH, and skips generation of an unused zip file,
+ # avoiding a dependency on app-arch/zip.
+ GIT_DESCRIBE="v${PV}" \
+ GIT_DIRTY="" \
+ GIT_COMMIT="${GIT_COMMIT}" \
+ emake dev-build
+}
+
+src_install() {
+ dobin bin/consul
+
+ keepdir /etc/consul.d
+ insinto /etc/consul.d
+ doins "${FILESDIR}/"*.json.example
+
+ keepdir /var/log/consul
+ fowners consul:consul /var/log/consul
+
+ newinitd "${FILESDIR}/consul.initd" "${PN}"
+ newconfd "${FILESDIR}/consul.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/consul/consul-1.9.1.ebuild b/app-admin/consul/consul-1.9.1.ebuild
new file mode 100644
index 000000000000..b54ce9d29cc7
--- /dev/null
+++ b/app-admin/consul/consul-1.9.1.ebuild
@@ -0,0 +1,775 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=ca5c38943
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+
+# Upstream doesn't use "-mod=vendor" in their build system, and the
+# vendor directory is incomplete.
+# On the next bump, remove this if they have added "-mod=vendor"
+EGO_SUM=(
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"cloud.google.com/go v0.38.0"
+"cloud.google.com/go v0.38.0/go.mod"
+"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible"
+"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+"github.com/Azure/go-autorest/autorest v0.10.0"
+"github.com/Azure/go-autorest/autorest v0.10.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.2.0"
+"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/to v0.3.0"
+"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.2.0"
+"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
+"github.com/Azure/go-autorest/logger v0.1.0"
+"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+"github.com/Azure/go-autorest/tracing v0.5.0"
+"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+"github.com/BurntSushi/toml v0.3.1"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+"github.com/DataDog/datadog-go v3.2.0+incompatible"
+"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+"github.com/Microsoft/go-winio v0.4.3"
+"github.com/Microsoft/go-winio v0.4.3/go.mod"
+"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+"github.com/NYTimes/gziphandler v1.0.1"
+"github.com/NYTimes/gziphandler v1.0.1/go.mod"
+"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
+"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+"github.com/armon/go-metrics v0.3.0/go.mod"
+"github.com/armon/go-metrics v0.3.5-0.20201104215618-6fd5a4ddf425"
+"github.com/armon/go-metrics v0.3.5-0.20201104215618-6fd5a4ddf425/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/armon/go-radix v1.0.0"
+"github.com/armon/go-radix v1.0.0/go.mod"
+"github.com/aws/aws-sdk-go v1.25.37/go.mod"
+"github.com/aws/aws-sdk-go v1.25.41"
+"github.com/aws/aws-sdk-go v1.25.41/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/boltdb/bolt v1.3.1"
+"github.com/boltdb/bolt v1.3.1/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/cespare/xxhash v1.1.0"
+"github.com/cespare/xxhash v1.1.0/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+"github.com/circonus-labs/circonusllhist v0.1.3"
+"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
+"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
+"github.com/cockroachdb/apd v1.1.0/go.mod"
+"github.com/coredns/coredns v1.1.2"
+"github.com/coredns/coredns v1.1.2/go.mod"
+"github.com/coreos/bbolt v1.3.2/go.mod"
+"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+"github.com/coreos/go-oidc v2.1.0+incompatible"
+"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+"github.com/coreos/go-semver v0.2.0/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+"github.com/digitalocean/godo v1.1.1/go.mod"
+"github.com/digitalocean/godo v1.10.0"
+"github.com/digitalocean/godo v1.10.0/go.mod"
+"github.com/dimchansky/utfbom v1.1.0"
+"github.com/dimchansky/utfbom v1.1.0/go.mod"
+"github.com/dnaeon/go-vcr v1.0.1"
+"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+"github.com/docker/go-connections v0.3.0"
+"github.com/docker/go-connections v0.3.0/go.mod"
+"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+"github.com/dustin/go-humanize v1.0.0/go.mod"
+"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
+"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
+"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.5"
+"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.9.0"
+"github.com/fatih/color v1.9.0/go.mod"
+"github.com/fatih/structs v1.1.0/go.mod"
+"github.com/frankban/quicktest v1.11.0"
+"github.com/frankban/quicktest v1.11.0/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+"github.com/ghodss/yaml v1.0.0"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod"
+"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-ldap/ldap/v3 v3.1.3/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-logr/logr v0.1.0/go.mod"
+"github.com/go-ole/go-ole v1.2.4"
+"github.com/go-ole/go-ole v1.2.4/go.mod"
+"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
+"github.com/go-test/deep v1.0.2"
+"github.com/go-test/deep v1.0.2/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
+"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/mock v1.2.0/go.mod"
+"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/protobuf v1.3.5"
+"github.com/golang/protobuf v1.3.5/go.mod"
+"github.com/golang/snappy v0.0.1"
+"github.com/golang/snappy v0.0.1/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.5.2"
+"github.com/google/go-cmp v0.5.2/go.mod"
+"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
+"github.com/google/go-querystring v1.0.0"
+"github.com/google/go-querystring v1.0.0/go.mod"
+"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+"github.com/google/gofuzz v1.0.0"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/gofuzz v1.2.0"
+"github.com/google/gofuzz v1.2.0/go.mod"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
+"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
+"github.com/google/uuid v1.1.1/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.5"
+"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+"github.com/googleapis/gnostic v0.2.0"
+"github.com/googleapis/gnostic v0.2.0/go.mod"
+"github.com/gophercloud/gophercloud v0.1.0"
+"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+"github.com/gorilla/websocket v1.4.0/go.mod"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+"github.com/hashicorp/errwrap v1.0.0"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/go-bexpr v0.1.2"
+"github.com/hashicorp/go-bexpr v0.1.2/go.mod"
+"github.com/hashicorp/go-checkpoint v0.5.0"
+"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-connlimit v0.3.0"
+"github.com/hashicorp/go-connlimit v0.3.0/go.mod"
+"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088"
+"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088/go.mod"
+"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+"github.com/hashicorp/go-hclog v0.9.1/go.mod"
+"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+"github.com/hashicorp/go-hclog v0.12.0"
+"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+"github.com/hashicorp/go-hclog v0.14.1"
+"github.com/hashicorp/go-hclog v0.14.1/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.3.0"
+"github.com/hashicorp/go-immutable-radix v1.3.0/go.mod"
+"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod"
+"github.com/hashicorp/go-memdb v1.3.0"
+"github.com/hashicorp/go-memdb v1.3.0/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.5"
+"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-multierror v1.1.0"
+"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+"github.com/hashicorp/go-plugin v1.0.1/go.mod"
+"github.com/hashicorp/go-raftchunking v0.6.1"
+"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.7"
+"github.com/hashicorp/go-retryablehttp v0.6.7/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.2"
+"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.2"
+"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go-uuid v1.0.2"
+"github.com/hashicorp/go-uuid v1.0.2/go.mod"
+"github.com/hashicorp/go-version v1.1.0/go.mod"
+"github.com/hashicorp/go-version v1.2.1"
+"github.com/hashicorp/go-version v1.2.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.4"
+"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+"github.com/hashicorp/hcl v1.0.0"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038"
+"github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038/go.mod"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.1"
+"github.com/hashicorp/mdns v1.0.1/go.mod"
+"github.com/hashicorp/mdns v1.0.3"
+"github.com/hashicorp/mdns v1.0.3/go.mod"
+"github.com/hashicorp/memberlist v0.2.2"
+"github.com/hashicorp/memberlist v0.2.2/go.mod"
+"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
+"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
+"github.com/hashicorp/raft v1.1.1/go.mod"
+"github.com/hashicorp/raft v1.2.0"
+"github.com/hashicorp/raft v1.2.0/go.mod"
+"github.com/hashicorp/raft-autopilot v0.1.1"
+"github.com/hashicorp/raft-autopilot v0.1.1/go.mod"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
+"github.com/hashicorp/serf v0.9.5"
+"github.com/hashicorp/serf v0.9.5/go.mod"
+"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086"
+"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086/go.mod"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267/go.mod"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce"
+"github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce/go.mod"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/imdario/mergo v0.3.5/go.mod"
+"github.com/imdario/mergo v0.3.6"
+"github.com/imdario/mergo v0.3.6/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
+"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
+"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
+"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
+"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+"github.com/jonboulle/clockwork v0.1.0/go.mod"
+"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
+"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
+"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
+"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.7/go.mod"
+"github.com/json-iterator/go v1.1.9"
+"github.com/json-iterator/go v1.1.9/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/errcheck v1.2.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pretty v0.2.0/go.mod"
+"github.com/kr/pretty v0.2.1"
+"github.com/kr/pretty v0.2.1/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/lib/pq v1.1.1/go.mod"
+"github.com/linode/linodego v0.7.1"
+"github.com/linode/linodego v0.7.1/go.mod"
+"github.com/magiconair/properties v1.8.0/go.mod"
+"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-colorable v0.1.6"
+"github.com/mattn/go-colorable v0.1.6/go.mod"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.10/go.mod"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-isatty v0.0.12"
+"github.com/mattn/go-isatty v0.0.12/go.mod"
+"github.com/mattn/go-runewidth v0.0.3/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/miekg/dns v1.1.26/go.mod"
+"github.com/miekg/dns v1.1.27/go.mod"
+"github.com/miekg/dns v1.1.31"
+"github.com/miekg/dns v1.1.31/go.mod"
+"github.com/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/cli v1.1.0"
+"github.com/mitchellh/cli v1.1.0/go.mod"
+"github.com/mitchellh/copystructure v1.0.0"
+"github.com/mitchellh/copystructure v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/go-testing-interface v1.14.0"
+"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
+"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
+"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/mitchellh/mapstructure v1.3.2/go.mod"
+"github.com/mitchellh/mapstructure v1.3.3"
+"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+"github.com/mitchellh/pointerstructure v1.0.0"
+"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.1"
+"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
+"github.com/oklog/run v1.0.0/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/ginkgo v1.8.0/go.mod"
+"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+"github.com/onsi/gomega v1.5.0/go.mod"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pascaldekloe/goe v0.1.0"
+"github.com/pascaldekloe/goe v0.1.0/go.mod"
+"github.com/patrickmn/go-cache v2.1.0+incompatible"
+"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
+"github.com/pelletier/go-toml v1.2.0/go.mod"
+"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.5.2+incompatible"
+"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/posener/complete v1.1.1/go.mod"
+"github.com/posener/complete v1.2.3"
+"github.com/posener/complete v1.2.3/go.mod"
+"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35"
+"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.2/go.mod"
+"github.com/prometheus/client_golang v0.9.3/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.4.0"
+"github.com/prometheus/client_golang v1.4.0/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+"github.com/prometheus/common v0.4.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.9.1"
+"github.com/prometheus/common v0.9.1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.8"
+"github.com/prometheus/procfs v0.0.8/go.mod"
+"github.com/prometheus/tsdb v0.7.1/go.mod"
+"github.com/rboyer/safeio v0.2.1"
+"github.com/rboyer/safeio v0.2.1/go.mod"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/rs/zerolog v1.4.0/go.mod"
+"github.com/russross/blackfriday v1.5.2/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/ryanuber/columnize v2.1.0+incompatible"
+"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+"github.com/ryanuber/go-glob v1.0.0"
+"github.com/ryanuber/go-glob v1.0.0/go.mod"
+"github.com/satori/go.uuid v1.2.0/go.mod"
+"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
+"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/shirou/gopsutil/v3 v3.20.10"
+"github.com/shirou/gopsutil/v3 v3.20.10/go.mod"
+"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
+"github.com/sirupsen/logrus v1.0.6/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.2"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+"github.com/spf13/afero v1.1.2/go.mod"
+"github.com/spf13/afero v1.2.1/go.mod"
+"github.com/spf13/afero v1.2.2/go.mod"
+"github.com/spf13/cast v1.3.0/go.mod"
+"github.com/spf13/cobra v0.0.5/go.mod"
+"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+"github.com/spf13/pflag v1.0.3/go.mod"
+"github.com/spf13/pflag v1.0.5"
+"github.com/spf13/pflag v1.0.5/go.mod"
+"github.com/spf13/viper v1.3.2/go.mod"
+"github.com/spf13/viper v1.4.0/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/stretchr/testify v1.6.1"
+"github.com/stretchr/testify v1.6.1/go.mod"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
+"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+"github.com/ugorji/go v1.1.4/go.mod"
+"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+"github.com/vmware/govmomi v0.18.0"
+"github.com/vmware/govmomi v0.18.0/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+"github.com/yuin/goldmark v1.1.27/go.mod"
+"go.etcd.io/bbolt v1.3.2/go.mod"
+"go.opencensus.io v0.21.0/go.mod"
+"go.opencensus.io v0.22.0"
+"go.opencensus.io v0.22.0/go.mod"
+"go.uber.org/atomic v1.4.0/go.mod"
+"go.uber.org/goleak v1.1.10"
+"go.uber.org/goleak v1.1.10/go.mod"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/zap v1.10.0/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
+"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/crypto v0.0.0-20200930160638-afb6bcd081ae"
+"golang.org/x/crypto v0.0.0-20200930160638-afb6bcd081ae/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+"golang.org/x/mod v0.2.0"
+"golang.org/x/mod v0.2.0/go.mod"
+"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
+"golang.org/x/net v0.0.0-20200930145003-4acb6c075d10"
+"golang.org/x/net v0.0.0-20200930145003-4acb6c075d10/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a"
+"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
+"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
+"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
+"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5"
+"golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5/go.mod"
+"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/text v0.3.3"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
+"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
+"golang.org/x/tools v0.0.0-20200513154647-78b527d18275"
+"golang.org/x/tools v0.0.0-20200513154647-78b527d18275/go.mod"
+"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+"google.golang.org/api v0.4.0/go.mod"
+"google.golang.org/api v0.9.0"
+"google.golang.org/api v0.9.0/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.5.0/go.mod"
+"google.golang.org/appengine v1.6.0"
+"google.golang.org/appengine v1.6.0/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/grpc v1.14.0/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.20.1/go.mod"
+"google.golang.org/grpc v1.21.0/go.mod"
+"google.golang.org/grpc v1.22.0/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.25.1"
+"google.golang.org/grpc v1.25.1/go.mod"
+"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+"gopkg.in/inf.v0 v0.9.1"
+"gopkg.in/inf.v0 v0.9.1/go.mod"
+"gopkg.in/resty.v1 v1.12.0"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.5.1"
+"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.2.8"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"k8s.io/api v0.16.9"
+"k8s.io/api v0.16.9/go.mod"
+"k8s.io/apimachinery v0.16.9"
+"k8s.io/apimachinery v0.16.9/go.mod"
+"k8s.io/client-go v0.16.9"
+"k8s.io/client-go v0.16.9/go.mod"
+"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+"k8s.io/klog v0.3.0/go.mod"
+"k8s.io/klog v1.0.0"
+"k8s.io/klog v1.0.0/go.mod"
+"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
+"k8s.io/utils v0.0.0-20190801114015-581e00157fb1"
+"k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod"
+"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+"sigs.k8s.io/yaml v1.1.0"
+"sigs.k8s.io/yaml v1.1.0/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_SUM_SRC_URI}"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+ acct-group/consul
+ acct-user/consul"
+ DEPEND="${COMMON_DEPEND}"
+ RDEPEND="${COMMON_DEPEND}"
+
+src_compile() {
+ # The dev target sets causes build.sh to set appropriate XC_OS
+ # and XC_ARCH, and skips generation of an unused zip file,
+ # avoiding a dependency on app-arch/zip.
+ GIT_DESCRIBE="v${PV}" \
+ GIT_DIRTY="" \
+ GIT_COMMIT="${GIT_COMMIT}" \
+ emake dev-build
+}
+
+src_install() {
+ dobin bin/consul
+
+ keepdir /etc/consul.d
+ insinto /etc/consul.d
+ doins "${FILESDIR}/"*.json.example
+
+ keepdir /var/log/consul
+ fowners consul:consul /var/log/consul
+
+ newinitd "${FILESDIR}/consul.initd" "${PN}"
+ newconfd "${FILESDIR}/consul.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild b/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild
index f80b7c07b4d1..43e174d3f559 100644
--- a/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild
+++ b/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -31,7 +31,7 @@ else
https://github.com/haubi/cygwin-rebase/compare/rebase-${MY_PV}...rebase-${MY_PV}_merge-files-flag-0.patch -> ${P}_merge-files-flag-0.patch
"
PATCHES=( "${DISTDIR}/${P}_merge-files-flag-0.patch" )
- KEYWORDS="-* ~x64-cygwin ~x86-cygwin"
+ KEYWORDS="-* ~x64-cygwin"
fi
DEPEND=""
diff --git a/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild b/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild
index f80b7c07b4d1..43e174d3f559 100644
--- a/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild
+++ b/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -31,7 +31,7 @@ else
https://github.com/haubi/cygwin-rebase/compare/rebase-${MY_PV}...rebase-${MY_PV}_merge-files-flag-0.patch -> ${P}_merge-files-flag-0.patch
"
PATCHES=( "${DISTDIR}/${P}_merge-files-flag-0.patch" )
- KEYWORDS="-* ~x64-cygwin ~x86-cygwin"
+ KEYWORDS="-* ~x64-cygwin"
fi
DEPEND=""
diff --git a/app-admin/entr/entr-4.6.ebuild b/app-admin/entr/entr-4.6.ebuild
index b86dea0ffd94..aafb265f6800 100644
--- a/app-admin/entr/entr-4.6.ebuild
+++ b/app-admin/entr/entr-4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://entrproject.org/code/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest
index e912249dcc5b..762b9aa9154d 100644
--- a/app-admin/graylog/Manifest
+++ b/app-admin/graylog/Manifest
@@ -1,2 +1,3 @@
DIST graylog-3.3.8.tgz 129314297 BLAKE2B 21eaf45b396b11ad5c42efad790390b643505ac7ecc24332813784443ba3b5aeed911fae07beb270f598341d577469f9a5fdbe92101e64939e6646884b7f7fc8 SHA512 feda3dafc3af249e54e8240ea20a8fd4e96c80901b45842cf8ec4ee7a5b33646a391a19a23a06b0e5fb4bf29c0d1c8d7cb87f2ee169ef17ac5b38fbd00682ead
+DIST graylog-3.3.9.tgz 129306340 BLAKE2B 91fd8195176b2e7d87b0bf29ffbe000b8cddac8efb238487a0e3cc1b1048e9ea9af36d1f5362c79ce0ba964886b336a43bbc7e64d52711bf00e3721d7253a3af SHA512 acbfd63974a700f7860e4acf706cc40f8c097546510ec7ed040bfbf50cb878fbd0a9f793eb88227e27205d5af40dbad3a4299354bf70bc2c26a6998b6c3bf0c6
DIST graylog-4.0.1.tgz 163263748 BLAKE2B fdaf3055a76b49a637e2ce7a52af465195e8afb787f20632197a6839a0e6d134284ac3e5c5af76d7fe8bb9ec5de9ba47d5401e0392eb5c078728698fd1e208cd SHA512 a7fb3757cb9ac67a33b836634f73d08b06bc6c0ff50ae0e24da3616dbe8663740e64f07efeb8ac8578f283232df784c959b940f25dc6ab5a66483bc84cbab88e
diff --git a/app-admin/graylog/graylog-3.3.9.ebuild b/app-admin/graylog/graylog-3.3.9.ebuild
new file mode 100644
index 000000000000..d9a5d3883577
--- /dev/null
+++ b/app-admin/graylog/graylog-3.3.9.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Free and open source log management"
+HOMEPAGE="https://www.graylog.org"
+SRC_URI="https://downloads.graylog.org/releases/graylog/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+RESTRICT="strip"
+
+RDEPEND="!app-admin/graylog2
+ acct-group/graylog
+ acct-user/graylog
+ >=virtual/jdk-1.8:*"
+
+DOCS=(
+ COPYING README.markdown UPGRADING.rst
+)
+
+GRAYLOG_DATA_DIR="/var/lib/graylog"
+GRAYLOG_INSTALL_DIR="/usr/share/graylog"
+QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
+
+src_prepare() {
+ default
+
+ # Stick to architecture of build host
+ if ! use amd64; then
+ rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
+ fi
+ if ! use ppc64; then
+ rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
+ fi
+ if ! use x86; then
+ rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
+ fi
+ # Currently unsupported platforms
+ # QA warning galore but testing/patches welcome
+ rm lib/sigar/libsigar-*freebsd*so \
+ lib/sigar/libsigar-*solaris*so \
+ lib/sigar/libsigar-*hpux*.sl \
+ lib/sigar/libsigar-*macosx*.dylib \
+ lib/sigar/libsigar-ia64-*.so \
+ lib/sigar/libsigar-ppc-*.so \
+ lib/sigar/libsigar-s390x*.so \
+ lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
+
+ # gentoo specific paths
+ sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \
+ s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g;" \
+ graylog.conf.example || die
+}
+
+src_install() {
+ default
+
+ insinto /etc/graylog
+ doins graylog.conf.example
+
+ insinto "${GRAYLOG_INSTALL_DIR}"
+ doins graylog.jar
+ doins -r lib plugin
+
+ keepdir "${GRAYLOG_DATA_DIR}"
+
+ newconfd "${FILESDIR}/graylog.confd" graylog
+ newinitd "${FILESDIR}/graylog.initd" graylog
+}
+
+pkg_postinst() {
+ ewarn "Graylog does not depend on need.net any more (#439092)."
+ ewarn
+ ewarn "Please configure rc_need according to your binding address in:"
+ ewarn "/etc/conf.d/graylog"
+ ewarn
+ ewarn "Graylog requires Java >= 8"
+ ewarn "Elasticsearch 5.x or 6.x (does NOT work with 7.x)"
+ ewarn "and MongoDB 3.6, 4.0 or 4.2"
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index fa6ad88fdc02..1df9ce22a918 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,4 +1,3 @@
-DIST puppet-agent_6.15.0-1stretch_amd64.deb 22581842 BLAKE2B 19c45427e56a41f6030836129a7fb2824ea47f1000745a8c74b0968c61f719d3cef9a0e02f51009b8e91c4ad66445c074ccc203754bb13d82007316a3d053c60 SHA512 4ec7e04fb6bab697bfccd369740a57f735476a4614dbfa1f7c893901f5ffb9d6ce3d79886b6e035805b1a8f2c3de3e0b9b468b08909881df6022c9700c7a2768
-DIST puppet-agent_6.15.0-1stretch_i386.deb 22917002 BLAKE2B 5bab2b6cdde11a46e64996074e8db50d48d004b601c0d08ddfde9c8dec0c0f62da1176b9148d084f0250b582460606b7cd0a97291d157a186b7a97dee4184c51 SHA512 89e676491f7b7b44c9c747b129166db7b025adf76d9911d12d7d026aa8d04de293d3d1c638ca309ee8ed45a37c49b4ab0076ea0c711ac0e43f4297084446784f
DIST puppet-agent_6.18.0-1focal_amd64.deb 22258752 BLAKE2B 547d06b16b2c95ec9be72bd82e1aa0a4a4b511075da73f29ebecdef32ca4ed9b965a38a7c071d9bcc8c444b6974159df97f020878c0e4a20d1f50ff23d4c1129 SHA512 00f0cfd96176f5311f0bab14016ab88da03ecc10fd9e2bf28fc2d9a399600c56a97e23095694be5382005fef0df1c4fe3ff0d1aec3a46d85f74c729a3c62476a
DIST puppet-agent_6.19.1-1focal_amd64.deb 22221600 BLAKE2B 22b03ef1f86b34955e8bad7c63a2022d2832dadd554316baf75419d6543e8a569902fb92a81a3dcc817401f06aa7dd47143a6cbd383f0e531c465cd3203dc4ed SHA512 4819a3509066516b0be76bc0f2afe94611405f7ac52fe50890d57c86a8a9c6c70787d46cb4b77085666f3e74bcb83a11acf1fef5d1e6ed3151ea06cbb8df3170
+DIST puppet-agent_7.1.0-1focal_amd64.deb 20881084 BLAKE2B 1f16533e9f2da9971bfeaaab696bd0631d058928491c52e7cadba2c710af8373cfb89b4eaa4e293121857dfdad9bc694d562ebd9db8213198191c56fe94dd119 SHA512 3356810dd08baad373fd62669995cea17fed6baad3d3ae54dfd00c88a69602b5d4b8917b5e54aacc41fbd011a4e6877d1fd6c4a62d09648ddfaf26d898c3e7d6
diff --git a/app-admin/puppet-agent/puppet-agent-6.15.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.1.0.ebuild
similarity index 70%
rename from app-admin/puppet-agent/puppet-agent-6.15.0.ebuild
rename to app-admin/puppet-agent/puppet-agent-7.1.0.ebuild
index 9d360f3dc1b3..b8c6c3f40eaa 100644
--- a/app-admin/puppet-agent/puppet-agent-6.15.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.1.0.ebuild
@@ -6,21 +6,18 @@ inherit eutils systemd unpacker
DESCRIPTION="general puppet client utils along with hiera and facter"
HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
-SRC_URI="
- amd64? ( ${SRC_BASE}_amd64.deb )
- x86? ( ${SRC_BASE}_i386.deb )"
+SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64"
IUSE="puppetdb selinux"
RESTRICT="strip"
CDEPEND="!app-admin/puppet
!dev-ruby/hiera
!dev-ruby/facter
- !app-emulation/virt-what
+ app-emulation/virt-what
acct-user/puppet
acct-group/puppet"
@@ -32,7 +29,8 @@ RDEPEND="${CDEPEND}
sys-apps/dmidecode
sys-libs/libselinux
sys-libs/glibc
- sys-libs/readline:0/7
+ sys-libs/readline:0/8
+ sys-libs/libxcrypt
sys-libs/ncurses:0[tinfo]
selinux? (
sys-libs/libselinux[ruby]
@@ -42,6 +40,8 @@ RDEPEND="${CDEPEND}
S=${WORKDIR}
+QA_PREBUILT="*"
+
src_install() {
# conf.d
doconfd etc/default/puppet
@@ -53,23 +53,22 @@ src_install() {
insinto /etc/puppetlabs
doins -r etc/puppetlabs/*
# logdir for systemd
- dodir var/log/puppetlabs/puppet/
- fperms 0750 var/log/puppetlabs/puppet/
+ keepdir var/log/puppetlabs/puppet/
+ chmod 0750 var/log/puppetlabs/puppet/
# the rest
insinto /opt
dodir opt/puppetlabs/puppet/cache
doins -r opt/*
fperms 0750 /opt/puppetlabs/puppet/cache
# init
- newinitd "${FILESDIR}/puppet.initd" puppet
+ newinitd "${FILESDIR}/puppet.initd2" puppet
systemd_dounit lib/systemd/system/puppet.service
systemd_dounit lib/systemd/system/pxp-agent.service
- systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+ systemd_newtmpfilesd usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
# symlinks
chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
- chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
- dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+ dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 0fcc97dea85a..cffabbeca385 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -3,3 +3,4 @@ DIST puppet-5.5.21.tar.gz 2997149 BLAKE2B b42fd79132ce0aab02724c7aa38fc39a216df3
DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
DIST puppet-6.18.0.tar.gz 2911742 BLAKE2B 75ecb14a0cf96c1c54d09f88f91984805834288a166e74c5b9648d5f9ad60a6c279100f32f148659772a22fc01d21345bf765ed47518bfa9bd81d06c17587efd SHA512 a14994aea502fbc78219967e2d711952b580df1e7befeab2d254a73f28036c6c7923d167a20bc61c9abe76000f93dcd3cba92b3353540e2a26fc27b10b06efe1
DIST puppet-6.19.1.tar.gz 2917976 BLAKE2B 06019b465699494c3c5045d8d3f617046583f8bb5ebff4e72991bcf5f1ca76b4e00f56af79bbcd7ab849439fc5e627840ef08b92f586441c0cb0bb3d51805f7f SHA512 4e8a3c8d46b6aa67c31da4b510dfc32a187937af213efb9f2f0b6625b29995cdfa8cbca384ad857c19e47ae4878127564756a809c2afdff4883038249395ff01
+DIST puppet-7.1.0.tar.gz 2827602 BLAKE2B 5e15c7304c7b91e40b95096482d6a71a3e9e1686f769c4c0334a533cd8b6faf31d4e126585c9b48c15bb524930e0410bff32201dd01d7faeb7487c29075f7477 SHA512 7cb5f8c472d28012a0b93893792611dd03081c7100be57e2fab60a0dabe164081fc40195d562ef8cf5e2d67f9d32f26704ecedee9cc772e568a116e12af70cda
diff --git a/app-admin/puppet/puppet-7.1.0.ebuild b/app-admin/puppet/puppet-7.1.0.ebuild
new file mode 100644
index 000000000000..7347beb79605
--- /dev/null
+++ b/app-admin/puppet/puppet-7.1.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils ruby-fakegem eapi7-ver
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="https://puppet.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+ dev-ruby/hiera
+ dev-ruby/json:=
+ dev-ruby/semantic_puppet
+ >=dev-ruby/facter-3.0.0
+ dev-ruby/concurrent-ruby
+ augeas? ( dev-ruby/ruby-augeas )
+ diff? ( dev-ruby/diff-lcs )
+ doc? ( dev-ruby/rdoc )
+ ldap? ( dev-ruby/ruby-ldap )
+ shadow? ( dev-ruby/ruby-shadow )
+ sqlite? ( dev-ruby/sqlite3 )
+ virtual/ruby-ssl
+ dev-ruby/hocon"
+
+ruby_add_bdepend "
+ doc? ( dev-ruby/yard )
+ test? (
+ dev-ruby/mocha
+ dev-ruby/rack
+ dev-ruby/rspec-its
+ )"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+# dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+ rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+ >=app-portage/eix-0.18.0
+ acct-user/puppet
+ acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+ # Avoid spec that require unpackaged json-schema.
+ rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+ # fix systemd path
+ epatch "${FILESDIR}/puppet-systemd.patch"
+
+ # Avoid specs that can only run in the puppet.git repository. This
+ # should be narrowed down to the specific specs.
+ rm spec/integration/parser/compiler_spec.rb || die
+
+ # Avoid failing spec that need further investigation.
+ rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ # systemd stuffs
+ insinto /usr/lib/systemd/system
+ doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ insinto /usr/lib/tmpfiles.d
+ newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+ # openrc init stuff
+ newinitd "${FILESDIR}"/puppet.init-4.x puppet
+
+ keepdir /etc/puppetlabs/puppet/ssl
+
+ keepdir /var/lib/puppet/facts
+ keepdir /var/lib/puppet/files
+ fowners -R puppet:puppet /var/lib/puppet
+
+ fperms 0750 /var/lib/puppet
+
+ fperms 0750 /etc/puppetlabs
+ fperms 0750 /etc/puppetlabs/puppet
+ fperms 0750 /etc/puppetlabs/puppet/ssl
+ fowners -R :puppet /etc/puppetlabs
+ fowners -R :puppet /var/lib/puppet
+
+ if use ldap ; then
+ insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+ fi
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto "$(dirname ${f})"; dodoc "${f}"
+ done
+}
+
+pkg_postinst() {
+ elog
+ elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+ elog "cause puppet to hang while installing packages."
+ elog
+ elog "Portage Puppet module with Gentoo-specific resources:"
+ elog "http://forge.puppetlabs.com/gentoo/portage"
+ elog
+ elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
+ elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
+ elog "not already done so."
+ elog
+}
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 0e74acc610d5..440a78b71451 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,2 +1,3 @@
DIST puppetdb-6.12.0.tar.gz 46375914 BLAKE2B 7d1a884881e9aa324b0d2a8cd49bf47e4014ff6bc23e94c76c27b3736c75f3cdcead76aea159de17ce1255381e32bb126f9cbf55297f64454fcca6ffd7f28b46 SHA512 040f8653c422e312857f82a8f040a33128f49c7900978a22b9ae672172ec41d2037e323de5aad3c50a630058b6b95c025bae05b3ea923e2321e94f97390998dc
DIST puppetdb-6.13.0.tar.gz 46400373 BLAKE2B 2e3cdd4e7a3e84e11f23031dba3aadf5be885e118938a0a52140e612b4006a0fd4e97f162322c80731b2bfb63dcff2d73d5b2cd0882f7aabcb69fe30aa05151b SHA512 4d16ce44666634e88c538b06f6b2e91cf9786646134a6302a80ea941e3f73168b0f4981cecdb125cac881c0233c835893e9385004461b67e7d8635865f14aee9
+DIST puppetdb-7.0.1.tar.gz 46449698 BLAKE2B 63538c2c61ca5f68643f95537d5096e08e46ffbd0b7d02e03fd6fb6ae5864fc234bd18bc9389d1f073c30ed4472415b6916672875250ae3a24cb348969f950d8 SHA512 0ae763b71d02c3afc55cf2f10829da75b07d89e57b75c713bc52492a7cc3693c3d22ecbbb36fed30f562f067f78fb0d1c80b073e0238a60eb144cc3555d7219d
diff --git a/app-admin/puppetdb/puppetdb-7.0.1.ebuild b/app-admin/puppetdb/puppetdb-7.0.1.ebuild
new file mode 100644
index 000000000000..5a7a32bcf49c
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-7.0.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+=">=virtual/jdk-1.8.0"
+DEPEND+="acct-user/puppetdb
+ acct-group/puppetdb"
+
+src_prepare() {
+ sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+ sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+ sed -i 's/sysconfig/conf\.d/g' install.sh || die
+ sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+ sed -i 's/var\/run/run/g' install.sh || die
+ default
+}
+
+src_compile() {
+ einfo "not compiling"
+}
+
+src_install() {
+ dodir /opt/puppetlabs/server/data/puppetdb
+ insinto /opt/puppetlabs/server/apps/puppetdb
+ insopts -m0744
+ doins ext/ezbake-functions.sh
+ insopts -m0644
+ doins ext/ezbake.manifest
+ doins puppetdb.jar
+ insinto /etc/puppetlabs/puppetdb
+ doins ext/config/logback.xml
+ doins ext/config/bootstrap.cfg
+ doins ext/config/request-logging.xml
+ insinto /etc/puppetlabs/puppetdb/conf.d
+ doins ext/config/conf.d/jetty.ini
+ doins ext/config/conf.d/repl.ini
+ doins ext/config/conf.d/database.ini
+ doins ext/config/conf.d/config.ini
+ insopts -m0755
+ insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+ doins install.sh
+ insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+ doins ext/cli/foreground
+ doins ext/cli/ssl-setup
+ doins ext/cli/config-migration
+ doins ext/cli/foreground
+ doins ext/cli/anonymize
+ doins ext/cli/reload
+ doins ext/cli/start
+ doins ext/cli/stop
+ insinto /opt/puppetlabs/server/apps/puppetdb/bin
+ doins ext/bin/puppetdb
+ insopts -m0644
+ dodir /opt/puppetlabs/server/bin
+ dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+ dodir /opt/puppetlabs/bin
+ dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+ dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+ # init type tasks
+ newconfd ext/default puppetdb
+ systemd_dounit ext/redhat/puppetdb.service
+ systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+ newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
+ # misc
+ insinto /etc/logrotate.d
+ newins ext/puppetdb.logrotate.conf puppetdb
+ fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+ fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+ elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+ elog
+ elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 26b5485b6169..a260918b4a90 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,2 +1,4 @@
+DIST puppetserver-6.12.1.tar.gz 60422470 BLAKE2B fd3fa33262a5ae83fb6889079a85c262d74d55b0ffb9ed297d60399c442d7a1676cfc54afd3e25721d6e4a4ad926c43a1f8f1a9db206ee6145280601c501fe09 SHA512 9ad5d3e266f91b8a1ef09302a1f8889f139909fb20268f714fb894dcff2379a01c78baafdab1102a26c26903cefe92ac833c2b20e9ea6f8d379af2dd11c20407
DIST puppetserver-6.13.0.tar.gz 61890579 BLAKE2B be514b3c41dcc018715e949f1f1c86317499baa22fa70e5f7e8df89211b566651ab4de469afadf14fcd1dbc9b1d0b0c21452c313f74052eb8d65bbd591231194 SHA512 ab67ebf94c37a50999a5597e1ceeadf606296c2b6e557bd6ee2bb99ac44b7c8fe8df892f4e3bccb9f0e3822fc480f61a27d6799b7dfc8df12e058c7074d589f9
DIST puppetserver-6.14.0.tar.gz 61960111 BLAKE2B 760fb2114aef78f1d96d41023f43f162eccd14ee0fa50f8ce4c7954450087dc395d9a9347629a968d99193ba6964b11a2650513c229b48159df67e9f9d63f541 SHA512 5d66b57a0f3c64ff889c33ccf94077a0ab142b84ca17faffaf4b885ba4794a52afb1b227f101eced36655999ac402913363897a3823a387f3c48948d38471c43
+DIST puppetserver-7.0.1.tar.gz 62214010 BLAKE2B e0272e8dfc910f503cbd8aca8d4c689656d1356a6198766c5c82ab6658b2e7f5e956eb10022ca5336fd1bd0d655ca4c87e5c43290229cfd26c74c9943210cdef SHA512 67f3ba07d1f607eeee0f0520054711f36d0f6e59477930a6115c5f5127b9fc7e00075d6f863bfe9e9f92e4f45fe13f452c80759e3b496aebdca6fd97e50f3774
diff --git a/app-admin/puppetserver/puppetserver-6.12.1.ebuild b/app-admin/puppetserver/puppetserver-6.12.1.ebuild
new file mode 100644
index 000000000000..2b74472d2418
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-6.12.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="amd64"
+
+RDEPEND+="
+ >=virtual/jdk-1.8.0
+ app-admin/puppet-agent[puppetdb?]"
+DEPEND+="acct-user/puppet
+ acct-group/puppet"
+
+src_prepare() {
+ sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+ sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+ sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+ sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+ sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+ sed -i 's/var\/run/run/g' install.sh || die
+ default
+}
+
+src_compile() {
+ einfo "not compiling"
+}
+
+src_install() {
+ insinto /opt/puppetlabs/server/apps/puppetserver
+ insopts -m0774
+ doins ext/ezbake-functions.sh
+ insopts -m0644
+ doins ext/ezbake.manifest
+ doins puppet-server-release.jar
+ insinto /etc/puppetlabs/puppetserver
+ doins ext/config/logback.xml
+ doins ext/config/request-logging.xml
+ insinto /etc/puppetlabs/puppetserver/services.d
+ doins ext/system-config/services.d/bootstrap.cfg
+ doins ext/config/services.d/ca.cfg
+ insinto /etc/puppetlabs/puppetserver/conf.d
+ doins ext/config/conf.d/puppetserver.conf
+ doins ext/config/conf.d/auth.conf
+ doins ext/config/conf.d/global.conf
+ doins ext/config/conf.d/web-routes.conf
+ doins ext/config/conf.d/metrics.conf
+ doins ext/config/conf.d/webserver.conf
+ insopts -m0755
+ insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+ doins install.sh
+ insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+ doins ext/cli/ca
+ doins ext/cli/irb
+ doins ext/cli/foreground
+ doins ext/cli/gem
+ doins ext/cli/ruby
+ doins ext/cli/reload
+ doins ext/cli/start
+ doins ext/cli/stop
+ insinto /opt/puppetlabs/server/apps/puppetserver/cli
+ doins ext/cli_defaults/cli-defaults.sh
+ insinto /opt/puppetlabs/server/apps/puppetserver/bin
+ doins ext/bin/puppetserver
+ insopts -m0644
+ dodir /opt/puppetlabs/server/bin
+ dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+ dodir /opt/puppetlabs/bin
+ dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+ dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+ dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+ # other sys stuff
+ dodir /etc/puppetlabs/code
+ # needed for systemd
+ dodir /var/log/puppetlabs/puppetserver
+ dodir /etc/puppetlabs/puppet/ssl
+ fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+ fperms -R 771 /etc/puppetlabs/puppet/ssl
+ # systemd type things
+ insinto /etc/systemd/system/puppetserver.service.d/
+ systemd_dounit ext/redhat/puppetserver.service
+ insinto /etc/default
+ newins ext/default puppetserver
+ # normal init type tasks
+ dosym ../default/puppetserver /etc/conf.d/puppetserver
+ newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
+ # misc
+ insinto /etc/logrotate.d
+ newins ext/puppetserver.logrotate.conf puppetserver
+ # cleanup
+ dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+ fowners -R puppet:puppet /opt/puppetlabs/server/data
+ fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+ fperms -R 700 /var/log/puppetlabs/puppetserver
+ insinto /opt/puppetlabs/server/data
+ doins ext/build-scripts/jruby-gem-list.txt
+ doins ext/build-scripts/mri-gem-list-no-dependencies.txt
+ insopts -m 0644
+ insinto /usr/lib/tmpfiles.d
+ newins ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+ elog "to install you may want to run the following:"
+ elog
+ elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver"
+ elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver"
+ elog "puppet config set --section master rundir /run/puppetlabs/puppetserver"
+ elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+ elog "puppet config set --section master codedir /etc/puppetlabs/code"
+ elog
+ elog "# install puppetserver gems"
+ elog "cd /opt/puppetlabs/server/apps/puppetserver"
+ elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+ elog "while read LINE; do"
+ elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+ elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+ elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+ elog "while read LINE; do"
+ elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+ elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
+}
diff --git a/app-admin/puppetserver/puppetserver-6.13.0.ebuild b/app-admin/puppetserver/puppetserver-6.13.0.ebuild
index 5385eacc0c94..2b74472d2418 100644
--- a/app-admin/puppetserver/puppetserver-6.13.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.13.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="puppetdb"
# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
RDEPEND+="
>=virtual/jdk-1.8.0
diff --git a/app-admin/puppetserver/puppetserver-6.14.0.ebuild b/app-admin/puppetserver/puppetserver-6.14.0.ebuild
index 5385eacc0c94..2b74472d2418 100644
--- a/app-admin/puppetserver/puppetserver-6.14.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.14.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="puppetdb"
# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
RDEPEND+="
>=virtual/jdk-1.8.0
diff --git a/app-admin/puppetserver/puppetserver-7.0.1.ebuild b/app-admin/puppetserver/puppetserver-7.0.1.ebuild
new file mode 100644
index 000000000000..4e99a7c7b7ee
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-7.0.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="~amd64"
+
+RDEPEND+="
+ >=virtual/jdk-1.8.0
+ app-admin/puppet-agent[puppetdb?]"
+DEPEND+="acct-user/puppet
+ acct-group/puppet"
+
+src_prepare() {
+ sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+ sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+ sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+ sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+ sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+ sed -i 's/var\/run/run/g' install.sh || die
+ default
+}
+
+src_compile() {
+ einfo "not compiling"
+}
+
+src_install() {
+ insinto /opt/puppetlabs/server/apps/puppetserver
+ insopts -m0774
+ doins ext/ezbake-functions.sh
+ insopts -m0644
+ doins ext/ezbake.manifest
+ doins puppet-server-release.jar
+ insinto /etc/puppetlabs/puppetserver
+ doins ext/config/logback.xml
+ doins ext/config/request-logging.xml
+ insinto /etc/puppetlabs/puppetserver/services.d
+ doins ext/system-config/services.d/bootstrap.cfg
+ doins ext/config/services.d/ca.cfg
+ insinto /etc/puppetlabs/puppetserver/conf.d
+ doins ext/config/conf.d/puppetserver.conf
+ doins ext/config/conf.d/auth.conf
+ doins ext/config/conf.d/global.conf
+ doins ext/config/conf.d/web-routes.conf
+ doins ext/config/conf.d/metrics.conf
+ doins ext/config/conf.d/webserver.conf
+ insopts -m0755
+ insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+ doins install.sh
+ insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+ doins ext/cli/ca
+ doins ext/cli/irb
+ doins ext/cli/foreground
+ doins ext/cli/gem
+ doins ext/cli/ruby
+ doins ext/cli/reload
+ doins ext/cli/start
+ doins ext/cli/stop
+ insinto /opt/puppetlabs/server/apps/puppetserver/cli
+ doins ext/cli_defaults/cli-defaults.sh
+ insinto /opt/puppetlabs/server/apps/puppetserver/bin
+ doins ext/bin/puppetserver
+ insopts -m0644
+ dodir /opt/puppetlabs/server/bin
+ dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+ dodir /opt/puppetlabs/bin
+ dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+ dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+ dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+ # other sys stuff
+ dodir /etc/puppetlabs/code
+ # needed for systemd
+ keepdir /var/log/puppetlabs/puppetserver
+ dodir /etc/puppetlabs/puppet/ssl
+ fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+ fperms -R 771 /etc/puppetlabs/puppet/ssl
+ # systemd type things
+ insinto /etc/systemd/system/puppetserver.service.d/
+ systemd_dounit ext/redhat/puppetserver.service
+ insinto /etc/default
+ newins ext/default puppetserver
+ # normal init type tasks
+ dosym ../default/puppetserver /etc/conf.d/puppetserver
+ newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
+ # misc
+ insinto /etc/logrotate.d
+ newins ext/puppetserver.logrotate.conf puppetserver
+ # cleanup
+ dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+ fowners -R puppet:puppet /opt/puppetlabs/server/data
+ fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+ fperms -R 700 /var/log/puppetlabs/puppetserver
+ insinto /opt/puppetlabs/server/data
+ doins ext/build-scripts/jruby-gem-list.txt
+ doins ext/build-scripts/mri-gem-list-no-dependencies.txt
+ insopts -m 0644
+ insinto /usr/lib/tmpfiles.d
+ newins ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+ elog "to install you may want to run the following:"
+ elog
+ elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver"
+ elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver"
+ elog "puppet config set --section master rundir /run/puppetlabs/puppetserver"
+ elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+ elog "puppet config set --section master codedir /etc/puppetlabs/code"
+ elog
+ elog "# install puppetserver gems"
+ elog "cd /opt/puppetlabs/server/apps/puppetserver"
+ elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+ elog "while read LINE; do"
+ elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+ elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+ elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+ elog "while read LINE; do"
+ elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+ elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
+}
diff --git a/app-admin/selint/selint-1.1.0.ebuild b/app-admin/selint/selint-1.1.0.ebuild
index 592cb7fbdf8f..76ff35921fcf 100644
--- a/app-admin/selint/selint-1.1.0.ebuild
+++ b/app-admin/selint/selint-1.1.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://github.com/TresysTechnology/selint.git"
else
SRC_URI="https://github.com/TresysTechnology/selint/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="Apache-2.0"
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 238a3d6aada8..7a1c0bee2786 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,2 +1,3 @@
DIST sudo-1.9.3p1.tar.gz 3958071 BLAKE2B b681c120faa5dc7f25e27c1be423d68cea70f63dcdfea2183fd386a34dec0376555453399d3f8886c66c6507343648d40b59a058710432154061b210df2a704c SHA512 3ad13fd03e5b371fd6bf7909731ffc11431d2182a744b654f7e5d4b810e47955d49bc78f551afe13ec56acbce694139c33a15bc022cea41b17af5496b8b7f89f
-DIST sudo-1.9.4.tar.gz 3992062 BLAKE2B 65eb8f78eb34ca7009ea0752a1acbfcb4e06ddd7083301736ac1bac7019c1a45cf2c34f69ac5b86fa4ac01310e209f236840712ad4998b692ddf774b9d1bf60d SHA512 682b4d303147193149509b734b64f8541e00ccc1c41468928dff307f9d52f2b1aae005deee1ef5ac389cd3dc506368dba8a78c0392ea1434dd78cf7ef8a08408
+DIST sudo-1.9.4p1.tar.gz 3993946 BLAKE2B 171af5befe05e393846886077d0c210664ff86191ae1a093148d85ca80d4a8c6cd8c41ef91451207831f574267d32d4c621e47ecfa1d3b37ee8c498af6729369 SHA512 5d247c9ad68cd2c3ea504dc0a49db041f68c1575775b4bb3a5fb62abadc23295a42658d33430d6391152c7b44f66d9f165f77a91abb355edc2d2d8787d41cd91
+DIST sudo-1.9.4p2.tar.gz 3994184 BLAKE2B 110562792fa3d6f3f30fb0f07eefca975f062d41743fb84a34c27bf4c72296aa5f581de1f74895deedd6b47cb235399c52b9d3d818d274c6cdc61c741a0a287e SHA512 5258531d3dca0e812df5f4f8f26665f643c036d42534e3b98f5dd463624e9df0bba2a92c15da0c9958bda7e68f6f10b7b34875792ac9c205d1e70a12bc4f98a4
diff --git a/app-admin/sudo/sudo-1.9.4.ebuild b/app-admin/sudo/sudo-1.9.4_p1.ebuild
similarity index 98%
rename from app-admin/sudo/sudo-1.9.4.ebuild
rename to app-admin/sudo/sudo-1.9.4_p1.ebuild
index 74f99d722acf..84770ae1b432 100644
--- a/app-admin/sudo/sudo-1.9.4.ebuild
+++ b/app-admin/sudo/sudo-1.9.4_p1.ebuild
@@ -74,10 +74,6 @@ REQUIRED_USE="
MAKEOPTS+=" SAMPLES="
-PATCHES=(
- "${FILESDIR}/${P}-without-sendmail_build_fix.patch" #757819
-)
-
src_prepare() {
default
elibtoolize
diff --git a/app-admin/sudo/sudo-1.9.4_p2.ebuild b/app-admin/sudo/sudo-1.9.4_p2.ebuild
new file mode 100644
index 000000000000..84770ae1b432
--- /dev/null
+++ b/app-admin/sudo/sudo-1.9.4_p2.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam multilib libtool systemd tmpfiles
+
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/b}"
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+if [[ ${PV} == "9999" ]] ; then
+ inherit mercurial
+ EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+else
+ uri_prefix=
+ case ${P} in
+ *_beta*|*_rc*) uri_prefix=beta/ ;;
+ esac
+
+ SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+ ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+ if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
+ fi
+fi
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
+
+DEPEND="
+ sys-libs/zlib:=
+ gcrypt? ( dev-libs/libgcrypt:= )
+ ldap? (
+ >=net-nds/openldap-2.1.30-r1
+ sasl? (
+ dev-libs/cyrus-sasl
+ net-nds/openldap[sasl]
+ )
+ )
+ pam? ( sys-libs/pam )
+ sasl? ( dev-libs/cyrus-sasl )
+ skey? ( >=sys-auth/skey-1.1.5-r1 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ sssd? ( sys-auth/sssd[sudo] )
+"
+RDEPEND="
+ ${DEPEND}
+ >=app-misc/editor-wrapper-3
+ virtual/editor
+ ldap? ( dev-lang/perl )
+ pam? ( sys-auth/pambase )
+ selinux? ( sec-policy/selinux-sudo )
+ sendmail? ( virtual/mta )
+"
+BDEPEND="
+ sys-devel/bison
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ ?? ( pam skey )
+ ?? ( gcrypt ssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+ default
+ elibtoolize
+}
+
+set_secure_path() {
+ # FIXME: secure_path is a compile time setting. using PATH or
+ # ROOTPATH is not perfect, env-update may invalidate this, but until it
+ # is available as a sudoers setting this will have to do.
+ einfo "Setting secure_path ..."
+
+ # first extract the default ROOTPATH from build env
+ SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
+ echo "${ROOTPATH}")
+ case "${SECURE_PATH}" in
+ */usr/sbin*) ;;
+ *) SECURE_PATH=$(unset PATH;
+ . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+ ;;
+ esac
+ if [[ -z ${SECURE_PATH} ]] ; then
+ ewarn " Failed to detect SECURE_PATH, please report this"
+ fi
+
+ # then remove duplicate path entries
+ cleanpath() {
+ local newpath thisp IFS=:
+ for thisp in $1 ; do
+ if [[ :${newpath}: != *:${thisp}:* ]] ; then
+ newpath+=:${thisp}
+ else
+ einfo " Duplicate entry ${thisp} removed..."
+ fi
+ done
+ SECURE_PATH=${newpath#:}
+ }
+ cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+ # finally, strip gcc paths #136027
+ rmpath() {
+ local e newpath thisp IFS=:
+ for thisp in ${SECURE_PATH} ; do
+ for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
+ newpath+=:${thisp}
+ done
+ SECURE_PATH=${newpath#:}
+ }
+ rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+ einfo "... done"
+}
+
+src_configure() {
+ local SECURE_PATH
+ set_secure_path
+
+ # audit: somebody got to explain me how I can test this before I
+ # enable it.. - Diego
+ # plugindir: autoconf code is crappy and does not delay evaluation
+ # until `make` time, so we have to use a full path here rather than
+ # basing off other values.
+ myeconfargs=(
+ # requires some python eclass
+ --disable-python
+ --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
+ --enable-zlib=system
+ --with-editor="${EPREFIX}"/usr/libexec/editor
+ --with-env-editor
+ --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+ --with-rundir="${EPREFIX}"/run/sudo
+ --with-vardir="${EPREFIX}"/var/db/sudo
+ --without-linux-audit
+ --without-opie
+ $(use_enable gcrypt)
+ $(use_enable nls)
+ $(use_enable sasl)
+ $(use_enable ssl openssl)
+ $(use_with ldap)
+ $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+ $(use_with offensive insults)
+ $(use_with offensive all-insults)
+ $(use_with pam)
+ $(use_with pam pam-login)
+ $(use_with secure-path secure-path "${SECURE_PATH}")
+ $(use_with selinux)
+ $(use_with sendmail)
+ $(use_with skey)
+ $(use_with sssd)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ if use ldap ; then
+ dodoc README.LDAP
+
+ cat <<-EOF > "${T}"/ldap.conf.sudo
+ # See ldap.conf(5) and README.LDAP for details
+ # This file should only be readable by root
+
+ # supported directives: host, port, ssl, ldap_version
+ # uri, binddn, bindpw, sudoers_base, sudoers_debug
+ # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+ EOF
+
+ if use sasl ; then
+ cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+ # SASL directives: use_sasl, sasl_mech, sasl_auth_id
+ # sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+ EOF
+ fi
+
+ insinto /etc
+ doins "${T}"/ldap.conf.sudo
+ fperms 0440 /etc/ldap.conf.sudo
+
+ insinto /etc/openldap/schema
+ newins doc/schema.OpenLDAP sudo.schema
+ fi
+
+ pamd_mimic system-auth sudo auth account session
+ pamd_mimic system-auth sudo-i auth account session
+
+ keepdir /var/db/sudo/lectured
+ fperms 0700 /var/db/sudo/lectured
+ fperms 0711 /var/db/sudo #652958
+
+ # Don't install into /run as that is a tmpfs most of the time
+ # (bug #504854)
+ rm -rf "${ED}"/run || die
+
+ find "${ED}" -type f -name "*.la" -delete || die #697812
+}
+
+pkg_postinst() {
+ tmpfiles_process sudo.conf
+
+ #652958
+ local sudo_db="${EROOT}/var/db/sudo"
+ if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+ chmod 711 "${sudo_db}" || die
+ fi
+
+ if use ldap ; then
+ ewarn
+ ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+ ewarn
+ if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+ ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+ ewarn "configured in /etc/nsswitch.conf."
+ ewarn
+ ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+ ewarn " sudoers: ldap files"
+ ewarn
+ fi
+ fi
+ if use prefix ; then
+ ewarn
+ ewarn "To use sudo, you need to change file ownership and permissions"
+ ewarn "with root privileges, as follows:"
+ ewarn
+ ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
+ ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+ ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
+ ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
+ ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
+ ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+ ewarn
+ fi
+
+ elog "To use the -A (askpass) option, you need to install a compatible"
+ elog "password program from the following list. Starred packages will"
+ elog "automatically register for the use with sudo (but will not force"
+ elog "the -A option):"
+ elog ""
+ elog " [*] net-misc/ssh-askpass-fullscreen"
+ elog " net-misc/x11-ssh-askpass"
+ elog ""
+ elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+ elog "variable to the program you want to use."
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 37473690414b..8f9f1d827a45 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index ac24e4f4c111..fb149bdb62d8 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,2 +1,3 @@
DIST file-roller-3.32.4.tar.xz 854444 BLAKE2B 04264e64af8ab4376fa6985683b16be7fef730a4e24044f726933b885aaaa6b630f347a256b09c2ce6183d0a0a392b33b4328715bf6d19cf7128c1980f9f4792 SHA512 16b5ddbdeacf4e9e61265ecff05e8f2e0034147c67ae7355d2442f9b26098ff253d24cb34c8e686c2ac031da6acac8e1e3c8a9f978e1eb2b446b1e045babafc7
DIST file-roller-3.36.3.tar.xz 870608 BLAKE2B 4c57b99f2ca0eb4db3fac0216b63207d1664829ee54e21eb976a327bd65aec5abfd2a02b84bc80246fde131ede6ff63deaf8b63451db6a0fecc0121c8bce1a5b SHA512 41558ca8061276b1248fd3599e856051dcd69ca831fb4d8a33666dc373b4abed56e7ef204a6e041ceace05ea7234448d15bc7be8c48dc1809ac6d445de251370
+DIST file-roller-3.38.0.tar.xz 877960 BLAKE2B af1c4800e24adfb36a8f8f108740f9cad14bcd40f797b2430d00e428d723587de75be03848aca612536cee768b6b372534e0b6a322dc40d7ab1c41eef540916b SHA512 9c2e3c105397bceb08e30c9796b9242633fe49772aed2e7f67461c34a51be1493e922301b1fc29bdcb0fa50d220f4a7db2ee7642f629007ce2bef00334d7110e
diff --git a/app-arch/file-roller/file-roller-3.38.0.ebuild b/app-arch/file-roller/file-roller-3.38.0.ebuild
new file mode 100644
index 000000000000..aee9ff433eab
--- /dev/null
+++ b/app-arch/file-roller/file-roller-3.38.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
+
+DESCRIPTION="Archive manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+IUSE="libnotify nautilus"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# gdk-pixbuf used extensively in the source
+# cairo used in eggtreemultidnd.c
+# pango used in fr-window
+RDEPEND="
+ >=app-arch/libarchive-3:=
+ >=dev-libs/glib-2.38:2
+ >=dev-libs/json-glib-0.14
+ >=x11-libs/gtk+-3.22.0:3
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/pango
+ libnotify? ( >=x11-libs/libnotify-0.4.3:= )
+ nautilus? ( >=gnome-base/nautilus-3.28.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+${PN} is a frontend for several archiving utilities. If you want a
+particular archive format support, see ${HOMEPAGE}
+and install the relevant package. For example:
+7-zip - app-arch/p7zip
+ace - app-arch/unace
+arj - app-arch/arj
+brotli - app-arch/brotli
+cpio - app-arch/cpio
+deb - app-arch/dpkg
+iso - app-cdr/cdrtools
+jar,zip - app-arch/zip and app-arch/unzip
+lha - app-arch/lha
+lzop - app-arch/lzop
+lz4 - app-arch/lz4
+rar - app-arch/unrar or app-arch/unar
+rpm - app-arch/rpm
+unstuff - app-arch/stuffit
+zstd - app-arch/zstd
+zoo - app-arch/zoo"
+
+src_prepare() {
+ # File providing Gentoo package names for various archivers
+ cp -v "${FILESDIR}"/3.36-packages.match data/packages.match || die
+
+ xdg_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ -Drun-in-place=false
+ $(meson_use nautilus nautilus-actions)
+ $(meson_use libnotify notification)
+ -Dpackagekit=false
+ -Dlibarchive=true
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+ readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/app-arch/file-roller/files/3.32-packages.match b/app-arch/file-roller/files/3.32-packages.match
index 09f1513968e3..b8f879c2d13d 100644
--- a/app-arch/file-roller/files/3.32-packages.match
+++ b/app-arch/file-roller/files/3.32-packages.match
@@ -5,7 +5,7 @@ brotli=app-arch/brotli
bzip2=app-arch/bzip2
cpio=app-arch/cpio
dpkg=app-arch/dpkg
-genisoimage=virtual/cdrtools
+genisoimage=app-cdr/cdrtools
gzip=app-arch/gzip
lha=app-arch/lha
lrzip=app-arch/lrzip
diff --git a/app-arch/file-roller/files/3.36-packages.match b/app-arch/file-roller/files/3.36-packages.match
index 0a26adebb250..b494f5430a00 100644
--- a/app-arch/file-roller/files/3.36-packages.match
+++ b/app-arch/file-roller/files/3.36-packages.match
@@ -5,7 +5,7 @@ brotli=app-arch/brotli
bzip2=app-arch/bzip2
cpio=app-arch/cpio
dpkg=app-arch/dpkg
-genisoimage=virtual/cdrtools
+genisoimage=app-cdr/cdrtools
gzip=app-arch/gzip
lha=app-arch/lha
lrzip=app-arch/lrzip
diff --git a/app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch b/app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch
new file mode 100644
index 000000000000..8f540e4aa07b
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch
@@ -0,0 +1,27 @@
+https://github.com/macports/macports-ports/blob/master/archivers/libarchive/files/patch-libarchive-3.5-strnlen.diff
+
+next release should have a fix for this
+
+--- a/libarchive/archive_read_support_format_mtree.c
++++ b/libarchive/archive_read_support_format_mtree.c
+@@ -65,6 +65,20 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_mtree.c 2011
+ #define O_CLOEXEC 0
+ #endif
+
++#ifdef __APPLE__
++#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070
++static size_t strnlen(const char *s, size_t maxlen) {
++ size_t l = 0;
++ while (l < maxlen && *s) {
++ l++;
++ s++;
++ }
++ return l;
++}
++#endif
++#endif
++
++
+ #define MTREE_HAS_DEVICE 0x0001
+ #define MTREE_HAS_FFLAGS 0x0002
+ #define MTREE_HAS_GID 0x0004
diff --git a/app-arch/libarchive/libarchive-3.5.0.ebuild b/app-arch/libarchive/libarchive-3.5.0.ebuild
index dde837017a82..d59eb05c046f 100644
--- a/app-arch/libarchive/libarchive-3.5.0.ebuild
+++ b/app-arch/libarchive/libarchive-3.5.0.ebuild
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-3.3.3-libressl.patch
+ "${FILESDIR}"/${PN}-3.5.0-darwin-strnlen.patch # drop on next release
)
src_prepare() {
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 10d1933d483b..c60a5c0d8da5 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,2 +1 @@
-DIST lz4-1.9.2.tar.gz 305796 BLAKE2B 0021487bee8657bc825fdd2b98a6dc8a6d10be3240fe0bebf6563e9c855a15bf5440a02d5cd6ee1f1e8502743348bcec1e866d3287b07e623887e9eb9da35eee SHA512 ae714c61ec8e33ed91359b63f2896cfa102d66b730dce112b74696ec5850e59d88bd5527173e01e354a70fbe8f036557a47c767ee0766bc5f9c257978116c3c1
DIST lz4-1.9.3.tar.gz 320958 BLAKE2B 9a194bd18ff52f780aa03a8a53fe7fab7b58117d768f4ba8e5005830c935d16328d0f7cc54f9413b58faf245017c0ac85fb4e709a9db150cb150a0a2a3c21645 SHA512 c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c
diff --git a/app-arch/lz4/lz4-1.9.2.ebuild b/app-arch/lz4/lz4-1.9.2.ebuild
deleted file mode 100644
index 6ac3dce5c2ff..000000000000
--- a/app-arch/lz4/lz4-1.9.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/lz4/lz4.git"
- EGIT_BRANCH=dev
-else
- SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- 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"
-fi
-
-DESCRIPTION="Extremely Fast Compression algorithm"
-HOMEPAGE="https://github.com/lz4/lz4"
-
-LICENSE="BSD-2 GPL-2"
-# https://abi-laboratory.pro/tracker/timeline/lz4/
-SLOT="0/r132"
-IUSE="static-libs"
-
-CMAKE_USE_DIR=${S}/contrib/cmake_unofficial
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_STATIC_LIBS=$(usex static-libs)
- )
-
- cmake_src_configure
-}
diff --git a/app-arch/lz4/lz4-1.9.3.ebuild b/app-arch/lz4/lz4-1.9.3.ebuild
index 2e76852c156d..5435992739dc 100644
--- a/app-arch/lz4/lz4-1.9.3.ebuild
+++ b/app-arch/lz4/lz4-1.9.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2 GPL-2"
# https://abi-laboratory.pro/tracker/timeline/lz4/
SLOT="0/r132"
-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"
+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"
IUSE="static-libs"
CMAKE_USE_DIR=${S}/build/cmake
diff --git a/app-arch/lz4/metadata.xml b/app-arch/lz4/metadata.xml
index 694c0de63b6c..9ea2d62a4794 100644
--- a/app-arch/lz4/metadata.xml
+++ b/app-arch/lz4/metadata.xml
@@ -14,7 +14,7 @@
Guilherme Amadio
- Cyan4973/lz4
+ lz4/lz4
cpe:/a:lz4_project:lz4
diff --git a/app-arch/pixz/pixz-1.0.7.ebuild b/app-arch/pixz/pixz-1.0.7.ebuild
index c6564c5abe3d..3f982f690295 100644
--- a/app-arch/pixz/pixz-1.0.7.ebuild
+++ b/app-arch/pixz/pixz-1.0.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3 autotools
else
SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz"
- 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"
fi
DESCRIPTION="Parallel Indexed XZ compressor"
diff --git a/app-arch/stormlib/Manifest b/app-arch/stormlib/Manifest
new file mode 100644
index 000000000000..99bea60fa5bd
--- /dev/null
+++ b/app-arch/stormlib/Manifest
@@ -0,0 +1 @@
+DIST StormLib-9.23.tar.gz 605295 BLAKE2B 2489e309f218f3e5c5069b56856415cc5985efb2352f36a33530442d539c786262b7c55d134dd67db3098981b1ad98ce8bfa77a16f86d28f326831b09752b705 SHA512 c851159596e252b42facdbac9c52f7477c61de35b44054ab608a22b42e7dc3b4179f50ba9d8cbd30448ed7787cc74e7efd2e08faafdd91289136cd91399d4f09
diff --git a/app-arch/stormlib/files/stormlib-9.23-gnuinstalldirs.patch b/app-arch/stormlib/files/stormlib-9.23-gnuinstalldirs.patch
new file mode 100644
index 000000000000..66b8f91183f0
--- /dev/null
+++ b/app-arch/stormlib/files/stormlib-9.23-gnuinstalldirs.patch
@@ -0,0 +1,55 @@
+From f89f1341cf59f7098af985ecd683d5e0407d2dc7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+Date: Sun, 20 Dec 2020 10:52:34 +0100
+Subject: [PATCH] cmake: Use GNUInstallDirs for configurable install
+ directories
+
+Use the standard GNUInstallDirs CMake module to provide configurable
+install directories rather than hardcoding 'bin', 'lib', etc. Most
+importantly, this fixes install on modern amd64 systems that use 'lib64'
+rather than 'lib'.
+---
+ CMakeLists.txt | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bd8d336..2b09191 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 2.8.12)
+ set(LIBRARY_NAME storm)
+
+ include(CMakeDependentOption)
++include(GNUInstallDirs)
+
+ option(BUILD_SHARED_LIBS "Compile shared libraries" OFF)
+ option(STORM_SKIP_INSTALL "Skip installing files" OFF)
+@@ -331,12 +332,12 @@ endif()
+
+ if (NOT STORM_SKIP_INSTALL)
+ install(TARGETS ${LIBRARY_NAME}
+- RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ FRAMEWORK DESTINATION /Library/Frameworks
+- PUBLIC_HEADER DESTINATION include
+- INCLUDES DESTINATION include)
++ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+ #CPack configurtion
+ SET(CPACK_GENERATOR "DEB" "RPM")
+@@ -369,6 +370,6 @@ endif()
+ if(STORM_BUILD_TESTS)
+ add_executable(StormLib_test ${TEST_SRC_FILES})
+ target_link_libraries(StormLib_test ${LIBRARY_NAME})
+- install(TARGETS StormLib_test RUNTIME DESTINATION bin)
++ install(TARGETS StormLib_test RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+
+--
+2.29.2
+
diff --git a/sys-apps/hwsetup/metadata.xml b/app-arch/stormlib/metadata.xml
similarity index 54%
rename from sys-apps/hwsetup/metadata.xml
rename to app-arch/stormlib/metadata.xml
index 06ddf117247b..0319eec4c8be 100644
--- a/sys-apps/hwsetup/metadata.xml
+++ b/app-arch/stormlib/metadata.xml
@@ -1,8 +1,8 @@
-
- releng@gentoo.org
- Gentoo Release Engineering
-
+
+ mgorny@gentoo.org
+ Michał Górny
+
diff --git a/app-arch/stormlib/stormlib-9.23-r1.ebuild b/app-arch/stormlib/stormlib-9.23-r1.ebuild
new file mode 100644
index 000000000000..484b8ef3e37f
--- /dev/null
+++ b/app-arch/stormlib/stormlib-9.23-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P=StormLib-${PV}
+DESCRIPTION="Library to read and write MPQ archives (Diablo, StarCraft)"
+HOMEPAGE="
+ http://www.zezula.net/en/mpq/stormlib.html
+ https://github.com/ladislav-zezula/StormLib"
+SRC_URI="
+ https://github.com/ladislav-zezula/StormLib/archive/v${PV}.tar.gz
+ -> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ app-arch/bzip2:=
+ dev-libs/libtomcrypt:=[libtommath]
+ sys-libs/zlib:="
+DEPEND=${RDEPEND}
+
+PATCHES=(
+ "${FILESDIR}"/stormlib-9.23-gnuinstalldirs.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ # interactive test app
+ -DSTORM_BUILD_TESTS=OFF
+ -DWITH_LIBTOMCRYPT=ON
+ )
+
+ cmake_src_configure
+}
diff --git a/app-arch/xar/xar-1.8-r4.ebuild b/app-arch/xar/xar-1.8-r4.ebuild
new file mode 100644
index 000000000000..6106c668f823
--- /dev/null
+++ b/app-arch/xar/xar-1.8-r4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic multilib-minimal multilib
+
+APPLE_PV=417.1
+DESCRIPTION="An easily extensible archive format"
+HOMEPAGE="https://opensource.apple.com/source/xar/"
+SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libressl"
+
+DEPEND="
+ elibc_musl? ( sys-libs/fts-standalone )
+ kernel_linux? ( virtual/acl )
+ !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+ app-arch/bzip2[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ dev-libs/libxml2[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.1-ext2.patch
+ "${FILESDIR}"/${PN}-1.8-safe_dirname.patch
+ "${FILESDIR}"/${PN}-1.8-arm-ppc.patch
+ "${FILESDIR}"/${PN}-1.8-openssl-1.1.patch
+)
+
+S=${WORKDIR}/${PN}-${APPLE_PV}/${PN}
+
+src_prepare() {
+ default
+
+ # make lib headers available (without installing first?)
+ cd "${S}"/include || die
+ mv ../lib/*.h . || die
+
+ # strip RPATH pointing to ED
+ cd "${S}"/src || die
+ sed -i -e 's/@RPATH@//' Makefile.inc.in || die
+
+ # avoid GNU make (bug?) behaviour of removing xar.o as intermediate
+ # file, this doesn't happen outside portage, but it does from the
+ # ebuild env, causing the install phase to re-compile xar.o and link
+ # the executable
+ echo ".PRECIOUS: @objroot@src/%.o" >> Makefile.inc.in || die
+
+ # drop Darwin specific reliance on CommonCrypto Framework, for it
+ # depends on what version of Darwin we're on, and it is much simpler
+ # to just use open/libressl instead, which we maintain and control
+ cd "${S}" || die
+ sed -i -e 's/__APPLE__/__NO_APPLE__/' \
+ include/archive.h \
+ lib/hash.c \
+ || die
+
+ # fix branding somewhat
+ sed -i -e "/XAR_VERSION/s|%s|%s (Gentoo ${PVR})|" src/xar.c || die
+}
+
+multilib_src_configure() {
+ append-libs $(pkg-config --libs openssl)
+ use elibc_musl && append-libs $(pkg-config --libs fts-standalone)
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-static
+ # botched check, fix it up
+ if use kernel_SunOS ; then
+ sed -i -e '/HAVE_SYS_ACL_H/s:^\(.*\)$:/* \1 */:' include/config.h || die
+ fi
+}
+
+multilib_src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 01a87b97e2a6..fcb880380f78 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,3 +1,3 @@
DIST zstd-1.4.4.tar.gz 1962617 BLAKE2B e21841a53b6c60703e5500cfc2a02923c4c3e57975aa57e1060310171e0d83d7c8eda1bd0510d5736db5c310d76847d2105ac5f614867fc3a9dc3086a035dfd7 SHA512 8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf
DIST zstd-1.4.5.tar.gz 1987927 BLAKE2B 1497d4e87040e5c71466468ebf1a57f4073666f2b005229925bc1d95a4b4fcb2a51d88bb79be20f21860e5750da42f8aac21d2997421d07ba37bd6bb12a28b55 SHA512 b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387
-DIST zstd-1.4.7.tar.gz 1817193 BLAKE2B 8a307fa7efca8baa45c61eb0e46c5b6eedff1459a9493d81ad7033b9050ccf96e39cfc0f5b913ea20fb64d5efa26063b70e36e6cc47077b17106f3b5135fd999 SHA512 720941fc484e36e2f2bd74f120966fc598781a7abb945ed2f553d4cb035fa007117d00b72979b037817fbaff60b0d72f698fc16561ccbd46b16ae2888b044548
+DIST zstd-1.4.8.tar.gz 1816546 BLAKE2B 950d03c408e9d3fc2081969553c46247a1b8c13a22542effbf70373625bbfeb2a810e0adf0e1c6180cef590e7a28487191b1a577982fddc7a00d1507b461efd5 SHA512 61ce5d61e24770e70c32680f32d58542d6a1b5cc65737256561d8e34c77a82c1d36c769c179da5ea8ed5ecb035b4a4af292b9717c65976172e282859a332137a
diff --git a/app-arch/zstd/zstd-1.4.5.ebuild b/app-arch/zstd/zstd-1.4.5.ebuild
index 110b0378b776..4632ada403a0 100644
--- a/app-arch/zstd/zstd-1.4.5.ebuild
+++ b/app-arch/zstd/zstd-1.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~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"
IUSE="lz4 static-libs +threads"
RDEPEND="app-arch/xz-utils
diff --git a/app-arch/zstd/zstd-1.4.7.ebuild b/app-arch/zstd/zstd-1.4.8.ebuild
similarity index 100%
rename from app-arch/zstd/zstd-1.4.7.ebuild
rename to app-arch/zstd/zstd-1.4.8.ebuild
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 206afa4ee726..6466b075b4e6 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/cdbkup/cdbkup-1.0-r2.ebuild b/app-backup/cdbkup/cdbkup-1.0-r2.ebuild
index 3c748f2a7b6a..82f0538a7ffb 100644
--- a/app-backup/cdbkup/cdbkup-1.0-r2.ebuild
+++ b/app-backup/cdbkup/cdbkup-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,8 +12,9 @@ SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
-DEPEND="net-misc/openssh
- virtual/cdrtools
+DEPEND="
+ app-cdr/cdrtools
+ net-misc/openssh
virtual/eject
"
RDEPEND="${DEPEND}
diff --git a/app-backup/rear/rear-2.4.ebuild b/app-backup/rear/rear-2.4.ebuild
index 55b55d0c90cc..498e7a6f47ab 100644
--- a/app-backup/rear/rear-2.4.ebuild
+++ b/app-backup/rear/rear-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="libressl udev samba"
RDEPEND="
+ app-cdr/cdrtools
net-dialup/mingetty
net-fs/nfs-utils
sys-apps/gawk
@@ -23,7 +24,6 @@ RDEPEND="
sys-apps/util-linux
sys-block/parted
sys-boot/syslinux
- virtual/cdrtools
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
samba? ( net-fs/cifs-utils )
diff --git a/app-backup/rear/rear-2.6.ebuild b/app-backup/rear/rear-2.6.ebuild
index 6e4df5c99df6..79da6fa23dec 100644
--- a/app-backup/rear/rear-2.6.ebuild
+++ b/app-backup/rear/rear-2.6.ebuild
@@ -15,6 +15,7 @@ KEYWORDS="amd64 x86"
IUSE="udev"
RDEPEND="
+ app-cdr/cdrtools
app-shells/bash
net-dialup/mingetty
net-fs/nfs-utils
@@ -25,7 +26,6 @@ RDEPEND="
sys-apps/util-linux
sys-block/parted
sys-boot/syslinux
- virtual/cdrtools
udev? ( virtual/udev )
"
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index fe37c601f3cf..be3ac5c1b224 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/bashburn/bashburn-3.1.0-r1.ebuild b/app-cdr/bashburn/bashburn-3.1.0-r1.ebuild
index d4b529bc22ec..d945b4ada648 100644
--- a/app-cdr/bashburn/bashburn-3.1.0-r1.ebuild
+++ b/app-cdr/bashburn/bashburn-3.1.0-r1.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="amd64 ppc ~ppc64 sparc x86"
BDEPEND="app-shells/bash"
RDEPEND="
+ app-cdr/cdrtools
app-shells/bash
app-cdr/cdrdao
app-cdr/dvd+rw-tools
@@ -25,7 +26,6 @@ RDEPEND="
|| ( media-sound/mpg123 media-sound/mpg321 )
media-sound/normalize
media-sound/vorbis-tools
- virtual/cdrtools
virtual/eject
"
diff --git a/app-cdr/brasero/brasero-3.12.2-r1.ebuild b/app-cdr/brasero/brasero-3.12.2-r1.ebuild
index 15af48340c06..917812f33104 100644
--- a/app-cdr/brasero/brasero-3.12.2-r1.ebuild
+++ b/app-cdr/brasero/brasero-3.12.2-r1.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=6
@@ -42,8 +42,9 @@ RDEPEND="${COMMON_DEPEND}
css? ( media-libs/libdvdcss:1.2 )
!libburn? (
app-cdr/cdrdao
+ app-cdr/cdrtools
app-cdr/dvd+rw-tools
- virtual/cdrtools )
+ )
packagekit? ( app-admin/packagekit-base )
"
DEPEND="${COMMON_DEPEND}
diff --git a/app-cdr/burncdda/burncdda-1.8.3.ebuild b/app-cdr/burncdda/burncdda-1.8.3.ebuild
index 0d02e2c31549..b782ab530772 100644
--- a/app-cdr/burncdda/burncdda-1.8.3.ebuild
+++ b/app-cdr/burncdda/burncdda-1.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,10 +14,10 @@ IUSE="flac mp3 vorbis"
RDEPEND="
app-cdr/cdrdao
+ app-cdr/cdrtools
dev-util/dialog
media-sound/normalize
media-sound/sox
- virtual/cdrtools
flac? ( media-libs/flac )
mp3? (
media-sound/mpg123
diff --git a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
index 242e7767047c..89a6b02600a9 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
IUSE="encode mad vorbis"
COMMON_DEPEND="
- virtual/cdrtools
+ app-cdr/cdrtools
encode? ( >=media-sound/lame-3.99 )
mad? (
media-libs/libmad
diff --git a/app-cdr/cdw/cdw-0.8.1-r1.ebuild b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
index c524d89d06de..317cc629ee9f 100644
--- a/app-cdr/cdw/cdw-0.8.1-r1.ebuild
+++ b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
@@ -13,11 +13,11 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
RDEPEND="
+ app-cdr/cdrtools
app-cdr/dvd+rw-tools
dev-libs/libburn
dev-libs/libcdio:=[-minimal]
sys-libs/ncurses:0=[unicode]
- virtual/cdrtools
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/app-cdr/cdw/cdw-0.8.1.ebuild b/app-cdr/cdw/cdw-0.8.1.ebuild
index 3b50e3848a7f..b4597335f09b 100644
--- a/app-cdr/cdw/cdw-0.8.1.ebuild
+++ b/app-cdr/cdw/cdw-0.8.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=6
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="amd64 ~ppc x86"
RDEPEND="
- virtual/cdrtools
+ app-cdr/cdrtools
app-cdr/dvd+rw-tools
dev-libs/libburn
dev-libs/libcdio[-minimal]
diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild
index f23f85b84c76..1e52c861c848 100644
--- a/app-cdr/cdw/cdw-9999.ebuild
+++ b/app-cdr/cdw/cdw-9999.ebuild
@@ -15,11 +15,11 @@ LICENSE="GPL-2+"
SLOT="0"
RDEPEND="
+ app-cdr/cdrtools
app-cdr/dvd+rw-tools
dev-libs/libburn
dev-libs/libcdio:=[-minimal]
sys-libs/ncurses:0=[unicode]
- virtual/cdrtools
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
index aee2f063fd21..c797c1c67194 100644
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
-RDEPEND="virtual/cdrtools"
+RDEPEND="app-cdr/cdrtools"
DEPEND="${RDEPEND}
sys-devel/m4"
diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
index c7e5f5c4269e..e052a53b1fb1 100644
--- a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
+++ b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,14 +14,16 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="gtk"
-RDEPEND=">=media-video/transcode-1.0.2-r2[dvd]
+RDEPEND="
+ app-cdr/cdrtools
+ >=app-cdr/dvd+rw-tools-6.1
+ >=app-text/gocr-0.40
+ >=media-video/dvdauthor-0.6.11
>=media-video/mjpegtools-1.8.0-r1
>=media-video/subtitleripper-0.3.4-r1
- >=media-video/dvdauthor-0.6.11
- >=app-cdr/dvd+rw-tools-6.1
+ >=media-video/transcode-1.0.2-r2[dvd]
gtk? ( >=dev-perl/Gtk2-1.104 )
- >=app-text/gocr-0.40
- virtual/cdrtools"
+"
DEPEND=""
S=${WORKDIR}/${PN}
diff --git a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
index f38d627c9490..bb2aeac49bd6 100644
--- a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
+++ b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,10 +15,10 @@ IUSE="debug dvdr flac mp3 nls vorbis"
RDEPEND="
app-cdr/cdrdao
+ app-cdr/cdrtools
>=dev-libs/glib-2.4:2
>=gnome-base/libglade-2.4:2.0
media-libs/libmng:=
- virtual/cdrtools
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-2.4:2
dvdr? ( app-cdr/dvd+rw-tools )
diff --git a/app-cdr/mp3burn/mp3burn-0.4.2.ebuild b/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
index c391931b7233..8c1183cd0515 100644
--- a/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
+++ b/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -15,10 +15,10 @@ IUSE=""
DEPEND="dev-lang/perl"
RDEPEND="${DEPEND}
+ app-cdr/cdrtools
media-sound/mpg123
media-libs/flac
media-sound/vorbis-tools
- virtual/cdrtools
dev-perl/MP3-Info
dev-perl/Ogg-Vorbis-Header
dev-perl/String-ShellQuote
diff --git a/app-cdr/multicd/multicd-1.7.5-r1.ebuild b/app-cdr/multicd/multicd-1.7.5-r1.ebuild
index a0811c55ef76..aaba8ca308a8 100644
--- a/app-cdr/multicd/multicd-1.7.5-r1.ebuild
+++ b/app-cdr/multicd/multicd-1.7.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,8 +12,10 @@ SLOT="0"
KEYWORDS="amd64 ~ppc x86"
IUSE=""
-RDEPEND=">=dev-lang/perl-5.8.6
- virtual/cdrtools"
+RDEPEND="
+ app-cdr/cdrtools
+ >=dev-lang/perl-5.8.6
+"
src_install() {
dobin multicd
diff --git a/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild b/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
index 96e958e6843d..4370360dc7ad 100644
--- a/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
+++ b/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -15,10 +15,10 @@ KEYWORDS="amd64 ppc x86"
IUSE=""
RDEPEND="
+ app-cdr/cdrtools
app-cdr/dvd+rw-tools
dev-lang/tcl:0
dev-lang/tk:0
- virtual/cdrtools
"
S=${WORKDIR}/tkdvd
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index c0e8d2f7e134..291592d8739f 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index cbd59f348c45..f23ee39aa196 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -1,2 +1 @@
-DIST libmd-1.0.0.tar.xz 254852 BLAKE2B af0d3c645a18262965e708d678cb30c7ed168af8055885b08084fafd7299e9aaea95efb8437ffa756e43c5bb75fac99af067c6a560f3bb2b8b93ee889d5e664b SHA512 54c3cae1308f7686a1f642d25ae5d8cfb0fce2b98b33cf5e2891682893715c7de7e9700c70a6bd7e4ab4cf7f54c87643b259319e09e03f529b70d273477fc8be
DIST libmd-1.0.1.tar.xz 257372 BLAKE2B e954ab6b1247952abcf6964d8d714c2a47a644e206a455db547a0159a97ebbc323cf1258a24c744cea3106f267f1a319a689fe545b672580f4e134d96cc7cb3d SHA512 6f343101f9ad8f927d862e6bae948d35ba596ecfd375c255fefb86efc621cf6e9de3597770ad66e0a48e8f4ea018df78debb571ea6746a7457d8900fec87069b
diff --git a/app-crypt/libmd/libmd-1.0.0-r1.ebuild b/app-crypt/libmd/libmd-1.0.0-r1.ebuild
deleted file mode 100644
index d27a6c00ff63..000000000000
--- a/app-crypt/libmd/libmd-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib
-
-DESCRIPTION="Message Digest functions from BSD systems"
-HOMEPAGE="https://www.hadrons.org/software/libmd/"
-SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
-
-LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs"
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- if ! use static-libs; then
- rm "${D}"/usr/$(get_libdir)/libmd.la || die
- fi
-}
diff --git a/app-crypt/libmd/libmd-1.0.0.ebuild b/app-crypt/libmd/libmd-1.0.0.ebuild
deleted file mode 100644
index aed0b60e74e8..000000000000
--- a/app-crypt/libmd/libmd-1.0.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Message Digest functions from BSD systems"
-HOMEPAGE="https://www.hadrons.org/software/libmd/"
-SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
-
-LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
diff --git a/app-crypt/libmd/libmd-1.0.1.ebuild b/app-crypt/libmd/libmd-1.0.1.ebuild
index aa6fb0663b15..0966fdfe7510 100644
--- a/app-crypt/libmd/libmd-1.0.1.ebuild
+++ b/app-crypt/libmd/libmd-1.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
src_configure() {
diff --git a/app-crypt/rhash/rhash-1.4.0.ebuild b/app-crypt/rhash/rhash-1.4.0.ebuild
index e777c4b21ffd..88a8e3ebfe3f 100644
--- a/app-crypt/rhash/rhash-1.4.0.ebuild
+++ b/app-crypt/rhash/rhash-1.4.0.ebuild
@@ -32,6 +32,13 @@ S="${WORKDIR}/RHash-${PV}"
src_prepare() {
default
+
+ if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
+ # we lack posix_memalign
+ sed -i -e '/if _POSIX_VERSION/s/if .*$/if 0/' \
+ librhash/util.h || die
+ fi
+
multilib_copy_sources
}
diff --git a/app-crypt/signify/signify-30.ebuild b/app-crypt/signify/signify-30.ebuild
index 474220e8fa16..01339391bfa5 100644
--- a/app-crypt/signify/signify-30.ebuild
+++ b/app-crypt/signify/signify-30.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/aperezdc/signify/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD-1"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
RDEPEND=">=dev-libs/libbsd-0.7"
DEPEND="${RDEPEND}"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 2f855104bb3d..972cfd210d88 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/libguestfs/libguestfs-1.36.13.ebuild b/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
index 7d1a1bbe48bb..a9896d1ca1ad 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="
dev-libs/libpcre:3
app-arch/cpio
dev-lang/perl:=
- virtual/cdrtools
+ app-cdr/cdrtools
>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
sys-apps/fakeroot
sys-apps/file
diff --git a/app-emulation/libguestfs/libguestfs-1.36.15.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
index 8ec3e24990bf..7ec4be7a95e1 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
dev-libs/libpcre:3
app-arch/cpio
dev-lang/perl:=
- virtual/cdrtools
+ app-cdr/cdrtools
>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
sys-apps/fakeroot
sys-apps/file
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild
index 833f7102526c..5c28a6fd58bb 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="
dev-libs/libpcre:3
app-arch/cpio
dev-lang/perl:=
- virtual/cdrtools
+ app-cdr/cdrtools
>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
sys-apps/fakeroot
sys-apps/file
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
index 15cebc77a632..9828f1232d0b 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
dev-libs/libpcre:3
app-arch/cpio
dev-lang/perl:=
- virtual/cdrtools
+ app-cdr/cdrtools
>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
sys-apps/fakeroot
sys-apps/file
diff --git a/app-emulation/qemu-riscv64-bin/Manifest b/app-emulation/qemu-riscv64-bin/Manifest
index dca4fafb8830..2f13c32ae03e 100644
--- a/app-emulation/qemu-riscv64-bin/Manifest
+++ b/app-emulation/qemu-riscv64-bin/Manifest
@@ -1,2 +1 @@
-DIST qemu-riscv64-bin-3.1.0-r4.tar.xz 889764 BLAKE2B 888fef2f27f44be098e9b834b083558ce18d98337612b4de2278ffe5d6599248d9ed4e99153ad9b2c1a5b773131c420bb23ce6d080943af744df34464660bc42 SHA512 bc92110f6730c61bd39056d0bf3f84b35ed340a47af51b28b27554f9f2f72409221d2c81826b718742475d0fc48040c81e8f051e29b4f13412c3a39e282471e0
DIST qemu-riscv64-bin-5.0.0.tar.xz 922240 BLAKE2B d4ff41c8e45ca99bc1b9e795d9e218b05be283b32d179e8ab88d07bd333a52fce7893739e6572219083d5d56a7abb7cc1870df7c585ca41af15b56a5dc30369d SHA512 1ba28679ce4bf1f11b77059dae8cb76f0095cc4427159d769947b8a1b1212c9de0a25a236c69ff9780dd111a22fa6e01519a3017b0b0a5d29069575501552f40
diff --git a/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-3.1.0-r4.ebuild b/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-3.1.0-r4.ebuild
deleted file mode 100644
index 650e2af57e19..000000000000
--- a/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-3.1.0-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Statically linked x86-64 binary of app-emulation/qemu, riscv64 emulator"
-
-HOMEPAGE="http://www.qemu.org"
-SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}.tar.xz"
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="!app-emulation/qemu[qemu_user_targets_riscv64]"
-
-QA_PREBUILT="*"
-
-S=${WORKDIR}
-
-src_install() {
- dobin qemu-riscv64
-}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 85ea218d9be3..b744ad2e191e 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -6,8 +6,9 @@ DIST ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz 3810726 BLAKE2B b9
DIST seabios-1.12.1.tar.gz 613450 BLAKE2B cb926b650c41a9962db407945cb5b6558079b061bd61f32ea56aedf0d37a00d10ad4434acbe717ffbc0dd1d1c0767304af8e640a53b0fc3784969dfa1590f681 SHA512 58755ce842adcb99c0f2f3ebbf9ec6d4a5072753966ab46805a96db1570847b109a90e6e03d61f9088ef877ca8ba96a8006777dc38ec434fce6b487f6c1f91d0
DIST seabios-1.13.0.tar.gz 620952 BLAKE2B 460a7dd2b2775b981bbd890ed0a50fe905794c68b0b895799667dd1378bb84125712330c2f6945112709d42cfb7b01196c7fff99051e44b6211d47d19531cfae SHA512 7f158badf7deecc2998eab2a08f3615dfe5a7c0a51323f7b4568a4d1280935bc32bb466c8226d87d2ca7e13f9f117ff0092befcc0699bc31c5018e84754e8393
DIST xen-4.13.2-upstream-patches-0.tar.xz 15404 BLAKE2B e4f679e4281e4edfe4f1e7722c19a973461b9a6423828f17719dfd766a73ef61a74b1cd87f375e2b0c2ec9cbed7b6a0f12c4a9982bbc325cdbba4c70a7145248 SHA512 122fe404f9c19567016e43208ddd08bdac56e7f264853d6cbe0929650fc4ada7175cc24c0e4fbf088acab77127eb76454948b98cbc731e35a12e1b068a5fd793
+DIST xen-4.13.2-upstream-patches-2.tar.xz 58992 BLAKE2B 535d67ae6a30e23feb975172a9e4abd6d7feb6c8c969aa243fdf672ed6580fe46bf57ea5530eab70457e22af9163f95061fdf97d10faa3be9f4c92033187c950 SHA512 6b6cdf72d13c0e595be65e3107c0f68299e932b74d4a1c4d59bfe3be8b76840c47f6adeaddd0efac71d5158cee8d778a0be863eea8f032cb9acf4191f629d8ae
DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
-DIST xen-4.14.0-upstream-patches-4.tar.xz 79204 BLAKE2B 54d3ba5eac263d78c052cdf2b7958662dc29f689f03d03692c20c881a6b520bf08c86cf830a2727c2a2249c256aa0d06dea75496c8ee6699361c86c3f91bbd83 SHA512 c18b43a16e225cd1c50fe975fa1daf414e8e5fd47e4d3c9e2c655001ae59ab6fed5d332e5f34acc4f01b3c9d42bd425a86e084a4eb22c360257689aab3fe6825
+DIST xen-4.14.0-upstream-patches-6.tar.xz 119116 BLAKE2B e3a0f807182d32754c6ae2000324237117cfa66c4a43c27b583b6aef69a3889949779751b71a87b2538f679fb481e8a723433950c689f28a8c2e96278c1b0ddb SHA512 03b1fdc08e74756001fbb0de4e21297456f63615e6f63b8f360f8270ef85b0d50c3872be41cc26529ed0d91d82ffda2af53882b7c5233113f223a4ec813a0d5b
DIST xen-4.14.0.tar.gz 39950576 BLAKE2B db4c3e79cfdfb10260d0d14d9d28e8c8bd9bf23f42aee743acf8f560bf4cdb96a425c0df887c70f9755f62680be24bfbe0149e52a4cb843ae83090cd9d6afc71 SHA512 ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0
DIST xen-gentoo-patches-21.tar.xz 18280 BLAKE2B 95446da72fc16cb82e4e51df8796c64db05a30894a351a98dbd6700ce354c34956ca09a1af98125a4e56c337936e8fae296d806519b8afa23a82b078aa0db8f1 SHA512 3cffac162606a09b10b47dca604f167897e6ac8d153411d3464ef29a7a4d46ac5b92340884cb21279cb2d053b131f1ea5cb2111e3e9a21b3298b5ab3320ee34d
DIST xen-gentoo-patches-22.tar.xz 18764 BLAKE2B e0da49b39fbc6b689db47e40a4fbb4f6568644fe192b114cce01b0406cba4bf23339ad1bf39b972f895df004916827b6e774f97fc079aeb8ac436763efda5fc3 SHA512 5b7959af4ed30edd2526698ab60a86353e35d9dc48dc941b6df7659a7c4904260461e0decbd8d788542bd69384736f2175861d4943c3738618d20788b19ea9b1
diff --git a/app-emulation/xen-tools/xen-tools-4.13.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.13.2-r2.ebuild
new file mode 100644
index 000000000000..9ed77248190a
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.13.2-r2.ebuild
@@ -0,0 +1,512 @@
+# 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='ncurses,xml,threads(+)'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+ inherit git-r3
+ REPO="xen.git"
+ EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+ S="${WORKDIR}/${REPO}"
+else
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ UPSTREAM_VER=2
+ SECURITY_VER=29
+ # xen-tools's gentoo patches tarball
+ GENTOO_VER=21
+ # xen-tools's gentoo patches version which apply to this specific ebuild
+ GENTOO_GPV=1
+ # xen-tools ovmf's patches
+ OVMF_VER=
+
+ SEABIOS_VER="1.12.1"
+ EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151"
+ EDK2_OPENSSL_VERSION="1_1_1g"
+ EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
+ EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+ IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6"
+
+ [[ -n ${UPSTREAM_VER} ]] && \
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+ [[ -n ${SECURITY_VER} ]] && \
+ SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz"
+ [[ -n ${GENTOO_VER} ]] && \
+ GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+ [[ -n ${OVMF_VER} ]] && \
+ OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+ SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+ https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz
+ ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+ ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+ https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
+ https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
+ https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
+ ${OVMF_PATCHSET_URI} )
+ ${UPSTREAM_PATCHSET_URI}
+ ${SECURITY_PATCHSET_URI}
+ ${GENTOO_PATCHSET_URI}"
+
+ S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README )
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ipxe? ( rombios )
+ ovmf? ( hvm )
+ pygrub? ( python )
+ rombios? ( hvm )
+ system-ipxe? ( rombios )
+ ?? ( ipxe system-ipxe )
+ ?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+ sys-apps/pciutils
+ dev-libs/lzo:2
+ dev-libs/glib:2
+ dev-libs/yajl
+ dev-libs/libaio
+ dev-libs/libgcrypt:0
+ sys-libs/zlib
+ ${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-4.11
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+ ')
+ x86? ( sys-devel/dev86
+ system-ipxe? ( sys-firmware/ipxe[qemu] )
+ sys-power/iasl )
+ api? ( dev-libs/libxml2
+ net-misc/curl )
+
+ ovmf? (
+ !arm? ( !arm64? ( dev-lang/nasm ) )
+ $(python_gen_impl_dep sqlite)
+ )
+ !amd64? ( >=sys-apps/dtc-1.4.0 )
+ amd64? ( sys-power/iasl
+ system-seabios? ( sys-firmware/seabios )
+ system-ipxe? ( sys-firmware/ipxe[qemu] )
+ rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+ dev-lang/perl
+ app-misc/pax-utils
+ doc? (
+ app-text/ghostscript-gpl
+ app-text/pandoc
+ $(python_gen_cond_dep '
+ dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+ ')
+ dev-texlive/texlive-latexextra
+ media-gfx/transfig
+ )
+ hvm? ( x11-base/xorg-proto )
+ qemu? (
+ app-arch/snappy:=
+ x11-libs/pixman
+ sdl? (
+ media-libs/libsdl[X]
+ media-libs/libsdl2[X]
+ )
+ )
+ system-qemu? ( app-emulation/qemu[xen] )
+ ocaml? ( dev-ml/findlib
+ >=dev-lang/ocaml-4 )
+ python? ( >=dev-lang/swig-4.0.0 )"
+
+RDEPEND="${COMMON_DEPEND}
+ sys-apps/iproute2[-minimal]
+ net-misc/bridge-utils
+ screen? (
+ app-misc/screen
+ app-admin/logrotate
+ )"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+ usr/libexec/xen/boot/hvmloader
+ usr/share/qemu-xen/qemu/hppa-firmware.img
+ usr/share/qemu-xen/qemu/s390-ccw.img
+ usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+ usr/libexec/xen/bin/elf2dmp
+ usr/libexec/xen/bin/ivshmem-client
+ usr/libexec/xen/bin/ivshmem-server
+ usr/libexec/xen/bin/qemu-edid
+ usr/libexec/xen/bin/qemu-img
+ usr/libexec/xen/bin/qemu-io
+ usr/libexec/xen/bin/qemu-keymap
+ usr/libexec/xen/bin/qemu-nbd
+ usr/libexec/xen/bin/qemu-pr-helper
+ usr/libexec/xen/bin/qemu-system-i386
+ usr/libexec/xen/bin/virtfs-proxy-helper
+ usr/libexec/xen/libexec/xen-bridge-helper
+ usr/share/qemu-xen/qemu/s390-ccw.img
+ usr/share/qemu-xen/qemu/s390-netboot.img
+ usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+ python_setup
+ export "CONFIG_LOMOUNT=y"
+
+ #bug 522642, disable compile tools/tests
+ export "CONFIG_TESTS=n"
+
+ if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+ if use x86 && use amd64; then
+ die "Confusion! Both x86 and amd64 are set in your use flags!"
+ elif use x86; then
+ export XEN_TARGET_ARCH="x86_32"
+ elif use amd64 ; then
+ export XEN_TARGET_ARCH="x86_64"
+ elif use arm; then
+ export XEN_TARGET_ARCH="arm32"
+ elif use arm64; then
+ export XEN_TARGET_ARCH="arm64"
+ else
+ die "Unsupported architecture!"
+ fi
+ fi
+}
+
+src_prepare() {
+ local i
+
+ # Upstream's patchset
+ if [[ -n ${UPSTREAM_VER} ]]; then
+ einfo "Try to apply Xen Upstream patch set"
+ eapply "${WORKDIR}"/patches-upstream
+ fi
+
+ # Security patchset
+ if [[ -n ${SECURITY_VER} ]]; then
+ einfo "Try to apply Xen Security patch set"
+ # apply main xen patches
+ # Two parallel systems, both work side by side
+ # Over time they may concdense into one. This will suffice for now
+ EPATCH_SUFFIX="patch"
+ EPATCH_FORCE="yes"
+
+ source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+ for i in ${XEN_SECURITY_MAIN}; do
+ eapply "${WORKDIR}"/patches-security/xen/$i
+ done
+
+ # apply qemu-xen/upstream patches
+ pushd "${S}"/tools/qemu-xen/ > /dev/null
+ for i in ${XEN_SECURITY_QEMUU}; do
+ eapply "${WORKDIR}"/patches-security/qemuu/$i
+ done
+ popd > /dev/null
+
+ # apply qemu-traditional patches
+ pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+ for i in ${XEN_SECURITY_QEMUT}; do
+ eapply "${WORKDIR}"/patches-security/qemut/$i
+ done
+ popd > /dev/null
+ fi
+
+ # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+ mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+ pushd tools/firmware/ > /dev/null
+ ln -s seabios-dir-remote seabios-dir || die
+ popd > /dev/null
+
+ # Gentoo's patchset
+ if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+ einfo "Try to apply Gentoo specific patch set"
+ source "${FILESDIR}"/gentoo-patches.conf || die
+ _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+ for i in ${!_gpv}; do
+ eapply "${WORKDIR}"/patches-gentoo/$i
+ done
+ fi
+
+ # Ovmf's patchset
+ if use ovmf; then
+ if [[ -n ${OVMF_VER} ]];then
+ einfo "Try to apply Ovmf patch set"
+ pushd "${WORKDIR}"/edk2-*/ > /dev/null
+ eapply "${WORKDIR}"/patches-ovmf
+ popd > /dev/null
+ fi
+ mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+ rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+ rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+ rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+ rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+ mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+ mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+ cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+ cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+ cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+ fi
+
+ # ipxe
+ if use ipxe; then
+ cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
+
+ # gcc 10
+ cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die
+ echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die
+ fi
+
+ mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+ # Fix texi2html build error with new texi2html, qemu.doc.html
+ sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+ use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+ sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+ -i tools/firmware/Makefile || die
+
+ # Drop .config, fixes to gcc-4.6
+ sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
+
+ # drop flags
+ unset CFLAGS
+ unset LDFLAGS
+ unset ASFLAGS
+ unset CPPFLAGS
+
+ if ! use pygrub; then
+ sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+ fi
+
+ if ! use python; then
+ sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+ fi
+
+ if ! use hvm; then
+ sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+ # Bug 351648
+ elif ! use x86 && ! has x86 $(get_all_abis); then
+ mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+ touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+ export CPATH="${WORKDIR}"/extra-headers
+ fi
+
+ if use qemu; then
+ if use sdl; then
+ sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+ tools/Makefile || die
+ else
+ sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+ tools/qemu-xen-traditional/xen-setup || die
+ sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+ tools/Makefile || die
+ fi
+ else
+ # Don't bother with qemu, only needed for fully virtualised guests
+ sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
+ fi
+
+ # Reset bash completion dir; Bug 472438
+ sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+ -i Config.mk || die
+ sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+ # xencommons, Bug #492332, sed lighter weight than patching
+ sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+ -i tools/hotplug/Linux/init.d/xencommons.in || die
+
+ # fix bashishm
+ sed -e '/Usage/s/\$//g' \
+ -i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+ # respect multilib, usr/lib/libcacard.so.0.0.0
+ sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+ -i tools/qemu-xen/configure || die
+
+ #bug 518136, don't build 32bit exactuable for nomultilib profile
+ if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+ sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+ fi
+
+ # uncomment lines in xl.conf
+ sed -e 's:^#autoballoon=:autoballoon=:' \
+ -e 's:^#lockfile=:lockfile=:' \
+ -e 's:^#vif.default.script=:vif.default.script=:' \
+ -i tools/examples/xl.conf || die
+
+ # disable capstone (Bug #673474)
+ sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+ -i tools/Makefile || die
+
+ # disable glusterfs
+ sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+ -i tools/Makefile || die
+
+ default
+}
+
+src_configure() {
+ local myconf="--prefix=${PREFIX}/usr \
+ --libdir=${PREFIX}/usr/$(get_libdir) \
+ --libexecdir=${PREFIX}/usr/libexec \
+ --localstatedir=${EPREFIX}/var \
+ --disable-werror \
+ --disable-xen \
+ --enable-tools \
+ --enable-docs \
+ $(use_enable api xenapi) \
+ $(use_enable ipxe) \
+ $(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
+ $(use_enable ocaml ocamltools) \
+ $(use_enable ovmf) \
+ $(use_enable pam) \
+ $(use_enable rombios) \
+ --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+ "
+
+ use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+ use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+ use amd64 && myconf+=" $(use_enable qemu-traditional)"
+ tc-ld-disable-gold # Bug 669570
+ econf ${myconf}
+}
+
+src_compile() {
+ local myopt
+ use debug && myopt="${myopt} debug=y"
+ use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
+
+ if test-flag-CC -fno-strict-overflow; then
+ append-flags -fno-strict-overflow
+ fi
+
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+ if use doc; then
+ emake -C docs build
+ else
+ emake -C docs man-pages
+ fi
+}
+
+src_install() {
+ # Override auto-detection in the build system, bug #382573
+ export INITD_DIR=/tmp/init.d
+ export CONFIG_LEAF_DIR=../tmp/default
+
+ # Let the build system compile installed Python modules.
+ local PYTHONDONTWRITEBYTECODE
+ export PYTHONDONTWRITEBYTECODE
+
+ emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+ XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+ # Created at runtime
+ rm -rv "${ED}/var/run" || die
+
+ # Fix the remaining Python shebangs.
+ python_fix_shebang "${D}"
+
+ # Remove RedHat-specific stuff
+ rm -rf "${D}"/tmp || die
+
+ if use doc; then
+ emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+ dodoc -r docs/{pdf,txt}
+ else
+ emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+ fi
+ dodoc ${DOCS[@]}
+
+ newconfd "${FILESDIR}"/xendomains.confd xendomains
+ newconfd "${FILESDIR}"/xenstored.confd xenstored
+ newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+ newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+ newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+ newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+ newinitd "${FILESDIR}"/xencommons.initd xencommons
+ newconfd "${FILESDIR}"/xencommons.confd xencommons
+ newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+ newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+ newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+ if use screen; then
+ cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+ cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+ keepdir /var/log/xen-consoles
+ fi
+
+ # For -static-libs wrt Bug 384355
+ if ! use static-libs; then
+ rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
+ fi
+
+ # for xendomains
+ keepdir /etc/xen/auto
+
+ # Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+ find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+ -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+
+ keepdir /var/lib/xen/dump
+ keepdir /var/lib/xen/xenpaging
+ keepdir /var/lib/xenstored
+ keepdir /var/log/xen
+
+ if use python; then
+ python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py"
+ python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so"
+ fi
+
+ python_optimize
+}
+
+pkg_postinst() {
+ elog "Official Xen Guide and the offical wiki page:"
+ elog "https://wiki.gentoo.org/wiki/Xen"
+ elog "https://wiki.xen.org/wiki/Main_Page"
+ elog ""
+ elog "Recommended to utilise the xencommons script to config system at boot"
+ elog "Add by use of rc-update on completion of the install"
+
+ if ! use hvm; then
+ echo
+ elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+ elog "support enable the hvm use flag."
+ elog "An x86 or amd64 system is required to build HVM support."
+ fi
+
+ if use qemu; then
+ elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+ elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"
+ elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
+ elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+ fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.14.0-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.14.0-r5.ebuild
similarity index 99%
rename from app-emulation/xen-tools/xen-tools-4.14.0-r4.ebuild
rename to app-emulation/xen-tools/xen-tools-4.14.0-r5.ebuild
index 55976ee7f22f..c23e528f38a5 100644
--- a/app-emulation/xen-tools/xen-tools-4.14.0-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.14.0-r5.ebuild
@@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
S="${WORKDIR}/${REPO}"
else
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
- UPSTREAM_VER=4
+ UPSTREAM_VER=6
SECURITY_VER=28
# xen-tools's gentoo patches tarball
GENTOO_VER=22
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index ba2a63dde3c8..03ed87819649 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,4 +1,5 @@
DIST xen-4.13.2-upstream-patches-1.tar.xz 15832 BLAKE2B 4e20a1e2d575ed7e1d21f3b34ed0d8bf6e1405cb39cc5c6ffc099614ea833ac9794bfcfcdea0893fdf81b318f536017ac3a023ad096bc8a8c7390c01f1d513ed SHA512 48dda9dadec1e87fb7b6952636e73057f6e0a5501f9727d05ac636fd47747194501db709c8ffa7154e79b6b612a98b658a03bc083c5065ff851ac57f454b599e
+DIST xen-4.13.2-upstream-patches-2.tar.xz 58992 BLAKE2B 535d67ae6a30e23feb975172a9e4abd6d7feb6c8c969aa243fdf672ed6580fe46bf57ea5530eab70457e22af9163f95061fdf97d10faa3be9f4c92033187c950 SHA512 6b6cdf72d13c0e595be65e3107c0f68299e932b74d4a1c4d59bfe3be8b76840c47f6adeaddd0efac71d5158cee8d778a0be863eea8f032cb9acf4191f629d8ae
DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
-DIST xen-4.14.0-upstream-patches-5.tar.xz 79424 BLAKE2B d2c6ec53e02fb306a7d7f7e8e6711f3e0523919d8dfb3e4e4b7ea66b618511c035e88e015e1028e6684bc6486e8e71b52e280c2f52c34357441870cd866b2672 SHA512 218657053c24330b0c9072fa32b9cc9619b6ceed0592114445651977c335fef0748160e89da2194456d4e0761b6314aed7a5f1992fa996c62eb191431b678e40
+DIST xen-4.14.0-upstream-patches-6.tar.xz 119116 BLAKE2B e3a0f807182d32754c6ae2000324237117cfa66c4a43c27b583b6aef69a3889949779751b71a87b2538f679fb481e8a723433950c689f28a8c2e96278c1b0ddb SHA512 03b1fdc08e74756001fbb0de4e21297456f63615e6f63b8f360f8270ef85b0d50c3872be41cc26529ed0d91d82ffda2af53882b7c5233113f223a4ec813a0d5b
DIST xen-4.14.0.tar.gz 39950576 BLAKE2B db4c3e79cfdfb10260d0d14d9d28e8c8bd9bf23f42aee743acf8f560bf4cdb96a425c0df887c70f9755f62680be24bfbe0149e52a4cb843ae83090cd9d6afc71 SHA512 ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0
diff --git a/app-emulation/xen/xen-4.13.2-r3.ebuild b/app-emulation/xen/xen-4.13.2-r3.ebuild
new file mode 100644
index 000000000000..79234b62328b
--- /dev/null
+++ b/app-emulation/xen/xen-4.13.2-r3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+ SRC_URI=""
+else
+ KEYWORDS="~amd64 ~arm -x86"
+ UPSTREAM_VER=2
+ SECURITY_VER=
+ GENTOO_VER=
+
+ [[ -n ${UPSTREAM_VER} ]] && \
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+ [[ -n ${SECURITY_VER} ]] && \
+ SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+ [[ -n ${GENTOO_VER} ]] && \
+ GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+ SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+ ${UPSTREAM_PATCHSET_URI}
+ ${SECURITY_PATCHSET_URI}
+ ${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+ efi? ( >=sys-devel/binutils-2.22[multitarget] )
+ !efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ if [[ -z ${XEN_TARGET_ARCH} ]]; then
+ if use amd64; then
+ export XEN_TARGET_ARCH="x86_64"
+ elif use arm; then
+ export XEN_TARGET_ARCH="arm32"
+ elif use arm64; then
+ export XEN_TARGET_ARCH="arm64"
+ else
+ die "Unsupported architecture!"
+ fi
+ fi
+
+ if use flask ; then
+ export "XSM_ENABLE=y"
+ export "FLASK_ENABLE=y"
+ fi
+}
+
+src_prepare() {
+ # Upstream's patchset
+ [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+ # Security patchset
+ if [[ -n ${SECURITY_VER} ]]; then
+ einfo "Try to apply Xen Security patch set"
+ # apply main xen patches
+ # Two parallel systems, both work side by side
+ # Over time they may concdense into one. This will suffice for now
+ source "${WORKDIR}"/patches-security/${PV}.conf
+
+ local i
+ for i in ${XEN_SECURITY_MAIN}; do
+ eapply "${WORKDIR}"/patches-security/xen/$i
+ done
+ fi
+
+ # Gentoo's patchset
+ [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+ eapply "${FILESDIR}"/${PN}-4.11-efi.patch
+
+ # Drop .config
+ sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
+
+ if use efi; then
+ export EFI_VENDOR="gentoo"
+ export EFI_MOUNTPOINT="/boot"
+ fi
+
+ default
+}
+
+src_configure() {
+ use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+ use debug && myopt="${myopt} debug=y"
+
+ # remove flags
+ unset CFLAGS
+ unset LDFLAGS
+ unset ASFLAGS
+
+ tc-ld-disable-gold # Bug 700374
+}
+
+src_compile() {
+ # Send raw LDFLAGS so that --as-needed works
+ emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+ local myopt
+ use debug && myopt="${myopt} debug=y"
+
+ # The 'make install' doesn't 'mkdir -p' the subdirs
+ if use efi; then
+ mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+ fi
+
+ emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+ # make install likes to throw in some extra EFI bits if it built
+ use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+ elog "Official Xen Guide:"
+ elog " https://wiki.gentoo.org/wiki/Xen"
+
+ use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
+
+ elog "You can optionally block the installation of /boot/xen-syms by an entry"
+ elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+ elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+
+ ewarn
+ ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
+ ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
+ ewarn "to work fine."
+ ewarn
+ ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
+ ewarn
+ ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
+}
diff --git a/app-emulation/xen/xen-4.14.0-r6.ebuild b/app-emulation/xen/xen-4.14.0-r7.ebuild
similarity index 99%
rename from app-emulation/xen/xen-4.14.0-r6.ebuild
rename to app-emulation/xen/xen-4.14.0-r7.ebuild
index 3a4fdc8209c9..7febeaacb942 100644
--- a/app-emulation/xen/xen-4.14.0-r6.ebuild
+++ b/app-emulation/xen/xen-4.14.0-r7.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
SRC_URI=""
else
KEYWORDS="~amd64 ~arm -x86"
- UPSTREAM_VER=5
+ UPSTREAM_VER=6
SECURITY_VER=
GENTOO_VER=
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 42ff9241cabb..e5c160f6be58 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 6754bdb51a04..2feabea9c749 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,2 +1,2 @@
DIST ibus-typing-booster-2.10.1.tar.gz 9449495 BLAKE2B 36e52d3e6349a89a1202429f7068221dc75dc0072d9e49424cf410ab12c2e732b9ea9fc54a2bbbfe386f2687535b9e0d46e5567f1572c42cf7fe98243c234a38 SHA512 d4262d7bec0b65919f5d25c97b319a48808d1257ea0697163bcaae238870d57640ed8fb44d423abb844416e1c99c130b1d6d5813a0edfa849afc762929e61f66
-DIST ibus-typing-booster-2.9.7.tar.gz 8833452 BLAKE2B 4c4f33bcff2fa9e20afeccf242bec1a6e11fca0b5cb515b2c2dce7ef2401c092a7197a6637e2ca72d4c1bacd694860c07ae645a313e41cd879d6bde8c1736d12 SHA512 984beacdd6b853e074127372a912442ba1dbc536ecf194a34d03025277b9d6277e967e63a9bdcd1620f5094965a191297ccae9adbff2d54d1cd474437a1ec16b
+DIST ibus-typing-booster-2.10.2.tar.gz 9433317 BLAKE2B 883639c6f6551b0e27e9ae45ba38320b465aeab9e43c6d848acff42fe74c670a6c0ea119256503267e5da7d94de2fbb8710b2d5c5de3a169aff095e0aa3570de SHA512 168ff2528e9b57120936dc69b6d8f32d495508de7e5a0cec9782b1b108b4acca9ba42c9a2f680f2b56c4ec01eae805b22cc5ba34e1a59c449715f589be51c542
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.1.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.1.ebuild
index ed1abe745449..69c81149e145 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.1.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.g
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RESTRICT="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.7.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.2.ebuild
similarity index 94%
rename from app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.7.ebuild
rename to app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.2.ebuild
index 69c81149e145..decf9c7acdb5 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.7.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
PYTHON_REQ_USE="sqlite(+)"
inherit gnome2-utils python-single-r1 xdg
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.g
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RESTRICT="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 338e78fc04f6..b4cad080b84d 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/cdcat/cdcat-0.3-r1.ebuild b/app-misc/cdcat/cdcat-0.3-r1.ebuild
index 8ad49a3e87e9..ae81f769f031 100644
--- a/app-misc/cdcat/cdcat-0.3-r1.ebuild
+++ b/app-misc/cdcat/cdcat-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
-RDEPEND="virtual/cdrtools
+RDEPEND="app-cdr/cdrtools
!app-backup/cdbkup"
src_prepare() {
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 41f9152dcb62..18e55e3d1acc 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,2 +1 @@
-DIST golly-3.4-src.tar.gz 5480295 BLAKE2B 6bd0c71083d021adb660ed8fd333399865e5f486b6d95d2851aefd31fd2ad09a04419e6e3b2e0ff38b1d934ebb975525c07ca841210cc05f60f9ecf92362bc48 SHA512 bb2b1a653f9556901aa18d2d56c75c2c5e55bd7451b2b5bfb6268793758c12a6b00d30fa52c08ebd47e5db98fbec6fb80c64194cd93a1a41846adbd824c7af47
DIST golly-4.0-src.tar.gz 5579026 BLAKE2B fc6c9d4db80e92635ac466250ca65c5cbe496c668f2fbd583226a2ecd686ac022aa4d47f453628284bceeb16554b91340b442216eab8412506243e30085a3a32 SHA512 3a39e170ceddfa4f8c261a81f7b45039e9cc2aef901915d83d3227231514bf66e254d307802cb0afddd7458722b8cbf2ce527cb9ee84a2710b52bf5bdb15484d
diff --git a/app-misc/golly/files/golly-3.3-allow-py23-exec.patch b/app-misc/golly/files/golly-3.3-allow-py23-exec.patch
deleted file mode 100644
index e46b608ed6c5..000000000000
--- a/app-misc/golly/files/golly-3.3-allow-py23-exec.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-'execfile' is python-2-only. 'exec/open' works for both python2 and python3.
---- a/gui-wx/wxpython.cpp
-+++ b/gui-wx/wxpython.cpp
-@@ -3356,7 +3388,7 @@ void RunPythonScript(const wxString& filepath)
- // for the global namespace so that this script cannot change the
- // globals of a caller script (which is possible now that RunScript
- // is re-entrant)
-- wxString command = wxT("execfile('") + fpath + wxT("',{})");
-+ wxString command = wxT("exec(open('") + fpath + wxT("').read(),{})");
- PyRun_SimpleString(command.mb_str(wxConvLocal));
- // don't use wxConvUTF8 in above line because caller has already converted
- // filepath to decomposed UTF8 if on a Mac
diff --git a/app-misc/golly/files/golly-3.3-allow-py3.patch b/app-misc/golly/files/golly-3.3-allow-py3.patch
deleted file mode 100644
index 54a047830818..000000000000
--- a/app-misc/golly/files/golly-3.3-allow-py3.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-The patch allows python3 as a python implementation.
-Ports module loading to conditional python3 support.
---- a/gui-wx/configure/configure.ac
-+++ b/gui-wx/configure/configure.ac
-@@ -19,7 +19,7 @@ AC_ARG_WITH([python-shlib], [AS_HELP_STRING([--with-python-shlib=ARG],
- , [with_python_shlib=check])
- AC_ARG_VAR([GOLLYDIR], [golly data directory [default=DATADIR/golly]])
- AC_ARG_VAR([PERL], [Perl 5 interpreter])
--AC_ARG_VAR([PYTHON], [Python 2 interpreter])
-+AC_ARG_VAR([PYTHON], [Python interpreter])
-
- # Check for build tools:
- m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-@@ -76,7 +76,7 @@ AS_IF([test "x$enable_perl" = xyes], [
- ])
-
- # Find Python
--AC_PATH_PROGS(PYTHON, [python2 python])
-+AC_CHECK_PROGS(PYTHON, [python python3 python2])
- AS_IF([test "x$PYTHON" = x], [AC_MSG_ERROR([missing Python])])
- AC_SUBST([PYTHON_INCLUDE], [-I"'`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())"`'"])
- AS_IF([test "x$with_python_shlib" = xcheck],
---- a/gui-wx/wxpython.cpp
-+++ b/gui-wx/wxpython.cpp
-@@ -90,6 +90,12 @@
- #include
- #endif
-
-+#if PY_MAJOR_VERSION >= 3
-+ // python-3 got rid of int/log distinction
-+ #define PyInt_AsLong PyLong_AsLong
-+ #define PyInt_FromLong PyLong_FromLong
-+#endif
-+
- #ifdef USE_PYTHON_DYNAMIC
-
- #ifndef __WXMAC__
-@@ -3268,6 +3274,22 @@ static PyMethodDef py_methods[] = {
- { NULL, NULL, 0, NULL }
- };
-
-+#if PY_MAJOR_VERSION >= 3
-+static PyModuleDef golly_module = {
-+ PyModuleDef_HEAD_INIT,
-+ "golly", /* name */
-+ NULL, /* doc */
-+ -1, /* size */
-+ py_methods, /* methoods */
-+};
-+
-+PyMODINIT_FUNC
-+PyInit_golly(void)
-+{
-+ return PyModule_Create(&golly_module);
-+}
-+#endif
-+
- // =============================================================================
-
- bool pyinited = false; // InitPython has been successfully called?
-@@ -3280,6 +3302,13 @@ bool InitPython()
- if (!LoadPythonLib()) return false;
- #endif
-
-+ #if PY_MAJOR_VERSION >= 3
-+ // Autoload 'golly' builtin module at interpreter start.
-+ if (PyImport_AppendInittab("golly", PyInit_golly) == -1) {
-+ Warning(_("Error: could not extend in-built modules table\n"));
-+ }
-+ #endif
-+
- // only initialize the Python interpreter once, mainly because multiple
- // Py_Initialize/Py_Finalize calls cause leaks of about 12K each time!
- Py_Initialize();
-@@ -3287,9 +3316,12 @@ bool InitPython()
- #ifdef USE_PYTHON_DYNAMIC
- GetPythonExceptions();
- #endif
--
-- // allow Python to call the above py_* routines
-- Py_InitModule((char*)"golly", py_methods);
-+
-+ // Python-3 uses module constructor
-+ #if PY_MAJOR_VERSION < 3
-+ // allow Python to call the above py_* routines
-+ Py_InitModule((char*)"golly", py_methods);
-+ #endif
-
- // catch Python messages sent to stderr and pass them to py_stderr
- if (PyRun_SimpleString(
diff --git a/app-misc/golly/files/golly-3.3-glife-py23.patch b/app-misc/golly/files/golly-3.3-glife-py23.patch
deleted file mode 100644
index 8b1599712508..000000000000
--- a/app-misc/golly/files/golly-3.3-glife-py23.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Use python-3 compatible syntax.
---- a/Scripts/Python/glife/__init__.py
-+++ b/Scripts/Python/glife/__init__.py
-@@ -90,7 +90,7 @@ def rule(s = "B3/S23"):
- def description(s):
- """Supply a textual description to the whole pattern."""
- for line in s.split("\n"):
-- print "#D", line
-+ print("#D", line)
-
- # --------------------------------------------------------------------
-
-@@ -161,7 +161,7 @@ class pattern(list):
- It is also the base for computing generations subsequent to N-th."""
- if N < 0:
- raise ValueError("backward evolving requested")
-- if self.__phases.has_key(N):
-+ if N in self.__phases:
- return self.__phases[N]
- M = 0
- for k in self.__phases.keys():
---- a/Scripts/Python/glife/text.py
-+++ b/Scripts/Python/glife/text.py
-@@ -173,7 +173,7 @@ def make_text (string, font='Snakial'):
- unknown = '-'
-
- for c in string:
-- if not f.has_key (c): c = unknown
-+ if not (c in f): c = unknown
- symbol = f[c]
- p += symbol (x, 0)
- x += symbol.width
diff --git a/app-misc/golly/files/golly-3.3-nondynamic-python.patch b/app-misc/golly/files/golly-3.3-nondynamic-python.patch
deleted file mode 100644
index bc1c81a61917..000000000000
--- a/app-misc/golly/files/golly-3.3-nondynamic-python.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Don't use runtime python loading via dlopen().
-
-Just link to libpython directly. That makes python dependency
-more explicit and allows catching more compile-time bugs.
---- a/gui-wx/configure/Makefile.am
-+++ b/gui-wx/configure/Makefile.am
-@@ -22,7 +22,7 @@ golly_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(PYTHON_INCLUDE) \
- $(PERL_CPPFLAGS) $(PERL_INCLUDE) \
- $(liblua_a_CPPFLAGS) -I$(top_srcdir)/../../lua
- golly_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS_ONLY)
--golly_LDADD = $(WX_LIBS) libgolly.a liblua.a
-+golly_LDADD = $(WX_LIBS) $(PYTHON_LIBS) libgolly.a liblua.a
-
- if WINDOWS
- golly_LDADD += gollyres.o
---- a/gui-wx/configure/configure.ac
-+++ b/gui-wx/configure/configure.ac
-@@ -86,6 +86,16 @@ AS_IF([test "x$with_python_shlib" = xcheck],
- AS_IF([test "x$shlib" = x], AC_MSG_ERROR([could not determine Python shared library name]))
- AC_DEFINE_UNQUOTED([PYTHON_SHLIB], [$shlib])
-
-+# Find python interpreter
-+# 1. --embed is needed for python>=3.8
-+# 2. statuc check is needed because python-3.7-config outputs error to stdout, not stderr
-+if ${PYTHON}-config --libs --embed; then
-+ PYTHON_LIBS=`${PYTHON}-config --libs --embed`
-+elif ${PYTHON}-config --libs; then
-+ PYTHON_LIBS=`${PYTHON}-config --libs`
-+fi
-+AC_SUBST(PYTHON_LIBS)
-+
- # Find zlib (unless explicitly disabled)
- AS_IF([test "x$with_zlib" != xno],
- [ AC_CHECK_HEADER([zlib.h], , [AC_MSG_ERROR([missing zlib])])
---- a/gui-wx/wxpython.cpp
-+++ b/gui-wx/wxpython.cpp
-@@ -59,8 +59,12 @@
- #undef SIZEOF_SIZE_T
- #undef SIZEOF_VOID_P
- #else
-- // load Python lib at runtime
-- #define USE_PYTHON_DYNAMIC
-+ // On gentoo just link against python to make
-+ // python dependency more explicit.
-+ # if 0
-+ // load Python lib at runtime
-+ #define USE_PYTHON_DYNAMIC
-+ #endif
-
- #ifdef __UNIX__
- // avoid warning on Linux
diff --git a/app-misc/golly/golly-3.4.ebuild b/app-misc/golly/golly-3.4.ebuild
deleted file mode 100644
index b1dcbb7f8201..000000000000
--- a/app-misc/golly/golly-3.4.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
-
-WX_GTK_VER=3.0-gtk3
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools desktop python-single-r1 wxwidgets xdg-utils
-
-DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
-HOMEPAGE="http://golly.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="virtual/opengl
- sys-libs/zlib
- x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff]
- ${PYTHON_DEPS}
-"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-src
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.3-nondynamic-python.patch
- "${FILESDIR}"/${PN}-3.3-allow-py23-exec.patch
- "${FILESDIR}"/${PN}-3.3-glife-py23.patch
- "${FILESDIR}"/${PN}-3.3-allow-py3.patch
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- setup-wxwidgets
-}
-
-src_prepare() {
- default
-
- # patches change configure.ac and Makefile.am
- pushd gui-wx/configure
- eautoreconf
- popd
-}
-
-src_configure() {
- ECONF_SOURCE=gui-wx/configure econf \
- --with-wxshared
-}
-
-src_install() {
- emake docdir= DESTDIR="${D}" install
- dodoc docs/ReadMe.html
- newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
- make_desktop_entry ${PN} "Golly" ${PN} "Science"
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index b5f95b458333..f94aa2c85e28 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,2 +1 @@
-DIST mc-4.8.24.tar.xz 2434988 BLAKE2B 18bd730d5bfbad19fa5e70fb578cf587a3df8da33885543b3d316548ac0d29bd67e4683d32b2751471e148e89390c7658edb622fd741eae054b7fae774996b60 SHA512 ec9e40198455e7001bb1d06ea060b9b4c32ad3a3750d0cc9bac334b53eb666df1746335bfcd411213fa4386b23e516f6026fe3d74ad9119b2340b26c63ccd4fc
DIST mc-4.8.25.tar.xz 2488324 BLAKE2B 47047c85fbe3ce1c54b9a3477c35fb05d76b3688205bfd13db03844bb9d8b3e74498ef4d6b449cfcf79c0188687accd93602274b7e8c0cbffc5247d433e33272 SHA512 51913fd41df18b49498b97ad8e13aa4365cec24ab24169b1abe93209263e4cfea4b52e0faccaf934182c84e8eb5dc49336c885358b4b66c48d38900f890fde5e
diff --git a/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch b/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch
deleted file mode 100644
index 8db6fdfb2ea3..000000000000
--- a/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-https://midnight-commander.org/ticket/4070
-
-From 30fd157a73f148dbc150c18b206b85e1a4a93e9c Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich
-Date: Tue, 3 Mar 2020 09:26:12 +0000
-Subject: [PATCH] misc/Makefile.am: install 'mc.lib' only once (#4070)
-
-Before the change `mc.lib` was installed twice due to being
-in two `_DATA` variables:
-
-```
-dist_pkgdata_DATA = \
- mc.lib
-
-pkgdata_DATA = \
- $(dist_pkgdata_DATA) \
- $(PKGDATA_OUT)
-```
-
-This causes occasional install failures when two parallel
-`/usr/bin/install` calls race in installing the file:
-
-```
-$ make -j20 DESTDIR=/var/tmp/portage/app-misc/mc-4.8.24/image install
-...
- /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \
- -c -m 644 mc.lib '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc'
- /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \
- -c -m 644 mc.lib mc.charsets '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc'
-...
- /usr/bin/install: cannot create regular file
- '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc/mc.lib': File exists
-```
-
-After the change `mc.lib` is present only in `dist_pkgdata_DATA`.
-
-Signed-off-by: Sergei Trofimovich
----
- misc/Makefile.am | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/misc/Makefile.am
-+++ b/misc/Makefile.am
-@@ -17,7 +17,7 @@ dist_pkgdata_DATA = \
- mc.lib
-
- pkgdata_DATA = \
-- $(dist_pkgdata_DATA) \
-+ \
- $(PKGDATA_OUT)
-
- SCRIPTS_IN = \
-@@ -54,7 +53,7 @@ EXTRA_DIST = \
- $(LIBFILES_SCRIPT) \
- $(SCRIPTS_IN) \
- $(noinst_DATA) \
-- $(dist_pkgdata_DATA) \
-+ \
- $(PKGDATA_IN)
-
- install-data-hook:
---- a/misc/Makefile.in
-+++ b/misc/Makefile.in
-@@ -472,7 +473,7 @@ dist_pkgdata_DATA = \
- mc.lib
-
- pkgdata_DATA = \
-- $(dist_pkgdata_DATA) \
-+ \
- $(PKGDATA_OUT)
-
- SCRIPTS_IN = \
-@@ -508,7 +509,7 @@ EXTRA_DIST = \
- $(LIBFILES_SCRIPT) \
- $(SCRIPTS_IN) \
- $(noinst_DATA) \
-- $(dist_pkgdata_DATA) \
-+ \
- $(PKGDATA_IN)
-
- all: all-recursive
---
-2.25.1
-
diff --git a/app-misc/mc/mc-4.8.24.ebuild b/app-misc/mc/mc-4.8.24.ebuild
deleted file mode 100644
index de7e49b86895..000000000000
--- a/app-misc/mc/mc-4.8.24.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
-SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
- gpm? ( sys-libs/gpm )
- kernel_linux? ( sys-fs/e2fsprogs )
- samba? ( net-fs/samba )
- sftp? ( net-libs/libssh2 )
- slang? ( >=sys-libs/slang-2 )
- !slang? ( sys-libs/ncurses:0=[unicode?] )
- spell? ( app-text/aspell )
- X? ( x11-libs/libX11
- x11-libs/libICE
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libSM )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( dev-libs/check )
- "
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=("${FILESDIR}"/${P}-mc-lib-twice-4070.patch)
-
-pkg_pretend() {
- if use slang && use unicode ; then
- ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
- fi
-}
-
-src_configure() {
- [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
- local myeconfargs=(
- --enable-charset
- --enable-vfs
- --with-homedir=$(usex xdg 'XDG' '.mc')
- --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
- $(use_enable kernel_linux vfs-undelfs)
- # Today mclib does not expose any headers and is linked to
- # single 'mc' binary. Thus there is no advantage of having
- # a library. Let's avoid shared library altogether
- # as it also conflicts with sci-libs/mc: bug #685938
- --disable-mclib
- $(use_enable nls)
- $(use_enable samba vfs-smb)
- $(use_enable sftp vfs-sftp)
- $(use_enable spell aspell)
- $(use_enable test tests)
- $(use_with gpm gpm-mouse)
- $(use_with X x)
- $(use_with edit internal-edit)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- # CK_FORK=no to avoid using fork() in check library
- # as mc mocks fork() itself: bug #644462.
- #
- # VERBOSE=1 to make test failures contain detailed
- # information.
- CK_FORK=no emake check VERBOSE=1
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS README NEWS
-
- # fix bug #334383
- if use kernel_linux && [[ ${EUID} == 0 ]] ; then
- fowners root:tty /usr/libexec/mc/cons.saver
- fperms g+s /usr/libexec/mc/cons.saver
- fi
-
- if ! use xdg ; then
- sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
- -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
- fi
-}
-
-pkg_postinst() {
- elog "To enable exiting to latest working directory,"
- elog "put this into your ~/.bashrc:"
- elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 66599d029bcd..c48c448ddae0 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1 +1,3 @@
DIST pax-utils-1.2.6.tar.xz 680696 BLAKE2B b271e19ed5ec1024d7c6e5723c12464c6ab07646dfbfd4738bfe0250629205051642421425d7c7c5f540b1ac3d100c13d1beca398d9766f7f477830ab128eef2 SHA512 59fe16c5573414aa2952a99c5b85c16cf10dbbee76943f263d31d5b1aa8818a9b00fa78c8b6dadbe02216de54fc32b26d80303a17e2d854de6bb9dd8b431f617
+DIST pax-utils-1.2.7.tar.xz 689680 BLAKE2B 9d7dd0aeaecc10edf1dc70acef1561e3984b9d4f30f2ff54b27cdd91fb88d194e6f1bb9b2b01064a25a1842855dfe4f448f7267d69bbed0102a854635b5829aa SHA512 e3bbe7fe0cf7c1607218187f272edad3652a55317a620905b76bba5bc9617f31b8eced6760f353b4558e7b118664c3df5c6d97c78b653f8d4636f094b96307f8
+DIST pax-utils-1.2.8.tar.xz 704804 BLAKE2B b64b50f985320618e10528aaddbeee9a2c86b05724d8564342fc78fd8bd31a84f3cfe5e6051b3b8a1a882bb0b3da586ca351b6fdda0fd6168930e8e4a44806cb SHA512 c211defb72921a6dfa950173bef7ef6bc5ac059dbb394a82d2b2455d082843fc7722a6819f37aa39033bd37a5a77880f193f8be550020320e87ce5becfa6e5bf
diff --git a/app-misc/pax-utils/pax-utils-1.2.7.ebuild b/app-misc/pax-utils/pax-utils-1.2.7.ebuild
new file mode 100644
index 000000000000..97ad76dbc3c2
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.2.7.ebuild
@@ -0,0 +1,78 @@
+# 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 eutils python-single-r1 toolchain-funcs
+
+DESCRIPTION="ELF utils that can check files for security relevant properties"
+HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+ https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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"
+IUSE="caps debug kernel_linux python seccomp"
+
+RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+ seccomp? ( sys-libs/libseccomp )
+"
+# >=linux-headers-4.11 to pick linux headers with statx, bug #737094
+DEPEND="
+ ${RDEPEND}
+ kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-4.11 ) )
+"
+BDEPEND="
+ caps? ( virtual/pkgconfig )
+ seccomp? ( virtual/pkgconfig )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+_emake() {
+ emake \
+ USE_CAP=$(usex caps) \
+ USE_DEBUG=$(usex debug) \
+ USE_PYTHON=$(usex python) \
+ USE_SECCOMP=$(usex seccomp) \
+ "$@"
+}
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_configure() {
+ # Avoid slow configure+gnulib+make if on an up-to-date Linux system
+ if use prefix || ! use kernel_linux ||
+ has_version '=sys-libs/libcap-2.24 )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+ seccomp? ( sys-libs/libseccomp )
+"
+# >=linux-headers-4.11 to pick linux headers with statx, bug #737094
+DEPEND="
+ ${RDEPEND}
+ kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-4.11 ) )
+"
+BDEPEND="
+ caps? ( virtual/pkgconfig )
+ seccomp? ( virtual/pkgconfig )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+_emake() {
+ emake \
+ USE_CAP=$(usex caps) \
+ USE_DEBUG=$(usex debug) \
+ USE_PYTHON=$(usex python) \
+ USE_SECCOMP=$(usex seccomp) \
+ "$@"
+}
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_configure() {
+ # Avoid slow configure+gnulib+make if on an up-to-date Linux system
+ if use prefix || ! use kernel_linux ||
+ has_version '=dev-libs/glib-2.46:2
+ >=app-misc/tracker-2.2.0:=
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ media-plugins/gst-plugins-meta:1.0 )
+ !gstreamer? (
+ ffmpeg? ( media-video/ffmpeg:0= ) )
+
+ >=sys-apps/dbus-1.3.1
+ xmp? ( >=media-libs/exempi-2.1.0:= )
+ raw? ( media-libs/gexiv2 )
+ >=dev-libs/icu-4.8.1.2:=
+ cue? ( media-libs/libcue:= )
+ exif? ( >=media-libs/libexif-0.6 )
+ gsf? ( >=gnome-extra/libgsf-1.14.24:= )
+ xps? ( app-text/libgxps )
+ iptc? ( media-libs/libiptcdata )
+ jpeg? ( virtual/jpeg:0 )
+ iso? ( >=sys-libs/libosinfo-0.2.10 )
+ >=media-libs/libpng-1.2:0=
+ seccomp? ( >=sys-libs/libseccomp-2.0 )
+ tiff? ( media-libs/tiff:0 )
+ xml? ( >=dev-libs/libxml2-2.6 )
+ pdf? ( >=app-text/poppler-0.16.0[cairo] )
+ playlist? ( >=dev-libs/totem-pl-parser-3:= )
+ upower? ( >=sys-power/upower-0.9.0 )
+ sys-libs/zlib:0
+ gif? ( media-libs/giflib:= )
+
+ rss? ( >=net-libs/libgrss-0.7:0 )
+ app-arch/gzip
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ dev-util/gdbus-codegen
+
+ >=dev-util/intltool-0.40.0
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ test? ( ${PYTHON_DEPS}
+ gstreamer? (
+ media-libs/gstreamer:1.0[introspection]
+ || ( media-plugins/gst-plugins-libav:1.0
+ media-plugins/gst-plugins-openh264:1.0 )
+ ) )
+"
+# intltool-merge manually called in meson.build in 2.2.2; might be properly gone by 2.3
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
+ if use gstreamer; then
+ sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
+ else
+ sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
+ fi
+ xdg_src_prepare
+ gnome2_environment_reset # sets gstreamer safety variables
+}
+
+src_configure() {
+ local media_extractor="none"
+ if use gstreamer ; then
+ media_extractor="gstreamer"
+ elif use ffmpeg ; then
+ media_extractor="libav"
+ fi
+
+ local emesonargs=(
+ -Dtracker_core=system
+
+ -Ddocs=true
+ -Dextract=true
+ -Dfunctional_tests=false # currently broken, may fare better in 2.2.3 or 2.3; if re-enabled re-add dconf test dep
+ #$(meson_use test functional_tests)
+ -Dminer_fs=true
+ $(meson_use rss miner_rss)
+ -Dwriteback=true
+ -Dabiword=true
+ -Ddvi=true
+ -Dicon=true
+ -Dmp3=true
+ -Dps=true
+ -Dtext=true
+ -Dunzip_ps_gz_files=true # spawns gunzip
+
+ $(meson_feature cue)
+ $(meson_feature exif)
+ -Dflac=disabled # never use external flac extractor - gst-plugins-flac is for that; ffmpeg one is maybe worse, but that's non-default
+ $(meson_feature gif)
+ $(meson_feature gsf)
+ $(meson_feature iptc)
+ $(meson_feature iso)
+ $(meson_feature jpeg)
+ $(meson_feature pdf)
+ $(meson_feature playlist)
+ -Dpng=enabled
+ $(meson_feature raw)
+ $(meson_feature tiff)
+ -Dvorbis=disabled # never use external vorbis extractor - gst-plugins-base[vorbis] is for that; ffmpeg one is maybe worse, but that's non-default
+ $(meson_feature xml)
+ $(meson_feature xmp)
+ $(meson_feature xps)
+
+ -Dbattery_detection=$(usex upower upower none)
+ -Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
+ -Dgeneric_media_extractor=${media_extractor}
+ # gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
+ -Dsystemd_user_services="$(systemd_get_userunitdir)"
+ )
+ meson_src_configure
+}
+
+src_test() {
+ export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
+ dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 104819fc25f8..c336bc3acd51 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1 +1,2 @@
DIST tracker-2.3.4.tar.xz 1607928 BLAKE2B f0285480091fdac3aab1d258496643b7644f2d58383eb0d7cdd10f273a79e75a36507285db4737bb270dda8cb195482d6f8e2770b24fce13c72dd32325c3976e SHA512 8b8ffc33962a5dffbae83dfb8ea73b0d2ff6ee002fbd9e4b574ef5f8e562338e359caab290ab804f2801a14e04d2c76eb0a52cf06be4d236ea043de4fc39dadf
+DIST tracker-2.3.5.tar.xz 1604004 BLAKE2B ad79682cb703056fd927649021a5f37fddb2e978ecc710d020c23ef5dd076f88c7e0c2cd9d4385343e9d6c2c2ac7473af7508d86793c505e2361a8021bf27d50 SHA512 74cd3b2671b811f3267a516e6f6047594fffa7c8a4a23fa5be4f7d71f581c417a88f12f614757418a848077a9231c0c876617d4486f3bb5b103382b871913d34
diff --git a/app-misc/tracker/tracker-2.3.4.ebuild b/app-misc/tracker/tracker-2.3.4.ebuild
index cb4efce3cb78..fb616ad99c5d 100644
--- a/app-misc/tracker/tracker-2.3.4.ebuild
+++ b/app-misc/tracker/tracker-2.3.4.ebuild
@@ -4,6 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
VALA_MIN_API_VERSION="0.40"
+VALA_MAX_API_VERSION="0.48"
inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
diff --git a/app-misc/tracker/tracker-2.3.5.ebuild b/app-misc/tracker/tracker-2.3.5.ebuild
new file mode 100644
index 000000000000..c5a3577c1c9e
--- /dev/null
+++ b/app-misc/tracker/tracker-2.3.5.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+VALA_MIN_API_VERSION="0.40"
+
+inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/2.0"
+IUSE="gtk-doc +miners networkmanager stemmer"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+#RESTRICT="!test? ( test )"
+
+PV_SERIES=$(ver_cut 1-2)
+
+# In 2.2.0 util-linux should only be necessary if glib is older than 2.52 at compile-time
+# But build still needs it - https://gitlab.gnome.org/GNOME/tracker/issues/131
+RDEPEND="
+ >=dev-libs/glib-2.46:2
+ >=sys-apps/dbus-1.3.2
+ >=dev-libs/gobject-introspection-1.54:=
+ >=dev-libs/icu-4.8.1.2:=
+ >=dev-libs/json-glib-1.0
+ >=net-libs/libsoup-2.40.1:2.4
+ >=dev-libs/libxml2-2.7
+ >=dev-db/sqlite-3.20.0
+ networkmanager? ( >=net-misc/networkmanager-0.8 )
+ stemmer? ( dev-libs/snowball-stemmer )
+ sys-apps/util-linux
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ $(vala_depend)
+ gtk-doc? ( >=dev-util/gtk-doc-1.8
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/docbook-xml-dtd:4.5 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ ${PYTHON_DEPS}
+"
+PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
+
+function inotify_enabled() {
+ if linux_config_exists; then
+ if ! linux_chkconfig_present INOTIFY_USER; then
+ ewarn "You should enable the INOTIFY support in your kernel."
+ ewarn "Check the 'Inotify support for userland' under the 'File systems'"
+ ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
+ die 'missing CONFIG_INOTIFY'
+ fi
+ else
+ einfo "Could not check for INOTIFY support in your kernel."
+ fi
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ inotify_enabled
+
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ xdg_src_prepare
+ vala_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use gtk-doc docs)
+ -Dfts=true
+ -Dfunctional_tests=false # many fail in 2.2; retry with 2.3
+ #$(meson_use test functional_tests)
+ -Dman=true
+ $(meson_feature networkmanager network_manager)
+ $(meson_feature stemmer)
+ -Dunicode_support=icu
+ -Dbash_completion="$(get_bashcompdir)"
+ -Dsystemd_user_services="$(systemd_get_userunitdir)"
+ )
+ meson_src_configure
+}
+
+src_test() {
+ dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 05c160a9d94f..13aa9676167d 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/scribus/scribus-1.5.6.1.ebuild b/app-office/scribus/scribus-1.5.6.1.ebuild
index f001fe5574c6..d68ada3ac042 100644
--- a/app-office/scribus/scribus-1.5.6.1.ebuild
+++ b/app-office/scribus/scribus-1.5.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 64404a069812..665f8add8781 100644
Binary files a/app-pda/Manifest.gz and b/app-pda/Manifest.gz differ
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index 1d40da80c875..1a1995a017ee 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -1,6 +1 @@
-DIST libimobiledevice-1.2.0-git.patch 187304 BLAKE2B 7c184f823b831b913dbae16a58db1e4b7682fb42e573b1bab3983eb8150feb696795fd59c81ca7582fd56cd953e32489a8ddc502c4cb39a6ac88ff3d018ceace SHA512 cfc433a8eada9357ee5119ccfeb1e7444f10132637a43954174721905207b0e168f49a1728ee16ed6b0a9fd8b9617e8e35b04cf34f775abd1d12b8ecb7dbdbd2
-DIST libimobiledevice-1.2.0-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch 2272 BLAKE2B 2f435af75c6f7fe319c76b52feac32d8f1389806835658bae5713d82471d0b2edd01b062871bff5e757795c220e2cd4c77d404c1df0cf9616c2fc2d77364b686 SHA512 a31741cfaae53781a1491fd53514e614e64c676573dc9252adea2fb0d64005eb5fad6483f1848b0246f0fff76c8fb4535f56a6e97c13dd7aa48a29061cabb172
-DIST libimobiledevice-1.2.0-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch 2014 BLAKE2B 8a6e51af145cf9983aa92ad7febf8d48a64b81f4f4664079ee7df3d433626141e10af6700ad38aad81bbbf3be03d6b35bae4f10a595e97f6998a06b6b2a4fbd4 SHA512 1c6002f8da5524603b989613fc1b14e526bc6fcbf515890f8c4976fe5e1b3801f04f6b210264624990ff7dd7de01063ad53dbf9ec506a0645098692a948216b9
-DIST libimobiledevice-1.2.0.tar.bz2 631495 BLAKE2B b04d87906615710e9e143013d27f4a0735e444160cb9dad464cb63d568470397f504680b3faca3995932cc8a80970a5923128d356fad9c98372af4981373ed69 SHA512 0de5f768aeb5d62445892855d84ceaff776f6667733c351ed6c34bf9d500802762d1a06e5efdf57f33cafc9ee788041cd9b6748fb9bad6c2e4ae2f9b9aa93589
-DIST libimobiledevice-1.2.1_pre20200220.tar.bz2 193582 BLAKE2B 7fab2101ee96a5fcc5dc68bad1a6c9fef25d87f25660cbce9aef45f8830c0162179f07e3d8a0f1d7d60bb7a219b1c4ee2513d43f98e8e4ea0d891686600c370e SHA512 f9d04941685f1cb0e982d061a6ea92d88d1d90157a789460e09e6af72954ed7a7f0448efbef3fe3cbca380195ffa658f7d8119e812f8ba8003c1e8a242976865
DIST libimobiledevice-1.3.0.tar.bz2 733949 BLAKE2B 40717280bb3424c7431aa93d06d10de817e6761acf2b19948d80b691cfb4dd4ef0e31b81c8458eed29a43c8c8aa256da7baa3648fb785cfbdb7316daaba119a3 SHA512 7b22040552a6561729c79c0846f571b0e608abb7c297567d2ecfdd1718ce86df08a5e34ba51f209bdee96a1917da15e7ba3aaef1d289a951d1d3470b1f89e6a8
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild
deleted file mode 100644
index 6b1c60b021b4..000000000000
--- a/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools python-r1
-
-DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
-HOMEPAGE="http://www.libimobiledevice.org/"
-
-# Get patches from Fedora
-SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2
- https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0001-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch -> ${P}-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch
- https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0002-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch -> ${P}-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch
- https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/344409e1d1ad917d377b256214c5411dda82e6b0...5a85432719fb3d18027d528f87d2a44b76fd3e12.patch -> ${P}-git.patch"
-
-# While COPYING* doesn't mention 'or any later version', all the headers do, hence use +
-LICENSE="GPL-2+ LGPL-2.1+"
-
-SLOT="0/6" # based on SONAME of libimobiledevice.so
-
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE="gnutls libressl python static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- >=app-pda/libplist-1.11:=
- >=app-pda/libusbmuxd-1.0.9:=
- gnutls? (
- dev-libs/libgcrypt:0
- >=dev-libs/libtasn1-1.1
- >=net-libs/gnutls-2.2.0 )
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= ) )
- python? (
- ${PYTHON_DEPS}
- app-pda/libplist[python(-),${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
-"
-
-BUILD_DIR="${S}_build"
-
-PATCHES=(
- "${DISTDIR}"/${P}-git.patch
- "${DISTDIR}"/${P}-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch
- "${DISTDIR}"/${P}-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local ECONF_SOURCE=${S}
-
- local myeconfargs=( $(use_enable static-libs static) )
- use gnutls && myeconfargs+=( --disable-openssl )
-
- do_configure() {
- mkdir -p "${BUILD_DIR}" || die
- pushd "${BUILD_DIR}" >/dev/null || die
- econf "${myeconfargs[@]}" "${@}"
- popd >/dev/null || die
- }
-
- do_configure_python() {
- # Bug 567916
- local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
- do_configure "$@"
- }
-
- do_configure --without-cython
- use python && python_foreach_impl do_configure_python
-}
-
-src_compile() {
- python_compile() {
- emake -C "${BUILD_DIR}"/cython -j1 \
- VPATH="${S}/cython:${native_builddir}/cython" \
- imobiledevice_la_LIBADD="${native_builddir}/src/libimobiledevice.la"
- }
-
- local native_builddir=${BUILD_DIR}
- pushd "${BUILD_DIR}" >/dev/null || die
- emake -j1
- use python && python_foreach_impl python_compile
- popd >/dev/null || die
-}
-
-src_install() {
- python_install() {
- emake -C "${BUILD_DIR}/cython" -j1 \
- VPATH="${S}/cython:${native_builddir}/cython" \
- DESTDIR="${D}" install
- }
-
- local native_builddir=${BUILD_DIR}
- pushd "${BUILD_DIR}" >/dev/null || die
- emake -j1 DESTDIR="${D}" install
- use python && python_foreach_impl python_install
- popd >/dev/null || die
-
- dodoc docs/html/*
- if use python; then
- insinto /usr/include/${PN}/cython
- doins cython/imobiledevice.pxd
- fi
-
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.2.1_pre20200220.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.2.1_pre20200220.ebuild
deleted file mode 100644
index 04ee38620ee7..000000000000
--- a/app-pda/libimobiledevice/libimobiledevice-1.2.1_pre20200220.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT="3d8d13f0a70cefc1b12571b7f6aa2d1d4c58cffb"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools python-r1
-
-DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
-HOMEPAGE="https://www.libimobiledevice.org/"
-SRC_URI="https://cgit.libimobiledevice.org/libimobiledevice.git/snapshot/libimobiledevice-${COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-
-# While COPYING* doesn't mention 'or any later version', all the headers do, hence use +
-LICENSE="GPL-2+ LGPL-2.1+"
-
-SLOT="0/6" # based on SONAME of libimobiledevice.so
-
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE="doc gnutls libressl python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=app-pda/libplist-1.11:=
- >=app-pda/libusbmuxd-1.1.0:=
- gnutls? (
- dev-libs/libgcrypt:0
- >=dev-libs/libtasn1-1.1
- >=net-libs/gnutls-2.2.0 )
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= ) )
- python? (
- ${PYTHON_DEPS}
- app-pda/libplist[python(-),${PYTHON_USEDEP}] )
-"
-
-DEPEND="
- ${RDEPEND}
-"
-
-BDEPEND="
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-BUILD_DIR="${S}_build"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local ECONF_SOURCE=${S}
-
- local myeconfargs=( $(use_enable static-libs static) )
- use gnutls && myeconfargs+=( --disable-openssl )
-
- do_configure() {
- mkdir -p "${BUILD_DIR}" || die
- pushd "${BUILD_DIR}" >/dev/null || die
- econf "${myeconfargs[@]}" "${@}"
- popd >/dev/null || die
- }
-
- do_configure_python() {
- # Bug 567916
- local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
- do_configure "$@"
- }
-
- do_configure --without-cython
- use python && python_foreach_impl do_configure_python
-}
-
-src_compile() {
- python_compile() {
- emake -C "${BUILD_DIR}"/cython \
- VPATH="${S}/cython:$1/cython" \
- imobiledevice_la_LIBADD="$1/src/libimobiledevice.la"
- }
-
- emake -C "${BUILD_DIR}"
- use python && python_foreach_impl python_compile "${BUILD_DIR}"
-
- if use doc; then
- doxygen "${BUILD_DIR}"/doxygen.cfg || die
- fi
-}
-
-src_install() {
- python_install() {
- emake -C "${BUILD_DIR}/cython" install \
- DESTDIR="${D}" \
- VPATH="${S}/cython:$1/cython"
- }
-
- emake -C "${BUILD_DIR}" install DESTDIR="${D}"
- use python && python_foreach_impl python_install "${BUILD_DIR}"
- use doc && dodoc docs/html/*
-
- if use python; then
- insinto /usr/include/${PN}/cython
- doins cython/imobiledevice.pxd
- fi
-
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
index 9a8f598ddc00..7caaf0293e9a 100644
--- a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
+++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0/1.0-6" # based on SONAME of libimobiledevice-1.0.so
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
IUSE="doc gnutls libressl python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index f7eb711f962c..7a8c3d90462f 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1,2 +1 @@
-DIST libplist-2.1.0.tar.bz2 120602 BLAKE2B 8abfe3c295c4ebd242f2c4d49c80d1f214097df84f1d2fcf2696519bbbca4e8a5ce13c04690ac64fd981f84d585df25fc65c268a4e4f4092319053583e67736c SHA512 23156e882835bb0b894a05b57018b5e76f9f8f8f4b1d3fdad7b1970d2ef695033c98de74a1fa81bdf0829742a058fd65075cebc1512313d2be42e2f5367274be
DIST libplist-2.2.0.tar.bz2 126808 BLAKE2B 7c3ec04aaa52eca33ae28851a6524c9ea531df939feef0f10827c8c2de78a6ccd856ea4d8a568b146ccb5de96f70dd5accec34aa2fdd61f9e6eba01256c0b518 SHA512 641bfd3ec0565f104d3a2d1ebdf6137bc9252b67ce90550e24ab0deeee4e820e119ba4f8f1ba04a0358d995d196fa61e35f2f0ee8ba37fc0270752ae842ab1f5
diff --git a/app-pda/libplist/libplist-2.1.0.ebuild b/app-pda/libplist/libplist-2.1.0.ebuild
deleted file mode 100644
index d4dfa2e6a791..000000000000
--- a/app-pda/libplist/libplist-2.1.0.ebuild
+++ /dev/null
@@ -1,98 +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 autotools python-r1 toolchain-funcs
-
-DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
-HOMEPAGE="https://www.libimobiledevice.org/"
-SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/3"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE="python static-libs"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( AUTHORS NEWS README.md )
-
-BUILD_DIR="${S}_build"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local ECONF_SOURCE=${S}
- local myeconfargs=( $(use_enable static-libs static) )
-
- do_configure() {
- mkdir -p "${BUILD_DIR}" || die
- pushd "${BUILD_DIR}" >/dev/null || die
- econf "${myeconfargs[@]}" "${@}"
- popd >/dev/null || die
- }
-
- do_configure_python() {
- local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
- do_configure "$@"
- }
-
- # Don't prefer clang.
- tc-export CC CXX
-
- do_configure --without-cython
- use python && python_foreach_impl do_configure_python
-}
-
-src_compile() {
- python_compile() {
- emake -C "${BUILD_DIR}"/cython \
- VPATH="${S}/cython:${native_builddir}/cython" \
- plist_la_LIBADD="${native_builddir}/src/libplist.la"
- }
-
- local native_builddir=${BUILD_DIR}
- pushd "${BUILD_DIR}" >/dev/null || die
- emake
- use python && python_foreach_impl python_compile
- popd >/dev/null || die
-}
-
-src_test() {
- emake -C "${BUILD_DIR}" check
-}
-
-src_install() {
- python_install() {
- emake -C "${BUILD_DIR}/cython" \
- VPATH="${S}/cython:${native_builddir}/cython" \
- DESTDIR="${D}" install
- }
-
- local native_builddir=${BUILD_DIR}
- pushd "${BUILD_DIR}" >/dev/null || die
- emake DESTDIR="${D}" install
- use python && python_foreach_impl python_install
- popd >/dev/null || die
-
- einstalldocs
-
- if use python ; then
- insinto /usr/include/plist/cython
- doins cython/plist.pxd
- fi
-
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-pda/libplist/libplist-2.2.0-r1.ebuild b/app-pda/libplist/libplist-2.2.0-r1.ebuild
deleted file mode 100644
index c5c2f5167b89..000000000000
--- a/app-pda/libplist/libplist-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit autotools python-r1 toolchain-funcs
-
-DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
-HOMEPAGE="https://www.libimobiledevice.org/"
-SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/2.0-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="python static-libs"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( AUTHORS NEWS README.md )
-
-BUILD_DIR="${S}_build"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local ECONF_SOURCE=${S}
- local myeconfargs=( $(use_enable static-libs static) )
-
- do_configure() {
- mkdir -p "${BUILD_DIR}" || die
- pushd "${BUILD_DIR}" >/dev/null || die
- econf "${myeconfargs[@]}" "${@}"
- popd >/dev/null || die
- }
-
- do_configure_python() {
- local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
- do_configure "$@"
- }
-
- # Don't prefer clang.
- tc-export CC CXX
-
- do_configure --without-cython
- use python && python_foreach_impl do_configure_python
-}
-
-src_compile() {
- python_compile() {
- emake -C "${BUILD_DIR}"/cython \
- VPATH="${S}/cython:${native_builddir}/cython" \
- plist_la_LIBADD="${native_builddir}/src/libplist.la"
- }
-
- local native_builddir=${BUILD_DIR}
- pushd "${BUILD_DIR}" >/dev/null || die
- emake
- use python && python_foreach_impl python_compile
- popd >/dev/null || die
-}
-
-src_test() {
- emake -C "${BUILD_DIR}" check
-}
-
-src_install() {
- python_install() {
- emake -C "${BUILD_DIR}/cython" \
- VPATH="${S}/cython:${native_builddir}/cython" \
- DESTDIR="${D}" install
- }
-
- local native_builddir=${BUILD_DIR}
- pushd "${BUILD_DIR}" >/dev/null || die
- emake DESTDIR="${D}" install
- use python && python_foreach_impl python_install
- popd >/dev/null || die
-
- einstalldocs
-
- if use python ; then
- insinto /usr/include/plist/cython
- doins cython/plist.pxd
- fi
-
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-pda/libplist/libplist-2.2.0-r2.ebuild b/app-pda/libplist/libplist-2.2.0-r2.ebuild
index 3956dce388f5..059c8ae313f3 100644
--- a/app-pda/libplist/libplist-2.2.0-r2.ebuild
+++ b/app-pda/libplist/libplist-2.2.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/2.0-3"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
IUSE="python static-libs"
RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/app-pda/libusbmuxd/Manifest b/app-pda/libusbmuxd/Manifest
index 972b301fc5f4..a4f0c952f6dd 100644
--- a/app-pda/libusbmuxd/Manifest
+++ b/app-pda/libusbmuxd/Manifest
@@ -1,3 +1 @@
-DIST libusbmuxd-1.0.10.tar.bz2 292649 BLAKE2B 7ec9a576cb20f7e87cf1f31e57e66100c496e5809142d225df9b3cc295a71546bed2d90f41df3144f7316ce0aec5f08fad850c528e27f336bf96e9578bcffd04 SHA512 180cde2e9d0860d07d29813e68abf8ca807f75e98424b50acfc1ce941ba4260922959e1047a7d2bc754470c08ed55d0a15c9367487bd41c635a52b4fbf8ff535
-DIST libusbmuxd-2.0.1.tar.bz2 37373 BLAKE2B 3d7d8b4ccc5331f1f3868e67ac9726281dccb8eabc58cf78d4b8a921c403095adb18cd8ec4f156c06297abb8566daae04300709fd1afd35c57dbda155db03c0d SHA512 c2a977898ccd28d32f7754bac08829b57bc87ad958febded2c95087a06cb0b5a73daf087b3a00630701a7313fd3900f916846b77b4794321c90e6aa9f9246ed3
DIST libusbmuxd-2.0.2.tar.bz2 43162 BLAKE2B e3559583e691a5f87a61ffece0ebf944d4aed48d37f83a504ee4d7a245e05511c6620c4a82d29bea2a10686910a14f7a730afec0f2cfc9435f748499e35df433 SHA512 3086ce1a05026afeabcdb5364ec30f4a6a5c84fe6f09e15ef6ff438bd3dfdb262ebdff94e5e0d0828b6d946bc8bdf01760271ba0d1fbf98d743dce149764a519
diff --git a/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild b/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild
deleted file mode 100644
index 484a681d6a9f..000000000000
--- a/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
-HOMEPAGE="http://www.libimobiledevice.org/"
-SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
-
-# tools/iproxy.c is GPL-2+, everything else is LGPL-2.1+
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/4" # based on SONAME of libusbmuxd.so
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE="kernel_linux static-libs"
-
-RDEPEND="
- >=app-pda/libplist-1.11:=
- virtual/libusb:1
- !=app-pda/libplist-2.1.0:=
- !=dev-db/sqlite-3:= )"
-RDEPEND="${BOTHDEPEND}
- >=app-shells/push-2.0-r1
- >=app-shells/quoter-3.0_p2-r1"
-DEPEND="${BOTHDEPEND}
- app-arch/xz-utils
- nls? ( sys-devel/gettext )"
-
-pkg_setup() {
- # remove stale cache file to prevent collisions
- local old_cache=${EROOT}/var/cache/${PN}
- if [[ -f ${old_cache} ]]; then
- rm "${old_cache}" || die
- fi
-}
-
-src_prepare() {
- default
- sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
- sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
- -e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
- -i src/eix-functions.sh.in || die
- sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
- -i src/Makefile.am || die
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- $(use_enable debug paranoic-asserts)
- $(use_enable nls)
- $(use_with doc extra-doc)
- $(use_with sqlite)
- --without-protobuf
-
- # default configuration
- $(use_with prefix always-accept-keywords)
- --with-dep-default
- --with-required-use-default
-
- # paths
- --with-portage-rootpath="${ROOTPATH}"
- --with-eprefix-default="${EPREFIX}"
-
- # build a single executable with symlinks
- --disable-separate-binaries
- --disable-separate-tools
-
- # used purely to control/disrespect *FLAGS
- --disable-debugging
- --disable-new_dialect
- --disable-optimization
- --disable-strong-optimization
- --disable-security
- --disable-nopie-security
- --disable-strong-security
- )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- dobashcomp bash/eix
- dotmpfiles tmpfiles.d/eix.conf
-
- rm -r "${ED}"/usr/bin/eix-functions.sh || die
-}
-
-pkg_postinst() {
- tmpfiles_process eix.conf
-
- local obs=${EROOT}/var/cache/eix.previous
- if [[ -f ${obs} ]]; then
- ewarn "Found obsolete ${obs}, please remove it"
- fi
-}
-
-pkg_postrm() {
- if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
- rm -rf "${EROOT}/var/cache/${PN}" || die
- fi
-}
diff --git a/app-portage/eix/eix-0.34.11.ebuild b/app-portage/eix/eix-0.34.11.ebuild
index 60c3f3a77291..27581250b045 100644
--- a/app-portage/eix/eix-0.34.11.ebuild
+++ b/app-portage/eix/eix-0.34.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc nls sqlite"
BOTHDEPEND="nls? ( virtual/libintl )
diff --git a/app-portage/eix/eix-0.34.9.ebuild b/app-portage/eix/eix-0.34.9.ebuild
deleted file mode 100644
index 27581250b045..000000000000
--- a/app-portage/eix/eix-0.34.9.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-BOTHDEPEND="nls? ( virtual/libintl )
- sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${BOTHDEPEND}
- >=app-shells/push-2.0-r1
- >=app-shells/quoter-3.0_p2-r1"
-DEPEND="${BOTHDEPEND}
- app-arch/xz-utils
- nls? ( sys-devel/gettext )"
-
-pkg_setup() {
- # remove stale cache file to prevent collisions
- local old_cache=${EROOT}/var/cache/${PN}
- if [[ -f ${old_cache} ]]; then
- rm "${old_cache}" || die
- fi
-}
-
-src_prepare() {
- default
- sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
- sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
- -e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
- -i src/eix-functions.sh.in || die
- sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
- -i src/Makefile.am || die
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- $(use_enable debug paranoic-asserts)
- $(use_enable nls)
- $(use_with doc extra-doc)
- $(use_with sqlite)
- --without-protobuf
-
- # default configuration
- $(use_with prefix always-accept-keywords)
- --with-dep-default
- --with-required-use-default
-
- # paths
- --with-portage-rootpath="${ROOTPATH}"
- --with-eprefix-default="${EPREFIX}"
-
- # build a single executable with symlinks
- --disable-separate-binaries
- --disable-separate-tools
-
- # used purely to control/disrespect *FLAGS
- --disable-debugging
- --disable-new_dialect
- --disable-optimization
- --disable-strong-optimization
- --disable-security
- --disable-nopie-security
- --disable-strong-security
- )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- dobashcomp bash/eix
- dotmpfiles tmpfiles.d/eix.conf
-
- rm -r "${ED}"/usr/bin/eix-functions.sh || die
-}
-
-pkg_postinst() {
- tmpfiles_process eix.conf
-
- local obs=${EROOT}/var/cache/eix.previous
- if [[ -f ${obs} ]]; then
- ewarn "Found obsolete ${obs}, please remove it"
- fi
-}
-
-pkg_postrm() {
- if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
- rm -rf "${EROOT}/var/cache/${PN}" || die
- fi
-}
diff --git a/app-portage/elt-patches/elt-patches-20170317.ebuild b/app-portage/elt-patches/elt-patches-20170317.ebuild
index b3a68c92282e..bdc8efaf06f5 100644
--- a/app-portage/elt-patches/elt-patches-20170317.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170317.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-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 s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
DEPEND="app-arch/xz-utils"
diff --git a/app-portage/elt-patches/elt-patches-20170422.ebuild b/app-portage/elt-patches/elt-patches-20170422.ebuild
index 526135456625..e9790fd876ed 100644
--- a/app-portage/elt-patches/elt-patches-20170422.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170422.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-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 s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/elt-patches/elt-patches-20170815.ebuild b/app-portage/elt-patches/elt-patches-20170815.ebuild
index 8836b8a3c500..cb0a74970111 100644
--- a/app-portage/elt-patches/elt-patches-20170815.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170815.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-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 s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/elt-patches/elt-patches-20170826.1.ebuild b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
index 98f318e07e43..865b12a91085 100644
--- a/app-portage/elt-patches/elt-patches-20170826.1.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-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 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/elt-patches/elt-patches-20201205.ebuild b/app-portage/elt-patches/elt-patches-20201205.ebuild
index e6ebc44e78a3..2f0742a48f46 100644
--- a/app-portage/elt-patches/elt-patches-20201205.ebuild
+++ b/app-portage/elt-patches/elt-patches-20201205.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-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 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index af04c9475361..db788bf3055d 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,4 +1 @@
-DIST gentoolkit-0.4.6.tar.gz 3205641 BLAKE2B 7da91a313c8a9263eb7b4abd6207ece9dd602a5069a87f1e78ada13fc9f396e1f2afddaf0637c473445034cf57b5ca7631e209361a88fa3892d302b20f4cc986 SHA512 3aa3c9af7e994313400607943b9090fd813227ddd6d550b50fbcf7eeb4053da8bcdb41c9ef2579d957d2f279fdcc4e2f2ceca1091c5fd457df4204dd11792d6e
-DIST gentoolkit-0.4.7.tar.gz 3205669 BLAKE2B e5f64b85546bc10ad16e7fa42d288965539177375e8796b40df699859efa13fb98bb86aec58e60363c955b2d5e4b2e6379a7597252ee4fdbeec49559de67b328 SHA512 0fab600b4323d23e12009eeb4ade595950880a88b05bcfbfeada1a9b9af615b96d31c568285629bf6e5de7b45ed857bdf98b6261dc54974fbaf70c924e093c76
-DIST gentoolkit-0.4.8.tar.gz 3206070 BLAKE2B 7f689ae85136827b8af50401165ccd44bc824e12bec43dad786c7221ec78ee3c1f14d538d197e277a2fedc23f570440f4ec7c0cc707a146814315ff6de48c115 SHA512 689b4229c5d2b6f4440b7d3d57e4b9be5265eead53737890c17dbd0510df287f5c19f86b924735d4ad146d1a500c59a15869b718cbf805b894b0bf115b69f838
DIST gentoolkit-0.5.0.tar.gz 3206598 BLAKE2B a379dcbbaba9d52c241fea020b87c458384e44092539947909e14fd6c63fd9cc06d076b8081874edf17fc50e80fe48ceab3400c90046867dc409e7ac39c17231 SHA512 8a5c344f3a17c4c779abbcaa35b5e3f147106dbc61310d0d1a816ec8080914271fa45c311a8feeb1bfe14195af7cf34c0b29142d6e43e2de232dae96fbd00861
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
deleted file mode 100644
index 1db74e52a9a5..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
+++ /dev/null
@@ -1,74 +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} )
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-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"
-
-DEPEND="
- sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- sys-apps/gawk
- sys-apps/gentoo-functions"
-
-python_prepare_all() {
- python_setup
- echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
- VERSION="${PVR}" "${PYTHON}" setup.py set_version
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-0.4.0"; then
- SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
- fi
-}
-
-pkg_postinst() {
- # Create cache directory for revdep-rebuild
- mkdir -p -m 0755 "${EROOT}"/var/cache
- mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild
-
- if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
- elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
- elog "part of the gentoolkit package."
- elog "The gentoolkit-dev package is now deprecated in favor of a single"
- elog "gentoolkit package. The remaining tools from gentoolkit-dev"
- elog "are now obsolete/unused with the git based tree."
- fi
-
- # Only show the elog information on a new install
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- elog
- elog "For further information on gentoolkit, please read the gentoolkit"
- elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
- elog
- elog "Another alternative to equery is app-portage/portage-utils"
- elog
- elog "Additional tools that may be of interest:"
- elog
- elog " app-admin/eclean-kernel"
- elog " app-portage/diffmask"
- elog " app-portage/flaggie"
- elog " app-portage/portpeek"
- elog " app-portage/smart-live-rebuild"
- fi
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
deleted file mode 100644
index 318ac20f777c..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
+++ /dev/null
@@ -1,74 +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} pypy3 )
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-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"
-
-DEPEND="
- sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- sys-apps/gawk
- sys-apps/gentoo-functions"
-
-python_prepare_all() {
- python_setup
- echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
- VERSION="${PVR}" "${PYTHON}" setup.py set_version
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-0.4.0"; then
- SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
- fi
-}
-
-pkg_postinst() {
- # Create cache directory for revdep-rebuild
- mkdir -p -m 0755 "${EROOT}"/var/cache
- mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild
-
- if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
- elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
- elog "part of the gentoolkit package."
- elog "The gentoolkit-dev package is now deprecated in favor of a single"
- elog "gentoolkit package. The remaining tools from gentoolkit-dev"
- elog "are now obsolete/unused with the git based tree."
- fi
-
- # Only show the elog information on a new install
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- elog
- elog "For further information on gentoolkit, please read the gentoolkit"
- elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
- elog
- elog "Another alternative to equery is app-portage/portage-utils"
- elog
- elog "Additional tools that may be of interest:"
- elog
- elog " app-admin/eclean-kernel"
- elog " app-portage/diffmask"
- elog " app-portage/flaggie"
- elog " app-portage/portpeek"
- elog " app-portage/smart-live-rebuild"
- fi
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
deleted file mode 100644
index 36cbf7459fc6..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
+++ /dev/null
@@ -1,74 +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} pypy3 )
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-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"
-
-DEPEND="
- sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- sys-apps/gawk
- sys-apps/gentoo-functions"
-
-python_prepare_all() {
- python_setup
- echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
- VERSION="${PVR}" "${PYTHON}" setup.py set_version
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-0.4.0"; then
- SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
- fi
-}
-
-pkg_postinst() {
- # Create cache directory for revdep-rebuild
- mkdir -p -m 0755 "${EROOT}"/var/cache
- mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild
-
- if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
- elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
- elog "part of the gentoolkit package."
- elog "The gentoolkit-dev package is now deprecated in favor of a single"
- elog "gentoolkit package. The remaining tools from gentoolkit-dev"
- elog "are now obsolete/unused with the git based tree."
- fi
-
- # Only show the elog information on a new install
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- elog
- elog "For further information on gentoolkit, please read the gentoolkit"
- elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
- elog
- elog "Another alternative to equery is app-portage/portage-utils"
- elog
- elog "Additional tools that may be of interest:"
- elog
- elog " app-admin/eclean-kernel"
- elog " app-portage/diffmask"
- elog " app-portage/flaggie"
- elog " app-portage/portpeek"
- elog " app-portage/smart-live-rebuild"
- fi
-}
diff --git a/app-portage/grs/grs-0.7.ebuild b/app-portage/grs/grs-0.7.ebuild
index c0dd4da74b1a..ab99785d4f64 100644
--- a/app-portage/grs/grs-0.7.ebuild
+++ b/app-portage/grs/grs-0.7.ebuild
@@ -30,12 +30,12 @@ RDEPEND="
sys-apps/portage
server? (
app-arch/tar[xattr]
+ app-cdr/cdrtools
app-crypt/md5deep
dev-libs/libcgroup
dev-vcs/git
net-misc/rsync
sys-fs/squashfs-tools
- virtual/cdrtools
|| (
sys-kernel/genkernel
sys-kernel/genkernel-next
diff --git a/app-portage/grs/grs-9999.ebuild b/app-portage/grs/grs-9999.ebuild
index 04dfe2966f17..c98149f22b02 100644
--- a/app-portage/grs/grs-9999.ebuild
+++ b/app-portage/grs/grs-9999.ebuild
@@ -30,12 +30,12 @@ RDEPEND="
sys-apps/portage
server? (
app-arch/tar[xattr]
+ app-cdr/cdrtools
app-crypt/md5deep
dev-libs/libcgroup
dev-vcs/git
net-misc/rsync
sys-fs/squashfs-tools
- virtual/cdrtools
|| (
sys-kernel/genkernel
sys-kernel/genkernel-next
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index f22302c612b1..57db9d65ebc2 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 57a297a78fd2..4951082a3d07 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -327,3 +327,7 @@ DIST bash50-015 2565 BLAKE2B 7df76369726332299c089db156c1e9bc6619fe2e925732da46c
DIST bash50-016 1534 BLAKE2B 8c9bb752a441b70b11655a9bd48e48ec9756a34d0513837faa94c64675c11d57ba1fb0bfc43a033040539f9c475a0efd00f375cf8ffe04a6d9d1d1c19575572e SHA512 dbc3bd0fe3bddad8f6417b210fc5638a9c0c545f9d27638d63bac48aba9d3b93181a4f2e9898584d231b658589573fad5e4627ccbcf3e9d87e7663ac730b51aa
DIST bash50-017 6517 BLAKE2B d8ec55e796fa2b17774fdf846c7b24ab1428a1dd94210e0d6b3174f99afe7f9c7f33448e1116c81f43407cb8d95390dd634cb8bd543046699898f471ffd68433 SHA512 d4a4b2746a106a7e78f7df2467cfd4ca486ab36b3e6e97eb9d47ede728033b1246bc1b60edc271cdb49df998af196619b09e598c0da1b425f05455237e256b65
DIST bash50-018 1242 BLAKE2B e5f811ede6938e3b09d2ca658dc2ff2b30d6debed4334369ddf7755992cd1c591188595465552f4b5d0ab7d2d62759ff0b4f14a07466650cde0d25778b26df7c SHA512 cfbad36b1805ad76cb21d9136843171d794e57383318a014522e2d35905cf262d6721615f0a79972cacc45152de636977c957cbbad08ccb52f96de40b09bba5c
+DIST bash51-001 2894 BLAKE2B 7918eb48d4afe91a167eed666f0d15ca220e002d824cfc5ebb753430144a8bf884e8895e6d050158153e08c115fb0b90659608ed98b18aec737e75b5e61098f3 SHA512 1cd86805a2639614372aec29a710bc456e330abcbbaa0867820c94f714a1fa5fb5c1b18aa2c10263ae0bce9dad7579c7af2f732282315c1c34bfd6a90777bfd2
+DIST bash51-002 1575 BLAKE2B 70336d2ef04c63fa29a625a2719c0b36f7e34818cadbb4b09e1434d72d6695dd882c758a00f2ea48f38d3918abc15f494780825b7d2f7cfc6c747a3be89ac497 SHA512 923e7822a9629645347d3aea0058fb5e2d52223507159a62369309f264612df44a84931c19e0ccb3852e98ce672dfbd454477090b4041b5a0de477c94eb61088
+DIST bash51-003 1800 BLAKE2B 6dd284666273016d3b9007537502d75ad7c4e1347c3a13dcdab2325e4f191a149180ee86f9904fc96291ed8217e1d26dcd2b8b20c283ea616f322dbd293d1998 SHA512 01e952dcfdae58624723d64912ea3444eed2fdcd266ba1a929b95ec3abd70f914bf400607c3f7bb7a94ac2925f794f91f37c1929d5bb987de2ba7f60a19cb8bd
+DIST bash51-004 3745 BLAKE2B dbbe2713c1cc4aa6de99366c1d91e136d1a7a86ac11108e8dd1aea3823ba0f9e005f48f1507acd1f86ce2f3c2f4ac60ae04ff066e5587229e7f19aefbe4d6e39 SHA512 10ff24cd91a2cd88818bfa7218050843af6b409e43fcca89f5ec70d8266020c6c2a55132426271f165cd0f154f49eb0f8ec2761b80fc066c921b83120bb543ce
diff --git a/app-shells/bash/bash-5.1_p4.ebuild b/app-shells/bash/bash-5.1_p4.ebuild
new file mode 100644
index 000000000000..b99647b1aed7
--- /dev/null
+++ b/app-shells/bash/bash-5.1_p4.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multilib prefix
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+is_release() {
+ case ${PV} in
+ *_alpha*|*_beta*|*_rc*) return 1 ;;
+ *) return 0 ;;
+ esac
+}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+ local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+ [[ ${plevel} -eq 0 ]] && return 1
+ eval set -- {1..${plevel}}
+ set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+ if [[ ${opt} == -s ]] ; then
+ echo "${@/#/${DISTDIR}/}"
+ else
+ local u
+ for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+ printf "${u}/${pn}-${pv}-patches/%s " "$@"
+ done
+ fi
+}
+
+# The version of readline this bash normally ships with.
+READLINE_VER="8.1"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
+if is_release ; then
+ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+else
+ SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ "${PV}" == *_rc* ]] || \
+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"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+ >=sys-libs/ncurses-5.2-r2:0=
+ nls? ( virtual/libintl )
+ readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+"
+RDEPEND="
+ ${DEPEND}
+"
+# we only need yacc when the .y files get patched (bash42-005)
+#BDEPEND="virtual/yacc"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ # Patches from Chet sent to bashbug ml
+ "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+)
+
+pkg_setup() {
+ if is-flag -malign-double ; then #7332
+ eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
+ eerror "as it breaks LFS (struct stat64) on x86."
+ die "remove -malign-double from your CFLAGS mr ricer"
+ fi
+ if use bashlogger ; then
+ ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+ ewarn "This will log ALL output you enter into the shell, you have been warned."
+ fi
+}
+
+src_unpack() {
+ unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+ # Include official patches
+ [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+
+ # Clean out local libs so we know we use system ones w/releases.
+ if is_release ; then
+ rm -rf lib/{readline,termcap}/* || die
+ touch lib/{readline,termcap}/Makefile.in || die # for config.status
+ sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
+ fi
+
+ # Prefixify hardcoded path names. No-op for non-prefix.
+ hprefixify pathnames.h.in
+
+ # Avoid regenerating docs after patches #407985
+ sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+ touch -r . doc/* || die
+
+ eapply -p0 "${PATCHES[@]}"
+ eapply_user
+}
+
+src_configure() {
+ local myconf=(
+ --disable-profiling
+ --with-curses
+ $(use_enable mem-scramble)
+ $(use_enable net net-redirections)
+ $(use_enable readline)
+ $(use_enable readline bang-history)
+ $(use_enable readline history)
+ $(use_with afs)
+ $(use_with mem-scramble bash-malloc)
+ )
+
+ # For descriptions of these, see config-top.h
+ # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+ append-cppflags \
+ -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+ -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+ -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+ -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+ -DNON_INTERACTIVE_LOGIN_SHELLS \
+ -DSSH_SOURCE_BASHRC \
+ $(use bashlogger && echo -DSYSLOG_HISTORY)
+
+ # Don't even think about building this statically without
+ # reading Bug 7714 first. If you still build it statically,
+ # don't come crying to us with bugs ;).
+ #use static && export LDFLAGS="${LDFLAGS} -static"
+ use nls || myconf+=( --disable-nls )
+
+ # Historically, we always used the builtin readline, but since
+ # our handling of SONAME upgrades has gotten much more stable
+ # in the PM (and the readline ebuild itself preserves the old
+ # libs during upgrades), linking against the system copy should
+ # be safe.
+ # Exact cached version here doesn't really matter as long as it
+ # is at least what's in the DEPEND up above.
+ export ac_cv_rl_version=${READLINE_VER%%_*}
+
+ # Force linking with system curses ... the bundled termcap lib
+ # sucks bad compared to ncurses. For the most part, ncurses
+ # is here because readline needs it. But bash itself calls
+ # ncurses in one or two small places :(.
+
+ if is_release ; then
+ # Use system readline only with released versions.
+ myconf+=( --with-installed-readline=. )
+ fi
+
+ if use plugins; then
+ append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+ else
+ # Disable the plugins logic by hand since bash doesn't
+ # provide a way of doing it.
+ export ac_cv_func_dl{close,open,sym}=no \
+ ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+ sed -i \
+ -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+ configure || die
+ fi
+ tc-export AR #444070
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ emake
+
+ if use plugins ; then
+ emake -C examples/loadables all others
+ fi
+}
+
+src_install() {
+ local d f
+
+ default
+
+ dodir /bin
+ mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+ dosym bash /bin/rbash
+
+ insinto /etc/bash
+ doins "${FILESDIR}"/bash_logout
+ doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+ keepdir /etc/bash/bashrc.d
+ insinto /etc/skel
+ for f in bash{_logout,_profile,rc} ; do
+ newins "${FILESDIR}"/dot-${f} .${f}
+ done
+
+ local sed_args=(
+ -e "s:#${USERLAND}#@::"
+ -e '/#@/d'
+ )
+ if ! use readline ; then
+ sed_args+=( #432338
+ -e '/^shopt -s histappend/s:^:#:'
+ -e 's:use_color=true:use_color=false:'
+ )
+ fi
+ sed -i \
+ "${sed_args[@]}" \
+ "${ED}"/etc/skel/.bashrc \
+ "${ED}"/etc/bash/bashrc || die
+
+ if use plugins ; then
+ exeinto /usr/$(get_libdir)/bash
+ doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+ insinto /usr/include/bash-plugins
+ doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+ fi
+
+ if use examples ; then
+ for d in examples/{functions,misc,scripts,startup-files} ; do
+ exeinto /usr/share/doc/${PF}/${d}
+ docinto ${d}
+ for f in ${d}/* ; do
+ if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+ doexe ${f}
+ else
+ dodoc ${f}
+ fi
+ done
+ done
+ fi
+
+ doman doc/*.1
+ newdoc CWRU/changelog ChangeLog
+ dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+ if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+ mkdir -p "${EROOT}"/etc/bash
+ mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+ fi
+
+ if [[ -L ${EROOT}/bin/sh ]] ; then
+ # rewrite the symlink to ensure that its mtime changes. having /bin/sh
+ # missing even temporarily causes a fatal error with paludis.
+ local target=$(readlink "${EROOT}"/bin/sh)
+ local tmp="${T}"/sh
+ ln -sf "${target}" "${tmp}"
+ mv -f "${tmp}" "${EROOT}"/bin/sh
+ fi
+}
+
+pkg_postinst() {
+ # If /bin/sh does not exist, provide it
+ if [[ ! -e ${EROOT}/bin/sh ]] ; then
+ ln -sf bash "${EROOT}"/bin/sh
+ fi
+}
diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.2.ebuild
index ea4ee62b3c0a..1299af651db8 100644
--- a/app-shells/dash/dash-0.5.11.2.ebuild
+++ b/app-shells/dash/dash-0.5.11.2.ebuild
@@ -40,6 +40,10 @@ src_configure() {
# if your headers strictly adhere to POSIX, you'll need this too
[[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255
fi
+ if [[ ${CHOST} == powerpc-*-darwin* ]] ; then
+ sed -i -e 's/= stpncpy(s, \([^,]\+\), \([0-9]\+\))/+= snprintf(s, \2, "%s", \1)/' \
+ src/jobs.c || die
+ fi
append-cppflags -DJOBS=$(usex libedit 1 0)
use static && append-ldflags -static
# Do not pass --enable-glob due to #443552.
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 486ed522e9b3..c6452834eced 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/an/an-1.2_p6.ebuild b/app-text/an/an-1.2_p6.ebuild
index ec08966bef24..3f1f44b3d2bd 100644
--- a/app-text/an/an-1.2_p6.ebuild
+++ b/app-text/an/an-1.2_p6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
RDEPEND="
dev-libs/icu:=
diff --git a/app-text/diction/diction-1.14.ebuild b/app-text/diction/diction-1.14.ebuild
index 9f39fa67f731..10e5903d6fa5 100644
--- a/app-text/diction/diction-1.14.ebuild
+++ b/app-text/diction/diction-1.14.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.moria.de/~michael/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
DEPEND="
sys-devel/gettext
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
index f67b00a8c3e4..ba58a5e516b1 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE=""
DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/dvipng/dvipng-1.17.ebuild b/app-text/dvipng/dvipng-1.17.ebuild
index 8143ed496cef..74c622e5e726 100644
--- a/app-text/dvipng/dvipng-1.17.ebuild
+++ b/app-text/dvipng/dvipng-1.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-3+ Texinfo-manual"
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 ~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 ~x86-solaris"
IUSE="truetype test"
RESTRICT="!test? ( test )"
diff --git a/app-text/epspdf/epspdf-0.6.3-r1.ebuild b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
index be2423a84ddc..3343af326070 100644
--- a/app-text/epspdf/epspdf-0.6.3-r1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 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 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc tk"
DEPEND="sys-apps/texinfo"
diff --git a/app-text/epstool/epstool-3.09.ebuild b/app-text/epstool/epstool-3.09.ebuild
index 7e62a5baddfd..135a57a851c7 100644
--- a/app-text/epstool/epstool-3.09.ebuild
+++ b/app-text/epstool/epstool-3.09.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ghostgum.com.au/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
DEPEND="app-text/ghostscript-gpl"
RDEPEND="${DEPEND}"
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
index 9c8118074706..146d905ec865 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="AGPL-3 CPL-1.0"
SLOT="0"
-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"
+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"
IUSE="cups dbus gtk l10n_de static-libs unicode X"
LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index a1c7fbf09305..5234dbe74303 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,2 +1,2 @@
-DIST gspell-1.6.1.tar.xz 416704 BLAKE2B 2a180bc52d3f09813d8de362e5bf900f831663c09530c8a9b993baf55f852a3939447a71c9c9dc0caafba7e8b74a2a5aad4443cf248eb87da4e15e0481e74262 SHA512 f1ffbd0d23d9743bcf924c25b3a3d7bf93c6a5e4ea5e362fb7300f657d8c1d0117e847f3dec29de377947f850e003b24a3231e88e99b313c955dd94ce358c23e
DIST gspell-1.8.3.tar.xz 421468 BLAKE2B 70a8c0649a9f1f0d5e1bbc170734c6ce7aeb4875ed1cca52c4c582688c56553ad2363b9fed732c504f3ff6bc33d994fc4ba12cd3754e4f3b602be2a2015144df SHA512 4116231fdfb416e70ee34c73e0ecf81f0071e81ad477135e3c1e270534dfe4be20c7f45e316e13d33c79944d282ed3223251122983a0f3199ea57c3431a24c1d
+DIST gspell-1.8.4.tar.xz 424356 BLAKE2B 031787c4f5c3f3cfe21d5f74ec72117818da43313c5e6dffb79581ca07033aede2ecf236ffdf2197938d62727c5bd3913d1362e02be7109b0d498304949e1d44 SHA512 adb481590442d81040151746c7747791d76248b1b35af1702dc5389efbd2e0c6bdda070b8e84384d22f4922b5a382ac2c6519e425f417ec85c8efbe22dc38c82
diff --git a/app-text/gspell/gspell-1.6.1.ebuild b/app-text/gspell/gspell-1.8.4.ebuild
similarity index 55%
rename from app-text/gspell/gspell-1.6.1.ebuild
rename to app-text/gspell/gspell-1.8.4.ebuild
index 108a5813d325..70eb544cba3a 100644
--- a/app-text/gspell/gspell-1.6.1.ebuild
+++ b/app-text/gspell/gspell-1.8.4.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="6"
@@ -10,15 +10,15 @@ DESCRIPTION="Spell check library for GTK+ applications"
HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
LICENSE="LGPL-2.1+"
-SLOT="0/1" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
+SLOT="0/2" # subslot = libgspell-1 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="+introspection +vala"
REQUIRED_USE="vala? ( introspection )"
RDEPEND="
app-text/iso-codes
- >=app-text/enchant-1.6.0:0/0
+ >=app-text/enchant-2.1.3:2
>=dev-libs/glib-2.44:2
>=x11-libs/gtk+-3.20:3[introspection?]
introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
@@ -27,10 +27,16 @@ DEPEND="${RDEPEND}
dev-libs/libxml2:2
dev-util/glib-utils
>=dev-util/gtk-doc-am-1.25
- >=sys-devel/gettext-0.19.4
+ >=sys-devel/gettext-0.19.6
virtual/pkgconfig
vala? ( $(vala_depend) )
+ test? ( app-text/enchant:2[hunspell]
+ || ( app-dicts/myspell-en[l10n_en(+)] app-dicts/myspell-en[l10n_en-US(+)] ) )
"
+# Tests require a en_US dictionary and fail with deprecated enchant aspell backend:
+# So enchant[hunspell] + myspell-en ensure they pass (hunspell is ordered before aspell),
+# however a different backend like hspell or nuspell + their en_US dict might be fine too,
+# but we don't support them at this time (2020-04-12) in enchant:2
src_prepare() {
use vala && vala_src_prepare
diff --git a/app-text/highlight/highlight-3.57-r1.ebuild b/app-text/highlight/highlight-3.57-r1.ebuild
index 1c4edc578e8c..971c9675c1b5 100644
--- a/app-text/highlight/highlight-3.57-r1.ebuild
+++ b/app-text/highlight/highlight-3.57-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="examples qt5"
RDEPEND="
diff --git a/app-text/mandoc/mandoc-1.14.5-r1.ebuild b/app-text/mandoc/mandoc-1.14.5-r1.ebuild
index e775602af4b0..c6058c164364 100644
--- a/app-text/mandoc/mandoc-1.14.5-r1.ebuild
+++ b/app-text/mandoc/mandoc-1.14.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="cgi system-man"
RDEPEND="sys-libs/zlib
diff --git a/app-text/tree/tree-1.8.0.ebuild b/app-text/tree/tree-1.8.0.ebuild
index b862f8493c38..42842fb57b01 100644
--- a/app-text/tree/tree-1.8.0.ebuild
+++ b/app-text/tree/tree-1.8.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
LICENSE="GPL-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=""
diff --git a/app-text/txt2man/txt2man-1.7.1.ebuild b/app-text/txt2man/txt2man-1.7.1.ebuild
index 8d30b3b96749..f06ad0f6aa3c 100644
--- a/app-text/txt2man/txt2man-1.7.1.ebuild
+++ b/app-text/txt2man/txt2man-1.7.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mvertes/txt2man/archive/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE=""
RDEPEND="app-shells/bash
diff --git a/app-text/txt2tags/Manifest b/app-text/txt2tags/Manifest
index 84b7e8ae19d8..9cd951b4e07b 100644
--- a/app-text/txt2tags/Manifest
+++ b/app-text/txt2tags/Manifest
@@ -1,2 +1 @@
-DIST txt2tags-3.3.tar.gz 261417 BLAKE2B 6070c23faafc9283e48efdab165c9a0050703d5d04a5ce557afc693161af5e1105435ddb9c991c0e8ef5dbd1e6d25f77c915e8be3f349b790636c904df7553f3 SHA512 a52de3f5226d85af006304a9063b5dd01df2627a45670a91b954f758cb920648f86699acab5cd7822c0183e93eed110ddc7dd8d156b0eccbe1541e7fbc2bdb22
DIST txt2tags-3.7.tar.gz 248392 BLAKE2B cad49f9815f2e8e466a0fa83715eee27c16cc67fac4c0c55324a3ebc22707857a4bb59176b62fbc1a922c465f60dbc6a057b326789f82a9a9b4babb7b8041486 SHA512 70f6b72b9555b881149e29581a200bf5195d740ca134fffb9faab3a8a04909173f40fe7758659bde44efa9aa50e9816e7164d8164f84b2046de500a49906072b
diff --git a/app-text/txt2tags/txt2tags-3.3.ebuild b/app-text/txt2tags/txt2tags-3.3.ebuild
deleted file mode 100644
index 83374fa38499..000000000000
--- a/app-text/txt2tags/txt2tags-3.3.ebuild
+++ /dev/null
@@ -1,17 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Generate marked up documents (HTML, etc.)from a plain text file with markup"
-HOMEPAGE="https://txt2tags.org"
-SRC_URI="https://github.com/jendrikseipp/txt2tags/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
diff --git a/app-text/txt2tags/txt2tags-3.7.ebuild b/app-text/txt2tags/txt2tags-3.7.ebuild
index 0ef8f7c72887..b29495dda13b 100644
--- a/app-text/txt2tags/txt2tags-3.7.ebuild
+++ b/app-text/txt2tags/txt2tags-3.7.ebuild
@@ -14,4 +14,4 @@ SRC_URI="https://codeload.github.com/txt2tags/txt2tags/tar.gz/${PV} -> ${P}.tar.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
index f8235bcf109d..e16047fa8605 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
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"
+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"
IUSE="experimental test"
RESTRICT="!test? ( test )"
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
index 83c8e4a568f5..f491cc889022 100644
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@@ -1,2 +1 @@
-DIST zathura-djvu-0.2.8.tar.xz 8860 BLAKE2B ea6eb70d7350ea388043c9ceb8ef8602030d17e4dabc353ac7346ba11c2d8f105bd235eee90823818fc1d4d5a9ca16755bb56a1e1b8aa633a79802ca2c3e92f2 SHA512 ec51d339a01e7f2d063d21ab0e32624770398a21727fe6714b8fa8f9a1ef46909d58fa26c4a50430234f04377cce076312ebefb8a6cbdc28ba5de1c205d944a9
DIST zathura-djvu-0.2.9.tar.xz 8976 BLAKE2B f0a798e9473ad2d09bdf171f4689231d73fa1e1bbaa0faa750feb82db2e2b029a86bf759e642f92c0ba438ee88b9178969e5d2aec4f30d9cb049bd3bcd69639e SHA512 3c2815e7f1cdfb9fc594dc6ad65359245f322e5fa27f018fb9431747e4d474734f5efd134aaeb9dabde09b01de603b1d1dc7aede883b1ef81266e067b0490726
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild
deleted file mode 100644
index 2a891acd222b..000000000000
--- a/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils meson xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
- EGIT_BRANCH="develop"
-else
- KEYWORDS="amd64 arm x86"
- SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
-fi
-
-DESCRIPTION="DjVu plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-djvu/"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-RDEPEND="app-text/djvu
- >=app-text/zathura-0.3.9
- dev-libs/girara
- dev-libs/glib:2
- x11-libs/cairo"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
index 7262f7ee1caf..b5a67f6e3010 100644
--- a/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
EGIT_BRANCH="develop"
else
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 arm x86"
SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
fi
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index ebe7bc681d8e..bf3152236884 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild b/dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild
index cdf3a111f176..015fa6c96c75 100644
--- a/dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild
+++ b/dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
IUSE="debug"
DEPEND="
diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild
deleted file mode 100644
index 0f8a8f23a825..000000000000
--- a/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P=${P/lib/}
-
-DESCRIPTION="A portable C++ preprocessor"
-HOMEPAGE="http://mcpp.sourceforge.net"
-SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --enable-mcpplib \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- if ! use static-libs; then
- find "${D}" -name '*.la' -delete || die
- fi
-}
diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild
index 69aa40621369..d22a2e028a4e 100644
--- a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild
+++ b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos"
IUSE="static-libs"
S=${WORKDIR}/${MY_P}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 207e71f8417d..1fcd9be7683d 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 64ead6b9598a..4cbfcbe57a24 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -3,7 +3,7 @@ DIST mysql-5.7.31-patches-01.tar.xz 6664 BLAKE2B 8225f286f0090653f9714545daa95cc
DIST mysql-5.7.32-patches-01.tar.xz 6660 BLAKE2B 5c63158615398bdcc4480a0e1b058f491b39ffc7ee33767b425f3b254555411031f64d865e1924afe8aa3926e4cba18049f1219a0a8acc702bc5e011c94fa947 SHA512 bf5e0d27af81e599005268ee243af4cd93f6df95c32cccb268a749322b4e5f73a2ce5d51f0ad1b0e1f2cf4702b8a05e4b2e0b73110fd4aac61f2a0f51bf4952e
DIST mysql-8.0.20-patches-01.tar.xz 7176 BLAKE2B 2fc51986c0a4da60521d0e64b9f8705caf8ec3869af930c9729359c3710059fc78aae176523fdf17d10173b404431f31f9bb23ee5c82fba7cbbb4cb39881c005 SHA512 bf8211cf3873f8672b9d3d1dc42b68a1c635690ffdc2d3393eafa83f060ada9f2eaa63f859bf8eecc24976a733d8c7c3b9632ac70f28b5facf48eae921c7ceeb
DIST mysql-8.0.21-patches-01.tar.xz 7212 BLAKE2B 2f1b38b3f84a124e3636cb726f3fcef82d71d933e90429dc78be44afeb4f456a37104359c5fd58ab50f0c03c1698e6c79f9b1e07640f0411c0024f558b4e9595 SHA512 3edcbb529b0623adaed30150d88c9b54d1a3e402faf5c7cff4ed626bbf4e5f50838d8f3c79bd2173439d748ded13412ff7fe37e3742c55879ff28907b9eb5660
-DIST mysql-8.0.22-patches-01.tar.xz 7176 BLAKE2B d793aefb0753bfdc04ae22f6f23e49755658c22bb749df3ba5cb5fad2296729600e209638be23e193aa0aaa114080be939e53e3e9aee45bde610eb17f0439211 SHA512 3606a5cd016a49bbbef008f5d0d0a98df44f523bfacf93cfd4e75f279b14329664241cc3cf63894fb24446a0eb1d51623b1267a5488dd3f7ea7990e9a18bf312
+DIST mysql-8.0.22-patches-02.tar.xz 7580 BLAKE2B a50704c3c58b1f67ca86edb233544137927b0ae5fdf302687b48f6fd30fbbd26798e8ef8282662586b25a7240b47278b44f944a8ca59f1a198bc228dd74459c9 SHA512 59f864452e9fdebe4d3990eff8b756e9bbfad58da216b74fa8b7e8391cb0d9d543ca2828591b9ed1ee276c1dec9e1851a8c2683507f0a326c85054e31cc3f950
DIST mysql-boost-5.7.27.tar.gz 51436383 BLAKE2B 6db64ab5fa659aae9baa3725a0de9465e48c37618ffd69f34809880c06a00ce55dce77f507810c6fa52d86901facfa42d3d1bd8db1914a779fbc88a69be82497 SHA512 573f4555f3d62bcd3dc2228bcfba023518d462bb6689114a3505ccf7c7c3061d2775a8e7a37ec3c8b9dea6e8fbc56ba599610f237abc38cedff58e75799bdc52
DIST mysql-boost-5.7.29.tar.gz 51417554 BLAKE2B 652ce9f99419387e9bcc37afeb1b46438784752e963c3aa1877f17650c31d8b058b4052da97c3a7e9454e758c259d6c311e0518f9a75909fce9741150b82164c SHA512 38acf7c2a10b20c59230ad05cd2cd6996c4c582233c1be573ead08e5c6684275790da07a036570363f89b4d61547b306589b0b98ed5fca70723a3f2cbc21fe11
DIST mysql-boost-5.7.30.tar.gz 51363998 BLAKE2B 7897ad74b685c3b30e7ecdf132fdfa72f3416c05e8d0086cb8f7674b6c4f377fff9abc51ed258cc4dfeab50a2cb393af9076d9c1f9a83a26521facbaf223afa1 SHA512 b75d41d0c72d16c6f8d5393dab6e476b7993d296eb5683c12417ce2da3db2052fdab2a152f6e7c545315d21bfa35f26a247cb6cdab83d3418b5d34ed7f5f9560
diff --git a/dev-db/mysql/mysql-8.0.22.ebuild b/dev-db/mysql/mysql-8.0.22.ebuild
index 721ce231c3a6..ccd6ddc59fa0 100644
--- a/dev-db/mysql/mysql-8.0.22.ebuild
+++ b/dev-db/mysql/mysql-8.0.22.ebuild
@@ -12,7 +12,7 @@ MY_PV="${PV//_pre*}"
MY_P="${PN}-${MY_PV}"
# Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/mysql/${PN}-8.0.22-patches-01.tar.xz"
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/mysql/${PN}-8.0.22-patches-02.tar.xz"
SRC_URI="https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-${MY_PV}.tar.gz
https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-${MY_PV}.tar.gz
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index ebe13c616cfe..ef3eea1e4ea0 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -1,11 +1,6 @@
-DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
-DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c24fb745779d1059b73f19f7e52b33b645adfe72b0296c5e098e5cdb3b9f5eddd382374f33fbcd2ad5739287b2206 SHA512 7f2ea9636baf0210e8ed1d21ee798efb6ce23c0710ff8228b285e2214f82193bcd2d912fd435929c554289a59101c7be2e27ce798f93833f307976f0dd070b49
DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
-DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8
-DIST percona-server-5.7.27-30.tar.gz 84672298 BLAKE2B 8431d231f602b704195868110e8eb73adb3db7c761906c15eff182e54634ef091a3ffa0d4f3498a93dbfbf65cd5cdd12102871abaaaa0f32378ba3068d083b2b SHA512 d62c66de3128df87dce52292ad1671e01fe2c923e668ef0faf9cb663c11c9cd0b976345aea1de6ea2bc458d0e1066b42c022849e422121d96cea082ed12c8f4b
-DIST percona-server-8.0.19-10.tar.gz 490703179 BLAKE2B 731e9498c4934eb53451c202e8b1de93618190d9b6334b761428ab223756d515d958db77515517e6b5db3ba6cd908c8b238c18b63f4c73b256ec251f8b161ff3 SHA512 39aa805474c6655980e70c97e0d2c0f21ae16e2c1e2e9c7e1d615f46320f1615620368fbdfc24f5d1784aae856090856c3ccda3d6f09ed86c6c9ffe3197be90e
-DIST percona-server-8.0.19.10-patches-01.tar.xz 8288 BLAKE2B 2f79c538ac1512b052210439a27b71491917cb9eab08ac3a3b21c188458c2989f0c998d973b8dd654a7d7606acd70ccf374f1e2f5e0088d0c6b96a794dc4c4a5 SHA512 43313797ec405be82f15745185bfab25fda093045f981a8caa8a019522e432415e4b3cca4ca5ffb735d102f98b3c2fccafccbd4695bd2d1f011707f709fcc2b3
-DIST percona-server-8.0.20-11.tar.gz 494288758 BLAKE2B 202f0cbd7395a6b8ae367ed96d1b6d2c6ae2a56ba6d85e8aad55a6b36a6966a0c3285836dc829e1583a46e28fd2903540e520f6347b1e8c18d99b08f58daef8b SHA512 cf8aa999bd0205bded526838246d023eae5dfadeec1aaf0be99565def5a1cdcc8041bcff90ba6a49f5e903e4f436d416181a9f134555d5c71b7cf44d2ba58a6d
-DIST percona-server-8.0.20.11-patches-02.tar.xz 8876 BLAKE2B 34cb3cd0c6d6fb8b2fca98efa53e6e163e4f6b251f629e40169018c328da5319a77ecceec92c925019d13a4ba2dba8c96a23dccf8ba8a3aa95452d4dc9278ffa SHA512 372885f22e7e37bcd63f382d4b064d99b6f826cd2d053148fcdfa1c7f062f51531d5366c198976797f9a3349539e59f5ba96187dc79fdf00365c618b0f83b7c2
+DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
DIST percona-server-8.0.21-12.tar.gz 522004727 BLAKE2B bc6bf77d862a4827839d1942f58e4124f4692abfa9298eaa7cebdaaa7a6cff036247edda51d9cbb878b0e79858e54cbe5326bc30479b1d5977a655240df438fd SHA512 66076a6774cf18af1111b83aa8977a55e1a2d634c30e190d3bd8e82ba079fb772ac2a2402356be0b79677b54ca0b24c441d87444b68d1e66cd298ca6a0108d31
-DIST percona-server-8.0.21.12-patches-01.tar.xz 8916 BLAKE2B 3a40f63383ad0c63830056b15453a0e7429f2507e8205cca660aaf6787c9d6ed9e741df8d09fc887fe07b82f86e7aa53730b3aa97788421ed4dde3e83c992c01 SHA512 f7599293dced8ea2bc98d88e8dfc4f20288974fecfe481f446b071c1d393119c22317819fcc054bf9cdd4c557044332d450ffc99b3a14c91b51a4c0b6c1c0896
+DIST percona-server-8.0.21.12-patches-02.tar.xz 9276 BLAKE2B 97aa38dedcd1c09e88d2b17c462da8adbf1defbe1596abbc33eeca1ef1f14e3a2acddeca82da04e7c4d3a4c0dec70c53ee39d1011ba86c836492a2f8599a6732 SHA512 e7876088778a6190c0f0dbfbc44d5794c2d0903a2303bbb913fc1d4d7f462000108e33d3e764399c9fedbaa5b642004243316505f4a6f0566e1b250a9faded14
+DIST percona-server-8.0.22-13.tar.gz 530806570 BLAKE2B 256e5afa2e3908617c41ffcab591ccdbfd932a8ba3ce25fbf2a0be2cdfa80991b0c2d090c11ffae64e4bb3d8cf9f3011b70974ab22cbab023f6625ac422f3c73 SHA512 9b7a1d06885eb4412361bb3920adc9f050f8da95584eb910c97c8877a433ead04d02f2908e5e9648b1d79cdba677727fdb745377feac3c958339588d5f0cdf2b
+DIST percona-server-8.0.22.13-patches-01.tar.xz 9236 BLAKE2B d75d32782902d5d095389c8f79587b196e65508223503616d92304a2cb09520959adca04eac96fd4501cccf46ca684702b55c7a0327e6c3477b68245fe96e82b SHA512 e884d8bbd31f6df7f3a585feb970f82f78484a90404c40dc3e5daf46c3836a59c6bcef34fd8a3e9191a12820ba7ae441d53a7c010256dd0296e7eeb00313d6a0
diff --git a/dev-db/percona-server/files/my.cnf-5.7 b/dev-db/percona-server/files/my.cnf-5.7
deleted file mode 100644
index 571ebf07a76e..000000000000
--- a/dev-db/percona-server/files/my.cnf-5.7
+++ /dev/null
@@ -1,3 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-
-!includedir @GENTOO_PORTAGE_EPREFIX@/etc/mysql/mysql.d
diff --git a/dev-db/percona-server/metadata.xml b/dev-db/percona-server/metadata.xml
index f282af308762..4b72b897bda7 100644
--- a/dev-db/percona-server/metadata.xml
+++ b/dev-db/percona-server/metadata.xml
@@ -7,8 +7,6 @@
diff --git a/dev-db/percona-server/percona-server-5.7.27.30-r1.ebuild b/dev-db/percona-server/percona-server-5.7.27.30-r1.ebuild
deleted file mode 100644
index 86283b34ba4b..000000000000
--- a/dev-db/percona-server/percona-server-5.7.27.30-r1.ebuild
+++ /dev/null
@@ -1,1136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20190822-1908Z"
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-# Python2 required for innodb_stress.innodb_stress{,_blob,_crash} test
-PYTHON_COMPAT=( python2_7 )
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-
-inherit eapi7-ver cmake-utils eutils flag-o-matic linux-info \
- prefix python-any-r1 toolchain-funcs multilib-minimal
-
-MY_PV=$(ver_rs 3 '-')
-MY_PN="Percona-Server"
-MY_P="${PN}-${MY_PV}"
-MY_MAJOR_PV=$(ver_cut 1-2)
-MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/5.7/release-notes/release-notes_index.html"
-
-SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
- mirror://sourceforge/boost/boost_1_59_0.tar.gz
-"
-
-# Gentoo patches to MySQL
-if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]] ; then
- SRC_URI="${SRC_URI}
- mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
- https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-fi
-
-HOMEPAGE="https://www.percona.com/software/mysql-database/percona-server"
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-LICENSE="GPL-2"
-SLOT="5.7/18"
-IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa pam +perl profiling rocksdb
- selinux +server static static-libs systemtap tcmalloc test tokudb tokudb-backup-plugin yassl"
-
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
-
-REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git"
- EGIT_CHECKOUT_DIR="${WORKDIR}/mysql-extras"
- EGIT_CLONE_TYPE=shallow
- MY_PATCH_DIR="${WORKDIR}/mysql-extras"
-else
- MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-fi
-
-PATCHES=(
- "${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.7.patch
- "${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
- "${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
- "${MY_PATCH_DIR}"/20018_all_percona-server-5.7.26-without-clientlibs-tools.patch
- "${MY_PATCH_DIR}"/20018_all_percona-server-5.7.25-fix-libressl-support.patch
- "${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-add-missing-gcc-8-fix.patch
- "${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch
- "${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-round-off-test-values-for-same-output-on-all-architectures.patch
- "${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-mips-ASM.patch
- "${MY_PATCH_DIR}"/20018_all_percona-server-5.7.23-rocksdb-use-system-libs.patch
-)
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-# MULTILIB_USEDEP only set for libraries used by the client library
-COMMON_DEPEND="net-misc/curl:=
- >=sys-apps/sed-4
- >=sys-apps/texinfo-4.7-r1
- sys-libs/ncurses:0=
- client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] )
- !client-libs? (
- dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?]
- >=sys-libs/zlib-1.2.3:0=
- )
- jemalloc? ( dev-libs/jemalloc:0= )
- kernel_linux? (
- dev-libs/libaio:0=
- sys-process/procps:0=
- )
- server? (
- >=app-arch/lz4-0_p131:=
- cjk? ( app-text/mecab:= )
- experimental? (
- dev-libs/libevent:=
- dev-libs/protobuf:=
- net-libs/libtirpc:=
- )
- numa? ( sys-process/numactl )
- pam? ( sys-libs/pam:0= )
- rocksdb? (
- app-arch/zstd:=
- dev-libs/protobuf:=
- )
- tokudb? (
- app-arch/snappy:=
- app-arch/xz-utils:=
- )
- tokudb-backup-plugin? ( dev-util/valgrind )
- )
- systemtap? ( >=dev-util/systemtap-1.3:0= )
- tcmalloc? ( dev-util/google-perftools:0= )
- !yassl? (
- client-libs? (
- !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
- )
- !client-libs? (
- !libressl? ( >=dev-libs/openssl-1.0.0:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- )
-"
-DEPEND="${COMMON_DEPEND}
- || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- dev-libs/protobuf
- virtual/yacc
- server? (
- dev-libs/libevent
- experimental? ( net-libs/rpcsvc-proto )
- )
- static? ( sys-libs/ncurses[static-libs] )
- test? (
- acct-group/mysql acct-user/mysql
- dev-perl/JSON
- || (
- $(python_gen_any_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]')
- $(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]')
- )
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster
- !dev-db/percona-server:0
- !dev-db/percona-server:8.0
- client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= )
- selinux? ( sec-policy/selinux-mysql )
- server? (
- !prefix? (
- acct-group/mysql acct-user/mysql
- dev-db/mysql-init-scripts
- )
- )
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-python_check_deps() {
- has_version "dev-python/mysqlclient[${PYTHON_USEDEP}]" \
- || has_version "dev-python/mysql-python[${PYTHON_USEDEP}]"
-}
-
-mysql_init_vars() {
- MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
- MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
- MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
- MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-
- if [[ -z "${MY_DATADIR}" ]] ; then
- MY_DATADIR=""
- if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
- MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
- | sed -ne '/datadir/s|^--datadir=||p' \
- | tail -n1`
- if [[ -z "${MY_DATADIR}" ]] ; then
- MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
- | sed -e 's/.*=\s*//' \
- | tail -n1`
- fi
- fi
- if [[ -z "${MY_DATADIR}" ]] ; then
- MY_DATADIR="${MY_LOCALSTATEDIR}"
- einfo "Using default MY_DATADIR"
- fi
- elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
- if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
- if [[ -e "${MY_DATADIR}" ]] ; then
- # If you get this and you're wondering about it, see bug #207636
- elog "MySQL datadir found in ${MY_DATADIR}"
- elog "A new one will not be created."
- PREVIOUS_DATADIR="yes"
- else
- PREVIOUS_DATADIR="no"
- fi
- export PREVIOUS_DATADIR
- fi
- else
- if [[ ${EBUILD_PHASE} == "config" ]] ; then
- local new_MY_DATADIR
- new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
- | sed -ne '/datadir/s|^--datadir=||p' \
- | tail -n1`
-
- if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]] ; then
- ewarn "MySQL MY_DATADIR has changed"
- ewarn "from ${MY_DATADIR}"
- ewarn "to ${new_MY_DATADIR}"
- MY_DATADIR="${new_MY_DATADIR}"
- fi
- fi
- fi
-
- export MY_SHAREDSTATEDIR MY_SYSCONFDIR
- export MY_LOCALSTATEDIR MY_LOGDIR
- export MY_DATADIR
-}
-
-pkg_pretend() {
- if use numa ; then
- local CONFIG_CHECK="~NUMA"
-
- local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
- WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
-
- check_extra_config
- fi
-}
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != binary ]] ; then
- local GCC_MAJOR_SET=$(gcc-major-version)
- local GCC_MINOR_SET=$(gcc-minor-version)
- # Bug 565584: InnoDB now requires atomic functions introduced with gcc-4.7 on
- # non x86{,_64} arches
- if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
- ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
- eerror "${PN} needs to be built with gcc-4.7 or later."
- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
- die
- fi
-
- use test && python-any-r1_pkg_setup
- fi
-
- if has test ${FEATURES} && \
- use server && ! has userpriv ${FEATURES} ; then
- eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
- fi
-}
-
-pkg_preinst() {
- # Here we need to see if the implementation switched client libraries
- # We check if this is a new instance of the package and a client library already exists
- local SHOW_ABI_MESSAGE libpath
- if use client-libs && [[ -z ${REPLACING_VERSIONS} && -e "${EROOT%/}/usr/$(get_libdir)/libperconaserverclient.so" ]] ; then
- libpath=$(readlink "${EROOT%/}/usr/$(get_libdir)/libperconaserverclient.so")
- elog "Due to ABI changes when switching between different client libraries,"
- elog "revdep-rebuild must find and rebuild all packages linking to libperconaserverclient."
- elog "Please run: revdep-rebuild --library ${libpath}"
- ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
- fi
-}
-
-pkg_postinst() {
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- # Create log directory securely if it does not exist
- [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
- if use server ; then
- if [[ -z "${REPLACING_VERSIONS}" ]] ; then
- einfo
- elog "You might want to run:"
- elog "\"emerge --config =${CATEGORY}/${PF}\""
- elog "if this is a new install."
- elog
- elog "If you are switching server implentations, you should run the"
- elog "mysql_upgrade tool."
- einfo
- else
- einfo
- elog "If you are upgrading major versions, you should run the"
- elog "mysql_upgrade tool."
- einfo
- fi
- fi
-
- # Note about configuration change
- einfo
- elog "This version of ${PN} reorganizes the configuration from a single my.cnf"
- elog "to several files in /etc/mysql/mysql.d."
- elog "Please backup any changes you made to /etc/mysql/my.cnf"
- elog "and add them as a new file under /etc/mysql/mysql.d with a .cnf extension."
- elog "You may have as many files as needed and they are read alphabetically."
- elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
- einfo
-}
-
-src_unpack() {
- unpack ${A}
- # Grab the patches
- [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
-
- mv -f "${WORKDIR}/${MY_P}" "${S}" || die
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- if use jemalloc ; then
- echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
- fi
-
- if use tcmalloc ; then
- echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
- fi
-
- # Don't build bundled xz-utils
- if [[ -d "${S}/storage/tokudb/ft-index" ]] ; then
- echo > "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
- sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
- elif [[ -d "${S}/storage/tokudb/PerconaFT" ]] ; then
- echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
- sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
- sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
- fi
-
- if [[ -d "${S}/plugin/tokudb-backup-plugin" ]] && ! use tokudb-backup-plugin ; then
- rm -r "${S}/plugin/tokudb-backup-plugin/Percona-TokuBackup" || die
- fi
-
- # Remove bundled libs so we cannot accidentally use them
- # We keep extra/lz4 directory because we use extra/lz4/xxhash.c via sql/CMakeLists.txt:394
- rm -rv \
- "${S}"/extra/protobuf \
- "${S}"/extra/libevent \
- "${S}"/storage/rocksdb/third_party \
- "${S}"/storage/tokudb/PerconaFT/third_party \
- "${S}"/zlib \
- || die
-
- # Don't clash with dev-db/mysql-connector-c
- rm \
- man/my_print_defaults.1 \
- man/perror.1 \
- man/zlib_decompress.1 \
- || die
-
- # Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
- if [[ -d "${S}/support-files/SELinux" ]] ; then
- echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
- fi
-
- if use libressl ; then
- sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
- "${S}/cmake/ssl.cmake" || die
- fi
-
- sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
-}
-
-src_configure() {
- # Bug #114895, bug #110149
- filter-flags "-O" "-O[01]"
-
- append-cxxflags -felide-constructors
-
- # bug #283926, with GCC4.4, this is required to get correct behavior.
- append-flags -fno-strict-aliasing
-
- if use tokudb ; then
- # https://jira.percona.com/browse/PS-4399
- append-cxxflags -Wno-error=shadow
- fi
-
- if use client-libs ; then
- multilib-minimal_src_configure
- else
- multilib_src_configure
- fi
-}
-
-multilib_src_configure() {
- debug-print-function ${FUNCNAME} "$@"
-
- if ! multilib_is_native_abi && ! use client-libs ; then
- return
- fi
-
- CMAKE_BUILD_TYPE="RelWithDebInfo"
-
- # debug hack wrt #497532
- mycmakeargs=(
- -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
- -DSYSCONFDIR="${EPREFIX}/etc/mysql"
- -DINSTALL_BINDIR=bin
- -DINSTALL_DOCDIR=share/doc/${PF}
- -DINSTALL_DOCREADMEDIR=share/doc/${PF}
- -DINSTALL_INCLUDEDIR=include/mysql
- -DINSTALL_INFODIR=share/info
- -DINSTALL_LIBDIR=$(get_libdir)
- -DINSTALL_MANDIR=share/man
- -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
- -DINSTALL_SCRIPTDIR=share/mysql/scripts
- -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
- -DINSTALL_SBINDIR=sbin
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
- -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
- -DWITH_UNIT_TESTS=$(usex test ON OFF)
- ### TODO: make this system but issues with UTF-8 prevent it
- -DWITH_EDITLINE=bundled
- -DWITH_ZLIB=system
- -DWITH_LIBWRAP=0
- -DENABLED_LOCAL_INFILE=1
- -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
- -DWITH_DEFAULT_COMPILER_OPTIONS=0
- -DWITH_DEFAULT_FEATURE_SET=0
- # The build forces this to be defined when cross-compiling. We pass it
- # all the time for simplicity and to make sure it is actually correct.
- -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
- -DWITH_CURL=system
- -DWITH_BOOST="${WORKDIR}/boost_1_59_0"
- -DWITH_PROTOBUF=system
- )
-
- if use test ; then
- mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
- else
- mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
- fi
-
- if ! use yassl ; then
- mycmakeargs+=( -DWITH_SSL=system )
- else
- mycmakeargs+=( -DWITH_SSL=bundled )
- fi
-
- if ! use client-libs ; then
- mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
- fi
-
- # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
- # systemtap only works on native ABI, bug 530132
- if multilib_is_native_abi ; then
- mycmakeargs+=(
- -DENABLE_DTRACE=$(usex systemtap)
- )
- else
- mycmakeargs+=(
- -DWITHOUT_TOOLS=1
- -DWITH_READLINE=1
- -DENABLE_DTRACE=0
- )
- fi
-
- if multilib_is_native_abi && use server ; then
- mycmakeargs+=(
- -DWITH_LIBEVENT=system
- -DWITH_LZ4=system
- -DWITH_MECAB=$(usex cjk system OFF)
- -DWITH_NUMA=$(usex numa ON OFF)
- -DWITH_RAPID=$(usex experimental ON OFF)
- )
-
- if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]] ; then
- ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
- ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
- ewarn "You MUST file bugs without these variables set."
-
- mycmakeargs+=(
- -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
- -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
- )
- elif ! use latin1 ; then
- mycmakeargs+=(
- -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci
- )
- else
- mycmakeargs+=(
- -DDEFAULT_CHARSET=latin1
- -DDEFAULT_COLLATION=latin1_swedish_ci
- )
- fi
-
- mycmakeargs+=(
- -DEXTRA_CHARSETS=all
- -DDISABLE_SHARED=$(usex static YES NO)
- -DWITH_DEBUG=$(usex debug)
- -DWITH_EMBEDDED_SERVER=OFF
- )
-
- if use profiling ; then
- # Setting to OFF doesn't work: Once set, profiling options will be added
- # to `mysqld --help` output via sql/sys_vars.cc causing
- # "main.mysqld--help-notwin" test to fail
- mycmakeargs+=( -DENABLED_PROFILING=ON )
- fi
-
- if use static ; then
- mycmakeargs+=( -DWITH_PIC=1 )
- fi
-
- # Storage engines
- mycmakeargs+=(
- -DWITH_EXAMPLE_STORAGE_ENGINE=0
- -DWITH_ARCHIVE_STORAGE_ENGINE=1
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1
- -DWITH_CSV_STORAGE_ENGINE=1
- -DWITH_FEDERATED_STORAGE_ENGINE=1
- -DWITH_HEAP_STORAGE_ENGINE=1
- -DWITH_INNOBASE_STORAGE_ENGINE=1
- -DWITH_INNODB_MEMCACHED=0
- -DWITH_MYISAMMRG_STORAGE_ENGINE=1
- -DWITH_MYISAM_STORAGE_ENGINE=1
- -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITH_ROCKSDB=$(usex rocksdb 1 0)
- $(usex tokudb '' -DWITHOUT_TOKUDB=1)
- )
-
- if use tokudb ; then
- # TokuDB Backup plugin requires valgrind unconditionally
- mycmakeargs+=(
- $(usex tokudb-backup-plugin '' -DTOKUDB_BACKUP_DISABLED=1)
- )
- fi
-
- else
- mycmakeargs+=(
- -DWITHOUT_SERVER=1
- -DWITH_EMBEDDED_SERVER=OFF
- -DEXTRA_CHARSETS=none
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- if use client-libs ; then
- multilib-minimal_src_compile
- else
- multilib_src_compile
- fi
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
-}
-
-# Official test instructions:
-# ulimit -n 16500 && \
-# USE='latin1 perl server' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild percona-server-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- _disable_test() {
- local rawtestname reason
- rawtestname="${1}" ; shift
- reason="${@}"
- ewarn "test '${rawtestname}' disabled: '${reason}'"
- echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
- }
-
- local TESTDIR="${BUILD_DIR}/mysql-test"
- local retstatus_unit
- local retstatus_tests
-
- if ! use server ; then
- einfo "Skipping server tests due to minimal build."
- return 0
- fi
-
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if [[ $UID -eq 0 ]] ; then
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
- fi
- has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
-
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
- # Run CTest (test-units)
- cmake-utils_src_test
- retstatus_unit=$?
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
- # Enable parallel testing, auto will try to detect number of cores
- # You may set this by hand.
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
- # create directories because mysqladmin might run out of order
- mkdir -p "${T}"/var-tests{,/log} || die
-
- # Run mysql tests
- pushd "${TESTDIR}" &>/dev/null || die
-
- touch "${T}/disabled.def"
- # These are failing in Percona-Server 5.7 for now and are believed to be
- # false positives or are known to fail:
- #
- # group_replication.gr_communication_configuration: requires a valid local network address
- # which clashes with FEATURES=network-sandbox
- # innodb.xtradb_compressed_columns_consistency: long running test which tends to timeout
- # on a busy host
- # keyring_vault.keyring_vault_timeout: requires network access to vault.public-ci.percona.com
- # which clashes with FEATURES=network-sandbox
- # rocksdb.prefix_extractor_override: https://jira.percona.com/browse/PS-5199
- # rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch: https://bugs.mysql.com/bug.php?id=89223
- # rpl.rpl_multi_source_mts_reset_worker_info: https://jira.percona.com/browse/PS-3786
- # tokudb.bugs.5733_tokudb: https://jira.percona.com/browse/PS-4274
- # x.crud_insert_cast: https://jira.percona.com/browse/PS-5032
- # x.insert_table_bad_column: https://jira.percona.com/browse/PS-5032
- # x.insert_table_bad_numcolumns: https://jira.percona.com/browse/PS-5032
- # x.insert_table_bad_column_type: https://jira.percona.com/browse/PS-5032
- # x.insert_table: https://jira.percona.com/browse/PS-5032
- # x.update_crud_arrayappend_o: https://jira.percona.com/browse/PS-5032
- # x.update_crud_arrayinsert_o: https://jira.percona.com/browse/PS-5032
- # x.mysqlxtest_help: https://jira.percona.com/browse/PS-5019
- # x.admin_kill_client_mysqlx: https://jira.percona.com/browse/PS-5019
- #
- local t
-
- for t in \
- group_replication.gr_communication_configuration \
- innodb.xtradb_compressed_columns_consistency \
- keyring_vault.keyring_vault_timeout \
- rocksdb.prefix_extractor_override \
- rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch \
- rpl.rpl_multi_source_mts_reset_worker_info \
- tokudb.bugs.5733_tokudb \
- x.crud_insert_cast \
- x.insert_table_bad_column \
- x.insert_table_bad_numcolumns \
- x.insert_table_bad_column_type \
- x.insert_table \
- x.update_crud_arrayappend_o \
- x.update_crud_arrayinsert_o \
- x.mysqlxtest_help \
- x.admin_kill_client_mysqlx \
- ; do
- _disable_test "$t" "False positives in Gentoo / Known bug"
- done
-
- # Unstable tests
- # - main.xa_prepared_binlog_off: https://bugs.mysql.com/bug.php?id=83340
- # - rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch: https://bugs.mysql.com/bug.php?id=89223
- # - rpl.rpl_non_direct_stm_mixing_engines: MDEV-14489
- for t in \
- main.xa_prepared_binlog_off \
- rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch \
- rpl.rpl_non_direct_stm_mixing_engines \
- ; do
- _disable_test "$t" "Unstable test"
- done
-
- for t in \
- gis.geometry_class_attri_prop \
- gis.geometry_property_function_issimple \
- gis.gis_bugs_crashes \
- gis.spatial_op_testingfunc_mix \
- gis.spatial_analysis_functions_buffer \
- gis.spatial_analysis_functions_centroid \
- gis.spatial_analysis_functions_distance \
- gis.spatial_op_testingfunc_mix \
- gis.spatial_utility_function_distance_sphere \
- gis.spatial_utility_function_simplify \
- ; do
- _disable_test "$t" "Known rounding error with latest AMD processors"
- done
-
- if has_version ">=dev-libs/openssl-1.1.1" ; then
- for t in \
- main.ssl_8k_key \
- auth_sec.mysql_ssl_connection \
- main.ssl_verify_identity \
- main.ssl_crl \
- main.grant_alter_user_qa \
- auth_sec.ssl_auto_detect \
- encryption.innodb_onlinealter_encryption \
- main.ssl_ca \
- main.ssl_cipher \
- main.grant_user_lock_qa \
- auth_sec.openssl_cert_generation \
- main.ssl_bug75311 \
- main.ssl_compress \
- main.ssl \
- main.plugin_auth_sha256_tls \
- main.ssl_ecdh \
- main.openssl_1 \
- auth_sec.cert_verify \
- main.mysql_ssl_default \
- main.percona_tls \
- auth_sec.tls \
- auth_sec.ssl_mode \
- binlog.binlog_grant_alter_user \
- x.connection_tls_version \
- x.connection_openssl \
- ; do
- _disable_test "$t" "Known >=openssl-1.1.1 failures"
- done
- fi
-
- if use numa && use kernel_linux ; then
- # bug 584880
- if ! linux_config_exists || ! linux_chkconfig_present NUMA ; then
- for t in sys_vars.innodb_numa_interleave_basic ; do
- _disable_test "$t" "Test $t requires system with NUMA support"
- done
- fi
- fi
-
- if use tokudb ; then
- if [[ -f "/sys/kernel/mm/transparent_hugepage/enabled" ]] ; then
- if grep -q -E "\[always\]" /sys/kernel/mm/transparent_hugepage/enabled &>/dev/null ; then
- # TokuDB refuses to start when transparent hugepages are enabled
- for t in \
- tokudb.rows-32m-rand-insert \
- tokudb.savepoint-2 \
- tokudb.savepoint-3 \
- tokudb.savepoint-4 \
- tokudb.savepoint-1078 \
- tokudb.savepoint-1078-2 \
- tokudb.savepoint-1078-3 \
- tokudb.savepoint-1078-4 \
- ; do
- _disable_test "$t" "TokuDB will not work with transparent hugepages enabled"
- done
- fi
- else
- einfo "Cannot determine transparent hugepage status."
- einfo "Please note that TokuDB refuses to start when transparent hugepages are enabled!"
- fi
- fi
-
- if ! use latin1 ; then
- # The following tests will fail if DEFAULT_CHARSET
- # isn't set to latin1:
- for t in \
- binlog.binlog_mysqlbinlog_filter \
- binlog.binlog_xa_prepared_disconnect \
- funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql \
- funcs_1.is_triggers \
- innodb.innodb_pagesize_max_recordsize \
- innodb.innodb-system-table-view \
- innodb.mysqldump_max_recordsize \
- main.mysql_client_test \
- main.mysqld--help-notwin \
- main.type_string \
- main.information_schema \
- perfschema.binlog_edge_mix \
- perfschema.binlog_edge_stmt \
- rpl.rpl_xa_survive_disconnect \
- rpl.rpl_xa_survive_disconnect_lsu_off \
- rpl.rpl_xa_survive_disconnect_table \
- ; do
- _disable_test "$t" "requires DEFAULT_CHARSET=latin1 but USE=-latin1 is set"
- done
- fi
-
- # Try to increase file limits to increase test coverage
- if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
- # Upper limit comes from parts.partition_* tests
- ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
-
- if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
- # Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
- ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
-
- if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
- ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
- else
- einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
- fi
- else
- einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
- fi
- else
- einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
- fi
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def"
- retstatus_tests=$?
-
- popd &>/dev/null || die
-
- # Cleanup is important for these testcases.
- pkill -9 -f "${S}/ndb" 2>/dev/null
- pkill -9 -f "${S}/sql" 2>/dev/null
-
- local failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
- [[ -z "$failures" ]] || die "Test failures: $failures"
- einfo "Tests successfully completed"
-}
-
-src_install() {
- local MULTILIB_WRAPPED_HEADERS
- local MULTILIB_CHOST_TOOLS
- if use client-libs ; then
- # headers with ABI specific data
- MULTILIB_WRAPPED_HEADERS=(
- /usr/include/mysql/server/my_config.h
- /usr/include/mysql/server/mysql_version.h )
-
- # wrap the config scripts
- MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
- multilib-minimal_src_install
- else
- multilib_src_install
- multilib_src_install_all
- fi
-}
-
-# Intentionally override eclass function
-multilib_src_install() {
-
- cmake-utils_src_install
-
- # Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
- find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
-}
-
-multilib_src_install_all() {
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- # Convenience links
- einfo "Making Convenience links for mysqlcheck multi-call binary"
- dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
- dosym "mysqlcheck" "/usr/bin/mysqlrepair"
- dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
- # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
- if [[ -d "${ED}/usr/data" ]] ; then
- rm -Rf "${ED}/usr/data" || die
- fi
-
- # Unless they explicitly specific USE=test, then do not install the
- # testsuite. It DOES have a use to be installed, esp. when you want to do a
- # validation of your database configuration after tuning it.
- if ! use test ; then
- rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
- fi
-
- # Configuration stuff
- einfo "Building default configuration ..."
- insinto "${MY_SYSCONFDIR#${EPREFIX}}"
- [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
- cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
- eprefixify "${TMPDIR}/my.cnf"
- doins "${TMPDIR}/my.cnf"
- insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
- cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
- eprefixify "${TMPDIR}/50-distro-client.cnf"
- doins "${TMPDIR}/50-distro-client.cnf"
-
- if use server ; then
- mycnf_src="my.cnf.distro-server"
- sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
- "${FILESDIR}/${mycnf_src}" \
- > "${TMPDIR}/my.cnf.ok" || die
-
- if use prefix ; then
- sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
- "${TMPDIR}/my.cnf.ok" || die
- fi
-
- if use latin1 ; then
- sed -i \
- -e "/character-set/s|utf8|latin1|g" \
- "${TMPDIR}/my.cnf.ok" || die
- fi
-
- eprefixify "${TMPDIR}/my.cnf.ok"
-
- newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
- if use tokudb ; then
- # Remove some unwanted files
- rm -fv \
- "${ED%/}"/usr/COPYING.AGPLv3 \
- "${ED%/}"/usr/COPYING.GPLv2 \
- "${ED%/}"/usr/PATENTS \
- "${ED%/}"/usr/README.md \
- || die
- fi
- fi
-
- #Remove mytop if perl is not selected
- [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-}
-
-pkg_config() {
- _getoptval() {
- local mypd="${EROOT%/}"/usr/bin/my_print_defaults
- local section="$1"
- local flag="--${2}="
- local extra_options="${3}"
- "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
- }
- local old_MY_DATADIR="${MY_DATADIR}"
- local old_HOME="${HOME}"
- # my_print_defaults needs to read stuff in $HOME/.my.cnf
- export HOME=${EPREFIX}/root
-
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
- if [[ ! -x "${EROOT%/}/usr/sbin/mysqld" ]] ; then
- die "Minimal builds do NOT include the MySQL server"
- fi
-
- if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]] ; then
- local MY_DATADIR_s="${ROOT%/}/${MY_DATADIR}"
- MY_DATADIR_s="${MY_DATADIR_s%%/}"
- local old_MY_DATADIR_s="${ROOT%/}/${old_MY_DATADIR}"
- old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
- if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]] ; then
- if [[ -d "${MY_DATADIR_s}" ]] ; then
- ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
- ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
- else
- elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
- mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
- || die "Moving MY_DATADIR failed"
- fi
- else
- ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
- if [[ -d "${MY_DATADIR_s}" ]] ; then
- ewarn "Attempting to use ${MY_DATADIR_s}"
- else
- eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
- die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
- fi
- fi
- fi
-
- local pwd1="a"
- local pwd2="b"
- local maxtry=15
-
- if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
- local tmp_mysqld_password_source=
-
- for tmp_mysqld_password_source in mysql client ; do
- einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
- MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
- if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
- if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
- ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
- MYSQL_ROOT_PASSWORD=
- continue
- fi
-
- einfo "Found password in '${tmp_mysqld_password_source}' section!"
- break
- fi
- done
-
- # Sometimes --show is required to display passwords in some implementations of my_print_defaults
- if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
- MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
- fi
-
- unset tmp_mysqld_password_source
- fi
- MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
- # These are dir+prefix
- MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
- MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
- MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
- MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
- if [[ ! -d "${EROOT%/}/$MYSQL_TMPDIR" ]] ; then
- einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
- install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_TMPDIR"
- fi
-
- if [[ ! -d "${EROOT%/}/$MYSQL_LOG_BIN" ]] ; then
- einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
- install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_LOG_BIN"
- fi
-
- if [[ ! -d "${EROOT%/}/$MYSQL_RELAY_LOG" ]] ; then
- einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
- install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_RELAY_LOG"
- fi
-
- if [[ -d "${ROOT%/}/${MY_DATADIR}/mysql" ]] ; then
- ewarn "You have already a MySQL database in place."
- ewarn "(${ROOT%/}/${MY_DATADIR}/*)"
- ewarn "Please rename or delete it if you wish to replace it."
- die "MySQL database already exists!"
- fi
-
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-
- einfo "Please provide a password for the mysql 'root' user now"
- einfo "or through the ${HOME}/.my.cnf file."
- ewarn "Avoid [\"'\\_%] characters in the password"
- read -rsp " >" pwd1 ; echo
-
- einfo "Retype the password"
- read -rsp " >" pwd2 ; echo
-
- if [[ "x$pwd1" != "x$pwd2" ]] ; then
- die "Passwords are not the same"
- fi
- MYSQL_ROOT_PASSWORD="${pwd1}"
- unset pwd1 pwd2
- fi
-
- local options
- local sqltmp="$(emktemp)"
-
- # Fix bug 446200. Don't reference host my.cnf, needs to come first,
- # see http://bugs.mysql.com/bug.php?id=31312
- use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
- # Figure out which options we need to disable to do the setup
- local helpfile="${TMPDIR%/}/mysqld-help"
- "${EROOT%/}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
- for opt in host-cache name-resolve networking slave-start \
- federated ssl log-bin relay-log slow-query-log external-locking \
- log-slave-updates \
- ; do
- optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
- egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
- done
-
- einfo "Creating the mysql database and setting proper permissions on it ..."
-
- # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
- PID_DIR="${EROOT%/}/var/run/mysqld"
- if [[ ! -d "${PID_DIR}" ]] ; then
- install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
- fi
-
- if [[ ! -d "${MY_DATADIR}" ]] ; then
- install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
- fi
-
- pushd "${TMPDIR}" &>/dev/null || die
-
- # Filling timezones, see
- # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
- echo "USE mysql;" >"${sqltmp}"
- "${EROOT%/}/usr/bin/mysql_tzinfo_to_sql" "${EROOT%/}/usr/share/zoneinfo" >> "${sqltmp}" 2>/dev/null
- chown mysql "${sqltmp}" || die
-
- # --initialize-insecure will not set root password
- # --initialize would set a random one in the log which we don't need as we set it ourselves
- local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
- cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
- einfo "Command: ${cmd[*]}"
- su -s /bin/sh -c "${cmd[*]}" mysql \
- >"${TMPDIR%/}"/mysql_install_db.log 2>&1
- if [[ $? -ne 0 ]] ; then
- grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
- die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
- fi
- popd &>/dev/null || die
- [[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
- || die "MySQL databases not installed"
-
- use prefix || options="${options} --user=mysql"
-
- local socket="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.sock"
- local pidfile="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.pid"
- local mysqld="${EROOT%/}/usr/sbin/mysqld \
- ${options} \
- $(use prefix || echo --user=mysql) \
- --log-warnings=0 \
- --basedir=${EROOT%/}/usr \
- --datadir=${ROOT%/}/${MY_DATADIR} \
- --max_allowed_packet=8M \
- --net_buffer_length=16K \
- --socket=${socket} \
- --pid-file=${pidfile} \
- --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
- #einfo "About to start mysqld: ${mysqld}"
- ebegin "Starting mysqld"
- einfo "Command ${mysqld}"
- ${mysqld} &
- rc=$?
- while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
- maxtry=$((${maxtry}-1))
- echo -n "."
- sleep 1
- done
- eend $rc
-
- if ! [[ -S "${socket}" ]] ; then
- die "Completely failed to start up mysqld with: ${mysqld}"
- fi
-
- ebegin "Setting root password"
- # Do this from memory, as we don't want clear text passwords in temp files
- local sql="ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '${MYSQL_ROOT_PASSWORD}'"
- "${EROOT%/}/usr/bin/mysql" \
- --no-defaults \
- "--socket=${socket}" \
- -hlocalhost \
- -e "${sql}"
- eend $?
-
- # Stop the server and cleanup
- einfo "Stopping the server ..."
- kill $(< "${pidfile}" )
- rm -f "${sqltmp}"
- wait %1
- einfo "Done"
-}
diff --git a/dev-db/percona-server/percona-server-8.0.19.10-r1.ebuild b/dev-db/percona-server/percona-server-8.0.19.10-r1.ebuild
deleted file mode 100644
index 44544aaf5cc7..000000000000
--- a/dev-db/percona-server/percona-server-8.0.19.10-r1.ebuild
+++ /dev/null
@@ -1,1185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake-utils flag-o-matic linux-info \
- multiprocessing prefix toolchain-funcs check-reqs
-
-MY_BOOST_VERSION="1.70.0"
-MY_PV=$(ver_rs 3 '-')
-MY_PV="${MY_PV//_pre*}"
-MY_PN="Percona-Server"
-MY_P="${PN}-${MY_PV}"
-MY_MAJOR_PV=$(ver_cut 1-2)
-MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/${MY_MAJOR_PV}/"
-
-# Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/percona-server/${PN}-8.0.19.10-patches-01.tar.xz"
-
-SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
- https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION}).tar.bz2
- ${PATCH_SET}
-"
-
-HOMEPAGE="https://www.percona.com/software/mysql-database/percona-server https://github.com/percona/percona-server"
-DESCRIPTION="Fully compatible, enhanced and open source drop-in replacement for MySQL"
-LICENSE="GPL-2"
-SLOT="8.0"
-IUSE="cjk cracklib debug jemalloc latin1 libressl numa pam +perl profiling
- rocksdb router selinux +server tcmalloc test tokudb tokudb-backup-plugin"
-
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
-
-REQUIRED_USE="?? ( tcmalloc jemalloc )
- cjk? ( server )
- jemalloc? ( server )
- numa? ( server )
- profiling? ( server )
- router? ( server )
- tcmalloc? ( server )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
- >=app-arch/lz4-0_p131:=
- sys-libs/ncurses:0=
- >=sys-libs/zlib-1.2.3:0=
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( >=dev-libs/openssl-1.0.0:0= )
- server? (
- dev-libs/icu:=
- dev-libs/libevent:=
- >=dev-libs/protobuf-3.8:=
- net-libs/libtirpc:=
- net-misc/curl:=
- cjk? ( app-text/mecab:= )
- jemalloc? ( dev-libs/jemalloc:0= )
- kernel_linux? (
- dev-libs/libaio:0=
- sys-process/procps:0=
- )
- numa? ( sys-process/numactl )
- pam? ( sys-libs/pam:0= )
- tcmalloc? ( dev-util/google-perftools:0= )
- )
-"
-DEPEND="${COMMON_DEPEND}
- || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- virtual/yacc
- server? ( net-libs/rpcsvc-proto )
- test? (
- acct-group/mysql acct-user/mysql
- dev-perl/JSON
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster
- !dev-db/percona-server:0
- !dev-db/percona-server:5.7
- selinux? ( sec-policy/selinux-mysql )
- !prefix? (
- acct-group/mysql acct-user/mysql
- dev-db/mysql-init-scripts
- )
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-CHECKREQS_DISK_BUILD="9G"
-
-mysql_init_vars() {
- : ${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
- : ${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
- : ${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
- : ${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
- MY_DATADIR="${MY_LOCALSTATEDIR}"
-
- export MY_SHAREDSTATEDIR MY_SYSCONFDIR
- export MY_LOCALSTATEDIR MY_LOGDIR
- export MY_DATADIR
-}
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} == binary ]] && return
- use server && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} == binary ]] && return
-
- if has test ${FEATURES} ; then
- # Bug #213475 - MySQL _will_ object strenuously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if ! has userpriv ${FEATURES} ; then
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
- fi
-
- local aio_max_nr=$(sysctl -n fs.aio-max-nr 2>/dev/null)
- [[ -z "${aio_max_nr}" || ${aio_max_nr} -lt 250000 ]] \
- && die "FEATURES=test will require fs.aio-max-nr=250000 at minimum!"
-
- if use latin1 ; then
- # Upstream only supports tests with default charset
- die "Testing with USE=latin1 is not supported."
- fi
- fi
-
- if use kernel_linux ; then
- if use numa ; then
- linux-info_get_any_version
-
- local CONFIG_CHECK="~NUMA"
-
- local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
- WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
-
- check_extra_config
- fi
- fi
-
- use server && check-reqs_pkg_setup
-}
-
-src_unpack() {
- unpack ${A}
-
- mv -f "${WORKDIR}/${MY_P}" "${S}" || die
-}
-
-src_prepare() {
- eapply "${WORKDIR}"/mysql-patches
-
- eapply_user
-
- # Avoid rpm call which would trigger sandbox, #692368
- sed -i \
- -e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
- CMakeLists.txt || die
-
- if use jemalloc ; then
- echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
- fi
-
- if use tcmalloc ; then
- echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
- fi
-
- # Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
- if [[ -d "${S}/support-files/SELinux" ]] ; then
- echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
- fi
-
- # Remove man pages for client-lib tools we don't install
- rm \
- man/my_print_defaults.1 \
- man/perror.1 \
- man/zlib_decompress.1 \
- || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- # Bug #114895, bug #110149
- filter-flags "-O" "-O[01]"
-
- append-cxxflags -felide-constructors
-
- # bug #283926, with GCC4.4, this is required to get correct behavior.
- append-flags -fno-strict-aliasing
-
- CMAKE_BUILD_TYPE="RelWithDebInfo"
-
- # debug hack wrt #497532
- mycmakeargs=(
- -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
- -DSYSCONFDIR="${EPREFIX}/etc/mysql"
- -DINSTALL_BINDIR=bin
- -DINSTALL_DOCDIR=share/doc/${PF}
- -DINSTALL_DOCREADMEDIR=share/doc/${PF}
- -DINSTALL_INCLUDEDIR=include/mysql
- -DINSTALL_INFODIR=share/info
- -DINSTALL_LIBDIR=$(get_libdir)
- -DINSTALL_MANDIR=share/man
- -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
- -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
- -DINSTALL_SBINDIR=sbin
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
- -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
- -DWITH_UNIT_TESTS=$(usex test ON OFF)
- # Using bundled editline to get CTRL+C working
- -DWITH_EDITLINE=bundled
- -DWITH_ZLIB=system
- -DWITH_SSL=system
- -DWITH_LIBWRAP=0
- -DENABLED_LOCAL_INFILE=1
- -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
- -DWITH_DEFAULT_COMPILER_OPTIONS=0
- -DWITH_DEFAULT_FEATURE_SET=0
- # The build forces this to be defined when cross-compiling. We pass it
- # all the time for simplicity and to make sure it is actually correct.
- -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON
- -DWITH_CURL=system
- -DWITH_BOOST="${WORKDIR}/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION})"
- -DWITH_ROUTER=$(usex router ON OFF)
- )
-
- if is-flagq -fno-lto ; then
- einfo "LTO disabled via {C,CXX,F,FC}FLAGS"
- mycmakeargs+=( -DWITH_LTO=OFF )
- elif is-flagq -flto ; then
- einfo "LTO forced via {C,CXX,F,FC}FLAGS"
- myconf+=( -DWITH_LTO=ON )
- else
- # Disable automagic
- myconf+=( -DWITH_LTO=OFF )
- fi
-
- if use test ; then
- mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
- else
- mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
- fi
-
- mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
-
- mycmakeargs+=(
- -DWITH_ICU=system
- -DWITH_LZ4=system
- # Our dev-libs/rapidjson doesn't carry necessary fixes for std::regex
- -DWITH_RAPIDJSON=bundled
- )
-
- if [[ -n "${MYSQL_DEFAULT_CHARSET}" && -n "${MYSQL_DEFAULT_COLLATION}" ]] ; then
- ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
- ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
- ewarn "You MUST file bugs without these variables set."
- ewarn "Tests will probably fail!"
-
- mycmakeargs+=(
- -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
- -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
- )
- elif use latin1 ; then
- mycmakeargs+=(
- -DDEFAULT_CHARSET=latin1
- -DDEFAULT_COLLATION=latin1_swedish_ci
- )
- else
- mycmakeargs+=(
- -DDEFAULT_CHARSET=utf8mb4
- -DDEFAULT_COLLATION=utf8mb4_0900_ai_ci
- )
- fi
-
- if use server ; then
- mycmakeargs+=(
- -DWITH_EXTRA_CHARSETS=all
- -DWITH_DEBUG=$(usex debug)
- -DWITH_MECAB=$(usex cjk system OFF)
- -DWITH_LIBEVENT=system
- -DWITH_PROTOBUF=system
- -DWITH_NUMA=$(usex numa ON OFF)
- -DWITH_PAM=$(usex pam)
- )
-
- if use profiling ; then
- # Setting to OFF doesn't work: Once set, profiling options will be added
- # to `mysqld --help` output via sql/sys_vars.cc causing
- # "main.mysqld--help-notwin" test to fail
- mycmakeargs+=( -DENABLED_PROFILING=ON )
- fi
-
- # Storage engines
- mycmakeargs+=(
- -DWITH_EXAMPLE_STORAGE_ENGINE=0
- -DWITH_ARCHIVE_STORAGE_ENGINE=1
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1
- -DWITH_CSV_STORAGE_ENGINE=1
- -DWITH_FEDERATED_STORAGE_ENGINE=1
- -DWITH_HEAP_STORAGE_ENGINE=1
- -DWITH_INNOBASE_STORAGE_ENGINE=1
- -DWITH_INNODB_MEMCACHED=0
- -DWITH_MYISAMMRG_STORAGE_ENGINE=1
- -DWITH_MYISAM_STORAGE_ENGINE=1
- -DWITH_ROCKSDB=$(usex rocksdb 1 0)
- -DWITH_TOKUDB=$(usex tokudb 1 0)
- )
- else
- mycmakeargs+=(
- -DWITHOUT_SERVER=1
- -DWITH_SYSTEMD=no
- )
- fi
-
- cmake-utils_src_configure
-}
-
-# Official test instructions:
-# ulimit -n 16500 && \
-# USE='perl server' \
-# FEATURES='test userpriv' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- _disable_test() {
- local rawtestname bug reason
- rawtestname="${1}" ; shift
- bug="${1}" ; shift
- reason="${@}"
- ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
- echo ${rawtestname} : BUG#${bug} ${reason} >> "${T}/disabled.def"
- }
-
- local TESTDIR="${BUILD_DIR}/mysql-test"
- local retstatus_unit
- local retstatus_tests
-
- # Run CTest (test-units)
- cmake-utils_src_test
- retstatus_unit=$?
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- if [[ -z "${MTR_PARALLEL}" ]] ; then
- local -x MTR_PARALLEL=$(makeopts_jobs)
-
- if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
- # Running multiple tests in parallel usually require higher ulimit
- # and fs.aio-max-nr setting. In addition, tests like main.multi_update
- # are known to hit timeout when system is busy.
- # To avoid test failure we will limit MTR_PARALLEL to 4 instead of
- # using "auto".
- local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
- info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
- einfo "${info_msg}"
- unset info_msg
- MTR_PARALLEL=4
- fi
- else
- einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
- fi
-
- # create directories because mysqladmin might run out of order
- mkdir -p "${T}"/var-tests{,/log} || die
-
- # Run mysql tests
- pushd "${TESTDIR}" &>/dev/null || die
-
- touch "${T}/disabled.def"
-
- local -a disabled_tests
- disabled_tests+=( "auth_sec.keyring_file_data_qa;0;Won't work with user privileges" )
- disabled_tests+=( "gis.spatial_analysis_functions_buffer;5452;Known rounding error with latest AMD processors (PS)" )
- disabled_tests+=( "gis.gis_bugs_crashes;5452;Known rounding error with latest AMD processors (PS)" )
- disabled_tests+=( "gis.geometry_class_attri_prop;5452;Known rounding error with latest AMD processors (PS)" )
- disabled_tests+=( "gis.spatial_utility_function_distance_sphere;5452;Known rounding error with latest AMD processors (PS)" )
- disabled_tests+=( "gis.geometry_property_function_issimple;5452;Known rounding error with latest AMD processors (PS)" )
- disabled_tests+=( "gis.spatial_analysis_functions_centroid;5452;Known rounding error with latest AMD processors (PS)" )
- disabled_tests+=( "gis.spatial_operators_intersection;5452;Known rounding error with latest AMD processors (PS)" )
- disabled_tests+=( "gis.spatial_utility_function_simplify;5452;Known rounding error with latest AMD processors (PS)" )
- disabled_tests+=( "gis.spatial_op_testingfunc_mix;5452;Known rounding error with latest AMD processors (PS)" )
- disabled_tests+=( "gis.spatial_analysis_functions_distance;5452;Known rounding error with latest AMD processors (PS)" )
- disabled_tests+=( "innodb.percona_changed_page_bmp_flush;6807;False positive on Gentoo (PS)" )
- disabled_tests+=( "innodb.percona_changed_page_bmp_log_resize;0;Sporadic failing test" )
- disabled_tests+=( "innodb.upgrade_orphan;0;Sporadic failing test" )
- disabled_tests+=( "main.myisam-blob;0;Sporadic failing test" )
- disabled_tests+=( "main.mysqlpump_basic_lz4;6042;Extra tool output causes false positive" )
- disabled_tests+=( "main.ssl_bug75311;5996;Known test failure" )
- disabled_tests+=( "main.ssl_san;6808;False positive on IPv6-enabled hosts" )
- disabled_tests+=( "main.window_std_var;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
- disabled_tests+=( "main.window_std_var_optimized;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
- disabled_tests+=( "main.with_recursive;6804;Known rounding error with latest AMD processors" )
- disabled_tests+=( "rpl_gtid.rpl_gtid_stm_drop_table;90612;Known test failure" )
- disabled_tests+=( "rpl_gtid.rpl_multi_source_mtr_includes;0;Know failure - no upstream bug yet" )
- disabled_tests+=( "sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware" )
- disabled_tests+=( "x.message_compressed_payload;0;False positive caused by protobuff-3.11+" )
- disabled_tests+=( "x.message_protobuf_nested;6803;False positive caused by protobuff-3.11+" )
-
- if ! hash zip 1>/dev/null 2>&1 ; then
- # no need to force dep app-arch/zip for one test
- disabled_tests+=( "innodb.partition_upgrade_create;0;Requires app-arch/zip" )
- fi
-
- local test_ds
- for test_infos_str in "${disabled_tests[@]}" ; do
- IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
-
- if [[ ${#test_infos_arr[@]} != 3 ]] ; then
- die "Invalid test data set, not matching format: ${test_infos_str}"
- fi
-
- _disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
- done
- unset test_ds test_infos_str test_infos_arr
-
- if [[ -z "${MTR_VAULT_TOKEN}" ]] ; then
- local impossible_test
- for impossible_test in \
- encryption.default_table_encryption_var \
- keyring_vault.innodb_online_alter_encryption \
- keyring_vault.innodb_row_log_encryption \
- keyring_vault.install_keyring_vault \
- keyring_vault.keyring_udf \
- keyring_vault.keyring_vault_config \
- keyring_vault.keyring_vault_config_qa \
- keyring_vault.keyring_vault_timeout \
- keyring_vault.key_rotation_qa \
- keyring_vault.rpl_key_rotation \
- keyring_vault.table_encrypt_2 \
- keyring_vault.table_encrypt_2_directory \
- keyring_vault.table_encrypt_2_keyring \
- keyring_vault.table_encrypt_5 \
- keyring_vault.table_encrypt_5_directory \
- keyring_vault.table_encrypt_kill \
- keyring_vault.temp_table_encrypt_keyring_vault \
- ; do
- _disable_test "${impossible_test}" "0" "MTR_VAULT_TOKEN is not set"
- done
- fi
-
- # Try to increase file limits to increase test coverage
- if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
- # Upper limit comes from parts.partition_* tests
- ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
-
- if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
- # Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
- ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
-
- if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
- ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
- else
- einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
- fi
- else
- einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
- fi
- else
- einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
- fi
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
- retstatus_tests=$?
-
- popd &>/dev/null || die
-
- # Cleanup is important for these testcases.
- pkill -9 -f "${S}/ndb" 2>/dev/null
- pkill -9 -f "${S}/sql" 2>/dev/null
-
- local failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
- [[ -z "$failures" ]] || die "Test failures: $failures"
- einfo "Tests successfully completed"
-}
-
-src_install() {
- cmake-utils_src_install
-
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- # Convenience links
- einfo "Making Convenience links for mysqlcheck multi-call binary"
- dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
- dosym "mysqlcheck" "/usr/bin/mysqlrepair"
- dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
- # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
- if [[ -d "${ED}/usr/data" ]] ; then
- rm -Rf "${ED}/usr/data" || die
- fi
-
- # Unless they explicitly specific USE=test, then do not install the
- # testsuite. It DOES have a use to be installed, esp. when you want to do a
- # validation of your database configuration after tuning it.
- if ! use test ; then
- rm -rf "${ED}/${MY_SHAREDSTATEDIR#${EPREFIX}}/mysql-test"
- fi
-
- # Configuration stuff
- einfo "Building default configuration ..."
- insinto "${MY_SYSCONFDIR#${EPREFIX}}"
- [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
- cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
- eprefixify "${TMPDIR}/my.cnf"
- doins "${TMPDIR}/my.cnf"
- insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
- cp "${FILESDIR}/my.cnf-8.0.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
- eprefixify "${TMPDIR}/50-distro-client.cnf"
- doins "${TMPDIR}/50-distro-client.cnf"
-
- mycnf_src="my.cnf-8.0.distro-server"
- sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
- "${FILESDIR}/${mycnf_src}" \
- > "${TMPDIR}/my.cnf.ok" || die
-
- if use prefix ; then
- sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
- "${TMPDIR}/my.cnf.ok" || die
- fi
-
- if use latin1 ; then
- sed -i \
- -e "/character-set/s|utf8mb4|latin1|g" \
- "${TMPDIR}/my.cnf.ok" || die
- fi
-
- eprefixify "${TMPDIR}/my.cnf.ok"
-
- newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
- #Remove mytop if perl is not selected
- [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-
- if use router ; then
- rm -rf \
- "${ED}/usr/LICENSE.router" \
- "${ED}/usr/README.router" \
- "${ED}/usr/run" \
- "${ED}/usr/var" \
- || die
- fi
-
- # Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
- find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
-}
-
-pkg_postinst() {
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- # Create log directory securely if it does not exist
- # NOTE: $MY_LOGDIR contains $EPREFIX by default
- [[ -d "${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${MY_LOGDIR}"
-
- # Note about configuration change
- einfo
- elog "This version of ${PN} reorganizes the configuration from a single my.cnf"
- elog "to several files in /etc/mysql/mysql.d."
- elog "Please backup any changes you made to /etc/mysql/my.cnf"
- elog "and add them as a new file under /etc/mysql/mysql.d with a .cnf extension."
- elog "You may have as many files as needed and they are read alphabetically."
- elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
- einfo
-
- if [[ -z "${REPLACING_VERSIONS}" ]] ; then
- einfo
- elog "You might want to run:"
- elog " \"emerge --config =${CATEGORY}/${PF}\""
- elog "if this is a new install."
- einfo
- else
- einfo
- elog "Upgrade process for ${PN}-8.x has changed. Please read"
- elog "https://dev.mysql.com/doc/refman/8.0/en/upgrade-binary-package.html"
- einfo
- fi
-}
-
-pkg_config() {
- _getoptval() {
- local section="$1"
- local flag="--${2}="
- local extra_options="${3}"
- local cmd=(
- "${my_print_defaults_binary}"
- "${extra_options}"
- "${section}"
- )
- local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
-
- if [[ ${#results[@]} -gt 0 ]] ; then
- # When option is set multiple times only return last value
- echo "${results[-1]}"
- fi
- }
-
- _mktemp_dry() {
- # emktemp has no --dry-run option
- local template="${1}"
-
- if [[ -z "${template}" ]] ; then
- if [[ -z "${T}" ]] ; then
- template="/tmp/XXXXXXX"
- else
- template="${T}/XXXXXXX"
- fi
- fi
-
- local template_wo_X=${template//X/}
- local n_X
- let n_X=${#template}-${#template_wo_X}
- if [[ ${n_X} -lt 3 ]] ; then
- echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
- return
- fi
-
- local attempts=0
- local character tmpfile
- while [[ true ]] ; do
- let attempts=attempts+1
-
- new_file=
- while read -n1 character ; do
- if [[ "${character}" == "X" ]] ; then
- tmpfile+="${RANDOM:0:1}"
- else
- tmpfile+="${character}"
- fi
- done < <(echo -n "${template}")
-
- if [[ ! -f "${tmpfile}" ]]
- then
- echo "${tmpfile}"
- return
- fi
-
- if [[ ${attempts} -ge 100 ]] ; then
- echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
- return
- fi
- done
- }
-
- local mysqld_binary="${EROOT}/usr/sbin/mysqld"
- if [[ ! -x "${mysqld_binary}" ]] ; then
- die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
- fi
-
- local mysql_binary="${EROOT}/usr/bin/mysql"
- if [[ ! -x "${mysql_binary}" ]] ; then
- die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
- fi
-
- local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
- if [[ ! -x "${my_print_defaults_binary}" ]] ; then
- die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
- fi
-
- if [[ -z "${MYSQL_USER}" ]] ; then
- MYSQL_USER=mysql
- if use prefix ; then
- MYSQL_USER=$(id -u -n 2>/dev/null)
- if [[ -z "${MYSQL_USER}" ]] ; then
- die "Failed to determine current username!"
- fi
- fi
- fi
-
- if [[ -z "${MYSQL_GROUP}" ]] ; then
- MYSQL_GROUP=mysql
- if use prefix ; then
- MYSQL_GROUP=$(id -g -n 2>/dev/null)
- if [[ -z "${MYSQL_GROUP}" ]] ; then
- die "Failed to determine current user groupname!"
- fi
- fi
- fi
-
- # my_print_defaults needs to read stuff in $HOME/.my.cnf
- local -x HOME="${EROOT}/root"
-
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- # Read currently set data directory
- MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if [[ -z "${MY_DATADIR}" ]] ; then
- die "Sorry, unable to find MY_DATADIR!"
- elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
- ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
- ewarn "Please rename or delete its content if you wish to initialize a new data directory."
- die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
- fi
-
- MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
- # These are dir+prefix
- MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
- MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
- MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
- MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-
- # Create missing directories.
- # Always check if mysql user can write to directory even if we just
- # created directory because a parent directory might be not
- # accessible for that user.
- PID_DIR="${EROOT}/run/mysqld"
- if [[ ! -d "${PID_DIR}" ]] ; then
- einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
- install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
- || die "Failed to create PID directory '${PID_DIR}'!"
- fi
-
- local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
- [[ -z "${_pid_dir_testfile}" ]] \
- && die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
- if use prefix ; then
- touch "${_pid_dir_testfile}" &>/dev/null
- else
- su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
- fi
-
- if [[ $? -ne 0 ]] ; then
- die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
- else
- rm "${_pid_dir_testfile}" || die
- unset _pid_dir_testfile
- fi
-
- if [[ ! -d "${MY_DATADIR}" ]] ; then
- einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
- install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
- || die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
- fi
-
- local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
- [[ -z "${_my_datadir_testfile}" ]] \
- && die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
- if use prefix ; then
- touch "${_my_datadir_testfile}" &>/dev/null
- else
- su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
- fi
-
- if [[ $? -ne 0 ]] ; then
- die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
- else
- rm "${_my_datadir_testfile}" || die
- unset _my_datadir_testfile
- fi
-
- if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
- einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
- install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
- || die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
- fi
-
- if [[ -z "${MYSQL_TMPDIR}" ]] ; then
- MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
- [[ -z "${MYSQL_TMPDIR}" ]] \
- && die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
-
- mkdir "${MYSQL_TMPDIR}" || die
- chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
- fi
-
- # Now we need to test MYSQL_TMPDIR...
- local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
- [[ -z "${_my_tmpdir_testfile}" ]] \
- && die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
- if use prefix ; then
- touch "${_my_tmpdir_testfile}" &>/dev/null
- else
- su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
- fi
-
- if [[ $? -ne 0 ]] ; then
- die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
- else
- rm "${_my_tmpdir_testfile}" || die
- unset _my_tmpdir_testfile
- fi
-
- if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
- einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
- install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
- || die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
- fi
-
- if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
- local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
- [[ -z "${_my_logbin_testfile}" ]] \
- && die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
- if use prefix ; then
- touch "${_my_logbin_testfile}" &>/dev/null
- else
- su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
- fi
-
- if [[ $? -ne 0 ]] ; then
- die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
- else
- rm "${_my_logbin_testfile}" || die
- unset _my_logbin_testfile
- fi
- fi
-
- if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
- einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
- install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
- || die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
- fi
-
- if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
- local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
- [[ -z "${_my_relaylog_testfile}" ]] \
- && die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
- if use prefix ; then
- touch "${_my_relaylog_testfile}" &>/dev/null
- else
- su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
- fi
-
- if [[ $? -ne 0 ]] ; then
- die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
- else
- rm "${_my_relaylog_testfile}" || die
- unset _my_relaylog_testfile
- fi
- fi
-
- local mysql_install_log="$(_mktemp_dry "${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log")"
- if [[ -z "${mysql_install_log}" ]] ; then
- die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log' failed!"
- else
- # make sure file is writable for MYSQL_USER...
- touch "${mysql_install_log}" || die
- chown ${MYSQL_USER} "${mysql_install_log}" || die
- fi
-
- local mysqld_logfile="$(_mktemp_dry "${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log")"
- if [[ -z "${mysqld_logfile}" ]] ; then
- die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log' failed!"
- else
- # make sure file is writable for MYSQL_USER...
- touch "${mysqld_logfile}" || die
- chown ${MYSQL_USER} "${mysqld_logfile}" || die
- fi
-
- echo ""
- einfo "Detected settings:"
- einfo "=================="
- einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
- einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
- einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
- einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
-
- if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
- einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
- fi
-
- if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
- einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
- fi
-
- einfo "PID DIR:\t\t\t\t${PID_DIR}"
- einfo "Install db log:\t\t\t${mysql_install_log}"
- einfo "Install server log:\t\t\t${mysqld_logfile}"
-
- local -a config_files
-
- local config_file="${EROOT}/etc/mysql/mysql.d/50-distro-client.cnf"
- if [[ -f "${config_file}" ]] ; then
- config_files+=( "${config_file}" )
- else
- ewarn "Client configuration '${config_file}' not found; Skipping configuration of default authentication plugin for client ..."
- fi
-
- config_file="${EROOT}/etc/mysql/mysql.d/50-distro-server.cnf"
- if [[ -f "${config_file}" ]] ; then
- config_files+=( "${config_file}" )
- else
- ewarn "Server configuration '${config_file}' not found; Skipping configuration of default authentication plugin for mysqld ..."
- fi
-
- if [[ ${#config_files[@]} -gt 0 ]] ; then
- if [[ -z "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" ]] ; then
- local user_answer
-
- echo
- einfo "Please select default authentication plugin (enter number or plugin name):"
- einfo "1) caching_sha2_password [MySQL 8.0 default]"
- einfo "2) mysql_native_password [MySQL 5.7 default]"
- einfo
- einfo "For details see:"
- einfo "https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html#upgrade-caching-sha2-password"
- read -p " >" user_answer
- echo
-
- case "${user_answer}" in
- 1|caching_sha2_password)
- MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=caching_sha2_password
- ;;
- 2|mysql_native_password)
- MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=mysql_native_password
- ;;
- '')
- die "No authentication plugin selected!"
- ;;
- *)
- die "Authentication plugin '${user_answer}' is unknown/unsupported!"
- ;;
- esac
-
- echo "Selected authentication plugin: ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" >> "${mysql_install_log}"
-
- unset user_answer
- fi
-
- local cfg_option cfg_option_tabs cfg_section
- for config_file in "${config_files[@]}" ; do
- cfg_option="default-authentication-plugin"
- cfg_section="mysqld"
- cfg_option_tabs="\t\t"
- if [[ "${config_file}" == *client.cnf ]] ; then
- cfg_option="default-auth"
- cfg_section="client"
- cfg_option_tabs="\t\t\t\t"
- fi
-
- if grep -qE "^(loose-)?${cfg_option}\b.*=" "${config_file}" 2>/dev/null ; then
- einfo "Ensuring that ${cfg_option} is set to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
- sed -i \
- -e "s/^\(loose-\)\?${cfg_option}\b.*=.*/loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}/" \
- "${config_file}" || die "Failed to change ${cfg_option} in '${config_file}'!"
- else
- einfo "Setting ${cfg_option} to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
- sed -i \
- -e "/^\[${cfg_section}\]$/a loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" \
- "${config_file}" || die "Failed to add ${cfg_option} to '${config_file}'!"
- fi
- done
- unset cfg_option cfg_option_tabs cfg_section
- fi
- unset config_files config_file
-
- echo
-
- if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
- local tmp_mysqld_password_source=
-
- for tmp_mysqld_password_source in mysql client ; do
- einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
- MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
- if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
- if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
- ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
- MYSQL_ROOT_PASSWORD=
- continue
- fi
-
- einfo "Found password in '${tmp_mysqld_password_source}' section!"
- break
- fi
- done
-
- # Sometimes --show is required to display passwords in some implementations of my_print_defaults
- if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
- MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
- fi
-
- unset tmp_mysqld_password_source
- fi
-
- if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
- local pwd1="a"
- local pwd2="b"
-
- echo
- einfo "No password for mysql 'root' user was specified via environment"
- einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
- einfo "file like '${HOME}/.my.cnf'."
- einfo "To continue please provide a password for the mysql 'root' user"
- einfo "now on console:"
- ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
- read -rsp " >" pwd1 ; echo
-
- einfo "Retype the password"
- read -rsp " >" pwd2 ; echo
-
- if [[ "x$pwd1" != "x$pwd2" ]] ; then
- die "Passwords are not the same!"
- fi
-
- MYSQL_ROOT_PASSWORD="${pwd1}"
- unset pwd1 pwd2
-
- echo
- fi
-
- local -a mysqld_options
-
- # Fix bug 446200. Don't reference host my.cnf, needs to come first,
- # see http://bugs.mysql.com/bug.php?id=31312
- use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
-
- # Figure out which options we need to disable to do the setup
- local helpfile="${TMPDIR}/mysqld-help"
- "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-
- local opt optexp optfull
- for opt in host-cache name-resolve networking slave-start \
- federated ssl log-bin relay-log slow-query-log external-locking \
- log-slave-updates \
- ; do
- optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
- egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
- done
-
- # Prepare timezones, see
- # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
- local tz_sql="$(_mktemp_dry "${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql")"
- [[ -z "${tz_sql}" ]] \
- && die "_mktemp_dry() for '${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql' failed!"
-
- echo "USE mysql;" >"${tz_sql}"
- "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
- if [[ $? -ne 0 ]] ; then
- die "mysql_tzinfo_to_sql failed!"
- fi
-
- # --initialize-insecure will not set root password
- # --initialize would set a random one in the log which we don't need as we set it ourselves
- local cmd=(
- "${mysqld_binary}"
- "${mysqld_options[@]}"
- "--initialize-insecure"
- "--init-file='${tz_sql}'"
- "--basedir='${EROOT}/usr'"
- "--datadir='${MY_DATADIR}'"
- "--tmpdir='${MYSQL_TMPDIR}'"
- "--log-error='${mysql_install_log}'"
- "--user=${MYSQL_USER}"
- )
-
- einfo "Initializing ${PN} data directory: ${cmd[@]}"
- eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
-
- if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql.ibd" ]] ; then
- grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
- die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
- fi
-
- rm "${tz_sql}" || die
-
- local x=${RANDOM}
- local socket="${EROOT}${PID_DIR}/mysqld${x}.sock"
- local pidfile="${EROOT}${PID_DIR}/mysqld${x}.pid"
- unset x
-
- cmd=(
- "${mysqld_binary}"
- "${mysqld_options[@]}"
- "--basedir='${EROOT}/usr'"
- "--datadir='${MY_DATADIR}'"
- "--tmpdir='${MYSQL_TMPDIR}'"
- --max_allowed_packet=8M
- --net_buffer_length=16K
- "--socket='${socket}'"
- "--pid-file='${pidfile}'"
- "--log-error='${mysqld_logfile}'"
- "--user=${MYSQL_USER}"
- )
-
- einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
- eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
-
- echo -n "Waiting for mysqld to accept connections "
- local maxtry=15
- while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
- maxtry=$((${maxtry}-1))
- echo -n "."
- sleep 1
- done
-
- if [[ -S "${socket}" ]] ; then
- # Even with a socket we don't know if mysqld will abort
- # start due to an error so just wait a little bit more...
- maxtry=5
- while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
- maxtry=$((${maxtry}-1))
- echo -n "."
- sleep 1
- done
- fi
-
- echo
-
- if [[ ! -S "${socket}" ]] ; then
- grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
- die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
- fi
-
- local mysql_logfile="${TMPDIR}/set_root_pw.log"
- touch "${mysql_logfile}" || die
-
- ebegin "Setting root password"
- # Do this from memory, as we don't want clear text passwords in temp files
- local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
- cmd=(
- "${mysql_binary}"
- --no-defaults
- "--socket='${socket}'"
- -hlocalhost
- "-e \"${sql}\""
- )
- eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
- local rc=$?
- eend ${rc}
-
- if [[ ${rc} -ne 0 ]] ; then
- # Poor man's solution which tries to avoid having password
- # in log. NOTE: sed can fail if user didn't follow advice
- # and included character which will require escaping...
- sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
-
- grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
- die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
- fi
-
- # Stop the server
- if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
- echo -n "Stopping the server "
- pkill -F "${pidfile}" &>/dev/null
-
- maxtry=10
- while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
- maxtry=$((${maxtry}-1))
- echo -n "."
- sleep 1
- done
-
- echo
-
- if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
- # We somehow failed to stop server.
- # However, not a fatal error. Just warn the user.
- ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
- fi
- fi
-
- einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
-}
diff --git a/dev-db/percona-server/percona-server-8.0.21.12.ebuild b/dev-db/percona-server/percona-server-8.0.21.12.ebuild
index 14f08b79a9b5..5081142e8ad8 100644
--- a/dev-db/percona-server/percona-server-8.0.21.12.ebuild
+++ b/dev-db/percona-server/percona-server-8.0.21.12.ebuild
@@ -17,7 +17,7 @@ MY_MAJOR_PV=$(ver_cut 1-2)
MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/${MY_MAJOR_PV}/"
# Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/percona-server/${PN}-8.0.21.12-patches-01.tar.xz"
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/percona-server/${PN}-8.0.21.12-patches-02.tar.xz"
SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION}).tar.bz2
diff --git a/dev-db/percona-server/percona-server-8.0.20.11-r2.ebuild b/dev-db/percona-server/percona-server-8.0.22.13.ebuild
similarity index 97%
rename from dev-db/percona-server/percona-server-8.0.20.11-r2.ebuild
rename to dev-db/percona-server/percona-server-8.0.22.13.ebuild
index e75b78da1705..42612652afc5 100644
--- a/dev-db/percona-server/percona-server-8.0.20.11-r2.ebuild
+++ b/dev-db/percona-server/percona-server-8.0.22.13.ebuild
@@ -5,10 +5,10 @@ EAPI="7"
CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake flag-o-matic linux-info \
- multiprocessing prefix toolchain-funcs check-reqs
+inherit check-reqs cmake flag-o-matic linux-info \
+ multiprocessing prefix toolchain-funcs
-MY_BOOST_VERSION="1.70.0"
+MY_BOOST_VERSION="1.73.0"
MY_PV=$(ver_rs 3 '-')
MY_PV="${MY_PV//_pre*}"
MY_PN="Percona-Server"
@@ -17,7 +17,7 @@ MY_MAJOR_PV=$(ver_cut 1-2)
MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/${MY_MAJOR_PV}/"
# Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/percona-server/${PN}-8.0.20.11-patches-02.tar.xz"
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/percona-server/${PN}-8.0.22.13-patches-01.tar.xz"
SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION}).tar.bz2
@@ -59,7 +59,7 @@ COMMON_DEPEND="
!libressl? ( >=dev-libs/openssl-1.0.0:0= )
server? (
dev-libs/icu:=
- dev-libs/libevent:=
+ dev-libs/libevent:=[ssl,threads]
>=dev-libs/protobuf-3.8:=
net-libs/libtirpc:=
net-misc/curl:=
@@ -101,8 +101,6 @@ RDEPEND="${COMMON_DEPEND}
# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-CHECKREQS_DISK_BUILD="9G"
-
mysql_init_vars() {
: ${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
: ${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
@@ -247,7 +245,6 @@ src_configure() {
-DENABLED_LOCAL_INFILE=1
-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-DWITH_DEFAULT_COMPILER_OPTIONS=0
- -DWITH_DEFAULT_FEATURE_SET=0
# The build forces this to be defined when cross-compiling. We pass it
# all the time for simplicity and to make sure it is actually correct.
-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
@@ -424,6 +421,7 @@ src_test() {
disabled_tests+=( "innodb.percona_log_encrypt_change_rk;6805;False positive on Gentoo (PS)" )
disabled_tests+=( "innodb.upgrade_orphan;0;Sporadic failing test" )
disabled_tests+=( "main.myisam-blob;0;Sporadic failing test" )
+ disabled_tests+=( "main.mysql_load_data_local_dir;7416;Known test failure" )
disabled_tests+=( "main.mysqlpump_basic_lz4;6042;Extra tool output causes false positive" )
disabled_tests+=( "main.ssl_bug75311;5996;Known test failure" )
disabled_tests+=( "main.ssl_san;6808;False positive on IPv6-enabled hosts" )
@@ -433,24 +431,17 @@ src_test() {
disabled_tests+=( "rpl_gtid.rpl_gtid_stm_drop_table;90612;Known test failure" )
disabled_tests+=( "rpl_gtid.rpl_multi_source_mtr_includes;0;Know failure - no upstream bug yet" )
disabled_tests+=( "sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware" )
+ disabled_tests+=( "sys_vars.innodb_sys_tablespace_encrypt_basic;7415;Known test failure" )
disabled_tests+=( "x.message_compressed_payload;0;False positive caused by protobuff-3.11+" )
disabled_tests+=( "x.message_protobuf_nested;6803;False positive caused by protobuff-3.11+" )
- # Known test failures due to expired SSL certificates -- fixed in 8.0.22
- disabled_tests+=( "auth_sec.admin_ssl_crl_crlpath;100055;Fixed in 8.0.22" )
- disabled_tests+=( "auth_sec.admin_ssl_crl;100055;Fixed in 8.0.22" )
- disabled_tests+=( "auth_sec.server_withssl_client_withssl;100055;Fixed in 8.0.22" )
- disabled_tests+=( "main.ssl_crl_clients_valid;100055;Fixed in 8.0.22" )
- disabled_tests+=( "main.ssl_crl;100055;Fixed in 8.0.22" )
- disabled_tests+=( "main.ssl_crl_crlpath;100055;Fixed in 8.0.22" )
- disabled_tests+=( "main.ssl_ca;100055;Fixed in 8.0.22" )
-
if ! hash zip 1>/dev/null 2>&1 ; then
# no need to force dep app-arch/zip for one test
+ disabled_tests+=( "innodb.discarded_partition_create;0;Requires app-arch/zip" )
disabled_tests+=( "innodb.partition_upgrade_create;0;Requires app-arch/zip" )
fi
- local test_ds
+ local test_infos_str test_infos_arr
for test_infos_str in "${disabled_tests[@]}" ; do
IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
@@ -460,7 +451,7 @@ src_test() {
_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
done
- unset test_ds test_infos_str test_infos_arr
+ unset test_infos_str test_infos_arr
if [[ -z "${MTR_VAULT_TOKEN}" ]] ; then
local impossible_test
@@ -482,6 +473,7 @@ src_test() {
keyring_vault.table_encrypt_5_directory \
keyring_vault.table_encrypt_kill \
keyring_vault.temp_table_encrypt_keyring_vault \
+ main.persisted_variables \
; do
_disable_test "${impossible_test}" "0" "MTR_VAULT_TOKEN is not set"
done
@@ -752,6 +744,7 @@ pkg_config() {
fi
MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
# These are dir+prefix
MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index 5966983d340d..515fa48e511a 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -2,3 +2,4 @@ DIST pgadmin4-4.17.tar.gz 28007097 BLAKE2B d296f2b9372c23067db899fa82e1b8e732837
DIST pgadmin4-4.25.tar.gz 33167393 BLAKE2B 5a40e45c53f79ea66c6f685d1605ddce7b1758540bf3a6863d4b092cc4dab5b00daff15832cd6feee28aa348c7a5376e25a93508fd348d8ffd4d29031e2b6c68 SHA512 a1944f9c65b8aa7ec5bd83ef75702293d869ae341ea73f81fb4358bfbc7f91a6981237eb9f1b20055c5f3fa182428afe19dc170963265789c34d73f2e240c268
DIST pgadmin4-4.26.tar.gz 33525278 BLAKE2B 2a4061f59299bc48b029a4a93f410538170b6c3d97597074d2b3b6eed1de0f9a1ac88bc187614d9e46d8fe872941f173ba0f0a02def590451dad09e6a3b78e5a SHA512 952a4771f80541c54234fcaa9c870283fdf4887246d0d9751a77c28340b7e39ba871141f230086efda9a274d5e6bd567305047cdc7edf766ccd41112281fdf94
DIST pgadmin4-4.28.tar.gz 35386627 BLAKE2B 6cbee6ccadf3b35e1b0aece2e8fc4b9e35dd04ed70436a3b74d69c09e887499c3a2ab8710d16df3327cd848c3c5ee1fac2cde06facbdc5605673b04a4a4fc434 SHA512 b9e8946e8133b382b9d69126c1ec6fc07a4b2051316c2151c339f15652900fa2bdf0a07811e052548c3f8699e382d8c16d187e89409b194e491148123558522e
+DIST pgadmin4-4.29.tar.gz 35389494 BLAKE2B faaa84c0eee9c92ba483f4adffaf9e39e0c5f8ea21630a9ee8fad62aa833c88aa913df50c760be740afa0696aa1fbf1b6902a8b5bfd322822472f7d2dcb295e1 SHA512 2c7d20d10c96712f41621c2862a6a6222f6d6dad4a0b3e1aaf04744e65744460dcae4220f61b27785e02c82a624fa0793df2ea9d8e83ac0a6de048455929e615
diff --git a/dev-db/pgadmin4/pgadmin4-4.29.ebuild b/dev-db/pgadmin4/pgadmin4-4.29.ebuild
new file mode 100644
index 000000000000..f795a75bfb27
--- /dev/null
+++ b/dev-db/pgadmin4/pgadmin4-4.29.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+inherit desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="GUI administration and development platform for PostgreSQL"
+HOMEPAGE="https://www.pgadmin.org/"
+SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+# libsodium dep added because of 689678
+COMMON_DEPEND="${PYTHON_DEPS}
+ dev-libs/libsodium[-minimal]
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtwidgets:5
+"
+DEPEND="${COMMON_DEPEND}
+ doc? (
+ $(python_gen_cond_dep '
+ dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+ virtual/imagemagick-tools[png]
+"
+
+# In 4.25's requirement.txt, bcrypt is listed as <=3.17, but upstream's
+# git history shows this is just for compatibility with =dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-compress-1.4.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-security-3.0.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-sqlalchemy-2.4.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-wtf-0.14.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/ldap3-2.5.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/passlib-1.7.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psutil-5.7.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pytz-2020.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/sqlalchemy-1.3.13[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/sqlparse-0.3.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/sshtunnel-0.1.5[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/werkzeug-0.15.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
+ dev-python/bcrypt[${PYTHON_MULTI_USEDEP}]
+ dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
+ dev-python/python-email-validator[${PYTHON_MULTI_USEDEP}]
+ ')
+"
+
+S="${WORKDIR}"/${P}/runtime
+
+src_prepare() {
+ cd "${WORKDIR}"/${P} || die
+ default
+}
+
+src_configure() {
+ export PGADMIN_PYTHON_DIR="${EPREFIX}/usr"
+ eqmake5
+}
+
+src_compile() {
+ default
+ use doc && emake -C "${WORKDIR}"/${P} docs
+}
+
+src_install() {
+ dobin pgAdmin4
+
+ cd "${WORKDIR}"/${P} || die
+
+ local APP_DIR=/usr/share/${PN}/web
+ insinto "${APP_DIR}"
+ doins -r web/.
+ newins - config_local.py <<-EOF
+ SERVER_MODE = False
+ UPGRADE_CHECK_ENABLED = False
+ EOF
+ python_optimize "${D}${APP_DIR}"
+
+ insinto /etc/xdg/pgadmin
+ newins - pgadmin4.conf <<-EOF
+ [General]
+ ApplicationPath=${APP_DIR}
+ PythonPath=$(python_get_sitedir)
+ EOF
+
+ if use doc; then
+ rm -r docs/en_US/_build/html/_sources || die
+ insinto /usr/share/${PN}/docs/en_US/_build
+ doins -r docs/en_US/_build/html
+ fi
+
+ local s
+ for s in 16 32 48 64 72 96 128 192 256; do
+ convert runtime/pgAdmin4.png -resize ${s}x${s} ${PN}_${s}.png || die
+ newicon -s ${s} ${PN}_${s}.png ${PN}.png
+ done
+ domenu "${FILESDIR}"/${PN}.desktop
+}
diff --git a/dev-db/pgrouting/Manifest b/dev-db/pgrouting/Manifest
index 89385eed601a..36a983e101a7 100644
--- a/dev-db/pgrouting/Manifest
+++ b/dev-db/pgrouting/Manifest
@@ -1,2 +1,3 @@
DIST pgrouting-2.6.2.tar.gz 6065517 BLAKE2B e27e28cf988040de1e894a857e3d210bc7676271f69d898afc2d6116d5b88d87404723b2cb1283ef77b4449b4aa62a03e2dbcd489ac641a4721a596d29f8fecd SHA512 6e37f66e631d0cc87e135be7d095822aae21656bb56b3d18afa5bececaad8cee6324d37e8e152bbf69e3374ded1f10aa4b9a4c52b873e3a4c43e73cd877fddcb
DIST pgrouting-3.1.1.tar.gz 6133979 BLAKE2B b7657eeb88773773e6166190cda73d9e657774ff81ce7e9f005333a8dcb9d56587d4a793410356092bb1623ec287549dbc60d814b1d5156ff28301503acee776 SHA512 73285d2d47be844203df136b8a8c13d1672ad8c2dac44a1ff7ce16e4676043692a8f2a60a305542132891da83560c49c5eaeb7712e3e3dd250cd8fd550260d4a
+DIST pgrouting-3.1.2.tar.gz 6063893 BLAKE2B a371fb9c744b14072c65af5ceb1ea73d2cdb69821626be3ac79e08c9dee854272ce8cb3816d1de3eade06d50a7520846dd6bccda06934b9db926f9092719f131 SHA512 3cf3e0a4a726f6f11887d15ad71b789a9067f3bc5a675288f22730215aa12d12b94d75f9bdc8ab3077de8368c45c55c0dc27128d0453c4c30965bfc0cf118dcd
diff --git a/dev-db/pgrouting/pgrouting-3.1.2.ebuild b/dev-db/pgrouting/pgrouting-3.1.2.ebuild
new file mode 100644
index 000000000000..addf00e4158a
--- /dev/null
+++ b/dev-db/pgrouting/pgrouting-3.1.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE="Release"
+
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_USEDEP="server"
+
+inherit cmake postgres-multi
+
+DESCRIPTION="pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality."
+HOMEPAGE="https://pgrouting.org/"
+LICENSE="GPL-2 MIT Boost-1.0"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+SRC_URI="https://github.com/pgRouting/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE=""
+
+RDEPEND="${POSTGRES_DEP}
+ >=dev-db/postgis-2.0
+ dev-libs/boost
+ sci-mathematics/cgal
+"
+DEPEND="${RDEPEND}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+src_prepare() {
+ cmake_src_prepare
+ postgres-multi_src_prepare
+}
+
+my_src_configure() {
+ local mycmakeargs=( -DPOSTGRESQL_BIN="$($PG_CONFIG --bindir)" )
+ cmake_src_configure
+}
+
+src_configure() {
+ postgres-multi_foreach my_src_configure
+}
+
+src_compile() {
+ postgres-multi_foreach cmake_build
+}
+
+src_install() {
+ postgres-multi_foreach cmake_src_install
+}
diff --git a/dev-db/postgis/files/postgis-3.0.3-avoid-calling-ar-directly.patch b/dev-db/postgis/files/postgis-3.0.3-avoid-calling-ar-directly.patch
new file mode 100644
index 000000000000..66a82e1e7261
--- /dev/null
+++ b/dev-db/postgis/files/postgis-3.0.3-avoid-calling-ar-directly.patch
@@ -0,0 +1,85 @@
+From 7c5acb8ab83ee278f6a16c7279c3a12ca93499e9 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel
+Date: Sat, 5 Dec 2020 13:38:03 +0100
+Subject: [PATCH] avoid calling ar directly
+
+Signed-off-by: Bernd Waibel
+---
+ configure.ac | 2 +-
+ deps/wagyu/Makefile.in | 4 +++-
+ libpgcommon/Makefile.in | 4 +++-
+ raster/rt_core/Makefile.in | 1 +
+ 4 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4f26390..362d3e6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,7 +14,7 @@ AC_CONFIG_HEADERS([postgis_config.h])
+ AC_CONFIG_MACRO_DIR([macros])
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_PROG_INSTALL
+-
++AM_PROG_AR
+
+ dnl Invoke libtool: we do this as it is the easiest way to find the PIC
+ dnl flags required to build liblwgeom
+diff --git a/deps/wagyu/Makefile.in b/deps/wagyu/Makefile.in
+index 03d2279..05d6629 100644
+--- a/deps/wagyu/Makefile.in
++++ b/deps/wagyu/Makefile.in
+@@ -28,6 +28,8 @@ LDFLAGS = @LDFLAGS@
+ top_builddir = @top_builddir@
+ libdir = @libdir@
+ LIBTOOL = @LIBTOOL@
++AR = @AR@
++ARFLAGS = rs
+
+ WAGYU_OBJS = \
+ lwgeom_wagyu.o
+@@ -78,7 +80,7 @@ WAGYU_HEADERS = \
+ all: @WAGYU_LIB@
+
+ @WAGYU_LIB@: $(WAGYU_OBJS)
+- ar rs @WAGYU_LIB@ $(WAGYU_OBJS)
++ $(AR) $(ARFLAGS) @WAGYU_LIB@ $(WAGYU_OBJS)
+
+ $(WAGYU_OBJS): %.o: %.cpp ../../liblwgeom/liblwgeom.h $(WAGYU_HEADERS)
+ $(CXX) $(CXXFLAGS) -c -o $@ $<
+diff --git a/libpgcommon/Makefile.in b/libpgcommon/Makefile.in
+index c44cf5b..78eb282 100644
+--- a/libpgcommon/Makefile.in
++++ b/libpgcommon/Makefile.in
+@@ -12,6 +12,8 @@
+ CC=@CC@
+ CFLAGS=-I../liblwgeom @WARNFLAGS@ @CFLAGS@ @PGSQL_BE_CPPFLAGS@ @PROJ_CPPFLAGS@ @PICFLAGS@ @GETTEXT_CFLAGS@
+ LDFLAGS=@GETTEXT_LDFLAGS@ @LIBINTL@
++AR = @AR@
++ARFLAGS = rs
+
+ NUMERICFLAGS=@NUMERICFLAGS@
+
+@@ -39,7 +41,7 @@ all: libpgcommon.a
+ install uninstall:
+
+ libpgcommon.a: $(SA_OBJS) $(SA_HEADERS)
+- ar rs libpgcommon.a $(SA_OBJS)
++ $(AR) $(ARFLAGS) libpgcommon.a $(SA_OBJS)
+
+ maintainer-clean: clean
+
+diff --git a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in
+index 380a3e7..b399661 100644
+--- a/raster/rt_core/Makefile.in
++++ b/raster/rt_core/Makefile.in
+@@ -18,6 +18,7 @@
+ #
+ #############################################################################
+
++AR = @AR@
+ ARFLAGS = rs
+
+ CC = @CC@
+--
+2.29.2
+
diff --git a/dev-db/postgis/postgis-3.0.3.ebuild b/dev-db/postgis/postgis-3.0.3-r1.ebuild
similarity index 96%
rename from dev-db/postgis/postgis-3.0.3.ebuild
rename to dev-db/postgis/postgis-3.0.3-r1.ebuild
index 3e05e061edf1..ef6c9bc20dbb 100644
--- a/dev-db/postgis/postgis-3.0.3.ebuild
+++ b/dev-db/postgis/postgis-3.0.3-r1.ebuild
@@ -53,7 +53,10 @@ DEPEND="${RDEPEND}
test? ( dev-util/cunit )
"
-PATCHES=( "${FILESDIR}/${PN}-2.2.0-arflags.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+ "${FILESDIR}/${P}-avoid-calling-ar-directly.patch"
+)
src_prepare() {
default
diff --git a/dev-db/postgis/postgis-3.1.0_alpha3.ebuild b/dev-db/postgis/postgis-3.1.0_alpha3-r1.ebuild
similarity index 96%
rename from dev-db/postgis/postgis-3.1.0_alpha3.ebuild
rename to dev-db/postgis/postgis-3.1.0_alpha3-r1.ebuild
index 36cb7623ef8f..d9647334f4e1 100644
--- a/dev-db/postgis/postgis-3.1.0_alpha3.ebuild
+++ b/dev-db/postgis/postgis-3.1.0_alpha3-r1.ebuild
@@ -53,7 +53,10 @@ DEPEND="${RDEPEND}
test? ( dev-util/cunit )
"
-PATCHES=( "${FILESDIR}/${PN}-2.2.0-arflags.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+ "${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch"
+)
src_prepare() {
default
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 030f9e27e752..2cb76a697d4e 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/binary/binary-0.8.7.0.ebuild b/dev-haskell/binary/binary-0.8.7.0.ebuild
index 47206fbe4a64..5755eb819db0 100644
--- a/dev-haskell/binary/binary-0.8.7.0.ebuild
+++ b/dev-haskell/binary/binary-0.8.7.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
# ebuild generated by hackport 0.6.9999
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite has circular depends
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Circular depend: test-suite"
# break circular dependencies:
# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
CABAL_FEATURES+=" nocabaldep"
@@ -21,17 +21,11 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
-RESTRICT=test # binary[test]->test-framework->text->xml->binary
+RESTRICT=test # circular depend: test-framework->base-orphans->cabal->semigroups->nats->binary
RDEPEND=">=dev-lang/ghc-7.8.2:=
"
-DEPEND="${RDEPEND}"
-# test? ( >=dev-haskell/base-orphans-0.8.1 =dev-haskell/quickcheck-2.9
-# >=dev-haskell/random-1.0.1.0
-# dev-haskell/test-framework
-# >=dev-haskell/test-framework-quickcheck2-0.3 )
-# "
+DEPEND="${RDEPEND}
+"
CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha1 PM:9999"
diff --git a/dev-haskell/clock/clock-0.7.2.ebuild b/dev-haskell/clock/clock-0.7.2.ebuild
index ee39489573f7..3cf62699328d 100644
--- a/dev-haskell/clock/clock-0.7.2.ebuild
+++ b/dev-haskell/clock/clock-0.7.2.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=6
@@ -6,7 +6,7 @@ EAPI=6
# ebuild generated by hackport 0.4.7.9999
#hackport: flags: -llvm
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: circular depends
inherit haskell-cabal
DESCRIPTION="High-resolution clock functions: monotonic, realtime, cputime"
@@ -24,8 +24,6 @@ RDEPEND=">=dev-lang/ghc-7.4.1:=
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/tasty-0.10
- dev-haskell/tasty-quickcheck )
"
src_configure() {
diff --git a/dev-haskell/parsec/metadata.xml b/dev-haskell/parsec/metadata.xml
index e593d5b00bd3..93067ba142c1 100644
--- a/dev-haskell/parsec/metadata.xml
+++ b/dev-haskell/parsec/metadata.xml
@@ -1,10 +1,16 @@
-
- haskell@gentoo.org
-
-
- aslatter/parsec
-
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
+ Parsec is designed from scratch as an industrial-strength parser
+ library. It is simple, safe, well documented (on the package
+ homepage), has extensive libraries and good error messages,
+ and is also fast. It is defined as a monad transformer that can be
+ stacked on arbitrary monads, and it is also parametric in the
+ input stream type.
+
diff --git a/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild b/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild
index 9999fac242a9..0a7c5b66927a 100644
--- a/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild
+++ b/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
# ebuild generated by hackport 0.5.5.9999
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Circulare depends: test-suite"
# break circular dependencies:
# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
CABAL_FEATURES+=" nocabaldep"
@@ -17,11 +17,10 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-#keep in sync with ghc-8.6
-#KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
-RESTRICT=test # circular dependencies
+RESTRICT=test # circular dependencies: dev-haskell/base-orphans->cabal->parsec[test]->test-framework-hunit->test-framework->base-orphans
RDEPEND=">=dev-haskell/fail-4.9:=[profile?] =dev-haskell/mtl-1.1.1:=[profile?] =dev-haskell/test-framework-0.8 =dev-haskell/test-framework-hunit-0.3 =dev-haskell/hunit-1.3.1.2 =dev-haskell/hunit-1.6 cabal->parsec[test]->test-framework-hunit->test-framework->base-orphans
RDEPEND=">=dev-haskell/fail-4.9:=[profile?] =dev-haskell/mtl-1.1.1:=[profile?] =dev-haskell/test-framework-0.8 =dev-haskell/test-framework-hunit-0.3 =dev-haskell/hunit-1.3.1.2 =dev-haskell/hunit-1.6
+Date: Sun, 9 Aug 2020 09:15:16 -0400
+Subject: [PATCH] Revert "[linker/rtsSymbols] More linker symbols"
+
+This reverts commit aa2e5863699306920513b216f337de09e29b5bb8.
+---
+ rts/RtsSymbols.c | 224 ++++-------------------------------------------
+ 1 file changed, 17 insertions(+), 207 deletions(-)
+
+diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c
+index d10a6900db..b2f90a892d 100644
+--- a/rts/RtsSymbols.c
++++ b/rts/RtsSymbols.c
+@@ -58,6 +58,7 @@
+ SymI_HasProto(signal_handlers) \
+ SymI_HasProto(stg_sig_install) \
+ SymI_HasProto(rtsTimerSignal) \
++ SymI_HasProto(atexit) \
+ SymI_NeedsDataProto(nocldstop)
+ #endif
+
+@@ -976,213 +977,29 @@
+ RTS_USER_SIGNALS_SYMBOLS \
+ RTS_INTCHAR_SYMBOLS
+
++
+ // 64-bit support functions in libgcc.a
+-// See https://gcc.gnu.org/onlinedocs/gccint/Libgcc.html#Libgcc
+-#define RTS_LIBGCC_SYMBOLS_32 \
+- SymI_NeedsProto(__fixunsdfdi) \
+- /* 4 The GCC low-level runtime library */\
+- /* 4.1.1 Arithmetic functions */\
+- /* SymI_NeedsProto(__ashlsi3) */\
+- SymI_NeedsProto(__ashldi3) \
+- /* SymI_NeedsProto(__ashlti3) */\
+- /* These functions return the result of shifting a left by b bits. */\
+- /* SymI_NeedsProto(__ashrsi3) */\
+- SymI_NeedsProto(__ashrdi3) \
+- /* SymI_NeedsProto(__ashrti3) */\
+- /* These functions return the result of arithmetically shifting a right by b bits. */\
+- /* SymI_NeedsProto(__divsi3) */\
+- SymI_NeedsProto(__divdi3) \
+- /* SymI_NeedsProto(__divti3) */\
+- /* These functions return the quotient of the signed division of a and b. */\
+- /* SymI_NeedsProto(__lshrsi3) */ \
+- SymI_NeedsProto(__lshrdi3) \
+- /* SymI_NeedsProto(__lshrti3) */ \
+- /* These functions return the result of logically shifting a right by b bits. */\
+- /* SymI_NeedsProto(__modsi3) */ \
+- SymI_NeedsProto(__moddi3) \
+- /* SymI_NeedsProto(__modti3) */ \
+- /* These functions return the remainder of the signed division of a and b. */\
+- /* SymI_NeedsProto(__mulsi3) */ \
+- SymI_NeedsProto(__muldi3) \
+- /* SymI_NeedsProto(__multi3) */ \
+- /* These functions return the product of a and b. */\
+- SymI_NeedsProto(__negdi2) \
+- /* SymI_NeedsProto(__negti2) */ \
+- /* These functions return the negation of a. */\
+- /* SymI_NeedsProto(__udivsi3) */ \
+- SymI_NeedsProto(__udivdi3) \
+- /* SymI_NeedsProto(__udivti3) */ \
+- /* These functions return the quotient of the unsigned division of a and b. */\
+- SymI_NeedsProto(__udivmoddi4) \
+- /* SymI_NeedsProto(__udivmodti4) */ \
+- /* These functions calculate both the quotient and remainder of the unsigned division of a and b. The return value is the quotient, and the remainder is placed in variable pointed to by c. */\
+- /* SymI_NeedsProto(__umodsi3) */ \
+- SymI_NeedsProto(__umoddi3) \
+- /* SymI_NeedsProto(__umodti3) */ \
+- /* These functions return the remainder of the unsigned division of a and b. */\
+- /* 4.1.2 Comparison functions */\
+- /* The following functions implement integral comparisons. These functions implement a low-level compare, upon which the higher level comparison operators (such as less than and greater than or equal to) can be constructed. The returned values lie in the range zero to two, to allow the high-level operators to be implemented by testing the returned result using either signed or unsigned comparison. */\
+- SymI_NeedsProto(__cmpdi2) \
+- /* SymI_NeedsProto(__cmpti2) */ \
+- /* These functions perform a signed comparison of a and b. If a is less than b, they return 0; if a is greater than b, they return 2; and if a and b are equal they return 1. */\
+- SymI_NeedsProto(__ucmpdi2) \
+- /* SymI_NeedsProto(__ucmpti2) */ \
+- /* These functions perform an unsigned comparison of a and b. If a is less than b, they return 0; if a is greater than b, they return 2; and if a and b are equal they return 1. */\
+- /* 4.1.3 Trapping arithmetic functions */\
+- /* The following functions implement trapping arithmetic. These functions call the libc function abort upon signed arithmetic overflow. */\
+- SymI_NeedsProto(__absvsi2) \
+- SymI_NeedsProto(__absvdi2) \
+- /* These functions return the absolute value of a. */\
+- /* SymI_NeedsProto(__addvsi3) */ \
+- SymI_NeedsProto(__addvdi3) \
+- /* These functions return the sum of a and b; that is a + b. */\
+- /* SymI_NeedsProto(__mulvsi3) */ \
+- SymI_NeedsProto(__mulvdi3) \
+- /* The functions return the product of a and b; that is a * b. */\
+- SymI_NeedsProto(__negvsi2) \
+- SymI_NeedsProto(__negvdi2) \
+- /* These functions return the negation of a; that is -a. */\
+- /* SymI_NeedsProto(__subvsi3) */ \
+- SymI_NeedsProto(__subvdi3) \
+- /* These functions return the difference between b and a; that is a - b. */\
+- /* 4.1.4 Bit operations */\
+- SymI_NeedsProto(__clzsi2) \
+- SymI_NeedsProto(__clzdi2) \
+- /* SymI_NeedsProto(__clzti2) */ \
+- /* These functions return the number of leading 0-bits in a, starting at the most significant bit position. If a is zero, the result is undefined. */\
+- SymI_NeedsProto(__ctzsi2) \
+- SymI_NeedsProto(__ctzdi2) \
+- /* SymI_NeedsProto(__ctzti2) */ \
+- /* These functions return the number of trailing 0-bits in a, starting at the least significant bit position. If a is zero, the result is undefined. */\
+- SymI_NeedsProto(__ffsdi2) \
+- /* SymI_NeedsProto(__ffsti2) */ \
+- /* These functions return the index of the least significant 1-bit in a, or the value zero if a is zero. The least significant bit is index one. */\
+- SymI_NeedsProto(__paritysi2) \
+- SymI_NeedsProto(__paritydi2) \
+- /* SymI_NeedsProto(__parityti2) */\
+- /* These functions return the value zero if the number of bits set in a is even, and the value one otherwise. */\
+- SymI_NeedsProto(__popcountsi2) \
+- SymI_NeedsProto(__popcountdi2) \
+- /* SymI_NeedsProto(__popcountti2) */ \
+- /* These functions return the number of bits set in a. */\
+- SymI_NeedsProto(__bswapsi2) \
+- SymI_NeedsProto(__bswapdi2)
+-#define RTS_LIBGCC_SYMBOLS_aarch32 \
+- /* armv6l */\
+- /* TODO: should check for __ARM_EABI__ */\
+- SymI_NeedsProto(__aeabi_d2f) \
+- SymI_NeedsProto(__aeabi_d2iz) \
+- SymI_NeedsProto(__aeabi_d2lz) \
+- SymI_NeedsProto(__aeabi_d2uiz) \
+- SymI_NeedsProto(__aeabi_d2ulz) \
+- SymI_NeedsProto(__aeabi_dadd) \
+- SymI_NeedsProto(__aeabi_dcmpeq) \
+- SymI_NeedsProto(__aeabi_dcmpge) \
+- SymI_NeedsProto(__aeabi_dcmpgt) \
+- SymI_NeedsProto(__aeabi_dcmple) \
+- SymI_NeedsProto(__aeabi_dcmplt) \
+- SymI_NeedsProto(__aeabi_dcmpun) \
+- SymI_NeedsProto(__aeabi_ddiv) \
+- SymI_NeedsProto(__aeabi_dmul) \
+- SymI_NeedsProto(__aeabi_dneg) \
+- SymI_NeedsProto(__aeabi_dsub) \
+- SymI_NeedsProto(__aeabi_f2d) \
+- SymI_NeedsProto(__aeabi_f2iz) \
+- SymI_NeedsProto(__aeabi_f2lz) \
+- SymI_NeedsProto(__aeabi_f2uiz) \
+- SymI_NeedsProto(__aeabi_f2ulz) \
+- SymI_NeedsProto(__aeabi_fadd) \
+- SymI_NeedsProto(__aeabi_fcmpeq) \
+- SymI_NeedsProto(__aeabi_fcmpge) \
+- SymI_NeedsProto(__aeabi_fcmpgt) \
+- SymI_NeedsProto(__aeabi_fcmple) \
+- SymI_NeedsProto(__aeabi_fcmplt) \
+- SymI_NeedsProto(__aeabi_fcmpun) \
+- SymI_NeedsProto(__aeabi_fdiv) \
+- SymI_NeedsProto(__aeabi_fmul) \
+- SymI_NeedsProto(__aeabi_fneg) \
+- SymI_NeedsProto(__aeabi_fsub) \
+- SymI_NeedsProto(__aeabi_i2d) \
+- SymI_NeedsProto(__aeabi_i2f) \
+- SymI_NeedsProto(__aeabi_idiv) \
+- SymI_NeedsProto(__aeabi_idivmod) \
+- SymI_NeedsProto(__aeabi_l2d) \
+- SymI_NeedsProto(__aeabi_l2f) \
+- SymI_NeedsProto(__aeabi_lasr) \
+- SymI_NeedsProto(__aeabi_lcmp) \
+- SymI_NeedsProto(__aeabi_ldivmod) \
+- SymI_NeedsProto(__aeabi_llsl) \
+- SymI_NeedsProto(__aeabi_llsr) \
+- SymI_NeedsProto(__aeabi_lmul) \
+- SymI_NeedsProto(__aeabi_ui2d) \
+- SymI_NeedsProto(__aeabi_ui2f) \
+- SymI_NeedsProto(__aeabi_uidiv) \
+- SymI_NeedsProto(__aeabi_uidivmod) \
+- SymI_NeedsProto(__aeabi_ul2d) \
+- SymI_NeedsProto(__aeabi_ul2f) \
+- SymI_NeedsProto(__aeabi_ulcmp) \
+- SymI_NeedsProto(__aeabi_uldivmod)
+-#define RTS_LIBGCC_SYMBOLS_64 \
++#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32)
++#define RTS_LIBGCC_SYMBOLS \
++ SymI_NeedsProto(__divdi3) \
++ SymI_NeedsProto(__udivdi3) \
++ SymI_NeedsProto(__moddi3) \
++ SymI_NeedsProto(__umoddi3) \
++ SymI_NeedsProto(__muldi3) \
++ SymI_NeedsProto(__ashldi3) \
++ SymI_NeedsProto(__ashrdi3) \
++ SymI_NeedsProto(__lshrdi3) \
++ SymI_NeedsProto(__fixunsdfdi)
++#elif defined(__GNUC__) && SIZEOF_VOID_P == 8
++#define RTS_LIBGCC_SYMBOLS \
+ SymI_NeedsProto(__udivti3) \
+ SymI_NeedsProto(__umodti3)
+-
+-/* for aarch64 */
+-#define RTS_LIBGCC_SYMBOLS_aarch64 \
+- SymI_NeedsProto(__netf2) \
+- SymI_NeedsProto(__addtf3) \
+- SymI_NeedsProto(__subtf3) \
+- SymI_NeedsProto(__multf3) \
+- SymI_NeedsProto(__extenddftf2) \
+- SymI_NeedsProto(__fixtfsi) \
+- SymI_NeedsProto(__fixunstfsi) \
+- SymI_NeedsProto(__floatsitf) \
+- SymI_NeedsProto(__floatunsitf)
+-
+-#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && defined(arm_HOST_OS)
+-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_32 RTS_LIBGCC_SYMBOLS_aarch32
+-#elif defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32)
+-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_32
+-#elif defined(__GNUC__) && SIZEOF_VOID_P == 8 && defined(aarch64_HOST_OS)
+-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_64 RTS_LIBGCC_SYMBOLS_aarch64
+-#elif defined(__GNUC__) && SIZEOF_VOID_P == 8
+-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_64
+ #else
+ #define RTS_LIBGCC_SYMBOLS
+ #endif
+
+-#if !defined(mingw32_HOST_OS) && !defined(DYNAMIC) && (defined(_FORTIFY_SOURCE) || defined(__SSP__))
+-#define RTS_SSP_SYMBOLS \
+- SymI_NeedsProto(__stack_chk_guard) \
+- SymI_NeedsProto(__stack_chk_fail)
+-#else
+-#define RTS_SSP_SYMBOLS
+-#endif
+-#if !defined(DYNAMIC) && defined(linux_HOST_OS)
+-// we need these for static musl builds. However when
+-// linking shared objects (DLLs) this will fail, hence
+-// we do not include them when building with -DDYNAMIC
+-#define RTS_LINKER_SYMBOLS \
+- SymI_NeedsProto(__fini_array_start) \
+- SymI_NeedsProto(__fini_array_end)
+-#else
+-#define RTS_LINKER_SYMBOLS
+-#endif
+-
+-#if defined(darwin_HOST_OS) && defined(powerpc_HOST_ARCH)
+- // Symbols that don't have a leading underscore
+- // on Mac OS X. They have to receive special treatment,
+- // see machoInitSymbolsWithoutUnderscore()
+-#define RTS_MACHO_NOUNDERLINE_SYMBOLS \
+- SymI_NeedsProto(saveFP) \
+- SymI_NeedsProto(restFP)
+-#endif
+-
+ /* entirely bogus claims about types of these symbols */
+-/* to prevent a bit of define expansion, SymI_NeedsProto is a variadic
+- * macro. And we'll concat vvv with the __VA_ARGS__. This prevents
+- * vvv from getting macro expanded.
+- */
+-#define SymI_NeedsProto(vvv,...) extern void vvv ## __VA_ARGS__ (void);
++#define SymI_NeedsProto(vvv) extern void vvv(void);
+ #define SymI_NeedsDataProto(vvv) extern StgWord vvv[];
+ #if defined(COMPILING_WINDOWS_DLL)
+ #define SymE_HasProto(vvv) SymE_HasProto(vvv);
+@@ -1209,8 +1026,6 @@ RTS_DARWIN_ONLY_SYMBOLS
+ RTS_OPENBSD_ONLY_SYMBOLS
+ RTS_LIBGCC_SYMBOLS
+ RTS_LIBFFI_SYMBOLS
+-RTS_SSP_SYMBOLS
+-RTS_LINKER_SYMBOLS
+ #undef SymI_NeedsProto
+ #undef SymI_NeedsDataProto
+ #undef SymI_HasProto
+@@ -1230,7 +1045,7 @@ RTS_LINKER_SYMBOLS
+ #define SymE_HasDataProto(vvv) \
+ SymE_HasProto(vvv)
+
+-#define SymI_NeedsProto(vvv,...) SymI_HasProto(vvv ## __VA_ARGS__)
++#define SymI_NeedsProto(vvv) SymI_HasProto(vvv)
+ #define SymI_NeedsDataProto(vvv) SymI_HasDataProto(vvv)
+ #define SymE_NeedsProto(vvv) SymE_HasProto(vvv)
+ #define SymE_NeedsDataProto(vvv) SymE_HasDataProto(vvv)
+@@ -1251,8 +1066,6 @@ RTS_LINKER_SYMBOLS
+ #define SymI_HasProto_deprecated(vvv) \
+ { #vvv, (void*)0xBAADF00D, true },
+
+-void *RTS_DYNAMIC = NULL;
+-
+ RtsSymbolVal rtsSyms[] = {
+ RTS_SYMBOLS
+ RTS_RET_SYMBOLS
+@@ -1264,14 +1077,11 @@ RtsSymbolVal rtsSyms[] = {
+ RTS_LIBGCC_SYMBOLS
+ RTS_LIBFFI_SYMBOLS
+ SymI_HasDataProto(nonmoving_write_barrier_enabled)
+- RTS_SSP_SYMBOLS
+- RTS_LINKER_SYMBOLS
+ #if defined(darwin_HOST_OS) && defined(i386_HOST_ARCH)
+ // dyld stub code contains references to this,
+ // but it should never be called because we treat
+ // lazy pointers as nonlazy.
+ { "dyld_stub_binding_helper", (void*)0xDEADBEEF, false },
+ #endif
+- { "_DYNAMIC", (void*)(&RTS_DYNAMIC), false },
+ { 0, 0, false } /* sentinel */
+ };
+--
+2.25.4
+
diff --git a/dev-lang/ghc/ghc-8.10.2.ebuild b/dev-lang/ghc/ghc-8.10.2.ebuild
new file mode 100644
index 000000000000..8f5cdd922f31
--- /dev/null
+++ b/dev-lang/ghc/ghc-8.10.2.ebuild
@@ -0,0 +1,798 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# to make make a crosscompiler use crossdev and symlink ghc tree into
+# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} = ${CHOST} ]] ; then
+ if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+ export CTARGET=${CATEGORY/cross-}
+ fi
+fi
+
+inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
+inherit multilib multiprocessing pax-utils toolchain-funcs prefix
+inherit check-reqs
+DESCRIPTION="The Glasgow Haskell Compiler"
+HOMEPAGE="https://www.haskell.org/ghc/"
+
+# we don't have any binaries yet
+arch_binaries=""
+
+BIN_PV=${PV}
+# sorted!
+#arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
+#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
+#arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )"
+arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
+#arch_binaries="$arch_binaries ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( !big-endian? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tbz2 ) )"
+#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
+arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
+
+# various ports:
+#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )"
+
+# 0 - yet
+yet_binary() {
+ case "${ARCH}" in
+ #alpha) return 0 ;;
+ #arm64) return 0 ;;
+ #arm) return 0 ;;
+ amd64) return 0 ;;
+ #ia64) return 0 ;;
+ #ppc) return 0 ;;
+ #ppc64)
+ # use big-endian && return 0
+ # return 0
+ # ;;
+ #sparc) return 0 ;;
+ x86) return 0 ;;
+ *) return 1 ;;
+ esac
+}
+
+GHC_PV=${PV}
+#GHC_PV=8.10.0.20200123 # uncomment only for -alpha, -beta, -rc ebuilds
+GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
+
+SRC_URI="!binary? (
+ https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-src.tar.xz
+ test? ( https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-testsuite.tar.xz )
+)"
+S="${WORKDIR}"/${GHC_P}
+
+[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
+
+BUMP_LIBRARIES=(
+ # "hackage-name hackage-version"
+)
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test"
+IUSE+=" binary"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-lang/perl-5.6.1
+ dev-libs/gmp:0=
+ sys-libs/ncurses:0=[unicode]
+ elfutils? ( dev-libs/elfutils )
+ !ghcmakebinary? ( dev-libs/libffi:= )
+ numa? ( sys-process/numactl )
+"
+
+# This set of dependencies is needed to run
+# prebuilt ghc. We specifically avoid ncurses
+# dependency with:
+# utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
+PREBUILT_BINARY_DEPENDS="
+ !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+"
+# This set of dependencies is needed to install
+# ghc[binary] in system. terminfo package is linked
+# against ncurses.
+PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
+ sys-libs/ncurses:0/6
+"
+
+RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
+
+DEPEND="${RDEPEND}
+ doc? ( app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-python/sphinx
+ >=dev-libs/libxslt-1.1.2 )
+ !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )"
+
+# we build binaries without profiling support
+REQUIRED_USE="
+ ?? ( ghcbootstrap binary )
+ ?? ( profile binary )
+"
+
+# haskell libraries built with cabal in configure mode, #515354
+QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
+
+is_crosscompile() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+
+is_native() {
+ [[ ${CHOST} == ${CBUILD} ]] && [[ ${CHOST} == ${CTARGET} ]]
+}
+
+if ! is_crosscompile; then
+ PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
+fi
+
+# returns tool prefix for crosscompiler.
+# Example:
+# CTARGET=armv7a-unknown-linux-gnueabi
+# CHOST=x86_64-pc-linux-gnu
+# "armv7a-unknown-linux-gnueabi-"
+# CTARGET=${CHOST}
+# ""
+# Used in tools and library prefix:
+# "${ED}"/usr/bin/$(cross)haddock
+# "${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+
+cross() {
+ if is_crosscompile; then
+ echo "${CTARGET}-"
+ else
+ echo ""
+ fi
+}
+
+append-ghc-cflags() {
+ local persistent compile assemble link
+ local flag ghcflag
+
+ for flag in $*; do
+ case ${flag} in
+ persistent) persistent="yes";;
+ compile) compile="yes";;
+ assemble) assemble="yes";;
+ link) link="yes";;
+ *)
+ [[ ${compile} ]] && ghcflag="-optc${flag}" CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+ [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+ [[ ${assemble} ]] && ghcflag="-opta${flag}" CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+ [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+ [[ ${link} ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+ [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+ ;;
+ esac
+ done
+}
+
+# $1 - lib name (under libraries/)
+# $2 - lib version
+# example: bump_lib "transformers" "0.4.2.0"
+bump_lib() {
+ local pn=$1 pv=$2
+ local p=${pn}-${pv}
+ local f
+
+ einfo "Bumping ${pn} up to ${pv}"
+
+ for f in ghc.mk GNUmakefile; do
+ mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die
+ done
+ mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die
+ mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die
+}
+
+update_SRC_URI() {
+ local p pn pv
+ for p in "${BUMP_LIBRARIES[@]}"; do
+ set -- $p
+ pn=$1 pv=$2
+
+ SRC_URI+=" https://hackage.haskell.org/package/${pn}-${pv}/${pn}-${pv}.tar.gz"
+ done
+}
+
+update_SRC_URI
+
+bump_libs() {
+ local p pn pv
+ for p in "${BUMP_LIBRARIES[@]}"; do
+ set -- $p
+ pn=$1 pv=$2
+
+ bump_lib "${pn}" "${pv}"
+ done
+}
+
+ghc_setup_cflags() {
+ # TODO: plumb CFLAGS and BUILD_CFLAGS to respective CONF_CC_OPTS_STAGE
+ if ! is_native; then
+ export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"}
+ export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"}
+ einfo "Crosscompiling mode:"
+ einfo " CHOST: ${CHOST}"
+ einfo " CTARGET: ${CTARGET}"
+ einfo " CFLAGS: ${CFLAGS}"
+ einfo " LDFLAGS: ${LDFLAGS}"
+ einfo " prefix: $(cross)"
+ return
+ fi
+ # We need to be very careful with the CFLAGS we ask ghc to pass through to
+ # gcc. There are plenty of flags which will make gcc produce output that
+ # breaks ghc in various ways. The main ones we want to pass through are
+ # -mcpu / -march flags. These are important for arches like alpha & sparc.
+ # We also use these CFLAGS for building the C parts of ghc, ie the rts.
+ strip-flags
+ strip-unsupported-flags
+
+ # Cmm can't parse line numbers #482086
+ replace-flags -ggdb[3-9] -ggdb2
+
+ GHC_FLAGS=""
+ GHC_PERSISTENT_FLAGS=""
+ for flag in ${CFLAGS}; do
+ case ${flag} in
+
+ # Ignore extra optimisation (ghc passes -O to gcc anyway)
+ # -O2 and above break on too many systems
+ -O*) ;;
+
+ # Arch and ABI flags are what we're really after
+ -m*) append-ghc-cflags compile assemble ${flag};;
+
+ # Sometimes it's handy to see backtrace of RTS
+ # to get an idea what happens there
+ -g*) append-ghc-cflags compile ${flag};;
+
+ # Ignore all other flags, including all -f* flags
+ esac
+ done
+
+ for flag in ${LDFLAGS}; do
+ append-ghc-cflags link ${flag}
+ done
+
+ # GHC uses ${CBUILD}-gcc, ${CHOST}-gcc and ${CTARGET}-gcc at a single build.
+ # Skip any gentoo-specific tweaks for cross-case to avoid passing unsupported
+ # options to gcc.
+ if is_native; then
+ # prevent from failing to build unregisterised ghc:
+ # https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
+ use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
+ fi
+}
+
+# substitutes string $1 to $2 in files $3 $4 ...
+relocate_path() {
+ local from=$1
+ local to=$2
+ shift 2
+ local file=
+ for file in "$@"
+ do
+ sed -i -e "s|$from|$to|g" \
+ "$file" || die "path relocation failed for '$file'"
+ done
+}
+
+# changes hardcoded ghc paths and updates package index
+# $1 - new absolute root path
+relocate_ghc() {
+ local to=$1 ghc_v=${BIN_PV}
+
+ # libdir for prebuilt binary and for current system may mismatch
+ # It does for prefix installation for example: bug #476998
+ local bin_ghc_prefix=${WORKDIR}/usr
+ local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
+ local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
+
+ # backup original script to use it later after relocation
+ local gp_back="${T}/ghc-pkg-${ghc_v}-orig"
+ cp "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" "$gp_back" || die "unable to backup ghc-pkg wrapper"
+
+ if [[ ${bin_libdir} != $(get_libdir) ]]; then
+ einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)"
+ # moving the dir itself is not strictly needed
+ # but then USE=binary would result in installing
+ # in '${bin_libdir}'
+ mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
+
+ relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
+ "${WORKDIR}/usr/bin/ghc-${ghc_v}" \
+ "${WORKDIR}/usr/bin/ghci-${ghc_v}" \
+ "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
+ "${WORKDIR}/usr/bin/hsc2hs" \
+ "${WORKDIR}/usr/bin/runghc-${ghc_v}" \
+ "$gp_back" \
+ "${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
+ fi
+
+ # Relocate from /usr to ${EPREFIX}/usr
+ relocate_path "/usr" "${to}/usr" \
+ "${WORKDIR}/usr/bin/ghc-${ghc_v}" \
+ "${WORKDIR}/usr/bin/ghci-${ghc_v}" \
+ "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
+ "${WORKDIR}/usr/bin/haddock-ghc-${ghc_v}" \
+ "${WORKDIR}/usr/bin/hp2ps" \
+ "${WORKDIR}/usr/bin/hpc" \
+ "${WORKDIR}/usr/bin/hsc2hs" \
+ "${WORKDIR}/usr/bin/runghc-${ghc_v}" \
+ "${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
+
+ # this one we will use to regenerate cache
+ # so it should point to current tree location
+ relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"
+
+ if use prefix; then
+ hprefixify "${bin_libpath}"/${PN}*/settings
+ fi
+
+ # regenerate the binary package cache
+ "$gp_back" recache || die "failed to update cache after relocation"
+ rm "$gp_back"
+}
+
+ghc-check-reqs() {
+ # These are pessimistic values (slightly bigger than worst-case)
+ # Worst case is UNREG USE=profile ia64. See bug #611866 for some
+ # numbers on various arches.
+ CHECKREQS_DISK_BUILD=8G
+ CHECKREQS_DISK_USR=2G
+ # USE=binary roughly takes
+ use binary && CHECKREQS_DISK_BUILD=4G
+
+ "$@"
+}
+
+pkg_pretend() {
+ ghc-check-reqs check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ ghc-check-reqs check-reqs_pkg_setup
+
+ # quiet portage about prebuilt binaries
+ use binary && QA_PREBUILT="*"
+
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ if use ghcbootstrap; then
+ ewarn "You requested ghc bootstrapping, this is usually only used"
+ ewarn "by Gentoo developers to make binary .tbz2 packages."
+
+ [[ -z $(type -P ghc) ]] && \
+ die "Could not find a ghc to bootstrap with."
+ else
+ if ! yet_binary; then
+ eerror "Please try emerging with USE=ghcbootstrap and report build"
+ eerror "sucess or failure to the haskell team (haskell@gentoo.org)"
+ die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
+ fi
+ fi
+}
+
+src_unpack() {
+ # Create the ${S} dir if we're using the binary version
+ use binary && mkdir "${S}"
+
+ # the Solaris and Darwin binaries from ghc (maeder) need to be
+ # unpacked separately, so prevent them from being unpacked
+ local ONLYA=${A}
+ case ${CHOST} in
+ *-darwin* | *-solaris*) ONLYA=${GHC_P}-src.tar.xz ;;
+ esac
+ unpack ${ONLYA}
+}
+
+src_prepare() {
+ ghc_setup_cflags
+
+ if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then
+ # Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS.
+ # See bug #313635.
+ sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+ "${WORKDIR}/usr/bin/ghc-${BIN_PV}"
+
+ # allow hardened users use vanilla binary to bootstrap ghc
+ # ghci uses mmap with rwx protection at it implements dynamic
+ # linking on it's own (bug #299709)
+ pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${PN}-${BIN_PV}/bin/ghc"
+ fi
+
+ if use binary; then
+ if use prefix; then
+ relocate_ghc "${EPREFIX}"
+ fi
+
+ # Move unpacked files to the expected place
+ mv "${WORKDIR}/usr" "${S}"
+ eapply_user
+ else
+ if ! use ghcbootstrap; then
+ case ${CHOST} in
+ *-darwin* | *-solaris*)
+ # UPDATE ME for ghc-7
+ mkdir "${WORKDIR}"/ghc-bin-installer || die
+ pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
+ use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
+ use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
+ use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
+ use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
+ popd > /dev/null
+
+ pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die
+ # fix the binaries so they run, on Solaris we need an
+ # LD_LIBRARY_PATH which has our prefix libdirs, on
+ # Darwin we need to replace the frameworks with our libs
+ # from the prefix fix before installation, because some
+ # of the tools are actually used during configure/make
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
+ elif [[ ${CHOST} == *-darwin* ]] ; then
+ local readline_framework=GNUreadline.framework/GNUreadline
+ local gmp_framework=/opt/local/lib/libgmp.10.dylib
+ local ncurses_file=/opt/local/lib/libncurses.5.dylib
+ for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do
+ install_name_tool -change \
+ ${readline_framework} \
+ "${EPREFIX}"/lib/libreadline.dylib \
+ ${binary} || die
+ install_name_tool -change \
+ ${gmp_framework} \
+ "${EPREFIX}"/usr/lib/libgmp.dylib \
+ ${binary} || die
+ install_name_tool -change \
+ ${ncurses_file} \
+ "${EPREFIX}"/usr/lib/libncurses.dylib \
+ ${binary} || die
+ done
+ # we don't do frameworks!
+ sed -i \
+ -e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \
+ -e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \
+ rts/package.conf.in || die
+ fi
+
+ # it is autoconf, but we really don't want to give it too
+ # many arguments, in fact we do the make in-place anyway
+ ./configure --prefix="${WORKDIR}"/usr || die
+ make install || die
+ popd > /dev/null
+ ;;
+ *)
+ relocate_ghc "${WORKDIR}"
+ ;;
+ esac
+ fi
+
+ sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+ "${S}/ghc/ghc.wrapper"
+
+ cd "${S}" # otherwise eapply will break
+
+ eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
+ eapply "${FILESDIR}"/${PN}-8.2.1-darwin.patch
+ eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
+ eapply "${FILESDIR}"/${PN}-8.8.1-revert-CPP.patch
+ eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.patch
+ eapply "${FILESDIR}"/${PN}-8.10.2-revert-linker-rtsSymbols_more_linker_symbols.patch
+
+ # a bunch of crosscompiler patches
+ # needs newer version:
+ #eapply "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch
+
+ # mingw32 target
+ pushd "${S}/libraries/Win32"
+ eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround
+ popd
+
+ bump_libs
+
+ eapply_user
+ # as we have changed the build system
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ if ! use binary; then
+ # initialize build.mk
+ echo '# Gentoo changes' > mk/build.mk
+
+ # Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV}
+ echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk
+ echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk
+
+ # We also need to use the GHC_FLAGS flags when building ghc itself
+ echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk
+ echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
+ echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk
+ # Speed up initial Cabal bootstrap
+ echo "utils/ghc-cabal_dist_EXTRA_HC_OPTS+=$(ghc-make-args)" >> mk/build.mk
+
+ # We can't depend on haddock except when bootstrapping when we
+ # must build docs and include them into the binary .tbz2 package
+ # app-text/dblatex is not in portage, can not build PDF or PS
+ echo "BUILD_SPHINX_PDF = NO" >> mk/build.mk
+ echo "BUILD_SPHINX_HTML = $(usex doc YES NO)" >> mk/build.mk
+ echo "BUILD_MAN = $(usex doc YES NO)" >> mk/build.mk
+
+ # this controls presence on 'xhtml' and 'haddock' in final install
+ echo "HADDOCK_DOCS = YES" >> mk/build.mk
+
+ # not used outside of ghc's test
+ if [[ -n ${GHC_BUILD_DPH} ]]; then
+ echo "BUILD_DPH = YES" >> mk/build.mk
+ else
+ echo "BUILD_DPH = NO" >> mk/build.mk
+ fi
+
+ # Any non-native build has to skip as it needs
+ # target haddock binary to be runnabine.
+ if ! is_native; then
+ # disable docs generation as it requires running stage2
+ echo "HADDOCK_DOCS=NO" >> mk/build.mk
+ echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
+ echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
+ fi
+
+ if is_crosscompile; then
+ # Install ghc-stage1 crosscompiler instead of
+ # ghc-stage2 cross-built compiler.
+ echo "Stage1Only=YES" >> mk/build.mk
+ fi
+
+ # allows overriding build flavours for libraries:
+ # v - vanilla (static libs)
+ # p - profiled
+ # dyn - shared libraries
+ # example: GHC_LIBRARY_WAYS="v dyn"
+ if [[ -n ${GHC_LIBRARY_WAYS} ]]; then
+ echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk
+ fi
+ echo "BUILD_PROF_LIBS = $(usex profile YES NO)" >> mk/build.mk
+
+ # Get ghc from the unpacked binary .tbz2
+ # except when bootstrapping we just pick ghc up off the path
+ if ! use ghcbootstrap; then
+ export PATH="${WORKDIR}/usr/bin:${PATH}"
+ fi
+
+ echo "INTEGER_LIBRARY = $(usex gmp integer-gmp integer-simple)" >> mk/build.mk
+
+ # don't strip anything. Very useful when stage2 SIGSEGVs on you
+ echo "STRIP_CMD = :" >> mk/build.mk
+
+ local econf_args=()
+
+ # GHC embeds toolchain it was built by and uses it later.
+ # Don't allow things like ccache or versioned binary slip.
+ # We use stable thing across gcc upgrades.
+ # User can use EXTRA_ECONF=CC=... to override this default.
+ econf_args+=(
+ AR=${CTARGET}-ar
+ CC=${CTARGET}-gcc
+ # these should be inferred by GHC but ghc defaults
+ # to using bundled tools on windows.
+ Windres=${CTARGET}-windres
+ DllWrap=${CTARGET}-dllwrap
+ # we set the linker explicitly below
+ --disable-ld-override
+ )
+ case ${CTARGET} in
+ arm*)
+ # ld.bfd-2.28 does not work for ghc. Force ld.gold
+ # instead. This should be removed once gentoo gets
+ # a fix for R_ARM_COPY bug: https://sourceware.org/PR16177
+ econf_args+=(LD=${CTARGET}-ld.gold)
+ ;;
+ sparc*)
+ # ld.gold-2.28 does not work for ghc. Force ld.bfd
+ # instead. This should be removed once gentoo gets
+ # a fix for missing --no-relax support bug:
+ # https://sourceware.org/ml/binutils/2017-07/msg00183.html
+ econf_args+=(LD=${CTARGET}-ld.bfd)
+ ;;
+ *)
+ econf_args+=(LD=${CTARGET}-ld)
+ esac
+
+ if [[ ${CBUILD} != ${CHOST} ]]; then
+ # GHC bug: ghc claims not to support cross-building.
+ # It does, but does not distinct --host= value
+ # for stage1 and stage2 compiler.
+ econf_args+=(--host=${CBUILD})
+ fi
+
+ if use ghcmakebinary; then
+ # When building booting libary we are trying to
+ # bundle or restrict most of external depends
+ # with unstable ABI:
+ # - embed libffi (default GHC behaviour)
+ # - disable ncurses support for ghci (via haskeline)
+ # https://bugs.gentoo.org/557478
+ # - disable ncurses support for ghc-pkg
+ echo "libraries/haskeline_CONFIGURE_OPTS += --flag=-terminfo" >> mk/build.mk
+ echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk
+ elif is_native; then
+ # using ${GTARGET}'s libffi is not supported yet:
+ # GHC embeds full path for ffi includes without /usr/${CTARGET} account.
+ econf_args+=(--with-system-libffi)
+ econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
+ fi
+
+ einfo "Final mk/build.mk:"
+ cat mk/build.mk || die
+
+ econf ${econf_args[@]} \
+ --enable-bootstrap-with-devel-snapshot \
+ $(use_enable elfutils dwarf-unwind) \
+ $(use_enable numa)
+
+ if [[ ${PV} == *9999* ]]; then
+ GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
+ GHC_P=${PN}-${GHC_PV}
+ fi
+ fi # ! use binary
+}
+
+src_compile() {
+ if ! use binary; then
+ # Stage1Only crosscompiler does not build stage2
+ if ! is_crosscompile; then
+ # 1. build/pax-mark compiler binary first
+ emake ghc/stage2/build/tmp/ghc-stage2
+ # 2. pax-mark (bug #516430)
+ pax-mark -m ghc/stage2/build/tmp/ghc-stage2
+ # 2. build/pax-mark haddock using ghc-stage2
+ if is_native; then
+ # non-native build does not build haddock
+ # due to HADDOCK_DOCS=NO, but it could.
+ emake utils/haddock/dist/build/tmp/haddock
+ pax-mark -m utils/haddock/dist/build/tmp/haddock
+ fi
+ fi
+ # 3. and then all the rest
+ emake all
+ fi # ! use binary
+}
+
+src_test() {
+ # TODO: deal with:
+ # - sandbox (pollutes environment)
+ # - extra packages (to extend testsuite coverage)
+ # bits are taken from 'validate'
+ local make_test_target='test' # can be fulltest
+ # not 'emake' as testsuite uses '$MAKE' without jobserver available
+ make $make_test_target stage=2 THREADS=$(makeopts_jobs)
+}
+
+src_install() {
+ if use binary; then
+ use prefix && mkdir -p "${ED}"
+ mv "${S}/usr" "${ED}"
+ else
+ [[ -f VERSION ]] || emake VERSION
+
+ # -j1 due to a rare race in install script:
+ # make --no-print-directory -f ghc.mk phase=final install
+ # /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 755 \
+ # -d "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404/include"
+ # /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 644 utils/hsc2hs/template-hsc.h \
+ # "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404"
+ # /usr/bin/install: cannot create regular file \
+ # '/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404': No such file or directory
+ emake -j1 install DESTDIR="${D}"
+
+ # Skip for cross-targets as they all share target location:
+ # /usr/share/doc/ghc-9999/
+ if ! is_crosscompile; then
+ dodoc "distrib/README" "LICENSE" "VERSION"
+ fi
+
+ # rename ghc-shipped files to avoid collision
+ # of external packages. Motivating example:
+ # user had installed:
+ # dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0)
+ # dev-haskell/transformers-0.4.2.0
+ # then user tried to update to
+ # dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0)
+ # this will lead to single .conf file collision.
+ local shipped_conf renamed_conf
+ local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+ for shipped_conf in "${package_confdir}"/*.conf; do
+ # rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf'
+ renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf
+ mv "${shipped_conf}" "${renamed_conf}" || die
+ done
+
+ # remove link, but leave 'haddock-${GHC_P}'
+ rm -f "${ED}"/usr/bin/$(cross)haddock
+
+ if ! is_crosscompile; then
+ newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg
+ newbashcomp utils/completion/ghc.bash ghc
+ fi
+ fi
+
+ # path to the package.cache
+ local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+ PKGCACHE="${package_confdir}"/package.cache
+ # copy the package.conf.d, including timestamp, save it so we can help
+ # users that have a broken package.conf.d
+ cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d"
+
+ # copy the package.conf, including timestamp, save it so we later can put it
+ # back before uninstalling, or when upgrading.
+ cp -p "${PKGCACHE}"{,.shipped} \
+ || die "failed to copy package.conf.d/package.cache"
+
+ if is_crosscompile; then
+ # When we build a cross-compiler the layout is the following:
+ # usr/lib/${CTARGET}-ghc-${VER}/ contains target libraries
+ # but
+ # usr/lib/${CTARGET}-ghc-${VER}/bin/ directory
+ # containst host binaries (modulo bugs).
+
+ # Portage's stripping mechanism does not skip stripping
+ # foreign binaries. This frequently causes binaries to be
+ # broken.
+ #
+ # Thus below we disable stripping of target libraries and allow
+ # stripping hosts executables.
+ dostrip -x "/usr/$(get_libdir)/$(cross)${GHC_P}"
+ dostrip "/usr/$(get_libdir)/$(cross)${GHC_P}/bin"
+ fi
+}
+
+pkg_preinst() {
+ # have we got an earlier version of ghc installed?
+ if has_version "<${CATEGORY}/${PF}"; then
+ haskell_updater_warn="1"
+ fi
+}
+
+pkg_postinst() {
+ ghc-reregister
+
+ # path to the package.cache
+ PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+
+ # give the cache a new timestamp, it must be as recent as
+ # the package.conf.d directory.
+ touch "${PKGCACHE}"
+
+ if [[ "${haskell_updater_warn}" == "1" ]]; then
+ ewarn
+ ewarn "\e[1;31m************************************************************************\e[0m"
+ ewarn
+ ewarn "You have just upgraded from an older version of GHC."
+ ewarn "You may have to run"
+ ewarn " 'haskell-updater'"
+ ewarn "to rebuild all ghc-based Haskell libraries."
+ ewarn
+ ewarn "\e[1;31m************************************************************************\e[0m"
+ ewarn
+ fi
+}
+
+pkg_prerm() {
+ PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+ rm -rf "${PKGCACHE}"
+
+ cp -p "${PKGCACHE}"{.shipped,}
+}
+
+pkg_postrm() {
+ ghc-package_pkg_postrm
+}
diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 138a4ae94957..c4b43650c73b 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,3 +1 @@
-DIST mujs-1.0.6.tar.gz 121385 BLAKE2B b74da9cc9df6c51d81fe4b6170fddd9bfd3e37cc1c48509ddbcc9b657feb7169cfa98427770a118fb9c0923e70320668198739ea111cbd5d1c2303b2ada7093d SHA512 c3062348dcc79b8ea3726fc528b3ba765d3462232059617b9ab221ba47fa904cc81a305a6199a9a2cea24a2d891ca63d475b4884cd4e53fa715b3a55f51ca4d9
-DIST mujs-1.0.7.tar.xz 93928 BLAKE2B 3c29ad3c23b75ee310824a36c0b08ede07b4ebaebff78558d07bc0eda55d6a994551502089cebd5b53ae24364ec1170e0865b7f1560d909dd15a18040666fea2 SHA512 30cc06ce4a608e091d46ba903ffc2eda29972cf583eb077d7824627fa20423c4721a406bf4271ebd5e5cade74f34e19acc9cffbc6d4d44314085a5525e91564f
DIST mujs-1.0.9.tar.gz 123113 BLAKE2B c55deaf14508c412394bf5fe3a53ef581d4e4726024d65f2ba5155eb2400a6e2f043c9f6721b170d19297e2cd38c62c462f3b4e102eb4bfe6e7857b40156c18b SHA512 a3dbc8dbf5c16b7de9803954fe38ea9f77c0e5b7de3895966ec0877e063d463c9950499791ea0d102e464bd0426413689f3edb15e38db3f13915d72f27556725
diff --git a/dev-lang/mujs/mujs-1.0.6.ebuild b/dev-lang/mujs/mujs-1.0.6.ebuild
deleted file mode 100644
index c6663ac60e38..000000000000
--- a/dev-lang/mujs/mujs-1.0.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="An embeddable Javascript interpreter in C."
-HOMEPAGE="
- https://mujs.com/
- https://github.com/ccxvii/mujs/
-"
-SRC_URI="https://github.com/ccxvii/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-# subslot matches SONAME
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.5-flags.patch"
-)
-
-src_prepare() {
- default
-
- tc-export AR CC
-
- # library's ABI (and API) changes in ~each release:
- # diff 'usr/includemujs.h' across releases to validate
- append-cflags -fPIC -Wl,-soname=lib${PN}.so.${PV}
-}
-
-src_compile() {
- emake VERSION=${PV} prefix=/usr shared
-}
-
-src_install() {
- local myeconfargs=(
- DESTDIR="${ED}"
- install-shared
- libdir="/usr/$(get_libdir)"
- prefix="/usr"
- VERSION="${PV}"
- $(usex static-libs install-static '')
- )
-
- emake "${myeconfargs[@]}"
-
- mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die
-
- dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
- dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
-}
diff --git a/dev-lang/mujs/mujs-1.0.7.ebuild b/dev-lang/mujs/mujs-1.0.7.ebuild
deleted file mode 100644
index b95335f324a9..000000000000
--- a/dev-lang/mujs/mujs-1.0.7.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="An embeddable Javascript interpreter in C."
-HOMEPAGE="
- https://mujs.com/
- https://github.com/ccxvii/mujs/
-"
-SRC_URI="https://mujs.com/downloads/${P}.tar.xz"
-
-LICENSE="ISC"
-# subslot matches SONAME
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.5-flags.patch"
-)
-
-src_prepare() {
- default
-
- tc-export AR CC
-
- # library's ABI (and API) changes in ~each release:
- # diff 'usr/includemujs.h' across releases to validate
- append-cflags -fPIC -Wl,-soname=lib${PN}.so.${PV}
-}
-
-src_compile() {
- emake VERSION=${PV} prefix=/usr shared
-}
-
-src_install() {
- local myeconfargs=(
- DESTDIR="${ED}"
- install-shared
- libdir="/usr/$(get_libdir)"
- prefix="/usr"
- VERSION="${PV}"
- $(usex static-libs install-static '')
- )
-
- emake "${myeconfargs[@]}"
-
- mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die
-
- dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
- dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
-}
diff --git a/dev-lang/php/php-7.2.34.ebuild b/dev-lang/php/php-7.2.34.ebuild
index 07f0645b8d80..b7fe1520efba 100644
--- a/dev-lang/php/php-7.2.34.ebuild
+++ b/dev-lang/php/php-7.2.34.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit flag-o-matic systemd autotools
+inherit flag-o-matic systemd autotools toolchain-funcs
DESCRIPTION="The PHP language runtime engine"
HOMEPAGE="https://www.php.net/"
@@ -239,6 +239,10 @@ src_configure() {
addpredict /usr/share/snmp/mibs/.index #nowarn
addpredict /var/lib/net-snmp/mib_indexes #nowarn
+ # Fix building against >=ICU-68, https://bugs.php.net/80310
+ append-cflags -DU_DEFINE_FALSE_AND_TRUE=1
+ append-cxxflags -DU_DEFINE_FALSE_AND_TRUE=1
+
PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
diff --git a/dev-lang/python/python-2.7.18-r5.ebuild b/dev-lang/python/python-2.7.18-r5.ebuild
index 96ab96cf4a88..a9a3f73e8e05 100644
--- a/dev-lang/python/python-2.7.18-r5.ebuild
+++ b/dev-lang/python/python-2.7.18-r5.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-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"
IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 06e32b065ecc..35863f573b42 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -6,6 +6,7 @@ DIST vala-0.44.11.tar.xz 3370248 BLAKE2B c111b6175e6339148e30bedc77f62a9ef3ec912
DIST vala-0.46.10.tar.xz 3417400 BLAKE2B 2f78de3e198f994a148e7ed4c82ef2417b70c19af3ce1874ee80aa7d0160691a50db24ad4898a04520e91d67a41bb508d3854ac2f4d90d2507a5a6558854716c SHA512 ae3734036f6a1b7088bac45083b75a49eee76947219f530493f81aa4ee60807cfa5424cf1b982d8d8f28f56119d66f06a9150b67884d80dd4b6724e152e32e62
DIST vala-0.46.13.tar.xz 3434196 BLAKE2B 49b7e0b776e185653c1b8c00747a150ceb42cf89006fd55d37e3efd0824dace379d2c72cdb45d481b0545d0b4b37299bc6161b2d083d3221d2d8d8ca7c10d6dc SHA512 6d8d1acebf4706346d5dc986f5c900cfda929ca59ca3f3907cff56892a496bf524b1f74032ac6c8587b236a473124e15c6f83f949636e28141a55c8abeddf004
DIST vala-0.48.11.tar.xz 3487944 BLAKE2B fe47bba9ddb31c469d63d9ca32d631901d59db19c417d864088bc33aa2845d388e762ecc39b2d9574aafbfc501eb61abb3604e07754b2d8eff63d23c53f1eb84 SHA512 6ddad88ab4d2a34352be9ce0a0c13dc3382ebcb494c08e2531a0195aad21a80db70e7dc3ffd2d27ef03a4ca30ac2bf31869521489ffd95fc520c4085362fc5e7
+DIST vala-0.48.12.tar.xz 3492200 BLAKE2B 0a401ac4349dc1c628fa608b5a89504583d6d2bb05ca74eb507e766cca418121e14adfe6e8cfeb8f42212c717280b9b91426309df415d869896654be626c46c5 SHA512 da7becf8b92985a07b139651c14bd41ec86aed3e2b610029d2b376f70335c98607f39de4a1fa4efe9d51e6088edd4c13d22431cada389679d55f684ad548f4d1
DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375
DIST vala-0.48.9.tar.xz 3472540 BLAKE2B 1c85b5d9a1f3819d5b26b521c7da423adee313b2acacb354e324abd9ccf24707dcfcd1a455bab867043f674c4daa5f1a62210847ac271dfce09a288651220f53 SHA512 076fcbea34dde1a84c15e4e2b6acd009c2fea578d48eb28a99a604eb4edc8bb53ac6883ca93ec906968d43d4b341707abc730d6ac8a7b3682a2fa5f0030d5256
-DIST vala-0.50.1.tar.xz 3508924 BLAKE2B 4a6acd2ac9e098e8da9c1264584f02a22429ed096292ec8baf4c9c5ac2d0be4bf20c6c2eb6a41e31295461e1a7e0929c471512e435245c04228bf67c91f372ed SHA512 2f5d0bee6dcac3031108fffaa3a9a0339c8c79ff92d1824292f266a704bef1cf4f9eed15ebf424b608f09129b3e0577ed8cd7798a4fa12bfd9d06026909de769
+DIST vala-0.50.2.tar.xz 3514208 BLAKE2B f2f7e86b90ac1245d593ba82204667a830843e2fdb8e9a5afaa44453a146461f0ce2b9f9338ef4743bc6055bbce6c023ae92f0bf2ca66757cddd7fc3d7a4db63 SHA512 77069b53037adcd4c3fed2dc4a5c740216b950c52e8a0ed777a5cf9a5d9f078d0abbc4dbce08e122817cd3de0ac75ebd150b0f6f0b0cf4a09cb4a46f96bf4c3e
diff --git a/dev-lang/vala/vala-0.48.12.ebuild b/dev-lang/vala/vala-0.48.12.ebuild
new file mode 100644
index 000000000000..1f7c05bd15c1
--- /dev/null
+++ b/dev-lang/vala/vala-0.48.12.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.48"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="test valadoc"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.48.0:2
+ >=dev-libs/vala-common-${PV}
+ valadoc? ( >=media-gfx/graphviz-2.16 )
+ != it, which would be bad
+# as the newer is not required with older vala when those are picked instead of 0.46.
+# vala-0.45.91 ships a broken libsoup-2.4.vapi copy too, but that'll be fixed by 0.45.92
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ sys-devel/flex
+ virtual/pkgconfig
+ virtual/yacc
+ test? (
+ dev-libs/dbus-glib
+ >=dev-libs/glib-2.26:2
+ dev-libs/gobject-introspection )
+"
+
+src_configure() {
+ # weasyprint enables generation of PDF from HTML
+ gnome2_src_configure \
+ --disable-unversioned \
+ $(use_enable valadoc) \
+ VALAC=: \
+ WEASYPRINT=:
+}
+
+src_install() {
+ default
+ find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-lang/vala/vala-0.50.1.ebuild b/dev-lang/vala/vala-0.50.2.ebuild
similarity index 100%
rename from dev-lang/vala/vala-0.50.1.ebuild
rename to dev-lang/vala/vala-0.50.2.ebuild
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c93eb93dfee4..78d5d2dcdfd4 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index 3eb682d0fc11..006d3ad66017 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1/${PV%.*}"
-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"
IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index f01a64f7cf5c..aa1b4d94151f 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,3 +1,2 @@
-DIST Botan-2.15.0.tar.xz 5920688 BLAKE2B 1bbb9cadb0f754194851bddf8b14dbcd291285c5f3fbaad35920277a11c3d9e1b1e5cc484c0d37b1c7999b3084a1c90da56631df0b07e788372b95aff5197031 SHA512 0965a0a6141df44e38bd7da038b89dd2b3808ed9a4ebaafbf089abf60718e62cba78d7b64eaf272b5df8c5a489222e4cad4fb511cde38e76cdaed87f35896c18
DIST Botan-2.16.0.tar.xz 5938644 BLAKE2B a4b7bb48aee0dbf0f8b81a407b6a39707c3e6040a2bb93f9c34208ab87ea64879b2e56af66f090a73d66b64156e333c89e490d206e666e665a5eb4fbcd98d13e SHA512 12550425c695119d7f448a47b7956565de373e1bc86b8fdfa0a2a5b9fed1ef93a36101b6480e7a2f78e9262c988904c353fa021b681543691d09bf5b00495bd4
DIST Botan-2.17.2.tar.xz 5940964 BLAKE2B 009df11c9d4379a15a48697554a82df3baffad0fff98af995f9a5b9b3223e4db42837650d41b7081170b07fb70d62ab347c5577ef2480a8f7011b40e1cf1764d SHA512 fa9bd30d02540c4544646971c7b82d3873f32362668d2496b4bc1a92f47d52f75ec9533d5848a7d8e9b9077c7ae2866b55d70d39101c705eec0edf9dbf01d6cf
diff --git a/dev-libs/botan/botan-2.15.0.ebuild b/dev-libs/botan/botan-2.15.0.ebuild
deleted file mode 100644
index b0108d71ae26..000000000000
--- a/dev-libs/botan/botan-2.15.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-r1 toolchain-funcs
-
-MY_P="Botan-${PV}"
-
-DESCRIPTION="C++ crypto library"
-HOMEPAGE="https://botan.randombit.net/"
-SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
-LICENSE="BSD-2"
-
-SLOT="2/$(ver_cut 1-2)" # soname version
-
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
-IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- ')
-"
-
-# NOTE: Boost is needed at runtime too for the CLI tool.
-DEPEND="
- boost? ( >=dev-libs/boost-1.48:= )
- bzip2? ( >=app-arch/bzip2-1.0.5:= )
- lzma? ( app-arch/xz-utils:= )
- python? ( ${PYTHON_DEPS} )
- ssl? (
- !libressl? ( dev-libs/openssl:0=[bindist=] )
- libressl? ( dev-libs/libressl:0= )
- )
- sqlite? ( dev-db/sqlite:3= )
- zlib? ( >=sys-libs/zlib-1.2.3:= )
-"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-# NOTE: Considering patching Botan?
-# Please see upstream's guidance:
-# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
-
-python_check_deps() {
- if use doc ; then
- has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1
- fi
-}
-
-src_configure() {
- local disable_modules=()
- use boost || disable_modules+=( "boost" )
- use bindist && disable_modules+=( "ecdsa" )
- elog "Disabling module(s): ${disable_modules[@]}"
-
- # Enable v9 instructions for sparc64
- local chostarch="${CHOST%%-*}"
- if [[ "${PROFILE_ARCH}" = "sparc64" ]] ; then
- chostarch="sparc32-v9"
- fi
-
- local myos=
- case ${CHOST} in
- *-darwin*) myos=darwin ;;
- *) myos=linux ;;
- esac
-
- case ${CHOST} in
- hppa*) chostarch=parisc ;;
- esac
-
- local pythonvers=()
- if use python ; then
- _append() {
- pythonvers+=( ${EPYTHON/python/} )
- }
-
- python_foreach_impl _append
- fi
-
- # Don't install Python bindings automatically
- # (do it manually later in the right place)
- # https://bugs.gentoo.org/723096
- local myargs=(
- $(use_enable static-libs static-library)
- $(use_with boost)
- $(use_with bzip2)
- $(use_with doc documentation)
- $(use_with doc sphinx)
- $(use_with lzma)
- $(use_with sqlite sqlite3)
- $(use_with ssl openssl)
- $(use_with zlib)
- $(usex hppa --without-stack-protector '')
- --cpu=${chostarch}
- --disable-modules=$( IFS=","; echo "${disable_modules[*]}" )
- --docdir=share/doc
- --libdir=$(get_libdir)
- --os=${myos}
- --distribution-info="Gentoo ${PVR}"
- --prefix="${EPREFIX}/usr"
- --with-endian="$(tc-endian)"
- --with-python-version=$( IFS=","; echo "${pythonvers[*]}" )
- --without-doxygen
- --no-install-python-module
- )
-
- tc-export CC CXX AR
-
- ./configure.py "${myargs[@]}" || die "configure.py failed"
-}
-
-src_test() {
- LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
-}
-
-src_install() {
- default
-
- # Manually install the Python bindings (bug #723096)
- if use python ; then
- python_foreach_impl python_domodule src/python/botan2.py
- fi
-}
diff --git a/dev-libs/crypto++/metadata.xml b/dev-libs/crypto++/metadata.xml
index 4c8d518abcc4..ed5b7931ce10 100644
--- a/dev-libs/crypto++/metadata.xml
+++ b/dev-libs/crypto++/metadata.xml
@@ -1,7 +1,10 @@
-
+
+ sam@gentoo.org
+ Sam James
+
diff --git a/dev-libs/fstrm/fstrm-0.6.0.ebuild b/dev-libs/fstrm/fstrm-0.6.0.ebuild
index 806ef1cc0cf3..7f3c9880c50f 100644
--- a/dev-libs/fstrm/fstrm-0.6.0.ebuild
+++ b/dev-libs/fstrm/fstrm-0.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/farsightsec/fstrm/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE="static-libs utils"
BDEPEND="virtual/pkgconfig"
diff --git a/dev-libs/glib/glib-2.62.6.ebuild b/dev-libs/glib/glib-2.62.6.ebuild
index 57adaa590548..654ff3b9d44d 100644
--- a/dev-libs/glib/glib-2.62.6.ebuild
+++ b/dev-libs/glib/glib-2.62.6.ebuild
@@ -250,14 +250,7 @@ pkg_postinst() {
gnome2_giomodule_cache_update \
|| die "Update GIO modules cache failed (for ${ABI})"
}
- if ! tc-is-cross-compiler ; then
- multilib_foreach_abi multilib_pkg_postinst
- else
- ewarn "Updating of GIO modules cache skipped due to cross-compilation."
- ewarn "You might want to run gio-querymodules manually on the target for"
- ewarn "your final image for performance reasons and re-run it when packages"
- ewarn "installing GIO modules get upgraded or added to the image."
- fi
+ multilib_foreach_abi multilib_pkg_postinst
}
pkg_postrm() {
diff --git a/dev-libs/glib/glib-2.64.5.ebuild b/dev-libs/glib/glib-2.64.5.ebuild
index 0f1b0aee616c..6e3a6137257b 100644
--- a/dev-libs/glib/glib-2.64.5.ebuild
+++ b/dev-libs/glib/glib-2.64.5.ebuild
@@ -257,14 +257,7 @@ pkg_postinst() {
gnome2_giomodule_cache_update \
|| die "Update GIO modules cache failed (for ${ABI})"
}
- if ! tc-is-cross-compiler ; then
- multilib_foreach_abi multilib_pkg_postinst
- else
- ewarn "Updating of GIO modules cache skipped due to cross-compilation."
- ewarn "You might want to run gio-querymodules manually on the target for"
- ewarn "your final image for performance reasons and re-run it when packages"
- ewarn "installing GIO modules get upgraded or added to the image."
- fi
+ multilib_foreach_abi multilib_pkg_postinst
for v in ${REPLACING_VERSIONS}; do
if ver_test "$v" "-lt" "2.63.6"; then
diff --git a/dev-libs/glib/glib-2.66.2.ebuild b/dev-libs/glib/glib-2.66.2.ebuild
index c7debe737f8a..af3ca09f98b1 100644
--- a/dev-libs/glib/glib-2.66.2.ebuild
+++ b/dev-libs/glib/glib-2.66.2.ebuild
@@ -259,14 +259,7 @@ pkg_postinst() {
gnome2_giomodule_cache_update \
|| die "Update GIO modules cache failed (for ${ABI})"
}
- if ! tc-is-cross-compiler ; then
- multilib_foreach_abi multilib_pkg_postinst
- else
- ewarn "Updating of GIO modules cache skipped due to cross-compilation."
- ewarn "You might want to run gio-querymodules manually on the target for"
- ewarn "your final image for performance reasons and re-run it when packages"
- ewarn "installing GIO modules get upgraded or added to the image."
- fi
+ multilib_foreach_abi multilib_pkg_postinst
for v in ${REPLACING_VERSIONS}; do
if ver_test "$v" "-lt" "2.63.6"; then
diff --git a/dev-libs/glib/glib-2.66.3.ebuild b/dev-libs/glib/glib-2.66.3.ebuild
index 10400fd0dd1f..6d419aa86b68 100644
--- a/dev-libs/glib/glib-2.66.3.ebuild
+++ b/dev-libs/glib/glib-2.66.3.ebuild
@@ -259,14 +259,7 @@ pkg_postinst() {
gnome2_giomodule_cache_update \
|| die "Update GIO modules cache failed (for ${ABI})"
}
- if ! tc-is-cross-compiler ; then
- multilib_foreach_abi multilib_pkg_postinst
- else
- ewarn "Updating of GIO modules cache skipped due to cross-compilation."
- ewarn "You might want to run gio-querymodules manually on the target for"
- ewarn "your final image for performance reasons and re-run it when packages"
- ewarn "installing GIO modules get upgraded or added to the image."
- fi
+ multilib_foreach_abi multilib_pkg_postinst
for v in ${REPLACING_VERSIONS}; do
if ver_test "$v" "-lt" "2.63.6"; then
diff --git a/dev-libs/gmp/gmp-6.2.1.ebuild b/dev-libs/gmp/gmp-6.2.1.ebuild
index 85f0e1d3160b..84c3a6978e1b 100644
--- a/dev-libs/gmp/gmp-6.2.1.ebuild
+++ b/dev-libs/gmp/gmp-6.2.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
LICENSE="|| ( LGPL-3+ GPL-2+ )"
# The subslot reflects the C & C++ SONAMEs.
SLOT="0/10.4"
-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"
IUSE="+asm doc +cxx pic static-libs"
BDEPEND="sys-devel/m4
diff --git a/dev-libs/hiredis/hiredis-1.0.0.ebuild b/dev-libs/hiredis/hiredis-1.0.0.ebuild
index be1b00061713..20d56c4f2ebd 100644
--- a/dev-libs/hiredis/hiredis-1.0.0.ebuild
+++ b/dev-libs/hiredis/hiredis-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
IUSE="examples ssl static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index c5f1ce69c8b8..4838621448ee 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,2 +1,3 @@
DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf48ae18fc4984b883d9f83a3a57129a0e782c85578cf69e9f397a8d6d3b16b70c3802084617d39ade68154f98f5 SHA512 24ff4ce5947c41fc12a168e15d4037556562c7f32c1da0bbedd705232476174a3b2318955a7124426a63c2034eb9ae077e728a5dbada8b9433d7173cac3db307
+DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
diff --git a/dev-libs/icu-layoutex/icu-layoutex-68.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-68.2.ebuild
new file mode 100644
index 000000000000..62b585924f49
--- /dev/null
+++ b/dev-libs/icu-layoutex/icu-layoutex-68.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="External layout part of International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ ~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
+ dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN/-layoutex}/source"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
+)
+
+src_prepare() {
+ # apply patches
+ default
+
+ # Disable renaming as it is stupid thing to do
+ sed -i \
+ -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+ common/unicode/uconfig.h || die
+
+ # Fix linking of icudata
+ sed -i \
+ -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+ config/mh-linux || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # Use C++14
+ append-cxxflags -std=c++14
+
+ if tc-is-cross-compiler; then
+ mkdir "${WORKDIR}"/host || die
+ pushd "${WORKDIR}"/host >/dev/null || die
+
+ CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+ CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+ RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+ "${S}"/configure --disable-renaming --disable-debug \
+ --disable-samples --enable-static || die
+ emake
+
+ popd >/dev/null || die
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --disable-renaming
+ --disable-samples
+ --enable-layoutex
+ $(use_enable debug)
+ $(use_enable static-libs static)
+ )
+
+ tc-is-cross-compiler && myeconfargs+=(
+ --with-cross-build="${WORKDIR}"/host
+ )
+
+ # icu tries to use clang by default
+ tc-export CC CXX
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+ # INTLTEST_OPTS: intltest options
+ # -e: Exhaustive testing
+ # -l: Reporting of memory leaks
+ # -v: Increased verbosity
+ # IOTEST_OPTS: iotest options
+ # -e: Exhaustive testing
+ # -v: Increased verbosity
+ # CINTLTST_OPTS: cintltst options
+ # -e: Exhaustive testing
+ # -v: Increased verbosity
+ pushd layoutex &>/dev/null || die
+ emake -j1 VERBOSE="1" check
+ popd &>/dev/null || die
+}
+
+multilib_src_install() {
+ pushd layoutex &>/dev/null || die
+ default
+ popd &>/dev/null || die
+}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index c5f1ce69c8b8..4838621448ee 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,2 +1,3 @@
DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf48ae18fc4984b883d9f83a3a57129a0e782c85578cf69e9f397a8d6d3b16b70c3802084617d39ade68154f98f5 SHA512 24ff4ce5947c41fc12a168e15d4037556562c7f32c1da0bbedd705232476174a3b2318955a7124426a63c2034eb9ae077e728a5dbada8b9433d7173cac3db307
+DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
diff --git a/dev-libs/icu/icu-68.2.ebuild b/dev-libs/icu/icu-68.2.ebuild
new file mode 100644
index 000000000000..e13a81c1b337
--- /dev/null
+++ b/dev-libs/icu/icu-68.2.ebuild
@@ -0,0 +1,142 @@
+# 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 flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
+
+DESCRIPTION="International Components for Unicode"
+HOMEPAGE="http://site.icu-project.org/"
+SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="debug doc examples static-libs"
+
+BDEPEND="${PYTHON_DEPS}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen[dot] )
+"
+
+S="${WORKDIR}/${PN}/source"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/icu-config
+)
+
+PATCHES=(
+ "${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
+ "${FILESDIR}/${PN}-64.2-darwin.patch"
+ "${FILESDIR}/${PN}-68.1-nonunicode.patch"
+)
+
+src_prepare() {
+ default
+
+ local variable
+
+ # Disable renaming as it is stupid thing to do
+ sed -i \
+ -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+ common/unicode/uconfig.h || die
+
+ # Fix linking of icudata
+ sed -i \
+ -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+ config/mh-linux || die
+
+ # Append doxygen configuration to configure
+ sed -i \
+ -e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+ configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ append-cxxflags -std=c++14
+
+ if tc-is-cross-compiler; then
+ mkdir "${WORKDIR}"/host || die
+ pushd "${WORKDIR}"/host >/dev/null || die
+
+ CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+ CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+ RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+ "${S}"/configure --disable-renaming --disable-debug \
+ --disable-samples --enable-static || die
+ emake
+
+ popd >/dev/null || die
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --disable-renaming
+ --disable-samples
+ --disable-layoutex
+ $(use_enable debug)
+ $(use_enable static-libs static)
+ $(multilib_native_use_enable examples samples)
+ )
+
+ tc-is-cross-compiler && myeconfargs+=(
+ --with-cross-build="${WORKDIR}"/host
+ )
+
+ # icu tries to use clang by default
+ tc-export CC CXX
+
+ # make sure we configure with the same shell as we run icu-config
+ # with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
+ export CONFIG_SHELL="${EPREFIX}/bin/sh"
+ # probably have no /bin/sh in prefix-chain
+ [[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi && use doc; then
+ doxygen -u Doxyfile || die
+ doxygen Doxyfile || die
+ fi
+}
+
+multilib_src_test() {
+ # INTLTEST_OPTS: intltest options
+ # -e: Exhaustive testing
+ # -l: Reporting of memory leaks
+ # -v: Increased verbosity
+ # IOTEST_OPTS: iotest options
+ # -e: Exhaustive testing
+ # -v: Increased verbosity
+ # CINTLTST_OPTS: cintltst options
+ # -e: Exhaustive testing
+ # -v: Increased verbosity
+ emake -j1 VERBOSE="1" check
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi && use doc; then
+ docinto html
+ dodoc -r doc/html/*
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ docinto html
+ dodoc ../readme.html
+}
diff --git a/dev-libs/isl/isl-0.22.1.ebuild b/dev-libs/isl/isl-0.22.1.ebuild
index 62d47d20a57d..8835c838fc72 100644
--- a/dev-libs/isl/isl-0.22.1.ebuild
+++ b/dev-libs/isl/isl-0.22.1.ebuild
@@ -15,7 +15,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sp
IUSE="static-libs"
RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
app-arch/xz-utils
virtual/pkgconfig"
diff --git a/dev-libs/isl/isl-0.23-r1.ebuild b/dev-libs/isl/isl-0.23-r1.ebuild
index ee79d99fae15..1b2b92589eb7 100644
--- a/dev-libs/isl/isl-0.23-r1.ebuild
+++ b/dev-libs/isl/isl-0.23-r1.ebuild
@@ -11,11 +11,12 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0/23"
-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="static-libs"
RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
app-arch/xz-utils
virtual/pkgconfig"
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
index 34689e2fbbc9..56c363d61a41 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="|| ( public-domain MIT )"
SLOT="0/24"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild
index 110a3886c5dd..44bc4a4976ad 100644
--- a/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild
+++ b/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
IUSE="${IUSE_VIDEO_CARDS}"
REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
diff --git a/dev-libs/libcroco/libcroco-0.6.13.ebuild b/dev-libs/libcroco/libcroco-0.6.13.ebuild
index 4208a3c7ceba..3ab0d95fc923 100644
--- a/dev-libs/libcroco/libcroco-0.6.13.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.13.ebuild
@@ -1,8 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
inherit gnome2 multilib-minimal
@@ -19,7 +18,8 @@ RDEPEND="
>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-util/gtk-doc-am
virtual/pkgconfig
"
@@ -50,6 +50,6 @@ multilib_src_install() {
}
multilib_src_install_all() {
- DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+ DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO )
einstalldocs
}
diff --git a/dev-libs/libevdev/libevdev-1.10.0.ebuild b/dev-libs/libevdev/libevdev-1.10.0.ebuild
index 022ffa450bed..12a8b20fbe69 100644
--- a/dev-libs/libevdev/libevdev-1.10.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.10.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
inherit git-r3
else
SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 ~sparc x86"
fi
LICENSE="MIT"
diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild
index 55138eb082d5..438d54d74f2a 100644
--- a/dev-libs/libffi/libffi-3.3-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.3-r2.ebuild
@@ -39,6 +39,15 @@ S=${WORKDIR}/${MY_P}
ECONF_SOURCE=${S}
+src_prepare() {
+ default
+ if [[ ${CHOST} == arm64-*-darwin* ]] ; then
+ # ensure we use aarch64 asm, not x86 on arm64
+ sed -i -e 's/aarch64\*-\*-\*/arm64*-*-*|&/' \
+ configure configure.host || die
+ fi
+}
+
multilib_src_configure() {
use userland_BSD && export HOST="${CHOST}"
# --includedir= path maintains a few properties:
diff --git a/dev-libs/libfilezilla/libfilezilla-0.25.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.25.0.ebuild
index 74e3d6fd82a5..9b5d37c80567 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.25.0.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.25.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0/10" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 670805a7b739..8699bbf4ef87 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,2 +1 @@
-DIST libgit2-1.0.1.tar.gz 5312878 BLAKE2B 7eb97bb97d66240ce135e21d348f6dea0c5626992b608f8944b75f9bae5de933fffa07edd536c0353841f8d02c950feec1451008003e35f53554f3c59b069a7f SHA512 7c307822b22e3771e5e908b115600310f7901b3250287532c498003b25a5b1e007bfa23592f16ec4d83c1567a9213710526f78cab7c120316e9a8fc74c5e57a9
DIST libgit2-1.1.0.tar.gz 5426975 BLAKE2B 2a1c1f71d2a2e06448c78eb46028fdcfd59682dccf2365851c4bd059cdd78842320f9a5ba7345e761611a5b4eba634faf2e26cc669097da0ba2e1c832c23059f SHA512 347bb68900181b44fa58a0417506c91383adb965607fce049a5b4c57ac9cc286e0a140d164c339b50fb6cd6951f47757c2917a2df44ba004bfaa4fb643946bb8
diff --git a/dev-libs/libgit2/libgit2-1.0.1-r1.ebuild b/dev-libs/libgit2/libgit2-1.0.1-r1.ebuild
deleted file mode 100644
index 19f69847b508..000000000000
--- a/dev-libs/libgit2/libgit2-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,72 +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,9} )
-inherit cmake python-any-r1
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${P/_/-}
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/1.0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~ppc-macos"
-IUSE="examples gssapi libressl +ssh test +threads trace"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/libpcre:=
- net-libs/http-parser:=
- sys-libs/zlib
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- gssapi? ( virtual/krb5 )
- ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
-"
-
-src_prepare() {
- cmake_src_prepare
- # relying on forked http-parser to support some obscure URI form
- sed -i -e '/empty_port/s:test:_&:' tests/network/urlparse.c || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_CLAR=$(usex test)
- -DENABLE_TRACE=$(usex trace ON OFF)
- -DUSE_GSSAPI=$(usex gssapi ON OFF)
- -DUSE_SSH=$(usex ssh)
- -DTHREADSAFE=$(usex threads)
- -DUSE_HTTP_PARSER=system
- )
- cmake_src_configure
-}
-
-src_test() {
- if [[ ${EUID} -eq 0 ]] ; then
- # repo::iterator::fs_preserves_error fails if run as root
- # since root can still access dirs with 0000 perms
- ewarn "Skipping tests: non-root privileges are required for all tests to pass"
- else
- local TEST_VERBOSE=1
- cmake_src_test -R offline
- fi
-}
-
-src_install() {
- cmake_src_install
- dodoc docs/*.{md,txt}
-
- if use examples ; then
- find examples -name '.gitignore' -delete || die
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild b/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
index c86c4c67b54f..7266a4febc0f 100644
--- a/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
+++ b/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${P/_/-}
LICENSE="GPL-2-with-linking-exception"
SLOT="0/1.1"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~ppc-macos"
IUSE="examples gssapi libressl +ssh test +threads trace"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index e63c05c5c944..f6f67a720306 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1 +1,2 @@
DIST libgudev-233.tar.xz 271292 BLAKE2B 02c9a1040e3db21a9478927cce99cc8fdb360db922fc35421fd41ceeaffc786aa9f397f9387ac9d98bdd8ed45a457af2c0d33df731edfa08b63cb64a2c7fa4e6 SHA512 0e7beb35478bba2aed3cf8e750f524c562038b04fd59e4dd31618b0ae7cbd29545e5909c422325e4be84dcab9177a5256bf0f3ce7df7b6c07e4866cbb8ce570b
+DIST libgudev-234.tar.xz 273244 BLAKE2B c0556988e37d5a5c48ba906b121d3c7a16c6a8ee4d05eb0e51913b9cde51bdc10966dcf8ceeccf62021dd8e47b004c85ed3412942d9d2bd5176d604931745f50 SHA512 cb01906d532b05cf8f69acdf80a8f05fbd4863fd98e88928b491e3657e60844f7ae6ca903ddd773fbea37268ff85d12719de47fd92a2f18b98fa2dbfe85e8151
diff --git a/dev-libs/libgudev/libgudev-234.ebuild b/dev-libs/libgudev/libgudev-234.ebuild
new file mode 100644
index 000000000000..e163aab6636e
--- /dev/null
+++ b/dev-libs/libgudev/libgudev-234.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="GObject bindings for libudev"
+HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="introspection static-libs"
+
+DEPEND="
+ >=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP},static-libs?]
+ >=virtual/libudev-199:=[${MULTILIB_USEDEP},static-libs(-)?]
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+"
+RDEPEND="${DEPEND}
+ !sys-fs/eudev[gudev(-)]
+ !sys-fs/udev[gudev(-)]
+ !sys-apps/systemd[gudev(-)]
+"
+BDEPEND="
+ dev-util/glib-utils
+ >=dev-util/gtk-doc-am-1.18
+ virtual/pkgconfig
+"
+
+multilib_src_configure() {
+ local myconf=(
+ $(multilib_native_use_enable introspection)
+ $(use_enable static-libs static)
+ --disable-umockdev # umockdev tests currently don't pass (might need extra setup)
+ )
+ local ECONF_SOURCE="${S}"
+ gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
diff --git a/dev-libs/libinput/libinput-1.16.4.ebuild b/dev-libs/libinput/libinput-1.16.4.ebuild
index ad71da0e96ca..e2cc5fe76a2c 100644
--- a/dev-libs/libinput/libinput-1.16.4.ebuild
+++ b/dev-libs/libinput/libinput-1.16.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0/10"
[[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="doc input_devices_wacom test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest
index 0d3874cc1194..88d8ac1f3b0a 100644
--- a/dev-libs/liblinear/Manifest
+++ b/dev-libs/liblinear/Manifest
@@ -1,5 +1 @@
-DIST liblinear-210.tar.gz 381662 BLAKE2B d64d217f7ba67605821062f66d4e9f130f4f2396dde14cd35532bad11f4af4f34bc231a1e3796ba2d0e14f84830ec05c6358d40018e048f4ae3fa62db2b1d0d7 SHA512 4e4558467f2ebb3dbd640c172b1129c8e5981c231a043abb0398a803252559795604a34992baee50ae6689646050733d3a908d7d76f8b1c94309b859eae7f8c8
-DIST liblinear-221.tar.gz 520288 BLAKE2B b28c837488f5827ae76f32dc14a1b92027eb5ff123a15c07e9974197eea842c8247420632d259defdba3968383749538c1ed16f6b5c982fad87b3bc52572b485 SHA512 abf21f9030e67886d88a95ad1699e566f8b67bb3bd23253f1f656460911f92a5c3c184fe127390d6100bbf9970cf7a246ef3611b0788907c35a33286228f1753
-DIST liblinear-230.tar.gz 524693 BLAKE2B 02e52f6dc26f6ae19dfe52691e4a86c64ea92c40a50d0fbe8a7bddcf06e1216b8f28462fb2105539dedf15ddb07f39ef7e7f78fa7cfd74eac955246e9ed050e7 SHA512 c8acdd9f5cfcf7ef1ff9b9fac658ff51ac4677801fdb9ce6a210ccca7fb136a7957d0edaf45e83269c1928de1926de0200d669cd94e09371c06821d42ba539bc
-DIST liblinear-240.tar.gz 558915 BLAKE2B 50aba25c0cb6f9be505b6f9f2b84c67c772b1c8c56cb4b3580b4615c22d30b97a510b28e3d180af29e6c29c4ad77d011319298d6301cb4b2708ad6caf0e1dfc2 SHA512 70e392700cf278d1b62ee7a0b5862dd2a8ea0de28e9660c6d7bc4cac7f098608eba2d20d8f28b5ce0132af09a4446a2cf8aac2ed5f62d35fe304d7a8709ef1d5
DIST liblinear-241.tar.gz 559122 BLAKE2B 793ef45fc652d6f35908465e754e0aed6568125e74e68ca72466c4d71cc0e30746a999e978521c09a3ada079698f59f2bf65a430679538b7bebc133a258f2588 SHA512 a9ca47b051e28046829a3f355a552b2f5b270dd706170e1d21db1509ef09eca55e2d8ff29695d9e8192baad8bcf50aa76e75a3683948c726f2c9b915a3e4bf27
diff --git a/dev-libs/liblinear/liblinear-210-r1.ebuild b/dev-libs/liblinear/liblinear-210-r1.ebuild
deleted file mode 100644
index fb59d193d192..000000000000
--- a/dev-libs/liblinear/liblinear-210-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A Library for Large Linear Classification"
-HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
-SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-src_prepare() {
- sed -i \
- -e '/^AR/s|=|?=|g' \
- -e '/^RANLIB/s|=|?=|g' \
- -e '/^CFLAGS/d;/^CXXFLAGS/d' \
- blas/Makefile || die
- sed -i \
- -e 's|make|$(MAKE)|g' \
- -e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \
- -e '/^CFLAGS/d;/^CXXFLAGS/d' \
- -e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
- Makefile || die
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- CFLAGS="${CFLAGS} -fPIC" \
- CXXFLAGS="${CXXFLAGS} -fPIC" \
- AR="$(tc-getAR) rcv" \
- RANLIB="$(tc-getRANLIB)" \
- lib all
-}
-
-src_install() {
- dolib ${PN}.so.3
- dosym ${PN}.so.3 /usr/$(get_libdir)/${PN}.so
-
- newbin predict ${PN}-predict
- newbin train ${PN}-train
-
- doheader linear.h
-
- dodoc README
-}
diff --git a/dev-libs/liblinear/liblinear-221.ebuild b/dev-libs/liblinear/liblinear-221.ebuild
deleted file mode 100644
index b99f3d0ac3d3..000000000000
--- a/dev-libs/liblinear/liblinear-221.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A Library for Large Linear Classification"
-HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
-SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-
-src_prepare() {
- default
-
- sed -i \
- -e '/^AR/s|=|?=|g' \
- -e '/^RANLIB/s|=|?=|g' \
- -e '/^CFLAGS/d;/^CXXFLAGS/d' \
- blas/Makefile || die
- sed -i \
- -e 's|make|$(MAKE)|g' \
- -e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \
- -e '/^CFLAGS/d;/^CXXFLAGS/d' \
- -e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
- Makefile || die
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- CFLAGS="${CFLAGS} -fPIC" \
- CXXFLAGS="${CXXFLAGS} -fPIC" \
- AR="$(tc-getAR) rcv" \
- RANLIB="$(tc-getRANLIB)" \
- lib all
-}
-
-src_install() {
- dolib.so ${PN}.so.3
- dosym ${PN}.so.3 /usr/$(get_libdir)/${PN}.so
-
- newbin predict ${PN}-predict
- newbin train ${PN}-train
-
- doheader linear.h
-
- dodoc README
-}
diff --git a/dev-libs/liblinear/liblinear-230.ebuild b/dev-libs/liblinear/liblinear-230.ebuild
deleted file mode 100644
index b99f3d0ac3d3..000000000000
--- a/dev-libs/liblinear/liblinear-230.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A Library for Large Linear Classification"
-HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
-SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-
-src_prepare() {
- default
-
- sed -i \
- -e '/^AR/s|=|?=|g' \
- -e '/^RANLIB/s|=|?=|g' \
- -e '/^CFLAGS/d;/^CXXFLAGS/d' \
- blas/Makefile || die
- sed -i \
- -e 's|make|$(MAKE)|g' \
- -e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \
- -e '/^CFLAGS/d;/^CXXFLAGS/d' \
- -e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
- Makefile || die
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- CFLAGS="${CFLAGS} -fPIC" \
- CXXFLAGS="${CXXFLAGS} -fPIC" \
- AR="$(tc-getAR) rcv" \
- RANLIB="$(tc-getRANLIB)" \
- lib all
-}
-
-src_install() {
- dolib.so ${PN}.so.3
- dosym ${PN}.so.3 /usr/$(get_libdir)/${PN}.so
-
- newbin predict ${PN}-predict
- newbin train ${PN}-train
-
- doheader linear.h
-
- dodoc README
-}
diff --git a/dev-libs/liblinear/liblinear-240-r1.ebuild b/dev-libs/liblinear/liblinear-240-r1.ebuild
deleted file mode 100644
index ede9a159d953..000000000000
--- a/dev-libs/liblinear/liblinear-240-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A Library for Large Linear Classification"
-HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
-SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-
-src_prepare() {
- default
-
- sed -i \
- -e '/^AR/s|=|?=|g' \
- -e '/^RANLIB/s|=|?=|g' \
- -e '/^CFLAGS/d;/^CXXFLAGS/d' \
- blas/Makefile || die
- sed -i \
- -e 's|make|$(MAKE)|g' \
- -e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \
- -e '/^CFLAGS/d;/^CXXFLAGS/d' \
- -e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
- Makefile || die
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- CFLAGS="${CFLAGS} -fPIC" \
- CXXFLAGS="${CXXFLAGS} -fPIC" \
- AR="$(tc-getAR) rcv" \
- RANLIB="$(tc-getRANLIB)" \
- lib all
-}
-
-src_install() {
- dolib.so ${PN}.so.4
- dosym ${PN}.so.4 /usr/$(get_libdir)/${PN}.so
-
- newbin predict ${PN}-predict
- newbin train ${PN}-train
-
- doheader linear.h
-
- dodoc README
-}
diff --git a/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild b/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
index c9a1afd2bcd4..1e0e67de31be 100644
--- a/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
+++ b/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz"
LICENSE="GPL-2 MIT"
SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="static-libs"
DEPEND=""
diff --git a/dev-libs/libpipeline/libpipeline-1.5.3.ebuild b/dev-libs/libpipeline/libpipeline-1.5.3.ebuild
index f3cacf173e23..d5105befe7ff 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.3.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-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"
+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"
IUSE="static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index c7e4685aa032..56d248f83f7d 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,2 +1,3 @@
DIST libpqxx-7.1.2.tar.gz 693152 BLAKE2B da28d0041fc345eb7774eadf0a886e2a89692ac47d870120991aa97328a6be7d10e8cb2d6deb9e056dc7e05b04fd317d9d0fe4dcf8eab901114b27cd64bf4ff6 SHA512 a4a76c62f6115f5898e4c4bb1c6f095284bdb7ae6a1efa45add9efd422d2a8280d1698caa2469acbb087168208ae0fd8efa36c8735a8ce30e58853e27acd4161
DIST libpqxx-7.2.1.tar.gz 691486 BLAKE2B ef1b12e436e33a26faa8f5acceef8d5ab1063b0618798fdf881fe38ab101da6d78989cc30c1e24f60fd81dd4f4034267e8b220b7b1d1932793028abf7e17c614 SHA512 baaa53f12aa87f512bbbe7494c915242cda8508b43414b79e6cd047dbd61902cbe54cb34af13d75bdccd70bdbafcaca155b4ccb426d8b831bd4df46e9a57e3a2
+DIST libpqxx-7.3.0.tar.gz 694012 BLAKE2B 35770599fcb3131081e08c18d96b753cc6d412c6ea8fddf5617df7da2035cf8ee3a031b7c14d592e0c9560e1e1074e633734337113ed0b3943e519aa44806307 SHA512 897af8e1c0ab12df745116e5387d3c31fb8800b6c599f49413ddcc67df7968fb1922c96896c818ce3f34d9649fb6c1d2ea59784f8765fb765481b156be44eaa2
diff --git a/dev-libs/libpqxx/libpqxx-7.3.0.ebuild b/dev-libs/libpqxx/libpqxx-7.3.0.ebuild
new file mode 100644
index 000000000000..1ce7f1510f3c
--- /dev/null
+++ b/dev-libs/libpqxx/libpqxx-7.3.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-any-r1
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
+SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://pqxx.org/development/libpqxx/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND="dev-db/postgresql:="
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ doc? (
+ app-doc/doxygen
+ app-text/xmlto
+ )
+"
+
+DOCS=( AUTHORS NEWS README{.md,-UPGRADE} )
+
+src_configure() {
+ econf \
+ --enable-shared \
+ $(use_enable doc documentation) \
+ $(use_enable static-libs static)
+}
+
+src_test() {
+ einfo "The tests need a running PostgreSQL server and an existing database."
+ einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally,"
+ einfo "set PGPORT and PGHOST. Define them at the command line or in:"
+ einfo " ${EROOT}/etc/libpqxx_test_env"
+
+ if [[ -z $PGDATABASE || -z $PGUSER ]] ; then
+ if [[ -f ${EROOT}/etc/libpqxx_test_env ]] ; then
+ source "${EROOT}/etc/libpqxx_test_env"
+ [[ -n $PGDATABASE ]] && export PGDATABASE
+ [[ -n $PGHOST ]] && export PGHOST
+ [[ -n $PGPORT ]] && export PGPORT
+ [[ -n $PGUSER ]] && export PGUSER
+ fi
+ fi
+
+ if [[ -n $PGDATABASE && -n $PGUSER ]] ; then
+ local server_version
+ server_version=$(psql -Aqtc 'SELECT version();' 2> /dev/null)
+ if [[ $? = 0 ]] ; then
+ cd "${S}/test" || die
+ emake check
+ else
+ eerror "Is the server running?"
+ eerror "Verify role and database exist, and are permitted in pg_hba.conf for:"
+ eerror " Role: ${PGUSER}"
+ eerror " Database: ${PGDATABASE}"
+ die "Couldn't connect to server."
+ fi
+ else
+ eerror "PGDATABASE and PGUSER must be set to perform tests."
+ eerror "Skipping tests."
+ fi
+}
+
+src_install () {
+ use doc && HTML_DOCS=( doc/html/. )
+ default
+
+ if ! use static-libs; then
+ find "${D}" -name '*.la' -delete || die
+ fi
+}
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest
new file mode 100644
index 000000000000..71ae48ee0d7c
--- /dev/null
+++ b/dev-libs/libtomcrypt/Manifest
@@ -0,0 +1 @@
+DIST libtomcrypt-1.18.2.tar.xz 2638064 BLAKE2B fad67e9e2a2002425488db9987a853bda631d6638c2cb1052a1d0d1f393945e38037cc75c54cd3a4bf87bb2e13b1e868e81da054a84bbdb393519ddef5e27300 SHA512 f6117a12a42b07f8de4a8aedbccf6ff4ee94b4b81cb7263af99627c32eae646ca8ead7d3063737918db4aa118673001fcf2cfa8e4ca8b528fb00045fda7cc893
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2.ebuild
new file mode 100644
index 000000000000..9b87379612a7
--- /dev/null
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="LibTomCrypt is a comprehensive, modular and portable cryptographic toolkit"
+HOMEPAGE="https://www.libtom.net/LibTomCrypt/ https://github.com/libtom/libtomcrypt"
+SRC_URI="
+ https://github.com/libtom/${PN}/releases/download/v${PV}/crypt-${PV}.tar.xz
+ -> ${P}.tar.xz"
+
+LICENSE="|| ( WTFPL-2 public-domain )"
+# Current SONAME is 1
+# Please bump when the ABI changes upstream
+# Helpful site:
+# https://abi-laboratory.pro/index.php?view=timeline&l=libtomcrypt
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gmp +libtommath tomsfastmath"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+ gmp? ( dev-libs/gmp:= )
+ libtommath? ( dev-libs/libtommath:= )
+ tomsfastmath? ( dev-libs/tomsfastmath:= )
+"
+
+mymake() {
+ # Standard boilerplate
+ # Upstream use homebrewed makefiles
+ # Best to use same args for all, for consistency,
+ # in case behaviour changes (v possible).
+ local enabled_features=()
+ local extra_libs=()
+
+ # Build support as appropriate for consumers (MPI)
+ use gmp && enabled_features+=( -DGMP_DESC=1 )
+ use libtommath && enabled_features+=( -DLTM_DESC=1 )
+ use tomsfastmath && enabled_features+=( -DTFM_DESC=1 )
+
+ # For the test and example binaries, we have to choose
+ # which MPI we want to use.
+ # For now (see src_test), arbitrarily choose:
+ # gmp > libtommath > tomsfastmath > none
+ if use gmp ; then
+ enabled_features+=( -DUSE_GMP=1 )
+ extra_libs=( -lgmp )
+ elif use libtommath ; then
+ enabled_features+=( -DUSE_LTM=1 )
+ extra_libs=( -ltommath )
+ elif use tomsfastmath ; then
+ enabled_features+=( -DUSE_TFM=1 )
+ extra_libs=( -ltfm )
+ fi
+
+ # If none of the above are being used,
+ # the tests don't need to link against any extra
+ # libraries.
+
+ # We only need to do this strange logic for tests
+ # anyway because we're choosing what to build a binary with.
+ if [[ ${TEST} != 1 ]] ; then
+ extra_libs=()
+ fi
+
+ # IGNORE_SPEED=1 is needed to respect CFLAGS
+ EXTRALIBS="${extra_libs}" emake \
+ CFLAGS="${CFLAGS} ${enabled_features[*]}" \
+ CC="$(tc-getCC)" \
+ AR="$(tc-getAR)" \
+ RANLIB="$(tc-getRANLIB)" \
+ LIBPATH="${ESYSROOT}/usr/$(get_libdir)" \
+ INCPATH="${ESYSROOT}/usr/include" \
+ IGNORE_SPEED=1 \
+ "${@}"
+}
+
+src_compile() {
+ mymake -f makefile.shared library
+}
+
+src_test() {
+ # libtomcrypt can build with several MPI providers
+ # but the tests can only be built with one at a time.
+ # When the next release (> 1.18.2) containing
+ # 1) https://github.com/libtom/libtomcrypt/commit/a65cfb8dbe4
+ # 2) https://github.com/libtom/libtomcrypt/commit/fdc6cd20137
+ # is made, we can run tests for each provider.
+ TEST=1 mymake test
+ ./test || die "Running tests failed"
+}
+
+src_install() {
+ mymake -f makefile.shared \
+ DATAPATH="${EPREFIX}/usr/share/doc/${PF}" \
+ DESTDIR="${ED}" \
+ install install_docs
+
+ find "${ED}" '(' -name '*.la' -o -name '*.a' ')' -delete || die
+}
diff --git a/dev-libs/libtomcrypt/metadata.xml b/dev-libs/libtomcrypt/metadata.xml
new file mode 100644
index 000000000000..9dda15fd9cfb
--- /dev/null
+++ b/dev-libs/libtomcrypt/metadata.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ sam@gentoo.org
+ Sam James
+
+
+ mgorny@gentoo.org
+ Michał Górny
+
+
+
+ libtom/libtomcrypt
+
+
diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest
index 67760f63274f..eaf116692eb5 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -1,2 +1 @@
-DIST ltm-1.1.0.tar.xz 2125456 BLAKE2B 3aca7993704341f6a81e7fbef35389ac8ecd957dd78b5d576f0305d37493c3ddc32462cd787de2fb67d8e165417b18fcfde70accf991cd9433ff87591d8265ac SHA512 6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91
DIST ltm-1.2.0.tar.xz 622120 BLAKE2B 1537dad7da5c14264f03280e9d49fa0b7e6c1c4924c805f202d31c60569b9e3bee40674301d67b0f5b049c1c2dc5ec71b6c566ff5c9b8168d16840b031acc400 SHA512 6f9ccd0691831f07f86ddc81cb6145504b3d5da66dd3e92312c64cce0ea986fa4e08ba65ca8991aaebe56702c2d7c15f309696785b813dffb4c112a4ad04b203
diff --git a/dev-libs/libtommath/libtommath-1.1.0.ebuild b/dev-libs/libtommath/libtommath-1.1.0.ebuild
deleted file mode 100644
index 70d7c93256b9..000000000000
--- a/dev-libs/libtommath/libtommath-1.1.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Optimized and portable routines for integer theoretic applications"
-HOMEPAGE="https://www.libtom.net/"
-SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}.tar.xz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples static-libs"
-
-src_prepare() {
- default
- # need libtool for cross compilation. Bug #376643
- cat <<-EOF > configure.ac
- AC_INIT(libtommath, 0)
- AM_INIT_AUTOMAKE
- LT_INIT
- AC_CONFIG_FILES(Makefile)
- AC_OUTPUT
- EOF
- touch NEWS README AUTHORS ChangeLog Makefile.am
- eautoreconf
- export LIBTOOL="${S}"/libtool
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-_emake() {
- emake \
- CC="$(tc-getCC)" \
- AR="$(tc-getAR)" \
- RANLIB="$(tc-getRANLIB)" \
- -f makefile.shared \
- IGNORE_SPEED=1 \
- LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
- INCPATH="${EPREFIX}/usr/include" \
- "$@"
-}
-
-src_compile() {
- _emake
-}
-
-src_test() {
- _emake test_standalone
- ./test || die
-}
-
-src_install() {
- _emake DESTDIR="${D}" install
- # We only link against -lc, so drop the .la file.
- find "${ED}" -name '*.la' -delete || die
- if ! use static-libs ; then
- find "${ED}" -name "*.a" -delete || die
- fi
-
- dodoc changes.txt
-
- use doc && dodoc *.pdf
-
- if use examples ; then
- docinto demo
- dodoc demo/*.c
- fi
-}
diff --git a/dev-libs/libuv/libuv-1.40.0.ebuild b/dev-libs/libuv/libuv-1.40.0.ebuild
index 2bff012b3068..0e5e25477356 100644
--- a/dev-libs/libuv/libuv-1.40.0.ebuild
+++ b/dev-libs/libuv/libuv-1.40.0.ebuild
@@ -25,6 +25,22 @@ src_prepare() {
echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
> m4/libuv-extra-automake-flags.m4 || die
+ if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
+ sed -i -e '/!defined(__DragonFly__)/i!defined(__APPLE__) && \\' \
+ src/unix/udp.c || die
+ sed -i -e '/err = pthread_setname_np/cerr = 0;' \
+ src/unix/darwin-proctitle.c || die
+ sed -i -e '/int uv_if_indextoname/i\
+ static size_t strnlen(char *x, size_t len) {\
+ char *r = memchr(x, '"'"'\\n'"'"', len);\
+ if (r == NULL)\
+ return len;\
+ else\
+ return r - x;\
+ }' \
+ src/unix/getaddrinfo.c || die
+ fi
+
# upstream fails to ship a configure script
eautoreconf
}
diff --git a/dev-libs/libverto/libverto-0.3.1.ebuild b/dev-libs/libverto/libverto-0.3.1.ebuild
index 883f3b2cfe0b..466fa5dc46b7 100644
--- a/dev-libs/libverto/libverto-0.3.1.ebuild
+++ b/dev-libs/libverto/libverto-0.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.g
LICENSE="MIT"
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="glib +libev libevent tevent +threads static-libs"
DEPEND="glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
index a6678320ffe2..65f752d81b4a 100644
--- a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
@@ -205,7 +205,7 @@ multilib_src_install_all() {
pkg_postinst() {
# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
- if [[ "${ROOT}" != "/" ]]; then
+ if [[ -n ${ROOT} ]]; then
elog "Skipping XML catalog creation for stage building (bug #208887)."
else
# need an XML catalog, so no-one writes to a non-existent one
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index b5debf23fbd4..39ba6751f649 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -1,2 +1,2 @@
DIST pugixml-1.10.tar.gz 381990 BLAKE2B ea446d11fe5213a5250b7e737a9e80a3976454724e1a1c326b689214ad4d3e183abd417a7782b3d5c68a0aabce42228e121352e4d2dd33f5f2bb2334f6c72c27 SHA512 bfc80661005d0a0fb82ca6d5299e5efdd1bb468e11ee52d7ee9367e15776d28efb60266ce03842715cd43aae023afc2b369797bb3cbecd6d6a65c3ae3903e469
-DIST pugixml-1.11.2.tar.gz 386166 BLAKE2B 21dee2f04e8f9d962cd6f0ebf54d608fb0434ed815a13807f5939dea47e98128009b6b918a761b80566b959f1c0651c4b771028515fd9e8b8b51a0e4e592d3dd SHA512 403ef9f642fba6aff2d642399516886c0cda44ca19c58eeb05594aa7220562afbee939a5edab0c85263596834c5bdaea82a346dd8ee00a712e97b564f0d1e52d
+DIST pugixml-1.11.3.tar.gz 386244 BLAKE2B 1c83b0e0c1f464d3ef2efc19decc425bac14b5f92face3ea3bbd9f970e442043d3c4d4c471178c8891d7b3245aa6193d89fe3bfea122886ec0261418a69cc2c6 SHA512 4af70f11bbbb8a33240bf12c6ea14973963303a8cf7fa6ce56376726a6c4764c2f6c87a4e6d7672961850a84d8f430712686d744da8bc12d5fe0a711dad6e90b
diff --git a/dev-libs/pugixml/pugixml-1.11.2.ebuild b/dev-libs/pugixml/pugixml-1.11.3.ebuild
similarity index 100%
rename from dev-libs/pugixml/pugixml-1.11.2.ebuild
rename to dev-libs/pugixml/pugixml-1.11.3.ebuild
diff --git a/dev-libs/tomsfastmath/files/tomsfastmath-0.13.1-export-fp_isprime_ex.patch b/dev-libs/tomsfastmath/files/tomsfastmath-0.13.1-export-fp_isprime_ex.patch
new file mode 100644
index 000000000000..627bf4b2f4d9
--- /dev/null
+++ b/dev-libs/tomsfastmath/files/tomsfastmath-0.13.1-export-fp_isprime_ex.patch
@@ -0,0 +1,13 @@
+Needed because libtomcrypt expects this symbol to be available
+https://github.com/libtom/tomsfastmath/commit/81530c207da8b3a43867da14df7d79d2cdf96978.patch
+--- a/libtfm.symbols
++++ b/libtfm.symbols
+@@ -16,6 +16,7 @@ fp_gcd
+ fp_ident
+ fp_invmod
+ fp_isprime
++fp_isprime_ex
+ fp_lcm
+ fp_lshd
+ fp_mod
+
diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
new file mode 100644
index 000000000000..738e6706e8c4
--- /dev/null
+++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Fast public domain large integer arithmetic library"
+HOMEPAGE="https://www.libtom.net/TomsFastMath/
+ https://github.com/libtom/tomsfastmath"
+SRC_URI="https://github.com/libtom/tomsfastmath/releases/download/v${PV}/tfm-${PV}.tar.xz"
+LICENSE="Unlicense"
+
+# Current SONAME is 1
+# Please bump when the ABI changes upstream
+# Helpful site:
+# https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath
+SLOT="0/1"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${P}-makefile-fix.patch"
+ "${FILESDIR}/${PN}-0.13.1-export-fp_isprime_ex.patch"
+)
+
+_emake() {
+ # Standard boilerplate
+ # Upstream use homebrewed makefiles
+ # Best to use same args for all, for consistency,
+ # in case behaviour changes (v possible).
+ emake \
+ CC="$(tc-getCC)" \
+ AR="$(tc-getAR)" \
+ RANLIB="$(tc-getRANLIB)" \
+ DESTDIR="${ED}" \
+ LIBPATH="/usr/$(get_libdir)" \
+ IGNORE_SPEED=1 \
+ "$@"
+}
+
+src_compile() {
+ _emake -f makefile.shared
+}
+
+src_test() {
+ _emake test_standalone stest rsatest
+
+ # We choose to be verbose during the test process
+ # because the output is quite repetitive with no
+ # clear demarcation b/t tests
+ local tests=( "test" "stest" "rsatest" )
+
+ local test
+ for test in "${tests[@]}"; do
+ einfo "Running test (${test})"
+ ./${test} || die "Test (${test}) failed"
+ einfo "Completed test (${test})"
+ done
+}
+
+src_install() {
+ _emake -f makefile.shared install
+
+ # Remove unnecessary .la files
+ find "${ED}" -name '*.la' -delete || die
+ # Same for static libs
+ find "${ED}" -name "*.a" -delete || die
+}
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index 294f633159b2..a4cb28e3d391 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -1,2 +1 @@
-DIST uthash-2.0.2.tar.gz 191173 BLAKE2B a4a2ddb19fcc9af1105bc07deb8ccbe9c3f04518b609f7cfd16f0a05ec3e16ffb25fb5f0a5f258413f9f52facaa26adf4ea0683415416c12ab36bf11883976ae SHA512 0c2e686eb5a1d6a03a6fa1d42e803fca4e9b60b2d965c635a5a33d487c8d115f1f8155ff99a0e1874b69f6b66c04ea7d8866472a39abe5d1a23ae73f6fa956d7
DIST uthash-2.1.0.tar.gz 191782 BLAKE2B 322661aca33e8df27ec3166cd16549b11f49a6f9eb12f11c78f44b75baf5d9f208825028fb3b89a380277de5784bf2d4c41a6cd2ff070b1d3cd667ec074a85d2 SHA512 c8005113a48ec7636715ecec0286a5d9086971a7267947aba9e0ad031b6113a4f38a1fb512d33d6fefb5891635fdd31169ce4d6ab04b938bda612ebbccb3eda0
diff --git a/dev-libs/uthash/files/uthash-2.0.2-cflags.patch b/dev-libs/uthash/files/uthash-2.0.2-cflags.patch
deleted file mode 100644
index e71506bce15b..000000000000
--- a/dev-libs/uthash/files/uthash-2.0.2-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- uthash-2.0.2/tests/Makefile
-+++ uthash-2.0.2/tests/Makefile
-@@ -18,7 +18,7 @@
- CFLAGS += -I$(HASHDIR)
- #CFLAGS += -DHASH_BLOOM=16
- #CFLAGS += -O2
--CFLAGS += -g
-+#CFLAGS += -g
- #CFLAGS += -Wstrict-aliasing=2
- CFLAGS += -Wall
- #CFLAGS += -Wextra
diff --git a/dev-libs/uthash/uthash-2.0.2.ebuild b/dev-libs/uthash/uthash-2.0.2.ebuild
deleted file mode 100644
index 95707126da3f..000000000000
--- a/dev-libs/uthash/uthash-2.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="An easy-to-use hash implementation for C programmers"
-HOMEPAGE="https://troydhanson.github.io/uthash/index.html"
-SRC_URI="https://github.com/troydhanson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-lang/perl )"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
-
-src_test() {
- cd tests || die
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- doheader src/*.h
- dodoc doc/*.txt
-}
diff --git a/dev-libs/uthash/uthash-2.1.0.ebuild b/dev-libs/uthash/uthash-2.1.0.ebuild
index 49f42356561e..c991385c4c34 100644
--- a/dev-libs/uthash/uthash-2.1.0.ebuild
+++ b/dev-libs/uthash/uthash-2.1.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="BSD-1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 9470c77c7de9..8dde919d3945 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,4 +1,5 @@
DIST vala-0.48.11.tar.xz 3487944 BLAKE2B fe47bba9ddb31c469d63d9ca32d631901d59db19c417d864088bc33aa2845d388e762ecc39b2d9574aafbfc501eb61abb3604e07754b2d8eff63d23c53f1eb84 SHA512 6ddad88ab4d2a34352be9ce0a0c13dc3382ebcb494c08e2531a0195aad21a80db70e7dc3ffd2d27ef03a4ca30ac2bf31869521489ffd95fc520c4085362fc5e7
+DIST vala-0.48.12.tar.xz 3492200 BLAKE2B 0a401ac4349dc1c628fa608b5a89504583d6d2bb05ca74eb507e766cca418121e14adfe6e8cfeb8f42212c717280b9b91426309df415d869896654be626c46c5 SHA512 da7becf8b92985a07b139651c14bd41ec86aed3e2b610029d2b376f70335c98607f39de4a1fa4efe9d51e6088edd4c13d22431cada389679d55f684ad548f4d1
DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375
DIST vala-0.48.9.tar.xz 3472540 BLAKE2B 1c85b5d9a1f3819d5b26b521c7da423adee313b2acacb354e324abd9ccf24707dcfcd1a455bab867043f674c4daa5f1a62210847ac271dfce09a288651220f53 SHA512 076fcbea34dde1a84c15e4e2b6acd009c2fea578d48eb28a99a604eb4edc8bb53ac6883ca93ec906968d43d4b341707abc730d6ac8a7b3682a2fa5f0030d5256
-DIST vala-0.50.1.tar.xz 3508924 BLAKE2B 4a6acd2ac9e098e8da9c1264584f02a22429ed096292ec8baf4c9c5ac2d0be4bf20c6c2eb6a41e31295461e1a7e0929c471512e435245c04228bf67c91f372ed SHA512 2f5d0bee6dcac3031108fffaa3a9a0339c8c79ff92d1824292f266a704bef1cf4f9eed15ebf424b608f09129b3e0577ed8cd7798a4fa12bfd9d06026909de769
+DIST vala-0.50.2.tar.xz 3514208 BLAKE2B f2f7e86b90ac1245d593ba82204667a830843e2fdb8e9a5afaa44453a146461f0ce2b9f9338ef4743bc6055bbce6c023ae92f0bf2ca66757cddd7fc3d7a4db63 SHA512 77069b53037adcd4c3fed2dc4a5c740216b950c52e8a0ed777a5cf9a5d9f078d0abbc4dbce08e122817cd3de0ac75ebd150b0f6f0b0cf4a09cb4a46f96bf4c3e
diff --git a/dev-libs/vala-common/vala-common-0.50.1.ebuild b/dev-libs/vala-common/vala-common-0.48.12.ebuild
similarity index 100%
rename from dev-libs/vala-common/vala-common-0.50.1.ebuild
rename to dev-libs/vala-common/vala-common-0.48.12.ebuild
diff --git a/dev-libs/vala-common/vala-common-0.50.2.ebuild b/dev-libs/vala-common/vala-common-0.50.2.ebuild
new file mode 100644
index 000000000000..ee55cfcad100
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.50.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+ insinto /usr/share/aclocal
+ doins vala.m4 vapigen/vapigen.m4
+ insinto /usr/share/vala
+ doins vapigen/Makefile.vapigen
+}
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index 7eccce0b88c9..be7ebfab1837 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -1,2 +1,4 @@
DIST voikko-fi-2.3.tar.gz 694602 BLAKE2B 454afaa76be00645b8640f84c2c91ed0b31be5b46c98d31bba0f4967dce27919eee6a6c452941b3878b498c7f913a413a3d143d658bc38da2a07b32d876ac317 SHA512 b3478cbb6aecebcc25e1c4bce0881a657d664c11190a22c1c2c4ca7e7c62b4c4fd5d396718fbadc8c5ab3c9db5d4349d6cd81440a1394cf4c2f77c52ae608018
DIST voikko-fi-2.3.tar.gz.asc 833 BLAKE2B 4d960595ac948ec59499448219c5c84fe17060f80bdddaf358d222db63b1c2d167713ff9feec04fa9cbf35072a6cc153486078851319cf6631b7f18b346cd034 SHA512 1990f737673931580236e1765aabc2e47766f0bc1f6fef150fd2fb63dd459244ceb0fef99cea9ba1f1295a75daab0336400b7c6b367f694038849759e000adbc
+DIST voikko-fi-2.4.tar.gz 701807 BLAKE2B 978871a733b12be53287ec2d4637428f6991cdb3098a97cc7fc673d7b1e1ac85eb6811653c1121a1f04b23f40e1b6ff6340a5514c2d1231cf7be37879c70cf20 SHA512 00098fd52d4f81b30fe7f0ecb97ee8f240d898dfd511da1fdc5e6fd7046f2bf94c0230dc733bc6034f178d56d26c3ee69965eb61c04fc7b30087131767701858
+DIST voikko-fi-2.4.tar.gz.asc 833 BLAKE2B f4f470118716cf3ad2348b8ae74f57d95a03adff3ffee66a1f09ae569e240a99ff08e026cd7bf575347ec9941bf6e0174c0b3b468a3434304dd8356db3e4d35d SHA512 bb68fe81c0d8cea206b93484d94d5bfc9a9272827616f3ce8016721027a736b190ae37679baed70df0350c3f84235fdb3d6a525d93123ff561ef6d83b7717562
diff --git a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
new file mode 100644
index 000000000000..527614bfd971
--- /dev/null
+++ b/dev-libs/voikko-fi/voikko-fi-2.4.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..9} )
+
+inherit python-any-r1 verify-sig
+
+DESCRIPTION="Finnish dictionary for libvoikko based spell checkers (vvfst format)"
+HOMEPAGE="https://voikko.puimula.org/"
+SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
+ verify-sig? ( https://www.puimula.org/voikko-sources/voikko-fi/${P}.tar.gz.asc )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/foma
+ dev-libs/libvoikko"
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}
+ dev-libs/libvoikko
+ verify-sig? ( app-crypt/openpgp-keys-voikko )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/voikko.asc
+
+src_compile() {
+ emake vvfst
+}
+
+src_install() {
+ emake DESTDIR="${D}/usr/share/voikko/" vvfst-install
+ einstalldocs
+}
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index b431b8317fa0..17f1fd06b530 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild
similarity index 92%
rename from dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild
rename to dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild
index f8e40f03140f..812eb60b0a60 100644
--- a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild
+++ b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild
@@ -46,6 +46,9 @@ DOCS=( "README.md" "samples/." )
src_prepare() {
default
+ # Allow override of LUA* variables
+ sed -e '/LUA /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die
+
# Prepare needed dependencies (source code files only)
rm -r deps/{auxiliar,lua-compat} || die
mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die
@@ -60,6 +63,7 @@ lua_src_compile() {
local myemakeargs=(
"AR=$(tc-getAR)"
"CC=$(tc-getCC)"
+ "LUA="
"LUA_CFLAGS=${CFLAGS} $(lua_get_CFLAGS)"
"LUA_LIBS=${LDFLAGS}"
"LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))"
@@ -80,6 +84,8 @@ lua_src_test() {
local myemakeargs=(
"LUA=${ELUA}"
+ "LUA_CFLAGS="
+ "LUA_LIBS="
"LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))"
"TARGET_SYS=${CTARGET:-${CHOST}}"
)
@@ -97,7 +103,10 @@ lua_src_install() {
pushd "${BUILD_DIR}" || die
local myemakeargs=(
+ "LUA="
+ "LUA_CFLAGS="
"LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)"
+ "LUA_LIBS="
"LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))"
"TARGET_SYS=${CTARGET:-${CHOST}}"
)
diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild
similarity index 92%
rename from dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild
rename to dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild
index c8c126b8cb44..88652952c1f3 100644
--- a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild
+++ b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild
@@ -45,6 +45,9 @@ DOCS=( "README.md" "samples/." )
src_prepare() {
default
+ # Allow override of LUA* variables
+ sed -e '/LUA /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die
+
# Prepare needed dependencies (source code files only)
rm -r deps/{auxiliar,lua-compat} || die
mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die
@@ -55,6 +58,7 @@ src_compile() {
local myemakeargs=(
"AR=$(tc-getAR)"
"CC=$(tc-getCC)"
+ "LUA="
"LUA_CFLAGS=${CFLAGS} -I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
"LUA_LIBS=${LDFLAGS}"
"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
@@ -67,6 +71,8 @@ src_compile() {
src_test() {
local myemakeargs=(
"LUA=$(usex luajit 'luajit' 'lua')"
+ "LUA_CFLAGS="
+ "LUA_LIBS="
"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
"TARGET_SYS=${CTARGET:-${CHOST}}"
)
@@ -76,7 +82,10 @@ src_test() {
src_install() {
local myemakeargs=(
+ "LUA="
+ "LUA_CFLAGS="
"LUA_LIBDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
+ "LUA_LIBS="
"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
"TARGET_SYS=${CTARGET:-${CHOST}}"
)
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 66dbadfef331..2b641295d988 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/findlib/findlib-1.8.1-r1.ebuild b/dev-ml/findlib/findlib-1.8.1-r2.ebuild
similarity index 95%
rename from dev-ml/findlib/findlib-1.8.1-r1.ebuild
rename to dev-ml/findlib/findlib-1.8.1-r2.ebuild
index 9c3988c304ea..fa1af8f3e840 100644
--- a/dev-ml/findlib/findlib-1.8.1-r1.ebuild
+++ b/dev-ml/findlib/findlib-1.8.1-r2.ebuild
@@ -3,19 +3,16 @@
EAPI=7
-inherit multilib
-
DESCRIPTION="OCaml tool to find/use non-standard packages"
HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
-IUSE="doc +ocamlopt tk"
LICENSE="MIT"
-
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc +ocamlopt tk"
-DEPEND=">=dev-lang/ocaml-4.08.1-r1:=[ocamlopt?]
+DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
tk? ( dev-ml/labltk:= )"
RDEPEND="${DEPEND}"
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index d36c99982c35..49b4c28bfcaa 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,4 +1,5 @@
DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..40fb0676b744
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+ NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+ "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.00.0:0=
+ dev-ml/ocaml-ctypes:=
+ ~sys-devel/llvm-${PV}:=[debug?]
+ !sys-devel/llvm[ocaml(-)]"
+for x in "${ALL_LLVM_TARGETS[@]}"; do
+ RDEPEND+="
+ ${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
+done
+unset x
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/perl
+ dev-ml/findlib
+ >=dev-util/cmake-3.16
+ test? ( dev-ml/ounit )
+ ${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+ -DBUILD_SHARED_LIBS=OFF
+ -DLLVM_BUILD_LLVM_DYLIB=ON
+ -DLLVM_LINK_LLVM_DYLIB=ON
+ -DLLVM_OCAML_OUT_OF_TREE=ON
+
+ # cheap hack: LLVM combines both anyway, and the only difference
+ # is that the former list is explicitly verified at cmake time
+ -DLLVM_TARGETS_TO_BUILD=""
+ -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+ -DLLVM_BUILD_TESTS=$(usex test)
+
+ # disable various irrelevant deps and settings
+ -DLLVM_ENABLE_FFI=OFF
+ -DLLVM_ENABLE_TERMINFO=OFF
+ -DHAVE_HISTEDIT_H=NO
+ -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+
+ -DLLVM_HOST_TRIPLE="${CHOST}"
+
+ -DPython3_EXECUTABLE="${PYTHON}"
+
+ # disable go bindings
+ -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+ # TODO: ocamldoc
+ )
+
+ use test && mycmakeargs+=(
+ -DLLVM_LIT_ARGS="$(get_lit_flags)"
+ )
+
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ # also: custom rules for OCaml do not work for CPPFLAGS
+ use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+ cmake_src_configure
+
+ local llvm_libdir=$(llvm-config --libdir)
+ # an ugly hack; TODO: figure out a way to pass -L to ocaml...
+ cd "${BUILD_DIR}/${libdir}" || die
+ ln -s "${llvm_libdir}"/*.so . || die
+
+ if use test; then
+ local llvm_bindir=$(llvm-config --bindir)
+ # Force using system-installed tools.
+ sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+ "${BUILD_DIR}"/test/lit.site.cfg.py || die
+ fi
+}
+
+src_compile() {
+ cmake_build ocaml_all
+}
+
+src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+ DESTDIR="${D}" \
+ cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+ dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index fd5108293f16..1cc948a2347f 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Text-BibTeX/Text-BibTeX-0.880.0.ebuild b/dev-perl/Text-BibTeX/Text-BibTeX-0.880.0.ebuild
index 039cbc9a8b87..7b3771f3439f 100644
--- a/dev-perl/Text-BibTeX/Text-BibTeX-0.880.0.ebuild
+++ b/dev-perl/Text-BibTeX/Text-BibTeX-0.880.0.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=6
@@ -12,7 +12,7 @@ inherit perl-module
DESCRIPTION="A Perl library for reading, parsing, and processing BibTeX files"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
index 41f6f60ab10b..5e40d52b4359 100644
--- a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
+++ b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="UAX #14 Unicode Line Breaking Algorithm"
SLOT="0"
-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"
IUSE=""
RDEPEND="dev-perl/MIME-Charset
diff --git a/dev-python/Babel/Babel-2.9.0.ebuild b/dev-python/Babel/Babel-2.9.0.ebuild
index 625b41efab30..967e7252cf17 100644
--- a/dev-python/Babel/Babel-2.9.0.ebuild
+++ b/dev-python/Babel/Babel-2.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
$(python_gen_cond_dep '
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 7cae96290c9c..bdee21b0bcae 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/aiohttp/aiohttp-3.7.3.ebuild b/dev-python/aiohttp/aiohttp-3.7.3.ebuild
index 6ad99a03e912..00de4b937726 100644
--- a/dev-python/aiohttp/aiohttp-3.7.3.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="
>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1.ebuild b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
similarity index 87%
rename from dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1.ebuild
rename to dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
index a5c5d51ed4a4..77b7ae5c51dc 100644
--- a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1.ebuild
+++ b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
RDEPEND="
$(python_gen_cond_dep '
@@ -38,6 +38,12 @@ BDEPEND="
# pytest-subtests
distutils_enable_tests unittest
+PATCHES=(
+ # fix segv in py3.8.7rc1+
+ # https://github.com/pganssle/zoneinfo/pull/97
+ "${FILESDIR}"/${P}-py38.patch
+)
+
python_test() {
if [[ ${EPYTHON} == pypy3 ]]; then
# pypy3.6 does not support dataclasses, and the backport
diff --git a/dev-python/backports-zoneinfo/files/backports-zoneinfo-0.2.1-py38.patch b/dev-python/backports-zoneinfo/files/backports-zoneinfo-0.2.1-py38.patch
new file mode 100644
index 000000000000..dbe9695a9a53
--- /dev/null
+++ b/dev-python/backports-zoneinfo/files/backports-zoneinfo-0.2.1-py38.patch
@@ -0,0 +1,22 @@
+From 0e42cc3999b4e3833b5f3f41857b8c1e3c9143f3 Mon Sep 17 00:00:00 2001
+From: Pablo Galindo
+Date: Mon, 21 Dec 2020 02:02:34 +0000
+Subject: [PATCH] Decrement the refcount of _PyLong_One in the correct branch
+
+---
+ lib/zoneinfo_module.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/zoneinfo_module.c b/lib/zoneinfo_module.c
+index e0c72d3..07ef603 100644
+--- a/lib/zoneinfo_module.c
++++ b/lib/zoneinfo_module.c
+@@ -616,7 +616,7 @@ zoneinfo_fromutc(PyObject *obj_self, PyObject *dt)
+ Py_DECREF(args);
+ Py_DECREF(kwargs);
+ Py_DECREF(replace);
+-#ifndef ATLEAST_37
++#ifdef ATLEAST_37
+ Py_DECREF(one);
+ #endif
+
diff --git a/dev-python/backports/Manifest b/dev-python/backports/Manifest
deleted file mode 100644
index 78c35159489d..000000000000
--- a/dev-python/backports/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST backports-1.0.tar.gz 2070 BLAKE2B 7fad9ef13abdc5bab550ddf62061a952991ff601642f5e03359c3ba2bf20d923701d86aed178dce530c60870efd33a4a2b4b2498802c78df73d406bc496239fb SHA512 069e155209d6036dec09000e4543abea9383f13b229a7259b1d3d02fff4b51be1a32c766dee434215c8a5209afc5e7d24163d188a77cec7d354d34170665bd37
diff --git a/dev-python/backports/backports-1.0-r1.ebuild b/dev-python/backports/backports-1.0-r1.ebuild
deleted file mode 100644
index 76c5d6cc2166..000000000000
--- a/dev-python/backports/backports-1.0-r1.ebuild
+++ /dev/null
@@ -1,19 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Namespace for backported Python features"
-HOMEPAGE="https://pypi.org/project/backports/"
-SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-RDEPEND="!=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+ # don't lock versions to narrow ranges
+ sed -e '/botocore/ d' \
+ -e '/jmespath/ d' \
+ -e '/s3transfer/ d' \
+ -i setup.py || die
+
+ # prevent an infinite loop
+ rm tests/functional/docs/test_smoke.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index c76a354d76cc..6b22af5185ef 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,3 +5,4 @@ DIST botocore-1.19.36.tar.gz 7291325 BLAKE2B d1f79298a0f47d704418cac8390a5d500b1
DIST botocore-1.19.37.tar.gz 7335789 BLAKE2B 3df00ad1f0d34f8f8408741b503fafdf9bdaacd9f5b0c52ffbc0b3172e7b0d01e741a076430268c55c39f1fe050a9b8bcc2d183eb54830886c7f3f050a22c408 SHA512 53ff17dcba3e72910709de7fe4504a04a507a708c2674039cfb682276ea7f8f46d3afeadbb41103d02141183d6216aab5964b0df98033cd12946ed1c83373aaf
DIST botocore-1.19.38.tar.gz 7358201 BLAKE2B 16dee2bd0d27996fd761b19918c36de0475c827cb27d0c1505e438436872337f0a5b0ddceb3c4ffb3b5c15592a2aa328f8eec94e2e6ab55aa705299ea847c465 SHA512 51a6c7a0ab950c4a7f0d7859d90c39f30f4be2789b55f520f5318a00878c62a2f5eaa9741e53953d3226a23137415fc4318ca09d37d690e71b8f2078b2662cfe
DIST botocore-1.19.39.tar.gz 7371273 BLAKE2B 574b0dedfbae40d496d5600ca37ec1181e74d48301deacaeca8b1628df1d5bdb3dfcdd0310b3e4860c9f0605cca176dadb4e313040a27521a0c0643ac7d0df0f SHA512 4b8b197a222f70cb136aeeac04178a27c229a2e7a82e42c66ab5f7366039a3d1748290d59df14db9039016247782c8f144757890e9fa0ebef4ea61f81931600f
+DIST botocore-1.19.40.tar.gz 7371480 BLAKE2B afd861d013b78487ff2a6d47a531536f3928c6e21dc88dc1a203d90e335c688a530bc9b253f325a641f4b31fc592dcec39d880e1962118b22a170229c54dbd29 SHA512 9d59a80864926a6ffcee7bd35ae1bc70cb5c373eba97318737f8485d8dc45a3efb4719dd6de64ced58077462eae445862708c04f2e936da6bf1fd7a0c24b3401
diff --git a/dev-python/botocore/botocore-1.19.40.ebuild b/dev-python/botocore/botocore-1.19.40.ebuild
new file mode 100644
index 000000000000..ca40b64d111f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.40.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/botocore"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/jmespath[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+ # unpin deps
+ sed -i -e "s:>=.*':':" setup.py || die
+ # very unstable
+ sed -i -e 's:test_stress_test_token_bucket:_&:' \
+ tests/functional/retries/test_bucket.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ # note: suites need to be run separately as one of the unit tests
+ # seems to be leaking mocks and breaking a few functional tests
+ nosetests -v tests/unit ||
+ die "unit tests failed under ${EPYTHON}"
+ nosetests -v tests/functional ||
+ die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild b/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
index 5dbd99180383..02bd07374538 100644
--- a/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
app-arch/brotli:=
diff --git a/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild b/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
index 7cf79b8878fd..1a8f7a4d4e3a 100644
--- a/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
+++ b/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# module name collision with app-arch/brotli
RDEPEND="
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index b4efda6d9545..0fc2cdca1af1 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -3,3 +3,4 @@ DIST cfn-python-lint-0.41.0.tar.gz 5192401 BLAKE2B 1f4c491446b552272cb9fea46d9d0
DIST cfn-python-lint-0.42.0.tar.gz 5307120 BLAKE2B f54c4ae7fcefa6b56714a0cfdf89d9fbce20078daac0784c6169dfbe1a110da699e37b526f306ed9734504fb3387c660ccb997748579b65afe01438124361383 SHA512 ce2e6a0031e3d67953da6f5dc96f0b155f1a1144bee75a8a476490eca69fdb700c8a3d6fd89b0afa4c8d724956e5f86bc48417035d7c94f3eed00abda47f9931
DIST cfn-python-lint-0.43.0.tar.gz 5329573 BLAKE2B 94ea659e3df02fb3b269984cdf6d879d0e2719aadf3c95f15c2982606cde220493da0a7e34e16538170f96a2611e8693dbad73033bd842e91de613c8cdcb2009 SHA512 fdde4cdffd01d1e8011f44b4eaec0bfe28f2189f53bdc3054d563cf4657c5f828751d8a12e2050d8e04687fe05bf768b5db8cbd27d2ed1c5e0d8967ede70d0ae
DIST cfn-python-lint-0.44.0.tar.gz 5339555 BLAKE2B 880f03384247f4d6af1e87850b367bdc0846e00205aa943480a3028760115e36b3f6180f536a7b16b9a1aaf9f824ceaea5ab69b7adb1da3f345506c0268b55c0 SHA512 15ee6cc0cb373f7104d9c32acb06433b5669ae89997de010f1c4f382514481f1c6b87ceb387236275299e13e63aae1a5345e71ee934f2d99c1b66e566e1ef245
+DIST cfn-python-lint-0.44.1.tar.gz 5339578 BLAKE2B 7982cba9fe422a8323c6ea270bd7ff5f41800cc16ceaa39d9fc01c2929cda5cca3b19c45de50ca8338a56aad001c834e16bfbd0ab59140381b5189e28965ba38 SHA512 b7f9ad598411d89979334aa79c7b4667ede28eef82b0b546977ba10f33f57e89366d1448e8ceeb3f28a2e53b33a409c439c3faf7d10f53fc5819f6b8693e117d
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.44.1.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.1.ebuild
new file mode 100644
index 000000000000..a83123122bcb
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.44.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+ >=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/importlib_resources[${PYTHON_USEDEP}]
+ ' python3_6)
+ dev-python/jsonpatch[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+ dev-python/junit-xml[${PYTHON_USEDEP}]
+ dev-python/networkx[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests --install unittest
+
+PATCHES=(
+ "${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+ # unpin the deps
+ sed -e 's:~=[0-9.]*::' -i setup.py || die
+ # requires git checkout
+ sed -e 's:test_update_docs:_&:' \
+ -i test/unit/module/maintenance/test_update_documentation.py || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index d36c99982c35..49b4c28bfcaa 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,4 +1,5 @@
DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/dev-python/clang-python/clang-python-11.0.1_rc2.ebuild b/dev-python/clang-python/clang-python-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..36c6ba65c994
--- /dev/null
+++ b/dev-python/clang-python/clang-python-11.0.1_rc2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+ >=sys-devel/clang-${PV}:*
+ !sys-devel/llvm:0[clang(-),python(-)]
+ !sys-devel/clang:0[python(-)]
+ ${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+ "${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+ python_foreach_impl python_test
+}
+
+src_install() {
+ python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 58828571fd2c..1e2551dd0fbd 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,2 +1,3 @@
DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
+DIST coverage-5.3.1.tar.gz 684457 BLAKE2B 82c8e311d85a6f758c46767957199e94099838e3c340f5da1472813a2877293245583cb190acc0139cddf3363ee5f299fb42f955c59912b80d9d1ece8cfb09fa SHA512 981ebc9f9490efe613edd68afdef83cb161b303e6de266335ffd2d1d3634bd5a088cbff249b0243071b55cb4f31b4b0c7537b5764660ccc86a7059307badd571
DIST coverage-5.3.tar.gz 693632 BLAKE2B 9daa3a0fd7f8c3ff7c9d68603e11a0a419d3ab50e3c3fb6be5b694aa1f7566040e1212b7175dfa4f71a0a309db325c00f94a85e0e9e755ae8c4f09c499d0daf4 SHA512 f40a21c394b1a72118965f702ae2b8e09c4e0b2fe92709aedf1de4c8074cd9c2cae0ed4860fbb863e4e5479f1067ff806d7051f7683d6b324de9945c0cacfc39
diff --git a/dev-python/coverage/coverage-5.3.1.ebuild b/dev-python/coverage/coverage-5.3.1.ebuild
new file mode 100644
index 000000000000..d230bee7bae8
--- /dev/null
+++ b/dev-python/coverage/coverage-5.3.1.ebuild
@@ -0,0 +1,69 @@
+# 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 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+#IUSE="test"
+# The tests are impossible to appease. Please run them externally
+# via tox. Or fix the ebuild if you have hours of time to spend
+# on something utterly useless.
+RESTRICT="test"
+
+#BDEPEND="
+# test? (
+# dev-python/PyContracts[${PYTHON_USEDEP}]
+# dev-python/flaky[${PYTHON_USEDEP}]
+# dev-python/hypothesis[${PYTHON_USEDEP}]
+# dev-python/mock[${PYTHON_USEDEP}]
+# dev-python/pytest[${PYTHON_USEDEP}]
+# >=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+# )
+#"
+
+src_prepare() {
+ # avoid the dep on xdist, run tests verbosely
+ sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
+ distutils-r1_src_prepare
+}
+
+python_compile() {
+ if [[ ${EPYTHON} == python2.7 ]]; then
+ local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+ export CFLAGS
+ fi
+
+ distutils-r1_python_compile
+}
+
+python_test() {
+ distutils_install_for_testing
+ local bindir=${TEST_DIR}/scripts
+
+ pushd tests/eggsrc >/dev/null || die
+ distutils_install_for_testing
+ popd >/dev/null || die
+
+ "${EPYTHON}" igor.py zip_mods || die
+ PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer py || die
+
+ # No C extensions under pypy
+ if [[ ${EPYTHON} != pypy* ]]; then
+ cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
+ PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer c || die
+ fi
+
+ # clean up leftover "egg1" directory
+ rm -rf build/lib/egg1 || die
+}
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index 76345a823f4e..815baeb1dbf0 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1 +1,2 @@
DIST dbusmock-0.19.tar.gz 72567 BLAKE2B 973cfa02d1aec29f2151ce077471c49f7def3cee079eb975bbc1abca39cc6d391f5dc4aed40fcd9c9db3fcc25429e689f130dc495b94428b73c64f3c650a9c3a SHA512 9f49cb1818c0de8b774d4ccd0eed35de3b0a95de669e70539699237b5cdfee993da7747dc28375c8f1c26fac83d948b7ce25107d866e28b833b556c6f654706c
+DIST dbusmock-0.20.0.tar.gz 72228 BLAKE2B 704287414bf562bcda9c25c6febd6c4a7b0123c1c38dcbe00f5448dc94784eb6002825975f03b8633e253dd63b18126026c9630aa98fcd891d7e40eba207f123 SHA512 26660439801dbd4c2cdc146d67fa465ecfdfbe4dba4fbd163e0f00af415247d0ff502122d0a850b5bd6dde9f296dea601dcb180ba4bdd5d58966ee4ccdef8999
diff --git a/dev-python/dbusmock/dbusmock-0.20.0.ebuild b/dev-python/dbusmock/dbusmock-0.20.0.ebuild
new file mode 100644
index 000000000000..7a5a676663e2
--- /dev/null
+++ b/dev-python/dbusmock/dbusmock-0.20.0.ebuild
@@ -0,0 +1,36 @@
+# 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="xml(+)"
+
+inherit distutils-r1
+
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
+SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+ # broken by bluez5?
+ rm tests/test_bluez4.py || die
+ # needed for unittest discovery
+ > tests/__init__.py || die
+
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 9773bdf6d15a..8b1149234ed3 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,2 +1,3 @@
DIST denonavr-0.9.7.tar.gz 101839 BLAKE2B d44600e6963c2e17ffc12f203926b522d2bf2d9a853e4f061583158fb087b8fb5dbc43be835aa639ffe11391aa494a8b061b2c177bccfc2568781b304547e311 SHA512 2b8a8224ec46b90d2256d7d516801c6ae18b4434a0ee901b0a9aa80cc0481216fa33566bf33d41928f0112361b165bbe40e5f44b65cd17f09beb7cb3f4d9d803
DIST denonavr-0.9.8.tar.gz 101850 BLAKE2B b02a18d1f61547e7e63fbd51a72de57803ec6e78232be0027fb6b77176fa872227afcb5a414b0cb92ca4373116a5c6ec4975fea73ae272742ec399e4c0e3ad81 SHA512 30ca12ffffcf66b45c17434c96e496fe61af5cd42aa85dcb25502f6a21593ec4d884937d52726a430b405d9807ad024456e48e144a759ea1351fccc906a95af3
+DIST denonavr-0.9.9.tar.gz 101902 BLAKE2B de30ad9520781eaa66a651f8a77ed88c76daa191f0de716f2cc00e21a8c8ae8883c5aa0c32167754062517763f903949626e04342a2342894a632cb9b94d2e20 SHA512 45d3b4fc6f8487caed0911ff7dd90dd28482de688429b8d0fae68db9a5d78959005ab2aab1b34eab34e964f4e82bccb6d57aadea367f81fc4a7927e54d771728
diff --git a/dev-python/denonavr/denonavr-0.9.9.ebuild b/dev-python/denonavr/denonavr-0.9.9.ebuild
new file mode 100644
index 000000000000..a1811fa7960b
--- /dev/null
+++ b/dev-python/denonavr/denonavr-0.9.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automation Library for Denon AVR receivers"
+HOMEPAGE="https://github.com/scarface-4711/denonavr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/netifaces[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/requests-mock[${PYTHON_USEDEP}]
+ dev-python/testtools[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild b/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
index 727acdc84be5..e107f94810a1 100644
--- a/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
+++ b/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/files/dogpile-cache-1.0.2-pytest6.patch b/dev-python/dogpile-cache/files/dogpile-cache-1.0.2-pytest6.patch
deleted file mode 100644
index cc8154822544..000000000000
--- a/dev-python/dogpile-cache/files/dogpile-cache-1.0.2-pytest6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 625f73ce189b43541636dc40d8d0e4cd4f9a1386
-Author: Louis Sautier
-Date: Sat Oct 31 02:23:06 2020 +0100
-
- Support pytest 6
-
- See https://docs.pytest.org/en/stable/deprecations.html#node-construction-changed-to-node-from-parent
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 10afafb..0b2a1e4 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -26,6 +26,6 @@ def is_unittest(obj):
-
- def pytest_pycollect_makeitem(collector, name, obj):
- if is_unittest(obj) and not obj.__name__.startswith("_"):
-- return UnitTestCase(name, parent=collector)
-+ return UnitTestCase.from_parent(collector, name=name)
- else:
- return []
diff --git a/dev-python/funcy/funcy-1.14-r1.ebuild b/dev-python/funcy/funcy-1.14-r1.ebuild
new file mode 100644
index 000000000000..ac375d59f047
--- /dev/null
+++ b/dev-python/funcy/funcy-1.14-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+inherit distutils-r1
+
+DESCRIPTION="A collection of fancy functional tools focused on practicality"
+HOMEPAGE="https://github.com/Suor/funcy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="
+ ${RDEPEND}
+ test? (
+ dev-python/whatever[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )"
+
+python_test() {
+ distutils_install_for_testing --via-root
+ pytest || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index d60dee5ddaf6..3504fdc829af 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,2 +1 @@
-DIST hiredis-1.0.1.tar.gz 54460 BLAKE2B 90bdbd99f47b0765636dbeee9fc3cbb9c71fd7ba752a0d58ab9c2c9d2ee93bfc1a343465618d1127703ae09a4870d6691d7d5b52f59150849a448eae73c6a1d3 SHA512 8aa5e29b09f42826d746857d55b8042b40ffa3977386b0f8b2ea1b2ede0c28337f3df4bbd177192d8873570810bc9d0987f1f2b29f094f27adaa4aaf409c3a6b
DIST hiredis-1.1.0.tar.gz 54620 BLAKE2B 9991745d277e87efe836c1c8eabb2016ce401e2be52c7e1b3a154350776fae6fd3c49e3096da57231e42c57bf36ba692ce26bc993d0923b5246376d8694ad058 SHA512 ad37868376de91303c15ffe6109dc7fadb4f458efdd44b7ddc0a410937a389b8e062ab7d36b1aec3fe324ecafe6b1e5e6b92f547cbf619251dad22a28e02ee9c
diff --git a/dev-python/hiredis/hiredis-1.0.1-r1.ebuild b/dev-python/hiredis/hiredis-1.0.1-r1.ebuild
deleted file mode 100644
index 8e84e217d314..000000000000
--- a/dev-python/hiredis/hiredis-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,32 +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,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/pietern/hiredis-py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="system-libs"
-
-DEPEND="system-libs? ( dev-libs/hiredis:0/0.14 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- use system-libs && PATCHES+=(
- "${FILESDIR}"/${P}-system-libs.patch
- "${FILESDIR}"/${P}-api-0.14.patch
- )
- default
-}
-
-python_test() {
- cd test
- "${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
-}
diff --git a/dev-python/hiredis/hiredis-1.0.1.ebuild b/dev-python/hiredis/hiredis-1.0.1.ebuild
deleted file mode 100644
index bde16f819154..000000000000
--- a/dev-python/hiredis/hiredis-1.0.1.ebuild
+++ /dev/null
@@ -1,29 +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,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/pietern/hiredis-py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="dev-libs/hiredis:0/0.14"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-system-libs.patch
- "${FILESDIR}"/${P}-api-0.14.patch
-)
-
-python_test() {
- cd test
- "${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
-}
diff --git a/dev-python/hiredis/hiredis-1.1.0.ebuild b/dev-python/hiredis/hiredis-1.1.0.ebuild
index 85eea435422f..062ab4b7da6e 100644
--- a/dev-python/hiredis/hiredis-1.1.0.ebuild
+++ b/dev-python/hiredis/hiredis-1.1.0.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit distutils-r1
DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/pietern/hiredis-py"
+HOMEPAGE="https://github.com/redis/hiredis-py/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="system-libs"
DEPEND="system-libs? ( dev-libs/hiredis:0/0.14 )"
@@ -27,6 +27,6 @@ src_prepare() {
}
python_test() {
- cd test
+ cd test || die
"${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
}
diff --git a/dev-python/hiredis/metadata.xml b/dev-python/hiredis/metadata.xml
index 2bf5fbd7ca5f..2d6830cbdf6f 100644
--- a/dev-python/hiredis/metadata.xml
+++ b/dev-python/hiredis/metadata.xml
@@ -11,7 +11,7 @@
hiredis
- pietern/hiredis-py
+ redis/hiredis-py
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild
new file mode 100644
index 000000000000..59557f004734
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="https://github.com/spyder-ide/spyder-kernels/
+ https://pypi.org/project/spyder-kernels/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/cloudpickle[${PYTHON_USEDEP}]
+ >=dev-python/ipykernel-5.1.3[${PYTHON_USEDEP}]
+ >=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
+ >=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+ >=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+ >=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+ test? (
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/flaky[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pandas[${PYTHON_USEDEP}]
+ dev-python/scipy[${PYTHON_USEDEP}]
+ dev-python/xarray[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # requires dask[distributed] while we last-rited distributed
+ sed -i -e 's:test_dask_multiprocessing:_&:' \
+ spyder_kernels/console/tests/test_console_kernel.py || die
+
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 58370d601971..82ab03588f54 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,3 +1,4 @@
DIST SQLAlchemy-1.3.17.tar.gz 5979141 BLAKE2B f0fa46493461f532ebca9420fc9f49a2c04af888aa99653946a5bb563d40b8bb714a03301300ebb80cca76a99f8226ddfcde4216e8fc2593d3a161b5072276ab SHA512 6f6d54b9018ece6c289f28a3a41ffb1b2216206edee08c49f387e9f30740969dfe0f8272654ce4efca159a2a6619e76c41b2ad2b10c391cdd64681ac17d0bc79
DIST SQLAlchemy-1.3.20.tar.gz 6264898 BLAKE2B 4c386eff56c2f9ec7ef467e3bc0032629582a970707dc11e3744fe3903d9cb18457f5e0be4dc9c20727b5733f158e031bf8b40f586dadb8f4ab8d0cae3cf7398 SHA512 29c52ada1a66f906ed2563df2ab093eceb7c09de45749c96031f30a1512d20b1d698e00640c777169ef3db99ab012151770a3daea45a51df934269b554ff4b28
DIST SQLAlchemy-1.3.21.tar.gz 6297278 BLAKE2B 39bd440eec25adc3ec81eaf55d2b97ecb328da4fd6e78dca17a94548a34336a8ef01a1dd0b4565794f4647d3bb4a98803873990c2e0df865216ed57fbe67ba1c SHA512 50ea60b849e6f043507728482dc1a90faea853c3fb16affe1d68197903578cb31f26b3543f4671be6aec2a705343193bfa7579e8d417e74c92ee104af4fba753
+DIST SQLAlchemy-1.3.22.tar.gz 6300186 BLAKE2B 5b788ddadef0b68f440c5c7584320dd0a71d43e288febf0cb35c4683052be0f46174ac17b7c8b22ad0461f1e5f55ef5e6dbb149c49d727c3b42b49f48eb7589d SHA512 5e43af97dd93af8174f14575c8238a72153afa4dbe56503cf934de9f783ea15ad27b25523c147191bd2ec89e25baafab5f5d9c34a29f71eaf4e2de49af5bb887
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild
new file mode 100644
index 000000000000..61033328f457
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+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 ~x64-solaris"
+IUSE="examples +sqlite test"
+
+# Use pytest-xdist to speed up tests
+BDEPEND="
+ test? (
+ $(python_gen_impl_dep sqlite)
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ # Ported part of those commits to fix failing tests:
+ # https://github.com/sqlalchemy/sqlalchemy/commit/c68f9fb87868c45fcadcc942ce4a35f10ff2f7ea
+ # https://github.com/sqlalchemy/sqlalchemy/commit/a9b068ae564e5e775e312373088545b75aeaa1b0
+ # https://github.com/sqlalchemy/sqlalchemy/commit/9e31fc74089cf565df5f275d22eb8ae5414d6e45
+ "${FILESDIR}/sqlalchemy-1.3.20-pypy3.patch"
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+ # Use all CPUs with pytest-xdist
+ pytest -n auto -vv || die "Tests failed with ${EPYTHON}"
+}
+
+python_prepare_all() {
+ # Disable tests hardcoding function call counts specific to Python versions.
+ rm -r test/aaa_profiling || die
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ if use examples; then
+ docompress -x "/usr/share/doc/${PF}/examples"
+ dodoc -r examples
+ fi
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+ dev-python/mysql-connector-python
+ optfeature "mssql support" dev-python/pymssql
+ optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index 3beb69c6899d..7a8476d16bf4 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,3 +1,2 @@
DIST sympy-1.6.2.tar.gz 6811705 BLAKE2B 4cd894d28bedc986acc8ef67aa60f82e0899c2ed028658a8f340d7538b890e0ed380b3614a464eb58d71873b29b0795508b4556bb8115bf0c108336ef1e4cca3 SHA512 e16a1d85aba438e4248bac48a163ea1827e2cee57c28f7670ed19cc69d4c08d6796d62f79d245e269d75765b8f7ff4f4ca2841f98534e136ceeb5d3f7a5d252a
DIST sympy-1.7.1.tar.gz 6974183 BLAKE2B 4bd8c9d60c46b05a7fc6c622667858fe17d25798756dbe967ce19abc8047263fe540f332e39418e877852c0565270377bd01fea7e65aa35ed4e03079bc130805 SHA512 eb9387bb9c632203af650279f896427556725b7496c00d8dfe97b7476beedbbee5714659f7fb44b4fa986c9567cdcaefcc19401d63e1ca0e9a6c7317855440ea
-DIST sympy-1.7.tar.gz 6969594 BLAKE2B c4ebd395e50f589dba2d01bf50a1a9cd7fb34e95e2b8632a64df5fe1a6625889c4e161b8a22aa815857cc3eb0d502f03ec8d9de694f369aaca7e573a2fab03ee SHA512 f7bdaff7432436dc888e56d4b56d023c8da5cfb54dfa6955cf7999acceedfd5175f910fb9b3c5776145f3dc3036f78e66813cdba4201be854dfa2c5c9f4e9f4d
diff --git a/dev-python/sympy/sympy-1.7.ebuild b/dev-python/sympy/sympy-1.7.ebuild
deleted file mode 100644
index fd39817141d0..000000000000
--- a/dev-python/sympy/sympy-1.7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Computer Algebra System in pure Python"
-HOMEPAGE="https://sympy.org"
-SRC_URI="https://github.com/sympy/sympy/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
- dev-python/pexpect[${PYTHON_USEDEP}]
- imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
- ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
- latex? (
- virtual/latex-base
- dev-texlive/texlive-fontsextra
- png? ( app-text/dvipng )
- pdf? ( app-text/ghostscript-gpl )
- )
- mathml? ( dev-libs/libxml2:2[${PYTHON_USEDEP}] )
- opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
- pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
- symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
- texmacs? ( app-office/texmacs )
- theano? ( dev-python/theano[${PYTHON_USEDEP}] )
-"
-
-src_test() {
- virtx distutils-r1_src_test
-}
-
-python_test() {
- "${EPYTHON}" setup.py test || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
- local DOCS=( AUTHORS README.md )
-
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- distutils-r1_python_install_all
-
- if use texmacs; then
- exeinto /usr/libexec/TeXmacs/bin/
- doexe data/TeXmacs/bin/tm_sympy
- insinto /usr/share/TeXmacs/plugins/sympy/
- doins -r data/TeXmacs/progs
- fi
-}
diff --git a/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
index 240c240bb9d2..9d144e9dcb06 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 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/three-merge/three-merge-0.1.1.ebuild b/dev-python/three-merge/three-merge-0.1.1.ebuild
index a6dd1a854807..deba595b0fe6 100644
--- a/dev-python/three-merge/three-merge-0.1.1.ebuild
+++ b/dev-python/three-merge/three-merge-0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.ta
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="dev-python/diff-match-patch[${PYTHON_USEDEP}]"
diff --git a/dev-python/trustme/trustme-0.6.0-r1.ebuild b/dev-python/trustme/trustme-0.6.0-r1.ebuild
index 2e969925fdb1..bbfbf63613bf 100644
--- a/dev-python/trustme/trustme-0.6.0-r1.ebuild
+++ b/dev-python/trustme/trustme-0.6.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( Apache-2.0 MIT )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index da8811ccb0d9..5f0e66cd9f5f 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -1 +1,2 @@
+DIST txaio-20.12.1.tar.gz 53200 BLAKE2B 0bbcf8a64fec668c2cf128a390779ca81033d0f43f02a341c46fc392254ff011df13a1456757e86dc5c4c15f18468698f4da85cc830fb2e52e4e620f7a8767ee SHA512 efde6115b8eccba94dce736fffe49f280ff49e9738f3299578cf41641c3b6f1deb5b1c0f0c8c6fbf85c8d8adbdc2d3f67aa256335d63a5977ac0bfacc98f909c
DIST txaio-20.4.1.tar.gz 52580 BLAKE2B 28d745eb9e8a0df1ca8748ce455eb122e240505f31464fcc0e66bafcefa8a01a356e44a46d9a5a1b1c670df46ca0c2ea9e66d29436bf2668e5614c5aa8726cee SHA512 da0269d13d72f4ea14f2e67585cdb74ec5105884c31d81157fb85e92d4eb935b1c13eb1222bd5ecd57a8caa36008cf49de85321e7b67e94159330e1d592d42c4
diff --git a/dev-python/txaio/metadata.xml b/dev-python/txaio/metadata.xml
index e8669e1d3fa0..55194dea6135 100644
--- a/dev-python/txaio/metadata.xml
+++ b/dev-python/txaio/metadata.xml
@@ -5,6 +5,10 @@
dolsen@gentoo.org
Brian Dolbec
+
+ python@gentoo.org
+ Python
+
autobahnws@googlegroups.com
diff --git a/dev-python/txaio/txaio-20.12.1.ebuild b/dev-python/txaio/txaio-20.12.1.ebuild
new file mode 100644
index 000000000000..b2b1b45835a2
--- /dev/null
+++ b/dev-python/txaio/txaio-20.12.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
+HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_sphinx docs \
+ '>=dev-python/sphinxcontrib-spelling-2.1.2' \
+ '>=dev-python/sphinx_rtd_theme-0.1.9'
+distutils_enable_tests pytest
+
+BDEPEND="
+ test? (
+ >=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+ )
+"
+
+src_prepare() {
+ default_src_prepare
+ # Take out failing tests known to pass when run manually
+ # we certainly don't need to test "python setup.py sdist" here
+ rm "${S}/test/test_packaging.py" || die
+}
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index 1dfb9910dfe4..f1080e6dfa7e 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -1,2 +1,2 @@
-DIST Unidecode-0.04.21.tar.gz 205931 BLAKE2B 701afb86b89fc17a8eb9c769b4be1d08a30f0b44881597735478108d8121f57e2539a8209b9aef9c90f5aa8cc9f9dc76bea837d9b2ebad502a840c37628ed5ff SHA512 33fc546b3eefc4ba5feee90d584e49ccd81dd0ae00671f7e44f43cc3dc8a458b86ed6dbfacba6dac7539112408137fc1db6329cc42f31ee250755d841c7c29c2
DIST Unidecode-1.1.1.tar.gz 212151 BLAKE2B 9884f89bb45c7c99569d42e0b287731638b8b1b697afab2c812b56340c6bd12dc3214b42177554f1b0aa214ce1b73fe1f05208ac6fc33d1949ed1200e42914ab SHA512 5474f04be843ed94ddceb1a7e5f1ca986ee5f2e88ee35bd9347784c7a11b51e1d94d61e1a2a10dd2e71b3587c5b7b76717756f6cf4e2446d83222178c2360696
+DIST Unidecode-1.1.2.tar.gz 213644 BLAKE2B c4a9ecb441eb05800d931ccd43843d19ae07f74829d43bc3c24462955e8872f4edf4bb9b3909fc5155b13676b8d255848cdd90772a88cd453152ca13af0d3fab SHA512 8ee45ae05064612638ecbaa4eb74759580e5ea5cba9f3116b8e63db4af13affc266c7a07aaefbbd70b50ead7e483a72d7676c64e20b5bee2a6ba831aaccd6748
diff --git a/dev-python/unidecode/unidecode-0.04.21.ebuild b/dev-python/unidecode/unidecode-1.1.2.ebuild
similarity index 55%
rename from dev-python/unidecode/unidecode-0.04.21.ebuild
rename to dev-python/unidecode/unidecode-1.1.2.ebuild
index 151b74730c29..fe98ac54f6e8 100644
--- a/dev-python/unidecode/unidecode-0.04.21.ebuild
+++ b/dev-python/unidecode/unidecode-1.1.2.ebuild
@@ -1,27 +1,22 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-MY_PN=Unidecode
-MY_P=${MY_PN}-${PV}
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE="wide-unicode(+)"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
inherit distutils-r1
+MY_P=Unidecode-${PV}
DESCRIPTION="Module providing ASCII transliterations of Unicode text"
HOMEPAGE="https://pypi.org/project/Unidecode/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
- esetup.py test
-}
+distutils_enable_tests setup.py
diff --git a/dev-python/urllib3/urllib3-1.26.2-r1.ebuild b/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
index 2345ae630e33..731474121952 100644
--- a/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="brotli test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/virtualenv/virtualenv-20.2.1.ebuild b/dev-python/virtualenv/virtualenv-20.2.1.ebuild
index 8efb70db5007..c1fa5db5d6ae 100644
--- a/dev-python/virtualenv/virtualenv-20.2.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.2.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 85ac3c02f1c3..8298977c347a 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -3,3 +3,4 @@ DIST watchdog-0.10.4.tar.gz 90303 BLAKE2B 0c057fe35383deaa6b7a66c24c07b2260153e9
DIST watchdog-0.10.5.tar.gz 91432 BLAKE2B 0f10a94edf4cb79d68b83f0cc6eebc1eae9a00a0fd7b8164977a2511b952b6dda9d0b26404ef316a57524f948eb6676a5da65bb711530f64a4a37ab82576b9a9 SHA512 b107fe23b123360ba8ad049576bdbbb40061c70157bee0663bcf9ee9a9a9f65b95234540a477ba9ae6d617199ca1d77fe30b3b9dc4868bfef08a6b9099d6fe51
DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f
DIST watchdog-1.0.0.tar.gz 89861 BLAKE2B 79734397fc91e3c733fd28e8c607c07265230f8e7949b07e4236e4fe38af48cd0f758270990b384ccee88bc88311291cc3758f29296edda2dff06dc757d6d492 SHA512 e89f34aba7547022a48ff16e36e6a2eea340e80a4b1e1f8657d4e70d4a451ac43351aafc76978fb4241c583df11c2dd6c53cb1a03c43c2734f4a8a07d5b2604f
+DIST watchdog-1.0.2.tar.gz 91796 BLAKE2B 001cbe82ff8aff0c4e56e4d1f02519047580cccb48466566ad7c9c1f462f90a9a036cf90846eb38ec4fb24ff1df2a1ddfec20b3f0587afdc1f938ada1bb0b1ef SHA512 e87a0955ce822daabd7d030804876698f98ed2aad58486e26a94585763655302063f091b653abd385ea99642361b6253d8e051d96019b243a77b078ba86b0d6e
diff --git a/dev-python/watchdog/watchdog-1.0.2.ebuild b/dev-python/watchdog/watchdog-1.0.2.ebuild
new file mode 100644
index 000000000000..fd006a578472
--- /dev/null
+++ b/dev-python/watchdog/watchdog-1.0.2.ebuild
@@ -0,0 +1,39 @@
+# 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 optfeature
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="https://github.com/gorakhargosh/watchdog"
+SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+ dev-python/argh[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+ test? (
+ >=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ sed -i -e '/--cov/d' setup.cfg || die
+ # broken when django is installed
+ sed -i -e 's:test_eventlet_monkey_patching:_&:' \
+ tests/test_skip_repeats_queue.py || die
+ default
+}
+
+pkg_postinst() {
+ optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/websockets/websockets-8.1.ebuild b/dev-python/websockets/websockets-8.1.ebuild
index 074ac905ba2c..4d5aaa0edf2d 100644
--- a/dev-python/websockets/websockets-8.1.ebuild
+++ b/dev-python/websockets/websockets-8.1.ebuild
@@ -14,4 +14,4 @@ SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
diff --git a/dev-python/whatever/Manifest b/dev-python/whatever/Manifest
new file mode 100644
index 000000000000..0a13a32bb428
--- /dev/null
+++ b/dev-python/whatever/Manifest
@@ -0,0 +1 @@
+DIST whatever-0.6.tar.gz 4748 BLAKE2B c0a8b3bff715b61744ca5094c234c24558882d00b0dd8c375b90deef9d68155997cb97fb94435cb6dcfa0ba4674ce61fd6d030dd338409e8aaa5686c3bf9f3b1 SHA512 acdc145b81423908fd2d80bf0e8a0c02bad3a6156ec5a7724cf10b0f447c14354c34ac4ffa4e5a26788a79ce2a6b7bd65bb0ea281a6d8919dacd9a24ee1cde2d
diff --git a/sys-libs/libkudzu/metadata.xml b/dev-python/whatever/metadata.xml
similarity index 54%
rename from sys-libs/libkudzu/metadata.xml
rename to dev-python/whatever/metadata.xml
index 06ddf117247b..d0e866f244f8 100644
--- a/sys-libs/libkudzu/metadata.xml
+++ b/dev-python/whatever/metadata.xml
@@ -1,8 +1,8 @@
-
- releng@gentoo.org
- Gentoo Release Engineering
-
+
+ tupone@gentoo.org
+ Tupone Alfredo
+
diff --git a/dev-python/whatever/whatever-0.6.ebuild b/dev-python/whatever/whatever-0.6.ebuild
new file mode 100644
index 000000000000..de60a47ae9a5
--- /dev/null
+++ b/dev-python/whatever/whatever-0.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+inherit distutils-r1
+
+DESCRIPTION="A collection of fancy functional tools focused on practicality"
+HOMEPAGE="https://github.com/Suor/whatever"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/zstd/zstd-1.4.5.1.ebuild b/dev-python/zstd/zstd-1.4.5.1.ebuild
index 2e3bf7744bbb..e06587558dad 100644
--- a/dev-python/zstd/zstd-1.4.5.1.ebuild
+++ b/dev-python/zstd/zstd-1.4.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
DEPEND="
app-arch/zstd
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 0b377441163f..83953d20e2c2 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/actioncable/actioncable-6.0.3.4.ebuild b/dev-ruby/actioncable/actioncable-6.0.3.4.ebuild
index 00434362e33e..faaa968abb19 100644
--- a/dev-ruby/actioncable/actioncable-6.0.3.4.ebuild
+++ b/dev-ruby/actioncable/actioncable-6.0.3.4.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.3.4.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.3.4.ebuild
index fda0608d401c..fd3658a8e9ac 100644
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.3.4.ebuild
+++ b/dev-ruby/actionmailbox/actionmailbox-6.0.3.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.3.4.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.3.4.ebuild
index 9de7bbb7b27e..c2daab5cc5cd 100644
--- a/dev-ruby/actionmailer/actionmailer-6.0.3.4.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-6.0.3.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE=""
RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionpack/actionpack-6.0.3.4.ebuild b/dev-ruby/actionpack/actionpack-6.0.3.4.ebuild
index b9f96b9946de..e2f269cbd09b 100644
--- a/dev-ruby/actionpack/actionpack-6.0.3.4.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.0.3.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE=""
RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actiontext/actiontext-6.0.3.4.ebuild b/dev-ruby/actiontext/actiontext-6.0.3.4.ebuild
index a228d2e2d075..e7b85321deae 100644
--- a/dev-ruby/actiontext/actiontext-6.0.3.4.ebuild
+++ b/dev-ruby/actiontext/actiontext-6.0.3.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionview/actionview-6.0.3.4.ebuild b/dev-ruby/actionview/actionview-6.0.3.4.ebuild
index a6b9c0c833ab..74c367a3ec9d 100644
--- a/dev-ruby/actionview/actionview-6.0.3.4.ebuild
+++ b/dev-ruby/actionview/actionview-6.0.3.4.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE=""
RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activejob/activejob-6.0.3.4.ebuild b/dev-ruby/activejob/activejob-6.0.3.4.ebuild
index 8bb3a8112946..d7cb080da0a2 100644
--- a/dev-ruby/activejob/activejob-6.0.3.4.ebuild
+++ b/dev-ruby/activejob/activejob-6.0.3.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activemodel/activemodel-6.0.3.4.ebuild b/dev-ruby/activemodel/activemodel-6.0.3.4.ebuild
index 1494c493a78d..c4575caa6a5d 100644
--- a/dev-ruby/activemodel/activemodel-6.0.3.4.ebuild
+++ b/dev-ruby/activemodel/activemodel-6.0.3.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activerecord/activerecord-6.0.3.4.ebuild b/dev-ruby/activerecord/activerecord-6.0.3.4.ebuild
index 1194b35b4808..5956e5555c2a 100644
--- a/dev-ruby/activerecord/activerecord-6.0.3.4.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.0.3.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="mysql postgres sqlite"
RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activestorage/activestorage-6.0.3.4.ebuild b/dev-ruby/activestorage/activestorage-6.0.3.4.ebuild
index 6181b336ee05..945b8395dccf 100644
--- a/dev-ruby/activestorage/activestorage-6.0.3.4.ebuild
+++ b/dev-ruby/activestorage/activestorage-6.0.3.4.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-6.0.3.4-r1.ebuild b/dev-ruby/activesupport/activesupport-6.0.3.4-r1.ebuild
index 83895aef0e7e..a688f36aa364 100644
--- a/dev-ruby/activesupport/activesupport-6.0.3.4-r1.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.0.3.4-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/capybara/capybara-3.34.0.ebuild b/dev-ruby/capybara/capybara-3.34.0.ebuild
index b0688ebe995b..00ff91a83b97 100644
--- a/dev-ruby/capybara/capybara-3.34.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.34.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
HOMEPAGE="https://github.com/jnicklas/capybara"
LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
SLOT="3"
IUSE="test"
diff --git a/dev-ruby/dalli/dalli-2.7.11.ebuild b/dev-ruby/dalli/dalli-2.7.11.ebuild
index a8a2a8ccf9e1..4dc53f6b7530 100644
--- a/dev-ruby/dalli/dalli-2.7.11.ebuild
+++ b/dev-ruby/dalli/dalli-2.7.11.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/petergoldstein/dalli"
SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
IUSE=""
DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4 )"
diff --git a/dev-ruby/docile/Manifest b/dev-ruby/docile/Manifest
index 08a387582b45..70955e28ea09 100644
--- a/dev-ruby/docile/Manifest
+++ b/dev-ruby/docile/Manifest
@@ -1 +1,2 @@
DIST docile-1.3.2.tar.gz 14684 BLAKE2B f24ce3ae857d249ce2fc32bcefa505b272327962755e000e51dd13531ad81a039c1da0e97774752cc03444fc3f44fa12212bbe61ff7886ebf5d44076785db3df SHA512 6bba8e8855e43acc3ad314ca500896b861865e4470618f98e720a11a26e226e30d8748096638027e213eeb54838fd1c3b2c9749701476d26cf8bc55c82c4f3ce
+DIST docile-1.3.3.tar.gz 15752 BLAKE2B 290af9553aba4b8b6ab058a1b1dbc4a36e840b3dc11e97db08408230679ab1095a5f6c03b133d9c02d2c1c9be75cf4d5cfa525bf5bd3c0705993df975ef152f3 SHA512 64e4f45616135f2089ecdb7282b7d1bed61cc5a1c8fa37e5ea70d8141d364760c62e06c650359d9cc107088fcfe4837d6bf35b492bd81c0207b037aa67d1d114
diff --git a/dev-ruby/docile/docile-1.3.3.ebuild b/dev-ruby/docile/docile-1.3.3.ebuild
new file mode 100644
index 000000000000..41f1cd91fffe
--- /dev/null
+++ b/dev-ruby/docile/docile-1.3.3.ebuild
@@ -0,0 +1,30 @@
+# 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_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
+
+RUBY_FAKEGEM_GEMSPEC="docile.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Turns any Ruby object into a DSL"
+HOMEPAGE="https://ms-ati.github.io/docile/"
+SRC_URI="https://github.com/ms-ati/docile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+ sed -i -e '/require \"github\/markup\"/d' Rakefile || die
+ sed -i -e '/^unless on/,/^end/ s:^:#:' spec/spec_helper.rb || die
+
+ sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 4aee4cb4dc85..6ffafeacf002 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,2 +1 @@
-DIST facter-3.14.13.tar.gz 407204 BLAKE2B 12019c20284eb2a62fb65f2ab09246b98708b1aecb485700c2074865d02bb836f140802ad3b54f28c90fdd225b72e9216d21fb57dc0d82b8b3854607d5ba0eb7 SHA512 62910dc71aff0a0b0ef1ece054e0d1eea095c65ca6a34e17331aea943e217baa1a12bba1176143b652bb322195248a4aab1379eb69d6be419b73eb6ae3a8afac
DIST facter-3.14.14.tar.gz 407276 BLAKE2B 5f911581773ef9a19ee42b5ed64114e2519ff88e024490d74bf9b1e777221d92d3ed502c8e6a0df573a5390fca323fcf0bcfdce6aeed25826c84efb3971307a5 SHA512 22e0ff0a9280be129f7587e24109f76f34660d99086378dd7e9ccc004c08a4fa5dd6f9ba50957c146ea40e26344ee87dbafd45b885f8f576192b6e572b084af7
diff --git a/dev-ruby/facter/facter-3.14.13.ebuild b/dev-ruby/facter/facter-3.14.13.ebuild
deleted file mode 100644
index f2b40c9e3b70..000000000000
--- a/dev-ruby/facter/facter-3.14.13.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-# git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake-utils eutils ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
- EGIT_BRANCH="master"
-else
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
- SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-RESTRICT="!test? ( test )"
-
-ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
-
-RDEPEND="
- >=dev-cpp/cpp-hocon-0.2.1:=
- >=dev-libs/leatherman-1.0.0:=
- dev-libs/openssl:0=
- sys-apps/util-linux
- app-emulation/virt-what
- net-misc/curl
- dev-libs/boost:=[nls]
- >=dev-cpp/yaml-cpp-0.5.1
- !=dev-ruby/activemodel-4.2.0 >=dev-ruby/railties-4.2.0 )"
diff --git a/dev-ruby/hashie/hashie-4.1.0-r1.ebuild b/dev-ruby/hashie/hashie-4.1.0-r1.ebuild
index 9f66fbf88a1c..45813a6672e2 100644
--- a/dev-ruby/hashie/hashie-4.1.0-r1.ebuild
+++ b/dev-ruby/hashie/hashie-4.1.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/intridea/hashie/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/activesupport )"
diff --git a/dev-ruby/i18n/i18n-1.8.5.ebuild b/dev-ruby/i18n/i18n-1.8.5.ebuild
index 80d623083010..f25448dde879 100644
--- a/dev-ruby/i18n/i18n-1.8.5.ebuild
+++ b/dev-ruby/i18n/i18n-1.8.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
diff --git a/dev-ruby/image_processing/image_processing-1.12.1.ebuild b/dev-ruby/image_processing/image_processing-1.12.1.ebuild
index b5cac1d48840..2ce41c80f42e 100644
--- a/dev-ruby/image_processing/image_processing-1.12.1.ebuild
+++ b/dev-ruby/image_processing/image_processing-1.12.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/janko/image_processing/archive/v${PV}.tar.gz -> ${P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
DEPEND+=" test? ( media-gfx/imagemagick[jpeg,png,tiff] )"
diff --git a/dev-ruby/launchy/launchy-2.5.0.ebuild b/dev-ruby/launchy/launchy-2.5.0.ebuild
index 8cf4802c944a..62ac53250ba4 100644
--- a/dev-ruby/launchy/launchy-2.5.0.ebuild
+++ b/dev-ruby/launchy/launchy-2.5.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/copiousfreetime/launchy"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE=""
ruby_add_rdepend ">=dev-ruby/addressable-2.7"
diff --git a/dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild b/dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild
index 7c1a496e7957..7e8bf819e44c 100644
--- a/dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild
+++ b/dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/ordinaryzelig/minispec-metadata"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
ruby_add_rdepend "dev-ruby/minitest"
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 9e98ebfd5caf..a0eafaf3bc5e 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,3 +1,2 @@
-DIST multi_json-1.13.1.tar.gz 26098 BLAKE2B e82a08a747a092a9094cd7b35b4f933b5ac922a01f45a51b215ca9c4cdb9a083a4808d4bbe67a147ecb57e0b7b7e313c3d896f8cd80c79338c24abc3b90a09f9 SHA512 7c98392bd1c909fcc05249a02a010b561bf6c2d812ae42413d6e8dafa62926d8cb76226ded4c61558a00e5fa531ba33b6f4ef562648c52ba9b552ff7b7e27682
DIST multi_json-1.14.1.tar.gz 24713 BLAKE2B 188d0fa3bf7a46a6cf4a5aa1d613523b4da3dee5061a5288146d1a367835b255f103dec265da9a218dd6dd21ecb38a7ce35d16a758ac7754b440f52c25f0b703 SHA512 19e2b6704a8ed39b8714da449c8961e740198772718ddba3d3b651f71f2b7d8c2c198d9cc16fe290f1df7b1e54d029c01147fdc431a8d2763944a4de802b89d9
DIST multi_json-1.15.0.tar.gz 24932 BLAKE2B c99c5c6b152c91dedc38fd24f8697f918064c603bfd72c55213f3ac8afd14d3c0ba31b7c3fb91c9998fcc8a5386f41a6983c53b40119558b99194ba58c06cc91 SHA512 55c873e45cdc59e75823aa031eb6d792cb9dc744b13a682fc279a8375b925db7a984256d61aa5454795a59722794a774a0ed5b6bf518db253152f4af67f46dea
diff --git a/dev-ruby/multi_json/multi_json-1.13.1.ebuild b/dev-ruby/multi_json/multi_json-1.13.1.ebuild
deleted file mode 100644
index 7a506ac265ed..000000000000
--- a/dev-ruby/multi_json/multi_json-1.13.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/intridea/multi_json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A gem to provide swappable JSON backends"
-HOMEPAGE="https://github.com/intridea/multi_json"
-LICENSE="MIT"
-
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "|| ( >=dev-ruby/json-1.4:* >=dev-ruby/yajl-ruby-1.0 )"
-
-ruby_add_bdepend "doc? ( dev-ruby/rspec:3 dev-ruby/yard )"
-
-ruby_add_bdepend "test? ( dev-ruby/json
- dev-ruby/yajl-ruby )"
-
-all_ruby_prepare() {
- sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die "Unable to remove bundler."
-
- # Remove unimportant rspec options not supported by rspec 2.6.
- rm .rspec || die
-
- # Remove specs specific to oj since we don't package oj yet.
- sed -i -e '/defaults to the best available gem/,/^ end/ s:^:#:' \
- -e '/Oj does not create symbols on parse/,/^ end/ s:^:#:' \
- -e '/with Oj.default_settings/,/^ end/ s:^:#:' \
- -e '/using one-shot parser/,/^ end/ s:^:#:' \
- spec/multi_json_spec.rb
-
- # Avoid simplecov which only works with ruby 1.9
- sed -i -e '/simplecov/d' -e '/SimpleCov.formatter/,/SimpleCov.start/ d' spec/spec_helper.rb || die
-
- # Remove unpackaged and for our purposes unneeded coveralls
- sed -i -e '/coveralls/d' spec/spec_helper.rb || die
-
- # Avoid testing unpackaged adapters
- rm spec/{gson,jr_jackson,oj}_adapter_spec.rb || die
-}
-
-each_ruby_test() {
- for t in spec/*_spec.rb; do
- ${RUBY} -S rspec-3 ${t} || die
- done
-}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 084a80390450..6938e72acf6c 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,2 +1,3 @@
DIST puppetdb-termini_6.12.0-1stretch_all.deb 21290 BLAKE2B 11bc0a316517190162e7e4e5a2ce05bc880ef8412bfcf5fb66ec68545bd7779e217d5d5e75ab79f24fc6b2f68e1a962262704efb8833fdce84288d060245b898 SHA512 a742825e9f9bacf5726814474b7812393d1a51c50fd710d771c10a9e23c874a465c6859fc17485b66a2c4114ac170f2f25c5ce1be6684ff18f5da31dc9ef0744
DIST puppetdb-termini_6.13.0-1stretch_all.deb 21296 BLAKE2B 6ef6f82047f293b854e1b0d6db2933e18bc922225d1bb7fe4a3d03d2dbe5da00cdb68e7e3ac35097f466ee21de5a7ed584606684a52c088a9e31abe9fe11d7cf SHA512 bbcf8d2ed996925ead0add6899b266ca9308b01cc12d0dfa6f61956e801a092abf5a01ae4647bf96778f9fe0fa95e17bfae0a3b30576346093651141c1982ebf
+DIST puppetdb-termini_7.0.1-1stretch_all.deb 21154 BLAKE2B 6b64de09d6b6c76395f79acda6322c4221cf58efb03442faee697736faa3fbfc0d3e4e0c0f318a3374a5b6b6844312a469656d3e31a5534f484c568d9d5e7fe1 SHA512 29b0e380d3e62bb714838c7e4dac0e296c69297bd4e4a4097ba006f846eb4166051d0c76195afb0a661e6e34726acbcc858e7897128f1bbe14b99a4ea44a9ff3
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild
new file mode 100644
index 000000000000..a7f2b53b2dde
--- /dev/null
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+inherit unpacker
+
+DESCRIPTION="Library needed to connect puppet to puppetdb"
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_all.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND+=""
+DEPEND+=""
+
+S=${WORKDIR}
+
+src_install() {
+ insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
+ doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
+}
diff --git a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild b/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild
index e5f104823864..ef731c8a8e82 100644
--- a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild
+++ b/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/kaspth/rails-dom-testing"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
IUSE=""
ruby_add_rdepend "
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0-r1.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0-r1.ebuild
index 7576409802c8..b96d893f1ddf 100644
--- a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0-r1.ebuild
+++ b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rafaelfranca/rails-html-sanitizer"
LICENSE="MIT"
SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
IUSE=""
ruby_add_rdepend ">=dev-ruby/loofah-2.3:0"
diff --git a/dev-ruby/railties/railties-6.0.3.4.ebuild b/dev-ruby/railties/railties-6.0.3.4.ebuild
index ac2c8ddd992c..d8cfce5dde5f 100644
--- a/dev-ruby/railties/railties-6.0.3.4.ebuild
+++ b/dev-ruby/railties/railties-6.0.3.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE=""
RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
index aac70a0d1954..58632b95a870 100644
--- a/dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="MIT"
SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild b/dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild
index 04561bc98b76..365b5f3d4e2b 100644
--- a/dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild
+++ b/dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/janosch-x/regexp_property_values/archive/v${PV}.tar.
LICENSE="MIT"
SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild b/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
index b40e6bc54350..8d2c24a82dc3 100644
--- a/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
+++ b/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/thekompanee/rspectacular"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend ">=dev-ruby/rspec-3.1:3 dev-ruby/fuubar:2 dev-ruby/shoulda-matchers:3"
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild
index 9a3af0575d9d..bf18d30bc5b7 100644
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild
@@ -21,7 +21,7 @@ RUBY_S="ruby-progressbar-releases-v${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7-r1.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7-r1.ebuild
index 629bc87f53d5..443cbb2b93fc 100644
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7-r1.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7-r1.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://github.com/seleniumhq/selenium"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE=""
ruby_add_rdepend ">=dev-ruby/childprocess-0.5:2
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r1.ebuild
index b0b00c69bd9a..f89418029a20 100644
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r1.ebuild
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
ruby_add_rdepend ">=dev-ruby/activesupport-4.0.0:*"
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-4.4.1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-4.4.1.ebuild
index 217fd3c9ac0a..93c08dbdac1e 100644
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-4.4.1.ebuild
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-4.4.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz ->
LICENSE="MIT"
SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
diff --git a/dev-ruby/sinatra/sinatra-2.1.0.ebuild b/dev-ruby/sinatra/sinatra-2.1.0.ebuild
index 601a0f85a37c..5a0f52662ef0 100644
--- a/dev-ruby/sinatra/sinatra-2.1.0.ebuild
+++ b/dev-ruby/sinatra/sinatra-2.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
ruby_add_rdepend "
diff --git a/dev-ruby/xpath/xpath-3.2.0.ebuild b/dev-ruby/xpath/xpath-3.2.0.ebuild
index 91a655c92300..53e37aa74684 100644
--- a/dev-ruby/xpath/xpath-3.2.0.ebuild
+++ b/dev-ruby/xpath/xpath-3.2.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="XPath is a Ruby DSL around a subset of XPath 1.0"
HOMEPAGE="https://github.com/jnicklas/xpath"
LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
SLOT="3"
IUSE=""
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
index 827d557e2223..195751178c4e 100644
--- a/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
+++ b/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/bundler )"
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index cabdd4734c08..5c2bab22f37c 100644
Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ
diff --git a/dev-tcltk/tcllib/tcllib-1.20.ebuild b/dev-tcltk/tcllib/tcllib-1.20.ebuild
index e3b15f8c4348..28e555d14893 100644
--- a/dev-tcltk/tcllib/tcllib-1.20.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
IUSE="examples"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
RESTRICT="!test? ( test )"
RDEPEND="
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 118a32e25248..3a4b45726541 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/biber/biber-2.14.ebuild b/dev-tex/biber/biber-2.14.ebuild
index a307066b4c96..0eb846f6d9a1 100644
--- a/dev-tex/biber/biber-2.14.ebuild
+++ b/dev-tex/biber/biber-2.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/plk/biber/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-tex/biblatex/biblatex-3.14.ebuild b/dev-tex/biblatex/biblatex-3.14.ebuild
index 1a0ecc11fc9a..d821b64c0d4d 100644
--- a/dev-tex/biblatex/biblatex-3.14.ebuild
+++ b/dev-tex/biblatex/biblatex-3.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tds.tgz"
LICENSE="LPPL-1.3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
IUSE="+biber doc examples"
DEPEND="dev-texlive/texlive-bibtexextra
diff --git a/dev-tex/hevea/Manifest b/dev-tex/hevea/Manifest
index d7e742761f47..fc3d98cfcdcd 100644
--- a/dev-tex/hevea/Manifest
+++ b/dev-tex/hevea/Manifest
@@ -1,3 +1 @@
-DIST hevea-2.29.tar.gz 969599 BLAKE2B 88724c0a1a139d370fa852af473e4f21f7c1f8a8ed79cf0a59fa6098d63a3956423f7b1403316aa2e296b00d77ddc529938f98476243795b6a00971532918d90 SHA512 4ea2f3d60fd43d183712a868cb3894b38f6d9809ba7905d69123a7672faba0d6dfe73ad1379d7996ede98ceb645bba903e5b7550bdf92e7950ce69ba7f4f3994
-DIST hevea-2.30.tar.gz 965635 BLAKE2B 7f23c6f793be1515b689571f0ae25d76d45c7bd8df9cc6fe1f73697b34dec598f64b0ed30e4b2cd5e456990c80ac0bba50c60e0294a825c6a0af59b228456cbd SHA512 75c700e009070bff4845ccc6f984ade8068f90ea78630a2e6ab1d27618a225a4bbbb7c4aa07c08be03094ddad4aac5d0c9e83fa01d41ff501f5c1eed9f4428eb
DIST hevea-2.31.tar.gz 965678 BLAKE2B 770a3ff5b3e209d1e34e68647baffc064cb78f63a610e6b81181a829837861984f22e381cc17c34a3b0b4643c260a5cb84841cd8e2038e40083bba7ffbdab929 SHA512 4b66030f69b8b60750f8e62a9d81240b0ba399af8af69df10b33742e10d23fe7aef3e7782265fac9705f27715e5964debd47b9da7a394f70fda947b5fcd2d6ea
diff --git a/dev-tex/hevea/hevea-2.29.ebuild b/dev-tex/hevea/hevea-2.29.ebuild
deleted file mode 100644
index 190fc255058d..000000000000
--- a/dev-tex/hevea/hevea-2.29.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-IUSE="+ocamlopt"
-
-DESCRIPTION="HeVeA is a quite complete and fast LaTeX to HTML translator"
-HOMEPAGE="http://hevea.inria.fr/"
-SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
-
-LICENSE="QPL"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-
-DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]"
-RDEPEND="${DEPEND}
- dev-texlive/texlive-latexextra"
-DEPEND="${DEPEND} dev-ml/ocamlbuild"
-
-src_compile() {
- rm -f config.sh
- emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
- if use ocamlopt; then
- emake PREFIX=/usr
- else
- emake PREFIX=/usr TARGET=byte
- fi
-}
-
-src_install() {
- if use ocamlopt; then
- emake DESTDIR="${D}" PREFIX=/usr install
- else
- emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install
- fi
-
- dodoc README CHANGES
-}
-
-# If texmf-update is present this means we have a latex install; update it so
-# that hevea.sty can be found
-# Do not (r)depend on latex though because hevea does not need it itself
-# If latex is installed later, it will see hevea.sty
-
-pkg_postinst() {
- if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
- /usr/sbin/texmf-update
- fi
-}
-
-pkg_postrm() {
- if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
- /usr/sbin/texmf-update
- fi
-}
diff --git a/dev-tex/hevea/hevea-2.30.ebuild b/dev-tex/hevea/hevea-2.30.ebuild
deleted file mode 100644
index c5dfa8e05aaf..000000000000
--- a/dev-tex/hevea/hevea-2.30.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-IUSE="+ocamlopt"
-
-DESCRIPTION="HeVeA is a quite complete and fast LaTeX to HTML translator"
-HOMEPAGE="http://hevea.inria.fr/"
-SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
-
-LICENSE="QPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]"
-RDEPEND="${DEPEND}
- dev-texlive/texlive-latexextra"
-DEPEND="${DEPEND} dev-ml/ocamlbuild"
-
-src_compile() {
- rm -f config.sh
- emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
- if use ocamlopt; then
- emake PREFIX=/usr
- else
- emake PREFIX=/usr TARGET=byte
- fi
-}
-
-src_install() {
- if use ocamlopt; then
- emake DESTDIR="${D}" PREFIX=/usr install
- else
- emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install
- fi
-
- dodoc README CHANGES
-}
-
-# If texmf-update is present this means we have a latex install; update it so
-# that hevea.sty can be found
-# Do not (r)depend on latex though because hevea does not need it itself
-# If latex is installed later, it will see hevea.sty
-
-pkg_postinst() {
- if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
- /usr/sbin/texmf-update
- fi
-}
-
-pkg_postrm() {
- if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
- /usr/sbin/texmf-update
- fi
-}
diff --git a/dev-tex/hevea/hevea-2.31.ebuild b/dev-tex/hevea/hevea-2.31.ebuild
index 80046a30f85d..3c1e67628b19 100644
--- a/dev-tex/hevea/hevea-2.31.ebuild
+++ b/dev-tex/hevea/hevea-2.31.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
LICENSE="QPL"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]"
RDEPEND="${DEPEND}
diff --git a/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild b/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
index 06bc0ba25ad4..6b2671ba5f95 100644
--- a/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/ftilmann/latexdiff.git"
else
SRC_URI="https://github.com/ftilmann/latexdiff/archive/${PV}.tar.gz -> ${P}.tar.gz"
- 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"
fi
LICENSE="GPL-3"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 99a2026d79ef..6ef09959f7df 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild b/dev-util/catalyst/catalyst-3.0.14.ebuild
index 09099da1323e..5294c9749a86 100644
--- a/dev-util/catalyst/catalyst-3.0.14.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.14.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
amd64? ( >=sys-boot/syslinux-3.72 )
x86? ( >=sys-boot/syslinux-3.72 )
ccache? ( dev-util/ccache )
- iso? ( virtual/cdrtools )
+ iso? ( app-cdr/cdrtools )
kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
"
PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
diff --git a/dev-util/catalyst/catalyst-3.0.15.ebuild b/dev-util/catalyst/catalyst-3.0.15.ebuild
index a987630870fe..f1c19554ff9f 100644
--- a/dev-util/catalyst/catalyst-3.0.15.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.15.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
amd64? ( >=sys-boot/syslinux-3.72 )
x86? ( >=sys-boot/syslinux-3.72 )
ccache? ( dev-util/ccache )
- iso? ( virtual/cdrtools )
+ iso? ( app-cdr/cdrtools )
kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
"
PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 27ca55eff349..f72a52d76d0d 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -41,10 +41,10 @@ RDEPEND="
app-arch/tar[xattr]
dev-vcs/git
sys-fs/dosfstools
- sys-fs/squashfs-tools-ng
+ sys-fs/squashfs-tools-ng[tools]
iso? (
- virtual/cdrtools
+ app-cdr/cdrtools
amd64? (
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index cfbcc2c6a81b..dd2b0aa0d453 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -3,3 +3,4 @@ DIST devscripts_2.20.1.tar.xz 854932 BLAKE2B b9523b2882625b66c7972db7c10f7d3f605
DIST devscripts_2.20.2.tar.xz 854948 BLAKE2B ca36f2d8d4f3d975479134d02ee4c035f7f32e087be523560c2c06d7625047fcf78d0428d1e4addcfa38a299befdd23b88ab3fbbef2028f67f8b7c9f8851c29f SHA512 d9147604a718582a19c036a040c62612427163146048dbf9e3665545072e8132d08f51dccfd3f0a01453c0405a0326dad8f83afd10270eec5c69fa0612cb8510
DIST devscripts_2.20.3.tar.xz 859612 BLAKE2B 074905e621234c60e26a014831a021b51f5f8fbdac4d6fa3a17aa98f994b4c171404a2326f5b00565f365469b41f1c7e5f03b6efa29f809b51bbabde209cafc2 SHA512 6d86deeecff82fc16df7d978678f5b88293164688078bf0732a7e6b844cf8845868be31c107518cf43b8dbcbadcd12a9691585f5725abd397f63ff9456fbdd8f
DIST devscripts_2.20.4.tar.xz 860604 BLAKE2B 05c486ed024964ec03f9e5396e739389010a2c51a4d01be14b4959aa86bd09ca426bbfbfa7657c87e54aec8497fbfc90064073310fb1af916b32142ff63d3137 SHA512 49e9ae38ca3682f399a17f2108a7ee15198dc955d8c7c4c1b043456c19cb35b47b6116de9a2cfaccbdd7560e79426ca0953674e5a89ac226d21af2c1cf847e5c
+DIST devscripts_2.20.5.tar.xz 881976 BLAKE2B 3d4079d3268b3b9bfacdd0a4afcfee5390bdbf4660038306611d9c24e7b5c6453eff5f24d938c9764a17336475cd60615919adaa11dcf47495d930cd4b3b4e09 SHA512 fbd372a62758e3d2872f37bfd93d9b169d0cc745719057078378949c4d01b4fb27830ae501fe45b06b30a869e8afc853d8477419bb2f46d7fd62749f54981ec0
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild
new file mode 100644
index 000000000000..1d567b48dc59
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="devscripts"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
+HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
+SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires python packages to check tools we don't need anyway
+RESTRICT="test"
+
+RDEPEND="dev-lang/perl
+ virtual/perl-Getopt-Long"
+
+S="${WORKDIR}/${MY_P}/scripts"
+
+src_prepare() {
+ default
+
+ sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
+}
+
+src_compile() { :; }
+
+src_install() {
+ newbin ${PN}.pl ${PN}
+ doman ${PN}.1
+}
diff --git a/dev-util/cmake/cmake-3.19.2.ebuild b/dev-util/cmake/cmake-3.19.2.ebuild
index 54a6d646dda4..945b1c1e8b09 100644
--- a/dev-util/cmake/cmake-3.19.2.ebuild
+++ b/dev-util/cmake/cmake-3.19.2.ebuild
@@ -137,6 +137,9 @@ src_prepare() {
# where things are via GCC configuration and ldwrapper
sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
Modules/Platform/Apple-GNU-*.cmake || die
+ # disable isysroot usage with clang as well
+ sed -i -e '/_SYSROOT_FLAG/d' \
+ Modules/Platform/Apple-Clang.cmake || die
# don't set a POSIX standard, system headers don't like that, #757426
sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
Source/cmLoadCommandCommand.cxx \
diff --git a/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
index d03b17551f0b..9a6054e9557f 100644
--- a/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
+++ b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
@@ -17,7 +17,8 @@ Updated by Lars Wendler (cmake-3.9.0_rc2)
Updated by Benda Xu (cmake-3.13.4)
Updated by Lars Wendler (cmake-3.14.0_rc1)
Updated by Lars Wendler (cmake-3.14.0_rc2)
-Updated by Lars Wendler (cmake-3.14.0_rc3
+Updated by Lars Wendler (cmake-3.14.0_rc3)
+Updated by Jacob Floyd (cmake-3.19.2)
---
Modules/Platform/Darwin.cmake | 12 +++++++----
Modules/Platform/UnixPaths.cmake | 35 ++++++++++++++++++++++++--------
@@ -39,16 +40,17 @@ index 5590433a3b..b04383e51d 100644
endif()
# Older OS X linkers do not report their framework search path
-@@ -140,6 +140,8 @@ endif()
+@@ -140,6 +140,9 @@ endif()
# set up the default search directories for frameworks
set(CMAKE_SYSTEM_FRAMEWORK_PATH
++ @GENTOO_PORTAGE_EPREFIX@MacOSX.sdk/System/Library/Frameworks
+ @GENTOO_PORTAGE_EPREFIX@Frameworks
+ @GENTOO_PORTAGE_EPREFIX@usr/lib
~/Library/Frameworks
)
if(_CMAKE_OSX_SYSROOT_PATH)
-@@ -186,13 +188,15 @@ if(CMAKE_OSX_SYSROOT)
+@@ -186,13 +189,15 @@ if(CMAKE_OSX_SYSROOT)
endif()
endif()
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index ef6fbd3d3c61..7365c118146b 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,5 +1,2 @@
-DIST cvise-1.6.0.tar.gz 243050 BLAKE2B 64c305426dbeaf2e3f3a92a902209b35fcc76b5f5a6d2e48fcc8e24d1325badc0839e70afa1381c6d1412c22a7e9dd41ca03d6ca714fa5082958378cc8863000 SHA512 9d4ee043c34748b600b49ac4f00463b853faff2809f8b581e9b07433a8f3bef4436d0e5d5a9dbff1b2d7c3a8ab1d6d4823e78787eb3e911a683808703b2e24b6
-DIST cvise-1.7.0.tar.gz 248515 BLAKE2B b1a2ca8abc7a09c240a7ae39400e3e60ca641dd0dff4edb34f43d755619ec47bb7a0d25fd6b4461bf80a3be14a63c6e56d0e3e758827ca7c2ef90370aba5d539 SHA512 2e0115355c0ca3cdf593ad4a8d0079ea0ea193234ff4fcae8bdc7c0244cc7b8672025682821279b826fda97f80dc71455390d709836acb671c19772f13156de5
-DIST cvise-1.8.0.tar.gz 248744 BLAKE2B 5196a2bb68c0f9ca1a8219ee0dccae80aa7adac64df5bc4c7601a8ef81048875bfa3d8fb2e8c407cfa8f238739733ad4fbdf08bb14a72ec208d562bd7e69ba84 SHA512 eaef3506f0fcd54953271494ebdbd043c028cd98c4a976bc2d978112c28d27d5d307527db52c2a3f8f153b52430ba9c61ad072dcae5a6e0b9bfb8be844a50bab
DIST cvise-1.9.0.tar.gz 249042 BLAKE2B 357d429afc43691e616dba31621d1de89fb1f85fcbc177847b3367aac993ccd2c3bec20226e910a319d5d6194b32d0be9704e4fa7b8fce49f23788d10a378012 SHA512 518c48b7b9d9af9b856bfc46d4fb8064bca3730735bdabf2b3aa981a3f743fa6988594b7cbe39da71ac01fbadb4a45e5212d7c79b510fa36d86055978829495b
DIST cvise-2.0.0.tar.gz 249307 BLAKE2B ba1a70da71706969a35b1223ad0c0fa1a1d4caf7f70eef184adc4dbc69586be6a33bdf11d7c1b606ea4b20d4cd2bf68170aabc1764364c235fe5f67182419080 SHA512 e49ca9919ced9db67b16af4b8a7cd3c18c7d96dea5724c9ee6d60736c8f34074d68ade151be702794c93b24943d167278e1c1a6e6f67a9a1422f695f3a177e46
diff --git a/dev-util/cvise/cvise-1.6.0.ebuild b/dev-util/cvise/cvise-1.6.0.ebuild
deleted file mode 100644
index ac8d916a8431..000000000000
--- a/dev-util/cvise/cvise-1.6.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm python-single-r1
-
-DESCRIPTION="Super-parallel Python port of the C-Reduce"
-HOMEPAGE="https://github.com/marxin/cvise/"
-SRC_URI="
- https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-LLVM_MAX_SLOT=12
-DEPEND="
- || (
- sys-devel/clang:12
- sys-devel/clang:11
- sys-devel/clang:10
- )
- <=sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):="
-RDEPEND="${DEPEND}
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pebble[${PYTHON_USEDEP}]
- ')
- dev-util/unifdef
- sys-devel/flex"
-BDEPEND="
- ${PYTHON_DEPS}
- sys-devel/flex
- test? (
- $(python_gen_cond_dep '
- dev-python/pebble[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- ')
- )"
-
-llvm_check_deps() {
- has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
- python-single-r1_pkg_setup
- llvm_pkg_setup
-}
-
-src_test() {
- cd "${BUILD_DIR}" || die
- pytest -vv || die
-}
diff --git a/dev-util/cvise/cvise-1.7.0-r1.ebuild b/dev-util/cvise/cvise-1.7.0-r1.ebuild
deleted file mode 100644
index 16f63504e0d4..000000000000
--- a/dev-util/cvise/cvise-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm python-single-r1
-
-DESCRIPTION="Super-parallel Python port of the C-Reduce"
-HOMEPAGE="https://github.com/marxin/cvise/"
-SRC_URI="
- https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-LLVM_MAX_SLOT=12
-DEPEND="
- || (
- sys-devel/clang:12
- sys-devel/clang:11
- sys-devel/clang:10
- )
- <=sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):="
-RDEPEND="${DEPEND}
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pebble[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- ')
- dev-util/unifdef
- sys-devel/flex"
-BDEPEND="
- ${PYTHON_DEPS}
- sys-devel/flex
- test? (
- $(python_gen_cond_dep '
- dev-python/pebble[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- ')
- )"
-
-llvm_check_deps() {
- has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
- python-single-r1_pkg_setup
- llvm_pkg_setup
-}
-
-src_test() {
- cd "${BUILD_DIR}" || die
- pytest -vv || die
-}
diff --git a/dev-util/cvise/cvise-1.8.0.ebuild b/dev-util/cvise/cvise-1.8.0.ebuild
deleted file mode 100644
index 16f63504e0d4..000000000000
--- a/dev-util/cvise/cvise-1.8.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm python-single-r1
-
-DESCRIPTION="Super-parallel Python port of the C-Reduce"
-HOMEPAGE="https://github.com/marxin/cvise/"
-SRC_URI="
- https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-LLVM_MAX_SLOT=12
-DEPEND="
- || (
- sys-devel/clang:12
- sys-devel/clang:11
- sys-devel/clang:10
- )
- <=sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):="
-RDEPEND="${DEPEND}
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pebble[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- ')
- dev-util/unifdef
- sys-devel/flex"
-BDEPEND="
- ${PYTHON_DEPS}
- sys-devel/flex
- test? (
- $(python_gen_cond_dep '
- dev-python/pebble[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- ')
- )"
-
-llvm_check_deps() {
- has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
- python-single-r1_pkg_setup
- llvm_pkg_setup
-}
-
-src_test() {
- cd "${BUILD_DIR}" || die
- pytest -vv || die
-}
diff --git a/dev-util/cvise/cvise-1.9.0.ebuild b/dev-util/cvise/cvise-1.9.0.ebuild
index 041dd4faeb67..ead00c52154a 100644
--- a/dev-util/cvise/cvise-1.9.0.ebuild
+++ b/dev-util/cvise/cvise-1.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="UoI-NCSA"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/dev-util/debhelper/debhelper-13.2.1.ebuild b/dev-util/debhelper/debhelper-13.2.1.ebuild
index 8b150d906aa6..f77d4a3b89c7 100644
--- a/dev-util/debhelper/debhelper-13.2.1.ebuild
+++ b/dev-util/debhelper/debhelper-13.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux"
IUSE="test"
RESTRICT="!test? ( test )"
DH_LANGS=( de es fr )
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
index 7caea829dc2f..5e2cecfcf614 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="emacs"
RDEPEND=">=dev-libs/glib-2.12:2"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index f14592d65b93..925412fa394b 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,2 +1 @@
-DIST diffoscope-162.tar.gz 1564386 BLAKE2B e5ea37ae48c65dae3c850a04152c322e1e8535ad982107689f23a4111ec04b9b7766681b7e61f69c75bece271d8875ef2d109b315ec5d55ad77658a065148ed6 SHA512 a5de428b491adfadc432322eba524dc8031a6be9709887f2f290376bb94b358cec45a4a0a31b8fb5f25377a33752044882245a22d7f2b71b17d5efe002c850f4
DIST diffoscope-163.tar.gz 1566445 BLAKE2B 4985d3a1e63fd2d4ef7cdf9e933e3ac6d1bc6c18a703bc92a8dc573b368c5989107debd57d96cfa40fe9e48d43b8ef0a07143ee48dd982a4a71b914a8e4d64ae SHA512 fc02d864c9a4b799aec45b88646f68de4f559366462b2057094592dfd3bff94213c17ea048b98070ae9a1f2f30d0e8d58d630b643e198dd85369cadea227a7e4
diff --git a/dev-util/diffoscope/diffoscope-162.ebuild b/dev-util/diffoscope/diffoscope-162.ebuild
deleted file mode 100644
index 572dad5645e4..000000000000
--- a/dev-util/diffoscope/diffoscope-162.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
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip zstd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
- dev-python/libarchive-c[${PYTHON_USEDEP}]
- dev-python/distro[${PYTHON_USEDEP}]
- acl? ( sys-apps/acl )
- binutils? ( sys-devel/binutils )
- bzip2? ( app-arch/bzip2 )
- libcaca? ( media-libs/libcaca )
- colord? ( x11-misc/colord )
- cpio? ( app-arch/cpio )
- diff? ( sys-apps/diffutils )
- docx? ( app-text/docx2txt )
- dtc? ( sys-apps/dtc )
- e2fsprogs? ( sys-fs/e2fsprogs )
- file? ( sys-apps/file )
- find? ( sys-apps/findutils )
- gettext? ( sys-devel/gettext )
- gif? ( media-libs/giflib )
- gpg? ( app-crypt/gnupg )
- gzip? ( app-arch/gzip )
- haskell? ( dev-lang/ghc )
- hdf5? ( sci-libs/hdf5 )
- hex? ( app-editors/vim-core )
- imagemagick? ( media-gfx/imagemagick )
- iso? ( virtual/cdrtools )
- java? ( virtual/jdk )
- llvm? ( sys-devel/llvm )
- mono? ( dev-lang/mono )
- opendocument? ( app-text/odt2txt )
- pascal? ( dev-lang/fpc )
- pdf? (
- app-text/pdftk
- app-text/poppler
- dev-python/PyPDF2[${PYTHON_USEDEP}]
- )
- postscript? ( app-text/ghostscript-gpl )
- R? ( dev-lang/R )
- rpm? ( app-arch/rpm )
- sqlite? ( dev-db/sqlite:3 )
- squashfs? ( sys-fs/squashfs-tools )
- ssh? ( net-misc/openssh )
- tar? ( app-arch/tar )
- tcpdump? ( net-analyzer/tcpdump )
- xz? ( app-arch/xz-utils )
- zip? ( app-arch/unzip )
- zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
diff --git a/dev-util/diffoscope/diffoscope-163.ebuild b/dev-util/diffoscope/diffoscope-163.ebuild
index 572dad5645e4..5f49e7be247b 100644
--- a/dev-util/diffoscope/diffoscope-163.ebuild
+++ b/dev-util/diffoscope/diffoscope-163.ebuild
@@ -43,7 +43,7 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
hdf5? ( sci-libs/hdf5 )
hex? ( app-editors/vim-core )
imagemagick? ( media-gfx/imagemagick )
- iso? ( virtual/cdrtools )
+ iso? ( app-cdr/cdrtools )
java? ( virtual/jdk )
llvm? ( sys-devel/llvm )
mono? ( dev-lang/mono )
diff --git a/dev-util/diffoscope/metadata.xml b/dev-util/diffoscope/metadata.xml
index 86628d987731..484caf983568 100644
--- a/dev-util/diffoscope/metadata.xml
+++ b/dev-util/diffoscope/metadata.xml
@@ -25,7 +25,7 @@
Use dev-lang/ghc
Use sci-libs/hdf5
Use app-editors/vim-core
- Use virtual/cdrtools
+ Use app-cdr/cdrtools
Use sys-devel/llvm
Use app-text/odt2txt
Use dev-lang/fpc
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index 7f5e52e234c9..3b2764138681 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,2 +1 @@
-DIST edb-debugger-1.2.0.tgz 608773 BLAKE2B d67136b3bfb153f0e5ba0aef514756f39d63692636adcad3569e79237613004f2a4c425b4bed875408473a7caa6280b3bfc590e8eeb4beb5bafaa2326da892bc SHA512 c04b8d3972497ac170c740f2625301ee7d3ea52b81b29084628aa0091d7cd7df12a34ae707be629cde6e0dea54254bfde25e290aba1d6bad2635eff704282ea9
DIST edb-debugger-1.3.0.tgz 618227 BLAKE2B 1650e727851b629d7778c8488a464b6439f2ac4e5a72c0738cfe1ee302538b0d97dcbf9587a1108a82f8f8f4a6bec273e31ad454063f70704ffb48ca8ba5b73f SHA512 9d813bb61cdc7b61b594e63834ffb3999d3e1bb0c7a435095efea9b3b6726369a06c553ba6633df160d9456758ff54d5eee8cfbee6a1304f3a01d09fe2c7a65d
diff --git a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
deleted file mode 100644
index 4d27f38f9869..000000000000
--- a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
-HOMEPAGE="https://github.com/eteran/edb-debugger"
-SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphviz"
-
-RDEPEND="
- dev-libs/capstone:=
- dev-libs/double-conversion
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5
- graphviz? ( media-gfx/graphviz )
-"
-
-DEPEND="
- dev-libs/boost
- virtual/pkgconfig
- ${RDEPEND}
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.0-qt-5.15.patch
- "${FILESDIR}"/${PN}-1.2.0-gcc-11.patch
-)
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- #Make the desktop's entries somewhat better
- sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
- sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
-
- if ! use graphviz; then
- sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
- fi
-
- cmake_src_prepare
-}
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch b/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch
deleted file mode 100644
index 68d58b2b90eb..000000000000
--- a/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://github.com/eteran/edb-debugger/pull/776
-
-From a46587a77c33256d56077a2d0709291b3ab12505 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich
-Date: Fri, 11 Sep 2020 07:57:39 +0100
-Subject: [PATCH] x86-generic/PlatformThread.cpp: avoid non-constant offsetof
-
-On gcc-11 edb-debugger build fails as:
-
-```
-.../x86-generic/PlatformThread.cpp:332:79: error: 'n' is not a constant expression
- 332 | return ptrace(PTRACE_POKEUSER, tid_, offsetof(struct user, u_debugreg[n]), value);
- | ^
-```
-
-The change workarounds by avoiding non-constant expression:
-https://gcc.gnu.org/PR95942
-
-Signed-off-by: Sergei Trofimovich
----
- .../unix/linux/arch/x86-generic/PlatformThread.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp
-+++ b/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp
-@@ -318,7 +318,8 @@ edb::address_t PlatformThread::instructionPointer() const {
- * @return
- */
- unsigned long PlatformThread::getDebugRegister(std::size_t n) {
-- return ptrace(PTRACE_PEEKUSER, tid_, offsetof(struct user, u_debugreg[n]), 0);
-+ size_t drOffset = offsetof(struct user, u_debugreg[0]) + n * sizeof(user::u_debugreg[0]);
-+ return ptrace(PTRACE_PEEKUSER, tid_, drOffset, 0);
- }
-
- /**
-@@ -328,7 +329,8 @@ unsigned long PlatformThread::getDebugRegister(std::size_t n) {
- * @return
- */
- long PlatformThread::setDebugRegister(std::size_t n, unsigned long value) {
-- return ptrace(PTRACE_POKEUSER, tid_, offsetof(struct user, u_debugreg[n]), value);
-+ size_t drOffset = offsetof(struct user, u_debugreg[0]) + n * sizeof(user::u_debugreg[0]);
-+ return ptrace(PTRACE_POKEUSER, tid_, drOffset, value);
- }
-
- /**
---
-2.28.0
-
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.2.0-qt-5.15.patch b/dev-util/edb-debugger/files/edb-debugger-1.2.0-qt-5.15.patch
deleted file mode 100644
index 795cb8fce681..000000000000
--- a/dev-util/edb-debugger/files/edb-debugger-1.2.0-qt-5.15.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/727530
-https://github.com/eteran/edb-debugger/pull/766
-
-Fix build failure on qt-5.15. Typical build error is:
-
-src/widgets/QDisassemblyView.cpp:1503:17:
- error: aggregate ‘QPainterPath path’ has incomplete type and cannot be defined
- 1503 | QPainterPath path;
- | ^~~~
-
---- a/src/widgets/QDisassemblyView.h
-+++ b/src/widgets/QDisassemblyView.h
-@@ -25,6 +25,7 @@ along with this program. If not, see .
- #include
- #include
- #include
-+#include
- #include
- #include
-
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index f27a6f6fae84..8faa0d3d5dbb 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1 +1 @@
-DIST goland-2020.2.3.tar.gz 427140538 BLAKE2B 0bc742e4fc4c5860b364cc34b4a17fa3147881a8e110fea43440e8cf89755b24840a86c770984b3e5d640229fa7806e2739acd6bbf5c7aee83af4404c92fb517 SHA512 742a7e134f01b882778b980f19f35f9310bf5e926ab4de1994af626f453ede74ea6fb5d2ed19c8077f6c152bc0836b1d4f36c5e3752b5cdd5b143a0f72ed4e79
+DIST goland-2020.3.tar.gz 484825433 BLAKE2B d3991ca6fdbbe0556ac99f65f5714a9e7b4904782a66904161d6a408ab816b2a44ea2282e51a41e71c827011da099f09e1087c259c42c8cca4e766da4cae0164 SHA512 47d5e91e17a4b3515fb72e9331bf63d69aec36d207822f20e99079d12de0351d8a9d3eca2f201a8a29bfcdc14c2f88015542f94c30be29921d4e12f0db4901f5
diff --git a/dev-util/goland/goland-2020.2.3.ebuild b/dev-util/goland/goland-2020.3.ebuild
similarity index 100%
rename from dev-util/goland/goland-2020.2.3.ebuild
rename to dev-util/goland/goland-2020.3.ebuild
diff --git a/dev-util/indent/indent-2.2.12.ebuild b/dev-util/indent/indent-2.2.12.ebuild
index f147dca41c81..d24c91e8ac8a 100644
--- a/dev-util/indent/indent-2.2.12.ebuild
+++ b/dev-util/indent/indent-2.2.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="nls"
DEPEND="
diff --git a/dev-util/itstool/itstool-2.0.6-r1.ebuild b/dev-util/itstool/itstool-2.0.6-r1.ebuild
index a8ed9c271124..b8f7df5ace99 100644
--- a/dev-util/itstool/itstool-2.0.6-r1.ebuild
+++ b/dev-util/itstool/itstool-2.0.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
# files in /usr/share/itstool/its are under a special exception || GPL-3+
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index d36c99982c35..49b4c28bfcaa 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,4 +1,5 @@
DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/dev-util/lldb/lldb-11.0.1_rc2.ebuild b/dev-util/lldb/lldb-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..e3f6cc1ae822
--- /dev/null
+++ b/dev-util/lldb/lldb-11.0.1_rc2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ libedit? ( dev-libs/libedit:0= )
+ lzma? ( app-arch/xz-utils:= )
+ ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/six[${PYTHON_MULTI_USEDEP}]
+ ')
+ ${PYTHON_DEPS}
+ )
+ ~sys-devel/clang-${PV}[xml]
+ ~sys-devel/llvm-${PV}
+ !=dev-util/cmake-3.16
+ python? ( >=dev-lang/swig-3.0.11 )
+ test? (
+ $(python_gen_cond_dep "
+ ~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+ ")
+ sys-devel/lld
+ )
+ ${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLLDB_ENABLE_CURSES=$(usex ncurses)
+ -DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+ -DLLDB_ENABLE_PYTHON=$(usex python)
+ -DLLDB_ENABLE_LZMA=$(usex lzma)
+ -DLLDB_USE_SYSTEM_SIX=1
+ -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+ -DLLDB_INCLUDE_TESTS=$(usex test)
+
+ -DCLANG_LINK_CLANG_DYLIB=ON
+ # TODO: fix upstream to detect this properly
+ -DHAVE_LIBDL=ON
+ -DHAVE_LIBPTHREAD=ON
+
+ # normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+ # and TERMINFO_LIBS... so just force FindCurses.cmake to use
+ # ncurses with complete library set (including autodetection
+ # of -ltinfo)
+ -DCURSES_NEED_NCURSES=ON
+
+ -DPython3_EXECUTABLE="${PYTHON}"
+ )
+ use test && mycmakeargs+=(
+ -DLLVM_BUILD_TESTS=$(usex test)
+ # compilers for lit tests
+ -DLLDB_TEST_COMPILER="$(type -P clang)"
+
+ -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+ -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+ -DLLVM_LIT_ARGS="$(get_lit_flags)"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ local -x LIT_PRESERVES_TMP=1
+ cmake_build check-lldb-lit
+ # failures + hangs
+ #use python && cmake_build check-lldb
+}
+
+src_install() {
+ cmake_src_install
+ find "${D}" -name '*.a' -delete || die
+
+ use python && python_optimize
+}
diff --git a/dev-util/ninja/ninja-1.10.2-r1.ebuild b/dev-util/ninja/ninja-1.10.2-r1.ebuild
new file mode 100644
index 000000000000..fb3ff9a2773e
--- /dev/null
+++ b/dev-util/ninja/ninja-1.10.2-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 2012-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
+else
+ SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${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
+
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="https://ninja-build.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="doc emacs test vim-syntax"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-util/re2c
+ doc? (
+ app-text/asciidoc
+ app-doc/doxygen
+ dev-libs/libxslt
+ )
+ test? ( dev-cpp/gtest )
+"
+RDEPEND="
+ emacs? ( >=app-editors/emacs-23.1:* )
+ vim-syntax? (
+ || (
+ app-editors/vim
+ app-editors/gvim
+ )
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/ninja-cflags.patch
+)
+
+run_for_build() {
+ if tc-is-cross-compiler; then
+ local -x AR=$(tc-getBUILD_AR)
+ local -x CXX=$(tc-getBUILD_CXX)
+ local -x CFLAGS=
+ local -x CXXFLAGS=${BUILD_CXXFLAGS}
+ local -x LDFLAGS=${BUILD_LDFLAGS}
+ fi
+ echo "$@" >&2
+ "$@"
+}
+
+src_compile() {
+ tc-export AR CXX
+
+ # configure.py appends CFLAGS to CXXFLAGS
+ unset CFLAGS
+
+ # enable LFS, bug #760848
+ export CXXFLAGS+=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+ BUILD_CXXFLAGS+=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+
+ run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
+
+ if tc-is-cross-compiler; then
+ mv ninja ninja-build || die
+ ${EPYTHON} configure.py || die
+ ./ninja-build -v ninja || die
+ else
+ ln ninja ninja-build || die
+ fi
+
+ if use doc; then
+ ./ninja-build -v doxygen manual || die
+ fi
+
+ if use emacs; then
+ elisp-compile misc/ninja-mode.el || die
+ fi
+}
+
+src_test() {
+ if ! tc-is-cross-compiler; then
+ # Bug 485772
+ ulimit -n 2048
+ ./ninja -v ninja_test || die
+ ./ninja_test || die
+ fi
+}
+
+src_install() {
+ dodoc README.md CONTRIBUTING.md
+ if use doc; then
+ docinto html
+ dodoc -r doc/doxygen/html/.
+ dodoc doc/manual.html
+ fi
+ dobin ninja
+
+ newbashcomp misc/bash-completion "${PN}"
+
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax/
+ doins misc/ninja.vim
+
+ echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim"
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${T}/ninja.vim"
+ fi
+
+ insinto /usr/share/zsh/site-functions
+ newins misc/zsh-completion _ninja
+
+ if use emacs; then
+ cd misc || die
+ elisp-install ninja ninja-mode.el* || die
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-util/perf/perf-5.9.9.ebuild b/dev-util/perf/perf-5.9.9.ebuild
index 4ab143e4afea..0b729ff3cc0c 100644
--- a/dev-util/perf/perf-5.9.9.ebuild
+++ b/dev-util/perf/perf-5.9.9.ebuild
@@ -31,7 +31,7 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
# TODO babeltrace
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/shflags/shflags-1.2.3.ebuild b/dev-util/shflags/shflags-1.2.3.ebuild
index 87735aff81d9..90397e69e81e 100644
--- a/dev-util/shflags/shflags-1.2.3.ebuild
+++ b/dev-util/shflags/shflags-1.2.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/kward/shflags/archive/v${PV}.tar.gz -> ${P}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
-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"
IUSE="examples"
src_test() {
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 6c75dddb0fe8..5001db99226c 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index 24f69ce36839..8114ca873fa0 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -1,2 +1 @@
-DIST darcs-2.14.5.tar.gz 1063677 BLAKE2B 7f38aa09d5af53e68829a9181f1981eccd173e2af5a044d100758164b668297303aed947ffc579ea1977e4a1f2820d1954b5c5428e429e5ff42ee238e0043611 SHA512 75f89dc920eb9a417e86bcbf185b0ba35e284a0a0c6bbd27c7dec46c4f143f5c37f0559a1ff1b3d3bd39ebdca98fa3a7420bee5e179c1bef0b0fc203e04e0484
DIST darcs-2.16.3.tar.gz 1244848 BLAKE2B 59754a782a456b3c6bba2b382d485b5de00ae3fc7ac1107bcf89877aff9650eb823704eb23912a83643685612a0cfc84ccf2af2303b52249d9e7a3e55c08c7b7 SHA512 267787c5b3111a20158858b42a8b9c2698b80dc40f7d340175e26d74b955643cefffc2f4de9811fa26464eac2e79913150fb3cd73871275725d10a690b9d73c3
diff --git a/dev-vcs/darcs/darcs-2.14.5.ebuild b/dev-vcs/darcs/darcs-2.14.5.ebuild
deleted file mode 100644
index 16ea2a78fd89..000000000000
--- a/dev-vcs/darcs/darcs-2.14.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize,hashed-storage-diff:diff,+http
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="a distributed, interactive, smart revision control system"
-HOMEPAGE="http://darcs.net/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl +terminfo +threaded"
-
-RDEPEND=">=dev-haskell/async-2.0.2:=[profile?] =dev-haskell/attoparsec-0.13.0.1:=[profile?] =dev-haskell/base16-bytestring-0.1:=[profile?] =dev-haskell/cryptohash-0.11:=[profile?] =dev-haskell/data-ordlist-0.4:=[profile?] =dev-haskell/fgl-5.5.2.3:=[profile?] =dev-haskell/graphviz-2999.18.1:=[profile?] =dev-haskell/hashable-1.2.3.3:=[profile?] =dev-haskell/haskeline-0.7.2:=[profile?] =dev-haskell/html-1.0.1.2:=[profile?] =dev-haskell/http-4000.2.20:=[profile?] =dev-haskell/mmap-0.5.9:=[profile?] =dev-haskell/mtl-2.2.1:=[profile?] =dev-haskell/network-2.6:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/old-time-1.1.0.3:=[profile?] =dev-haskell/parsec-3.1.9:=[profile?] =dev-haskell/random-1.1:=[profile?] =dev-haskell/regex-applicative-0.2:=[profile?] =dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] =dev-haskell/sandi-0.4:=[profile?] =dev-haskell/stm-2.1:=[profile?] =dev-haskell/tar-0.5:=[profile?] =dev-haskell/text-1.2.1.3:=[profile?] =dev-haskell/unix-compat-0.4.2:=[profile?] =dev-haskell/utf8-string-1:=[profile?] =dev-haskell/vector-0.11:=[profile?] =dev-haskell/zip-archive-0.3:=[profile?] =dev-haskell/zlib-0.6.1.2:=[profile?] =dev-lang/ghc-8.0.1:=
- curl? ( net-misc/curl )
- terminfo? ( >=dev-haskell/terminfo-0.4.0.2:=[profile?] =dev-haskell/cabal-1.24.0.0
- test? ( >=dev-haskell/cmdargs-0.10.10 =dev-haskell/findbin-0.0.5 =dev-haskell/hunit-1.3 =dev-haskell/quickcheck-2.8.2 =dev-haskell/shelly-1.6.8 =dev-haskell/split-0.2.2 =dev-haskell/test-framework-0.8.1.1 =dev-haskell/test-framework-hunit-0.3.0.2 =dev-haskell/test-framework-quickcheck2-0.3.0.3 =dev-libs/libfmt-7.1:0=
dev-libs/lzo:2=
dev-libs/pugixml:0=
media-libs/libpng:0=
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index d78ce229e596..b4dc09ce87e7 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest
index 2195f5ba9093..c8fa438bdbb3 100644
--- a/games-engines/stratagus/Manifest
+++ b/games-engines/stratagus/Manifest
@@ -1,2 +1,3 @@
DIST stratagus-2.4.1.tar.gz 1087678 BLAKE2B be7fc8322aee2a28c80833d44c3180e26b961ce9dfd1bc5e0a8e3fa0caac74bf713224de4c38b2ebf6d5aeabbe778a5664346c6a444b066f07f719bba5317bac SHA512 1f0420677df72e3e2d2f31e60030fa2eba4c3d1ab80cfc79c045724fe39ac237846bc38e8762ee9aa51768a443cdbbaa1fe91bf80fb2164261288a1bb17e27cd
DIST stratagus-2.4.3.tar.gz 1123537 BLAKE2B 90e40b2b277b5c52977f3c0ae2ae8f2e65d940d765e2ca4f7def4f8cf903399350f5e46f6dc6fbc38f3a53c7ca9ecaf5cf38025ec69154972869f28da37865d4 SHA512 16271c4fed3fb75fb8fb08e363e72713ede7979ea7e25b7c83db2fa9a0688fb7927cad3379e3b23e172c409cf0f6db18f7c6557d19a693c9a7f24109b56d2a56
+DIST stratagus-3.0.0.tar.gz 1149659 BLAKE2B 62a14bdc84462f22867b836b9a83f58ba31c7793c20f25cd8a0ca58adf7e5a38ee4559e96dddf8eb61dd1572dac55e08b16c95f8b7590644da0d0ffd040e0360 SHA512 baef3636471134c53ae0a60471f217daf694c20f439db125cf31cc33a510be456486aa905950aec15f28acada1af39a245e97fc85045d849b10532939a8f3a83
diff --git a/games-engines/stratagus/stratagus-3.0.0-r1.ebuild b/games-engines/stratagus/stratagus-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..ee369f12de34
--- /dev/null
+++ b/games-engines/stratagus/stratagus-3.0.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake optfeature
+
+DESCRIPTION="A realtime strategy game engine"
+HOMEPAGE="https://wargus.github.io/stratagus.html
+ https://github.com/Wargus/stratagus"
+SRC_URI="https://github.com/Wargus/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 debug doc mng theora vorbis"
+REQUIRED_USE="theora? ( vorbis )"
+
+RDEPEND="
+ dev-db/sqlite:3
+ >=dev-lang/lua-5:0
+ dev-lua/toluapp
+ media-libs/libpng:0
+ x11-libs/libX11
+ media-libs/libsdl2[sound,opengl,video]
+ media-libs/sdl2-mixer[vorbis]
+ media-libs/sdl2-image[png]
+ sys-libs/zlib
+ bzip2? ( app-arch/bzip2 )
+ mng? ( media-libs/libmng )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ theora? ( media-libs/libtheora )
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}"-2.3.0-doc.patch
+)
+
+src_prepare() {
+ sed -i -e 's:-Werror::' CMakeLists.txt || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ # there are in-source switches
+ use debug && CMAKE_BUILD_TYPE=Debug
+
+ local mycmakeargs=(
+ -DGAMEDIR="/usr/bin"
+ -DDOCDIR="/usr/share/doc/${PF}"
+ -DWITH_BZIP2=$(usex bzip2)
+ -DWITH_MNG=$(usex mng)
+ -DWITH_OGGVORBIS=$(usex vorbis)
+ -DWITH_THEORA=$(usex theora)
+ -DENABLE_DOC=$(usex doc)
+ -DENABLE_DEV=ON
+ )
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ optfeature "MIDI music support" "media-libs/sdl2-mixer[midi]"
+}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index f8e35a67ceec..4edca7680baa 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/war1gus/Manifest b/games-strategy/war1gus/Manifest
index 3e030e66acef..27c10be561cd 100644
--- a/games-strategy/war1gus/Manifest
+++ b/games-strategy/war1gus/Manifest
@@ -1 +1,2 @@
DIST war1gus-2.4.3.tar.gz 436938 BLAKE2B 662c3e2d16d4ca3225a50ec28ff6ae11f9c309a02c1b71e26a28155012395091dec7833a4f32a0ee6c19119a9c0aa2aa96cb465b06937da8efdd54b040189778 SHA512 909dc3375a00a4ff05eb287e6a1e3414b084f51cda37fe73ab4d728eb2d13e3e0e8612700a90e000d67a9ddffb115fe41554a4ad9db9f68e0b62cdbc0d025ae0
+DIST war1gus-3.0.0.tar.gz 446245 BLAKE2B f58d8fe8248cc7cc661a5c2dabef9b13410eb3530bb045c03c54abeea8028e26ada3bd98d50680165b3ce35b17a08acba2b953b8c896de990cdbb3acf59cd4ae SHA512 fad712945e939fededf202181523b34945ba58ded5b5ea8089709860b63ad9c9766eb926293e5195c14f0dc3b8531ac0ae4654ab6b6718068648f9efc0fb817c
diff --git a/games-strategy/war1gus/war1gus-3.0.0.ebuild b/games-strategy/war1gus/war1gus-3.0.0.ebuild
new file mode 100644
index 000000000000..7871af95da19
--- /dev/null
+++ b/games-strategy/war1gus/war1gus-3.0.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Warcraft: Orcs & Humans for the Stratagus game engine"
+HOMEPAGE="https://wargus.github.io/war1gus.html
+ https://github.com/Wargus/war1gus"
+SRC_URI="https://github.com/Wargus/war1gus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ =games-engines/stratagus-${PV}*[theora]
+ media-libs/libpng:0=
+ sys-libs/zlib:=
+ x11-libs/gtk+:2
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig"
+
+src_configure() {
+ local mycmakeargs=(
+ -DGAMEDIR="${EPREFIX}/usr/bin"
+ -DBINDIR="${EPREFIX}/usr/bin"
+ -DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
+ -DSHAREDIR="${EPREFIX}/usr/share/stratagus/war1gus"
+ -DICONDIR=/usr/share/icons/hicolor/64x64/apps
+ )
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ elog "War1gus requires the data from the original game to run. The game"
+ elog "will ask you for the location of the game data and extract/convert"
+ elog "it automatically on the first run."
+
+ if ! has_version media-video/ffmpeg ||
+ ! has_version media-sound/timidity++
+ then
+ elog
+ elog "If you did not convert the game data yet, you may want to install"
+ elog "the following optional dependencies:"
+ elog
+ elog "media-video/ffmpeg -- to convert game videos"
+ elog "media-sound/timidity++ -- to convert game music"
+ fi
+
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/games-strategy/wargus/Manifest b/games-strategy/wargus/Manifest
index 75a106a3ee0a..2a1683db4750 100644
--- a/games-strategy/wargus/Manifest
+++ b/games-strategy/wargus/Manifest
@@ -1,2 +1,3 @@
DIST wargus-2.4.1.tar.gz 45981981 BLAKE2B 8d80e5d781a1be1edf602f13d77b84e85fe2592fb0a784f1b25b5c9656eaf10a11c3241dfa71388c9a01a9e8fad15b1805a67ddb3157c2a0e86d967f3852869a SHA512 d468d9ad08907fbbfd02af0bca069d6a95d5303cd4f3d838c12bbfe6af0d48f695f9f49d446dbddeae2a91deb1eaa17875954eefdfbe5e25cd840c4454dc6ea0
DIST wargus-2.4.3.tar.gz 46635465 BLAKE2B be559e6efdba7542e9ed65f4ece5419b781b61d7d6d43b40418ca8dffc446fa7478f608d7f24696281c7acbda4dc5bf8d808feeb3376ae3e8a04b3372d18ace1 SHA512 0c9eca898146c44e211e0da7061cb605eb04ab113fd9ad0c51f9b92df8724a5b28aea9b7cf9bfadd44f0183f8b5c519d7da0050b260624f4f7da4b9f8aee458c
+DIST wargus-3.0.0.tar.gz 4890178 BLAKE2B 7ab4a4b5e8171b2297e17f0338a5fd674cff7beb3457e33c7938c12f9a262d81b9faf2db6ae00fdbbef440624880c37bfe61c2b9957e943cf13d364544f58a65 SHA512 70bf6a5a3d489c9d88bf28e65eea85936ac42850b9c8f27c5cb4a7ba8ff28c609274235c735abb4de92e5c63113d4850adc1da313ff39cbdee797de6b9e1cc43
diff --git a/games-strategy/wargus/metadata.xml b/games-strategy/wargus/metadata.xml
index 4dbdbbfd0323..e87f6c4d810f 100644
--- a/games-strategy/wargus/metadata.xml
+++ b/games-strategy/wargus/metadata.xml
@@ -9,6 +9,10 @@
games@gentoo.org
Gentoo Games Project
+
Wargus/wargus
diff --git a/games-strategy/wargus/wargus-3.0.0-r1.ebuild b/games-strategy/wargus/wargus-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..a15e86163b5b
--- /dev/null
+++ b/games-strategy/wargus/wargus-3.0.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Warcraft II for the Stratagus game engine"
+HOMEPAGE="https://wargus.github.io/
+ https://github.com/Wargus/wargus"
+SRC_URI="https://github.com/Wargus/wargus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bne"
+
+RDEPEND="
+ =games-engines/stratagus-${PV}*[theora]
+ media-libs/libpng:0=
+ sys-libs/zlib:=
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ bne? ( app-arch/stormlib:= )
+ !games-strategy/wargus-data"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig"
+
+pkg_pretend() {
+ if has_version games-strategy/wargus-data; then
+ ewarn "The system-wide install of game data via games-strategy/wargus-data"
+ ewarn "no longer works. The old data will be uninstalled after merging"
+ ewarn "this version of Wargus. If you would like to preserve it, please"
+ ewarn "abort the process and back /usr/share/stratagus/wargus up."
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DGAMEDIR="${EPREFIX}/usr/bin"
+ -DBINDIR="${EPREFIX}/usr/bin"
+ -DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
+ -DSHAREDIR="${EPREFIX}/usr/share/stratagus/wargus"
+ -DICONDIR=/usr/share/icons/hicolor/64x64/apps
+ -DWITH_STORMLIB=$(usex bne)
+ )
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ elog "Wargus requires the data from the original game to run. The game"
+ elog "will ask you for the location of the game data and extract/convert"
+ elog "it automatically on the first run."
+
+ if ! has_version media-video/ffmpeg ||
+ ! has_version media-sound/cdparanoia
+ then
+ elog
+ elog "If you did not convert the game data yet, you may want to install"
+ elog "the following optional dependencies:"
+ elog
+ elog "media-video/ffmpeg -- to convert game videos"
+ elog "media-sound/cdparanoia -- to rip game music from the CD"
+ fi
+
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 05772ff549ef..9ac4f13ae25c 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 7d6145586cf0..8e16e6d366eb 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,4 +1,3 @@
DIST gnome-desktop-3.36.5.tar.xz 738956 BLAKE2B 6c419df487e908f57a1dc8798a8dfe8b574d8c5c9aa5d83e45aed233ba856ba398367a990aa83fb1b8966aad02c868cd0e41805908863ea8fef24cc3ade3687c SHA512 0b5ad42c0832d58552270e9e24dabf56668c4fbb84d07812e4a2a34cff0a67344a7c8ee963a53a703b2e4bb28c67035bf2ce854ea271194511dc66e051481b1b
-DIST gnome-desktop-3.36.7.tar.xz 739284 BLAKE2B fb64db72883ca6b5001b519f6ce3b5b26605e081530ff27728bc565e5d3ce832281adf3d10107e74028d14d9d1e5fa64f8e5d447c13690ff67aa3d2c2816c2e8 SHA512 20e3566ce1c36399a7fa359dd218f0357e1deef54ad613ce825d19f9266d98ed03c5ae59843100b36dcc6b3cdee8479ea9403514eb39e1f32d9b1fd4e53a7679
-DIST gnome-desktop-3.38.1.tar.xz 745400 BLAKE2B 872b0cdd993ed8f8865ec02e8f4e818657f526caebb3cd1b772c1182a6655d1502f454b94acb0a1dc9e3a1b8f8b8308c5dcee7933a63600d7f8d93fa3876a1d2 SHA512 b3927f0b8571d2ecb528dbe3e096e816e4e90333ce4f1ab8682c8682bbaaf5fc3484dc0944a9437aca40036d29b0feace8ed3954fb17c0bfd7ce503c99af830b
+DIST gnome-desktop-3.36.8.tar.xz 739236 BLAKE2B 378cf551787863543e30b0e69dd7447a5a9fd1026c3c85f32f140874658f803e6e8d2a82c79a1a9c4aadd08043905f1b0486e900596e855c2650248ac9478d01 SHA512 d9a447ec1c34e98d19ed6f5ef7e48f19d89009bd20368e2d731ff0cea30adc2dea6c0293df9b07f39e4573035edd25815ccd7d740f09ba421ebee74b7c8c90a2
DIST gnome-desktop-3.38.2.tar.xz 745252 BLAKE2B cdbc3ae5bf78dfed0dcedfd83c01ab13f551c312d4eb5e680a9e22932d55ee9cf9334bec84cd99186d43afcf3fe707a12b469409d5c2094a8bbd8a1d36a75ed2 SHA512 93e98c10cac0f1c035af33fc61f945dfdbe12e88e4c42d44b5ba0570f8d81bb3f40f5e0d9fd6c4e4d9faf674f38ded0fc99dfffd57b824d62b92368df6239da8
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.36.7.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.36.8.ebuild
similarity index 94%
rename from gnome-base/gnome-desktop/gnome-desktop-3.36.7.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.36.8.ebuild
index e7951e7ba9c2..bcd26befee5f 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.36.7.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.36.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
SLOT="3/19" # subslot = libgnome-desktop-3 soname version
IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
# cairo[X] needed for gnome-bg
COMMON_DEPEND="
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.38.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.38.1.ebuild
deleted file mode 100644
index f2127cb11f3b..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.38.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
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Library with common API for various GNOME modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
-SLOT="3/19" # subslot = libgnome-desktop-3 soname version
-IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
- >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
- >=x11-libs/gtk+-3.3.6:3[X,introspection?]
- >=dev-libs/glib-2.53.0:2
- >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
- x11-misc/xkeyboard-config
- app-text/iso-codes
- systemd? ( sys-apps/systemd:= )
- udev? (
- sys-apps/hwids
- virtual/libudev:= )
- seccomp? ( sys-libs/libseccomp )
-
- x11-libs/cairo:=
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
- media-libs/fontconfig
-"
-RDEPEND="${COMMON_DEPEND}
- seccomp? ( sys-apps/bubblewrap )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.1.2
- dev-util/gdbus-codegen
- gtk-doc? ( >=dev-util/gtk-doc-1.14 )
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- x11-base/xorg-proto
- virtual/pkgconfig
-"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
-
-PATCHES=(
- "${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
-)
-
-src_prepare() {
- # Don't build manual test programs that will never get run
- sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
- xdg_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- -Dgnome_distributor=Gentoo
- -Ddate_in_gnome_version=true
- -Ddesktop_docs=true
- $(meson_use debug debug_tools)
- $(meson_use introspection)
- $(meson_feature udev)
- $(meson_feature systemd)
- $(meson_use gtk-doc gtk_doc)
- -Dinstalled_tests=false
- )
- meson_src_configure
-}
diff --git a/gnome-base/librsvg/librsvg-2.40.21.ebuild b/gnome-base/librsvg/librsvg-2.40.21.ebuild
index 44a6e1505746..7fa10b848624 100644
--- a/gnome-base/librsvg/librsvg-2.40.21.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.21.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
+GNOME2_EAUTORECONF="yes"
VALA_USE_DEPEND="vapigen"
-inherit autotools eutils gnome2 multilib-minimal vala
+inherit autotools gnome2 multilib-minimal vala
DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
@@ -19,55 +19,52 @@ REQUIRED_USE="vala? ( introspection )"
RDEPEND="
>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.38.0[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
>=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.38.0[${MULTILIB_USEDEP}]
introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
tools? ( >=x11-libs/gtk+-3.10.0:3 )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-libs/gobject-introspection-common
dev-libs/vala-common
dev-util/glib-utils
>=dev-util/gtk-doc-am-1.13
virtual/pkgconfig
+ x11-libs/gdk-pixbuf
vala? ( $(vala_depend) )
"
# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
RESTRICT="test" # Lots of issues due to freetype changes and more; ever since newer tests got backported into 2.40.19
-src_prepare() {
+PATCHES=(
# https://bugzilla.gnome.org/show_bug.cgi?id=653323
- eapply "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch"
-
- eautoreconf
+ "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch"
+)
+src_prepare() {
use vala && vala_src_prepare
gnome2_src_prepare
}
multilib_src_configure() {
- local myconf=()
+ local myconf=(
+ --disable-static
+ --disable-tools # only useful for librsvg developers
+ $(multilib_native_use_enable introspection)
+ $(multilib_native_use_with tools gtk3)
+ $(multilib_native_use_enable vala)
+ --enable-pixbuf-loader
+ )
# -Bsymbolic is not supported by the Darwin toolchain
- if [[ ${CHOST} == *-darwin* ]]; then
- myconf+=( --disable-Bsymbolic )
- fi
+ [[ ${CHOST} == *-darwin* ]] && myconf+=( --disable-Bsymbolic )
- # --disable-tools even when USE=tools; the tools/ subdirectory is useful
- # only for librsvg developers
- ECONF_SOURCE=${S} \
- gnome2_src_configure \
- --disable-static \
- --disable-tools \
- $(multilib_native_use_enable introspection) \
- $(multilib_native_use_with tools gtk3) \
- $(multilib_native_use_enable vala) \
- --enable-pixbuf-loader \
- "${myconf[@]}"
+ ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
if multilib_is_native_abi; then
ln -s "${S}"/doc/html doc/html || die
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index d10da42ca3e5..56c17eb2e6fa 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.36.6.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.36.6.ebuild
index 098d16b342b9..bae4e2ebd197 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.36.6.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.36.6.ebuild
@@ -42,19 +42,19 @@ DEPEND="
" # gobject-introspection needed for libovf subproject (and gtk-frdp subproject with USE=rdp)
# These are called via exec():
# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
-# virtual/cdrtools mkisofs is needed for unattended installer secondary disk image creation
+# app-cdr/cdrtools mkisofs is needed for unattended installer secondary disk image creation
# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
# sys-apps/policycoreutils restorecon is used for checking selinux context
# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
RDEPEND="${DEPEND}
+ app-cdr/cdrtools
>=app-misc/tracker-miners-2[iso]
app-emulation/spice[smartcard]
>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
sys-fs/mtools
- virtual/cdrtools
sys-auth/polkit
"
# gtk-frdp generates gir and needs gtk+ introspection for it
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index dd547b7244a5..452cd71c910b 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,2 +1,3 @@
DIST gnome-calendar-3.36.2.tar.xz 605904 BLAKE2B 42b0337a01a5316a60d41eede91c453e3c0fa2b056e9053f8868f344a662fdf4b3de4ade1f1a59b729f2bc3e087cf6b971094cd282d75432a83acc89a21054a7 SHA512 83d0157a3958ff7f16af2f6a06c2c5fdd7ce19bb532c1cda0982ab37d78149f4c0ae252de937103baa56d105a1cf54c2e29174f6f3f969904071e187cf564c33
DIST gnome-calendar-3.38.1.tar.xz 547168 BLAKE2B 05ad63cb5ca6ed39456846dc9f08ce9dabe5614d92a985060dfe079f7fd5472bf449506ff9ac00f1c7fbe0af7c2d6895799392a579ca5b9525b0e1c46ebdebc5 SHA512 24ddb69852139954f0b29b3333b712bb56f79fa8cdefba567cad99ddeb1bd5a4af644fdfc8ac0c7c404be49437df0395722d5d7e7e5221847b2eb4b83c9b5f05
+DIST gnome-calendar-3.38.2.tar.xz 547228 BLAKE2B ef7ba6dce47d9ee664d1dc648da81738cfd20108799e0c262b16152ce7b590613b711fbcf9ddbff4fb9ba597b1067b558697874744abd3f32ac08d7dcbe5550d SHA512 2744c91e37c8966f2deee1588fe439ccd520344c24f1b74422f7ba95f592c9691a2530984499a00af3065447932195879bc1b5b9e8ae6731487ac047e5d75267
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.38.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.38.2.ebuild
new file mode 100644
index 000000000000..23459051d17b
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.38.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
+DEPEND="
+ >=dev-libs/libical-1.0.1:0=
+ >=gnome-base/gsettings-desktop-schemas-3.21.2
+ >=gnome-extra/evolution-data-server-3.33.2:=[gtk]
+ net-libs/libsoup:2.4
+ >=dev-libs/libdazzle-3.33.1
+ >=gui-libs/libhandy-0.0.9:0.0=
+ >=dev-libs/glib-2.58.0:2
+ >=x11-libs/gtk+-3.22.0:3
+ >=net-libs/gnome-online-accounts-3.2.0:=
+ >=dev-libs/libgweather-3.27.2:=
+ >=app-misc/geoclue-2.4:2.0
+ >=sci-geosciences/geocode-glib-3.23
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-libs/appstream-glib
+ dev-libs/libxml2:2
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_test() {
+ virtx meson_src_test
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 0603b79364c3..e3737753cef7 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1 +1,2 @@
DIST gnome-contacts-3.36.2.tar.xz 635932 BLAKE2B 9bcdf093d99477d1162c9ea78007e65cf20a1e4038fe284fafa4c174ab1d1d0c2ceb7ec2806c9abeed1c8ab168549c80b2763e65ece22c76a9044781eef8ed5d SHA512 ebbce67aa5c0af55559230c558c5f28b065182d434582431595bffedc25dd0ec3caa44e60f4670b4b2a1f784e90c8dd4f56df937054697b4ea932a39da78f1c1
+DIST gnome-contacts-3.38.1.tar.xz 657376 BLAKE2B 5c042566ad99be1bda454466dcc2a42d6494cfbfb5a9f60eb0fa718a8d9bcbb986798ec48a87d5d322989b22d0fac2eee69df852ae39ba8a228ad91f50247c30 SHA512 bc2ed06d491c4773b9cedb2c51dc390a95d0271cf22d54864f5da4d892f80efece3cbdc1b90b4497f730039c8c83065b2a0ca590cecec579f011dd324ff8f134
diff --git a/gnome-extra/gnome-contacts/files/3.36.2-fix-telepathy.patch b/gnome-extra/gnome-contacts/files/3.36.2-fix-telepathy.patch
new file mode 100644
index 000000000000..07d4e7783634
--- /dev/null
+++ b/gnome-extra/gnome-contacts/files/3.36.2-fix-telepathy.patch
@@ -0,0 +1,71 @@
+From cbcb28f91f2c5dab9300ded79dc8e246a7ae0f36 Mon Sep 17 00:00:00 2001
+From: Niels De Graef
+Date: Sat, 7 Nov 2020 12:01:59 +0100
+Subject: [PATCH] Fix build when -Dtelepathy=true
+
+---
+ src/contacts-contact-list.vala | 2 +-
+ src/contacts-contact-sheet.vala | 4 +++-
+ src/contacts-utils.vala | 4 ++--
+ 3 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/contacts-contact-list.vala b/src/contacts-contact-list.vala
+index aa3cd33..b371644 100644
+--- a/src/contacts-contact-list.vala
++++ b/src/contacts-contact-list.vala
+@@ -243,7 +243,7 @@ public class Contacts.ContactList : ListBox {
+ selection_changed (individual);
+ #if HAVE_TELEPATHY
+ if (individual != null)
+- Contact.fetch_contact_info (individual);
++ Utils.fetch_contact_info (individual);
+ #endif
+ }
+
+diff --git a/src/contacts-contact-sheet.vala b/src/contacts-contact-sheet.vala
+index b6c2249..669e771 100644
+--- a/src/contacts-contact-sheet.vala
++++ b/src/contacts-contact-sheet.vala
+@@ -27,6 +27,7 @@ using Gee;
+ public class Contacts.ContactSheet : Grid {
+ private int last_row = 0;
+ private Individual individual;
++ private unowned Store store;
+ public bool narrow { get; set; default = true; }
+
+ private const string[] SORTED_PROPERTIES = {
+@@ -43,6 +44,7 @@ public class Contacts.ContactSheet : Grid {
+ public ContactSheet (Individual individual, Store store) {
+ Object (row_spacing: 12, column_spacing: 12);
+ this.individual = individual;
++ this.store = store;
+
+ this.individual.notify.connect (update);
+ this.individual.personas_changed.connect (update);
+@@ -242,7 +244,7 @@ public class Contacts.ContactSheet : Grid {
+ var type = im_persona.presence_type;
+ if (type != PresenceType.UNSET && type != PresenceType.ERROR &&
+ type != PresenceType.OFFLINE && type != PresenceType.UNKNOWN) {
+- Utils.start_chat (this.contact, protocol, id.value);
++ Utils.start_chat (this.individual, protocol, id.value);
+ }
+ }
+ });
+diff --git a/src/contacts-utils.vala b/src/contacts-utils.vala
+index 879c4a9..8f3b8c1 100644
+--- a/src/contacts-utils.vala
++++ b/src/contacts-utils.vala
+@@ -80,8 +80,8 @@ namespace Contacts.Utils {
+ }
+
+ #if HAVE_TELEPATHY
+- public void start_chat (Contact contact, string protocol, string id) {
+- var im_persona = contact.find_im_persona (protocol, id);
++ public void start_chat (Individual individual, string protocol, string id) {
++ var im_persona = Utils.find_im_persona (individual, protocol, id);
+ var account = (im_persona.store as Tpf.PersonaStore).account;
+ var request_dict = new HashTable(str_hash, str_equal);
+ request_dict.insert (TelepathyGLib.PROP_CHANNEL_CHANNEL_TYPE,
+--
+2.27.0
+
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild
index 669b2a1ab433..372d51f30729 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+VALA_MIN_API_VERSION="0.40"
VALA_MAX_API_VERSION="0.48"
inherit gnome.org gnome2-utils meson vala xdg
@@ -48,6 +49,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PV}-fix-telepathy.patch
+)
+
src_prepare() {
xdg_src_prepare
vala_src_prepare
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.38.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.38.1.ebuild
new file mode 100644
index 000000000000..279d1ad7f841
--- /dev/null
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.38.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="GNOME contact management application"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="telepathy v4l"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+VALA_DEPEND="
+ $(vala_depend)
+ >=dev-libs/gobject-introspection-1.54
+ dev-libs/folks[vala(+)]
+ net-libs/gnome-online-accounts[vala]
+ gnome-extra/evolution-data-server[gtk,vala]
+ telepathy? ( net-libs/telepathy-glib[vala] )
+ >=gui-libs/libhandy-1.0.0:1[vala]
+"
+# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
+RDEPEND="
+ >=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts]
+ >=dev-libs/folks-0.11.4:=[eds,telepathy?]
+ >=dev-libs/glib-2.58:2
+ >=dev-libs/libgee-0.10:0.8
+ >=gnome-base/gnome-desktop-3.0:3=
+ net-libs/gnome-online-accounts:=
+ >=x11-libs/gtk+-3.23.1:3
+ v4l? ( >=media-video/cheese-3.5.91:= )
+ telepathy? ( >=net-libs/telepathy-glib-0.22 )
+ >=gui-libs/libhandy-0.0.12:0.0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${VALA_DEPEND}
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xsl-stylesheets
+ dev-libs/appstream-glib
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ xdg_src_prepare
+ vala_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature v4l cheese)
+ $(meson_use telepathy)
+ -Dmanpage=true
+ -Ddocs=false
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index db10b3813c04..9c3febee8042 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1 +1,2 @@
DIST gnome-user-docs-3.36.2.tar.xz 10568116 BLAKE2B bf53e85276d455bfeed645621b8273ace47644c5de0896f07b46c1dde5316f03385cbedce5ca259fe6c6460d35c090ad0dca8cbf46e3db0df95cc6a832424dc0 SHA512 6f9d5e6c86a377a7c77a89246b1c0555a5ddbbf9e0ec983182b9cc019c03c53d585c71f63fedb67ff1e0547ec65e1c2d832947d7e58ac2f1491c268735617c77
+DIST gnome-user-docs-3.36.6.tar.xz 10607064 BLAKE2B 2b6173905f16a72885ea684e79930ee9425adea7b98b11f324df48c5f788a6f72aafcf9b782aae764eca3db451bd232be6f2572eec6278e179ae04102c863a1f SHA512 62384715c9cfa82fcf39f93d574e61aa2a127060f558f7f68b7ce1a3a724cf1670affeff165cff16b6c019b2c4135a517d39da6be859e8756c850763c912f3ab
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.36.6.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.36.6.ebuild
new file mode 100644
index 000000000000..1c83d246f5a8
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.36.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="GNOME end user documentation"
+HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
+
+LICENSE="CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+ test? ( dev-libs/libxml2 )
+"
+# eautoreconf requires:
+# app-text/yelp-tools
+# rebuilding translations requires:
+# app-text/yelp-tools
+# dev-util/gettext
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip
+ !test? ( test )"
+
+src_configure() {
+ # itstool is only needed for rebuilding translations
+ # xmllint is only needed for tests
+ gnome2_src_configure \
+ $(usex test "" XMLLINT=$(type -P true)) \
+ ITSTOOL=$(type -P true)
+}
+
+src_compile() {
+ # Do not compile; "make all" with unset LINGUAS rebuilds all translations,
+ # which can take > 2 hours on a Core i7.
+ return
+}
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 96241ec92d49..a2087a714cd7 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1 +1,2 @@
DIST yelp-3.36.0.tar.xz 1538076 BLAKE2B d3f8817a54506997581ddc5477c87e2b61be0303c275e9174602a005838f141b1b7ad1904b682dfe3cf1118aaf497abbbfc855c5b57e2f7f3fdf6108a90f3ef1 SHA512 533916c61f6c0c830ddd21533c4462bea8493c76246092b1d77fa145f29cda15ae01817a4ac680bdf61ed591513320faf48e0aa727567c677fdb0ad66b6fa0c8
+DIST yelp-3.36.2.tar.xz 1526300 BLAKE2B f33bbbab9c02d36d8d2472735b661f5a29bfae8b104851e202a0b825390c308500fe108b6a7741ddf0774b2657f772bf94b69051b089b98009ab49a1cc55e4f5 SHA512 eabf1513a723c208d63c728aa08da641672b93f026317258f5732371e9837ab7626d2dcaf609da7982458fe2caf76a6d7607042d073bb5779a2e3916e938af0d
diff --git a/gnome-extra/yelp/yelp-3.36.2.ebuild b/gnome-extra/yelp/yelp-3.36.2.ebuild
new file mode 100644
index 000000000000..4c46c28a79fe
--- /dev/null
+++ b/gnome-extra/yelp/yelp-3.36.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+ app-arch/bzip2:=
+ >=app-arch/xz-utils-4.9:=
+ dev-db/sqlite:3=
+ >=dev-libs/glib-2.38:2
+ >=dev-libs/libxml2-2.6.5:2
+ >=dev-libs/libxslt-1.1.4
+ >=gnome-extra/yelp-xsl-3.27.1
+ >=net-libs/webkit-gtk-2.19.2:4
+ >=x11-libs/gtk+-3.13.3:3
+ x11-themes/adwaita-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-libs/appstream-glib
+ >=dev-util/gtk-doc-am-1.13
+ dev-util/glib-utils
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ # Fix compatibility with Gentoo's sys-apps/man
+ # https://bugzilla.gnome.org/show_bug.cgi?id=648854
+ "${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch # needs eautoreconf
+)
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ --enable-bz2 \
+ --enable-lzma \
+ APPSTREAM_UTIL=$(type -P true)
+}
+
+src_install() {
+ gnome2_src_install
+ exeinto /usr/libexec/
+ doexe "${S}"/libyelp/yelp-groff
+}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 2718d5d9ace6..002306a5a07d 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index 67b522264f29..761fa6643579 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1 +1,2 @@
+DIST libhandy-1.0.2.tar.xz 388756 BLAKE2B c4995c5865378b133ba90125cd2c6c7500730be32b2426ccb323c878c22e556c0aad4eb0a5ab5f6ff936b3132a1717759af826e5bc0c9426b6f6972ac20f4f44 SHA512 411e016e1770ea83507a66e6e751f223304890cd193191c28cf751f8128dc5c98feb5342012596c10219e4da5a2445659395a0e7086d5c9990f7845b0406c685
DIST libhandy-v0.0.13.tar.bz2 394811 BLAKE2B 318c226f20b4d8032e984dbd47b4634e828b922dcbc244e4f3f35b94c38f27ed38427196d553809bb1d6bfa7c4830db5d27701e3595cac8a05b58a27ba4a2472 SHA512 a0918c55c9ac14af223a83db542e7dc815d97c844d1f0830a1bee4bdcdf248d00d049fa90fd2be96265535a68d56de5143ddd9264b5e997a902ac9558d5096f3
diff --git a/gui-libs/libhandy/libhandy-1.0.2.ebuild b/gui-libs/libhandy/libhandy-1.0.2.ebuild
new file mode 100644
index 000000000000..43d30fc4e3fc
--- /dev/null
+++ b/gui-libs/libhandy/libhandy-1.0.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson xdg vala virtualx
+
+DESCRIPTION="Building blocks for modern adaptive GNOME apps"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
+
+LICENSE="LGPL-2.1+"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="examples glade gtk-doc +introspection test +vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.44:2
+ >=x11-libs/gtk+-3.24.1:3[introspection?]
+ glade? ( dev-util/glade:3.10= )
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-libs/libxml2:2
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc
+ app-text/docbook-xml-dtd:4.3 )
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ use vala && vala_src_prepare
+ xdg_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dprofiling=false # -pg passing
+ $(meson_feature introspection)
+ $(meson_use vala vapi)
+ $(meson_use gtk-doc gtk_doc)
+ $(meson_use test tests)
+ $(meson_use examples)
+ $(meson_feature glade glade_catalog)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ virtx meson_src_test
+}
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 9c66b08dd47e..7f7ea2040957 100644
Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ
diff --git a/gui-wm/sway/sway-1.5.1-r1.ebuild b/gui-wm/sway/sway-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..1d2aa6e981d5
--- /dev/null
+++ b/gui-wm/sway/sway-1.5.1-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils meson
+
+DESCRIPTION="i3-compatible Wayland window manager"
+HOMEPAGE="https://swaywm.org"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+ MY_PV=${PV/_rc/-rc}
+ SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X zsh-completion"
+REQUIRED_USE="?? ( elogind systemd )
+ tray? ( || ( elogind systemd ) )"
+
+DEPEND="
+ >=dev-libs/json-c-0.13:0=
+ >=dev-libs/libinput-1.6.0:0=
+ dev-libs/libpcre
+ dev-libs/wayland
+ x11-libs/cairo
+ x11-libs/libxkbcommon
+ x11-libs/pango
+ x11-libs/pixman
+ media-libs/mesa[gles2,libglvnd(+)]
+ elogind? ( >=sys-auth/elogind-239[policykit] )
+ swaybar? ( x11-libs/gdk-pixbuf:2 )
+ swaybg? ( gui-apps/swaybg )
+ swayidle? ( gui-apps/swayidle )
+ swaylock? ( gui-apps/swaylock )
+ systemd? ( >=sys-apps/systemd-239[policykit] )
+ wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
+ X? ( x11-libs/libxcb:0= )
+"
+if [[ ${PV} == 9999 ]]; then
+ DEPEND+="~gui-libs/wlroots-9999:=[elogind=,seatd=,systemd=,X=]"
+else
+ DEPEND+="
+ =gui-libs/wlroots-0.12.0*:=[elogind=,seatd=,systemd=,X=]
+ "
+fi
+RDEPEND="
+ x11-misc/xkeyboard-config
+ ${DEPEND}
+"
+BDEPEND="
+ >=dev-libs/wayland-protocols-1.14
+ >=dev-util/meson-0.53.0
+ virtual/pkgconfig
+"
+if [[ ${PV} == 9999 ]]; then
+ BDEPEND+="man? ( ~app-text/scdoc-9999 )"
+else
+ BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
+fi
+
+src_prepare() {
+ default
+
+ use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
+ -e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
+ use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
+ -e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
+ use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
+ -e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dman-pages=$(usex man enabled disabled)
+ -Dtray=$(usex tray enabled disabled)
+ -Dxwayland=$(usex X enabled disabled)
+ $(meson_use wallpapers default-wallpaper)
+ $(meson_use fish-completion fish-completions)
+ $(meson_use zsh-completion zsh-completions)
+ "-Dbash-completions=true"
+ "-Dwerror=false"
+ )
+
+ if use swaybar; then
+ emesonargs+=("-Dgdk-pixbuf=enabled")
+ else
+ emesonargs+=("-Dgdk-pixbuf=disabled")
+ fi
+
+ meson_src_configure
+}
+
+pkg_preinst() {
+ if ! use systemd && ! use elogind && ! use seatd; then
+ fowners root:0 /usr/bin/sway
+ fperms 4511 /usr/bin/sway
+ fi
+}
+
+pkg_postinst() {
+ if ! use systemd && ! use elogind && ! use seatd; then
+ elog ""
+ elog "If you use ConsoleKit2, remember to launch sway using:"
+ elog "exec ck-launch-session sway"
+ elog ""
+ elog "If your system does not set the XDG_RUNTIME_DIR environment"
+ elog "variable, you must set it manually to run Sway. See wiki"
+ elog "for details: https://wiki.gentoo.org/wiki/Sway"
+ fi
+}
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index ffac4374950d..1d2aa6e981d5 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -34,12 +34,12 @@ DEPEND="
x11-libs/pango
x11-libs/pixman
media-libs/mesa[gles2,libglvnd(+)]
- elogind? ( >=sys-auth/elogind-239 )
+ elogind? ( >=sys-auth/elogind-239[policykit] )
swaybar? ( x11-libs/gdk-pixbuf:2 )
swaybg? ( gui-apps/swaybg )
swayidle? ( gui-apps/swayidle )
swaylock? ( gui-apps/swaylock )
- systemd? ( >=sys-apps/systemd-239 )
+ systemd? ( >=sys-apps/systemd-239[policykit] )
wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
X? ( x11-libs/libxcb:0= )
"
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index cc979016a21f..866c5683fb17 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/k3b/k3b-20.08.3.ebuild b/kde-apps/k3b/k3b-20.08.3.ebuild
index 7187e896a880..cfe5805e1339 100644
--- a/kde-apps/k3b/k3b-20.08.3.ebuild
+++ b/kde-apps/k3b/k3b-20.08.3.ebuild
@@ -66,9 +66,9 @@ DEPEND="
"
RDEPEND="${DEPEND}
app-cdr/cdrdao
+ app-cdr/cdrtools
dev-libs/libburn
media-sound/cdparanoia
- virtual/cdrtools
dvd? (
>=app-cdr/dvd+rw-tools-7
encode? ( media-video/transcode[dvd] )
diff --git a/kde-apps/k3b/k3b-20.12.0.ebuild b/kde-apps/k3b/k3b-20.12.0.ebuild
index 2b788559cf74..dac793b68014 100644
--- a/kde-apps/k3b/k3b-20.12.0.ebuild
+++ b/kde-apps/k3b/k3b-20.12.0.ebuild
@@ -66,9 +66,9 @@ DEPEND="
"
RDEPEND="${DEPEND}
app-cdr/cdrdao
+ app-cdr/cdrtools
dev-libs/libburn
media-sound/cdparanoia
- virtual/cdrtools
dvd? (
>=app-cdr/dvd+rw-tools-7
encode? ( media-video/transcode[dvd] )
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index df13ec7fe342..db2c9491ae65 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/kdav/kdav-5.77.0.ebuild b/kde-frameworks/kdav/kdav-5.77.0-r1.ebuild
similarity index 98%
rename from kde-frameworks/kdav/kdav-5.77.0.ebuild
rename to kde-frameworks/kdav/kdav-5.77.0-r1.ebuild
index 8b3627220883..6225b8738794 100644
--- a/kde-frameworks/kdav/kdav-5.77.0.ebuild
+++ b/kde-frameworks/kdav/kdav-5.77.0-r1.ebuild
@@ -12,7 +12,6 @@ inherit ecm kde.org
DESCRIPTION="DAV protocol implemention with KJobs"
LICENSE="LGPL-2+"
-SLOT="5"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
IUSE=""
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.77.0-add-dptr-to-cache.patch b/kde-frameworks/knewstuff/files/knewstuff-5.77.0-add-dptr-to-cache.patch
new file mode 100644
index 000000000000..f6547fc6e5ff
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-5.77.0-add-dptr-to-cache.patch
@@ -0,0 +1,135 @@
+From 243ea6155b28457c8b1441fee8ab1037828d21ba Mon Sep 17 00:00:00 2001
+From: Dan Leinir Turthra Jensen
+Date: Mon, 14 Dec 2020 21:11:51 +0000
+Subject: [PATCH] Add a dptr to Cache, and move the throttle timer there to fix
+ crash
+
+Previously, the throttle timer was a raw static, but it was also a parented qobject, which means that when the cache was deleted, so was the timer, but the variable was not reset. Consequently, things would crash left and right later on. So, to alleviate this, and hopefully avoid future issues, introduce a dptr, stick the timer there, and move the logic to that private class as well.
+
+BUG:429442
+
+FIXED-IN:5.78
+---
+ src/core/cache.cpp | 41 ++++++++++++++++++++++++++++++-----------
+ src/core/cache.h | 7 +++++--
+ 2 files changed, 35 insertions(+), 13 deletions(-)
+
+diff --git a/src/core/cache.cpp b/src/core/cache.cpp
+index 0395045c..ace7be4e 100644
+--- a/src/core/cache.cpp
++++ b/src/core/cache.cpp
+@@ -11,17 +11,42 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+ #include
+
++class KNSCore::CachePrivate {
++public:
++ CachePrivate(Cache* qq)
++ : q(qq)
++ {}
++ ~CachePrivate() {}
++
++ Cache* q;
++ QHash requestCache;
++
++ QPointer throttleTimer;
++ void throttleWrite() {
++ if (!throttleTimer) {
++ throttleTimer = new QTimer(q);
++ QObject::connect(throttleTimer, &QTimer::timeout, q, [this](){ q->writeRegistry(); });
++ throttleTimer->setSingleShot(true);
++ throttleTimer->setInterval(1000);
++ }
++ throttleTimer->start();
++ }
++};
++
+ using namespace KNSCore;
+
+ typedef QHash > CacheHash;
+ Q_GLOBAL_STATIC(CacheHash, s_caches)
+
+-Cache::Cache(const QString &appName): QObject(nullptr)
++Cache::Cache(const QString &appName)
++ : QObject(nullptr)
++ , d(new CachePrivate(this))
+ {
+ m_kns2ComponentName = appName;
+
+@@ -280,36 +305,30 @@ void Cache::registerChangedEntry(const KNSCore::EntryInternal &entry)
+ if (entry.status() == KNS3::Entry::Updating || entry.status() == KNS3::Entry::Installing) {
+ return;
+ }
+- static QTimer* writeThrottle{nullptr};
+- if (!writeThrottle) {
+- writeThrottle = new QTimer(this);
+- connect(writeThrottle, &QTimer::timeout, this, [this](){ writeRegistry(); });
+- writeThrottle->setInterval(1000);
+- }
+ if (!property("reloadingRegistry").toBool()) {
+ setProperty("dirty", true);
+ cache.remove(entry); // If value already exists in the set, the set is left unchanged
+ cache.insert(entry);
+- writeThrottle->start();
++ d->throttleWrite();
+ }
+ }
+
+ void Cache::insertRequest(const KNSCore::Provider::SearchRequest &request, const KNSCore::EntryInternal::List &entries)
+ {
+ // append new entries
+- auto &cacheList = requestCache[request.hashForRequest()];
++ auto &cacheList = d->requestCache[request.hashForRequest()];
+ for (const auto &entry : entries) {
+ if (!cacheList.contains(entry)) {
+ cacheList.append(entry);
+ }
+ }
+- qCDebug(KNEWSTUFFCORE) << request.hashForRequest() << " add: " << entries.size() << " keys: " << requestCache.keys();
++ qCDebug(KNEWSTUFFCORE) << request.hashForRequest() << " add: " << entries.size() << " keys: " << d->requestCache.keys();
+ }
+
+ EntryInternal::List Cache::requestFromCache(const KNSCore::Provider::SearchRequest &request)
+ {
+ qCDebug(KNEWSTUFFCORE) << request.hashForRequest();
+- return requestCache.value(request.hashForRequest());
++ return d->requestCache.value(request.hashForRequest());
+ }
+
+ void KNSCore::Cache::removeDeletedEntries()
+diff --git a/src/core/cache.h b/src/core/cache.h
+index 06e95ab4..73ea7c61 100644
+--- a/src/core/cache.h
++++ b/src/core/cache.h
+@@ -16,9 +16,11 @@
+
+ #include "knewstuffcore_export.h"
+
++#include
++
+ namespace KNSCore
+ {
+-
++class CachePrivate;
+ class KNEWSTUFFCORE_EXPORT Cache : public QObject
+ {
+ Q_OBJECT
+@@ -99,7 +101,8 @@ private:
+ QString m_kns2ComponentName;
+
+ QSet cache;
+- QHash requestCache;
++
++ std::unique_ptr d;
+ };
+
+ }
+--
+GitLab
+
diff --git a/kde-frameworks/knewstuff/knewstuff-5.77.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.77.0-r1.ebuild
similarity index 93%
rename from kde-frameworks/knewstuff/knewstuff-5.77.0.ebuild
rename to kde-frameworks/knewstuff/knewstuff-5.77.0-r1.ebuild
index 96d2ca852d9f..59ba609ab98f 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.77.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.77.0-r1.ebuild
@@ -38,3 +38,5 @@ DEPEND="
RDEPEND="${DEPEND}
>=kde-frameworks/kirigami-${PVCUT}:5
"
+
+PATCHES=( "${FILESDIR}/${P}-add-dptr-to-cache.patch" ) # KDE-bug 429442
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index ed22dfcaa319..88b87dcea865 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,2 +1,3 @@
+DIST plasma-5.77.0-fix-broken-background.patch.xz 3732 BLAKE2B 19c656de212e3b2162e5f43e6ee2aface46d9169169179b6ac8af3eee01e64ec54139ac0001a6009f2a6d3cc4a59775951a3e10e8c33c7d04bf2b78543564137 SHA512 a262bebc754102709d1b41a2e5571938e58bfbcfd027dce9d0c1dd5cbdb8adee44a1c18b716976dc36d7f55b1d7e16d0536615e9f2895fa62eebb5f08cf05098
DIST plasma-framework-5.74.0.tar.xz 3140648 BLAKE2B dfc8df92d351446a146204f48c42cd4d6325f2652b5b61e0a530b27763fb3b6f07bf14319c86a54f933a58329d214977545e00f261cc784c0d8659eebd8cddb0 SHA512 7aae44d94a175dcdbd779a6801626d20e8d986597d1d05c82c5c035997b874ebb9b4412191e1fa7a26aa4e045ceaf22a7ef359d3e817d812357d51219eb5fb46
DIST plasma-framework-5.77.0.tar.xz 3152748 BLAKE2B 717d620fd5249887d47bbc6ed8ec42f103b56c4e566b0baae3624e64403b48977b5d36ebdbb30b52ae6cbec7694645050cf76eceaf6ab28c3690bcafcf8c7a07 SHA512 abcbb0b5bf063cdda728b0fc03f0d51f0ad84b4c45fb428efe54556aeb27b4cc3c488244ba0f7e3a435c31e802551d09f758bde815ca0a5aa43cf18e916d1ea4
diff --git a/kde-frameworks/plasma/plasma-5.77.0.ebuild b/kde-frameworks/plasma/plasma-5.77.0-r1.ebuild
similarity index 91%
rename from kde-frameworks/plasma/plasma-5.77.0.ebuild
rename to kde-frameworks/plasma/plasma-5.77.0-r1.ebuild
index 3e2958b66620..298dcdf54342 100644
--- a/kde-frameworks/plasma/plasma-5.77.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.77.0-r1.ebuild
@@ -10,6 +10,7 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Plasma framework"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-fix-broken-background.patch.xz"
LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
@@ -61,6 +62,8 @@ DEPEND="${RDEPEND}
RESTRICT+=" test"
+PATCHES=( "${WORKDIR}/${P}-fix-broken-background.patch" ) # KDE-bug 430390
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package !gles2-only OpenGL)
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 2149e841c622..cbf6385c1cc8 100644
Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ
diff --git a/kde-misc/krename/files/krename-5.0.1-no-kjs.patch b/kde-misc/krename/files/krename-5.0.1-no-kjs.patch
new file mode 100644
index 000000000000..f4b7eb786890
--- /dev/null
+++ b/kde-misc/krename/files/krename-5.0.1-no-kjs.patch
@@ -0,0 +1,519 @@
+From 407b612a93128b9f935a686d5ff82c7ee06087f5 Mon Sep 17 00:00:00 2001
+From: Harald Sitter
+Date: Thu, 17 Dec 2020 13:19:56 +0100
+Subject: [PATCH 1/5] reduce nesting
+
+easier on the eyes
+---
+ src/scriptplugin.cpp | 63 +++++++++++++++++++++++---------------------
+ 1 file changed, 33 insertions(+), 30 deletions(-)
+
+diff --git a/src/scriptplugin.cpp b/src/scriptplugin.cpp
+index 0790fd4..8f4b11e 100644
+--- a/src/scriptplugin.cpp
++++ b/src/scriptplugin.cpp
+@@ -175,36 +175,39 @@ void ScriptPlugin::initKRenameVars(const KRenameFile &file, int index)
+ file.srcDirectory());
+
+ // User definitions, set them only on first file
+- if (index == 0) {
+- for (int i = 0; i < m_widget->listVariables->topLevelItemCount(); i++) {
+- // TODO, we have to know the type of the variable!
+- QTreeWidgetItem *item = m_widget->listVariables->topLevelItem(i);
+- if (item) {
+- EVarType eVarType = static_cast(item->data(1, Qt::UserRole).toInt());
+- const QString &name = item->text(0);
+- const QString &value = item->text(1);
+- switch (eVarType) {
+- default:
+- case eVarType_String:
+- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+- name, value.toUtf8().data());
+- break;
+- case eVarType_Int:
+- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+- name, value.toInt());
+- break;
+- case eVarType_Double:
+- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+- name, value.toDouble());
+- break;
+- case eVarType_Bool:
+- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+- name,
+- (value.toLower() == "true" ? true : false));
+- break;
+-
+- }
+- }
++ if (index != 0) {
++ return;
++ }
++
++ for (int i = 0; i < m_widget->listVariables->topLevelItemCount(); i++) {
++ // TODO, we have to know the type of the variable!
++ QTreeWidgetItem *item = m_widget->listVariables->topLevelItem(i);
++ if (!item) {
++ continue;
++ }
++
++ EVarType eVarType = static_cast(item->data(1, Qt::UserRole).toInt());
++ const QString &name = item->text(0);
++ const QString &value = item->text(1);
++ switch (eVarType) {
++ default:
++ case eVarType_String:
++ m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
++ name, value.toUtf8().data());
++ break;
++ case eVarType_Int:
++ m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
++ name, value.toInt());
++ break;
++ case eVarType_Double:
++ m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
++ name, value.toDouble());
++ break;
++ case eVarType_Bool:
++ m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
++ name,
++ (value.toLower() == "true" ? true : false));
++ break;
+ }
+ }
+ }
+--
+2.29.2
+
+
+From f80de4b81846da45c4cc16c585a159872dcc2c29 Mon Sep 17 00:00:00 2001
+From: Harald Sitter
+Date: Thu, 17 Dec 2020 13:24:37 +0100
+Subject: [PATCH 2/5] don't needlessly use qpointer
+
+for one it has no value, scopedpointer might. we don't need a pointer
+at all though, simply put qdialog on the stack and let the compiler
+take care of it
+---
+ src/scriptplugin.cpp | 44 ++++++++++++++++++++++----------------------
+ 1 file changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/src/scriptplugin.cpp b/src/scriptplugin.cpp
+index 8f4b11e..fec61e7 100644
+--- a/src/scriptplugin.cpp
++++ b/src/scriptplugin.cpp
+@@ -28,7 +28,6 @@
+ #include
+ #include
+ #include
+-#include
+ #include
+ #include
+ #include
+@@ -228,7 +227,7 @@ void ScriptPlugin::slotEnableControls()
+
+ void ScriptPlugin::slotAdd()
+ {
+- QPointer dialog = new QDialog();
++ QDialog dialog;
+ Ui::ScriptPluginDialog dlg;
+
+ QStringList types;
+@@ -238,32 +237,33 @@ void ScriptPlugin::slotAdd()
+ types << i18n("Double");
+ types << i18n("Boolean");
+
+- dlg.setupUi(dialog);
++ dlg.setupUi(&dialog);
+ dlg.comboType->addItems(types);
+
+- if (dialog->exec() == QDialog::Accepted) {
+- QString name = dlg.lineName->text();
+- QString value = dlg.lineValue->text();
++ if (dialog.exec() != QDialog::Accepted) {
++ return;
++ }
+
+- // Build a Java script statement
+- QString script = name + " = " + value + ';';
++ QString name = dlg.lineName->text();
++ QString value = dlg.lineValue->text();
+
+- KJSInterpreter interpreter;
+- KJSResult result = m_interpreter->evaluate(script, nullptr);
+- if (result.isException()) {
+- KMessageBox::error(m_parent,
+- i18n("A JavaScript error has occurred: ") +
+- result.errorMessage(), this->name());
+- } else {
+- QTreeWidgetItem *item = new QTreeWidgetItem();
+- item->setText(0, name);
+- item->setText(1, value);
+- item->setData(1, Qt::UserRole, QVariant(dlg.comboType->currentIndex()));
++ // Build a Java script statement
++ QString script = name + " = " + value + ';';
+
+- m_widget->listVariables->addTopLevelItem(item);
+- }
++ KJSInterpreter interpreter;
++ KJSResult result = m_interpreter->evaluate(script, nullptr);
++ if (result.isException()) {
++ KMessageBox::error(m_parent,
++ i18n("A JavaScript error has occurred: ") +
++ result.errorMessage(), this->name());
++ } else {
++ QTreeWidgetItem *item = new QTreeWidgetItem();
++ item->setText(0, name);
++ item->setText(1, value);
++ item->setData(1, Qt::UserRole, QVariant(dlg.comboType->currentIndex()));
++
++ m_widget->listVariables->addTopLevelItem(item);
+ }
+- delete dialog;
+ }
+
+ void ScriptPlugin::slotRemove()
+--
+2.29.2
+
+
+From 5979b30da5b385008894ff5577da917dd888959e Mon Sep 17 00:00:00 2001
+From: Harald Sitter
+Date: Thu, 17 Dec 2020 13:32:41 +0100
+Subject: [PATCH 3/5] fix dangerously implicit int->int->enum mapping
+
+the type order in the qstringlist was implicitly the int values of the
+type enum. incredibly scary. instead push the items into the combobox
+along with their enum value as Qt::UserRole and then pass that along.
+this ensures (kind of) that the int we cast back to enum in
+initKRenameVars will be an actual enum value
+---
+ src/scriptplugin.cpp | 15 ++++++---------
+ 1 file changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/src/scriptplugin.cpp b/src/scriptplugin.cpp
+index fec61e7..1933bc6 100644
+--- a/src/scriptplugin.cpp
++++ b/src/scriptplugin.cpp
+@@ -4,6 +4,7 @@
+ begin : Fri Nov 9 2007
+ copyright : (C) 2007 by Dominik Seichter
+ email : domseichter@web.de
++ copyright : (C) 2020 by Harald Sitter
+ ***************************************************************************/
+
+ /***************************************************************************
+@@ -230,15 +231,11 @@ void ScriptPlugin::slotAdd()
+ QDialog dialog;
+ Ui::ScriptPluginDialog dlg;
+
+- QStringList types;
+-
+- types << i18n("String");
+- types << i18n("Int");
+- types << i18n("Double");
+- types << i18n("Boolean");
+-
+ dlg.setupUi(&dialog);
+- dlg.comboType->addItems(types);
++ dlg.comboType->addItem(i18n("String"), eVarType_String);
++ dlg.comboType->addItem(i18n("Int"), eVarType_Int);
++ dlg.comboType->addItem(i18n("Double"), eVarType_Double);
++ dlg.comboType->addItem(i18n("Boolean"), eVarType_Bool);
+
+ if (dialog.exec() != QDialog::Accepted) {
+ return;
+@@ -260,7 +257,7 @@ void ScriptPlugin::slotAdd()
+ QTreeWidgetItem *item = new QTreeWidgetItem();
+ item->setText(0, name);
+ item->setText(1, value);
+- item->setData(1, Qt::UserRole, QVariant(dlg.comboType->currentIndex()));
++ item->setData(1, Qt::UserRole, dlg.comboType->currentData());
+
+ m_widget->listVariables->addTopLevelItem(item);
+ }
+--
+2.29.2
+
+
+From 82161c323b7b0d4b77602551923118f304c5c536 Mon Sep 17 00:00:00 2001
+From: Harald Sitter
+Date: Thu, 17 Dec 2020 15:05:49 +0100
+Subject: [PATCH 4/5] port away from stringy QMenu::addAction to functor based
+ API
+
+was introdcued in 5.6 so is fine to use and loads safer
+---
+ src/previewlist.cpp | 8 ++++----
+ src/progressdialog.cpp | 8 ++++----
+ src/scriptplugin.cpp | 10 +++++-----
+ 3 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/src/previewlist.cpp b/src/previewlist.cpp
+index df8097b..0d3ccb6 100644
+--- a/src/previewlist.cpp
++++ b/src/previewlist.cpp
+@@ -28,12 +28,12 @@ PreviewList::PreviewList(QWidget *parent)
+ : QTreeView(parent), m_model(nullptr)
+ {
+ m_menu = new QMenu("KRename", this); // we need any text here so that we have a title
+- m_menu->addAction(i18n("&Change filename manually..."), this, SLOT(slotManually()), QKeySequence("F2"));
++ m_menu->addAction(i18n("&Change filename manually..."), this, &PreviewList::slotManually, QKeySequence("F2"));
+ m_menu->addSeparator();
+- m_menu->addAction(i18n("&Open"), this, SLOT(slotOpen()));
++ m_menu->addAction(i18n("&Open"), this, &PreviewList::slotOpen);
+ m_menu->addSeparator();
+- m_menu->addAction(i18n("&Add..."), this, SIGNAL(addFiles()));
+- m_menu->addAction(i18n("&Remove"), this, SLOT(slotRemove()));
++ m_menu->addAction(i18n("&Add..."), this, &PreviewList::addFiles);
++ m_menu->addAction(i18n("&Remove"), this, &PreviewList::slotRemove);
+
+ connect(this, &PreviewList::activated, this, &PreviewList::slotManually);
+ }
+diff --git a/src/progressdialog.cpp b/src/progressdialog.cpp
+index 4eaaf1a..d217614 100644
+--- a/src/progressdialog.cpp
++++ b/src/progressdialog.cpp
+@@ -49,11 +49,11 @@ ProgressDialog::ProgressDialog(ESplitMode eSplitMode, unsigned int dot, QWidget
+ qApp, &QApplication::quit, Qt::QueuedConnection);
+
+ QMenu *menu = new QMenu(this);
+- menu->addAction(i18n("Restart &KRename..."), this, SLOT(slotRestartKRename()));
++ menu->addAction(i18n("Restart &KRename..."), this, &ProgressDialog::slotRestartKRename);
+ menu->addSeparator();
+- m_actProcessed = menu->addAction(i18n("Rename Processed Files &Again..."), this, SLOT(slotRenameProcessedAgain()));
+- m_actUnprocessed = menu->addAction(i18n("Rename &Unprocessed Files Again..."), this, SLOT(slotRenameUnprocessedAgain()));
+- menu->addAction(i18n("&Rename All Files Again..."), this, SLOT(slotRenameAllAgain()));
++ m_actProcessed = menu->addAction(i18n("Rename Processed Files &Again..."), this, &ProgressDialog::slotRenameProcessedAgain);
++ m_actUnprocessed = menu->addAction(i18n("Rename &Unprocessed Files Again..."), this, &ProgressDialog::slotRenameUnprocessedAgain);
++ menu->addAction(i18n("&Rename All Files Again..."), this, &ProgressDialog::slotRenameAllAgain);
+
+ m_buttonMore->setMenu(menu);
+ }
+diff --git a/src/scriptplugin.cpp b/src/scriptplugin.cpp
+index 1933bc6..46b27ca 100644
+--- a/src/scriptplugin.cpp
++++ b/src/scriptplugin.cpp
+@@ -68,11 +68,11 @@ ScriptPlugin::ScriptPlugin(PluginLoader *loader)
+
+ m_help.append("[js;4+5];;" + i18n("Insert a snippet of JavaScript code (4+5 in this case)"));
+
+- m_menu->addAction(i18n("Index of the current file"), this, SLOT(slotInsertIndex()));
+- m_menu->addAction(i18n("URL of the current file"), this, SLOT(slotInsertUrl()));
+- m_menu->addAction(i18n("Filename of the current file"), this, SLOT(slotInsertFilename()));
+- m_menu->addAction(i18n("Extension of the current file"), this, SLOT(slotInsertExtension()));
+- m_menu->addAction(i18n("Directory of the current file"), this, SLOT(slotInsertDirectory()));
++ m_menu->addAction(i18n("Index of the current file"), this, &ScriptPlugin::slotInsertIndex);
++ m_menu->addAction(i18n("URL of the current file"), this, &ScriptPlugin::slotInsertUrl);
++ m_menu->addAction(i18n("Filename of the current file"), this, &ScriptPlugin::slotInsertFilename);
++ m_menu->addAction(i18n("Extension of the current file"), this, &ScriptPlugin::slotInsertExtension);
++ m_menu->addAction(i18n("Directory of the current file"), this, &ScriptPlugin::slotInsertDirectory);
+ }
+
+ ScriptPlugin::~ScriptPlugin()
+--
+2.29.2
+
+
+From e0a93830d0ea0c71ab649b7e68af0238bd48eb10 Mon Sep 17 00:00:00 2001
+From: Harald Sitter
+Date: Thu, 17 Dec 2020 13:45:07 +0100
+Subject: [PATCH 5/5] port from deprecated kjs to qjsengine
+
+for kf6 todo https://phabricator.kde.org/T11604
+
+kjs is deprecated and we want to move away from it. this ports to
+qjsengine which does what we need for krename just fine and is also
+supported in qt6 still
+
+all use cases of the js plugin still seem to work fine. variable
+definition, function definition and using either in the replacement.
+same for the implicit global variables.
+---
+ CMakeLists.txt | 2 +-
+ src/CMakeLists.txt | 2 +-
+ src/scriptplugin.cpp | 55 ++++++++++++++------------------------------
+ src/scriptplugin.h | 6 +++--
+ 4 files changed, 23 insertions(+), 42 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2b39e18..e1673e1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,7 +17,7 @@ include(FeatureSummary)
+ include(KDECompilerSettings NO_POLICY_SCOPE)
+ include(FeatureSummary)
+
+-find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
++find_package(Qt5 REQUIRED COMPONENTS Core Qml Widgets)
+ find_package(KF5 REQUIRED COMPONENTS
+ Completion
+ Config
+@@ -27,7 +27,6 @@ find_package(KF5 REQUIRED COMPONENTS
+ IconThemes
+ ItemViews
+ JobWidgets
+- JS
+ KIO
+ Service
+ WidgetsAddons
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3f262b3..bee7378 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -128,9 +128,9 @@ target_link_libraries(krename
+ KF5::KIOCore
+ KF5::KIOFileWidgets
+ KF5::I18n
+- KF5::JSApi
+ KF5::IconThemes
+ Qt5::Widgets
++ Qt5::Qml
+ )
+ if(TAGLIB_FOUND)
+ target_link_libraries(krename
+diff --git a/src/scriptplugin.cpp b/src/scriptplugin.cpp
+index d7f7125..651e656 100644
+--- a/src/scriptplugin.cpp
++++ b/src/scriptplugin.cpp
+@@ -18,8 +18,7 @@
+ #include
+ #include
+ #include
+-
+-#include
++#include
+
+ #include "ui_scriptplugindialog.h"
+ #include "ui_scriptpluginwidget.h"
+@@ -46,7 +45,6 @@ ScriptPlugin::ScriptPlugin(PluginLoader *loader)
+ {
+ m_name = i18n("JavaScript Plugin");
+ m_icon = "applications-development";
+- m_interpreter = new KJSInterpreter();
+ m_menu = new QMenu();
+ m_widget = new Ui::ScriptPluginWidget();
+
+@@ -65,7 +63,6 @@ ScriptPlugin::~ScriptPlugin()
+ {
+ delete m_widget;
+ delete m_menu;
+- delete m_interpreter;
+ }
+
+ QString ScriptPlugin::processFile(BatchRenamer *b, int index,
+@@ -90,13 +87,13 @@ QString ScriptPlugin::processFile(BatchRenamer *b, int index,
+ // Make sure definitions are executed first
+ script = definitions + '\n' + script;
+
+- KJSResult result = m_interpreter->evaluate(script, nullptr);
+- if (result.isException()) {
+- qDebug("JavaScript Error: %s", result.errorMessage().toUtf8().data());
++ const QJSValue result = m_engine.evaluate(script);
++ if (result.isError()) {
++ qDebug() << "JavaScript Error:" << result.toString();
+ return QString();
+ }
+
+- return result.value().toString(m_interpreter->globalContext());
++ return result.toString();
+ }
+
+ return QString();
+@@ -144,21 +141,11 @@ void ScriptPlugin::createUI(QWidget *parent) const
+ void ScriptPlugin::initKRenameVars(const KRenameFile &file, int index)
+ {
+ // KRename definitions
+- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+- ScriptPlugin::s_pszVarNameIndex,
+- index);
+- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+- ScriptPlugin::s_pszVarNameUrl,
+- file.srcUrl().url());
+- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+- ScriptPlugin::s_pszVarNameFilename,
+- file.srcFilename());
+- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+- ScriptPlugin::s_pszVarNameExtension,
+- file.srcExtension());
+- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+- ScriptPlugin::s_pszVarNameDirectory,
+- file.srcDirectory());
++ m_engine.globalObject().setProperty(ScriptPlugin::s_pszVarNameIndex, index);
++ m_engine.globalObject().setProperty(ScriptPlugin::s_pszVarNameUrl, file.srcUrl().url());
++ m_engine.globalObject().setProperty(ScriptPlugin::s_pszVarNameFilename, file.srcFilename());
++ m_engine.globalObject().setProperty(ScriptPlugin::s_pszVarNameExtension, file.srcExtension());
++ m_engine.globalObject().setProperty(ScriptPlugin::s_pszVarNameDirectory, file.srcDirectory());
+
+ // User definitions, set them only on first file
+ if (index != 0) {
+@@ -178,21 +165,16 @@ void ScriptPlugin::initKRenameVars(const KRenameFile &file, int index)
+ switch (eVarType) {
+ default:
+ case eVarType_String:
+- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+- name, value.toUtf8().data());
++ m_engine.globalObject().setProperty(name, value);
+ break;
+ case eVarType_Int:
+- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+- name, value.toInt());
++ m_engine.globalObject().setProperty(name, value.toInt());
+ break;
+ case eVarType_Double:
+- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+- name, value.toDouble());
++ m_engine.globalObject().setProperty(name, value.toDouble());
+ break;
+ case eVarType_Bool:
+- m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+- name,
+- (value.toLower() == "true" ? true : false));
++ m_engine.globalObject().setProperty(name, (value.toLower() == "true" ? true : false));
+ break;
+ }
+ }
+@@ -233,12 +215,9 @@ void ScriptPlugin::slotAdd()
+ // Build a Java script statement
+ QString script = name + " = " + value + ';';
+
+- KJSInterpreter interpreter;
+- KJSResult result = m_interpreter->evaluate(script, nullptr);
+- if (result.isException()) {
+- KMessageBox::error(m_parent,
+- i18n("A JavaScript error has occurred: ") +
+- result.errorMessage(), this->name());
++ const QJSValue result = m_engine.evaluate(script);
++ if (result.isError()) {
++ KMessageBox::error(m_parent, i18n("A JavaScript error has occurred: ") + result.toString(), this->name());
+ } else {
+ QTreeWidgetItem *item = new QTreeWidgetItem();
+ item->setText(0, name);
+diff --git a/src/scriptplugin.h b/src/scriptplugin.h
+index 367310b..f91e79b 100644
+--- a/src/scriptplugin.h
++++ b/src/scriptplugin.h
+@@ -3,9 +3,10 @@
+
+ #include "plugin.h"
+
++#include
++
+ class QMenu;
+
+-class KJSInterpreter;
+ class KRenameFile;
+
+ namespace Ui
+@@ -171,7 +173,7 @@ private:
+
+ QStringList m_keys;
+ QStringList m_help;
+- KJSInterpreter *m_interpreter;
++ QJSEngine m_engine;
+ QWidget *m_parent;
+ QMenu *m_menu;
+
+--
+2.29.2
+
diff --git a/kde-misc/krename/krename-5.0.1-r1.ebuild b/kde-misc/krename/krename-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..168940d1e283
--- /dev/null
+++ b/kde-misc/krename/krename-5.0.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.70.0
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Powerful batch file renamer"
+HOMEPAGE="https://apps.kde.org/en/krename https://userbase.kde.org/KRename"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="exif pdf taglib truetype"
+
+BDEPEND="sys-devel/gettext"
+DEPEND="
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ exif? ( media-gfx/exiv2:= )
+ pdf? ( app-text/podofo:= )
+ taglib? ( media-libs/taglib )
+ truetype? ( media-libs/freetype:2 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-no-kjs.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package exif LibExiv2)
+ $(cmake_use_find_package pdf PoDoFo)
+ $(cmake_use_find_package taglib Taglib)
+ $(cmake_use_find_package truetype Freetype)
+ )
+ ecm_src_configure
+}
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index ad5e6fdde7ee..4bdb1afa1dc9 100644
Binary files a/licenses/Manifest.gz and b/licenses/Manifest.gz differ
diff --git a/licenses/Mendeley-terms b/licenses/Mendeley-terms
deleted file mode 100644
index e4e3e32c463c..000000000000
--- a/licenses/Mendeley-terms
+++ /dev/null
@@ -1,220 +0,0 @@
-TERMS OF USE
-
-These terms (“Terms of Use”) apply to the use of our website at http://www.mendeley.com (the "Site"), and our software (the "Software") downloaded from the Site (collectively, the “Services”). Please read these Terms of Use carefully before you start to use the Services. These Terms of Use include the Site’s privacy policy, Copyright and Intellectual Property Policy and any additional terms or product requirements applicable to the Services you use. By using our Services, you are agreeing to these Terms of Use.
-
-We may revise these Terms of Use at any time by amending this page. You are expected to check this page from time to time to take notice of any changes we make, as they are binding on you.
-
-
-1. INFORMATION ABOUT US
-
-1.1. The Services are provided by Mendeley Limited ("we", "us" and "our"). We are registered in England and Wales under company number 6419015 and have our registered office at White Bear Yard, 144a Clerkenwell Road, London, EC1R 5DF, United Kingdom. Our VAT number is 494 6272 12.
-
-
-2. PURPOSE
-
-2.1. The principal purposes of the Services are to:
-
-2.1.1. assist you in the cataloguing and managing of your academic papers and articles ("Academic Papers");
-
-2.1.2. share your academic and scientific knowledge with selected colleagues;
-
-2.1.3. discover academic knowledge and enable detailed search of academic papers;
-
-2.1.4. put you in touch with like-minded people and facilitate research projects;
-
-2.1.5. provide data and analytics to help monitor, guide and facilitate the research being undertaken across your institution.
-
-
-3. ACCESSING OUR SITE
-
-3.1. We restrict access to certain parts of our Site to users who have registered with us. If you register with us, you must provide true and accurate information about yourself. Should the registration information provided prove false or misleading (including your personal details), we may suspend or terminate your account.
-
-3.2. We restrict access to the Mendeley Institutional Edition portion of our Site to users who are covered by their institution’s license agreement granting such access, if any. If you are covered by such license agreement, additional terms detailed therein govern your use of the Services.
-
-3.3. If you choose a password or any other piece of information as part of our security procedures, you must take reasonable steps to keep such information confidential and secure, and you must not disclose it to any third party. We have the right to disable any account or password, if in our reasonable opinion, your account information has been compromised. You must tell us immediately if you become aware of or suspect any unauthorised use of your account or access to your password.
-
-
-4. OUR SOFTWARE
-
-4.1. We hereby grant to you a non-exclusive, personal, non-transferable license, in accordance with these Terms of Use, to:
-
-4.1.1. download, install and use the Software for the purposes of cataloguing and managing your Academic Papers, including making a back-up copy of your Academic Papers;
-
-4.1.2. distribute the Software so that other users may install and use the Software for the purposes of cataloguing and managing their Academic Papers; and
-
-4.1.3. make a copy of the Software for back-up purposes.
-
-4.2. When you download our Software and connect it to a Mendeley web account by entering your account details, our Software collects (even while you are offline) certain data which is uploaded to our servers when you synchronize your Software and Mendeley web account, specifically, data relating to:
-
-4.2.1. Academic Papers such as the author name, title and keywords for the purpose of assisting in the:
-
-
- cataloguing of your and other user's Academic Papers;
- indexing of academic articles and materials;
- searching of the indexed academic articles and materials;
- improving the document recognition process for all users;
-
-4.2.2. reading, cataloguing and accessing your Academic Papers for the purpose of:
-
-
- generating recommendations for you including articles that you may be interested in reading and these recommendations are displayed in your private account;
- preparing individualized statistical information which will only be made available to you via your account; and
- generating anonymous aggregate statistical information regarding the interests, habits and reading patterns of all users and/or certain sub-groups of our users such as all users at your institution.
-
-4.3. Except as we permit in these Terms of Use or as permitted by any local law, you undertake:
-
-4.3.1. to use our Software only in accordance with the Terms of Use;
-
-4.3.2. not to copy, rent, lease, sub-license, loan, translate, merge, adapt, vary or modify the whole or any part of our Software, nor permit our Software or any part of it to be combined with, or become incorporated in, any other programs (though you may contact us at office [at] mendeley [dot] com to seek a written permission from us to do so);
-
-4.3.3. not to disassemble, decompile, reverse engineer or create derivative works based on the whole or any part of our Software nor attempt to do any such thing except to the extent that such actions cannot be prohibited by law;
-
-4.3.4. not to remove or alter our (or our licensors’) copyright or other proprietary notice on our Software.
-
-4.4. Save for the Content (as defined below), you acknowledge that we are the owner of or the licensee of all intellectual property rights in our Site and in the material published on it, including the Software, and that you have no rights in or to our Software other than the right to use the Software in accordance with these Terms of Use.
-
-
-5. INTERACTIVE AND SOCIAL NETWORKING SERVICES
-
-5.1. We may from time to time provide interactive services on our Site, including, without limitation:
-
-5.1.1. forums for discussion of issues of interest to users and members of our Site;
-
-5.1.2. wikis for users and members to share and collaborate on knowledge relating to issues of mutual interest;
-
-5.1.3. social networking services where registered members can: (i) create online personal profiles; and (ii) interact with other members;
-
-5.1.4. facilities for the uploading and sharing of users' and members' Academic Papers with other users or private user groups you have created;
-
-5.1.5. generation of statistics and recommendations.
-
-5.2. We do not oversee, monitor or moderate the content that you upload to our Site using our interactive services and neither do we vet or screen users of our Site.
-
-
-6. ACCEPTABLE USE
-
-6.1. You may use our Services only for lawful purposes. Accordingly, you may only post versions of Academic Papers or other Content (as defined below) on the Site if you have the right to do so. By way of example, while many journal publishers permit posting of some versions of Academic Papers, most journals restrict the sharing of final versions. To be sure you have the right to upload such content, you should review your publishing agreement, the publisher’s copyright policies, and/or any other applicable information prior to posting any version of an Academic Paper.
-
-6.2. "Content" shall mean any material you post on or through the Site, including, without limitation, Academic Papers and any comments on forums, wikis, personal profiles and communications with members. By using the Site and posting any Content, you permit us to extract metadata and convert to PDF form, for indexing and improved searchability purposes only, any such Content that you post or upload to the Site. We do not claim any ownership rights in your or any other user’s Content. After posting or uploading your Content to the Site, except for the permissions granted to us hereunder, you continue to retain all your rights in such Content.
-
-6.3. By posting your Content you represent and warrant that: (i) your Content is original to you and/or is licensed and fully cleared to permit us to use such Content as contemplated herein; (ii) your Content was produced in compliance with all applicable laws and regulations; (iii) your Content does and will not, in any way, violate or breach any of these Terms of Use; (iv) your Content does not contain libelous, tortious, or otherwise unlawful information, infringe or violate any copyright or other right, or contain any matter the publication or sale of which will violate any federal or state statute or regulation; (v) your Content is not obscene or in any other manner unlawful; (vi) your Content shall not be injurious to the health of any user; and (vii) we shall not be required to pay or incur any sums to any person or entity as a result of our use or exploitation of your Content.
-
-6.4. You may not use our Services:
-
-6.4.1. to send, knowingly receive, upload, download, use or re-use any Academic Papers without authorization. You may perform these actions only if you are the copyright owner, have the copyright owner’s permission, are permitted to do so under your publishing agreement or your institution’s license agreement or under license from an Open Access database or under a Creative Commons license.
-
-6.4.2. in any way that breaches any applicable local, national or international law or regulation;
-
-6.4.3. in any way that is unlawful or fraudulent, or that advocates, promotes or assists any unlawful act, or that may deceive any person or that breaches any legal duty owed to a third party, such as a contractual duty or a duty of confidence or that may be harmful to a user;
-
-6.4.4. in any way that is defamatory of any person, obscene, offensive, hateful or inflammatory;
-
-6.4.5. in any way that promotes sexually explicit material, violence, or discrimination of any kind;
-
-6.4.6. in any way that infringes any copyright, database right, trade mark or other intellectual property right of any other person;
-
-6.4.7. in any way that is threatening, abusive or invades another’s privacy, or is likely to harass, upset, embarrass, alarm or annoy any other person;
-
-6.4.8. to impersonate any person, or to misrepresent your identity or affiliation with any person;
-
-6.4.9. to upload, post, email, message, transmit or otherwise make available or initiate any content that includes any unsolicited or unauthorised advertising, promotional materials, “junk mail”, “spam”, “chain letters”, “pyramid schemes”, “market research”, or any other form of solicitation whether it be for commercial or non-commercial purposes. This prohibition includes but is not limited to (a) using Mendeley invitations to send messages to people who don’t know you or who are unlikely to recognize you as a known contact; (b) using Mendeley to connect to people who don’t know you and then sending unsolicited promotional messages to those direct connections without their permission.
-
-6.4.10. to knowingly transmit any data, send or upload any material that contains viruses, Trojan horses, worms, time-bombs, keystroke loggers, spyware, adware or any other harmful programs or similar computer code designed to adversely affect the operation of any computer software or hardware.
-
-6.5. Unless you have express prior written permission, you may not use any spider- or bot-like system, software or other device or program (whether automated or otherwise) to extract content, data, information or other material from the Site.
-
-6.6. You also agree:
-
-6.6.1. not to access without authority, interfere with, damage or disrupt:
-
-
- any part of our Site;
- any equipment or network on which our Site is stored;
- our Software or any software used in the provision of our Site; or
- any equipment or network or software owned or used by any third party.
-
-6.6.2. to use our Services only for research related activity (e.g, not to store your personal collection of movies, music and other large file types unrelated to your research activities).
-
-6.7. You may form more than one private group as part of a Mendeley for Teams package only if you intend to be active in all such groups; you may not form more than one private group to act solely as an administrator.
-
-
-7. FAILURE TO COMPLY WITH THESE TERMS OF USE
-
-7.1. To raise complaints regarding alleged copyright or other intellectual property infringement, you must follow the instructions set forth on the Copyright and Intellectual Property Policy page. For all other complaints about the use of our Site or Content (as defined below) posted to our Site, please contact us at complaints [at] mendeley [dot] com. We request that you provide a sufficiently detailed description of the basis of your complaint and your contact information in case additional information is necessary. We will then review your complaint and decide whether there has been a failure to comply with our Terms of Use. If not, we will deal with the matter as described below. We will inform you of the outcome of our review within a reasonable time of receiving your complaint.
-
-7.2. If we determine, in our sole discretion and judgment, that you have failed to comply with these Terms of Use we reserve the right at any time to take all or any of the following actions (and any other action we reasonably deem appropriate):
-
-7.2.1. temporary or permanent withdrawal of your right to use our Site and/or closure of your account;
-
-7.2.2. temporary or permanent removal of any posting or material uploaded by you to our Site;
-
-7.2.3. issue of a warning to you;
-
-7.2.4. legal action against you including proceedings for reimbursement of all costs on an indemnity basis (including, but not limited to, reasonable administrative and legal costs) resulting from the breach;
-
-7.2.5. disclosure of such information to law enforcement authorities or third party complainants as we reasonably feel is necessary or required;
-
-7.2.6. disclosure of your identity to any third party who is claiming that any material posted or uploaded by you to our Site constitutes a violation of their intellectual property rights, right to privacy or other legal rights;
-
-7.2.7. use any technological, legal, operational or other means available to us to enforce the provisions of these Terms of Use.
-
-7.3. You hereby hold harmless and indemnify us and our affiliates, officers, agents and employees from and against any claim, suit or action made by any third party arising from or related to your use of the Services or violation of these Terms of Use, including any liability or expense arising from losses, damages, claims, costs and reasonable attorneys’ fees.
-
-
-8. DELETION OF CONTENT
-
-8.1. Except as set out in 8.2, you may delete your Content at any time using the automated account deactivation tool. When you delete your Content, our right to use it shall cease save that we may retain a copy in backup for a reasonable period of time and as necessary to comply with our legal obligations. However, the deleted Content will not be generally available to other users or registered members.
-
-8.2. Where you make use of the interactive features of our Services to share Content with others, you may not be able to delete such shared Content.
-
-
-9. OUR SITE CHANGES REGULARLY
-
-9.1. We aim to update our Site regularly. If the need arises such as an operational issue, we may suspend access to our Site, or close it indefinitely. Any of the material on our Site may be out of date at any given time, and we are under no obligation to update such material.
-
-9.2. Although we aim to keep the Services available at all reasonable times, we may withdraw, suspend or amend the Services in whole or in part without notice including, for example, in the event of technical failures, upgrades, routine or emergency repair work or some reason outside our control. We will not be liable if for any reason our Services are unavailable at any time or for any period.
-
-
-10. LIMITATION OF LIABILITY
-
-THE SERVICES AND ALL CONTENT ARE MADE AVAILABLE ON AN "AS IS" AND "AS AVAILABLE" BASIS, WITHOUT ANY REPRESENTATION OR WARRANTY OF ANY KIND, EXPRESS OR IMPLIED (INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF TITLE AND NONINFRINGEMENT AND THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE), OR ANY GUARANTY OR ASSURANCE THE SERVICES WILL BE AVAILABLE FOR USE, OR THAT ALL FEATURES, FUNCTIONS OR OPERATIONS WILL BE AVAILABLE OR PERFORM AS DESCRIBED, OR THAT THE SERVICES WILL BE FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS. Without limiting the foregoing, we are not responsible or liable for any malicious code, delays, inaccuracies, errors, or omissions arising out of your use of the Services.
-
-You understand, acknowledge and agree that you are assuming the entire risk as to your use of the Services and the Content, including without limitation the quality, accuracy, performance, timeliness, adequacy, completeness, correctness, authenticity, non-infringement, security and validity of any and all features and functions of the Services, your Content and materials associated with your use of the Services.
-
-YOU UNDERSTAND AND AGREE THAT, TO THE FULLEST EXTENT PERMISSIBLE BY LAW, WE, ANY OF OUR AFFILIATES, OR OUR RESPECTIVE SUCCESSORS AND ASSIGNS, OR ANY OF OUR RESPECTIVE OFFICERS, DIRECTORS, EMPLOYEES, AGENTS, REPRESENTATIVES, LICENSORS, PARTNERS, OPERATIONAL SERVICE PROVIDERS, ADVERTISERS, OR SUPPLIERS, SHALL NOT BE LIABLE FOR ANY LOSS OR DAMAGE, OF ANY KIND, DIRECT OR INDIRECT, IN CONNECTION WITH OR ARISING FROM USE OF THE SERVICES, INCLUDING, WITHOUT LIMITATION, COMPENSATORY, CONSEQUENTIAL, INCIDENTAL, INDIRECT, SPECIAL OR PUNITIVE DAMAGES.
-
-We do not claim ownership, endorse or take responsibility for any third-party product, information, guidelines, materials or services that may be offered, advertised, provided or displayed on the Site or incorporated in the Content, products or services contained on, accessible from or distributed through the Site.
-
-Some jurisdictions do not allow for the exclusion of certain warranties or certain limitations on damages and remedies, accordingly some of the exclusions and limitations described in these Terms of Use may not apply to you.
-
-
-11. RELIANCE ON SITE INFORMATION
-
-11.1. We do not claim that the information on any specific subject contained on our Site is accurate, comprehensive, verified, complete or error free. Commentary and other materials posted on our Site are not intended to amount to advice on which reliance should be placed. You should seek appropriate professional advice.
-
-
-12. UNITED STATES OF AMERICA FEDERAL AGENCIES
-
-12.1. Use by U.S.A. federal agencies will follow the amended terms found here.
-
-
-13. LINKS FROM OUR SITE
-
-13.1. Where our Site contains links to other sites and resources provided by third parties, these links are provided for your information only. We have no control over the contents of those sites or resources, and accept no responsibility for them or for any loss or damage that may arise from your use of them.
-
-
-14. JURISDICTION AND APPLICABLE LAW
-
-14.1. The English courts will have non-exclusive jurisdiction over any claim arising from, or related to, our Services although we retain the right to bring proceedings against you for breach of these conditions in your country of residence or any other relevant country. These terms of use are governed by English law.
-
-
-15. YOUR CONCERNS
-
-15.1. If you have any comments on our Site or our Software, please contact us.
-
-Thank you for visiting our Site and using our Software.
-
-
-These Terms of Use were last updated on February 6, 2014.
-
-Copyright © 2013 Mendeley Ltd. – All Rights Reserved.
diff --git a/licenses/OPERA-2014 b/licenses/OPERA-2014
deleted file mode 100644
index cfb71f516498..000000000000
--- a/licenses/OPERA-2014
+++ /dev/null
@@ -1,101 +0,0 @@
-Format: Mostly copyright-format 1.0
-# http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-# Making this file match the format entirely would require
-# reformatting the Opera license.
-
-Upstream-Name: opera/opera-next/opera-developer
-Source: http://www.opera.com
-
-Files: *
-Copyright: 2014 Opera Software
-License: Proprietary
-End-user license agreement and terms of service for Opera for desktop for Open Source operating systems
-
-Please read this carefully. This software license agreement and terms of service (“Terms”), including the privacy provisions in section 7 of these Terms, form a binding contract between you and Opera Software ASA (“Opera”), whose principal place of business is Gjerdrums vei 19, 0484, Oslo, Norway. By acceptance of delivery of the software and services you (“you”) hereby agree to be bound by these Terms. Otherwise, please discontinue the use of the software and services.
-
-These Terms govern your use of the software in executable form and your use of the associated services. Source code used in the software, under open source license agreements, can be obtained at http://sourcecode.opera.com or by sending an email message to opensource@opera.com.
-
-1 Acceptance of terms
-
-You can accept the Terms by selecting to accept or to agree to the Terms during the installation process or when the dialog is displayed in the user interface, or by your use of the Software and Services.
-
-You declare by acceptance of the Terms that you are of legal age to use the Software and Services.
-
-2 Definitions
-
-2.1 “You” (or “your”) means the legal entity or person who orders or downloads the Software and/or activates the Services.
-
-2.2 “Documentation” means the standard end-user technical documentation, specifications, materials and other information Opera supplies with the Software and/or Services.
-
-2.3 "Services" means the various services to which Opera provides users with access, including without limitation, the Opera Turbo feature, Discover feature, search services, automatic updates, personalized content and branded offerings.
-
-2.4 “Software” means Opera’s software products (in object code format only) delivered to you (including but not limited to the Opera browser), together with any update or upgrade, when and if made available to you by Opera. Software does not include Third-Party Software.
-
-2.5 “Third-Party Software” means the software of certain third parties that Opera may deliver with the Software, including but not limited to any third-party open source components.
-
-2.6 “Use” (or “use”) means to cause a computer system to execute any machine-executable portion of the Software in accordance with the documentation or to make use of any documentation or related materials in connection with the execution of any machine-executable portion of the Software, and to make use of any of the Services.
-
-3 License
-
-Subject to the terms and conditions of these Terms, Opera hereby grants you a limited, non-exclusive, non-transferable, non-sublicensable license; (i) to use the Services and to install and use the Software supplied to you hereunder, as installed on your personal computer, including your laptop, desktop, or on computers within your organization; and (ii) to reproduce and distribute the Software without modification, provided that any such reproduction or distribution of the Software by you: (a) must be in an application repository for a desktop Open Source OS distribution (expressly excluding distribution for embedded Open Source OS); (b) must be made available free of charge for end-users; (c) must be subject to and distributed with a copy of this Agreement; and (d) no automatic modification of the default search engines in the Software settings is done at any time, including but not limited to after the Software is installed.
-
-4 License restrictions and Third-Party Software
-
-4.1 You shall not and shall not allow any third party to: (a) Use the Software or Services except as expressly permitted under Section 3; (b) separate the component programs of the Software for use on different computers; (c) adapt, alter, publicly display, publicly perform, translate, embed into any other product, or otherwise create derivative works of, or otherwise modify the Software or Services; (d) sublicense, lease, rent, loan, or distribute the Software or Services to any third party; (e) transfer the Software or Services to any third party; (f) reverse engineer, decompile, disassemble, or otherwise attempt to derive the source code for the Software, (i) except as permitted by applicable law, or (ii) to the extent as may be permitted by the license of any included Third-Party Software; (g) remove, alter or obscure any proprietary notices on the Software or Services, or the applicable documentation therefore; or (h) allow third parties to access or use the Software or Services, including without limitation any use in any application service provider environment, service bureau, or time-sharing arrangements.
-
-4.2 Third-Party Software is subject to separate terms and conditions included with, or contained in the setup installation segments of such Third-Party Software. The license restrictions contained in these Terms do not apply to Third-Party Software to the extent they are inconsistent with such Third-Party Software terms. Opera shall not be responsible for any Third-Party Software.
-
-5 Use of services
-
-5.1 Opera reserves the right at any time and from time to time to modify or discontinue, temporarily or permanently, the Services (or any part thereof) with or without notice. You agree that Opera shall not be liable to you or to any third party for any modification, suspension or discontinuance of the Services. Opera reserves the right to change, limit usage of, charge for continued usage of (of course require you to opt in before incurring any charges), and/or discontinue any service at any point in time.
-
-5.2 Opera Turbo: When Opera Turbo is enabled, the Software will request normal web content through an Opera proxy server. The browsing experience may change due to increased webpage loading speeds when using the Opera Turbo feature.
-
-5.3 Discover: The Discover feature helps you to discover and access content made available by third parties on the internet. Opera exercises no editorial control over any content that you access through the Discover feature.
-
-5.4 Synchronization: Opera allows you to enable synchronization of browser data such as your speed dials between Opera browsers on the devices you are using. The service requires that you login a social network service or by creating an Opera account.
-
-6 Proprietary rights
-
-You acknowledge and agree that the Services and the Software, including without limitation the Software’s sequence, structure, organization, source code and applicable documentation contains valuable trade secrets and other intellectual property of Opera and its suppliers and is considered Opera’s confidential information. The Software and Services are licensed and not sold to you, and no title or ownership to such Software or Services or the intellectual property rights embodied therein passes as a result of these Terms or any act pursuant to these Terms. The Software and Services and all intellectual property rights therein are the exclusive property of Opera and its suppliers, and all rights in and to the Software and Services not expressly granted to you in this Agreement are reserved. Opera owns all copies of the Software, however made. Nothing in these Terms will be deemed to grant, by implication, estoppel or otherwise, a license under any existing or future patents of Opera, except to the extent necessary for User to use the Software or Services as expressly permitted under these Terms.
-
-7 Privacy and personal information
-
-7.1 General: No personal identifiable information is collected. Your installation of the Software contains a unique ID that can not be linked to you as an individual person. This unique ID is required for auto-updates of the Software and any installed extensions. Data about the features (not websites) used in the Software is collected with the purpose to improve the Software and Services. The Software also creates a unique ID that is linked to your computer. This unique ID is processed with the sole purpose to measure marketing campaigns and distribution partners. Any crash logs sent by the Software will include the version number of the Software and information about the operating system. This information is collected with the sole purpose to improve the Software or the Services. Opera’s privacy policy located at http://www.opera.com/privacy (“Privacy Policy”) is incorporated by reference.
-
-7.2 Opera Turbo is a web browsing service relying on web content being compressed on Opera proxy and video compression servers and then sent to the Software installed on your device. Opera is not able to link usage related data in Opera proxy servers to individual persons. Opera proxy servers log in addition to the web addresses (not content of the web pages), IP-addresses, Operating system, any campaign reference for the Software and a randomly generated identifier for the Software. Opera stores and processes usage related log data to provide, debug, maintain, and optimize the service. Opera server logs are kept for up to six months. Usage-related log data is also used to generate aggregated and anonymized statistics for Opera’s own use and for reporting usage to Opera’s customers.
-
-7.3 Discover: Opera is not able to link any usage related data to individual persons. The service collects the web addresses (not content of the webpages), IP-addresses, the end-user device make and model, and a randomly generated identifier for the Software. Opera stores and processes usage related log data to provide, debug, maintain and optimize the service. Opera server logs are kept for up to six months. Usage related log data are also used to generate aggregated and anonymized statistics for Opera’s own use, and for reporting usage to Opera’s customers.
-
-7.4 Synchronization: Opera allows you to enable synchronization of browser data such as your speed dials between Opera browsers on the devices you are using, by logging in using Facebook, Google, Twitter or by creating an Opera account. Opera collects data submitted by you, and your name, username, email address and language if provided by the social service you use to login. The data is processed with the sole purpose to enable synchronization of browser data, including debugging, improvements and optimization. Data received for a social service may be retained for up to six months after you stopped using the synchronization feature. The data in your Opera account can be modified and deleted with the tools we provide.
-
-7.5 Built-in web search: The Software has a built-in, web search feature. This gives you the option to utilize external web search engines directly from the browser interface. Opera relies on third parties for this service. The Software sends the your search requests (in a specially designed URL string) directly to third-party websites that handle the actual search queries. What is sent to the third-party site is the special search string along with the text terms needed to perform the particular search query. No personal information is sent.
-
-7.6 Some third-party sites may monitor data traffic from the Software, such as numbers of hits and the search terms used. No personally identifiable information is made available to these services by the Software, and not by Opera. Please note: Opera does not control the privacy and security practices and policies of these third parties and their sites. Check the particular site and/or business for more information. It is your responsibility to use caution before sharing personal information via forms and other methods used by third parties and their websites.
-
-7.7 Opera reserves the right to disclose any information we have as required by law and when we believe that disclosure is necessary to protect our rights and/or comply with a judicial proceeding, court order, or legal process. Opera restricts internal access to data that is not aggregated or further anonymized, exclusively to those who need it for the operation of the services. Information may be stored outside of the country in which the user resides, and user hereby consents to such storage and transfer of information between jurisdictions. Any updates or changes to these privacy provisions will be included in Opera’s Privacy Policy available at http://www.opera.com/privacy/.
-
-8 Term and termination
-
-These Terms will commence upon your download of the Software and/or your commencement of the Services and, unless earlier terminated as provided in this Section 8, will continue in perpetuity. These terms will immediately terminate upon your breach of these Terms, unless such breach is curable and is actually and immediately cured by you after Opera provides notice of breach to you. Upon the termination of these Terms, you will discontinue all use of the Software and/or Services, promptly destroy or have destroyed the Software and any copies thereof, and, upon request by Opera, certify in writing to Opera that such destruction has taken place. These remedies are cumulative and in addition to any other remedies available to Opera. Sections 2, 4, 6, 7, 8, 9, 10, 11, 12, and 13, shall survive such termination.
-
-9 Disclaimer of warranties
-
-THE SOFTWARE AND SERVICES ARE PROVIDED “AS IS,” AND ALL WARRANTIES AND CONDITIONS, EXPRESS, IMPLIED, AND STATUTORY, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR USE, ACCURACY OR COMPLETENESS, SATISFACTORY QUALITY, AND QUIET ENJOYMENT, OR OTHER WARRANTIES OR CONDITIONS ARISING BY STATUTE, OPERATION OR LAW, COURSE OF DEALING, USAGE OF TRADE OR OTHERWISE ARE HEREBY DISCLAIMED. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OR EXCLUSION OF IMPLIED WARRANTIES, SO THE ABOVE LIMITATIONS MAY NOT APPLY TO USER. OPERA DOES NOT WARRANT THAT THE USE OF THE SOFTWARE OR SERVICES WILL BE UNINTERRUPTED OR ERROR FREE OR THAT THE SOFTWARE OR SERVICES DO NOT CONTAIN ANY VIRUSES. THIS WARRANTY DISCLAIMER IS A FUNDAMENTAL ELEMENT OF THE BASIS OF THE BARGAIN BETWEEN USER AND OPERA. OPERA WOULD NOT PROVIDE THE SOFTWARE OR SERVICES ABSENT SUCH DISCLAIMER. NO REPRESENTATIONS OR WARRANTIES ARE MADE BY ANY SUPPLIERS TO OPERA UNDER OR BY VIRTUE OF THIS AGREEMENT.
-
-10 Limitation of liability
-
-IN NO EVENT SHALL OPERA BE LIABLE FOR ANY INCIDENTAL, SPECIAL, CONSEQUENTIAL, OR INDIRECT DAMAGES OF ANY KIND (INCLUDING WITHOUT LIMITATION DAMAGES FOR INTERRUPTION OF BUSINESS, LOST DATA, LOST PROFITS, OR THE LIKE) REGARDLESS OF THE FORM OF ACTION, WHETHER IN CONTRACT, TORT (INCLUDING WITHOUT LIMITATION NEGLIGENCE), STRICT PRODUCT LIABILITY, OR OTHER THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN NO EVENT WILL THE CUMULATIVE LIABILITY OF OPERA ARISING OUT OF OR RELATED TO THIS AGREEMENT EXCEED THE AMOUNT PAID TO OPERA IN RESPECT OF THE SOFTWARE GIVING RISE TO THE CLAIM OR IF NO FEES WERE PAID THEN FIVE HUNDRED EUROS. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THE FOREGOING EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. THIS LIMITATION OF LIABILITY WILL APPLY NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE OF ANY LIMITED REMEDY SET FORTH HEREIN. IN NO EVENT WILL ANY SUPPLIER TO OPERA HAVE ANY LIABILITY TO YOU UNDER THIS AGREEMENT. THIS LIMITATION OF LIABILITY IS A FUNDAMENTAL ELEMENT OF THE BASIS OF THE BARGAIN BETWEEN YOU AND OPERA. OPERA WOULD NOT PROVIDE THE SOFTWARE TO YOU ABSENT SUCH LIMITATION.
-
-11 Notices
-
-All notices required under these Terms will be given as follows: (a) in the case of notices to Opera, by certified mail, return receipt requested, to the following address: Chief Operating Officer, Opera Software ASA, Gjerdrums vei 19, 0484 Oslo, Norway, such notice to be deemed effective upon receipt by Opera; and (b) in the case of notices to you, by email to the email address that you provided to Opera prior to initiating the download of the Software or start of the Services, such notice to be deemed effective upon the earlier of (i) twenty-four (24) hours after sending, or (ii) your actual receipt of any such email. Source code used in the software, under open source license agreements, can be obtained by sending an email message to opensource@opera.com.
-
-12 Injunctive relief
-
-You acknowledge and agree that the Software and Services contain valuable trade secrets, confidential information and proprietary information of Opera. You further acknowledge that any actual or threatened breach or violation of Section 3 or Section 4 of these Terms will constitute immediate, irreparable harm to Opera for which monetary damages would be an inadequate remedy, and that injunctive relief is an appropriate remedy for any such breach or violation.
-
-13 General
-
-You acknowledge and agree that the Software may contain cryptographic functionality the export of which is restricted under applicable export control law. You will comply with all applicable laws and regulations in your activities under these Terms. You will not export or re-export the Software in violation of such laws or regulations or without all required licenses and authorizations. The laws of Norway will govern these Terms without giving effect to any conflicts of law principles that may require the application of the laws of a different country. The United Nations Convention on Contracts for the International Sale of Goods does not apply to this Agreement. All actions or proceedings arising under or related to these Terms must be brought in the Oslo City Court, and each party hereby agrees to irrevocably submit to the jurisdiction and venue of any such court in all such actions or proceedings. If any provision of these Terms is determined by a court of competent jurisdiction to be invalid, illegal, or unenforceable, the remaining provisions of these Terms shall not be affected or impaired thereby. You may not assign or transfer this contract without obtaining Opera’s prior written consent, and any purported assignment or transfer in violation of this Section 13 will be null and void. Opera may update the Terms of this agreement if and when you install and update or upgrade to the Software and/or Services. You will be responsible for all of your access and data charges from your internet service provider or mobile operator. Applications you download or that are made available to you may automatically connect to the Internet to update information or provide a service to you.
-
diff --git a/licenses/OPERA-2018 b/licenses/OPERA-2018
new file mode 100644
index 000000000000..7c03c43c64f6
--- /dev/null
+++ b/licenses/OPERA-2018
@@ -0,0 +1,57 @@
+Format: Mostly copyright-format 1.0
+# http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+# Making this file match the format entirely would require
+# reformatting the Opera license.
+
+Upstream-Name: opera-stable
+Source: http://www.opera.com
+
+Files: *
+Copyright: 2014 Opera Software
+License: Proprietary
+
+
+END USER LICENSE AGREEMENT
+
+
+Opera for Computers
+
+Last updated: December 14, 2018
+
+This end user license agreement ("EULA") governs your download and/or use of the executable code for the Opera for Computers desktop software application, including any update or upgrade thereto ("Software"). This EULA forms a binding contract between you and Opera Unite Pte. Ltd., a Singapore company with a registered address at 8 Burn Road #07-07 Trivex, Singapore 369977 ("Opera").
+
+Terms & Conditions
+
+1. THIS IS A CONTRACT. This EULA constitutes a contract between you and Opera. You may not use the Software if you do not accept the terms in this EULA. By downloading and/or using the Software, you agree to be bound by all the terms and conditions set forth in this EULA. If you are under thirteen (13) years of age, or at least thirteen (13) years of age but a minor where you live, you must have your parent or legal guardian accept this EULA on your behalf and approve your use of the Software.
+
+2. YOU ARE ONLY GRANTED A LIMITED LICENSE TO USE THE SOFTWARE. Subject to the terms and conditions of this EULA, Opera hereby grants you a personal, limited, non-exclusive, non-transferable, non-sublicensable license to:
+
+(A) use the executable code version of the Software solely as installed on your personal computer; and
+
+(B) reproduce and distribute the Software solely as included in an application repository for a desktop open source operating system distribution PROVIDED THAT in all cases the Software is distributed: (i) without modification; (ii) free of charge to end-users; and (iii) with a copy of this EULA. Distribution for embedded open source operating systems is not permitted. For the avoidance of doubt, the Software must be distributed without modification (including as to the default search engine(s) in the Software settings), both at the time of distribution as well as after the Software is installed.
+
+You may only use the Software as expressly authorized in this Section 2.
+
+3. YOU MUST RESPECT OUR RIGHTS IN THE SOFTWARE. Unless expressly permitted by law, you may not copy, decompile, reverse engineer, disassemble, attempt to derive the source code of, modify, or create derivative works of the Software. You may not remove, obscure, or alter any copyright notice or other proprietary rights notices affixed to or contained within the Software. You may not separate the component programs of the Software for use on different computers or sublicense, lease, rent, loan, or distribute the Software to any third party. You may not permit, direct or authorize any third party to take any action with respect to the Software which is inconsistent with the terms set forth in this EULA.
+
+4. THE SOFTWARE CONTAINS OUR VALUABLE INTELLECTUAL PROPERTY. You acknowledge and agree that the Software, including its sequence, structure, organization, source code and applicable documentation, contains valuable trade secrets and other intellectual property of Opera and its suppliers. The Software is licensed and not sold to you, and no title or ownership to such Software or the intellectual property rights embodied therein is granted to you. The Software is the exclusive property of Opera and its suppliers, and all rights in and to the Software not expressly granted to you in this Agreement are reserved. Nothing in this EULA will be deemed to grant, by implication, estoppel or otherwise, a license under any existing or future patents of Opera, except to the extent necessary for you to use the Software as expressly permitted under this EULA. You acknowledge and agree that any actual or threatened breach of this EULA will constitute immediate, irreparable harm to Opera for which monetary damages would be an inadequate remedy, and that injunctive relief is an appropriate remedy for any such breach or violation.
+
+5. COMPONENTS FROM THIRD PARTIES MAY BE DELIVERED ALONG WITH THE SOFTWARE. The Software is delivered along with certain software components provided by third parties (“Third Party Software”). Opera shall not be responsible for any such Third-Party Software. Third-Party Software, particularly open source software, may be subject to separate license terms included with, or contained in the setup installation segments of such Third-Party Software. The terms set forth in this EULA do not apply to Third-Party Software to the extent they are inconsistent with such Third-Party Software licenses. This EULA governs your use of the Software in executable form. Source code for any open source Third-Party Software delivered along with the Software can be obtained at http://sourcecode.opera.com or by sending an email message to opensource@opera.com.
+
+6. THE SOFTWARE MAY PROVIDE FOR ACCESS TO ADDITIONAL SERVICES. Various services may be offered where available via or as integrated into the Software (“Services”). By using any such Services, you agreed to the terms of service at https://www.opera.com/terms (“Terms of Service”). The Terms of Service are incorporated into this EULA by this reference. As is more fully explained in the Terms of Service, some Services are offered by Opera, others by third parties (which may be subject to separate terms – please refer to the Terms of Service for more information). Opera reserves the right at any time and from time to time to modify or discontinue, temporarily or permanently, the Services (or any part thereof) with or without notice. You agree that Opera shall not be liable to you or to any third party for any modification, suspension or discontinuance of the Services.
+
+7. OUR SOFTWARE AND SERVICES ARE AD-SUPPORTED. The Software is free to download and our Services are generally provided free of charge. Opera incurs substantial development, collocation and bandwidth expenses in doing this. To support our business and continue providing you with the Software and Services for free, we will display the advertisements of select partners to you. By using our Software and Services, you consent to the placement of such advertisements within the Software and Services.
+
+8. YOUR PRIVACY IS IMPORTANT TO US. Opera takes the protection and security of its users’ information very seriously and will treat any and all such information in accordance with our privacy statement, which is currently posted at https://www.opera.com/privacy (“Privacy Statement”). The Privacy Statement is incorporated into this EULA by this reference. You agree to the use of your data in accordance with Opera’s Privacy Statement.
+
+9. YOUR LICENSE TO USE THE SOFTWARE TERMINATES IF YOU BREACH THIS EULA. This EULA will commence upon your download of the Software and continue in perpetuity unless terminated earlier as provided herein. This EULA will immediately terminate upon your breach of any of the terms or conditions set forth herein. Upon the termination of the EULA, you will discontinue all use of the Software, promptly destroy or have destroyed the Software and any copies thereof, and, upon request by Opera, certify in writing that such destruction has taken place. These remedies are cumulative and in addition to any other remedies which may be available. Section 1, as well as Sections 3 through 14 of this EULA shall survive termination.
+
+10. THE SOFTWARE IS PROVIDED WITHOUT ANY WARRANTIES OR GUARANTEES. THE SOFTWARE IS PROVIDED “AS IS”, AND OPERA DISCLAIMS ALL WARRANTIES WITH REGARD TO THE SOFTWARE WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR USE, SATISFACTORY QUALITY, OR QUIET ENJOYMENT. OPERA DOES NOT WARRANT THAT THE USE OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR FREE OR THAT THE SOFTWARE DOES NOT CONTAIN ANY VIRUSES. THIS WARRANTY DISCLAIMER IS A FUNDAMENTAL ELEMENT OF THE BASIS OF THE BARGAIN BETWEEN YOU AND OPERA. OPERA WOULD NOT PROVIDE THE SOFTWARE ABSENT SUCH DISCLAIMER. NO REPRESENTATIONS OR WARRANTIES ARE MADE BY ANY OF OPERA’S CUSTOMERS OR SUPPLIERS UNDER OR BY VIRTUE OF THIS AGREEMENT. IF YOU ARE DISSATISFIED WITH ANY PORTION OF THE SOFTWARE, OR WITH ANY OF THESE TERMS, YOUR SOLE AND EXCLUSIVE REMEDY IS TO DISCONTINUE USING THE SOFTWARE.
+
+11. OPERA IS NOT LIABLE FOR ANY DAMAGES YOU MAY INCUR. IN NO EVENT SHALL OPERA, ITS AFFILIATES, OR THEIR RESPECTIVE SUPPLIERS OR CUSTOMERS BE LIABLE FOR ANY INCIDENTAL, SPECIAL, CONSEQUENTIAL, OR INDIRECT DAMAGES OF ANY KIND (INCLUDING WITHOUT LIMITATION DAMAGES FOR INTERRUPTION OF BUSINESS, LOST DATA, LOST PROFITS, OR THE LIKE) REGARDLESS OF THE FORM OF ACTION, WHETHER IN CONTRACT, TORT (INCLUDING WITHOUT LIMITATION NEGLIGENCE), PRODUCT LIABILITY, OR OTHER THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN NO EVENT WILL THE CUMULATIVE LIABILITY OF OPERA ARISING OUT OF OR RELATED TO THIS AGREEMENT EXCEED THE AMOUNT PAID TO OPERA IN RESPECT OF THE SOFTWARE GIVING RISE TO THE CLAIM OR, IF NO FEES WERE PAID, THEN FIVE HUNDRED EUROS. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THE FOREGOING EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. THIS LIMITATION OF LIABILITY WILL APPLY NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE OF ANY LIMITED REMEDY SET FORTH HEREIN. THIS LIMITATION OF LIABILITY IS A FUNDAMENTAL ELEMENT OF THE BASIS OF THE BARGAIN BETWEEN YOU AND OPERA. OPERA WOULD NOT PROVIDE THE SOFTWARE TO YOU ABSENT SUCH LIMITATION.
+
+12. THIS CONTRACT IS BASED ON ENGLISH LAW. This EULA will be governed by the laws of England and Wales, without giving effect to any conflicts of law principles that may require the application of the laws of a different country. Any and all disputes arising out of or in connection with this EULA, including any question regarding its existence, validity or termination, shall be referred to and finally resolved by arbitration in English in accordance with the UNCITRAL Arbitration Rules for the time being in force at the commencement of the arbitration. The place of arbitration shall be Singapore before a tribunal of three arbitrators, one to be appointed by each of the parties and the third by the two so chosen, unless the parties have agreed to the appointment of a sole arbitrator. The parties agree that the seat of the arbitration shall remain in London. Notwithstanding this, you agree that Opera shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. If any provision of this EULA is determined by a court of competent jurisdiction to be invalid, illegal, or unenforceable, the remaining provisions of this EULA shall not be affected or impaired thereby
+
+13. OPERA MAY MODIFY THESE TERMS. Opera may update the terms of this EULA, the Privacy Statement or the Terms of Service. The current version of this EULA is posted at https://www.opera.com/eula/computers, the latest version of the Privacy Statement is posted at https://www.opera.com/privacy, and the Terms of Service are posted at https://www.opera.com/terms. It is your responsibility to remain informed of any changes as you are bound by the latest version of the EULA, Privacy Statement and Terms of Service.
+
+14. GENERAL. You acknowledge and agree that the Software may contain cryptographic functionality the export of which may be restricted under applicable export control law. You will comply with all applicable laws and regulations in your activities with regard to the Software. You will not export or re-export the Software in violation of such laws or regulations or without all required licenses and authorizations. You may not assign or transfer this contract without obtaining Opera’s prior written consent, and any purported assignment or transfer in violation of this restriction will be null and void.
\ No newline at end of file
diff --git a/licenses/WRI-EULA b/licenses/WRI-EULA
deleted file mode 100644
index 16861fac9e0f..000000000000
--- a/licenses/WRI-EULA
+++ /dev/null
@@ -1,22 +0,0 @@
-You should visit http://support.wolfram.com/technotes/latestfonts.en.html
-for up to date license and accept it. As of 02.12.2008 the text on that page was:
-
-READ THIS AGREEMENT CAREFULLY BEFORE PROCEEDING. IT IS AN AGREEMENT BETWEEN
-WOLFRAM RESEARCH, INC. ("WRI"), AND YOU. ACCEPTANCE OF ITS TERMS CREATES A
-BINDING CONTRACT BETWEEN YOU AND WRI.
-
-Wolfram Research, Inc. ("WRI") licenses Mathematica fonts to individual users
-downloading from this site. All WRI fonts are copyright Wolfram Research, Inc.
-or its vendors. All rights reserved. WRI fonts are not in the public domain.
-
-WRI reserves the right to control all distribution of the Mathematica fonts and
-does not, at this time, allow them to be widely distributed via any servers,
-archives, or non-WRI software products of any kind without express written
-consent of WRI. There are no restrictions on embedding the fonts in documents
-transmitted to service bureaus, publishers, or other users of WRI products.
-There are no restrictions on widely distributing metrics files generated from
-the Mathematica fonts.
-
-WRI does not require authors to credit Wolfram Research for the use of the
-Mathematica fonts in published papers. However, such credit is appreciated.
-“Mathematica fonts by Wolfram Research, Inc.” is sufficient.
diff --git a/licenses/eGenixPublic-1.1 b/licenses/eGenixPublic-1.1
deleted file mode 100644
index 8fb8789e9683..000000000000
--- a/licenses/eGenixPublic-1.1
+++ /dev/null
@@ -1,106 +0,0 @@
-________________________________________________________________________
-
-EGENIX.COM PUBLIC LICENSE AGREEMENT VERSION 1.1.0
-________________________________________________________________________
-
-1. Introduction
-
- This "License Agreement" is between eGenix.com Software, Skills
- and Services GmbH ("eGenix.com"), having an office at
- Pastor-Loeh-Str. 48, D-40764 Langenfeld, Germany, and the
- Individual or Organization ("Licensee") accessing and otherwise
- using this software in source or binary form and its associated
- documentation ("the Software").
-
-2. License
-
- Subject to the terms and conditions of this eGenix.com Public
- License Agreement, eGenix.com hereby grants Licensee a
- non-exclusive, royalty-free, world-wide license to reproduce,
- analyze, test, perform and/or display publicly, prepare derivative
- works, distribute, and otherwise use the Software alone or in any
- derivative version, provided, however, that the eGenix.com Public
- License Agreement is retained in the Software, or in any
- derivative version of the Software prepared by Licensee.
-
-3. NO WARRANTY
-
- eGenix.com is making the Software available to Licensee on an "AS
- IS" basis. SUBJECT TO ANY STATUTORY WARRANTIES WHICH CAN NOT BE
- EXCLUDED, EGENIX.COM MAKES NO REPRESENTATIONS OR WARRANTIES,
- EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION,
- EGENIX.COM MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY
- OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
- THE USE OF THE SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
-
-4. LIMITATION OF LIABILITY
-
- EGENIX.COM SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF
- THE SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES
- OR LOSS (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF
- BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS
- INFORMATION, OR OTHER PECUNIARY LOSS) AS A RESULT OF USING,
- MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE THEREOF,
- EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
- SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF
- INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THE ABOVE EXCLUSION OR
- LIMITATION MAY NOT APPLY TO LICENSEE.
-
-5. Termination
-
- This License Agreement will automatically terminate upon a
- material breach of its terms and conditions.
-
-6. Third Party Rights
-
- Any software or documentation in source or binary form provided
- along with the Software that is associated with a separate license
- agreement is licensed to Licensee under the terms of that license
- agreement. This License Agreement does not apply to those portions
- of the Software. Copies of the third party licenses are included
- in the Software Distribution.
-
-7. General
-
- Nothing in this License Agreement affects any statutory rights of
- consumers that cannot be waived or limited by contract.
-
- Nothing in this License Agreement shall be deemed to create any
- relationship of agency, partnership, or joint venture between
- eGenix.com and Licensee.
-
- If any provision of this License Agreement shall be unlawful,
- void, or for any reason unenforceable, such provision shall be
- modified to the extent necessary to render it enforceable without
- losing its intent, or, if no such modification is possible, be
- severed from this License Agreement and shall not affect the
- validity and enforceability of the remaining provisions of this
- License Agreement.
-
- This License Agreement shall be governed by and interpreted in all
- respects by the law of Germany, excluding conflict of law
- provisions. It shall not be governed by the United Nations
- Convention on Contracts for International Sale of Goods.
-
- This License Agreement does not grant permission to use eGenix.com
- trademarks or trade names in a trademark sense to endorse or
- promote products or services of Licensee, or any third party.
-
- The controlling language of this License Agreement is English. If
- Licensee has received a translation into another language, it has
- been provided for Licensee's convenience only.
-
-8. Agreement
-
- By downloading, copying, installing or otherwise using the
- Software, Licensee agrees to be bound by the terms and conditions
- of this License Agreement.
-
-
- For question regarding this License Agreement, please write to:
-
- eGenix.com Software, Skills and Services GmbH
- Pastor-Loeh-Str. 48
- D-40764 Langenfeld
- Germany
diff --git a/licenses/maui b/licenses/maui
deleted file mode 100644
index d48bf7b0f7ea..000000000000
--- a/licenses/maui
+++ /dev/null
@@ -1,155 +0,0 @@
-Moab Scheduling System - End User Open Source License
-
-This software is based on the Moab Scheduling System which was created by
-Cluster Resources, Inc.
-
-Copyright (C) 1999-2005 Cluster Resources, Inc., all rights reserved.
-
-Moab Scheduling System is a trademark of Cluster Resources, Inc.
-
-This SOFTWARE is bound by an 'End User Open Source' LICENSE from Cluster
-Resources Inc. The conditions of the 'End User Open Source' LICENSE include,
-but are not limited to the conditions described below.
-
-THE SOFTWARE IS PROVIDED AS IS, AND CLUSTER RESOURCES, INC. (CRI) AND ALL
-CONTRIBUTING PARTIES DISCLAIM ALL WARRANTIES RELATING TO THE SOFTWARE,
-WHETHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. NEITHER
-CRI NOR ANYONE INVOLVED IN THE CREATION, PRODUCTION, OR DELIVERY OF THE
-SOFTWARE SHALL BE LIABLE FOR ANY INDIRECT, CONSEQUENTIAL, OR INCIDENTAL
-DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE SOFTWARE EVEN IF CRI
-HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES OR CLAIMS. IN NO EVENT
-SHALL CRI'S LIABILITY FOR ANY DAMAGES EXCEED THE CONSIDERATION PAID FOR THE
-LICENSE TO USE THE SOFTWARE, REGARDLESS OF THE FORM OF CLAIM. THE PERSON OR
-ENTITY USING THE SOFTWARE BEARS ALL RISK AS TO THE QUALITY AND PERFORMANCE
-OF THE SOFTWARE.
-
-By installing or using this SOFTWARE you are accepting a non-exclusive 'End
-User Open Source' LICENSE from Cluster Resources Inc. and are bound to abide by the following conditions:
-
-1. Inclusion of Notice and Disclaimer
-
- All copies of the SOFTWARE, whether or not for redistribution and whether
-or not in source code or in binary form must include a conspicuous and
-appropriate publication of the above copyright notice and disclaimer.
-
-2. Usage
-
- Source and/or binary forms of this SOFTWARE may be used by any 'End User'
-organization pursuant to the conditions of this and other associated LICENSES
-at no charge and for an unlimited period of time. An 'End User' organization
-is defined as an organization that is using this SOFTWARE on their own
-systems and is not commercially redistributing, modifying, supporting, or
-providing other services specific to this SOFTWARE to other organizations
-for profit.
-
-3. Modifications
-
- SOFTWARE may be freely modified by the 'End User' as necessary to meet the
-needs of the 'End User' LICENSEE'S system. 'End User' may solicit the
-services of Cluster Resources Inc. or 'Authorized Distribution and Services
-Partners' of Cluster Resources Inc. that have received express prior written
-authorization to redistribute, modify or provide services for SOFTWARE.
-Available services include but are not limited to technical support,
-training, consultation or optimization services. 'End User' may not
-solicit or receive this SOFTWARE or services associated to the use,
-customization, training, development, or support on this SOFTWARE from any
-organization that is not an 'Authorized Distribution and Services Partner'
-of Cluster Resources Inc. Any organization that desires to become an
-'Authorized Distribution and Services Partner' of Cluster Resources, Inc.
-may contact us at support@clusterresources.com. 'End User' organizations
-that desire services from Cluster Resources Inc., or an 'Authorized
-Distribution and Services Partner' may contact us using the same email
-listed above.
-
-4. Distribution
-
- 'End User' organizations that are academic and government agencies may
-redistribute this SOFTWARE subject to the condition that the distribution
-contains conspicuous publication of the acknowledgement statement found
-within the LICENSE agreement distributed with this SOFTWARE.
-
- Organizations that are not academic and government agencies including
-commercial and other for-profit organizations may not redistribute this code
-or derivations of this code in any form whatsoever, including parts of
-SOFTWARE incorporated into other software programs without express written
-permission from Cluster Resources, Inc.
-
- Redistribution of the SOFTWARE in any form whatsoever, including parts of
-the code that are incorporated into other software programs, must include a
-conspicuous and appropriate publication of the following acknowledgement:
-
- 'This product was developed by Cluster Resources, Inc. Moab Scheduling
-System is a trademark of Cluster Resources, Inc.'
-
- Any redistribution or modification of the SOFTWARE must, when installed,
-display the above language, the copyright notice, and the warranty
-disclaimer.
-
- Each time the SOFTWARE (or any work based on the SOFTWARE) is
-redistributed, the recipient must automatically receive this LICENSE,
-copyright notice, and the warranty disclaimer as described in this license
-agreement, which govern the ability to copy, distribute or modify the
-SOFTWARE subject to these terms and conditions, and have the choice of
-accepting or declining the LICENSE.
-
- As the LICENSEE, you shall automatically provide the recipient with a
-copy of this LICENSE. Further restrictions are not to be imposed on
-recipients of the SOFTWARE by the LICENSEE beyond those expressly described
-herein.
-
-5. Use of Modifications
-
- LICENSEES with a redistribution agreement that wish to distribute their
-modifications (including government and academic institutions) must first
-send a copy of the modifications along with a brief explanation of why the
-modification was made and the resulting performance or functionality of the
-modifications to Cluster Resources, Inc. at support@clusterresources.com.
-Failure to send a copy of distributed modifications renders the LICENSE
-invalid, as well as any LICENSES granted to third parties subsequent to the
-incorporation of the modifications into SOFTWARE. Any such modification of
-the SOFTWARE must, when installed, display the LICENSE, the copyright
-notice, and the warranty disclaimer as described in the LICENSE agreement/s
-distributed with this SOFTWARE. Those without a LICENSE to redistribute may
-send modifications to Cluster Resources for evaluation and possible
-incorporation into SOFTWARE.
-
- Copyright owners of modifications to SOFTWARE hereby grant Cluster
-Resources, Inc. a non-exclusive, royalty-free, worldwide, irrevocable right
-and LICENSE to install, use, distribute, sublicense, and prepare derivative
-works of said modifications. Only organizations receiving an express prior
-written exclusion to this condition are exempted from providing these
-non-exclusive rights to Cluster Resources, Inc.
-
-6. Communications about and Endorsement of SOFTWARE and Products/Software
-Derived from the SOFTWARE
-
- The name 'Moab Scheduling System', 'Moab Scheduler', or any of its
-variants must not otherwise be used to endorse or to promote products
-derived from the SOFTWARE without prior written permission from CRI.
-
- Products derived from or incorporating the SOFTWARE in whole or in part
-shall not contain as part of the product's name any form of the terms
-'Cluster Resources, Inc.', 'CRI', 'Moab', 'Moab Scheduling System',
-'Moab Scheduler', or 'Supercluster Development Group' unless prior written
-permission has been received from Cluster Resources, Inc.
-
- All advertising materials for products that use or incorporate features of
-the SOFTWARE must display the following acknowledgement: 'This product
-includes software developed by Cluster Resources, Inc. for use in the Moab
-Scheduling System.'
-
-7. Acceptance of this LICENSE
-
- It is not required that you accept this LICENSE; however, if you do not
-accept the terms of this LICENSE, you are prohibited by law from installing,
-using, modifying or distributing the SOFTWARE or any of its derivative
-works. Therefore, by installing, using, modifying or distributing the
-SOFTWARE (or any of its derivative works), you have agreed to this LICENSE
-and have accepted all its terms and conditions.
-
- If any portion of this LICENSE is held invalid or unenforceable under any
-particular circumstance, the balance of the LICENSE will continue to apply.
-
-
-
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index dac381a54eca..041c2f04e113 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/postgrey/Manifest b/mail-filter/postgrey/Manifest
index b445413d7923..dbe173a4481c 100644
--- a/mail-filter/postgrey/Manifest
+++ b/mail-filter/postgrey/Manifest
@@ -1,2 +1,3 @@
DIST postgrey-1.36.tar.gz 38797 BLAKE2B b8e4dedb28ababc92cdd1d128652a468caeb55eb611ca019148a2e538d3cc0d397cd14889942904b05c9471bb13ed9fa6250e399d47df22241895c109a68315d SHA512 9b2502b873658c1ef8a86bff091d61b8dc8d66f7395bc0a869f9e6ec60b691a317c084ae326f49ce8dd926f0fa2620a58f3ad76c25e1b1c9606557d2802d1395
DIST postgrey-1.37.tar.gz 41815 BLAKE2B dd8a1f62f56a614c25863afde089f1882a1567e3a53a24b1d12b6f23994388caf99059f05775853065143f4f953a6fd964625d5c865993e0e679dd545b848c11 SHA512 369968212ea60539efc0d4a7ae84f7c3ce13f5622e6ee070a0089423ef81ca8f7541ebd20289291d0e6a3aec2ca30dbc9c0d9c0a6f0a686adfadb5d0dd7830ca
+DIST postgrey-1.37_p20190625.tar.gz 124667 BLAKE2B ca2caba51a72198e42d6d4d9c5c7590b62c1bd1589d05bfb4096fb4d95ff62ff96976beac8c1b35136a4a6830af936244485ff7dcdcd46d8558a4bef0bbb123a SHA512 f3caf3c7663bd8784701c7e1ad45d1c577edf6fac14591a6983fda25e7f8a875f2501780a8f97ce72e6a324878404e9ac2a003a07ae07ad4debae61fe734b8d4
diff --git a/mail-filter/postgrey/metadata.xml b/mail-filter/postgrey/metadata.xml
index 2805de6dd07d..53aeb0809926 100644
--- a/mail-filter/postgrey/metadata.xml
+++ b/mail-filter/postgrey/metadata.xml
@@ -2,12 +2,8 @@
- lists@xunil.at
- Stefan Weichinger
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+ sam@gentoo.org
+ Sam James
Postgrey is a Postfix policy server implementing greylisting developed by David Schweikert at the ISG.EE.
@@ -15,4 +11,7 @@
+
+ schweikert/postgrey
+
diff --git a/mail-filter/postgrey/postgrey-1.37.ebuild b/mail-filter/postgrey/postgrey-1.37.ebuild
index 37e2c1011e8c..03ab30c7a0e3 100644
--- a/mail-filter/postgrey/postgrey-1.37.ebuild
+++ b/mail-filter/postgrey/postgrey-1.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -12,7 +12,7 @@ http://postgrey.schweikert.ch/pub/old/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 x86"
IUSE=""
DEPEND=""
diff --git a/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild b/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild
new file mode 100644
index 000000000000..7714cf102c09
--- /dev/null
+++ b/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+COMMIT="eb420c5dee57dd54e6f63bad5d74e85f5cc9535d"
+DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting"
+HOMEPAGE="http://postgrey.schweikert.ch/"
+SRC_URI="https://github.com/schweikert/postgrey/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DEPEND="
+ acct-group/postgrey
+ acct-user/postgrey
+"
+RDEPEND="
+ ${DEPEND}
+ >=dev-lang/perl-5.6.0
+ dev-perl/Net-Server
+ dev-perl/IO-Multiplex
+ dev-perl/BerkeleyDB
+ dev-perl/Net-DNS
+ dev-perl/NetAddr-IP
+ dev-perl/Net-RBLClient
+ dev-perl/Parse-Syslog
+ virtual/perl-Digest-SHA
+ >=sys-libs/db-4.1
+"
+
+src_prepare() {
+ default
+ # bug 479400
+ sed -i 's@#!/usr/bin/perl -T -w@#!/usr/bin/perl -w@' postgrey || die "sed failed"
+ sed -i -e '/git/d' Makefile || die
+}
+
+src_install() {
+ # postgrey data/DB in /var
+ diropts -m0770 -o ${PN} -g ${PN}
+ dodir /var/spool/postfix/${PN}
+ keepdir /var/spool/postfix/${PN}
+ fowners postgrey:postgrey /var/spool/postfix/${PN}
+ fperms 0770 /var/spool/postfix/${PN}
+
+ # postgrey binary
+ dosbin ${PN}
+ dosbin contrib/postgreyreport
+
+ # policy-test script
+ dosbin policy-test
+
+ # postgrey data in /etc/postfix
+ insinto /etc/postfix
+ insopts -o root -g ${PN} -m 0640
+ doins postgrey_whitelist_clients postgrey_whitelist_recipients
+
+ # documentation
+ dodoc Changes README README.exim
+
+ # init.d + conf.d files
+ insopts -o root -g root -m 755
+ newinitd "${FILESDIR}"/${PN}-1.34-r3.rc.new ${PN}
+ insopts -o root -g root -m 640
+ newconfd "${FILESDIR}"/${PN}.conf.new ${PN}
+ systemd_dounit "${FILESDIR}"/postgrey.service
+}
diff --git a/mail-filter/postsrsd/Manifest b/mail-filter/postsrsd/Manifest
index fd02a04e05a9..e393a3a0931f 100644
--- a/mail-filter/postsrsd/Manifest
+++ b/mail-filter/postsrsd/Manifest
@@ -1 +1,2 @@
+DIST postsrsd-1.10.tar.gz 34844 BLAKE2B 4722e8f3ec1d5d7de0648d8afc03c38f485c92b092bd42bc02c82c4072b5eb053cbb907bd1198de1219acf465c850b4f08ee8bca629f85734ca2ff643d77c1e4 SHA512 79f824cbc56de2e79da2eb67b1888c1c171a10a7bae5f19384c22024ff7e65dd36a447e632ddaf77bea6bdfa4972c7a918a30cd3b06f7b7ae49ab7552c43be0e
DIST postsrsd-1.6.tar.gz 32111 BLAKE2B 5b4e562aa9c9b5faf0e45c035a71d76dc2b6e9b3d4399108f06e6d0ad3e4f7abfcb8c18c818f3b4787bab155bf7895caaf127a97b861b26525ad5a27f2ee4dc7 SHA512 b2df4cdec41361e15cd8c9207fb16564d607559bcb36dd73c9347b90e4f3c2414b88434ef1ffe6a18783f38c5960383516e40e4ffa28802a03539e52ca723aa1
diff --git a/mail-filter/postsrsd/postsrsd-1.10.ebuild b/mail-filter/postsrsd/postsrsd-1.10.ebuild
new file mode 100644
index 000000000000..58991e5e7a9a
--- /dev/null
+++ b/mail-filter/postsrsd/postsrsd-1.10.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Postfix Sender Rewriting Scheme daemon"
+SRC_URI="https://github.com/roehling/postsrsd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/roehling/postsrsd"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+BDEPEND=">=dev-util/cmake-2.4"
+RDEPEND=""
+
+CHROOT_DIR="${EPREFIX}/var/lib/postsrsd"
+
+src_configure() {
+ local mycmakeargs=(
+ -DCHROOT_DIR=${CHROOT_DIR}
+ -DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ newinitd "${FILESDIR}/postsrsd.init-r1" postsrsd
+ newconfd "${BUILD_DIR}/postsrsd.default" postsrsd
+ keepdir ${CHROOT_DIR}
+}
diff --git a/mail-filter/rspamd/rspamd-2.6-r2.ebuild b/mail-filter/rspamd/rspamd-2.6-r2.ebuild
index a31a0897fc9a..d22ac2c67f30 100644
--- a/mail-filter/rspamd/rspamd-2.6-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-2.6-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Rapid spam filtering system"
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index bb4f87b16807..9af00f127e62 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index 45e4eba5c48d..bf7b37ce351d 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -1,2 +1,4 @@
DIST liberation-fonts-2.1.0.tar.gz 4986277 BLAKE2B c8d60a749d35d979237d1c82be69e5fc4fe3e8702893235b9064c6790974126a6e019f20164ca3431bfc2c972cd7102aa688519739e381660f745cc5f1099613 SHA512 70dbdd2e61808e7a56f76d605ded6195fc1b2d91b8682e8daef1bc5bf36a45a04b8f4e77fdcafa81f1253835c65637abc4c2df65ebe86aa1555fc074826ee0ba
+DIST liberation-fonts-2.1.2.tar.gz 4976962 BLAKE2B 934b71cbd45ba94b6cf18fc81942004beefe2dba860f13e885930b423208aa0b2f328f3d6e95f65c16017fdf40d51c25bf2b94d8654e3118fd347a00253056fc SHA512 9eec48e3a87d07499969926204fc9063d9d196894b95536b506988041b1965064319a2686bf54cbaabf836f54323816fe0d2a74ae14249366791de94da630e29
DIST liberation-fonts-ttf-2.1.0.tar.gz 2355448 BLAKE2B 675f739710d46b7198fd2bab68ee084c205c2ac5c4ce34d502040ee2ea9be50d9014302840edf72997619c6acefcb81984f04c2c5f5e5a4c57f276016e53ed5c SHA512 608252c064b5368591549a6c1b927a361e1373881607bf7217a2cd9f3ae72eda7389a7cfd530bba29ffbffc1128e68b8d8c83d9b9937c33815caf41766301c4b
+DIST liberation-fonts-ttf-2.1.2.tar.gz 2370416 BLAKE2B 386eab6e886b677082bbbe1bf625bf91304e6baa4352a8dba3d073d3d2d80c1ae85ebb456f0b967be7ba9c430d7a95364107e54e789d419605976174ceb751b3 SHA512 bfdc3fb7dff1e78aa833035dad40bc26b12bce24b9e16863ec2f8f768a2a370705fafd25c430e3ed4ba7f742051c52ed3cf14da82a8500797b9efcdeef507f3c
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.1.2.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.1.2.ebuild
new file mode 100644
index 000000000000..817ed2e44f8a
--- /dev/null
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.1.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit font python-any-r1
+
+DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
+HOMEPAGE="https://github.com/liberationfonts/liberation-fonts"
+SRC_URI="fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/5722232/${P}.tar.gz )
+ !fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/5722233/${PN}-ttf-${PV}.tar.gz )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
+SLOT="0"
+LICENSE="OFL-1.1"
+IUSE="fontforge X"
+
+FONT_SUFFIX="ttf"
+
+FONT_CONF=( "${FILESDIR}/60-liberation.conf" )
+
+BDEPEND="
+ fontforge? (
+ ${PYTHON_DEPS}
+ media-gfx/fontforge
+ $(python_gen_any_dep 'dev-python/fonttools[${PYTHON_USEDEP}]')
+ )"
+
+python_check_deps() {
+ has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+ default
+ if use fontforge ; then
+ sed -i "s/= python3/= ${EPYTHON}/" Makefile || die
+ fi
+}
+
+pkg_setup() {
+ if use fontforge; then
+ FONT_S="${S}/${PN}-ttf-${PV}"
+ python-any-r1_pkg_setup
+ else
+ FONT_S="${WORKDIR}/${PN}-ttf-${PV}"
+ S="${FONT_S}"
+ fi
+ font_pkg_setup
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 88afaa4b0e3c..66746c254765 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/cairosvg/cairosvg-2.5.0.ebuild b/media-gfx/cairosvg/cairosvg-2.5.0.ebuild
index a0513821d46b..4c147e00d421 100644
--- a/media-gfx/cairosvg/cairosvg-2.5.0.ebuild
+++ b/media-gfx/cairosvg/cairosvg-2.5.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
RDEPEND="
dev-python/cairocffi[${PYTHON_USEDEP}]
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 5f042a513565..9a4d4d729de3 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1 +1,2 @@
DIST eog-3.36.3.tar.xz 3651556 BLAKE2B 6224b21342b24bed8cfed5702c440547423a7c0db36278c082f336f274ebabea401700c418eafced814fb33043362963055acbcacc81edff8b0f202898c09542 SHA512 90205561dbc49aa42e60f636ce23d04dcd05513d28176ffa4c1dd6602889c4b2c920bd299086d3d7bfee72fcc6a029e2d34e14eb80ba5f91573161fbd1b85aea
+DIST eog-3.36.4.tar.xz 3651632 BLAKE2B f971ab236422a875ea8d91a661c6c653ba2ef4834b282dcce7d5c53e9c23bedf49610c0a8ff1bedb2af1821610ab29de8476a2b13b6cb1b82e58c3309b56b7dd SHA512 d1f4aa2e225a8147507cbed74a74bd435887884a2431f3ea0d1c569217a291f93c1440bede1c6abf03660ad8df46530e8b2195399ac8faaac36b1e31e8e93daf
diff --git a/media-gfx/eog/eog-3.36.4.ebuild b/media-gfx/eog/eog-3.36.4.ebuild
new file mode 100644
index 000000000000..75800455eb94
--- /dev/null
+++ b/media-gfx/eog/eog-3.36.4.ebuild
@@ -0,0 +1,70 @@
+# 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="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="exif? ( jpeg )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+ >=dev-libs/glib-2.53.4:2
+ >=dev-libs/libpeas-0.7.4:=[gtk]
+ >=gnome-base/gnome-desktop-2.91.2:3=
+ >=gnome-base/gsettings-desktop-schemas-2.91.92
+ >=x11-misc/shared-mime-info-0.20
+ >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+ >=x11-libs/gtk+-3.22.0:3[introspection,X]
+ sys-libs/zlib
+
+ exif? ( >=media-libs/libexif-0.6.14 )
+ lcms? ( media-libs/lcms:2 )
+ xmp? ( media-libs/exempi:2 )
+ jpeg? ( virtual/jpeg:0 )
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+ svg? ( >=gnome-base/librsvg-2.44.0:2 )
+
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ gtk-doc? ( >=dev-util/gtk-doc-1.16
+ app-text/docbook-xml-dtd:4.1.2 )
+ dev-util/glib-utils
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use exif libexif)
+ $(meson_use lcms cms)
+ $(meson_use xmp)
+ $(meson_use jpeg libjpeg)
+ $(meson_use svg librsvg)
+ $(meson_use gtk-doc gtk_doc)
+ $(meson_use introspection)
+ -Dinstalled_tests=false
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
index 99dae78ef38b..009934548efa 100644
--- a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
LICENSE="CPL-1.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
REQUIRED_USE="
diff --git a/media-gfx/hugin/hugin-2020.0.0.ebuild b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
similarity index 90%
rename from media-gfx/hugin/hugin-2020.0.0.ebuild
rename to media-gfx/hugin/hugin-2020.0.0-r1.ebuild
index 7c7d2c57f260..60bec67bbd97 100644
--- a/media-gfx/hugin/hugin-2020.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
+inherit python-single-r1 wxwidgets cmake xdg
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net"
@@ -39,7 +39,7 @@ CDEPEND="
virtual/glu
virtual/jpeg:0
virtual/opengl
- x11-libs/wxGTK:3.0=[X,opengl]
+ x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
lapack? ( virtual/blas virtual/lapack )
python? ( ${PYTHON_DEPS} )
sift? ( media-gfx/autopano-sift-C )"
@@ -68,7 +68,7 @@ src_prepare() {
-e "/COMMAND.*GZIP/d" \
-e "s/\.gz//g" \
"${S}"/doc/CMakeLists.txt || die
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -76,11 +76,11 @@ src_configure() {
-DBUILD_HSI=$(usex python)
-DENABLE_LAPACK=$(usex lapack)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
use python && python_optimize
local lang
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 3eb92a7c66c7..0c9e3ac20a0f 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{6,7,8} )
-inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
+inherit mercurial python-single-r1 wxwidgets cmake xdg
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net"
@@ -19,7 +19,7 @@ SLOT="0"
KEYWORDS=""
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
+IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
CDEPEND="
!!dev-util/cocom
@@ -41,12 +41,13 @@ CDEPEND="
virtual/glu
virtual/jpeg:0
virtual/opengl
- x11-libs/wxGTK:3.0=[X,opengl]
+ x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
lapack? ( virtual/blas virtual/lapack )
python? ( ${PYTHON_DEPS} )
sift? ( media-gfx/autopano-sift-C )"
RDEPEND="${CDEPEND}
- media-libs/exiftool"
+ media-libs/exiftool
+ raw? ( media-gfx/dcraw )"
DEPEND="${CDEPEND}
dev-cpp/tclap
sys-devel/gettext
@@ -65,7 +66,7 @@ pkg_setup() {
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -73,11 +74,11 @@ src_configure() {
-DBUILD_HSI=$(usex python)
-DENABLE_LAPACK=$(usex lapack)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
use python && python_optimize
local lang
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index f73096a27f9f..453831cd2d3d 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,4 +1,4 @@
-DIST ImageMagick-6.9.11-44.tar.xz 9155096 BLAKE2B efd52ca6d30a385f29f0fda102c58d89dff6b80d702391a39d52cb59835fe258a21b171a64dfefd91f15d377177219de1a1db1b2e8bb2e3337119497a38b272e SHA512 dcf2965f1751c50649c74160b29f6909b6fa2dfdf64520d0f55be9fe0eef02aac32f9c376756295c90b9c89b2947890249ca0e41f0cc56e2ec4b37678bc92372
DIST ImageMagick-6.9.11-46.tar.xz 9165256 BLAKE2B 5fb2c7ef90c165388bf9c9b42d752823e62b94a631f8dd8161d8c71b718154b5f577474a7074f42644e994af1aec99f28c4d69913be3045865cbc87533c05fca SHA512 63022225e694dccbfb52eec3793332bc92ff2d6a51a6ed161d63e044a33c8d13f0a2630afc1935cb139ca2d0e141d99a9bec23f5eac82a488a461ed30baf85f5
-DIST ImageMagick-7.0.10-44.tar.xz 9649740 BLAKE2B b721532e267c2832252519b52fd6f88795e0bc22cc165020478dc80164784a0407e0eec066ecf8db68409e04a48e877d16f882e773f34c50797784ba771ec997 SHA512 246567c84ecaaba4f7742c215b2d79f181fedd3ba953d318f177916e5a3757ddbae111837657a5df4b420da3b1337b1ec78c871c57b3e738585ee847a7b9d768
+DIST ImageMagick-6.9.11-52.tar.xz 9152084 BLAKE2B bc50767e3eacc06ccf6168d9cac5666a2836e3b2085ee834594da419c2912cafce7dee84573f1a2062e051afb066529ae79b7bea25242fb055fdd11e734ee0d7 SHA512 79e6ab62722060601283f4c172f7a27b7d3c00f5dbdfaea4c1f5c1940a681ab3fd53e4ea4b736adc3e0662ecccba13f7f86baada3d319733191eda37abee38a1
DIST ImageMagick-7.0.10-46.tar.xz 9649132 BLAKE2B 8083aa4fa26d59c4bea4bd9a45ab5b1a46d3fe0ecdbb0090588d16bcc31ad044171a59dc7e8681c878e885d83c7b34a4bbfa21273d5711181bbefdee457ac895 SHA512 7008286a05a1794a3061bd598bf6acc70dcfe1aec3a6b5632dce9dd87bb6c28385af0d469b47996d5576c4b39c5d48a4fcd7752b9353ec28b7f7d8160f4c5023
+DIST ImageMagick-7.0.10-52.tar.xz 9642352 BLAKE2B c1a86214978da88d66ef90b91516482fe67ee5e215fd5d76c79dbbcd9e33cc2d417d8f5d8e29056743737dd2275fe7a8d891b6ad2f3c8d7d5ab0adfd83f60dd1 SHA512 da1a8d53af0dc8f0dc8f71a7d41c5277c1e17f81e03a3c54852ced65d5d379577989e274bac66926c8a10f4d2f2834f7456b79635007252308ca593e98ef6d43
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild
index 671132b9e8fb..2093cc705f7b 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/6.9.11-37"
-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"
+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 )
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.44.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild
similarity index 97%
rename from media-gfx/imagemagick/imagemagick-6.9.11.44.ebuild
rename to media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild
index 2093cc705f7b..671132b9e8fb 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.44.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/6.9.11-37"
-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"
+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 )
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild
index c476290b8c6a..e5576b5108a8 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild
@@ -13,7 +13,7 @@ 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"
+ 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"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.44.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild
similarity index 97%
rename from media-gfx/imagemagick/imagemagick-7.0.10.44.ebuild
rename to media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild
index e5576b5108a8..c476290b8c6a 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.44.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild
@@ -13,7 +13,7 @@ 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"
+ 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"
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index b1b5f5552a52..7f5aba286908 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,2 +1 @@
-DIST pstoedit-3.70.tar.gz 1013949 BLAKE2B ec459dc56851d942076adf4352ef974188b0b8273a6f9150c8767c1d63c3c9b6d993ea8c0b1a0b59663b31652eb7a4b8697e4c38c23d5aa0572d554120a5e900 SHA512 63668ea039fdf988ba007bafb8dc1f23f06d4eb430a92b97fb93c71b819f63e2708b99476ec9b096598db2ddd30d29a69101f078e7d4fdfec314677f50293cf9
DIST pstoedit-3.75.tar.gz 1290057 BLAKE2B 607a265ea6f058e1ba432d55c4602452cd52a48302441ecee542a113d90b090ce888cc6fa5e3a8e3a2fdbf94dce9b1ab1f7f5ba58ab81f1f509eea9052a3cd82 SHA512 54b8cf7e78e52027d45e7550821476d9a9c4df4f63af83792b6a2909bc62236450ba6b619f95eede9f61a715f4937f1fbaf2ce4ae4b486daa0294c396a882a28
diff --git a/media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch b/media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch
deleted file mode 100644
index 279ed715f53a..000000000000
--- a/media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6b33220..30c9f2e 100755
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -139,7 +139,7 @@ libpstoedit_la_SOURCES = \
- genericints.h \
- version.h
-
--libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm
-+libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} ${LIBLD_LDFLAGS} -lm
- libpstoedit_la_LDFLAGS = -no-undefined
-
- pstoedit_SOURCES = cmdmain.cpp
diff --git a/media-gfx/pstoedit/files/pstoedit-3.70-pkgconfig.patch b/media-gfx/pstoedit/files/pstoedit-3.70-pkgconfig.patch
deleted file mode 100644
index c101077431e5..000000000000
--- a/media-gfx/pstoedit/files/pstoedit-3.70-pkgconfig.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-LIBPNG_LDFLAGS is never substituted...
-https://bugs.gentoo.org/show_bug.cgi?id=551208
-
-Index: pstoedit-3.70/config/pstoedit.pc.in
-===================================================================
---- pstoedit-3.70.orig/config/pstoedit.pc.in
-+++ pstoedit-3.70/config/pstoedit.pc.in
-@@ -7,5 +7,5 @@ Name: pstoedit
- Description: converts PostScript(TM) and PDF files to other vector graphic formats
- Version: @VERSION@.0
- Requires:
--Libs: -L@libdir@ -lpstoedit @LIBPNG_LDFLAGS@ @CXX_STD_LIB@ @CXX_RUNTIME_LIB@ @LIBLD_LDFLAGS@
-+Libs: -L@libdir@ -lpstoedit @CXX_STD_LIB@ @CXX_RUNTIME_LIB@ @LIBLD_LDFLAGS@
- Cflags: -I@includedir@
diff --git a/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild b/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
deleted file mode 100644
index 23d9052cacf5..000000000000
--- a/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Translate PostScript and PDF graphics into other vector formats"
-HOMEPAGE="https://sourceforge.net/projects/pstoedit/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="emf imagemagick plotutils pptx static-libs"
-
-RDEPEND="
- >=media-libs/gd-2.0.35-r1:=
- >=app-text/ghostscript-gpl-8.71-r1
- emf? ( >=media-libs/libemf-1.0.3 )
- imagemagick? ( >=media-gfx/imagemagick-6.6.1.2:=[cxx] )
- plotutils? ( media-libs/plotutils )
- pptx? ( dev-libs/libzip )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.60-libdl.patch
- "${FILESDIR}"/${PN}-3.70-pkgconfig.patch
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e '/CXXFLAGS="-g"/d' \
- -e 's:-pedantic::' \
- configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(use_with emf) \
- $(use_with imagemagick magick) \
- $(use_with plotutils libplot) \
- $(use_with pptx) \
- --without-swf
-}
-
-src_install() {
- default
- doman doc/pstoedit.1
- dodoc doc/*.txt
- docinto html
- dodoc doc/*.htm
-
- find "${ED}" -name '*.la' -delete
-}
diff --git a/media-gfx/pstoedit/pstoedit-3.75.ebuild b/media-gfx/pstoedit/pstoedit-3.75.ebuild
index ff88b5ffff46..c876af5e5c68 100644
--- a/media-gfx/pstoedit/pstoedit-3.75.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.75.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="emf imagemagick plotutils pptx"
BDEPEND="
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 78db7e6345cd..49ab0ed27cd4 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,5 +1 @@
-DIST scrot-1.2.tar.gz 36839 BLAKE2B 26ca05fb3c8fa9069ad87bdd5cc93791994e44e2f5cd7a4b729a6c9e3035c349049500b9627fd31532c280465f77f839370d095f1b0f2ccc10649b3e6fa01edb SHA512 b89e7a94e6317fdb7bd260190c6d68a2dfefc08691b4574337afdfff84f55b8b9c955a6ac60642ae9749c1deaa16bee7b855fbd15833a95f602536693daf8c37
-DIST scrot-1.3.tar.gz 141726 BLAKE2B 1972edfa3b61c95fd786d0b4db13633778293b2c671c395939ea0b77d49714e644abd60cfae5656f03fd1c701185d2c8961c45d62989e882f2cd8f4a824dee57 SHA512 45828824701c7574676d0746d01f3dc8313ea91a272fa169b616765442e8842b67d8aa73f47009a66d34dd6b89a230fd9fb42bc598e88baae70fc45345c13a4c
DIST scrot-1.4.tar.gz 157779 BLAKE2B ba844f8bc500c468d028ce62ae57bd6a9fa0e403df6f05dd217722a9115456b70a38aabd7ccb0da53d855b9971d0f5948f82545ca0c8cceb75ede0d4546e27c1 SHA512 8423e7b2658f3e0ccf30f61e122016469226328adf8b1e511aeb031dd2655ae66582651e2d046c7c35d23efb98656369a02b59e711980481ddc4db24c299ee11
-DIST scrot_0.8-13.debian.tar.gz 7943 BLAKE2B 6c58c76f3a8dcf61a8ca4c31f5845cb27b4d0ed2bf9619cc8ea5824b5e42c66ee5163c7f4e76308763947b933003dbd3df6e641b0596ed342993343fd5418a75 SHA512 3f6d0a8e592088af38a3d90394b6b7246430479f5b0c8451af5eae383725d1896dc4bbf595495f9f2b546f00ef38780123c4ee0e3f06971c55a6ac2dfa5b7d53
-DIST scrot_0.8.orig.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d4bb2052a90703353a9ad5b6ab46c8840ed20834f976badab4258fbb0f031645d9689eef1b838ebd4b1a0 SHA512 cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c
diff --git a/media-gfx/scrot/files/scrot.bash-completion b/media-gfx/scrot/files/scrot.bash-completion
deleted file mode 100644
index d7e5729cd849..000000000000
--- a/media-gfx/scrot/files/scrot.bash-completion
+++ /dev/null
@@ -1,40 +0,0 @@
-# bash-completion script for scrot
-# place this in /etc/bash_completion.d
-
-_scrot() {
- local cur prev opts
- COMPREPLY=()
- cur=${COMP_WORDS[COMP_CWORD]}
- prev=${COMP_WORDS[COMP_CWORD-1]}
- opts="-h --help -v --version -b --border -c --count -d --delay -e --exec \
- -q --quality -m --multidisp -s --select -t --thumb"
-
- if [[ "${cur}" == -* ]] || [[ ${COMP_CWORD} -eq 1 ]]; then
- COMPREPLY=($(compgen -W "${opts}" -- "${cur}"))
- fi
-
- case "${prev}" in
- -e|--exec)
- COMPREPLY=($(compgen -A command -- "${cur}"))
- ;;
- -h|--help)
- COMPREPLY=($(compgen -W "${opts/-h --help}" -- "${cur}"))
- ;;
- -v|--version)
- COMPREPLY=($(compgen -W "${opts/-v --version}" -- "${cur}"))
- ;;
- -b|--border)
- COMPREPLY=($(compgen -W "${opts/-b --border}" -- "${cur}"))
- ;;
- -c|--count)
- COMPREPLY=($(compgen -W "${opts/-c --count}" -- "${cur}"))
- ;;
- -m|--multidisp)
- COMPREPLY=($(compgen -W "${opts/-m --multidisp}" -- "${cur}"))
- ;;
- -s|--select)
- COMPREPLY=($(compgen -W "${opts/-s --select}" -- "${cur}"))
- ;;
- esac
-}
-complete -F _scrot scrot
diff --git a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
deleted file mode 100644
index 94d6392391df..000000000000
--- a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PV=${PV/_p/-}
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="Screen capture utility using imlib2 library"
-HOMEPAGE="http://scrot.sourcearchive.com/"
-SRC_URI="http://${PN}.sourcearchive.com/downloads/${MY_PV}/${PN}_0.8.orig.tar.gz
- http://${PN}.sourcearchive.com/downloads/${MY_PV}/${PN}_${MY_PV}.debian.tar.gz"
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/imlib2-1.0.3
- >=media-libs/giblib-1.2.3
- || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-0.8
-
-src_prepare() {
- local d=${WORKDIR}/debian/patches
- EPATCH_SOURCE=${d} epatch $(<"${d}"/series)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- rm -r "${ED}"/usr/doc || die
- dodoc AUTHORS ChangeLog
-
- newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
-}
diff --git a/media-gfx/scrot/scrot-1.2.ebuild b/media-gfx/scrot/scrot-1.2.ebuild
deleted file mode 100644
index 234442c4fbc2..000000000000
--- a/media-gfx/scrot/scrot-1.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools bash-completion-r1
-
-DESCRIPTION="Screen capture utility using imlib2 library"
-HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
-SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
- >=media-libs/giblib-1.2.3
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXfixes
- || (
- media-libs/imlib2[gif]
- media-libs/imlib2[jpeg]
- media-libs/imlib2[png]
- media-libs/imlib2[tiff]
- )
-"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
-"
-DOCS=(
- AUTHORS ChangeLog CONTRIBUTING.md README TODO
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_install() {
- default
-
- newbashcomp "${FILESDIR}"/${PN}-1.2.bash-completion ${PN}
-}
diff --git a/media-gfx/scrot/scrot-1.3-r1.ebuild b/media-gfx/scrot/scrot-1.3-r1.ebuild
deleted file mode 100644
index 61281f19b1fb..000000000000
--- a/media-gfx/scrot/scrot-1.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools bash-completion-r1
-
-DESCRIPTION="Screen capture utility using imlib2 library"
-HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
-SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
- >=media-libs/giblib-1.2.3
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXfixes
- || (
- media-libs/imlib2[gif]
- media-libs/imlib2[jpeg]
- media-libs/imlib2[png]
- media-libs/imlib2[tiff]
- )
-"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
-"
-DOCS=(
- AUTHORS ChangeLog CONTRIBUTING.md README.md TODO
-)
-
-src_prepare() {
- sed -i -e 's#-g -O3##g' src/Makefile.am || die
- default
- eautoreconf
-}
-
-src_install() {
- default
-
- newbashcomp "${FILESDIR}"/${PN}-1.2.bash-completion ${PN}
-}
diff --git a/media-gfx/scrot/scrot-1.4.ebuild b/media-gfx/scrot/scrot-1.4.ebuild
index 956e5ff60f2c..741754ad3601 100644
--- a/media-gfx/scrot/scrot-1.4.ebuild
+++ b/media-gfx/scrot/scrot-1.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV
LICENSE="feh LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
RDEPEND="
>=media-libs/giblib-1.2.3
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index b7bccc761219..30638d644c0b 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1 +1,2 @@
DIST simple-scan-3.36.4.tar.xz 914688 BLAKE2B ae972cf6b5085d0e79fdfa9250aed655051b97239988b410e175b3058dda3ed5dc19b6574c015dd9a7afcbefd4d05cce6120b3648c061ff1e52043f866769a62 SHA512 780eeabd9593f14b2b04b9474bb1faebe3a32a7fd7e6b067c144fe44ad9b880f307bf80a8a925fb2549ca0b8172357c9a393146dfabd4b68bfc4396c32de4fa8
+DIST simple-scan-3.36.7.tar.xz 914572 BLAKE2B dee363c08b0454bc6a4990fc14831069162f74365549a081421c286658cce130957b91030558d1232c979601be00e955996f702e8bafeeeb30710b89ee3e42c0 SHA512 ff0dd82d0db30dbfacfd8b04d7bcbc0599c1b1b47f845e1176ec7ffce0aa44253735431c2c531ef428dae0cee80818acfbba4fb2514f501623c0c0242aa8a7a2
diff --git a/media-gfx/simple-scan/simple-scan-3.36.7.ebuild b/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
new file mode 100644
index 000000000000..a7a3d720bbeb
--- /dev/null
+++ b/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.34"
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Simple document scanning utility"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="colord webp"
+
+DEPEND="
+ >=dev-libs/glib-2.38:2
+ >=x11-libs/gtk+-3.22:3
+ >=sys-libs/zlib-1.2.3.1:=
+ x11-libs/cairo:=
+ x11-libs/gdk-pixbuf:2
+ >=dev-libs/libgusb-0.2.7
+ colord? ( >=x11-misc/colord-0.1.24:=[udev] )
+ webp? ( media-libs/libwebp )
+ >=media-gfx/sane-backends-1.0.20:=
+
+ virtual/jpeg:0=
+"
+# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
+RDEPEND="${DEPEND}
+ x11-misc/xdg-utils
+"
+BDEPEND="
+ $(vala_depend)
+ dev-libs/libxml2:2
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ dev-libs/libgusb[vala]
+ colord? ( x11-misc/colord[vala] )
+"
+
+PATCHES=(
+ # Add control for optional dependencies
+ "${FILESDIR}"/3.26-add-control-optional-deps.patch
+)
+
+src_prepare() {
+ vala_src_prepare
+ xdg_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use colord)
+ -Dpackagekit=false
+ $(meson_use webp)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 0f72754e7044..8a7fdcbef884 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/allegro/allegro-5.2.6.0.ebuild b/media-libs/allegro/allegro-5.2.6.0.ebuild
index 0b19c66b087c..1ba05c1efe7c 100644
--- a/media-libs/allegro/allegro-5.2.6.0.ebuild
+++ b/media-libs/allegro/allegro-5.2.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.g
LICENSE="BSD ZLIB"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
IUSE="alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama"
RESTRICT="!test? ( test )"
diff --git a/media-libs/jbig2dec/jbig2dec-0.19.ebuild b/media-libs/jbig2dec/jbig2dec-0.19.ebuild
index a93d96944e6d..297aaf13dead 100644
--- a/media-libs/jbig2dec/jbig2dec-0.19.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ArtifexSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.t
LICENSE="AGPL-3"
SLOT="0/$(ver_cut 1-2)" #698428
-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 ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="png static-libs test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
index 1c4bfaf15476..de9a5e1eb9c7 100644
--- a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
+++ b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
@@ -44,7 +44,7 @@ multilib_src_configure() {
}
multilib_src_install() {
- emake DESTDIR="${ED}" install
+ emake DESTDIR="${D}" install
}
multilib_src_install_all() {
diff --git a/media-libs/mesa/mesa-20.2.4.ebuild b/media-libs/mesa/mesa-20.2.4.ebuild
index 9c506a4c2497..562ba0c64e65 100644
--- a/media-libs/mesa/mesa-20.2.4.ebuild
+++ b/media-libs/mesa/mesa-20.2.4.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://archive.mesa3d.org/${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"
+ 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"
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 5c410fcd9811..a83701ae097f 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://archive.mesa3d.org/${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"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
diff --git a/media-libs/speex/speex-1.2.0-r2.ebuild b/media-libs/speex/speex-1.2.0-r2.ebuild
index c6d40ee3ccb8..4a46ec58cd0c 100644
--- a/media-libs/speex/speex-1.2.0-r2.ebuild
+++ b/media-libs/speex/speex-1.2.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse utils +vbr"
RDEPEND="
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
index c529f672be52..abc7431a1101 100644
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon"
RDEPEND="!=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
+ jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="test? ( jpeg )" #483132
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/tiffconf.h
+)
+
+src_prepare() {
+ default
+
+ # tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
+ sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --without-x
+ --with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable cxx)
+ $(use_enable jbig)
+ $(use_enable jpeg)
+ $(use_enable lzma)
+ $(use_enable static-libs static)
+ $(use_enable webp)
+ $(use_enable zlib)
+ $(use_enable zstd)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+ # remove useless subdirs
+ if ! multilib_is_native_abi ; then
+ sed -i \
+ -e 's/ tools//' \
+ -e 's/ contrib//' \
+ -e 's/ man//' \
+ -e 's/ html//' \
+ Makefile || die
+ fi
+}
+
+multilib_src_test() {
+ if ! multilib_is_native_abi ; then
+ emake -C tools
+ fi
+ emake check
+}
+
+multilib_src_install_all() {
+ find "${ED}" -type f -name '*.la' -delete || die
+ rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die
+}
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 733501c0d657..d4d406cf057f 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,3 +1,2 @@
DIST xine-lib-1.2.10.tar.xz 5226116 BLAKE2B e1bc088814c951ff56e55b626fe1f6f34c3da744e716de369a68e6c82a5adc414b452675ad19a5f82500bade6795b54efd503de8ffe4f1e65b534317ca0a26af SHA512 1cbe033da606d67a0a59f19968b2fe1cb46eaeb32c4b4aca7b91125b7230e15bd36d1e3e39e48e6eda56e556018f9f9bf84acb0012d3dd634306e7110fdc4c5f
DIST xine-lib-1.2.11.tar.xz 5282204 BLAKE2B c61bec690f662e01372b1c068b0681ac4435925ca90a767c590d5d3b968163280c11210dc9e3aeb4cc6bb6b3520349ba22e18b17f34bd9139af02280d3a37ee3 SHA512 8208e4699819465ec9e820530f27b6129ee954ea17ab474eb9eda12137af1417ed5260830c1006ce32266a3913d22ba9957689bb5552464908038a1b8a8efbcf
-DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c
diff --git a/media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch b/media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch
deleted file mode 100644
index 34062222e32c..000000000000
--- a/media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://git.pld-linux.org/?p=packages/xine-lib.git;a=blob;f=imagemagick7.patch;h=d050323cdf509c9bb5f8edbad90084e8ce5c1b38;hb=HEAD
-
---- xine-lib-1.2.6/src/video_dec/image.c
-+++ xine-lib-1.2.6/src/video_dec/image.c
-@@ -39,7 +39,7 @@
- #define LOG
- */
-
--#include
-+#include
- #ifdef PACKAGE_NAME
- #undef PACKAGE_BUGREPORT
- #undef PACKAGE_NAME
diff --git a/media-libs/xine-lib/xine-lib-1.2.10.ebuild b/media-libs/xine-lib/xine-lib-1.2.10.ebuild
index 1c6c377268c7..49cb170173da 100644
--- a/media-libs/xine-lib/xine-lib-1.2.10.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.10.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
else
- KEYWORDS="amd64 arm64 ~hppa ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 arm64 ~hppa ppc ppc64 x86"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"
diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
deleted file mode 100644
index f1ccbed79848..000000000000
--- a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic libtool
-
-if [[ ${PV} == *9999* ]]; then
- EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2"
- inherit autotools mercurial
- unset NLS_IUSE
- NLS_DEPEND="sys-devel/gettext"
- NLS_RDEPEND="virtual/libintl"
-else
- KEYWORDS="amd64 arm64 ~hppa ppc ppc64 x86"
- SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
- NLS_IUSE="nls"
- NLS_DEPEND="nls? ( sys-devel/gettext )"
- NLS_RDEPEND="nls? ( virtual/libintl )"
-fi
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X xinerama +xv xvmc ${NLS_IUSE}"
-
-RDEPEND="${NLS_RDEPEND}
- dev-libs/libxdg-basedir
- media-libs/libdvdnav
- media-video/ffmpeg:0=
- sys-libs/zlib:=
- virtual/libiconv
- a52? ( media-libs/a52dec )
- aac? ( media-libs/faad2 )
- aalib? ( media-libs/aalib )
- alsa? ( media-libs/alsa-lib )
- bluray? ( >=media-libs/libbluray-0.2.1:= )
- css? ( >=media-libs/libdvdcss-1.2.10 )
- dts? ( media-libs/libdca )
- dxr3? ( media-libs/libfame )
- flac? ( media-libs/flac )
- gtk? ( x11-libs/gdk-pixbuf:2 )
- imagemagick? ( virtual/imagemagick-tools )
- jack? ( virtual/jack )
- jpeg? ( virtual/jpeg:0 )
- libcaca? ( media-libs/libcaca )
- mad? ( media-libs/libmad )
- mng? ( media-libs/libmng:= )
- modplug? ( >=media-libs/libmodplug-0.8.8.1 )
- musepack? ( >=media-sound/musepack-tools-444 )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- pulseaudio? ( media-sound/pulseaudio )
- samba? ( net-fs/samba )
- sdl? ( media-libs/libsdl )
- speex? (
- media-libs/libogg
- media-libs/speex
- )
- theora? (
- media-libs/libogg
- media-libs/libtheora
- )
- truetype? (
- media-libs/fontconfig
- media-libs/freetype:2
- )
- v4l? ( media-libs/libv4l )
- vaapi? ( x11-libs/libva:0=[X,opengl] )
- vcd? (
- >=media-video/vcdimager-0.7.23
- dev-libs/libcdio:0=[-minimal]
- )
- vdpau? ( x11-libs/libvdpau )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
- vpx? ( media-libs/libvpx:0= )
- wavpack? ( media-sound/wavpack )
- X? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libxcb
- )
- xinerama? ( x11-libs/libXinerama )
- xv? ( x11-libs/libXv )
- xvmc? ( x11-libs/libXvMC )
-"
-DEPEND="${RDEPEND}
- ${NLS_DEPEND}
- app-arch/xz-utils
- >=sys-devel/libtool-2.2.6b
- virtual/pkgconfig
- oss? ( virtual/os-headers )
- v4l? ( virtual/os-headers )
- X? (
- x11-base/xorg-proto
- x11-libs/libXt
- )
- xv? ( x11-base/xorg-proto )
- xvmc? ( x11-base/xorg-proto )
- xinerama? ( x11-base/xorg-proto )
-"
-REQUIRED_USE="
- vidix? ( || ( X fbcon ) )
- xv? ( X )
- xinerama? ( X )
-"
-
-src_prepare() {
- default
-
- if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
- eapply "${FILESDIR}/${PN}-1.2.6-imagemagick7.patch"
- fi
-
- sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
-
- if [[ "${PV}" = *9999* ]] ; then
- eautoreconf
- else
- elibtoolize
- fi
-
- local x
- for x in 0 1 2 3; do
- sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
- done
-}
-
-src_configure() {
- [[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519
-
- local win32dir #197236
- if has_multilib_profile; then
- win32dir=/usr/$(ABI="x86" get_libdir)/win32
- else
- win32dir=/usr/$(get_libdir)/win32
- fi
-
- local myconf=(
- --disable-directfb
- --disable-gnomevfs
- --disable-optimizations
- --disable-real-codecs
- --disable-v4l
- --disable-w32dll
- --enable-avformat
- --with-external-dvdnav
- --with-real-codecs-path=/usr/$(get_libdir)/codecs
- --with-w32-path=${win32dir}
- --with-xv-path=/usr/$(get_libdir)
- --without-esound
- --without-fusionsound
- $(use_enable a52 a52dec)
- $(use_enable aac faad)
- $(use_enable aalib)
- $(use_enable altivec)
- $(use_enable bluray)
- $(use_enable dts)
- $(use_enable dvb)
- $(use_enable dxr3)
- $(use_enable fbcon fb)
- $(use_enable gtk gdkpixbuf)
- $(use_enable ipv6)
- $(use_enable jpeg libjpeg)
- $(use_enable mad)
- $(use_enable mmap)
- $(use_enable mng)
- $(use_enable modplug)
- $(use_enable musepack)
- $(use_enable opengl)
- $(use_enable opengl glu)
- $(use_enable oss)
- $(use_enable samba)
- $(use_enable v4l libv4l)
- $(use_enable v4l v4l2)
- $(use_enable vaapi)
- $(use_enable vdpau)
- $(use_enable vis)
- $(use_enable vidix)
- $(use_enable xinerama)
- $(use_enable xvmc)
- $(use_enable vcd)
- $(use_enable vdr)
- $(use_enable vpx)
- $(use_with alsa)
- $(use_with flac libflac)
- $(use_with imagemagick)
- $(use_with jack)
- $(use_with libcaca caca)
- $(use_with pulseaudio)
- $(use_with sdl)
- $(use_with speex)
- $(use_with theora)
- $(use_with truetype fontconfig)
- $(use_with truetype freetype)
- $(use_with vorbis)
- $(use_with wavpack)
- $(use_with X x)
- $(use_with X xcb)
- )
- [[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- # enable verbose building, bug #448140
- emake V=1
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
- rm -f "${ED}"usr/share/doc/${PF}/COPYING || die
-}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index b0140b4a1a54..b8838e40bb45 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/mythplugins/mythplugins-31.0-r1.ebuild b/media-plugins/mythplugins/mythplugins-31.0-r1.ebuild
index c943e976e8cd..5fb249aee59e 100644
--- a/media-plugins/mythplugins/mythplugins-31.0-r1.ebuild
+++ b/media-plugins/mythplugins/mythplugins-31.0-r1.ebuild
@@ -73,7 +73,7 @@ RDEPEND="
media-video/dvdauthor
media-video/mjpegtools[png]
media-video/transcode
- virtual/cdrtools
+ app-cdr/cdrtools
)
mythbrowser? ( dev-qt/qtwebkit:5 )
mythgame? (
@@ -92,7 +92,7 @@ RDEPEND="
cdda? (
media-sound/cdparanoia
dev-libs/libcdio:=
- cdr? ( virtual/cdrtools )
+ cdr? ( app-cdr/cdrtools )
)
)
mythnetvision? (
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 63403c9fb845..fc3d8b045de0 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/abcde/abcde-2.9.3-r1.ebuild b/media-sound/abcde/abcde-2.9.3-r1.ebuild
index e33e9553b76b..2c0f83b27dd3 100644
--- a/media-sound/abcde/abcde-2.9.3-r1.ebuild
+++ b/media-sound/abcde/abcde-2.9.3-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
)
)
aiff? ( media-video/ffmpeg )
- cdr? ( virtual/cdrtools )
+ cdr? ( app-cdr/cdrtools )
flac? ( media-libs/flac )
id3tag? (
dev-python/eyeD3:0.7
diff --git a/media-sound/audiotools/audiotools-3.1.1.ebuild b/media-sound/audiotools/audiotools-3.1.1.ebuild
index 16e75ef9155c..24789992f77a 100644
--- a/media-sound/audiotools/audiotools-3.1.1.ebuild
+++ b/media-sound/audiotools/audiotools-3.1.1.ebuild
@@ -36,7 +36,7 @@ RDEPEND="${DEPEND}
media-libs/faad2
media-libs/faac
)
- cdr? ( virtual/cdrtools )
+ cdr? ( app-cdr/cdrtools )
cue? ( app-cdr/cdrdao )
flac? ( media-libs/flac )
gui? (
diff --git a/media-sound/din/din-49.1.ebuild b/media-sound/din/din-49.1.ebuild
index b88be5f2c753..6872627e7dcb 100644
--- a/media-sound/din/din-49.1.ebuild
+++ b/media-sound/din/din-49.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+alsa jack"
RDEPEND="
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 2662d410f9e9..a7ebae569640 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1 +1,2 @@
DIST gnome-music-3.36.4.1.tar.xz 979064 BLAKE2B e744bee915a48a5d2366350cda7ebb0c43382f46de07d9203d95675cad45d825f2d93cc07be7865eceb5be3554ab478ecf84c52d9b8f5defc198b4f1b6638926 SHA512 8b6b4a8a44158a724de82855ba781dd6ceb53a30a35160f477721a385a841697f9a7c97cdba9a5bcc5b36834d55c034eb4c892907d550205dc5b7f7af56133ca
+DIST gnome-music-3.36.7.tar.xz 971980 BLAKE2B f27d0eb49a1728873ef6d439eead83cc34fb6802afdba3b4e0ef8d15c88d2012634ec0a18a4df4ba18079915d4227f526a93ac7989ce6ea4a807b620722fad1e SHA512 3470563621c17004d0b92451950ebfca203e830cb9ffe481fef7fe4d5187afa36ccb33130695226d4db95a89af9fac592910d2a19e715af4dd0c0ffba081c3a4
diff --git a/media-sound/gnome-music/gnome-music-3.36.7.ebuild b/media-sound/gnome-music/gnome-music-3.36.7.ebuild
new file mode 100644
index 000000000000..333450fc479b
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-3.36.7.ebuild
@@ -0,0 +1,81 @@
+# 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 gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Music"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="${PYTHON_DEPS}
+ >=dev-libs/glib-2.50:2
+ >=net-libs/gnome-online-accounts-3.35.90[introspection]
+ >=dev-libs/gobject-introspection-1.54:=
+ >=x11-libs/gtk+-3.24.7:3[introspection]
+ >=dev-libs/libdazzle-3.28.0[introspection]
+ >=media-libs/libmediaart-1.9.1:2.0[introspection]
+ net-libs/libsoup:2.4[introspection]
+ >=app-misc/tracker-2.3.0:=[introspection(+)]
+ $(python_gen_cond_dep '
+ >=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
+ ')
+ >=media-libs/grilo-0.3.12:0.3[introspection]
+ >=media-plugins/grilo-plugins-0.3.10:0.3
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${DEPEND}
+ || (
+ >=app-misc/tracker-miners-2.2.0[gstreamer]
+ >=app-misc/tracker-miners-2.2.0[ffmpeg]
+ )
+ x11-libs/libnotify[introspection]
+ media-libs/gstreamer:1.0[introspection]
+ media-libs/gst-plugins-base:1.0[introspection]
+ media-plugins/gst-plugins-meta:1.0
+ media-plugins/grilo-plugins:0.3[tracker]
+ x11-misc/xdg-user-dirs
+"
+BDEPEND="
+ dev-libs/libxml2:2
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
+
+pkg_setup() {
+ python_setup
+}
+
+src_prepare() {
+ sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
+ xdg_src_prepare
+}
+
+src_install() {
+ meson_src_install
+ python_fix_shebang "${D}"/usr/bin/gnome-music
+ python_optimize
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/media-sound/mp3c/mp3c-0.31-r1.ebuild b/media-sound/mp3c/mp3c-0.31-r1.ebuild
index c81de5093efc..8ed587907721 100644
--- a/media-sound/mp3c/mp3c-0.31-r1.ebuild
+++ b/media-sound/mp3c/mp3c-0.31-r1.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
@@ -17,7 +17,7 @@ IUSE="mp3 vorbis"
DEPEND="sys-libs/ncurses:0="
RDEPEND="
${DEPEND}
- virtual/cdrtools
+ app-cdr/cdrtools
mp3? (
media-sound/lame
media-sound/mp3info
diff --git a/media-sound/mumble/mumble-1.3.3.ebuild b/media-sound/mumble/mumble-1.3.3.ebuild
index 48c7aff21f57..0da26f648ad4 100644
--- a/media-sound/mumble/mumble-1.3.3.ebuild
+++ b/media-sound/mumble/mumble-1.3.3.ebuild
@@ -21,7 +21,7 @@ else
https://dl.mumble.info/${MY_P}.tar.gz"
S="${WORKDIR}/${P/_*}"
fi
- KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 x86"
fi
LICENSE="BSD MIT"
diff --git a/media-sound/murmur/murmur-1.3.3.ebuild b/media-sound/murmur/murmur-1.3.3.ebuild
index 18faea156060..606e4379065a 100644
--- a/media-sound/murmur/murmur-1.3.3.ebuild
+++ b/media-sound/murmur/murmur-1.3.3.ebuild
@@ -24,7 +24,7 @@ else
https://dl.mumble.info/${MY_P}.tar.gz"
S="${WORKDIR}/${MY_PN}-${PV/_*}"
fi
- KEYWORDS="~amd64 ~arm x86"
+ KEYWORDS="amd64 ~arm x86"
fi
LICENSE="BSD"
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 80726ac757d3..ddc5158024aa 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1 +1,2 @@
DIST qjackctl-0.6.3.tar.gz 1033664 BLAKE2B 98d80d0fea3db359b732fad14711352ba688e605b7225daad64d7df1dabf1d19e24b4d643581f1936afa0df0c84350cf5727686246bd8a850e09da969a228e44 SHA512 72a9218b3b8a6b72470656e774f5cfbfe6670059e9f1a85a394345f4689c5d5c05af23b5e37d5f8dfc6159e591f64249006936069dde1632ef9d74b6f8355e0b
+DIST qjackctl-0.9.0.tar.gz 1088061 BLAKE2B 3be89091b6efb34d2dffee92fdfda5dabadc8b6e9f9a248cc5cd60df423482dc65342e9758a98f34c5c01bfba74eac64039e3ec2de157df0e03f8bf09a7a14fc SHA512 5aa6f3e86b6a5c528daa5fdb71b5400d5882fea6569d585a86bb6b9fa66b62699472fd82999a6f4eb1a375c70e684a20214240c1fc3b44239c22d182e3ae1b1c
diff --git a/media-sound/qjackctl/qjackctl-0.9.0.ebuild b/media-sound/qjackctl/qjackctl-0.9.0.ebuild
new file mode 100644
index 000000000000..f91e1e16e544
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.9.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils xdg
+
+DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
+HOMEPAGE="https://qjackctl.sourceforge.io/"
+SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dbus debug portaudio"
+
+BDEPEND="dev-qt/linguist-tools:5"
+RDEPEND="
+ app-arch/gzip
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtxml:5
+ virtual/jack
+ alsa? ( media-libs/alsa-lib )
+ dbus? ( dev-qt/qtdbus:5 )
+ portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ append-cxxflags -std=c++11
+ local myeconfargs=(
+ $(use_enable alsa alsa-seq)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable portaudio)
+ --enable-jack-version
+ )
+ econf "${myeconfargs[@]}"
+ eqmake5 ${PN}.pro -o ${PN}.mak
+}
+
+src_compile() {
+ emake -f ${PN}.mak
+}
+
+src_install() {
+ default
+
+ gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die
+ gunzip "${D}/usr/share/man/fr/man1/qjackctl.1.gz" || die
+}
diff --git a/media-sound/qjackctl/qjackctl-9999.ebuild b/media-sound/qjackctl/qjackctl-9999.ebuild
index 1601c3b1ea75..55ceab1b20dc 100644
--- a/media-sound/qjackctl/qjackctl-9999.ebuild
+++ b/media-sound/qjackctl/qjackctl-9999.ebuild
@@ -54,4 +54,5 @@ src_install() {
default
gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die
+ gunzip "${D}/usr/share/man/fr/man1/qjackctl.1.gz" || die
}
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 54e462243bfb..66b24d017d63 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,2 +1 @@
-DIST qsampler-0.5.6.tar.gz 260607 BLAKE2B 52002ad95fe11266337f058124e7ae33947eb50ce5b12574c9091c10827bff2a8135a52bd53dd030be0394fdb39c2bd034308ae9d615c0b74ad660a06573446b SHA512 2a3a322fec31d9c66d7d1e9b4a7f74629e4b2bcf3ee2350bca8d450d2f68c41ac80563f8e28bd5314f00f0387503aa1e33c0b94ff518cca27b2ca93d9d72334e
DIST qsampler-0.6.3.tar.gz 284613 BLAKE2B a4ef67014578b4eb7b6f6e7b5da94b04253a40bed0cc413acfde62f4660d2e1d3485d301637d1871e7f20dcdac34ea81511738a4455f8690f40460d7ea4db72b SHA512 55fe16d5cfe0245cfedb228d448235997160471343191cf204347bb13c260be747a06fce2344b36a60c5877f89b32b0f4ac4861ed8a3d555d4cc798f21f5e1ae
diff --git a/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch b/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch
deleted file mode 100644
index 7f23e78b669a..000000000000
--- a/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.in 2018-12-16 23:40:26.001395069 +0100
-+++ b/Makefile.in 2018-12-16 23:46:00.210638503 +0100
-@@ -109,7 +109,6 @@
- @install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
- @install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
- @install -v -m 0644 $(name)*.1 $(DESTDIR)$(mandir)/man1
-- @gzip -vf $(DESTDIR)$(mandir)/man1/$(name)*.1
-
- uninstall: $(DESTDIR)$(prefix)/bin/$(name)
- @$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
diff --git a/media-sound/qsampler/qsampler-0.5.6.ebuild b/media-sound/qsampler/qsampler-0.5.6.ebuild
deleted file mode 100644
index ab5a0073a2c5..000000000000
--- a/media-sound/qsampler/qsampler-0.5.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Graphical frontend to the LinuxSampler engine"
-HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="debug +libgig"
-
-COMMON_DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- media-libs/alsa-lib
- >=media-libs/liblscp-0.5.6:=
- x11-libs/libX11
- libgig? ( >=media-libs/libgig-3.3.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
- >=media-sound/linuxsampler-0.5
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
-
-PATCHES=( "${FILESDIR}/${PN}-0.5.3-Makefile.patch" )
-
-src_configure() {
- local myeconfargs=(
- $(use_enable debug)
- $(use_enable libgig)
- )
- ac_qmake="$(qt5_get_bindir)/qmake" \
- econf "${myeconfargs[@]}"
-
- cd src || die
- eqmake5 src.pro -o Makefile
-}
diff --git a/media-sound/qsampler/qsampler-0.6.3.ebuild b/media-sound/qsampler/qsampler-0.6.3.ebuild
index 6cb59ab6dfc0..049457c6e582 100644
--- a/media-sound/qsampler/qsampler-0.6.3.ebuild
+++ b/media-sound/qsampler/qsampler-0.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="debug +libgig"
DEPEND="
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index aa85f2bd531d..279ae60383fa 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -1,4 +1,4 @@
DIST teamspeak3-server_linux_amd64-3.12.1.tar.bz2 9428301 BLAKE2B aeab07edc31d1ee57ffd34b218aeb3f7e23f31ffb5b8b940cbc46bca91b6ef9caffb67f1a52c059439a64d73ceb8fce124c0e8101d3e04d752782344ff6c1843 SHA512 58bfb582deddc4137245fe73d3aabfbcd84c3c346fe5fd3db8c7756014fcdd1f0bd7798ee029aa9beebe454fa8021dd180dd577f147cc5f02c833b68d9253fc7
-DIST teamspeak3-server_linux_amd64-3.13.2.tar.bz2 9945659 BLAKE2B bb3d10e5824aab613b5713c86845ce86405de351ee8e1ab378b35b57da5458a007c3663bb5c70b8e02ab1c3554d1bb7c74a8df0535d47dff6ed15e5068a1e14a SHA512 40c8630ed05eb46cd3d1eb870f2ab66b185b68b9d3118789de99a2ad817e5cb38fdd9f1bc16607f850cc5f0823c3f306d7cb9ab544fe41e5a1fbc8cddd977d9b
+DIST teamspeak3-server_linux_amd64-3.13.3.tar.bz2 9945408 BLAKE2B d714a046279c8cac11ff373a66ba41010e5839704030ae29f8d7f429759126dff8675b8b0b37b584115ad44d9e216cb5449d4b159dae53ece72f9e5bbe119f84 SHA512 39ad3a00f5e38a0601ed9e9df4227a7f00b4cb9bdaed6562ccf05e0fce22ed040cfd5a2ea36e9e97a18a74c335e90c0c080106cdaf5c0b32859819286727cb58
DIST teamspeak3-server_linux_x86-3.12.1.tar.bz2 9268349 BLAKE2B 61d0794944775e4e9bfb57bc2ac331c5cc9da04d6a3956d4c1ec6c6d36ef87cb04ea1f0004d75251adc4baa1b9be999373d08ea36ca9f86e10b00e03d0f20f38 SHA512 83222586ff6e157af7242afc151c900eb339f05813f8b5fef602f9989a109b80de46bc86c7381b6acce240c62e9859b86df655a0b0219225162315337ca609ef
-DIST teamspeak3-server_linux_x86-3.13.2.tar.bz2 9780711 BLAKE2B c6749062abd4d23aa86be0348f973b3a4cba85f990845f63a9b175545daa707e443b01699690994843480028b5f44797096b6624266756ca3ff00faf1e8003d2 SHA512 8ed1bd7aebcea214b33209d1330fd6f9701aeefd804d2e1d69d4219e15eea580ec5c2e492312065f9150f48629a7c86490519b37a8fb333d3632a76c56e31086
+DIST teamspeak3-server_linux_x86-3.13.3.tar.bz2 9779788 BLAKE2B 1ddb466dfc6a7d19dacfa05a0608487a8b086963186eb48e2480b83fb9eaa408ca45bc80bfc6fbfd1623c21caeb27e516f6d893ab84e442ba75c9f59daf4fa79 SHA512 9b14e1fd8b969c32ca63e3b9665e0941c3d1e67b3e49d5f2d6cc701aa4ee10a80f1c10428ef2d59bb3767cd03ad5503a527c47b1db11ea525cca8c7e07787621
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.13.2.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.13.3.ebuild
similarity index 100%
rename from media-sound/teamspeak-server/teamspeak-server-3.13.2.ebuild
rename to media-sound/teamspeak-server/teamspeak-server-3.13.3.ebuild
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 35f237b0f9ed..c780c8d1fe34 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/devedeng/devedeng-4.16.0-r1.ebuild b/media-video/devedeng/devedeng-4.16.0-r1.ebuild
index ebc7d38d6cb4..54884ef59be8 100644
--- a/media-video/devedeng/devedeng-4.16.0-r1.ebuild
+++ b/media-video/devedeng/devedeng-4.16.0-r1.ebuild
@@ -16,14 +16,15 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}]
+RDEPEND="
+ app-cdr/cdrtools
+ dev-python/pycairo[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
x11-libs/gtk+:3
|| ( media-video/vlc media-video/mpv media-video/mplayer )
media-video/ffmpeg
media-video/dvdauthor
media-video/vcdimager
- virtual/cdrtools
|| ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn )"
DEPEND="${PYTHON_DEPS}"
diff --git a/media-video/dvdstyler/dvdstyler-3.0.4.ebuild b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
index a2c8db9c5ebb..f34dcb86924f 100644
--- a/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
+++ b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
@@ -18,13 +18,13 @@ KEYWORDS="~amd64 ~x86"
IUSE="debug +udev"
COMMON_DEPEND="
+ app-cdr/cdrtools
>=app-cdr/dvd+rw-tools-7.1
media-libs/libexif:=
>=media-libs/wxsvg-1.5.11:=
>=media-video/dvdauthor-0.7.1
>=media-video/ffmpeg-2.6:0=[encode]
>=media-video/xine-ui-0.99.7
- virtual/cdrtools
virtual/jpeg:0
x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X]
sys-apps/dbus
diff --git a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
index 2fd3ea1ba4c1..ad1f9fb2b883 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
@@ -59,7 +59,7 @@ LICENSE="
samba? ( GPL-3 )
"
if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
fi
# Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
deleted file mode 100644
index e5889b7e6368..000000000000
--- a/media-video/kmplayer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kmplayer-0.12.0b.tar.bz2 599496 BLAKE2B c27b54cf05c52ffbb78c8f623b7cab066901f647c14364da1de2fcedd96329439521ad329fc15be58491b570de17fd151c95f266738e049501a5a22ba8dd9c93 SHA512 d34c496d0c24c6d5c1bb675b83fac60da5c9672e4076aed72bac2e9b333e88d031076e7e386ec7b61ae8ece88870f6187c61f483f425aa78edd1e443c7f2e882
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-cmake.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-cmake.patch
deleted file mode 100644
index a99b1149f8c3..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-cmake.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 2a5df7b875a8c5acb99be05baf84e5c9800d52a3 Mon Sep 17 00:00:00 2001
-From: Pino Toscano
-Date: Sat, 13 May 2017 18:57:15 +0200
-Subject: cmake: fix endif syntax
-
-it does not match the if condition, so just remove it (also to ease
-reading it)
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 057fcc4..14a55d2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -81,7 +81,7 @@ add_subdirectory(src)
- add_subdirectory(icons)
- if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc" AND KF5DocTools_VERSION)
- add_subdirectory(doc)
--endif(KF5DocTools_VERSION)
-+endif()
- add_subdirectory(data)
-
- if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
-
-From 41a284a0f5f728556280b9f942961631566ad7ff Mon Sep 17 00:00:00 2001
-From: Pino Toscano
-Date: Sat, 13 May 2017 19:04:47 +0200
-Subject: cmake: use NO_POLICY_SCOPE for KDECompilerSettings
-
-just like done for all the other projects
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 14a55d2..5a58a35 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,7 +15,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_D
-
- include(KDEInstallDirs)
- include(KDECMakeSettings)
--include(KDECompilerSettings)
-+include(KDECompilerSettings NO_POLICY_SCOPE)
- include(ECMInstallIcons)
- #include(ECMSetupVersion)
- include(FeatureSummary)
---
-cgit v0.11.2
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-desktop.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-desktop.patch
deleted file mode 100644
index c84944effc29..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-desktop.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2126d76b8f16381e576de779b94b5b4555e562c2 Mon Sep 17 00:00:00 2001
-From: Luigi Toscano
-Date: Sat, 13 May 2017 21:13:43 +0200
-Subject: Fix .desktop: Qt5 apps accept qwindowtitle, not caption
-
----
- src/org.kde.kmplayer.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/org.kde.kmplayer.desktop b/src/org.kde.kmplayer.desktop
-index fcc5255..2b5435c 100644
---- a/src/org.kde.kmplayer.desktop
-+++ b/src/org.kde.kmplayer.desktop
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Type=Application
--Exec=kmplayer -caption %c %i %U
-+Exec=kmplayer -qwindowtitle %c %i %U
- Icon=kmplayer
- X-DocPath=kmplayer/index.html
- Comment=KDE interface for MPlayer
-
-From 6b7757397c6181664d58d0a9e09cc329f279cc72 Mon Sep 17 00:00:00 2001
-From: Luigi Toscano
-Date: Sat, 13 May 2017 21:13:36 +0200
-Subject: Add org namespace to the desktop file
-
-Required by the Desktop Entry Specification for desktop file
-with Type=Application.
----
- src/CMakeLists.txt | 2 +-
- src/kmplayer_part.desktop | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7a05382..f675d9a 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -122,7 +122,7 @@ install(TARGETS kdeinit_kmplayer ${INSTALL_TARGETS_DEFAULT_ARGS} )
-
- install(TARGETS kmplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
-
--install(FILES kmplayer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-+install(FILES org.kde.kmplayer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-
- #qt5_add_dbus_interface(kmplayer_SRCS org.kde.Konqueror.Main.xml kmplayer_interface)
-
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-devpixelratio.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-devpixelratio.patch
deleted file mode 100644
index 0dea98084e3e..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-devpixelratio.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 93fa2c2587fa8b2f1b0da4ab7f7f2978f105fac2 Mon Sep 17 00:00:00 2001
-From: Koos Vriezen
-Date: Sun, 30 Oct 2016 12:58:05 +0100
-Subject: Update pixel_device_ratio before painting instead on app startup
-
-Only used for adding a few pixels to text bounds. So if dragging the app
-from a low res to a hires display, that could cause text being tuncated.
----
- src/viewarea.cpp | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/viewarea.cpp b/src/viewarea.cpp
-index e407c95..77a260f 100644
---- a/src/viewarea.cpp
-+++ b/src/viewarea.cpp
-@@ -1892,9 +1892,6 @@ KDE_NO_CDTOR_EXPORT ViewArea::ViewArea (QWidget *, View * view, bool paint_bg)
- m_minimal (false),
- m_updaters_enabled (true),
- m_paint_background (paint_bg) {
--#if QT_VERSION >= 0x050600
-- pixel_device_ratio = devicePixelRatioF();
--#endif
- if (!paint_bg)
- setAttribute (Qt::WA_NoSystemBackground, true);
- QPalette palette;
-@@ -2030,6 +2027,7 @@ KDE_NO_EXPORT void ViewArea::mouseMoveEvent (QMouseEvent * e) {
-
- KDE_NO_EXPORT void ViewArea::syncVisual () {
- #if QT_VERSION >= 0x050600
-+ pixel_device_ratio = devicePixelRatioF();
- int w = (int)(width() * devicePixelRatioF());
- int h = (int)(height() * devicePixelRatioF());
- #else
---
-cgit v0.11.2
-
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-qfile.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-qfile.patch
deleted file mode 100644
index 32b645cd0a00..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-qfile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 7dce8e00c8e48cc08d3cc39909681643aa36ed62 Mon Sep 17 00:00:00 2001
-From: Luigi Toscano
-Date: Mon, 8 May 2017 18:07:40 +0200
-Subject: Use QFile to copy a file instead of /bin/cp
-
-The code has been there probably way before QFile gained the copy
-functionality.
----
- src/kmplayerpartbase.cpp | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp
-index fd7b363..f718496 100644
---- a/src/kmplayerpartbase.cpp
-+++ b/src/kmplayerpartbase.cpp
-@@ -124,12 +124,8 @@ PartBase::PartBase (QWidget * wparent, QObject * parent, KSharedConfigPtr config
- QString bmfile = KStandardDirs::locate ("data", "kmplayer/bookmarks.xml");
- QString localbmfile = KStandardDirs::locateLocal ("data", "kmplayer/bookmarks.xml");
- if (localbmfile != bmfile) {
-- QProcess p;
-- QStringList args;
-- args << QFile::encodeName (bmfile) << QFile::encodeName (localbmfile);
-- p.start ("/bin/cp", args);
-- kDebug () << "cp " << args.join (" ");
-- p.waitForFinished ();
-+ bool bmfileCopied = QFile(bmfile).copy(localbmfile);
-+ kDebug() << "bookmarks.xml copied successfully?" << bmfileCopied;
- }
- m_bookmark_manager = KBookmarkManager::managerForFile (localbmfile, "kmplayer");
- m_bookmark_owner = new BookmarkOwner (this);
---
-cgit v0.11.2
-
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch
deleted file mode 100644
index 8c91fa6c2ff3..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 66b262c344deb6ac4924966a584e8aeb3d899180 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Tue, 17 Apr 2018 12:07:04 +0200
-Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
-
----
- src/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index f675d9a..57af1ed 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -161,9 +161,9 @@ qt5_add_dbus_adaptor(kphononplayer_SRCS org.kde.kmplayer.streamslave.xml
-
- add_executable(kphononplayer ${kphononplayer_SRCS})
-
--qt5_use_modules(kphononplayer Core DBus Widgets X11Extras)
--
--target_link_libraries(kphononplayer Phonon::phonon4qt5 ${XCB_LIBRARIES})
-+target_link_libraries(kphononplayer Phonon::phonon4qt5 ${XCB_LIBRARIES}
-+ Qt5::Core Qt5::DBus Qt5::Widgets Qt5::X11Extras
-+)
-
- install(TARGETS kphononplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
-
---
-2.17.0
-
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch
deleted file mode 100644
index 80f3bee6ee88..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3def65075c09af4961cd399e8e78ed78cca72e65 Mon Sep 17 00:00:00 2001
-From: Wolfgang Bauer
-Date: Wed, 11 Oct 2017 22:16:02 +0200
-Subject: Fix build with Qt 5.9
-
-Summary:
-moc 5.9 errors out when building:
-Error: Plugin Metadata file "" could not be opened: file to open is a directory
-
-Same issue and fix as https://phabricator.kde.org/D5392 for khtml.
-
-CCBUG: 377490
-
-Test Plan: builds fine now with Qt 5.9.0rc and also earlier versions.
-
-Reviewers: vriezen, pino
-
-Reviewed By: pino
-
-Subscribers: pino
-
-Differential Revision: https://phabricator.kde.org/D5985
----
- src/kmplayer_part.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kmplayer_part.h b/src/kmplayer_part.h
-index f90f85d..0fddbaa 100644
---- a/src/kmplayer_part.h
-+++ b/src/kmplayer_part.h
-@@ -36,7 +36,7 @@ namespace KMPlayer {
-
- class KMPlayerFactory : public KPluginFactory {
- Q_OBJECT
-- Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory" FILE "")
-+ Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory")
- Q_INTERFACES(KPluginFactory)
- public:
- KMPlayerFactory();
---
-cgit v0.11.2
-
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-schedulerepaint.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-schedulerepaint.patch
deleted file mode 100644
index 02bf9f38b561..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-schedulerepaint.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 5517262a2a328518dd42a8aa0e37a34152a06282 Mon Sep 17 00:00:00 2001
-From: Koos Vriezen
-Date: Sun, 30 Oct 2016 12:50:03 +0100
-Subject: scheduleRepaint should be called with pixel coordinates
-
----
- src/viewarea.cpp | 31 ++++++++++++++++++++++++++-----
- 1 file changed, 26 insertions(+), 5 deletions(-)
-
-diff --git a/src/viewarea.cpp b/src/viewarea.cpp
-index 24f68cf..e4df941 100644
---- a/src/viewarea.cpp
-+++ b/src/viewarea.cpp
-@@ -2117,9 +2117,20 @@ KDE_NO_EXPORT void ViewArea::syncVisual () {
-
- KDE_NO_EXPORT void ViewArea::paintEvent (QPaintEvent * pe) {
- #ifdef KMPLAYER_WITH_CAIRO
-- if (surface->node)
-- scheduleRepaint (IRect (pe->rect ().x (), pe->rect ().y (), pe->rect ().width (), pe->rect ().height ()));
-- else
-+ if (surface->node) {
-+#if QT_VERSION >= 0x050600
-+ int x = (int)(pe->rect().x() * devicePixelRatioF());
-+ int y = (int)(pe->rect().y() * devicePixelRatioF());
-+ int w = (int)(pe->rect().width() * devicePixelRatioF());
-+ int h = (int)(pe->rect().height() * devicePixelRatioF());
-+#else
-+ int x = pe->rect().x();
-+ int y = pe->rect().y();
-+ int w = pe->rect().width();
-+ int h = pe->rect().height();
-+#endif
-+ scheduleRepaint(IRect(x, y, w, h));
-+ } else
- #endif
- if (m_fullscreen || m_paint_background)
- {
-@@ -2647,8 +2658,18 @@ void VideoOutput::setGeometry (const IRect &rect) {
- void VideoOutput::setAspect (float a) {
- m_aspect = a;
- QRect r = geometry ();
-- m_view->viewArea ()->scheduleRepaint (
-- IRect (r.x (), r.y (), r.width (), r.height ()));
-+#if QT_VERSION >= 0x050600
-+ int x = (int)(r.x() * devicePixelRatioF());
-+ int y = (int)(r.y() * devicePixelRatioF());
-+ int w = (int)(r.width() * devicePixelRatioF());
-+ int h = (int)(r.height() * devicePixelRatioF());
-+#else
-+ int x = r.x();
-+ int y = r.y();
-+ int w = r.width();
-+ int h = r.height();
-+#endif
-+ m_view->viewArea()->scheduleRepaint(IRect(x, y, w, h));
- }
-
- KDE_NO_EXPORT void VideoOutput::map () {
---
-cgit v0.11.2
-
diff --git a/media-video/kmplayer/kmplayer-0.12.0b-r4.ebuild b/media-video/kmplayer/kmplayer-0.12.0b-r4.ebuild
deleted file mode 100644
index 6feb296bfb3c..000000000000
--- a/media-video/kmplayer/kmplayer-0.12.0b-r4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="true"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Video player plugin for Konqueror and basic MPlayer frontend"
-HOMEPAGE="https://kmplayer.kde.org https://apps.kde.org/en/kmplayer"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
-SLOT="5"
-IUSE="cairo"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdelibs4support-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kmediaplayer-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=media-libs/phonon-4.11.0
- x11-libs/libX11
- x11-libs/libxcb
- cairo? ( x11-libs/cairo[X,xcb(+)] )
-"
-RDEPEND="${DEPEND}
- media-video/mplayer
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-schedulerepaint.patch
- "${FILESDIR}"/${P}-devpixelratio.patch
- "${FILESDIR}"/${P}-qfile.patch
- "${FILESDIR}"/${P}-cmake.patch
- "${FILESDIR}"/${P}-desktop.patch
- "${FILESDIR}"/${P}-qt-5.9.patch
- "${FILESDIR}"/${P}-qt-5.11b3.patch
-)
-
-src_prepare() {
- # Prerequisite for ${P}-desktop.patch:
- mv src/kmplayer.desktop src/org.kde.kmplayer.desktop || die
- ecm_src_prepare
-}
-
-src_configure() {
- # 0.12: expat build broken, check in later releases
- local mycmakeargs=(
- -DKMPLAYER_BUILT_WITH_EXPAT=OFF
- -DKMPLAYER_BUILT_WITH_NPP=OFF
- -DKMPLAYER_BUILT_WITH_CAIRO=$(usex cairo)
- )
- ecm_src_configure
-}
diff --git a/media-video/kmplayer/metadata.xml b/media-video/kmplayer/metadata.xml
deleted file mode 100644
index e68bcea066c3..000000000000
--- a/media-video/kmplayer/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- kde@gentoo.org
- Gentoo KDE Project
-
-
- media-video@gentoo.org
- Gentoo Video project
-
-
diff --git a/media-video/rav1e/rav1e-0.3.4.ebuild b/media-video/rav1e/rav1e-0.3.4.ebuild
index 3058a80e498c..3cf9015a2eaf 100644
--- a/media-video/rav1e/rav1e-0.3.4.ebuild
+++ b/media-video/rav1e/rav1e-0.3.4.ebuild
@@ -180,7 +180,7 @@ else
https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
$(cargo_crate_uris ${CRATES})
"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 arm arm64 ppc64 x86"
fi
DESCRIPTION="The fastest and safest AV1 encoder"
diff --git a/media-video/streamdvd/streamdvd-0.4-r2.ebuild b/media-video/streamdvd/streamdvd-0.4-r2.ebuild
index 9c889d779a06..c235978a8e29 100644
--- a/media-video/streamdvd/streamdvd-0.4-r2.ebuild
+++ b/media-video/streamdvd/streamdvd-0.4-r2.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
@@ -15,11 +15,12 @@ KEYWORDS="~amd64 ~ppc ~x86"
IUSE="X"
-DEPEND="media-libs/libdvdread
+DEPEND="
+ app-cdr/cdrtools
+ media-libs/libdvdread
media-video/lsdvd
X? ( dev-perl/Tk
dev-perl/Tk-JPEG-Lite
- virtual/cdrtools
>=media-video/dvdauthor-0.6.5
>=app-cdr/dvd+rw-tools-5.13.4.7.4 )"
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 9a9fc9012075..51b189beb218 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,2 +1 @@
-DIST xine-ui-0.99.10.tar.xz 1762968 BLAKE2B eede1a7b43f3fca37c092541145a4d13813185a740c396503bdfc93fd96d4d3bf52ad2daed4389634e2a517972c1233e3d9b1af74b718dd9def58eb2e702d967 SHA512 73cbc72375b27335e9d5f5527c35dab12d1ae40539b587630b3d8709471e4c61ce7b619062b75f587252c0647c234ffcf611f3b4e38e0447f7041b7ca5d7289e
DIST xine-ui-0.99.12.tar.xz 1980672 BLAKE2B ac1a9b17b48005c667d53129e51f4db2cfe2933c0fca9ba8b6f1d999f903568217a061c84806abfec31d4afcc238579c232a1ae6f4b04afcac465c340826f037 SHA512 bc04cb8df730abce147485b488250331a304e4318fc28ebab890c6485242a5edeafd953547c637622e2312c65aa1e36aaae6117d608dd668781d841804f2ae86
diff --git a/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch b/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch
deleted file mode 100644
index c5a359758d4a..000000000000
--- a/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -r efe11fb1562e configure.ac
---- a/configure.ac Thu Dec 28 18:08:02 2017 +0200
-+++ b/configure.ac Sun Apr 01 23:00:22 2018 -0600
-@@ -374,7 +374,7 @@
- if test "x$with_caca" = "xyes" && test "x$have_caca" = "xno"; then
- AC_MSG_ERROR([CACA support requested, but libcaca 0.99 not found])
- fi
-- if test test "x$have_caca" = "xyes"; then
-+ if test "x$have_caca" = "xyes"; then
- AM_DL()
- fi
- AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include
-
---- a/configure Thu Dec 28 18:08:02 2017 +0200
-+++ b/configure Sun Apr 01 23:00:22 2018 -0600
-@@ -12651,7 +12651,7 @@
- if test "x$with_caca" = "xyes" && test "x$have_caca" = "xno"; then
- as_fn_error $? "CACA support requested, but libcaca 0.99 not found" "$LINENO" 5
- fi
-- if test test "x$have_caca" = "xyes"; then
-+ if test "x$have_caca" = "xyes"; then
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5
- $as_echo_n "checking for dlopen in -lc... " >&6; }
diff --git a/media-video/xine-ui/xine-ui-0.99.10.ebuild b/media-video/xine-ui/xine-ui-0.99.10.ebuild
deleted file mode 100644
index eacab2930ba0..000000000000
--- a/media-video/xine-ui/xine-ui-0.99.10.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils xdg-utils
-
-DESCRIPTION="Xine movie player"
-HOMEPAGE="https://xine-project.org/home"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
-
-RDEPEND="
- || ( app-arch/tar app-arch/libarchive )
- media-libs/libpng:0=
- >=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
- virtual/jpeg:0
- aalib? ( media-libs/aalib:= )
- curl? ( >=net-misc/curl-7.10.2:= )
- libcaca? ( media-libs/libcaca:= )
- lirc? ( app-misc/lirc:= )
- nls? ( virtual/libintl )
- readline? ( >=sys-libs/readline-6.2:= )
- X? (
- x11-libs/libICE:=
- x11-libs/libSM:=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXft:=
- x11-libs/libXrender:=
- x11-libs/libXScrnSaver:=
- x11-libs/libXtst:=
- x11-libs/libXv:=
- x11-libs/libXxf86vm:=
- xinerama? ( x11-libs/libXinerama:= )
- )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( >=sys-devel/gettext-0.18.3 )
- X? (
- x11-base/xorg-proto
- x11-libs/libXt
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-desktop.patch
- "${FILESDIR}"/${P}-libcaca.patch
-)
-
-src_prepare() {
- default
- eautoreconf
- rm misc/xine-bugreport || die
-}
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_enable xinerama) \
- $(use_enable lirc) \
- $(use_enable vdr vdr-keys) \
- --disable-nvtvsimple \
- $(use_enable debug) \
- $(use_with X x) \
- $(use_with readline) \
- $(use_with curl) \
- $(use_with aalib) \
- $(use_with libcaca caca) \
- --without-fb
-}
-
-src_install() {
- # xine-list apparently may cause sandbox violation, bug 654394
- addpredict /dev/dri
-
- emake \
- DESTDIR="${D}" \
- docdir="/usr/share/doc/${PF}" \
- docsdir="/usr/share/doc/${PF}" \
- install
-
- einstalldocs
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-video/xine-ui/xine-ui-0.99.12.ebuild b/media-video/xine-ui/xine-ui-0.99.12.ebuild
index b4b3da98ab25..f1ab7d8539fa 100644
--- a/media-video/xine-ui/xine-ui-0.99.12.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
RDEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 61d29950d826..32540a6e6c8d 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 6e9dcaf3d8d0..33efc54e44ae 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 18 Dec 2020 06:08:40 +0000
+Mon, 21 Dec 2020 11:38:25 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 6e9dcaf3d8d0..33efc54e44ae 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 18 Dec 2020 06:08:40 +0000
+Mon, 21 Dec 2020 11:38:25 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 15ec8ea14735..28d3132db2b4 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 b8738a07d426..e742063836fd 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/postgrey-0 b/metadata/md5-cache/acct-group/postgrey-0
new file mode 100644
index 000000000000..064570c55a3f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/postgrey-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the postgrey mail daemon
+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 074f6fd7ac19dbf5e1ab9bc58c92af5d user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=bb3e3877afacabcceadf15a9d204fd1e
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index e6e2e111f73b..0f3c634faff7 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/postgrey-0 b/metadata/md5-cache/acct-user/postgrey-0
new file mode 100644
index 000000000000..f450ec1baceb
--- /dev/null
+++ b/metadata/md5-cache/acct-user/postgrey-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the postgrey mail daemon
+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/postgrey
+SLOT=0
+_eclasses_=acct-user 0d24c8dbb9e192bb2307b3086e8abb6d user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=4767857bebd808f8ab37545c9b9e2a2f
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index fde76244d293..7e4e56887dc3 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/orca-3.36.6 b/metadata/md5-cache/app-accessibility/orca-3.36.6
new file mode 100644
index 000000000000..f0cb1c76c658
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/orca-3.36.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-accessibility/at-spi2-atk-2.34:2 >=app-accessibility/at-spi2-core-2.36:2[introspection] >=dev-libs/atk-2.36 >=dev-libs/glib-2.28:2 media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] python_single_target_python3_6? ( dev-python/gst-python:1.0[python_targets_python3_6(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/gst-python:1.0[python_targets_python3_7(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/gst-python:1.0[python_targets_python3_8(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_8(-)] ) braille? ( python_single_target_python3_6? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_6(-)] dev-libs/liblouis[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_7(-)] dev-libs/liblouis[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_8(-)] dev-libs/liblouis[python,python_targets_python3_8(-)] ) ) dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Extensible screen reader that provides access to the desktop
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Orca
+IUSE=+braille python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+ CC-BY-SA-3.0
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-accessibility/at-spi2-atk-2.34:2 >=app-accessibility/at-spi2-core-2.36:2[introspection] >=dev-libs/atk-2.36 >=dev-libs/glib-2.28:2 media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] python_single_target_python3_6? ( dev-python/gst-python:1.0[python_targets_python3_6(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/gst-python:1.0[python_targets_python3_7(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/gst-python:1.0[python_targets_python3_8(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_8(-)] ) braille? ( python_single_target_python3_6? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_6(-)] dev-libs/liblouis[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_7(-)] dev-libs/liblouis[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_8(-)] dev-libs/liblouis[python,python_targets_python3_8(-)] ) ) dev-libs/atk[introspection] python_single_target_python3_6? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_6(-)] >=dev-python/pyatspi-2.36[python_targets_python3_6(-)] dev-python/setproctitle[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_7(-)] >=dev-python/pyatspi-2.36[python_targets_python3_7(-)] dev-python/setproctitle[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_8(-)] >=dev-python/pyatspi-2.36[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] ) x11-libs/libwnck:3[introspection] x11-libs/pango[introspection]
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/orca/3.36/orca-3.36.6.tar.xz
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 c156bb2ac81c822dd861424ce19bc168 gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=c2baf8d8ced608f4965bf694dbfca41e
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 0630a659e951..f2db9dbfe5fd 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/ansible-2.10.4 b/metadata/md5-cache/app-admin/ansible-2.10.4
index ff0b25891eef..47ba5b8f9c0f 100644
--- a/metadata/md5-cache/app-admin/ansible-2.10.4
+++ b/metadata/md5-cache/app-admin/ansible-2.10.4
@@ -1,10 +1,10 @@
BDEPEND=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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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(-)] >=dev-python/setuptools-42.0.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 prepare test
-DEPEND=>=dev-python/packaging-16.6[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(-)] app-admin/ansible-base doc? ( dev-python/sphinx[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/sphinx-notfound-page[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/pygments-2.4.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(-)] ) test? ( dev-python/paramiko[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/jinja[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(-)] dev-python/cryptography[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/httplib2[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/six[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/netaddr[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/pexpect[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(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base dev-python/nose[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/mock-1.0.1[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/passlib[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/coverage[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/unittest2[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-vcs/git )
+DEPEND=>=dev-python/packaging-16.6[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(-)] app-admin/ansible-base test? ( dev-python/paramiko[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/jinja[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(-)] dev-python/cryptography[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/httplib2[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/six[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/netaddr[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/pexpect[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(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base dev-python/nose[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/mock-1.0.1[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/passlib[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/coverage[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/unittest2[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-vcs/git )
DESCRIPTION=Model-driven deployment, config management, and command execution framework
EAPI=7
HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
LICENSE=GPL-3
RDEPEND=dev-python/paramiko[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/jinja[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(-)] dev-python/cryptography[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/httplib2[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/six[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/netaddr[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/pexpect[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(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base 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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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(-)]
@@ -13,4 +13,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://pypi/a/ansible/ansible-2.10.4.tar.gz
_eclasses_=distutils-r1 6a128a9211d714bf9dfb5c0c9e72558e edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=42f8990dbcbe2ab89b0c2242939114df
+_md5_=7aad628b1ca76fbcb5219a0bec7c5662
diff --git a/metadata/md5-cache/app-admin/ansible-9999 b/metadata/md5-cache/app-admin/ansible-9999
index 53634f7fdc0c..be56ff7ff9cb 100644
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ b/metadata/md5-cache/app-admin/ansible-9999
@@ -1,10 +1,10 @@
BDEPEND=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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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(-)] >=dev-python/setuptools-42.0.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(-)] >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!app-admin/ansible-base >=dev-python/packaging-16.6[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(-)] doc? ( dev-python/sphinx[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/sphinx-notfound-page[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/pygments-2.4.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(-)] ) test? ( dev-python/paramiko[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/jinja[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(-)] dev-python/cryptography[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/httplib2[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/six[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/netaddr[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/pexpect[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(-)] net-misc/sshpass virtual/ssh !app-admin/ansible-base dev-python/nose[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/mock-1.0.1[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/passlib[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/coverage[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/unittest2[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-vcs/git )
+DEPEND=!app-admin/ansible-base >=dev-python/packaging-16.6[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(-)] test? ( dev-python/paramiko[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/jinja[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(-)] dev-python/cryptography[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/httplib2[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/six[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/netaddr[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/pexpect[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(-)] net-misc/sshpass virtual/ssh !app-admin/ansible-base dev-python/nose[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/mock-1.0.1[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/passlib[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/coverage[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/unittest2[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-vcs/git )
DESCRIPTION=Model-driven deployment, config management, and command execution framework
EAPI=7
HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
LICENSE=GPL-3
PROPERTIES=live
RDEPEND=dev-python/paramiko[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/jinja[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(-)] dev-python/cryptography[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/httplib2[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/six[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/netaddr[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/pexpect[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(-)] net-misc/sshpass virtual/ssh !app-admin/ansible-base 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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
RESTRICT=test
SLOT=0
_eclasses_=distutils-r1 6a128a9211d714bf9dfb5c0c9e72558e edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 git-r3 3e7ec3d6619213460c85e2aa48398441 l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=6f2df48de80aa92913dc4aba0fec3d93
+_md5_=ccbf8ed211bbe37d55bf45a6dee428ea
diff --git a/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.23.1 b/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.23.1
index 75fb11d0b6d6..74ed320eeaaa 100644
--- a/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.23.1
+++ b/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.23.1
@@ -7,5 +7,5 @@ LICENSE=GPL-3
RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-crypt/libsecret dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango
SLOT=0
SRC_URI=https://github.com/bitwarden/desktop/releases/download/v1.23.1/Bitwarden-1.23.1-amd64.deb
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=fb1566af76fb2d2f46aeed67a946b1c0
diff --git a/metadata/md5-cache/app-admin/clsync-0.4.5 b/metadata/md5-cache/app-admin/clsync-0.4.5
index e794eb6d6012..c33788c36ce1 100644
--- a/metadata/md5-cache/app-admin/clsync-0.4.5
+++ b/metadata/md5-cache/app-admin/clsync-0.4.5
@@ -5,11 +5,11 @@ DESCRIPTION=Live sync tool based on inotify, written in GNU C
EAPI=7
HOMEPAGE=https://github.com/clsync/clsync http://ut.mephi.ru/oss/clsync
IUSE=apidoc +caps +clsync cluster control-socket cgroups doc debug examples extra-debug extra-hardened gio +hardened +highload-locks +inotify +lto mhash namespaces seccomp socket-library static-libs kernel_linux
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
LICENSE=GPL-3+
RDEPEND=caps? ( sys-libs/libcap ) cgroups? ( dev-libs/libcgroup ) clsync? ( dev-libs/glib:2 ) mhash? ( app-crypt/mhash ) !app-doc/clsync-docs !dev-libs/libclsync
REQUIRED_USE=|| ( clsync socket-library ) || ( gio inotify ) mhash? ( cluster ) seccomp? ( caps )
SLOT=0
SRC_URI=https://github.com/clsync/clsync/archive/v0.4.5.tar.gz -> clsync-0.4.5.tar.gz
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a libtool f143db5a74ccd9ca28c1234deffede96 linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib d410501a125f99ffb560b0c523cd3d1e systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=4e47e98ba228b13a2e663afc4708b2b1
+_md5_=6579f3b9e106a1709acd90edff535e22
diff --git a/metadata/md5-cache/app-admin/consul-1.7.11 b/metadata/md5-cache/app-admin/consul-1.7.11
new file mode 100644
index 000000000000..8ebdfb2db9a2
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.7.11
@@ -0,0 +1,14 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/consul acct-user/consul
+DESCRIPTION=A tool for service discovery, monitoring and configuration
+EAPI=7
+HOMEPAGE=https://www.consul.io
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
+RDEPEND=acct-group/consul acct-user/consul
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul/archive/v1.7.11.tar.gz -> consul-1.7.11.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.7.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.7.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.zip mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.zip mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20180828235145-f29afc2cceca.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20180828235145-f29afc2cceca.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20191202160150-7ec2cfbda7a2.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20191202160150-7ec2cfbda7a2.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.zip mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190309162924-0a377eecf7aa.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190309162924-0a377eecf7aa.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190418170008-ace88ad0983b.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190418170008-ace88ad0983b.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190501133040-e77ea8b19cdc.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190501133040-e77ea8b19cdc.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.20.16.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.16.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190409170913-40473a74d76d.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190409170913-40473a74d76d.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190419151922-c1f9f0b4f084.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190419151922-c1f9f0b4f084.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190502021454-d8787b4bfa0b.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190502021454-d8787b4bfa0b.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.3.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.3.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.zip mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.zip -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.zip mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180820201707-7c9eb446e3cf.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180820201707-7c9eb446e3cf.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.2.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191106202628-ed6320f186d4.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191106202628-ed6320f186d4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20170807180024-9a379c6b3e95.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20170807180024-9a379c6b3e95.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180829000535-087779f1d2c9.zip -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.zip mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180829000535-087779f1d2c9.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.zip -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.zip -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20180806132203-61b11ee65332.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20180806132203-61b11ee65332.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.zip -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.zip mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20180821005732-488889b0007f.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20180821005732-488889b0007f.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.mod mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.zip -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.zip mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.mod -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.mod
+_eclasses_=go-module 92660621959e7fab813173772987588b multilib d410501a125f99ffb560b0c523cd3d1e systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=144f5ccc17ead1ce7d79bf068f24c1a6
diff --git a/metadata/md5-cache/app-admin/consul-1.7.7 b/metadata/md5-cache/app-admin/consul-1.7.7
deleted file mode 100644
index 7d574cb0b68d..000000000000
--- a/metadata/md5-cache/app-admin/consul-1.7.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/consul acct-user/consul
-DESCRIPTION=A tool for service discovery, monitoring and configuration
-EAPI=7
-HOMEPAGE=https://www.consul.io
-KEYWORDS=~amd64
-LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
-RDEPEND=acct-group/consul acct-user/consul
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/consul/archive/v1.7.7.tar.gz -> consul-1.7.7.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.7.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.7.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.zip mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.zip mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20180828235145-f29afc2cceca.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20180828235145-f29afc2cceca.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20191202160150-7ec2cfbda7a2.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20191202160150-7ec2cfbda7a2.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.zip mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190309162924-0a377eecf7aa.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190309162924-0a377eecf7aa.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190418170008-ace88ad0983b.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190418170008-ace88ad0983b.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190501133040-e77ea8b19cdc.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190501133040-e77ea8b19cdc.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.20.16.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.16.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190409170913-40473a74d76d.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190409170913-40473a74d76d.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190419151922-c1f9f0b4f084.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190419151922-c1f9f0b4f084.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190502021454-d8787b4bfa0b.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190502021454-d8787b4bfa0b.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.3.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.3.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.zip mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.zip -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.zip mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180820201707-7c9eb446e3cf.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180820201707-7c9eb446e3cf.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.2.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191106202628-ed6320f186d4.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191106202628-ed6320f186d4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20170807180024-9a379c6b3e95.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20170807180024-9a379c6b3e95.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180829000535-087779f1d2c9.zip -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.zip mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180829000535-087779f1d2c9.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.zip -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.zip -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20180806132203-61b11ee65332.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20180806132203-61b11ee65332.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.zip -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.zip mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20180821005732-488889b0007f.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20180821005732-488889b0007f.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.mod mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.zip -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.zip mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.mod -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.mod
-_eclasses_=go-module 92660621959e7fab813173772987588b multilib d410501a125f99ffb560b0c523cd3d1e systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=80a7d7175a260e9cd8c3a474cea16209
diff --git a/metadata/md5-cache/app-admin/consul-1.8.3 b/metadata/md5-cache/app-admin/consul-1.8.3
deleted file mode 100644
index a6b353615243..000000000000
--- a/metadata/md5-cache/app-admin/consul-1.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/consul acct-user/consul
-DESCRIPTION=A tool for service discovery, monitoring and configuration
-EAPI=7
-HOMEPAGE=https://www.consul.io
-KEYWORDS=~amd64
-LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
-RDEPEND=acct-group/consul acct-user/consul
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/consul/archive/v1.8.3.tar.gz -> consul-1.8.3.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.zip -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.zip mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.zip mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.16.9.zip -> k8s.io%2Fapi%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/api/@v/v0.16.9.mod -> k8s.io%2Fapi%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/client-go/@v/v0.16.9.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/client-go/@v/v0.16.9.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
-_eclasses_=go-module 92660621959e7fab813173772987588b multilib d410501a125f99ffb560b0c523cd3d1e systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=0fc34b62738b0363fc554e7bc8498303
diff --git a/metadata/md5-cache/app-admin/consul-1.8.7 b/metadata/md5-cache/app-admin/consul-1.8.7
new file mode 100644
index 000000000000..9a656dddf754
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.8.7
@@ -0,0 +1,14 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/consul acct-user/consul
+DESCRIPTION=A tool for service discovery, monitoring and configuration
+EAPI=7
+HOMEPAGE=https://www.consul.io
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
+RDEPEND=acct-group/consul acct-user/consul
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul/archive/v1.8.7.tar.gz -> consul-1.8.7.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.37.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.37.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.1.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.1.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.1.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.4.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.4.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.9+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.9+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.9+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.9+incompatible.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200904194848-62affa334b73.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200904194848-62affa334b73.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201007082116-8445cc04cbdf.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201007082116-8445cc04cbdf.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513154647-78b527d18275.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513154647-78b527d18275.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.16.9.zip -> k8s.io%2Fapi%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/api/@v/v0.16.9.mod -> k8s.io%2Fapi%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/client-go/@v/v0.16.9.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/client-go/@v/v0.16.9.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
+_eclasses_=go-module 92660621959e7fab813173772987588b multilib d410501a125f99ffb560b0c523cd3d1e systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=a479c8d22ec216e2423a70220f0af60e
diff --git a/metadata/md5-cache/app-admin/consul-1.9.1 b/metadata/md5-cache/app-admin/consul-1.9.1
new file mode 100644
index 000000000000..4bc90a05f603
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.9.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/consul acct-user/consul
+DESCRIPTION=A tool for service discovery, monitoring and configuration
+EAPI=7
+HOMEPAGE=https://www.consul.io
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
+RDEPEND=acct-group/consul acct-user/consul
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul/archive/v1.9.1.tar.gz -> consul-1.9.1.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.5-0.20201104215618-6fd5a4ddf425.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.5-0.20201104215618-6fd5a4ddf425.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.5-0.20201104215618-6fd5a4ddf425.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.5-0.20201104215618-6fd5a4ddf425.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.37.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.37.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.3.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20200423225030-a18a1cd20038.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20200423225030-a18a1cd20038.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.1.zip -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20200609203250-aecfd211c9ce.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20200609203250-aecfd211c9ce.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20200609203250-aecfd211c9ce.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20200609203250-aecfd211c9ce.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.27.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.31.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.31.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.10.zip -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.zip mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.10.mod -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200930160638-afb6bcd081ae.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200930160638-afb6bcd081ae.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200930160638-afb6bcd081ae.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200930160638-afb6bcd081ae.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200930145003-4acb6c075d10.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200930145003-4acb6c075d10.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200930145003-4acb6c075d10.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200930145003-4acb6c075d10.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201024232916-9f70ab9862d5.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201024232916-9f70ab9862d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513154647-78b527d18275.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513154647-78b527d18275.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.16.9.zip -> k8s.io%2Fapi%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/api/@v/v0.16.9.mod -> k8s.io%2Fapi%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/client-go/@v/v0.16.9.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/client-go/@v/v0.16.9.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
+_eclasses_=go-module 92660621959e7fab813173772987588b multilib d410501a125f99ffb560b0c523cd3d1e systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=62146fb35da959010f7db06ef9906c45
diff --git a/metadata/md5-cache/app-admin/cygwin-rebase-4.4.4 b/metadata/md5-cache/app-admin/cygwin-rebase-4.4.4
index 427f76efd692..983a4a4d2889 100644
--- a/metadata/md5-cache/app-admin/cygwin-rebase-4.4.4
+++ b/metadata/md5-cache/app-admin/cygwin-rebase-4.4.4
@@ -3,9 +3,9 @@ DEFINED_PHASES=configure install preinst prepare
DESCRIPTION=Core of the automatic rebase facility during postinstall on Cygwin
EAPI=7
HOMEPAGE=https://cygwin.com
-KEYWORDS=-* ~x64-cygwin ~x86-cygwin
+KEYWORDS=-* ~x64-cygwin
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/haubi/cygwin-rebase/archive/rebase-4-4-4.tar.gz -> cygwin-rebase-4.4.4.tar.gz https://github.com/haubi/cygwin-rebase/compare/rebase-4-4-4...rebase-4-4-4_merge-files-flag-0.patch -> cygwin-rebase-4.4.4_merge-files-flag-0.patch
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=75267505d7ed4883651cd15dbaf5126d
+_md5_=24a144a8bc76923745fd79d94db8c15d
diff --git a/metadata/md5-cache/app-admin/cygwin-rebase-9999 b/metadata/md5-cache/app-admin/cygwin-rebase-9999
index f8aa64c0b386..56f652c8f5f3 100644
--- a/metadata/md5-cache/app-admin/cygwin-rebase-9999
+++ b/metadata/md5-cache/app-admin/cygwin-rebase-9999
@@ -7,4 +7,4 @@ LICENSE=GPL-2
PROPERTIES=live
SLOT=0
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a git-r3 3e7ec3d6619213460c85e2aa48398441 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=75267505d7ed4883651cd15dbaf5126d
+_md5_=24a144a8bc76923745fd79d94db8c15d
diff --git a/metadata/md5-cache/app-admin/entr-4.6 b/metadata/md5-cache/app-admin/entr-4.6
index baaed109bf62..8d222fd89b8e 100644
--- a/metadata/md5-cache/app-admin/entr-4.6
+++ b/metadata/md5-cache/app-admin/entr-4.6
@@ -3,10 +3,10 @@ DESCRIPTION=Run arbitrary commands when files change
EAPI=7
HOMEPAGE=http://entrproject.org
IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
LICENSE=ISC
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://entrproject.org/code/entr-4.6.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=2c9ae9642d54fbd3048e727a905419ac
+_md5_=657d809257d2fc92db59e333eb3dd7bd
diff --git a/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1 b/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
index bb7f0b7d8a01..7df572869aa5 100644
--- a/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
+++ b/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=app-arch/unzip dev-perl/DateTime dev-perl/Digest-CRC dev-perl/DateTime dev-perl/Carp-Assert dev-perl/Data-Hexify dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=http://computer.forensikblog.de/files/evtx/Parse-Evtx-1.1.1.zip
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=fab8d9c3f3917bd54e96c78d303e49d5
diff --git a/metadata/md5-cache/app-admin/graylog-3.3.9 b/metadata/md5-cache/app-admin/graylog-3.3.9
new file mode 100644
index 000000000000..d9f8f850215e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/graylog-3.3.9
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=Free and open source log management
+EAPI=7
+HOMEPAGE=https://www.graylog.org
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=!app-admin/graylog2 acct-group/graylog acct-user/graylog >=virtual/jdk-1.8:*
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://downloads.graylog.org/releases/graylog/graylog-3.3.9.tgz
+_md5_=8146b6e3f2efaff05b9a1b873e06b410
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.2.12-r1 b/metadata/md5-cache/app-admin/haskell-updater-1.2.12-r1
index f65209e030b3..72f695b52aa0 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.2.12-r1
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.2.12-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore )
SLOT=0
SRC_URI=https://hackage.haskell.org/package/haskell-updater-1.2.12/haskell-updater-1.2.12.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal f2babbc5251b22d1c1811b67f7fb8ad1 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=9223addbc585a25b90d2e48e8136fa62
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.3.1 b/metadata/md5-cache/app-admin/haskell-updater-1.3.1
index 4ef89405d162..0acaa9540b8f 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.3.1
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore )
SLOT=0
SRC_URI=https://hackage.haskell.org/package/haskell-updater-1.3.1/haskell-updater-1.3.1.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal f2babbc5251b22d1c1811b67f7fb8ad1 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=dbb7bd7603ab3c3d8ab8fa65bd322c3f
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.3.2 b/metadata/md5-cache/app-admin/haskell-updater-1.3.2
index 4ab4b4464c6d..d8df4be63a65 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.3.2
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.3.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore )
SLOT=0
SRC_URI=https://hackage.haskell.org/package/haskell-updater-1.3.2/haskell-updater-1.3.2.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal f2babbc5251b22d1c1811b67f7fb8ad1 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=dbb7bd7603ab3c3d8ab8fa65bd322c3f
diff --git a/metadata/md5-cache/app-admin/psmon-1.39-r1 b/metadata/md5-cache/app-admin/psmon-1.39-r1
index 4f3455d3ef8d..d30d3630e96f 100644
--- a/metadata/md5-cache/app-admin/psmon-1.39-r1
+++ b/metadata/md5-cache/app-admin/psmon-1.39-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=dev-lang/perl[-build(-)]
SLOT=0
SRC_URI=http://www.psmon.com/psmon-1.39.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=638281d7f812ac993c8e8dc03cc218b8
diff --git a/metadata/md5-cache/app-admin/puppet-7.1.0 b/metadata/md5-cache/app-admin/puppet-7.1.0
new file mode 100644
index 000000000000..e0389907b9af
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-7.1.0
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] dev-ruby/rspec-its[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DESCRIPTION=A system automation and configuration management software.
+EAPI=6
+HOMEPAGE=https://puppet.com/
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0 GPL-2
+PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
+RDEPEND=ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.1.0.tar.gz
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 6ee14a23a169409059ed36d4dddc3197 ruby-ng d4dbb4c6c526fcb43401ce82bd01c953 ruby-utils 927b40774937983813d360c726615e54 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=2ad155a373ba0271d01b7a6152f3f44e
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.15.0 b/metadata/md5-cache/app-admin/puppet-agent-6.15.0
deleted file mode 100644
index dea4b42aaab3..000000000000
--- a/metadata/md5-cache/app-admin/puppet-agent-6.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install unpack
-DEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what acct-user/puppet acct-group/puppet app-admin/augeas
-DESCRIPTION=general puppet client utils along with hiera and facter
-EAPI=7
-HOMEPAGE=https://puppetlabs.com/
-IUSE=puppetdb selinux
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what acct-user/puppet acct-group/puppet app-portage/eix sys-apps/dmidecode sys-libs/libselinux sys-libs/glibc sys-libs/readline:0/7 sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )
-RESTRICT=strip
-SLOT=0
-SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.15.0-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.15.0-1stretch_i386.deb )
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=0f8a4e7bbef2a39a6f64cbe7dbab22ff
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.18.0 b/metadata/md5-cache/app-admin/puppet-agent-6.18.0
index 07ea6739cb1d..1cc46283edb5 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.18.0
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.18.0
@@ -11,5 +11,5 @@ RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-w
RESTRICT=strip
SLOT=0
SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_6.18.0-1focal_amd64.deb
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=7e5db47de6d5d3bd56c74478135edec9
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1 b/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1
index 5f41e4fbf74c..a36641b1620c 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1
@@ -11,5 +11,5 @@ RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-w
RESTRICT=strip
SLOT=0
SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_6.19.1-1focal_amd64.deb
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=367965848c0c3b6c8880f01a4d31a545
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.1.0 b/metadata/md5-cache/app-admin/puppet-agent-7.1.0
new file mode 100644
index 000000000000..8080256be4e9
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-agent-7.1.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install unpack
+DEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet app-admin/augeas
+DESCRIPTION=general puppet client utils along with hiera and facter
+EAPI=7
+HOMEPAGE=https://puppetlabs.com/
+IUSE=puppetdb selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet app-portage/eix sys-apps/dmidecode sys-libs/libselinux sys-libs/glibc sys-libs/readline:0/8 sys-libs/libxcrypt sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.1.0-1focal_amd64.deb
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=ce561f3ce0f151b0c79b5bb150ed1096
diff --git a/metadata/md5-cache/app-admin/puppetdb-7.0.1 b/metadata/md5-cache/app-admin/puppetdb-7.0.1
new file mode 100644
index 000000000000..40a5ad1ce31c
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppetdb-7.0.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=acct-user/puppetdb acct-group/puppetdb
+DESCRIPTION=PuppetDB collects data generated by Puppet.
+EAPI=7
+HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8.0
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-7.0.1.tar.gz
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=4776119ce214f1fe4704f8096506d5ba
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.12.1 b/metadata/md5-cache/app-admin/puppetserver-6.12.1
new file mode 100644
index 000000000000..f7c2de028442
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppetserver-6.12.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=acct-user/puppet acct-group/puppet
+DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
+EAPI=7
+HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
+IUSE=puppetdb
+KEYWORDS=amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-6.12.1.tar.gz
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=ab029b221ad00eb5e1626282b54bd0c3
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.13.0 b/metadata/md5-cache/app-admin/puppetserver-6.13.0
index 6831eff6fee5..7d02ba9d4f20 100644
--- a/metadata/md5-cache/app-admin/puppetserver-6.13.0
+++ b/metadata/md5-cache/app-admin/puppetserver-6.13.0
@@ -5,10 +5,10 @@ DESCRIPTION=Puppet Server is the next-generation application for managing Puppet
EAPI=7
HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
IUSE=puppetdb
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
LICENSE=Apache-2.0
RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
SLOT=0
SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-6.13.0.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=877c34d1e198cd2d10b7bd42ea575f3b
+_md5_=ab029b221ad00eb5e1626282b54bd0c3
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.14.0 b/metadata/md5-cache/app-admin/puppetserver-6.14.0
index aaa5e623529d..50cfcb2ce4b2 100644
--- a/metadata/md5-cache/app-admin/puppetserver-6.14.0
+++ b/metadata/md5-cache/app-admin/puppetserver-6.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Puppet Server is the next-generation application for managing Puppet
EAPI=7
HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
IUSE=puppetdb
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
LICENSE=Apache-2.0
RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
SLOT=0
SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-6.14.0.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=877c34d1e198cd2d10b7bd42ea575f3b
+_md5_=ab029b221ad00eb5e1626282b54bd0c3
diff --git a/metadata/md5-cache/app-admin/puppetserver-7.0.1 b/metadata/md5-cache/app-admin/puppetserver-7.0.1
new file mode 100644
index 000000000000..300f49e01103
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppetserver-7.0.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=acct-user/puppet acct-group/puppet
+DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
+EAPI=7
+HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
+IUSE=puppetdb
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-7.0.1.tar.gz
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=699a31c2e6896eb8ddc876208e4734b3
diff --git a/metadata/md5-cache/app-admin/selint-1.1.0 b/metadata/md5-cache/app-admin/selint-1.1.0
index 4df1e797a396..36ea9dced10d 100644
--- a/metadata/md5-cache/app-admin/selint-1.1.0
+++ b/metadata/md5-cache/app-admin/selint-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Policy Analysis Tools for SELinux
EAPI=7
HOMEPAGE=https://github.com/TresysTechnology/selint/wiki
IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=dev-libs/confuse:= dev-libs/uthash
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/TresysTechnology/selint/releases/download/v1.1.0/selint-1.1.0.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=b117de49898ac67a3f8c107b1a7ea539
+_md5_=6d28c9908d278541cce8ac21480b0646
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.4 b/metadata/md5-cache/app-admin/sudo-1.9.4_p1
similarity index 92%
rename from metadata/md5-cache/app-admin/sudo-1.9.4
rename to metadata/md5-cache/app-admin/sudo-1.9.4_p1
index f48c6cb12f49..0aeaf610ee41 100644
--- a/metadata/md5-cache/app-admin/sudo-1.9.4
+++ b/metadata/md5-cache/app-admin/sudo-1.9.4_p1
@@ -10,6 +10,6 @@ LICENSE=ISC BSD
RDEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
SLOT=0
-SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.4.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.4.tar.gz
+SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.4p1.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.4p1.tar.gz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e pam 226d8d2ff588bdfd7d188512dbdb189d systemd 69be00334d73f9f50261554b94be0879 tmpfiles 6170dc7770585fb3f16efdee789a3218 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=062546a59bc897f609ebce9aee4ef435
+_md5_=d02e9c181c1cddd9eb7907e35cdb6f91
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.4_p2 b/metadata/md5-cache/app-admin/sudo-1.9.4_p2
new file mode 100644
index 000000000000..32db57c4ff90
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sudo-1.9.4_p2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] )
+DESCRIPTION=Allows users or groups to run commands as other users
+EAPI=7
+HOMEPAGE=https://www.sudo.ws/
+IUSE=gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris
+LICENSE=ISC BSD
+RDEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
+REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
+SLOT=0
+SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.4p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.4p2.tar.gz
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e pam 226d8d2ff588bdfd7d188512dbdb189d systemd 69be00334d73f9f50261554b94be0879 tmpfiles 6170dc7770585fb3f16efdee789a3218 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=d02e9c181c1cddd9eb7907e35cdb6f91
diff --git a/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1 b/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
index ae2f9205f674..81a83fe8b35c 100644
--- a/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
+++ b/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=dev-perl/Date-Manip dev-perl/Date-Calc dev-perl/File-Tail dev-perl/TimeDate >=virtual/perl-Time-HiRes-1.12 !app-admin/swatch dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://sourceforge/swatch/swatchdog-3.2.4.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=afe296f9c4283c547da5473261a1a22a
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 3a1d102ac231..4bcea177e8a9 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/file-roller-3.38.0 b/metadata/md5-cache/app-arch/file-roller-3.38.0
new file mode 100644
index 000000000000..9a31e25a98cf
--- /dev/null
+++ b/metadata/md5-cache/app-arch/file-roller-3.38.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 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 test
+DEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.38:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.22.0:3 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Archive manager for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/FileRoller
+IUSE=libnotify nautilus
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.38:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.22.0:3 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/file-roller/3.38/file-roller-3.38.0.tar.xz
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e meson 71d293a701d6362387e1214da368c848 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=383b73aecb66510da80323e31c53e324
diff --git a/metadata/md5-cache/app-arch/libarchive-3.5.0 b/metadata/md5-cache/app-arch/libarchive-3.5.0
index 92496e11dbad..51e17285a736 100644
--- a/metadata/md5-cache/app-arch/libarchive-3.5.0
+++ b/metadata/md5-cache/app-arch/libarchive-3.5.0
@@ -11,4 +11,4 @@ RDEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
SLOT=0/13
SRC_URI=https://www.libarchive.org/downloads/libarchive-3.5.0.tar.gz
_eclasses_=libtool f143db5a74ccd9ca28c1234deffede96 multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=1cf07b2edb6e19acaa9c48bbccc73d6b
+_md5_=8b2c6911886386d70c5a38129016b2bb
diff --git a/metadata/md5-cache/app-arch/lz4-1.9.2 b/metadata/md5-cache/app-arch/lz4-1.9.2
deleted file mode 100644
index d90027a20937..000000000000
--- a/metadata/md5-cache/app-arch/lz4-1.9.2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extremely Fast Compression algorithm
-EAPI=7
-HOMEPAGE=https://github.com/lz4/lz4
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-2 GPL-2
-SLOT=0/r132
-SRC_URI=https://github.com/lz4/lz4/archive/v1.9.2.tar.gz -> lz4-1.9.2.tar.gz
-_eclasses_=cmake 6b7438831d544f2fe59a3d4ab4103f52 cmake-multilib b396704c8c04bb210b7b45dff5c67fea edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=f0396817faa9b62f093c900daf89d78c
diff --git a/metadata/md5-cache/app-arch/lz4-1.9.3 b/metadata/md5-cache/app-arch/lz4-1.9.3
index edefda8e89b5..61675778be23 100644
--- a/metadata/md5-cache/app-arch/lz4-1.9.3
+++ b/metadata/md5-cache/app-arch/lz4-1.9.3
@@ -4,9 +4,9 @@ DESCRIPTION=Extremely Fast Compression algorithm
EAPI=7
HOMEPAGE=https://github.com/lz4/lz4
IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD-2 GPL-2
SLOT=0/r132
SRC_URI=https://github.com/lz4/lz4/archive/v1.9.3.tar.gz -> lz4-1.9.3.tar.gz
_eclasses_=cmake 6b7438831d544f2fe59a3d4ab4103f52 cmake-multilib b396704c8c04bb210b7b45dff5c67fea edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=66a1275b9936135f1a88303a1e83da80
+_md5_=8f013e0d904eb403f0e49b0347b92082
diff --git a/metadata/md5-cache/app-arch/makeself-2.2.0-r2 b/metadata/md5-cache/app-arch/makeself-2.2.0-r2
index 15f4b5a433eb..d2668dea26ad 100644
--- a/metadata/md5-cache/app-arch/makeself-2.2.0-r2
+++ b/metadata/md5-cache/app-arch/makeself-2.2.0-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
RDEPEND=sys-apps/gentoo-functions
SLOT=0
SRC_URI=https://github.com/megastep/makeself/archive/release-2.2.0.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=588602b5a4e68bcd8f766613b6088d9d
diff --git a/metadata/md5-cache/app-arch/pax-20161104 b/metadata/md5-cache/app-arch/pax-20161104
index e2a12b3de396..94e21c726c64 100644
--- a/metadata/md5-cache/app-arch/pax-20161104
+++ b/metadata/md5-cache/app-arch/pax-20161104
@@ -8,5 +8,5 @@ LICENSE=BSD
RDEPEND=dev-libs/libbsd elibc_musl? ( sys-libs/fts-standalone )
SLOT=0
SRC_URI=https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-20161104.cpio.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=b04bd098ddad95d6604a0ce01c418d50
diff --git a/metadata/md5-cache/app-arch/pixz-1.0.7 b/metadata/md5-cache/app-arch/pixz-1.0.7
index 45fd4282c556..adbb10b8fc17 100644
--- a/metadata/md5-cache/app-arch/pixz-1.0.7
+++ b/metadata/md5-cache/app-arch/pixz-1.0.7
@@ -4,10 +4,10 @@ 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
+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_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=109dc9d9ee65c82f5285264079e31c4f
+_md5_=a498b411f7b59a4d70b8e980f83ca5ab
diff --git a/metadata/md5-cache/app-arch/stormlib-9.23-r1 b/metadata/md5-cache/app-arch/stormlib-9.23-r1
new file mode 100644
index 000000000000..9b9df8e79230
--- /dev/null
+++ b/metadata/md5-cache/app-arch/stormlib-9.23-r1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/bzip2:= dev-libs/libtomcrypt:=[libtommath] sys-libs/zlib:=
+DESCRIPTION=Library to read and write MPQ archives (Diablo, StarCraft)
+EAPI=7
+HOMEPAGE=http://www.zezula.net/en/mpq/stormlib.html https://github.com/ladislav-zezula/StormLib
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-arch/bzip2:= dev-libs/libtomcrypt:=[libtommath] sys-libs/zlib:=
+SLOT=0
+SRC_URI=https://github.com/ladislav-zezula/StormLib/archive/v9.23.tar.gz -> StormLib-9.23.tar.gz
+_eclasses_=cmake 6b7438831d544f2fe59a3d4ab4103f52 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=272e8a5e83e32afc66e66c97adc39086
diff --git a/metadata/md5-cache/app-arch/xar-1.8-r4 b/metadata/md5-cache/app-arch/xar-1.8-r4
new file mode 100644
index 000000000000..46f38a5449d8
--- /dev/null
+++ b/metadata/md5-cache/app-arch/xar-1.8-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=elibc_musl? ( sys-libs/fts-standalone ) kernel_linux? ( virtual/acl ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=An easily extensible archive format
+EAPI=7
+HOMEPAGE=https://opensource.apple.com/source/xar/
+IUSE=libressl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=elibc_musl? ( sys-libs/fts-standalone ) kernel_linux? ( virtual/acl ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://opensource.apple.com/tarballs/xar/xar-417.1.tar.gz
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=2b43d7c36469cdc920712abe59585c12
diff --git a/metadata/md5-cache/app-arch/zstd-1.4.5 b/metadata/md5-cache/app-arch/zstd-1.4.5
index 820663590ff6..3ab25b79f89d 100644
--- a/metadata/md5-cache/app-arch/zstd-1.4.5
+++ b/metadata/md5-cache/app-arch/zstd-1.4.5
@@ -4,10 +4,10 @@ DESCRIPTION=zstd fast compression library
EAPI=7
HOMEPAGE=https://facebook.github.io/zstd/
IUSE=lz4 static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~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=|| ( BSD GPL-2 )
RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
SLOT=0/1
SRC_URI=https://github.com/facebook/zstd/archive/v1.4.5.tar.gz -> zstd-1.4.5.tar.gz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=4fb969b17cbf22646a415a914a3e8cdc
+_md5_=09865c4efa463e81bc4a7f4fc5e505eb
diff --git a/metadata/md5-cache/app-arch/zstd-1.4.7 b/metadata/md5-cache/app-arch/zstd-1.4.8
similarity index 92%
rename from metadata/md5-cache/app-arch/zstd-1.4.7
rename to metadata/md5-cache/app-arch/zstd-1.4.8
index 2ade06ec40b2..db899a1cd64f 100644
--- a/metadata/md5-cache/app-arch/zstd-1.4.7
+++ b/metadata/md5-cache/app-arch/zstd-1.4.8
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~s
LICENSE=|| ( BSD GPL-2 )
RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
SLOT=0/1
-SRC_URI=https://github.com/facebook/zstd/archive/v1.4.7.tar.gz -> zstd-1.4.7.tar.gz
+SRC_URI=https://github.com/facebook/zstd/archive/v1.4.8.tar.gz -> zstd-1.4.8.tar.gz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=497cf3c58deb0f269adec52a434fd496
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 989f943b194c..bfdbef73bf8c 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/amanda-3.3.9 b/metadata/md5-cache/app-backup/amanda-3.3.9
index 2e280c49ddfc..48255ec2de03 100644
--- a/metadata/md5-cache/app-backup/amanda-3.3.9
+++ b/metadata/md5-cache/app-backup/amanda-3.3.9
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://sourceforge/amanda/amanda-3.3.9.tar.gz
-_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=498c097f6ef59f994923ec392ab7bcb5
diff --git a/metadata/md5-cache/app-backup/cdbkup-1.0-r2 b/metadata/md5-cache/app-backup/cdbkup-1.0-r2
index 4b41a02903e7..d40c510457fb 100644
--- a/metadata/md5-cache/app-backup/cdbkup-1.0-r2
+++ b/metadata/md5-cache/app-backup/cdbkup-1.0-r2
@@ -1,11 +1,11 @@
DEFINED_PHASES=configure install prepare
-DEPEND=net-misc/openssh virtual/cdrtools virtual/eject
+DEPEND=app-cdr/cdrtools net-misc/openssh virtual/eject
DESCRIPTION=performs full/incremental backups of local/remote filesystems onto CD-R(W)s
EAPI=6
HOMEPAGE=http://cdbkup.sourceforge.net/
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
-RDEPEND=net-misc/openssh virtual/cdrtools virtual/eject !app-misc/cdcat
+RDEPEND=app-cdr/cdrtools net-misc/openssh virtual/eject !app-misc/cdcat
SLOT=0
SRC_URI=mirror://sourceforge/cdbkup/cdbkup-1.0.tar.gz
-_md5_=5d6404a4d7695af61a00aa3ce03e0ee7
+_md5_=5ceb7abdb1740d4b47bf7e806fa497d2
diff --git a/metadata/md5-cache/app-backup/rear-2.4 b/metadata/md5-cache/app-backup/rear-2.4
index bcb08b0b56ab..6babaca0a089 100644
--- a/metadata/md5-cache/app-backup/rear-2.4
+++ b/metadata/md5-cache/app-backup/rear-2.4
@@ -5,7 +5,7 @@ HOMEPAGE=http://relax-and-recover.org/
IUSE=libressl udev samba
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
-RDEPEND=net-dialup/mingetty net-fs/nfs-utils sys-apps/gawk sys-apps/iproute2 sys-apps/lsb-release sys-apps/sed sys-apps/util-linux sys-block/parted sys-boot/syslinux virtual/cdrtools !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) samba? ( net-fs/cifs-utils ) udev? ( virtual/udev )
+RDEPEND=app-cdr/cdrtools net-dialup/mingetty net-fs/nfs-utils sys-apps/gawk sys-apps/iproute2 sys-apps/lsb-release sys-apps/sed sys-apps/util-linux sys-block/parted sys-boot/syslinux !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) samba? ( net-fs/cifs-utils ) udev? ( virtual/udev )
SLOT=0
SRC_URI=https://github.com/rear/rear/archive/2.4.tar.gz -> rear-2.4.tar.gz
-_md5_=d530de456773b61eb131eb9ec1683e4a
+_md5_=acc91a63eafe2e54feb1280660b91980
diff --git a/metadata/md5-cache/app-backup/rear-2.6 b/metadata/md5-cache/app-backup/rear-2.6
index a0487d2842cd..62c6d54698ee 100644
--- a/metadata/md5-cache/app-backup/rear-2.6
+++ b/metadata/md5-cache/app-backup/rear-2.6
@@ -6,8 +6,8 @@ HOMEPAGE=http://relax-and-recover.org/ https://github.com/rear/rear/
IUSE=udev
KEYWORDS=amd64 x86
LICENSE=GPL-3+
-RDEPEND=app-shells/bash net-dialup/mingetty net-fs/nfs-utils sys-apps/gawk sys-apps/iproute2 sys-apps/lsb-release sys-apps/sed sys-apps/util-linux sys-block/parted sys-boot/syslinux virtual/cdrtools udev? ( virtual/udev )
+RDEPEND=app-cdr/cdrtools app-shells/bash net-dialup/mingetty net-fs/nfs-utils sys-apps/gawk sys-apps/iproute2 sys-apps/lsb-release sys-apps/sed sys-apps/util-linux sys-block/parted sys-boot/syslinux udev? ( virtual/udev )
SLOT=0
SRC_URI=https://github.com/rear/rear/archive/2.6.tar.gz -> rear-2.6.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e optfeature 6c9aa35fc16df43d7142ef2660e00e25 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6
-_md5_=f3ba11138f2939905eecf38108d382cc
+_md5_=466ecf361e40a452fa5d3fd9517015ac
diff --git a/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1 b/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
index 2085d8e4cada..fb0ec3db303c 100644
--- a/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
+++ b/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/mit-krb5[keyutils] media-libs/libpng-compat:1.2 dbus? ( sys-ap
RESTRICT=mirror strip
SLOT=0
SRC_URI=x86? ( https://spideroak.com/release/spideroak/deb_x86 -> spideroak-bin-7.5.0_x86.deb ) amd64? ( https://spideroak.com/release/spideroak/deb_x64 -> spideroak-bin-7.5.0_amd64.deb )
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=8f8e5d233b8c29f2c409b247892a4970
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 6dca1e14a855..4539f9c13542 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/bashburn-3.1.0-r1 b/metadata/md5-cache/app-cdr/bashburn-3.1.0-r1
index d78ecdb758f8..c69d80a255d8 100644
--- a/metadata/md5-cache/app-cdr/bashburn-3.1.0-r1
+++ b/metadata/md5-cache/app-cdr/bashburn-3.1.0-r1
@@ -5,7 +5,7 @@ EAPI=7
HOMEPAGE=http://bashburn.dose.se/ https://gitlab.com/anders.linden/BashBurn
KEYWORDS=amd64 ppc ~ppc64 sparc x86
LICENSE=GPL-2
-RDEPEND=app-shells/bash app-cdr/cdrdao app-cdr/dvd+rw-tools media-libs/flac || ( dev-libs/libcdio-paranoia media-sound/cdparanoia ) media-sound/lame || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/normalize media-sound/vorbis-tools virtual/cdrtools virtual/eject
+RDEPEND=app-cdr/cdrtools app-shells/bash app-cdr/cdrdao app-cdr/dvd+rw-tools media-libs/flac || ( dev-libs/libcdio-paranoia media-sound/cdparanoia ) media-sound/lame || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/normalize media-sound/vorbis-tools virtual/eject
SLOT=0
SRC_URI=http://bashburn.dose.se/index.php?s=file_download&id=25 -> BashBurn-3.1.0.tar.gz
-_md5_=9f588d8e6ff48bb28f20c03a757bff29
+_md5_=cb54aaa637fdba65a5308b33ea739d5e
diff --git a/metadata/md5-cache/app-cdr/brasero-3.12.2-r1 b/metadata/md5-cache/app-cdr/brasero-3.12.2-r1
index af09d8f4304b..da06dbc1070d 100644
--- a/metadata/md5-cache/app-cdr/brasero-3.12.2-r1
+++ b/metadata/md5-cache/app-cdr/brasero-3.12.2-r1
@@ -7,9 +7,9 @@ IUSE=+css +introspection +libburn mp3 nautilus packagekit playlist test tracker
KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
LICENSE=GPL-2+ CC-BY-SA-3.0
PDEPEND=gnome-base/gvfs
-RDEPEND=>=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3:3[introspection?] media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/libxml2-2.6:2 >=x11-libs/libnotify-0.6.1:= media-libs/libcanberra[gtk3] x11-libs/libICE x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-1.30:= ) libburn? ( >=dev-libs/libburn-0.4:= >=dev-libs/libisofs-0.6.4:= ) nautilus? ( >=gnome-base/nautilus-2.91.90 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= ) tracker? ( >=app-misc/tracker-1:0= ) media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0[mp3?] x11-themes/hicolor-icon-theme css? ( media-libs/libdvdcss:1.2 ) !libburn? ( app-cdr/cdrdao app-cdr/dvd+rw-tools virtual/cdrtools ) packagekit? ( app-admin/packagekit-base )
+RDEPEND=>=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3:3[introspection?] media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/libxml2-2.6:2 >=x11-libs/libnotify-0.6.1:= media-libs/libcanberra[gtk3] x11-libs/libICE x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-1.30:= ) libburn? ( >=dev-libs/libburn-0.4:= >=dev-libs/libisofs-0.6.4:= ) nautilus? ( >=gnome-base/nautilus-2.91.90 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= ) tracker? ( >=app-misc/tracker-1:0= ) media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0[mp3?] x11-themes/hicolor-icon-theme css? ( media-libs/libdvdcss:1.2 ) !libburn? ( app-cdr/cdrdao app-cdr/cdrtools app-cdr/dvd+rw-tools ) packagekit? ( app-admin/packagekit-base )
RESTRICT=!test? ( test )
SLOT=0/3.1
SRC_URI=mirror://gnome/sources/brasero/3.12/brasero-3.12.2.tar.xz
_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 c156bb2ac81c822dd861424ce19bc168 gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=b05165c3a7228f4db3b15877649f9ae8
+_md5_=70080859fdfce1db0e5c05eb1691d15e
diff --git a/metadata/md5-cache/app-cdr/burncdda-1.8.3 b/metadata/md5-cache/app-cdr/burncdda-1.8.3
index 4aebe1f636b2..e91166cc1292 100644
--- a/metadata/md5-cache/app-cdr/burncdda-1.8.3
+++ b/metadata/md5-cache/app-cdr/burncdda-1.8.3
@@ -5,7 +5,7 @@ HOMEPAGE=http://burncdda.sourceforge.net/
IUSE=flac mp3 vorbis
KEYWORDS=amd64 ppc ~sparc x86
LICENSE=GPL-2
-RDEPEND=app-cdr/cdrdao dev-util/dialog media-sound/normalize media-sound/sox virtual/cdrtools flac? ( media-libs/flac ) mp3? ( media-sound/mpg123 media-sound/mp3_check ) vorbis? ( media-sound/vorbis-tools )
+RDEPEND=app-cdr/cdrdao app-cdr/cdrtools dev-util/dialog media-sound/normalize media-sound/sox flac? ( media-libs/flac ) mp3? ( media-sound/mpg123 media-sound/mp3_check ) vorbis? ( media-sound/vorbis-tools )
SLOT=0
SRC_URI=mirror://sourceforge/burncdda/burncdda-1.8.3.tar.gz
-_md5_=adaf55034dc0352c06983bdc1a076b59
+_md5_=73466a072822ccbc2d9238f3c0d86211
diff --git a/metadata/md5-cache/app-cdr/cdrdao-1.2.4 b/metadata/md5-cache/app-cdr/cdrdao-1.2.4
index ebcd3f33e3bd..e0e456be06d3 100644
--- a/metadata/md5-cache/app-cdr/cdrdao-1.2.4
+++ b/metadata/md5-cache/app-cdr/cdrdao-1.2.4
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure prepare
-DEPEND=virtual/cdrtools encode? ( >=media-sound/lame-3.99 ) mad? ( media-libs/libmad media-libs/libao ) vorbis? ( media-libs/libvorbis media-libs/libao ) 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
+DEPEND=app-cdr/cdrtools encode? ( >=media-sound/lame-3.99 ) mad? ( media-libs/libmad media-libs/libao ) vorbis? ( media-libs/libvorbis media-libs/libao ) 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
DESCRIPTION=Burn CDs in disk-at-once mode -- with optional GUI frontend
EAPI=6
HOMEPAGE=http://cdrdao.sourceforge.net/
IUSE=encode mad vorbis
KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86
LICENSE=GPL-2
-RDEPEND=virtual/cdrtools encode? ( >=media-sound/lame-3.99 ) mad? ( media-libs/libmad media-libs/libao ) vorbis? ( media-libs/libvorbis media-libs/libao ) !app-cdr/cue2toc !dev-util/pccts
+RDEPEND=app-cdr/cdrtools encode? ( >=media-sound/lame-3.99 ) mad? ( media-libs/libmad media-libs/libao ) vorbis? ( media-libs/libvorbis media-libs/libao ) !app-cdr/cue2toc !dev-util/pccts
SLOT=0
SRC_URI=mirror://sourceforge/cdrdao/cdrdao-1.2.4.tar.bz2
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=9883404330b68f2c9fc6a62b811ca7b4
+_md5_=ba790237276439fe0d6340b4c2a2e9e1
diff --git a/metadata/md5-cache/app-cdr/cdw-0.8.1 b/metadata/md5-cache/app-cdr/cdw-0.8.1
index 8a6c005fc11c..62fa047d8a6b 100644
--- a/metadata/md5-cache/app-cdr/cdw-0.8.1
+++ b/metadata/md5-cache/app-cdr/cdw-0.8.1
@@ -1,12 +1,12 @@
DEFINED_PHASES=configure install
-DEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses:*[unicode] virtual/pkgconfig
+DEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses:*[unicode] virtual/pkgconfig
DESCRIPTION=An ncurses based console frontend for cdrtools and dvd+rw-tools
EAPI=6
HOMEPAGE=http://cdw.sourceforge.net
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2+
-RDEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses:*[unicode]
+RDEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses:*[unicode]
SLOT=0
SRC_URI=mirror://sourceforge/cdw/cdw-0.8.1.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=1d8c3ac244d148aa0ab89c50d75418cf
+_md5_=5b920159d24949c35a66d04a10999a1d
diff --git a/metadata/md5-cache/app-cdr/cdw-0.8.1-r1 b/metadata/md5-cache/app-cdr/cdw-0.8.1-r1
index 777d896fa21d..03cb153563ef 100644
--- a/metadata/md5-cache/app-cdr/cdw-0.8.1-r1
+++ b/metadata/md5-cache/app-cdr/cdw-0.8.1-r1
@@ -1,13 +1,13 @@
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 prepare
-DEPEND=app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode] virtual/cdrtools
+DEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode]
DESCRIPTION=An ncurses based console frontend for cdrtools and dvd+rw-tools
EAPI=7
HOMEPAGE=http://cdw.sourceforge.net
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2+
-RDEPEND=app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode] virtual/cdrtools
+RDEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode]
SLOT=0
SRC_URI=mirror://sourceforge/cdw/cdw-0.8.1.tar.gz
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=ea7a3725bf565167fd2b8a14ac754f2e
+_md5_=7220fc47fafad3be9fab740c5ddb2bc1
diff --git a/metadata/md5-cache/app-cdr/cdw-9999 b/metadata/md5-cache/app-cdr/cdw-9999
index 569ab35ba200..e6a253ff1f2e 100644
--- a/metadata/md5-cache/app-cdr/cdw-9999
+++ b/metadata/md5-cache/app-cdr/cdw-9999
@@ -1,12 +1,12 @@
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 dev-vcs/cvs
DEFINED_PHASES=configure prepare unpack
-DEPEND=app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode] virtual/cdrtools
+DEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode]
DESCRIPTION=An ncurses based console frontend for cdrtools and dvd+rw-tools
EAPI=7
HOMEPAGE=http://cdw.sourceforge.net
LICENSE=GPL-2+
PROPERTIES=live
-RDEPEND=app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode] virtual/cdrtools
+RDEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode]
SLOT=0
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a cvs bda24999586324ba1c7266a9b89622fd libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=1f1d2d03bc17e383003f1288b73db7da
+_md5_=a5a0c7ac314bbbc17574262cdad70363
diff --git a/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3 b/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3
index ad6a0c44bb28..a194dd7b82a6 100644
--- a/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3
+++ b/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile install postinst prepare
-DEPEND=virtual/cdrtools sys-devel/m4
+DEPEND=app-cdr/cdrtools sys-devel/m4
DESCRIPTION=A set of tools for DVD+RW/-RW drives
EAPI=6
HOMEPAGE=http://fy.chalmers.se/~appro/linux/DVD+RW/
KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
-RDEPEND=virtual/cdrtools
+RDEPEND=app-cdr/cdrtools
SLOT=0
SRC_URI=http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.1.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=c8af1e9de84332d7fd1374e2e8f39290
+_md5_=e13e392925de92fafe02151753e4465e
diff --git a/metadata/md5-cache/app-cdr/dvdshrink-2.6.1_p10 b/metadata/md5-cache/app-cdr/dvdshrink-2.6.1_p10
index 5b8f9f36d46b..e25048ab2311 100644
--- a/metadata/md5-cache/app-cdr/dvdshrink-2.6.1_p10
+++ b/metadata/md5-cache/app-cdr/dvdshrink-2.6.1_p10
@@ -5,8 +5,8 @@ HOMEPAGE=http://dvdshrink.sourceforge.net
IUSE=gtk
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
-RDEPEND=>=media-video/transcode-1.0.2-r2[dvd] >=media-video/mjpegtools-1.8.0-r1 >=media-video/subtitleripper-0.3.4-r1 >=media-video/dvdauthor-0.6.11 >=app-cdr/dvd+rw-tools-6.1 gtk? ( >=dev-perl/Gtk2-1.104 ) >=app-text/gocr-0.40 virtual/cdrtools
+RDEPEND=app-cdr/cdrtools >=app-cdr/dvd+rw-tools-6.1 >=app-text/gocr-0.40 >=media-video/dvdauthor-0.6.11 >=media-video/mjpegtools-1.8.0-r1 >=media-video/subtitleripper-0.3.4-r1 >=media-video/transcode-1.0.2-r2[dvd] gtk? ( >=dev-perl/Gtk2-1.104 )
SLOT=0
SRC_URI=mirror://sourceforge/dvdshrink/dvdshrink-2.6.1-10mdk.tar.gz
_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a
-_md5_=2503233608104cefe437e36d1fdd2680
+_md5_=1fa864303735d65bd84cc666cdc9cae5
diff --git a/metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r2 b/metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r2
index 980838824fd8..68b4fa3e5622 100644
--- a/metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r2
+++ b/metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r2
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-cdr/cdrdao >=dev-libs/glib-2.4:2 >=gnome-base/libglade-2.4:2.0 media-libs/libmng:= virtual/cdrtools x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.4:2 dvdr? ( app-cdr/dvd+rw-tools ) flac? ( media-libs/flac ) mp3? ( media-libs/libid3tag media-libs/libmad media-sound/sox ) nls? ( virtual/libintl ) vorbis? ( media-libs/libogg media-libs/libvorbis media-sound/sox ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) >=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 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-cdr/cdrdao app-cdr/cdrtools >=dev-libs/glib-2.4:2 >=gnome-base/libglade-2.4:2.0 media-libs/libmng:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.4:2 dvdr? ( app-cdr/dvd+rw-tools ) flac? ( media-libs/flac ) mp3? ( media-libs/libid3tag media-libs/libmad media-sound/sox ) nls? ( virtual/libintl ) vorbis? ( media-libs/libogg media-libs/libvorbis media-sound/sox ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) >=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 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Graphical frontend for cdrecord, mkisofs, readcd and sox using GTK+2
EAPI=6
HOMEPAGE=http://graveman.tuxfamily.org/
IUSE=debug dvdr flac mp3 nls vorbis
KEYWORDS=amd64 ppc ppc64 sparc x86
LICENSE=GPL-2
-RDEPEND=app-cdr/cdrdao >=dev-libs/glib-2.4:2 >=gnome-base/libglade-2.4:2.0 media-libs/libmng:= virtual/cdrtools x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.4:2 dvdr? ( app-cdr/dvd+rw-tools ) flac? ( media-libs/flac ) mp3? ( media-libs/libid3tag media-libs/libmad media-sound/sox ) nls? ( virtual/libintl ) vorbis? ( media-libs/libogg media-libs/libvorbis media-sound/sox )
+RDEPEND=app-cdr/cdrdao app-cdr/cdrtools >=dev-libs/glib-2.4:2 >=gnome-base/libglade-2.4:2.0 media-libs/libmng:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.4:2 dvdr? ( app-cdr/dvd+rw-tools ) flac? ( media-libs/flac ) mp3? ( media-libs/libid3tag media-libs/libmad media-sound/sox ) nls? ( virtual/libintl ) vorbis? ( media-libs/libogg media-libs/libvorbis media-sound/sox )
SLOT=0
SRC_URI=http://graveman.tuxfamily.org/sources/graveman-0.3.12-5.tar.gz
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 c156bb2ac81c822dd861424ce19bc168 gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=9602a60b7b915f50c093bbea031ae09a
+_md5_=1b314d8a5b2766a1fe93902e99771b66
diff --git a/metadata/md5-cache/app-cdr/mp3burn-0.4.2 b/metadata/md5-cache/app-cdr/mp3burn-0.4.2
index d67c202fa2cb..5c9bdb6f9139 100644
--- a/metadata/md5-cache/app-cdr/mp3burn-0.4.2
+++ b/metadata/md5-cache/app-cdr/mp3burn-0.4.2
@@ -5,8 +5,8 @@ EAPI=5
HOMEPAGE=https://sourceforge.net/projects/mp3burn
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
-RDEPEND=dev-lang/perl media-sound/mpg123 media-libs/flac media-sound/vorbis-tools virtual/cdrtools dev-perl/MP3-Info dev-perl/Ogg-Vorbis-Header dev-perl/String-ShellQuote
+RDEPEND=dev-lang/perl app-cdr/cdrtools media-sound/mpg123 media-libs/flac media-sound/vorbis-tools dev-perl/MP3-Info dev-perl/Ogg-Vorbis-Header dev-perl/String-ShellQuote
SLOT=0
SRC_URI=mirror://sourceforge/mp3burn/mp3burn-0.4.2.tar.gz
_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=0e1f9c67cf4394ef53dab8f8c30f3482
+_md5_=8b0dee5ebc3f92998dace5b521aff31f
diff --git a/metadata/md5-cache/app-cdr/multicd-1.7.5-r1 b/metadata/md5-cache/app-cdr/multicd-1.7.5-r1
index fd65df28e0a6..66104501c95d 100644
--- a/metadata/md5-cache/app-cdr/multicd-1.7.5-r1
+++ b/metadata/md5-cache/app-cdr/multicd-1.7.5-r1
@@ -4,7 +4,7 @@ EAPI=6
HOMEPAGE=http://danborn.net/multicd/
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.8.6 virtual/cdrtools
+RDEPEND=app-cdr/cdrtools >=dev-lang/perl-5.8.6
SLOT=0
SRC_URI=http://danborn.net/multicd/multicd-1.7.5.tar.gz
-_md5_=18c650fc3086fa7e78654081847528da
+_md5_=a32c25436484575ed795689b68e6968a
diff --git a/metadata/md5-cache/app-cdr/tkdvd-4.0.9-r1 b/metadata/md5-cache/app-cdr/tkdvd-4.0.9-r1
index 6a7d26eaeb15..de1ef8cc0ed3 100644
--- a/metadata/md5-cache/app-cdr/tkdvd-4.0.9-r1
+++ b/metadata/md5-cache/app-cdr/tkdvd-4.0.9-r1
@@ -4,8 +4,8 @@ EAPI=5
HOMEPAGE=http://regis.damongeot.free.fr/tkdvd/
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
-RDEPEND=app-cdr/dvd+rw-tools dev-lang/tcl:0 dev-lang/tk:0 virtual/cdrtools
+RDEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-lang/tcl:0 dev-lang/tk:0
SLOT=0
SRC_URI=http://regis.damongeot.free.fr/tkdvd/dl/tkdvd-4.0.9.tar.gz
_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=e3967c8021df6cca126114255f154ffc
+_md5_=584c2ccad994765a2906472218a352b7
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 352a8ffa1f10..adfff53d5ccf 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/debian-archive-keyring-2018.1 b/metadata/md5-cache/app-crypt/debian-archive-keyring-2018.1
index cce555b12e91..ee28e2875e50 100644
--- a/metadata/md5-cache/app-crypt/debian-archive-keyring-2018.1
+++ b/metadata/md5-cache/app-crypt/debian-archive-keyring-2018.1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2018.1_all.deb
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b
_md5_=d82f4f8942ddaa5c91284ddb599cc5e5
diff --git a/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1 b/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1
index e7e0cf70ac78..d4f518ad8935 100644
--- a/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1
+++ b/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2019.1_all.deb
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b
_md5_=58dd817cc06301c302bc95e8296693f6
diff --git a/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1-r1 b/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1-r1
index 5104abd7108a..cb25571c8f6d 100644
--- a/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1-r1
+++ b/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1-r1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2019.1_all.deb
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b
_md5_=539c5b462329635e1792047a55afe2bf
diff --git a/metadata/md5-cache/app-crypt/libmd-1.0.0 b/metadata/md5-cache/app-crypt/libmd-1.0.0
deleted file mode 100644
index 82c212338fc7..000000000000
--- a/metadata/md5-cache/app-crypt/libmd-1.0.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Message Digest functions from BSD systems
-EAPI=6
-HOMEPAGE=https://www.hadrons.org/software/libmd/
-KEYWORDS=amd64 ppc x86
-LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
-SLOT=0
-SRC_URI=https://archive.hadrons.org/software/libmd/libmd-1.0.0.tar.xz
-_md5_=ae239665f4e53ba2002161352bdc238f
diff --git a/metadata/md5-cache/app-crypt/libmd-1.0.0-r1 b/metadata/md5-cache/app-crypt/libmd-1.0.0-r1
deleted file mode 100644
index 8f40f6d28d45..000000000000
--- a/metadata/md5-cache/app-crypt/libmd-1.0.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Message Digest functions from BSD systems
-EAPI=6
-HOMEPAGE=https://www.hadrons.org/software/libmd/
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
-SLOT=0
-SRC_URI=https://archive.hadrons.org/software/libmd/libmd-1.0.0.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=8b2b2550c7321c665fbc20de5324b9fc
diff --git a/metadata/md5-cache/app-crypt/libmd-1.0.1 b/metadata/md5-cache/app-crypt/libmd-1.0.1
index 57b6034343cf..e7b6af3094ed 100644
--- a/metadata/md5-cache/app-crypt/libmd-1.0.1
+++ b/metadata/md5-cache/app-crypt/libmd-1.0.1
@@ -3,9 +3,9 @@ DESCRIPTION=Message Digest functions from BSD systems
EAPI=6
HOMEPAGE=https://www.hadrons.org/software/libmd/
IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
SLOT=0
SRC_URI=https://archive.hadrons.org/software/libmd/libmd-1.0.1.tar.xz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=02390bab956dcf873c28abfa9ec6f9fe
+_md5_=76d0bae38387fa567a0c4b64460d8623
diff --git a/metadata/md5-cache/app-crypt/rhash-1.4.0 b/metadata/md5-cache/app-crypt/rhash-1.4.0
index c93619fa6ec7..aa9fe4a484d5 100644
--- a/metadata/md5-cache/app-crypt/rhash-1.4.0
+++ b/metadata/md5-cache/app-crypt/rhash-1.4.0
@@ -11,4 +11,4 @@ RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,ab
SLOT=0
SRC_URI=mirror://sourceforge/rhash/rhash-1.4.0-src.tar.gz
_eclasses_=multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=2cd2cfa44cad7a7df644e6d4ab5f384b
+_md5_=1bb8de325b23c6bc7fb69e9a8e340efa
diff --git a/metadata/md5-cache/app-crypt/signify-30 b/metadata/md5-cache/app-crypt/signify-30
index 85225a93b025..5934c6e101ae 100644
--- a/metadata/md5-cache/app-crypt/signify-30
+++ b/metadata/md5-cache/app-crypt/signify-30
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libbsd-0.7
DESCRIPTION=Cryptographically sign and verify files
EAPI=7
HOMEPAGE=http://www.openbsd.org/ https://github.com/aperezdc/signify
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
LICENSE=BSD-1
RDEPEND=>=dev-libs/libbsd-0.7
SLOT=0
SRC_URI=https://github.com/aperezdc/signify/archive/v30.tar.gz -> signify-30.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=1fcf07b226b7262c1493cf73a5aec507
+_md5_=43f0389cb4764623ed26ea319a67b0c0
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 5abbae84a8f3..0cf04d7022a9 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/dictd-wn-3.0_p33 b/metadata/md5-cache/app-dicts/dictd-wn-3.0_p33
index 8130d3f7e553..d2a17c78dcd1 100644
--- a/metadata/md5-cache/app-dicts/dictd-wn-3.0_p33
+++ b/metadata/md5-cache/app-dicts/dictd-wn-3.0_p33
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc ppc64 sparc x86
LICENSE=Princeton
SLOT=0
SRC_URI=mirror://debian/pool/main/w/wordnet/dict-wn_3.0-33_all.deb
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b
_md5_=247b7e277af3b96a1f943cde15d42e5f
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 9df97c26cf29..8dcd664dbf3f 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/NaturalDocs-1.52-r1 b/metadata/md5-cache/app-doc/NaturalDocs-1.52-r1
index 6319620836d9..291a11a63635 100644
--- a/metadata/md5-cache/app-doc/NaturalDocs-1.52-r1
+++ b/metadata/md5-cache/app-doc/NaturalDocs-1.52-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=dev-lang/perl dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://sourceforge/naturaldocs/NaturalDocs-1.52.zip
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=dff8050f040a0c3ff4661d1f3922439e
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 9be168e1e5e9..95045d740a26 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/moe-1.10 b/metadata/md5-cache/app-editors/moe-1.10
index a4df83310b2b..f1c096235fad 100644
--- a/metadata/md5-cache/app-editors/moe-1.10
+++ b/metadata/md5-cache/app-editors/moe-1.10
@@ -8,5 +8,5 @@ LICENSE=GPL-3
RDEPEND=sys-libs/ncurses:0=
SLOT=0
SRC_URI=mirror://gnu/moe/moe-1.10.tar.lz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b
_md5_=dc29d46c2c60c29238cf7319fad92bbc
diff --git a/metadata/md5-cache/app-editors/moe-1.9 b/metadata/md5-cache/app-editors/moe-1.9
index 98f6e7dab8d0..22ccc6423662 100644
--- a/metadata/md5-cache/app-editors/moe-1.9
+++ b/metadata/md5-cache/app-editors/moe-1.9
@@ -8,5 +8,5 @@ LICENSE=GPL-3
RDEPEND=sys-libs/ncurses:0=
SLOT=0
SRC_URI=mirror://gnu/moe/moe-1.9.tar.lz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b
_md5_=661cef3a72d6b1aa18608f54ad40360a
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index ede893d931be..eccee0005550 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/crossover-bin-19.0.1-r1 b/metadata/md5-cache/app-emulation/crossover-bin-19.0.1-r1
index e3d4353a51cc..8f3a7af6ca91 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-19.0.1-r1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-19.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
RESTRICT=bindist test
SLOT=0
SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-19.0.1.bin
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b
_md5_=673d7f2e7c14276b69b1fbd0e2cf0e72
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.36.13 b/metadata/md5-cache/app-emulation/libguestfs-1.36.13
index b99304088b86..249d0839463e 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.36.13
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.36.13
@@ -1,15 +1,15 @@
DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) >=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
+DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) >=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=Tools for accessing, inspect and modifying virtual machine (VM) disk images
EAPI=6
HOMEPAGE=http://libguestfs.org/
IUSE=bash-completion debug doc erlang +fuse gtk inspect-icons introspection lua ocaml +perl python ruby selinux static-libs systemtap test kernel_linux +python_single_target_python3_6
KEYWORDS=~amd64
LICENSE=GPL-2 LGPL-2
-RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
+RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
RESTRICT=!test? ( test )
SLOT=0/1.36
SRC_URI=http://libguestfs.org/download/1.36-stable/libguestfs-1.36.13.tar.gz
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 linux-info c90a203b1c14cfa77bd3e37a0e96c955 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=6ccaf5af40b5d4376735aff8a07a27eb
+_md5_=1c8bd1bc04a39345590f13a83932d6e8
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.36.15 b/metadata/md5-cache/app-emulation/libguestfs-1.36.15
index 432525336f96..ba330cde3747 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.36.15
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.36.15
@@ -1,15 +1,15 @@
DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) ) >=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
+DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) ) >=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=Tools for accessing, inspect and modifying virtual machine (VM) disk images
EAPI=6
HOMEPAGE=http://libguestfs.org/
IUSE=doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test kernel_linux +python_single_target_python3_6
KEYWORDS=~amd64
LICENSE=GPL-2 LGPL-2
-RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
+RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
RESTRICT=!test? ( test )
SLOT=0/1.36
SRC_URI=http://libguestfs.org/download/1.36-stable/libguestfs-1.36.15.tar.gz
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a bash-completion-r1 20058ccf29bb27d8da5ebf2fd48c60c2 desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 linux-info c90a203b1c14cfa77bd3e37a0e96c955 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d02f3fe64b337b14500f78db960a12d
+_md5_=64b6bf06370ca3ea85b81624f28b0ce9
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.38.6 b/metadata/md5-cache/app-emulation/libguestfs-1.38.6
index 40a43bdf3295..a38f11ca69b4 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.38.6
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.38.6
@@ -1,15 +1,15 @@
DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf >=dev-lang/ocaml-4.03[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) ) >=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
+DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf >=dev-lang/ocaml-4.03[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) ) >=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=Tools for accessing, inspect and modifying virtual machine (VM) disk images
EAPI=6
HOMEPAGE=http://libguestfs.org/
IUSE=doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test kernel_linux +python_single_target_python3_6
KEYWORDS=~amd64
LICENSE=GPL-2 LGPL-2
-RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
+RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
RESTRICT=!test? ( test )
SLOT=0/1.38
SRC_URI=http://libguestfs.org/download/1.38-stable/libguestfs-1.38.6.tar.gz
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a bash-completion-r1 20058ccf29bb27d8da5ebf2fd48c60c2 desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 linux-info c90a203b1c14cfa77bd3e37a0e96c955 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a8e14ab676bcb3a3ab68bf7a3a15c05
+_md5_=dfb036784f3aa575580dda3e80ce82ce
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r100 b/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r100
index 7d2eac08f753..172269d019f1 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r100
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r100
@@ -1,16 +1,16 @@
BDEPEND=lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=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
-DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf >=dev-lang/ocaml-4.03[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) )
+DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf >=dev-lang/ocaml-4.03[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) )
DESCRIPTION=Tools for accessing, inspect and modifying virtual machine (VM) disk images
EAPI=7
HOMEPAGE=https://libguestfs.org/
IUSE=doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test kernel_linux +lua_single_target_lua5-1 +python_single_target_python3_6
KEYWORDS=~amd64
LICENSE=GPL-2 LGPL-2
-RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
+RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_6 ) )
RESTRICT=!test? ( test )
SLOT=0/1.38
SRC_URI=https://libguestfs.org/download/1.38-stable/libguestfs-1.38.6.tar.gz
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a bash-completion-r1 20058ccf29bb27d8da5ebf2fd48c60c2 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 linux-info c90a203b1c14cfa77bd3e37a0e96c955 lua-single f91b5656f00869c220a6e35ae0521c54 lua-utils 661d14f97b7d04273143565853fdfbfe multilib d410501a125f99ffb560b0c523cd3d1e perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=67a7dad2e267ef18537b4d13dd20882e
+_md5_=56b8168778c6159b7eb7a950db8be3b3
diff --git a/metadata/md5-cache/app-emulation/qemu-riscv64-bin-3.1.0-r4 b/metadata/md5-cache/app-emulation/qemu-riscv64-bin-3.1.0-r4
deleted file mode 100644
index 09989b0f7e5f..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-riscv64-bin-3.1.0-r4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Statically linked x86-64 binary of app-emulation/qemu, riscv64 emulator
-EAPI=7
-HOMEPAGE=http://www.qemu.org
-KEYWORDS=~amd64
-LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!app-emulation/qemu[qemu_user_targets_riscv64]
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/qemu-riscv64-bin-3.1.0-r4.tar.xz
-_md5_=661e9c1aa3735c7bffc016e1794bccee
diff --git a/metadata/md5-cache/app-emulation/xen-4.13.2-r3 b/metadata/md5-cache/app-emulation/xen-4.13.2-r3
new file mode 100644
index 000000000000..2f7b44bbb3e7
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.13.2-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=debug efi flask
+KEYWORDS=~amd64 ~arm -x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.13.2
+REQUIRED_USE=arm? ( debug )
+RESTRICT=test splitdebug strip
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.13.2/xen-4.13.2.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.13.2-upstream-patches-2.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.13.2-upstream-patches-2.tar.xz
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e mount-boot 20014ae7a3e81eb2c65a4d4d86d2560d multilib d410501a125f99ffb560b0c523cd3d1e python-any-r1 54a3178500786b0a7ede4a23b7f2a6ad python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=50c7794da8200bdebc4eaeecbf174288
diff --git a/metadata/md5-cache/app-emulation/xen-4.14.0-r6 b/metadata/md5-cache/app-emulation/xen-4.14.0-r7
similarity index 87%
rename from metadata/md5-cache/app-emulation/xen-4.14.0-r6
rename to metadata/md5-cache/app-emulation/xen-4.14.0-r7
index a4cdd03a268a..35db4abb9bb0 100644
--- a/metadata/md5-cache/app-emulation/xen-4.14.0-r6
+++ b/metadata/md5-cache/app-emulation/xen-4.14.0-r7
@@ -10,6 +10,6 @@ PDEPEND=~app-emulation/xen-tools-4.14.0
REQUIRED_USE=arm? ( debug )
RESTRICT=test splitdebug strip
SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.14.0/xen-4.14.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.14.0-upstream-patches-5.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.0-upstream-patches-5.tar.xz
+SRC_URI=https://downloads.xenproject.org/release/xen/4.14.0/xen-4.14.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.14.0-upstream-patches-6.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.0-upstream-patches-6.tar.xz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e mount-boot 20014ae7a3e81eb2c65a4d4d86d2560d multilib d410501a125f99ffb560b0c523cd3d1e python-any-r1 54a3178500786b0a7ede4a23b7f2a6ad python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=3777cef0113f17ea6e85e6e1b2c613b8
+_md5_=548c6daba8a377ee1d951f42dfd454b6
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.13.2-r2 b/metadata/md5-cache/app-emulation/xen-tools-4.13.2-r2
new file mode 100644
index 000000000000..9ae94127a303
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.13.2-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=sys-kernel/linux-headers-4.11 python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] pam? ( dev-python/pypam[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] pam? ( dev-python/pypam[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] pam? ( dev-python/pypam[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] pam? ( dev-python/pypam[python_targets_python3_9(-)] ) ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python3_6? ( dev-python/markdown[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/markdown[python_targets_python3_9(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) python? ( >=dev-lang/swig-4.0.0 )
+DESCRIPTION=Xen tools including QEMU and xl
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
+RESTRICT=test
+SLOT=0/4.13
+SRC_URI=https://downloads.xenproject.org/release/xen/4.13.2/xen-4.13.2.tar.gz https://github.com/qemu/seabios/archive/rel-1.12.1.tar.gz -> seabios-1.12.1.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/06dc822d045c2bb42e497487935485302486e151.tar.gz -> edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.13.2-upstream-patches-2.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.13.2-upstream-patches-2.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-security-patches-29.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-security-patches-29.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-21.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-21.tar.xz
+_eclasses_=bash-completion-r1 20058ccf29bb27d8da5ebf2fd48c60c2 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=497e6312cf95fd2ff1eadf65eabe2d5a
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.14.0-r4 b/metadata/md5-cache/app-emulation/xen-tools-4.14.0-r5
similarity index 97%
rename from metadata/md5-cache/app-emulation/xen-tools-4.14.0-r4
rename to metadata/md5-cache/app-emulation/xen-tools-4.14.0-r5
index db12a06697cc..91ff028003b5 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.14.0-r4
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.14.0-r5
@@ -10,6 +10,6 @@ RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/
REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
RESTRICT=test
SLOT=0/4.14
-SRC_URI=https://downloads.xenproject.org/release/xen/4.14.0/xen-4.14.0.tar.gz https://github.com/qemu/seabios/archive/rel-1.13.0.tar.gz -> seabios-1.13.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/06dc822d045c2bb42e497487935485302486e151.tar.gz -> edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.14.0-upstream-patches-4.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.0-upstream-patches-4.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-security-patches-28.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-security-patches-28.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-22.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-22.tar.xz
+SRC_URI=https://downloads.xenproject.org/release/xen/4.14.0/xen-4.14.0.tar.gz https://github.com/qemu/seabios/archive/rel-1.13.0.tar.gz -> seabios-1.13.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/06dc822d045c2bb42e497487935485302486e151.tar.gz -> edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.14.0-upstream-patches-6.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.0-upstream-patches-6.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-security-patches-28.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-security-patches-28.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-22.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-22.tar.xz
_eclasses_=bash-completion-r1 20058ccf29bb27d8da5ebf2fd48c60c2 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=897a8ab28f7e5384e78033645e7219ea
+_md5_=250f20fb386eff1441e2e2b9a88045d5
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index e0f9ebf04cbb..22c8bbd30bb1 100644
Binary files a/metadata/md5-cache/app-forensics/Manifest.gz and b/metadata/md5-cache/app-forensics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-forensics/quickfuzz-0.1_p20160920 b/metadata/md5-cache/app-forensics/quickfuzz-0.1_p20160920
index 2c92feea4cc7..c46d2d181a2e 100644
--- a/metadata/md5-cache/app-forensics/quickfuzz-0.1_p20160920
+++ b/metadata/md5-cache/app-forensics/quickfuzz-0.1_p20160920
@@ -9,5 +9,5 @@ LICENSE=GPL-3
RDEPEND=dev-haskell/abstract-par:= dev-haskell/argparser:= dev-haskell/derive:= dev-haskell/linear:= dev-haskell/monad-par:= dev-haskell/mtl:= dev-haskell/parallel-io:= dev-haskell/primitive:= dev-haskell/process-extras:= dev-haskell/quickcheck:2= dev-haskell/quickcheck-unicode:= dev-haskell/random:= dev-haskell/split:= dev-haskell/text:= dev-haskell/vector:= dev-haskell/wl-pprint:= >=dev-lang/ghc-7.8.2:= archs? ( dev-haskell/base16-bytestring:= >=dev-haskell/tar-0.5:= dev-haskell/zip-archive:= ) !archs? ( net? ( dev-haskell/base16-bytestring:= ) ) codes? ( dev-haskell/haxml:= dev-haskell/json:= dev-haskell/language-bash:= dev-haskell/language-css:= dev-haskell/language-dot:= dev-haskell/language-ecmascript:= dev-haskell/language-glsl:= dev-haskell/language-lua:= dev-haskell/language-python:= dev-haskell/shell-escape:= dev-haskell/uniplate:= ) docs? ( app-text/pandoc:= dev-haskell/data-default:= dev-haskell/hcg-minus:= dev-haskell/hps:= dev-haskell/icalendar:= dev-haskell/pandoc-types:= ) imgs? ( dev-haskell/ac-ppm:= dev-haskell/memory:= dev-haskell/attoparsec:= dev-haskell/lens:= dev-haskell/scientific:= dev-haskell/thyme:= dev-haskell/xml:= >=dev-haskell/zlib-0.6:= ) !imgs? ( archs? ( >=dev-haskell/zlib-0.6:= ) ) media? ( dev-haskell/hcodecs:= dev-haskell/hunit:= dev-haskell/mtl:= dev-haskell/old-locale:= dev-haskell/random:= dev-haskell/idiii:= dev-haskell/bitwise:= dev-haskell/monad-loops:= dev-haskell/mtl:= dev-haskell/wavy:= ) net? ( dev-haskell/concurrent-extra:= dev-haskell/dns:= dev-haskell/http:= dev-haskell/iproute:= dev-haskell/network:= dev-haskell/network-uri:= dev-haskell/unbounded-delays:= ) pki? ( dev-haskell/hourglass:= dev-haskell/asn1-types:= dev-haskell/asn1-parse:= dev-haskell/cryptonite:= dev-haskell/hourglass:= dev-haskell/memory:= )
SLOT=0
SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/quickfuzz-0.1_p20160920.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal f2babbc5251b22d1c1811b67f7fb8ad1 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=d31ef5ca50af38fe5f8249703ec5f312
diff --git a/metadata/md5-cache/app-forensics/quickfuzz-9999 b/metadata/md5-cache/app-forensics/quickfuzz-9999
index 3ad4e17ec427..2e64a5b3f531 100644
--- a/metadata/md5-cache/app-forensics/quickfuzz-9999
+++ b/metadata/md5-cache/app-forensics/quickfuzz-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
PROPERTIES=live
RDEPEND=dev-haskell/abstract-par:= dev-haskell/argparser:= dev-haskell/derive:= dev-haskell/linear:= dev-haskell/monad-par:= dev-haskell/mtl:= dev-haskell/parallel-io:= dev-haskell/primitive:= dev-haskell/process-extras:= dev-haskell/quickcheck:2= dev-haskell/quickcheck-unicode:= dev-haskell/random:= dev-haskell/split:= dev-haskell/text:= dev-haskell/vector:= dev-haskell/wl-pprint:= >=dev-lang/ghc-7.8.2:= archs? ( dev-haskell/base16-bytestring:= >=dev-haskell/tar-0.5:= dev-haskell/zip-archive:= ) !archs? ( net? ( dev-haskell/base16-bytestring:= ) ) codes? ( dev-haskell/haxml:= dev-haskell/json:= dev-haskell/language-bash:= dev-haskell/language-css:= dev-haskell/language-dot:= dev-haskell/language-ecmascript:= dev-haskell/language-glsl:= dev-haskell/language-lua:= dev-haskell/language-python:= dev-haskell/shell-escape:= dev-haskell/uniplate:= ) docs? ( app-text/pandoc:= dev-haskell/data-default:= dev-haskell/hcg-minus:= dev-haskell/hps:= dev-haskell/icalendar:= dev-haskell/pandoc-types:= ) imgs? ( dev-haskell/ac-ppm:= dev-haskell/memory:= dev-haskell/attoparsec:= dev-haskell/lens:= dev-haskell/scientific:= dev-haskell/thyme:= dev-haskell/xml:= >=dev-haskell/zlib-0.6:= ) !imgs? ( archs? ( >=dev-haskell/zlib-0.6:= ) ) media? ( dev-haskell/hcodecs:= dev-haskell/hunit:= dev-haskell/mtl:= dev-haskell/old-locale:= dev-haskell/random:= dev-haskell/idiii:= dev-haskell/bitwise:= dev-haskell/monad-loops:= dev-haskell/mtl:= dev-haskell/wavy:= ) net? ( dev-haskell/concurrent-extra:= dev-haskell/dns:= dev-haskell/http:= dev-haskell/iproute:= dev-haskell/network:= dev-haskell/network-uri:= dev-haskell/unbounded-delays:= ) pki? ( dev-haskell/hourglass:= dev-haskell/asn1-types:= dev-haskell/asn1-parse:= dev-haskell/cryptonite:= dev-haskell/hourglass:= dev-haskell/memory:= )
SLOT=0
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e git-r3 3e7ec3d6619213460c85e2aa48398441 haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e git-r3 3e7ec3d6619213460c85e2aa48398441 haskell-cabal f2babbc5251b22d1c1811b67f7fb8ad1 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=91d18d130ef2cb304705ff6bd4aa58ea
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index afac351e6b38..cd103c404f3f 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-typing-booster-2.10.1 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.1
index 3637552931bf..78232433ab53 100644
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.1
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.1
@@ -5,7 +5,7 @@ DESCRIPTION=Completion input method for IBus
EAPI=7
HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-3+
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] ) dev-libs/m17n-lib python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pyenchant[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pyenchant[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pyenchant[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) >=dev-db/m17n-db-1.7
REQUIRED_USE=^^ ( 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/mike-fabian/ibus-typing-booster/releases/download/2.10.1/ibus-typing-booster-2.10.1.tar.gz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=9b324c564bd840dc2c47b73b1768e052
+_md5_=d25e5b76d6c8b3a0610941e40173e70c
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.2 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.2
new file mode 100644
index 000000000000..39c2ddff510a
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=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_9? ( dev-lang/python:3.9[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/m17n-lib python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pyenchant[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pyenchant[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pyenchant[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Completion input method for IBus
+EAPI=7
+HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+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_9? ( dev-lang/python:3.9[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/m17n-lib python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pyenchant[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pyenchant[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pyenchant[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) >=dev-db/m17n-db-1.7
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.10.2/ibus-typing-booster-2.10.2.tar.gz
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=d6906b786f40809c7aac148026cda25c
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.7 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.7
deleted file mode 100644
index 7680d4f0fb30..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=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] ) dev-libs/m17n-lib python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pyenchant[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pyenchant[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pyenchant[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Completion input method for IBus
-EAPI=7
-HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
-IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-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] ) dev-libs/m17n-lib python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pyenchant[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pyenchant[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pyenchant[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) >=dev-db/m17n-db-1.7
-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/mike-fabian/ibus-typing-booster/releases/download/2.9.7/ibus-typing-booster-2.9.7.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=d25e5b76d6c8b3a0610941e40173e70c
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 855000969fe7..62257a33be32 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/beancounter-0.8.10-r1 b/metadata/md5-cache/app-misc/beancounter-0.8.10-r1
index c9875f03c2d2..fb74d2a40ff1 100644
--- a/metadata/md5-cache/app-misc/beancounter-0.8.10-r1
+++ b/metadata/md5-cache/app-misc/beancounter-0.8.10-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
RDEPEND=dev-perl/Date-Manip dev-perl/Statistics-Descriptive dev-perl/Finance-YahooQuote dev-perl/libwww-perl mysql? ( dev-perl/DBD-mysql ) sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) dev-perl/DBI dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=http://eddelbuettel.com/dirk/code/beancounter/beancounter_0.8.10.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=93e01a44c03ac03769c4e3acd30f8eb0
diff --git a/metadata/md5-cache/app-misc/cdcat-0.3-r1 b/metadata/md5-cache/app-misc/cdcat-0.3-r1
index baa96fbc909c..a5d5390e92cd 100644
--- a/metadata/md5-cache/app-misc/cdcat-0.3-r1
+++ b/metadata/md5-cache/app-misc/cdcat-0.3-r1
@@ -4,7 +4,7 @@ EAPI=7
HOMEPAGE=http://cdcatalog.sourceforge.net/
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
-RDEPEND=virtual/cdrtools !app-backup/cdbkup
+RDEPEND=app-cdr/cdrtools !app-backup/cdbkup
SLOT=0
SRC_URI=mirror://sourceforge/cdcatalog/cdcat-0.3.tar.gz
-_md5_=071e2a6133996b603a030aae66d93dac
+_md5_=c492a377f145370668a9d2c0a3c489e7
diff --git a/metadata/md5-cache/app-misc/conmux-0.15.1-r3 b/metadata/md5-cache/app-misc/conmux-0.15.1-r3
index f2dd2f23ee1c..d145ce4304de 100644
--- a/metadata/md5-cache/app-misc/conmux-0.15.1-r3
+++ b/metadata/md5-cache/app-misc/conmux-0.15.1-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=dev-perl/IO-Multiplex dev-perl/URI dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=https://dev.gentoo.org/~hwoarang/distfiles/conmux-0.15.1.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=8280378113f25868b549af4eec4dc06a
diff --git a/metadata/md5-cache/app-misc/flirc-3.22.4 b/metadata/md5-cache/app-misc/flirc-3.22.4
index 2b982a43a6f2..743359ddfad9 100644
--- a/metadata/md5-cache/app-misc/flirc-3.22.4
+++ b/metadata/md5-cache/app-misc/flirc-3.22.4
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 dev-libs/hidapi qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 d
RESTRICT=bindist mirror strip
SLOT=0
SRC_URI=amd64? ( https://apt.fury.io/flirc/flirc-3.22.4-amd64 -> flirc-3.22.4_amd64.deb ) arm? ( https://apt.fury.io/flirc/flirc-3.22.4-armhf -> flirc-3.22.4_arm.deb ) x86? ( https://apt.fury.io/flirc/flirc-3.22.4-i386 -> flirc-3.22.4_x86.deb )
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6 unpacker 8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6 unpacker 45b49db67094fdafbb6a16a2299e894b
_md5_=afb9a76ecd44a8d387d55d390d214b15
diff --git a/metadata/md5-cache/app-misc/flirc-3.24.0 b/metadata/md5-cache/app-misc/flirc-3.24.0
index 8f150d92187c..7a49da1b1f3f 100644
--- a/metadata/md5-cache/app-misc/flirc-3.24.0
+++ b/metadata/md5-cache/app-misc/flirc-3.24.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 dev-libs/hidapi qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 d
RESTRICT=bindist mirror strip
SLOT=0
SRC_URI=amd64? ( https://apt.fury.io/flirc/flirc-3.24.0-amd64 -> flirc-3.24.0_amd64.deb ) arm? ( https://apt.fury.io/flirc/flirc-3.24.0-armhf -> flirc-3.24.0_arm.deb ) x86? ( https://apt.fury.io/flirc/flirc-3.24.0-i386 -> flirc-3.24.0_x86.deb )
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6 unpacker 8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6 unpacker 45b49db67094fdafbb6a16a2299e894b
_md5_=b79d4e41373be6763fac26614bc31e5c
diff --git a/metadata/md5-cache/app-misc/flirc-3.25.2 b/metadata/md5-cache/app-misc/flirc-3.25.2
index c978b06a1026..f8ca2eb3cec5 100644
--- a/metadata/md5-cache/app-misc/flirc-3.25.2
+++ b/metadata/md5-cache/app-misc/flirc-3.25.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 dev-libs/hidapi qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 d
RESTRICT=bindist mirror strip
SLOT=0
SRC_URI=amd64? ( https://apt.fury.io/flirc/flirc-3.25.2-amd64 -> flirc-3.25.2_amd64.deb ) arm? ( https://apt.fury.io/flirc/flirc-3.25.2-armhf -> flirc-3.25.2_arm.deb ) x86? ( https://apt.fury.io/flirc/flirc-3.25.2-i386 -> flirc-3.25.2_x86.deb )
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6 unpacker 8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6 unpacker 45b49db67094fdafbb6a16a2299e894b
_md5_=b79d4e41373be6763fac26614bc31e5c
diff --git a/metadata/md5-cache/app-misc/golly-3.4 b/metadata/md5-cache/app-misc/golly-3.4
deleted file mode 100644
index edf7d57ad17e..000000000000
--- a/metadata/md5-cache/app-misc/golly-3.4
+++ /dev/null
@@ -1,15 +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 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=virtual/opengl sys-libs/zlib x11-libs/wxGTK:3.0-gtk3[X,opengl,tiff] 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] )
-DESCRIPTION=simulator for Conway's Game of Life and other cellular automata
-EAPI=7
-HOMEPAGE=http://golly.sourceforge.net/
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl sys-libs/zlib x11-libs/wxGTK:3.0-gtk3[X,opengl,tiff] 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] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=mirror://sourceforge/golly/golly-3.4-src.tar.gz
-_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=77ebf8271ad094022222eab2c999a4d7
diff --git a/metadata/md5-cache/app-misc/mc-4.8.24 b/metadata/md5-cache/app-misc/mc-4.8.24
deleted file mode 100644
index ddc9b1f35839..000000000000
--- a/metadata/md5-cache/app-misc/mc-4.8.24
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst pretend test
-DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=7
-HOMEPAGE=https://www.midnight-commander.org
-IUSE=+edit gpm nls samba sftp +slang spell test unicode X +xdg
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-REQUIRED_USE=spell? ( edit )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://ftp.midnight-commander.org/mc-4.8.24.tar.xz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=4f9dd60ca18a69ece965d662a143739c
diff --git a/metadata/md5-cache/app-misc/note-1.3.3-r1 b/metadata/md5-cache/app-misc/note-1.3.3-r1
index 852ce37ea0ec..03ed1614aa4b 100644
--- a/metadata/md5-cache/app-misc/note-1.3.3-r1
+++ b/metadata/md5-cache/app-misc/note-1.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
RDEPEND=dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=http://www.daemon.de/files/mirror/ftp.daemon.de/scip/Apps/note/note-1.3.3.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=e5c176a29e116c418090423f9e0ae9fa
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.7 b/metadata/md5-cache/app-misc/pax-utils-1.2.7
new file mode 100644
index 000000000000..51ed7dd02105
--- /dev/null
+++ b/metadata/md5-cache/app-misc/pax-utils-1.2.7
@@ -0,0 +1,15 @@
+BDEPEND=caps? ( virtual/pkgconfig ) seccomp? ( virtual/pkgconfig )
+DEFINED_PHASES=compile configure install setup test
+DEPEND=caps? ( >=sys-libs/libcap-2.24 ) 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] ) python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) ) seccomp? ( sys-libs/libseccomp ) kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-4.11 ) )
+DESCRIPTION=ELF utils that can check files for security relevant properties
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
+IUSE=caps debug kernel_linux python seccomp 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=caps? ( >=sys-libs/libcap-2.24 ) 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] ) python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) ) seccomp? ( sys-libs/libseccomp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0
+SRC_URI=mirror://gentoo/pax-utils-1.2.7.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.7.tar.xz
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=1957a4469a6a24ce14290f7d417101b9
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.8 b/metadata/md5-cache/app-misc/pax-utils-1.2.8
new file mode 100644
index 000000000000..c4593adf0cac
--- /dev/null
+++ b/metadata/md5-cache/app-misc/pax-utils-1.2.8
@@ -0,0 +1,15 @@
+BDEPEND=caps? ( virtual/pkgconfig ) seccomp? ( virtual/pkgconfig )
+DEFINED_PHASES=compile configure install setup test
+DEPEND=caps? ( >=sys-libs/libcap-2.24 ) 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] ) python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) ) seccomp? ( sys-libs/libseccomp ) kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-4.11 ) )
+DESCRIPTION=ELF utils that can check files for security relevant properties
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
+IUSE=caps debug kernel_linux python seccomp 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=caps? ( >=sys-libs/libcap-2.24 ) 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] ) python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) ) seccomp? ( sys-libs/libseccomp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0
+SRC_URI=mirror://gentoo/pax-utils-1.2.8.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.8.tar.xz
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=1957a4469a6a24ce14290f7d417101b9
diff --git a/metadata/md5-cache/app-misc/prog-express-3.8.8 b/metadata/md5-cache/app-misc/prog-express-3.8.8
index e1cb45c68509..f7f8d6c0671c 100644
--- a/metadata/md5-cache/app-misc/prog-express-3.8.8
+++ b/metadata/md5-cache/app-misc/prog-express-3.8.8
@@ -8,5 +8,5 @@ LICENSE=prog-express
RDEPEND=dev-db/sqlite:3 dev-dotnet/gtk-sharp:2 dev-dotnet/libgdiplus dev-lang/mono dev-lang/mono-basic virtual/libusb:1 virtual/udev
SLOT=0
SRC_URI=amd64? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/prog-express-3.8.8-1.amd64.deb ) x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/prog-express-3.8.8-1.i386.deb )
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6 unpacker 8ee8c1a2f31437d1766aac890d07a7f4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6 unpacker 45b49db67094fdafbb6a16a2299e894b xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=048c8a6199474747fb02aeb4082015e2
diff --git a/metadata/md5-cache/app-misc/smtm-1.6.10-r1 b/metadata/md5-cache/app-misc/smtm-1.6.10-r1
index 8bdc441942fa..184c55d2eaba 100644
--- a/metadata/md5-cache/app-misc/smtm-1.6.10-r1
+++ b/metadata/md5-cache/app-misc/smtm-1.6.10-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=http://eddelbuettel.com/dirk/code/smtm/smtm_1.6.10.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=b712cd565f594542b15252943bfc602a
diff --git a/metadata/md5-cache/app-misc/tracker-2.3.4 b/metadata/md5-cache/app-misc/tracker-2.3.4
index 3d8d8906ae71..912998ddb9fe 100644
--- a/metadata/md5-cache/app-misc/tracker-2.3.4
+++ b/metadata/md5-cache/app-misc/tracker-2.3.4
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/glib-utils || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) gtk-doc? ( >=dev-util/gtk-doc-1.8 app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig
+BDEPEND=dev-util/glib-utils || ( dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) gtk-doc? ( >=dev-util/gtk-doc-1.8 app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
DEPEND=>=dev-libs/glib-2.46:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.0 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.20.0 networkmanager? ( >=net-misc/networkmanager-0.8 ) stemmer? ( dev-libs/snowball-stemmer ) sys-apps/util-linux dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=A tagging metadata database, search tool and indexer
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/glib-2.46:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspe
SLOT=0/2.0
SRC_URI=mirror://gnome/sources/tracker/2.3/tracker-2.3.4.tar.xz
_eclasses_=bash-completion-r1 20058ccf29bb27d8da5ebf2fd48c60c2 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e linux-info c90a203b1c14cfa77bd3e37a0e96c955 meson 71d293a701d6362387e1214da368c848 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 54a3178500786b0a7ede4a23b7f2a6ad python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vala 2cd99cd72bb91f3f190fa4ca576be580 wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=0768850ba8756ed65dcc8e6557a46ed1
+_md5_=893926f0a8ef9d642131b14360854103
diff --git a/metadata/md5-cache/app-misc/tracker-2.3.5 b/metadata/md5-cache/app-misc/tracker-2.3.5
new file mode 100644
index 000000000000..06b19e3ac0ec
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tracker-2.3.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) gtk-doc? ( >=dev-util/gtk-doc-1.8 app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.46:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.0 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.20.0 networkmanager? ( >=net-misc/networkmanager-0.8 ) stemmer? ( dev-libs/snowball-stemmer ) sys-apps/util-linux dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A tagging metadata database, search tool and indexer
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
+IUSE=gtk-doc +miners networkmanager stemmer kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+PDEPEND=miners? ( >=app-misc/tracker-miners-2.3 )
+RDEPEND=>=dev-libs/glib-2.46:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.0 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.20.0 networkmanager? ( >=net-misc/networkmanager-0.8 ) stemmer? ( dev-libs/snowball-stemmer ) sys-apps/util-linux
+SLOT=0/2.0
+SRC_URI=mirror://gnome/sources/tracker/2.3/tracker-2.3.5.tar.xz
+_eclasses_=bash-completion-r1 20058ccf29bb27d8da5ebf2fd48c60c2 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e linux-info c90a203b1c14cfa77bd3e37a0e96c955 meson 71d293a701d6362387e1214da368c848 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 54a3178500786b0a7ede4a23b7f2a6ad python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vala 2cd99cd72bb91f3f190fa4ca576be580 wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=8823c1d9e7fa348d3e32a2c5d0dd16a3
diff --git a/metadata/md5-cache/app-misc/tracker-miners-2.3.4 b/metadata/md5-cache/app-misc/tracker-miners-2.3.4
new file mode 100644
index 000000000000..e8184f8403e4
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tracker-miners-2.3.4
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glib-utils dev-util/gdbus-codegen >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) gstreamer? ( media-libs/gstreamer:1.0[introspection] || ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-openh264:1.0 ) ) ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.46:2 >=app-misc/tracker-2.2.0:= gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Collection of data extractors for Tracker/Nepomuk
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
+IUSE=cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.46:2 >=app-misc/tracker-2.2.0:= gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip
+REQUIRED_USE=cue? ( gstreamer )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/tracker-miners/2.3/tracker-miners-2.3.4.tar.xz
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e meson 71d293a701d6362387e1214da368c848 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 54a3178500786b0a7ede4a23b7f2a6ad python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=9d1a9c9e93800b23c2a99dbeca08daaa
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 8f6346393fc9..e160045f95cd 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/scribus-1.5.6.1 b/metadata/md5-cache/app-office/scribus-1.5.6.1
index 2d255f2a88ac..27018c18f3f2 100644
--- a/metadata/md5-cache/app-office/scribus-1.5.6.1
+++ b/metadata/md5-cache/app-office/scribus-1.5.6.1
@@ -5,11 +5,11 @@ DESCRIPTION=Desktop publishing (DTP) and layout program
EAPI=7
HOMEPAGE=https://www.scribus.net/
IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen dev-libs/icu:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= x11-libs/cairo[X,svg] boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_6? ( dev-python/pillow[tk?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[tk?,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[tk?,python_targets_python3_9(-)] ) ) app-text/ghostscript-gpl
REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) tk? ( scripts )
SLOT=0
SRC_URI=https://github.com/scribusproject/scribus/archive/aa84120d97003a03d883db33ea9a6ad28550e59a.tar.gz -> scribus-1.5.6.1.tar.gz
_eclasses_=cmake 6b7438831d544f2fe59a3d4ab4103f52 desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=99009d96b479053f04026ef6af2d4ce6
+_md5_=436940ec7acf7dca0cd5d221de7efed6
diff --git a/metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580 b/metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580
index 132597de452f..6043c8b32b42 100644
--- a/metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580
+++ b/metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580
@@ -7,5 +7,5 @@ LICENSE=worklog-assistant
RESTRICT=fetch bindist strip
SLOT=0
SRC_URI=https://worklogassistant.com/downloads/worklog-assistant-v2_2.1.3580_amd64.deb
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b
_md5_=ddef9d08d29a671e81a22fd0b6301d14
diff --git a/metadata/md5-cache/app-office/wps-office-11.1.0.9615 b/metadata/md5-cache/app-office/wps-office-11.1.0.9615
index eb801aa62d9f..89dcc8837763 100644
--- a/metadata/md5-cache/app-office/wps-office-11.1.0.9615
+++ b/metadata/md5-cache/app-office/wps-office-11.1.0.9615
@@ -9,5 +9,5 @@ RDEPEND=app-arch/bzip2:0 app-arch/xz-utils app-arch/lz4 dev-libs/atk dev-libs/ex
RESTRICT=strip mirror
SLOT=0
SRC_URI=https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9615/wps-office_11.1.0.9615.XA_amd64.deb
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=f591aa2769cd847915ffe10898ca52de
diff --git a/metadata/md5-cache/app-office/wps-office-11.1.0.9719 b/metadata/md5-cache/app-office/wps-office-11.1.0.9719
index 95711b2818cc..c0525ccb162c 100644
--- a/metadata/md5-cache/app-office/wps-office-11.1.0.9719
+++ b/metadata/md5-cache/app-office/wps-office-11.1.0.9719
@@ -9,5 +9,5 @@ RDEPEND=app-arch/bzip2:0 app-arch/xz-utils app-arch/lz4 dev-libs/atk dev-libs/ex
RESTRICT=strip mirror
SLOT=0
SRC_URI=https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9719/wps-office_11.1.0.9719.XA_amd64.deb
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=f591aa2769cd847915ffe10898ca52de
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index 2e0c2a5de749..f90c06e951c0 100644
Binary files a/metadata/md5-cache/app-pda/Manifest.gz and b/metadata/md5-cache/app-pda/Manifest.gz differ
diff --git a/metadata/md5-cache/app-pda/gnupod-0.99.8-r2 b/metadata/md5-cache/app-pda/gnupod-0.99.8-r2
index 4d816c6268cc..15e0be93f073 100644
--- a/metadata/md5-cache/app-pda/gnupod-0.99.8-r2
+++ b/metadata/md5-cache/app-pda/gnupod-0.99.8-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
RDEPEND=dev-perl/TimeDate dev-perl/XML-Parser >=dev-perl/MP3-Info-1.01 dev-perl/Unicode-String dev-perl/Digest-SHA1 dev-perl/libwww-perl ffmpeg? ( media-video/ffmpeg ) flac? ( dev-perl/Audio-FLAC-Header media-libs/flac aac? ( >=media-libs/faac-1.24 ) mp3? ( media-sound/lame ) !aac? ( media-sound/lame ) ) ogg? ( dev-perl/Ogg-Vorbis-Header-PurePerl media-sound/vorbis-tools aac? ( >=media-libs/faac-1.24 ) mp3? ( media-sound/lame ) !aac? ( media-sound/lame ) ) dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=http://blinkenlights.ch/gnupod-dist/stable/gnupod-0.99.8.tgz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=54d95adaa297ab978f0d76c978ebd9db
diff --git a/metadata/md5-cache/app-pda/libimobiledevice-1.2.0-r1 b/metadata/md5-cache/app-pda/libimobiledevice-1.2.0-r1
deleted file mode 100644
index c0c51de8a60b..000000000000
--- a/metadata/md5-cache/app-pda/libimobiledevice-1.2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=app-pda/libplist-1.11:= >=app-pda/libusbmuxd-1.0.9:= gnutls? ( dev-libs/libgcrypt:0 >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-pda/libplist[python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) virtual/pkgconfig python? ( >=dev-python/cython-0.17[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=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=Support library to communicate with Apple iPhone/iPod Touch devices
-EAPI=6
-HOMEPAGE=http://www.libimobiledevice.org/
-IUSE=gnutls libressl python static-libs python_targets_python3_6
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=app-pda/libplist-1.11:= >=app-pda/libusbmuxd-1.0.9:= gnutls? ( dev-libs/libgcrypt:0 >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-pda/libplist[python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-SLOT=0/6
-SRC_URI=http://www.libimobiledevice.org/downloads/libimobiledevice-1.2.0.tar.bz2 https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0001-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch -> libimobiledevice-1.2.0-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0002-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch -> libimobiledevice-1.2.0-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/344409e1d1ad917d377b256214c5411dda82e6b0...5a85432719fb3d18027d528f87d2a44b76fd3e12.patch -> libimobiledevice-1.2.0-git.patch
-_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a libtool f143db5a74ccd9ca28c1234deffede96 multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=e937e5ebc98c51f15a27766520b38ea4
diff --git a/metadata/md5-cache/app-pda/libimobiledevice-1.2.1_pre20200220 b/metadata/md5-cache/app-pda/libimobiledevice-1.2.1_pre20200220
deleted file mode 100644
index 6726b59e3214..000000000000
--- a/metadata/md5-cache/app-pda/libimobiledevice-1.2.1_pre20200220
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) python? ( >=dev-python/cython-0.17[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(-)] ) >=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 prepare
-DEPEND=>=app-pda/libplist-1.11:= >=app-pda/libusbmuxd-1.1.0:= gnutls? ( dev-libs/libgcrypt:0 >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) 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(-)] app-pda/libplist[python(-),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=Support library to communicate with Apple iPhone/iPod Touch devices
-EAPI=7
-HOMEPAGE=https://www.libimobiledevice.org/
-IUSE=doc gnutls libressl python static-libs python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=app-pda/libplist-1.11:= >=app-pda/libusbmuxd-1.1.0:= gnutls? ( dev-libs/libgcrypt:0 >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) 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(-)] app-pda/libplist[python(-),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 ) )
-SLOT=0/6
-SRC_URI=https://cgit.libimobiledevice.org/libimobiledevice.git/snapshot/libimobiledevice-3d8d13f0a70cefc1b12571b7f6aa2d1d4c58cffb.tar.bz2 -> libimobiledevice-1.2.1_pre20200220.tar.bz2
-_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a libtool f143db5a74ccd9ca28c1234deffede96 multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=a4ab98bb363864fe07d576caa00642c8
diff --git a/metadata/md5-cache/app-pda/libimobiledevice-1.3.0-r1 b/metadata/md5-cache/app-pda/libimobiledevice-1.3.0-r1
index 6efd5c341028..2214dc0f606a 100644
--- a/metadata/md5-cache/app-pda/libimobiledevice-1.3.0-r1
+++ b/metadata/md5-cache/app-pda/libimobiledevice-1.3.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Support library to communicate with Apple iPhone/iPod Touch devices
EAPI=7
HOMEPAGE=https://www.libimobiledevice.org/
IUSE=doc gnutls libressl python static-libs python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
LICENSE=GPL-2+ LGPL-2.1+
RDEPEND=>=app-pda/libplist-2.2.0:= >=app-pda/libusbmuxd-2.0.2:= gnutls? ( dev-libs/libgcrypt:0 >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) 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(-)] app-pda/libplist[python(-),python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
SLOT=0/1.0-6
SRC_URI=https://github.com/libimobiledevice/libimobiledevice/releases/download/1.3.0/libimobiledevice-1.3.0.tar.bz2
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a libtool f143db5a74ccd9ca28c1234deffede96 multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=624b86a1aff6e8b1ef951227e858a5c5
+_md5_=a495b98d53c0dbe89b01aa537a201b65
diff --git a/metadata/md5-cache/app-pda/libplist-2.1.0 b/metadata/md5-cache/app-pda/libplist-2.1.0
deleted file mode 100644
index a6f266293b88..000000000000
--- a/metadata/md5-cache/app-pda/libplist-2.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig python? ( >=dev-python/cython-0.17[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(-)] ) >=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 prepare test
-DEPEND=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(-)] )
-DESCRIPTION=Support library to deal with Apple Property Lists (Binary & XML)
-EAPI=7
-HOMEPAGE=https://www.libimobiledevice.org/
-IUSE=python static-libs python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
-LICENSE=GPL-2 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 ) )
-SLOT=0/3
-SRC_URI=https://cgit.libimobiledevice.org/libplist.git/snapshot/libplist-2.1.0.tar.bz2
-_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a libtool f143db5a74ccd9ca28c1234deffede96 multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=ad3e98439df72d5649c5bd44d3c05d85
diff --git a/metadata/md5-cache/app-pda/libplist-2.2.0-r1 b/metadata/md5-cache/app-pda/libplist-2.2.0-r1
deleted file mode 100644
index 486c0019f0d6..000000000000
--- a/metadata/md5-cache/app-pda/libplist-2.2.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig python? ( >=dev-python/cython-0.17[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=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 prepare test
-DEPEND=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(-)] )
-DESCRIPTION=Support library to deal with Apple Property Lists (Binary & XML)
-EAPI=7
-HOMEPAGE=https://www.libimobiledevice.org/
-IUSE=python static-libs python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=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(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
-SLOT=0/2.0-3
-SRC_URI=https://cgit.libimobiledevice.org/libplist.git/snapshot/libplist-2.2.0.tar.bz2
-_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a libtool f143db5a74ccd9ca28c1234deffede96 multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=25786c71956c9bd4d731f90d054b5613
diff --git a/metadata/md5-cache/app-pda/libplist-2.2.0-r2 b/metadata/md5-cache/app-pda/libplist-2.2.0-r2
index c212e963c946..1d513682f34c 100644
--- a/metadata/md5-cache/app-pda/libplist-2.2.0-r2
+++ b/metadata/md5-cache/app-pda/libplist-2.2.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Support library to deal with Apple Property Lists (Binary & XML)
EAPI=7
HOMEPAGE=https://www.libimobiledevice.org/
IUSE=python static-libs python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
LICENSE=GPL-2 LGPL-2.1
RDEPEND=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(-)] )
REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
SLOT=0/2.0-3
SRC_URI=https://cgit.libimobiledevice.org/libplist.git/snapshot/libplist-2.2.0.tar.bz2
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a libtool f143db5a74ccd9ca28c1234deffede96 multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=b949d50a821039202a512a9fb0711a3a
+_md5_=bf3bdb6487fbe4939fd749bf47eb3779
diff --git a/metadata/md5-cache/app-pda/libusbmuxd-1.0.10-r1 b/metadata/md5-cache/app-pda/libusbmuxd-1.0.10-r1
deleted file mode 100644
index 6ff9e29d1a71..000000000000
--- a/metadata/md5-cache/app-pda/libusbmuxd-1.0.10-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/os-headers virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=>=app-pda/libplist-1.11:= virtual/libusb:1 !=app-pda/libplist-1.11:= virtual/libusb:1 !=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 prepare
-DEPEND=>=app-pda/libplist-2.1.0:= !=app-pda/libplist-2.1.0:= !=app-pda/libplist-2.2.0:=
SLOT=0/2.0-6
SRC_URI=https://cgit.libimobiledevice.org/libusbmuxd.git/snapshot/libusbmuxd-2.0.2.tar.bz2
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=74fc33be0292ebe3bd4f9619b3a6473a
+_md5_=5db5ab023ec444b140f04fc7e3102fd5
diff --git a/metadata/md5-cache/app-pda/usbmuxd-1.1.1 b/metadata/md5-cache/app-pda/usbmuxd-1.1.1
index 0936ed563a03..ab0ab81bf86b 100644
--- a/metadata/md5-cache/app-pda/usbmuxd-1.1.1
+++ b/metadata/md5-cache/app-pda/usbmuxd-1.1.1
@@ -5,10 +5,10 @@ DESCRIPTION=USB multiplex daemon for use with Apple iPhone/iPod Touch devices
EAPI=7
HOMEPAGE=https://www.libimobiledevice.org/
IUSE=systemd
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
LICENSE=GPL-2 GPL-3 LGPL-2.1+
RDEPEND=acct-user/usbmux >=app-pda/libimobiledevice-1.0:= >=app-pda/libplist-2.0:= virtual/libusb:1 virtual/udev
SLOT=0
SRC_URI=https://github.com/libimobiledevice/usbmuxd/releases/download/1.1.1/usbmuxd-1.1.1.tar.bz2
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6
-_md5_=dcf76887191d04c6c92c59848641e3dc
+_md5_=8237bdea0456678da553ae23fbeb4c2a
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 8ee2014e0011..44a6f200af39 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/eix-0.34.10 b/metadata/md5-cache/app-portage/eix-0.34.10
deleted file mode 100644
index 5ce8fe2f294c..000000000000
--- a/metadata/md5-cache/app-portage/eix-0.34.10
+++ /dev/null
@@ -1,14 +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 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) app-arch/xz-utils nls? ( sys-devel/gettext )
-DESCRIPTION=Search and query ebuilds
-EAPI=7
-HOMEPAGE=https://github.com/vaeth/eix/
-IUSE=debug doc nls sqlite
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/vaeth/eix/releases/download/v0.34.10/eix-0.34.10.tar.xz
-_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a bash-completion-r1 20058ccf29bb27d8da5ebf2fd48c60c2 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e tmpfiles 6170dc7770585fb3f16efdee789a3218 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=65e4fc79b8445e455bd6f7226a23cedc
diff --git a/metadata/md5-cache/app-portage/eix-0.34.11 b/metadata/md5-cache/app-portage/eix-0.34.11
index fd6158defc84..c0f51449c1e5 100644
--- a/metadata/md5-cache/app-portage/eix-0.34.11
+++ b/metadata/md5-cache/app-portage/eix-0.34.11
@@ -5,10 +5,10 @@ DESCRIPTION=Search and query ebuilds
EAPI=7
HOMEPAGE=https://github.com/vaeth/eix/
IUSE=debug doc nls sqlite
-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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
SLOT=0
SRC_URI=https://github.com/vaeth/eix/releases/download/v0.34.11/eix-0.34.11.tar.xz
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a bash-completion-r1 20058ccf29bb27d8da5ebf2fd48c60c2 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e tmpfiles 6170dc7770585fb3f16efdee789a3218 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=957168e52ce73301efaa9c878bb055d0
+_md5_=3708b3063e4ba6d3f8d104d1d8073bba
diff --git a/metadata/md5-cache/app-portage/eix-0.34.9 b/metadata/md5-cache/app-portage/eix-0.34.9
deleted file mode 100644
index 53eb84cf43e3..000000000000
--- a/metadata/md5-cache/app-portage/eix-0.34.9
+++ /dev/null
@@ -1,14 +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 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) app-arch/xz-utils nls? ( sys-devel/gettext )
-DESCRIPTION=Search and query ebuilds
-EAPI=7
-HOMEPAGE=https://github.com/vaeth/eix/
-IUSE=debug doc nls sqlite
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/vaeth/eix/releases/download/v0.34.9/eix-0.34.9.tar.xz
-_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a bash-completion-r1 20058ccf29bb27d8da5ebf2fd48c60c2 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e tmpfiles 6170dc7770585fb3f16efdee789a3218 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=3708b3063e4ba6d3f8d104d1d8073bba
diff --git a/metadata/md5-cache/app-portage/elt-patches-20170317 b/metadata/md5-cache/app-portage/elt-patches-20170317
index 05ddbbdb0e20..dccccdfef7e1 100644
--- a/metadata/md5-cache/app-portage/elt-patches-20170317
+++ b/metadata/md5-cache/app-portage/elt-patches-20170317
@@ -3,8 +3,8 @@ DEPEND=app-arch/xz-utils
DESCRIPTION=Collection of patches for libtool.eclass
EAPI=6
HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-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 s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=GPL-2
SLOT=0
SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170317.tar.xz
-_md5_=521ebb75783b1c577d6de544def3f640
+_md5_=24a7582a6e7b3e4fe2dce86b019546f7
diff --git a/metadata/md5-cache/app-portage/elt-patches-20170422 b/metadata/md5-cache/app-portage/elt-patches-20170422
index 7e8fce0dfd0e..01bda10ff2cc 100644
--- a/metadata/md5-cache/app-portage/elt-patches-20170422
+++ b/metadata/md5-cache/app-portage/elt-patches-20170422
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
DESCRIPTION=Collection of patches for libtool.eclass
EAPI=6
HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-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 s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=GPL-2
RDEPEND=sys-apps/gentoo-functions
SLOT=0
SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170422.tar.xz
-_md5_=67706a6d21e57d18d6fb417a312e0a18
+_md5_=1185c543a60acd852efbe936dc030c64
diff --git a/metadata/md5-cache/app-portage/elt-patches-20170815 b/metadata/md5-cache/app-portage/elt-patches-20170815
index ed26bff76aa9..aed189eb936a 100644
--- a/metadata/md5-cache/app-portage/elt-patches-20170815
+++ b/metadata/md5-cache/app-portage/elt-patches-20170815
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
DESCRIPTION=Collection of patches for libtool.eclass
EAPI=6
HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-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 s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=GPL-2
RDEPEND=sys-apps/gentoo-functions
SLOT=0
SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170815.tar.xz
-_md5_=ebc20465beaa298b31fe904ea04bd596
+_md5_=5d171121d3b1000915d41d55f36e04aa
diff --git a/metadata/md5-cache/app-portage/elt-patches-20170826.1 b/metadata/md5-cache/app-portage/elt-patches-20170826.1
index 40ed9db95cca..3ebe568e00d5 100644
--- a/metadata/md5-cache/app-portage/elt-patches-20170826.1
+++ b/metadata/md5-cache/app-portage/elt-patches-20170826.1
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
DESCRIPTION=Collection of patches for libtool.eclass
EAPI=6
HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-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 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=GPL-2
RDEPEND=sys-apps/gentoo-functions
SLOT=0
SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170826.1.tar.xz
-_md5_=d967b35067fafed67e7ca390b8e24802
+_md5_=9c98c53e51187b3f2f8815285906ae2a
diff --git a/metadata/md5-cache/app-portage/elt-patches-20201205 b/metadata/md5-cache/app-portage/elt-patches-20201205
index 8d3290a8b79d..5702ff5601f3 100644
--- a/metadata/md5-cache/app-portage/elt-patches-20201205
+++ b/metadata/md5-cache/app-portage/elt-patches-20201205
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
DESCRIPTION=Collection of patches for libtool.eclass
EAPI=7
HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-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 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=GPL-2
RDEPEND=sys-apps/gentoo-functions
SLOT=0
SRC_URI=https://dev.gentoo.org/~grobian/distfiles/elt-patches-20201205.tar.xz
-_md5_=0f4a71b290dec0c80970431a00a27954
+_md5_=cde0f755a06d3af7b0b8ce286ed49e35
diff --git a/metadata/md5-cache/app-portage/fquery-0.2.3 b/metadata/md5-cache/app-portage/fquery-0.2.3
index 3a30c601486e..7871c6f1c7b4 100644
--- a/metadata/md5-cache/app-portage/fquery-0.2.3
+++ b/metadata/md5-cache/app-portage/fquery-0.2.3
@@ -8,5 +8,5 @@ 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 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal f2babbc5251b22d1c1811b67f7fb8ad1 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_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 d1a13869202d..9bdc0ae3c732 100644
--- a/metadata/md5-cache/app-portage/fquery-0.2.3-r1
+++ b/metadata/md5-cache/app-portage/fquery-0.2.3-r1
@@ -8,5 +8,5 @@ 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 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal f2babbc5251b22d1c1811b67f7fb8ad1 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=e0629fdc36fc818aa5191e45de023043
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.6 b/metadata/md5-cache/app-portage/gentoolkit-0.4.6
deleted file mode 100644
index 60f9600f0aed..000000000000
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Collection of administration scripts for Gentoo
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
-IUSE=python_targets_python3_6 python_targets_python3_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
-LICENSE=GPL-2
-RDEPEND=sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-apps/gawk sys-apps/gentoo-functions python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] ) >=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=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.4.6.tar.gz
-_eclasses_=distutils-r1 6a128a9211d714bf9dfb5c0c9e72558e multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=8e369e409bcb3736a58a01057c6e193c
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.7 b/metadata/md5-cache/app-portage/gentoolkit-0.4.7
deleted file mode 100644
index 97f1a118a6e9..000000000000
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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(-)]
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=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(-)]
-DESCRIPTION=Collection of administration scripts for Gentoo
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
-IUSE=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
-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 )
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.4.7.tar.gz
-_eclasses_=distutils-r1 6a128a9211d714bf9dfb5c0c9e72558e multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=97311a33d6e42ab83e8df7efa19a7c18
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.8 b/metadata/md5-cache/app-portage/gentoolkit-0.4.8
deleted file mode 100644
index 969e380f23b5..000000000000
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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(-)]
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=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(-)]
-DESCRIPTION=Collection of administration scripts for Gentoo
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
-IUSE=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
-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 )
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.4.8.tar.gz
-_eclasses_=distutils-r1 6a128a9211d714bf9dfb5c0c9e72558e multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=06296208bac1822c7477c841098c248e
diff --git a/metadata/md5-cache/app-portage/grs-0.7 b/metadata/md5-cache/app-portage/grs-0.7
index 063a81083b3f..9822f4405fef 100644
--- a/metadata/md5-cache/app-portage/grs-0.7
+++ b/metadata/md5-cache/app-portage/grs-0.7
@@ -6,9 +6,9 @@ HOMEPAGE=https://dev.gentoo.org/~blueness/grs
IUSE=server python_targets_python3_7 python_targets_python3_8 kernel_linux
KEYWORDS=amd64 arm arm64 x86
LICENSE=GPL-2
-RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-fs/squashfs-tools virtual/cdrtools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) ) 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(-)]
+RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-cdr/cdrtools app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-fs/squashfs-tools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) ) 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(-)]
REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
SLOT=0
SRC_URI=https://dev.gentoo.org/~blueness/grs/grs-0.7.tar.gz https://dev.gentoo.org/~blueness/grs/ISO-1.tar.gz
_eclasses_=distutils-r1 6a128a9211d714bf9dfb5c0c9e72558e linux-info c90a203b1c14cfa77bd3e37a0e96c955 multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=d1e88f9d001f4cb9503ebeb02a0536ed
+_md5_=0ee2986c4fab61e09ae10ebc79c1554a
diff --git a/metadata/md5-cache/app-portage/grs-9999 b/metadata/md5-cache/app-portage/grs-9999
index ddd8322534cc..fa1cbe792ac1 100644
--- a/metadata/md5-cache/app-portage/grs-9999
+++ b/metadata/md5-cache/app-portage/grs-9999
@@ -6,9 +6,9 @@ HOMEPAGE=https://dev.gentoo.org/~blueness/grs
IUSE=server python_targets_python3_7 python_targets_python3_8 kernel_linux
LICENSE=GPL-2
PROPERTIES=live
-RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-fs/squashfs-tools virtual/cdrtools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) ) 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(-)]
+RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-cdr/cdrtools app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-fs/squashfs-tools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) ) 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(-)]
REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
SLOT=0
SRC_URI=https://dev.gentoo.org/~blueness/grs/ISO-1.tar.gz
_eclasses_=distutils-r1 6a128a9211d714bf9dfb5c0c9e72558e git-r3 3e7ec3d6619213460c85e2aa48398441 linux-info c90a203b1c14cfa77bd3e37a0e96c955 multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=b33fd69682d931e2a691d368dc001ab8
+_md5_=daf4489f488daee93482886eca15245d
diff --git a/metadata/md5-cache/app-portage/hackport-0.6.6 b/metadata/md5-cache/app-portage/hackport-0.6.6
index dba68d3f299b..0d270c066f44 100644
--- a/metadata/md5-cache/app-portage/hackport-0.6.6
+++ b/metadata/md5-cache/app-portage/hackport-0.6.6
@@ -10,5 +10,5 @@ RDEPEND=app-portage/repoman >=dev-haskell/async-2.0:= >=dev-haskell/base16-bytes
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://hackage.haskell.org/package/hackport-0.6.6/hackport-0.6.6.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal f2babbc5251b22d1c1811b67f7fb8ad1 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=5687c286fbd8c2669a632933b8cdbfb0
diff --git a/metadata/md5-cache/app-portage/hackport-9999 b/metadata/md5-cache/app-portage/hackport-9999
index ad8c52542537..0792ba9f6606 100644
--- a/metadata/md5-cache/app-portage/hackport-9999
+++ b/metadata/md5-cache/app-portage/hackport-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
RDEPEND=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/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:=
RESTRICT=test
SLOT=0
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e git-r3 3e7ec3d6619213460c85e2aa48398441 haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e git-r3 3e7ec3d6619213460c85e2aa48398441 haskell-cabal f2babbc5251b22d1c1811b67f7fb8ad1 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=e330fd0646d3f5140899a6d67606f7fa
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index c0e1fbac3eaf..79f1edc8c19a 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/bash-5.1_p4 b/metadata/md5-cache/app-shells/bash-5.1_p4
new file mode 100644
index 000000000000..3ca39dac67c6
--- /dev/null
+++ b/metadata/md5-cache/app-shells/bash-5.1_p4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.1:0= )
+DESCRIPTION=The standard GNU Bourne again shell
+EAPI=7
+HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
+IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
+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
+RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.1:0= )
+SLOT=0
+SRC_URI=mirror://gnu/bash/bash-5.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004 mirror://gnu/bash/bash-5.1-patches/bash51-001 mirror://gnu/bash/bash-5.1-patches/bash51-002 mirror://gnu/bash/bash-5.1-patches/bash51-003 mirror://gnu/bash/bash-5.1-patches/bash51-004
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=8c55a4ff06d2cb92598f5a95a56e34a0
diff --git a/metadata/md5-cache/app-shells/dash-0.5.11.2 b/metadata/md5-cache/app-shells/dash-0.5.11.2
index a45db4ff715f..7d232b1e3ea9 100644
--- a/metadata/md5-cache/app-shells/dash-0.5.11.2
+++ b/metadata/md5-cache/app-shells/dash-0.5.11.2
@@ -11,4 +11,4 @@ RDEPEND=!static? ( libedit? ( dev-libs/libedit ) )
SLOT=0
SRC_URI=http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.11.2.tar.gz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=b24104da3dcc7118e05ad7cf168e2fa8
+_md5_=50d1948cfd36801666704fc05c501c2b
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 8ea19279893f..cf1e421a198f 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/an-1.2_p6 b/metadata/md5-cache/app-text/an-1.2_p6
index 59feaa1e00ba..190e4540f965 100644
--- a/metadata/md5-cache/app-text/an-1.2_p6
+++ b/metadata/md5-cache/app-text/an-1.2_p6
@@ -3,10 +3,10 @@ DEPEND=dev-libs/icu:= sys-apps/miscfiles[-minimal] virtual/pkgconfig
DESCRIPTION=Very fast anagram generator with dictionary lookup
EAPI=7
HOMEPAGE=https://packages.debian.org/unstable/games/an
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
+KEYWORDS=amd64 hppa ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/icu:= sys-apps/miscfiles[-minimal]
SLOT=0
SRC_URI=mirror://debian/pool/main/a/an/an_1.2.orig.tar.xz mirror://debian/pool/main/a/an/an_1.2-6.debian.tar.xz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=4d51fd669976e7e1e423ef7066c40281
+_md5_=f432983eccaf935d95f451f17694d38a
diff --git a/metadata/md5-cache/app-text/chasen-2.4.4-r3 b/metadata/md5-cache/app-text/chasen-2.4.4-r3
index dfb3d914e5ea..2ff4d737f66f 100644
--- a/metadata/md5-cache/app-text/chasen-2.4.4-r3
+++ b/metadata/md5-cache/app-text/chasen-2.4.4-r3
@@ -10,5 +10,5 @@ PDEPEND=>=app-dicts/ipadic-2.7.0
RDEPEND=>=dev-libs/darts-0.32 perl? ( !dev-perl/Text-ChaSen ) dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://sourceforge.jp/chasen-legacy/32224/chasen-2.4.4.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=d8be9bab283cacad5ea1f6195e0ab458
diff --git a/metadata/md5-cache/app-text/diction-1.14 b/metadata/md5-cache/app-text/diction-1.14
index 39a12454d3ec..2fd0dc8a89c9 100644
--- a/metadata/md5-cache/app-text/diction-1.14
+++ b/metadata/md5-cache/app-text/diction-1.14
@@ -3,8 +3,8 @@ DEPEND=sys-devel/gettext virtual/libintl
DESCRIPTION=Diction and style checkers for english and german texts
EAPI=7
HOMEPAGE=https://www.gnu.org/software/diction/diction.html
-KEYWORDS=amd64 ~hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
LICENSE=GPL-3
SLOT=0
SRC_URI=http://www.moria.de/~michael/diction/diction-1.14.tar.gz
-_md5_=bc092d0c09affa6427d403e119329e08
+_md5_=08b92319b453f5721344c85910f812bc
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5-r1 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5-r1
index 2b963d06dbe9..16b42447af6f 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5-r1
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5-r1
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41
DESCRIPTION=Docbook SGML DTD 4.5
EAPI=7
HOMEPAGE=https://docbook.org/sgml/
-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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
LICENSE=docbook
RDEPEND=>=app-text/sgml-common-0.6.3-r7
SLOT=4.5
SRC_URI=https://docbook.org/sgml/4.5/docbook-4.5.zip
_eclasses_=sgml-catalog-r1 e6ff98989cdecb4311b67afb96edb6f8
-_md5_=3d7bd4e530942b1c56680b644c6a3bcb
+_md5_=7f31065a2d46a666720c9cbb6d19678f
diff --git a/metadata/md5-cache/app-text/dvipng-1.17 b/metadata/md5-cache/app-text/dvipng-1.17
index 8b74d40e01c8..163b4fc24178 100644
--- a/metadata/md5-cache/app-text/dvipng-1.17
+++ b/metadata/md5-cache/app-text/dvipng-1.17
@@ -4,11 +4,11 @@ DESCRIPTION=Translate DVI files into PNG or GIF graphics
EAPI=7
HOMEPAGE=http://dvipng.sourceforge.net/
IUSE=truetype 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 ~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 ~x86-solaris
LICENSE=LGPL-3+ Texinfo-manual
RDEPEND=>=dev-libs/kpathsea-6.2.1:= media-libs/gd:2=[jpeg,png] media-libs/libpng:0= virtual/latex-base sys-libs/zlib truetype? ( >=media-libs/freetype-2.1.5 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/dvipng/dvipng-1.17.tar.gz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=bbc917d3db55f51867f58bff10eb4c8d
+_md5_=443695da8e8afa2e679124263e397b65
diff --git a/metadata/md5-cache/app-text/epspdf-0.6.3-r1 b/metadata/md5-cache/app-text/epspdf-0.6.3-r1
index a45b39301d33..52faf5aa0431 100644
--- a/metadata/md5-cache/app-text/epspdf-0.6.3-r1
+++ b/metadata/md5-cache/app-text/epspdf-0.6.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=GUI and command-line converter for [e]ps and pdf
EAPI=7
HOMEPAGE=http://tex.aanhet.net/epspdf/
IUSE=doc tk
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 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 ppc ppc64 ~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=!=dev-texlive/texlive-basic-2011 app-text/ghostscript-gpl tk? ( dev-lang/tk )
SLOT=0
SRC_URI=http://tex.aanhet.net/epspdf/epspdf.0.6.3.tgz
_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a texlive-common 0ed8c0ce6e8c9bb49ab84344ac802665
-_md5_=338d0f82b646d1d0838030ab48ebf076
+_md5_=9836eb775474d2765807f4696fb7310b
diff --git a/metadata/md5-cache/app-text/epstool-3.09 b/metadata/md5-cache/app-text/epstool-3.09
index 3e1d5a24a34c..33f3747d8e86 100644
--- a/metadata/md5-cache/app-text/epstool-3.09
+++ b/metadata/md5-cache/app-text/epstool-3.09
@@ -3,10 +3,10 @@ DEPEND=app-text/ghostscript-gpl
DESCRIPTION=Creates or extracts preview images in EPS files, fixes bounding boxes
EAPI=7
HOMEPAGE=http://www.ghostgum.com.au/software/epstool.htm
-KEYWORDS=amd64 arm arm64 hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=app-text/ghostscript-gpl
SLOT=0
SRC_URI=http://www.ghostgum.com.au/download/epstool-3.09.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=16ec2b55e2ce1a20fc593c376937f7e6
+_md5_=41be801efc36e44bf7c5d6070f19c4cc
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r4 b/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r4
index 09c596fa8fe4..200e716c2e90 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r4
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r4
@@ -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 unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
-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
+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=AGPL-3 CPL-1.0
RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/openjpeg-2.1.0:2= >=media-libs/tiff-4.0.1:0= >=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= ) 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/gs9533/ghostscript-9.53.3.tar.xz https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/ghostscript-gpl-9.53-patchset-01.tar.xz
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=ac6f847011695a2f282e97f2b015662e
+_md5_=b6f3671c8d042b0255f4046d1f965bf1
diff --git a/metadata/md5-cache/app-text/grutatxt-2.0.16-r1 b/metadata/md5-cache/app-text/grutatxt-2.0.16-r1
index 1535b1688c84..17257ded10b4 100644
--- a/metadata/md5-cache/app-text/grutatxt-2.0.16-r1
+++ b/metadata/md5-cache/app-text/grutatxt-2.0.16-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=https://www.triptico.com/download/Grutatxt-2.0.16.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=1cc592c4e3fd40f366c5e617a93d2150
diff --git a/metadata/md5-cache/app-text/gspell-1.6.1 b/metadata/md5-cache/app-text/gspell-1.8.4
similarity index 52%
rename from metadata/md5-cache/app-text/gspell-1.6.1
rename to metadata/md5-cache/app-text/gspell-1.8.4
index f16cbc3f48d3..9a4a98b76efe 100644
--- a/metadata/md5-cache/app-text/gspell-1.6.1
+++ b/metadata/md5-cache/app-text/gspell-1.8.4
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-text/iso-codes >=app-text/enchant-1.6.0:0/0 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) dev-libs/libxml2:2 dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.4 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-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEPEND=app-text/iso-codes >=app-text/enchant-2.1.3:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) dev-libs/libxml2:2 dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.6 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(+)] ) ) test? ( app-text/enchant:2[hunspell] || ( app-dicts/myspell-en[l10n_en(+)] app-dicts/myspell-en[l10n_en-US(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
DESCRIPTION=Spell check library for GTK+ applications
EAPI=6
HOMEPAGE=https://wiki.gnome.org/Projects/gspell
IUSE=+introspection +vala test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=LGPL-2.1+
-RDEPEND=app-text/iso-codes >=app-text/enchant-1.6.0:0/0 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+RDEPEND=app-text/iso-codes >=app-text/enchant-2.1.3:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
REQUIRED_USE=vala? ( introspection )
RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=mirror://gnome/sources/gspell/1.6/gspell-1.6.1.tar.xz
+SLOT=0/2
+SRC_URI=mirror://gnome/sources/gspell/1.8/gspell-1.8.4.tar.xz
_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 c156bb2ac81c822dd861424ce19bc168 gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vala 2cd99cd72bb91f3f190fa4ca576be580 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d virtualx 7e60d3b10c791ab996f717bc1f30072f wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=56b6193b0b72c00344bf0cda6479dfea
+_md5_=8883b97d71c5c2d74e345774c22e6cf1
diff --git a/metadata/md5-cache/app-text/highlight-3.57-r1 b/metadata/md5-cache/app-text/highlight-3.57-r1
index 818ad19e824a..1b03415315ba 100644
--- a/metadata/md5-cache/app-text/highlight-3.57-r1
+++ b/metadata/md5-cache/app-text/highlight-3.57-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Converts source code to formatted text (HTML, LaTeX, etc.) with synt
EAPI=7
HOMEPAGE=http://www.andre-simon.de/
IUSE=examples qt5
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-3
RDEPEND=|| ( dev-lang/lua:0 dev-lang/lua:5.3 dev-lang/lua:5.2 dev-lang/lua:5.1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
SLOT=0
SRC_URI=http://www.andre-simon.de/zip/highlight-3.57.tar.bz2
_eclasses_=estack d780995dc525ff7e6a2c4c043ffec242 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=2bee23b7b72f4de5c215f027d6bb9c41
+_md5_=3e6a97a7c513dea64fd1aa482d4b1391
diff --git a/metadata/md5-cache/app-text/htag-0.0.24-r1 b/metadata/md5-cache/app-text/htag-0.0.24-r1
index c2b65712489e..7026ce99fe03 100644
--- a/metadata/md5-cache/app-text/htag-0.0.24-r1
+++ b/metadata/md5-cache/app-text/htag-0.0.24-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=http://www.earth.li/projectpurple/files/htag-0.0.24.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=7ce376dbdb9966fdafe4638e04ff97e6
diff --git a/metadata/md5-cache/app-text/mandoc-1.14.5-r1 b/metadata/md5-cache/app-text/mandoc-1.14.5-r1
index dbe8fcf9d21c..39345b623fe4 100644
--- a/metadata/md5-cache/app-text/mandoc-1.14.5-r1
+++ b/metadata/md5-cache/app-text/mandoc-1.14.5-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Suite of tools compiling mdoc and man
EAPI=7
HOMEPAGE=https://mdocml.bsd.lv/
IUSE=cgi system-man
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
LICENSE=ISC
RDEPEND=sys-libs/zlib system-man? ( !sys-apps/man-db )
SLOT=0
SRC_URI=https://mdocml.bsd.lv/snapshots/mandoc-1.14.5.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=90b340e630dd8f8e1c73367b71c4fde9
+_md5_=d6d60d67dd80db77f0b03e48fa61e956
diff --git a/metadata/md5-cache/app-text/ocrad-0.26 b/metadata/md5-cache/app-text/ocrad-0.26
index 48b0c7812575..8ebf9d739cae 100644
--- a/metadata/md5-cache/app-text/ocrad-0.26
+++ b/metadata/md5-cache/app-text/ocrad-0.26
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://nongnu/ocrad/ocrad-0.26.tar.lz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b
_md5_=1c8c3738d05bd63acdb864a28441e795
diff --git a/metadata/md5-cache/app-text/ocrad-0.27 b/metadata/md5-cache/app-text/ocrad-0.27
index bb82f214515a..8d1e710fa381 100644
--- a/metadata/md5-cache/app-text/ocrad-0.27
+++ b/metadata/md5-cache/app-text/ocrad-0.27
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://nongnu/ocrad/ocrad-0.27.tar.lz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b
_md5_=9fb54145bc902f4b341957e667ea8503
diff --git a/metadata/md5-cache/app-text/pandoc-2.9.2.1 b/metadata/md5-cache/app-text/pandoc-2.9.2.1
index d00c2782e41e..4aebd5756d6c 100644
--- a/metadata/md5-cache/app-text/pandoc-2.9.2.1
+++ b/metadata/md5-cache/app-text/pandoc-2.9.2.1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.7:=[profile?] =dev-haskell/aeson-pretty-0.8.5:=[profile?] =dev-haskell/attoparsec-0.12:=[profile?] =dev-haskell/base-compat-0.9:=[profile?] >=dev-haskell/base-noprelude-4.9:=[profile?] =dev-haskell/base64-bytestring-0.1:=[profile?] =dev-haskell/blaze-html-0.9:=[profile?] =dev-haskell/blaze-markup-0.8:=[profile?] =dev-haskell/case-insensitive-1.2:=[profile?] =dev-haskell/cmark-gfm-0.2:=[profile?] =dev-haskell/data-default-0.4:=[profile?] =dev-haskell/doclayout-0.3:=[profile?] =dev-haskell/doctemplates-0.8:=[profile?] =dev-haskell/emojis-0.1:=[profile?] =dev-haskell/exceptions-0.8:=[profile?] =dev-haskell/glob-0.7:=[profile?] =dev-haskell/haddock-library-1.7:=[profile?] =dev-haskell/hslua-1.0.1:=[profile?] =dev-haskell/hslua-module-system-0.2:=[profile?] =dev-haskell/hslua-module-text-0.2:=[profile?] =dev-haskell/hsyaml-0.2:=[profile?] =dev-haskell/http-4000.0.5:=[profile?] =dev-haskell/http-client-0.4.30:=[profile?] =dev-haskell/http-client-tls-0.2.4:=[profile?] =dev-haskell/http-types-0.8:=[profile?] =dev-haskell/ipynb-0.1:=[profile?] =dev-haskell/jira-wiki-markup-1.1.3:=[profile?] =dev-haskell/juicypixels-3.1.6.1:=[profile?] =dev-haskell/mtl-2.2:=[profile?] =dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/pandoc-types-1.20:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-haskell/random-1:=[profile?] =dev-haskell/safe-0.3:=[profile?] =dev-haskell/scientific-0.3:=[profile?] =dev-haskell/sha-1.6:=[profile?] =dev-haskell/skylighting-0.8.3.2:=[profile?] =dev-haskell/skylighting-core-0.8.3.2:=[profile?] =dev-haskell/split-0.2:=[profile?] =dev-haskell/syb-0.1:=[profile?] =dev-haskell/tagsoup-0.14.6:=[profile?] =dev-haskell/temporary-1.1:=[profile?] =dev-haskell/texmath-0.12.0.1:=[profile?] =dev-haskell/text-1.1.1.0:=[profile?] =dev-haskell/text-conversions-0.3:=[profile?] =dev-haskell/unicode-transforms-0.3:=[profile?] =dev-haskell/unordered-containers-0.2:=[profile?] =dev-haskell/vector-0.10:=[profile?] =dev-haskell/xml-1.3.12:=[profile?] =dev-haskell/zip-archive-0.2.3.4:=[profile?] =dev-haskell/zlib-0.5:=[profile?] =dev-lang/ghc-8.0.1:= embed-data-files? ( >=dev-haskell/file-embed-0.0:=[profile?] =dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] ) >=dev-haskell/cabal-2.0 test? ( >=dev-haskell/diff-0.2 =dev-haskell/executable-path-0.0 =dev-haskell/quickcheck-2.4 =dev-haskell/tasty-0.11 =dev-haskell/tasty-golden-2.3 =dev-haskell/tasty-hunit-0.9 =dev-haskell/tasty-lua-0.2 =dev-haskell/tasty-quickcheck-0.8 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] =dev-haskell/aeson-pretty-0.8.5:=[profile?] =dev-haskell/attoparsec-0.12:=[profile?] =dev-haskell/base-compat-0.9:=[profile?] >=dev-haskell/base-noprelude-4.9:=[profile?] =dev-haskell/base64-bytestring-0.1:=[profile?] =dev-haskell/blaze-html-0.9:=[profile?] =dev-haskell/blaze-markup-0.8:=[profile?] =dev-haskell/case-insensitive-1.2:=[profile?] =dev-haskell/cmark-gfm-0.2:=[profile?] =dev-haskell/data-default-0.4:=[profile?] =dev-haskell/doclayout-0.3:=[profile?] =dev-haskell/doctemplates-0.8:=[profile?] =dev-haskell/emojis-0.1:=[profile?] =dev-haskell/exceptions-0.8:=[profile?] =dev-haskell/glob-0.7:=[profile?] =dev-haskell/haddock-library-1.7:=[profile?] =dev-haskell/hslua-1.0.1:=[profile?] =dev-haskell/hslua-module-system-0.2:=[profile?] =dev-haskell/hslua-module-text-0.2:=[profile?] =dev-haskell/hsyaml-0.2:=[profile?] =dev-haskell/http-4000.0.5:=[profile?] =dev-haskell/http-client-0.4.30:=[profile?] =dev-haskell/http-client-tls-0.2.4:=[profile?] =dev-haskell/http-types-0.8:=[profile?] =dev-haskell/ipynb-0.1:=[profile?] =dev-haskell/jira-wiki-markup-1.1.3:=[profile?] =dev-haskell/juicypixels-3.1.6.1:=[profile?] =dev-haskell/mtl-2.2:=[profile?] =dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/pandoc-types-1.20:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-haskell/random-1:=[profile?] =dev-haskell/safe-0.3:=[profile?] =dev-haskell/scientific-0.3:=[profile?] =dev-haskell/sha-1.6:=[profile?] =dev-haskell/skylighting-0.8.3.2:=[profile?] =dev-haskell/skylighting-core-0.8.3.2:=[profile?] =dev-haskell/split-0.2:=[profile?] =dev-haskell/syb-0.1:=[profile?] =dev-haskell/tagsoup-0.14.6:=[profile?] =dev-haskell/temporary-1.1:=[profile?] =dev-haskell/texmath-0.12.0.1:=[profile?] =dev-haskell/text-1.1.1.0:=[profile?] =dev-haskell/text-conversions-0.3:=[profile?] =dev-haskell/unicode-transforms-0.3:=[profile?] =dev-haskell/unordered-containers-0.2:=[profile?] =dev-haskell/vector-0.10:=[profile?] =dev-haskell/xml-1.3.12:=[profile?] =dev-haskell/zip-archive-0.2.3.4:=[profile?] =dev-haskell/zlib-0.5:=[profile?] =dev-lang/ghc-8.0.1:= embed-data-files? ( >=dev-haskell/file-embed-0.0:=[profile?] =dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] ) >=dev-haskell/cabal-2.0 test? ( >=dev-haskell/diff-0.2 =dev-haskell/executable-path-0.0 =dev-haskell/quickcheck-2.4 =dev-haskell/tasty-0.11 =dev-haskell/tasty-golden-2.3 =dev-haskell/tasty-hunit-0.9 =dev-haskell/tasty-lua-0.2 =dev-haskell/tasty-quickcheck-0.8 =dev-haskell/aeson-0.7:=[profile?]
RESTRICT=test
SLOT=0/2.9.2.1
SRC_URI=https://hackage.haskell.org/package/pandoc-2.9.2.1/pandoc-2.9.2.1.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal f2babbc5251b22d1c1811b67f7fb8ad1 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=bb5336639ac3e4582f53ebc476a3a883
diff --git a/metadata/md5-cache/app-text/rnv-1.7.11-r1 b/metadata/md5-cache/app-text/rnv-1.7.11-r1
index 4a10dba3c3a4..c1f0369e4d72 100644
--- a/metadata/md5-cache/app-text/rnv-1.7.11-r1
+++ b/metadata/md5-cache/app-text/rnv-1.7.11-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
RDEPEND=dev-libs/expat dev-scheme/scm[libscm]
SLOT=0
SRC_URI=mirror://sourceforge/rnv/rnv-1.7.11.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b
_md5_=7300efb2c06eb0abeecce9f659cad466
diff --git a/metadata/md5-cache/app-text/tree-1.8.0 b/metadata/md5-cache/app-text/tree-1.8.0
index f3cd482983eb..f80118422fb8 100644
--- a/metadata/md5-cache/app-text/tree-1.8.0
+++ b/metadata/md5-cache/app-text/tree-1.8.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Lists directories recursively, and produces an indented listing of files
EAPI=7
HOMEPAGE=http://mama.indstate.edu/users/ice/tree/
-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
LICENSE=GPL-2
SLOT=0
SRC_URI=ftp://mama.indstate.edu/linux/tree/tree-1.8.0.tgz
_eclasses_=bash-completion-r1 20058ccf29bb27d8da5ebf2fd48c60c2 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=ac7a0c19f529b7c5469f1a12f1be450f
+_md5_=9cb0c194669f090778d688e79df927b3
diff --git a/metadata/md5-cache/app-text/txt2man-1.7.1 b/metadata/md5-cache/app-text/txt2man-1.7.1
index 6bf235e15bca..27b0647d8bc2 100644
--- a/metadata/md5-cache/app-text/txt2man-1.7.1
+++ b/metadata/md5-cache/app-text/txt2man-1.7.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
DESCRIPTION=Scripts to convert regular ASCII text to man pages
EAPI=7
HOMEPAGE=https://github.com/mvertes/txt2man
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
LICENSE=GPL-2
RDEPEND=app-shells/bash sys-apps/gawk
SLOT=0
SRC_URI=https://github.com/mvertes/txt2man/archive/txt2man-1.7.1.tar.gz
-_md5_=9493107bc66ba9acadea8cd48d493bd1
+_md5_=675ff37ad3c597eb5fa53fdfff993ea4
diff --git a/metadata/md5-cache/app-text/txt2tags-3.3 b/metadata/md5-cache/app-text/txt2tags-3.3
deleted file mode 100644
index 214d913675d3..000000000000
--- a/metadata/md5-cache/app-text/txt2tags-3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=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(-)] >=dev-python/setuptools-42.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(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Generate marked up documents (HTML, etc.)from a plain text file with markup
-EAPI=7
-HOMEPAGE=https://txt2tags.org
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=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(-)] >=dev-python/setuptools-42.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(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/jendrikseipp/txt2tags/archive/3.3.tar.gz -> txt2tags-3.3.tar.gz
-_eclasses_=distutils-r1 6a128a9211d714bf9dfb5c0c9e72558e multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=ef825e4bf634c3b685f37b1beb243694
diff --git a/metadata/md5-cache/app-text/txt2tags-3.7 b/metadata/md5-cache/app-text/txt2tags-3.7
index b91923f84129..a465282dd950 100644
--- a/metadata/md5-cache/app-text/txt2tags-3.7
+++ b/metadata/md5-cache/app-text/txt2tags-3.7
@@ -4,11 +4,11 @@ DESCRIPTION=Generate marked up documents (HTML, etc.)from a plain text file with
EAPI=7
HOMEPAGE=https://txt2tags.org
IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
LICENSE=GPL-2
RDEPEND=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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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(-)] >=dev-python/setuptools-42.0.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://codeload.github.com/txt2tags/txt2tags/tar.gz/3.7 -> txt2tags-3.7.tar.gz
_eclasses_=distutils-r1 6a128a9211d714bf9dfb5c0c9e72558e multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8d03325e7e3cf3e1465d9c32031e2517 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=aba4d440a8cc2b911830c46a7370a541
+_md5_=959e74c879bdc60397af912ef62417c7
diff --git a/metadata/md5-cache/app-text/wdiff-1.2.2-r1 b/metadata/md5-cache/app-text/wdiff-1.2.2-r1
index 4bb04ff44284..7c9022e10837 100644
--- a/metadata/md5-cache/app-text/wdiff-1.2.2-r1
+++ b/metadata/md5-cache/app-text/wdiff-1.2.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Create a diff disregarding formatting
EAPI=6
HOMEPAGE=https://www.gnu.org/software/wdiff/
IUSE=experimental 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
+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
LICENSE=GPL-3
RDEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses:0=
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://gnu/wdiff/wdiff-1.2.2.tar.gz
-_md5_=efe69f5ad950f008162fa3f7e538272f
+_md5_=00d9946f2ee862b00625318fef05a6d1
diff --git a/metadata/md5-cache/app-text/zathura-djvu-0.2.8 b/metadata/md5-cache/app-text/zathura-djvu-0.2.8
deleted file mode 100644
index 24033ec4aa65..000000000000
--- a/metadata/md5-cache/app-text/zathura-djvu-0.2.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
-DESCRIPTION=DjVu plug-in for zathura
-EAPI=6
-HOMEPAGE=https://pwmt.org/projects/zathura-djvu/
-KEYWORDS=amd64 arm x86
-LICENSE=ZLIB
-RDEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
-SLOT=0
-SRC_URI=https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-0.2.8.tar.xz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa meson 71d293a701d6362387e1214da368c848 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=41cd223d1d1e6596a503773c2a7f6f91
diff --git a/metadata/md5-cache/app-text/zathura-djvu-0.2.9 b/metadata/md5-cache/app-text/zathura-djvu-0.2.9
index 733f4f6437cd..1133d67c97bc 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-0.2.9
+++ b/metadata/md5-cache/app-text/zathura-djvu-0.2.9
@@ -4,10 +4,10 @@ DEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x1
DESCRIPTION=DjVu plug-in for zathura
EAPI=7
HOMEPAGE=https://pwmt.org/projects/zathura-djvu/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 arm x86
LICENSE=ZLIB
RDEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
SLOT=0
SRC_URI=https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-0.2.9.tar.xz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e meson 71d293a701d6362387e1214da368c848 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=80cf3e716aa34bceb852ed1a1c150886
+_md5_=4cf3826bb7fb820981e92dd81a7d5372
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index cd1ccb736b14..c8ce9ab3d5e2 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0 b/metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0
index 214d027055ef..2bc26bcf7cb0 100644
--- a/metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0
+++ b/metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0
@@ -5,10 +5,10 @@ DESCRIPTION=Provides C++ support for the HOCON configuration file format
EAPI=7
HOMEPAGE=https://github.com/puppetlabs/cpp-hocon
IUSE=debug
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-libs/boost-1.54:=[nls] >=dev-libs/leatherman-0.9.3:=
SLOT=0/0.3.0
SRC_URI=https://github.com/puppetlabs/cpp-hocon/archive/0.3.0.tar.gz -> cpp-hocon-0.3.0.tar.gz
_eclasses_=cmake 6b7438831d544f2fe59a3d4ab4103f52 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=1287e1aaa27b9fce81fc60a18c47f4be
+_md5_=6215e42a096df4d0d7a2ab2a01147b5e
diff --git a/metadata/md5-cache/dev-cpp/libmcpp-2.7.2-r2 b/metadata/md5-cache/dev-cpp/libmcpp-2.7.2-r2
deleted file mode 100644
index 54eded35d60d..000000000000
--- a/metadata/md5-cache/dev-cpp/libmcpp-2.7.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=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=A portable C++ preprocessor
-EAPI=6
-HOMEPAGE=http://mcpp.sourceforge.net
-IUSE=static-libs
-KEYWORDS=amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://sourceforge/mcpp/mcpp-2.7.2.tar.gz
-_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=5d7dad56945da7faa190f7bda0cfbbd4
diff --git a/metadata/md5-cache/dev-cpp/libmcpp-2.7.2-r3 b/metadata/md5-cache/dev-cpp/libmcpp-2.7.2-r3
index c54447ebf9da..c977c394ab2d 100644
--- a/metadata/md5-cache/dev-cpp/libmcpp-2.7.2-r3
+++ b/metadata/md5-cache/dev-cpp/libmcpp-2.7.2-r3
@@ -4,9 +4,9 @@ DESCRIPTION=A portable C++ preprocessor
EAPI=6
HOMEPAGE=http://mcpp.sourceforge.net
IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~ia64 ~x86 ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos
LICENSE=BSD
SLOT=0
SRC_URI=mirror://sourceforge/mcpp/mcpp-2.7.2.tar.gz
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=173f5d65b0c34ee36861caa857d90c74
+_md5_=48f9e0fc76b02fd0119375519e88100f
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 8273e2eddca9..6bd8a16901ce 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/bucardo-5.4.1 b/metadata/md5-cache/dev-db/bucardo-5.4.1
index 3137c5c7a0b2..89fc00d7b879 100644
--- a/metadata/md5-cache/dev-db/bucardo-5.4.1
+++ b/metadata/md5-cache/dev-db/bucardo-5.4.1
@@ -9,5 +9,5 @@ RDEPEND=dev-perl/DBIx-Safe dev-lang/perl:=[-build(-)]
RESTRICT=test
SLOT=0
SRC_URI=http://bucardo.org/downloads/Bucardo-5.4.1.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=b73bab92ca8470a8b0dd6fd2aed6a446
diff --git a/metadata/md5-cache/dev-db/mtop-0.6.6-r3 b/metadata/md5-cache/dev-db/mtop-0.6.6-r3
index e916fababd46..eaab2ae6b815 100644
--- a/metadata/md5-cache/dev-db/mtop-0.6.6-r3
+++ b/metadata/md5-cache/dev-db/mtop-0.6.6-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=dev-perl/Curses dev-perl/DBI dev-perl/DBD-mysql virtual/perl-libnet dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://sourceforge/mtop/mtop-0.6.6.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=541b72bf1ad1eefceba3ac44369a4c62
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.22 b/metadata/md5-cache/dev-db/mysql-8.0.22
index 8970aeeeb95f..6c09dc0a8d7f 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.22
+++ b/metadata/md5-cache/dev-db/mysql-8.0.22
@@ -12,6 +12,6 @@ RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/z
REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa? ( server ) profiling? ( server ) router? ( server ) tcmalloc? ( server )
RESTRICT=!test? ( test ) libressl? ( test )
SLOT=8.0
-SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.22.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.22.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.22.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.22-patches-01.tar.xz
+SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.22.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.22.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.22.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.22-patches-02.tar.xz
_eclasses_=check-reqs 38804be59703af0fbf462b3710024074 cmake 6b7438831d544f2fe59a3d4ab4103f52 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=adea020b6ae445fdb5ccd272a05a1fc3
+_md5_=33bf592447b2b72414046a7e9a7f894f
diff --git a/metadata/md5-cache/dev-db/percona-server-5.7.27.30-r1 b/metadata/md5-cache/dev-db/percona-server-5.7.27.30-r1
deleted file mode 100644
index 13a2e3f584e1..000000000000
--- a/metadata/md5-cache/dev-db/percona-server-5.7.27.30-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
-DEPEND=net-misc/curl:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= client-libs? ( >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=sys-libs/zlib-1.2.3:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) server? ( >=app-arch/lz4-0_p131:= cjk? ( app-text/mecab:= ) experimental? ( dev-libs/libevent:= dev-libs/protobuf:= net-libs/libtirpc:= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) rocksdb? ( app-arch/zstd:= dev-libs/protobuf:= ) tokudb? ( app-arch/snappy:= app-arch/xz-utils:= ) tokudb-backup-plugin? ( dev-util/valgrind ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) !yassl? ( client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) ) !client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) dev-libs/protobuf virtual/yacc server? ( dev-libs/libevent experimental? ( net-libs/rpcsvc-proto ) ) static? ( sys-libs/ncurses[static-libs] ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON || ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/mysqlclient[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/mysql-python[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
-EAPI=6
-HOMEPAGE=https://www.percona.com/software/mysql-database/percona-server
-IUSE=cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa pam +perl profiling rocksdb selinux +server static static-libs systemtap tcmalloc test tokudb tokudb-backup-plugin yassl kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
-RDEPEND=net-misc/curl:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= client-libs? ( >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=sys-libs/zlib-1.2.3:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) server? ( >=app-arch/lz4-0_p131:= cjk? ( app-text/mecab:= ) experimental? ( dev-libs/libevent:= dev-libs/protobuf:= net-libs/libtirpc:= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) rocksdb? ( app-arch/zstd:= dev-libs/protobuf:= ) tokudb? ( app-arch/snappy:= app-arch/xz-utils:= ) tokudb-backup-plugin? ( dev-util/valgrind ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) !yassl? ( client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) ) !client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster !dev-db/percona-server:0 !dev-db/percona-server:8.0 client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= ) selinux? ( sec-policy/selinux-mysql ) server? ( !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts ) )
-REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
-RESTRICT=!test? ( test ) libressl? ( test )
-SLOT=5.7/18
-SRC_URI=https://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-5.7.27-30/source/tarball/percona-server-5.7.27-30.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2
-_eclasses_=cmake-utils 77cd39e6009811bf97a59d91ffd5b54f desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e linux-info c90a203b1c14cfa77bd3e37a0e96c955 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 54a3178500786b0a7ede4a23b7f2a6ad python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=e26268f57cae4961730bd9053a6bebc5
diff --git a/metadata/md5-cache/dev-db/percona-server-8.0.19.10-r1 b/metadata/md5-cache/dev-db/percona-server-8.0.19.10-r1
deleted file mode 100644
index 14fa23f94e9e..000000000000
--- a/metadata/md5-cache/dev-db/percona-server-8.0.19.10-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile config configure install postinst prepare pretend setup test unpack
-DEPEND=>=app-arch/lz4-0_p131:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( dev-libs/icu:= dev-libs/libevent:= >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/yacc server? ( net-libs/rpcsvc-proto ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON )
-DESCRIPTION=Fully compatible, enhanced and open source drop-in replacement for MySQL
-EAPI=7
-HOMEPAGE=https://www.percona.com/software/mysql-database/percona-server https://github.com/percona/percona-server
-IUSE=cjk cracklib debug jemalloc latin1 libressl numa pam +perl profiling rocksdb router selinux +server tcmalloc test tokudb tokudb-backup-plugin kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
-RDEPEND=>=app-arch/lz4-0_p131:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( dev-libs/icu:= dev-libs/libevent:= >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster !dev-db/percona-server:0 !dev-db/percona-server:5.7 selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
-REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa? ( server ) profiling? ( server ) router? ( server ) tcmalloc? ( server )
-RESTRICT=!test? ( test ) libressl? ( test )
-SLOT=8.0
-SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.19-10/source/tarball/percona-server-8.0.19-10.tar.gz https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.19.10-patches-01.tar.xz
-_eclasses_=check-reqs 38804be59703af0fbf462b3710024074 cmake-utils 77cd39e6009811bf97a59d91ffd5b54f edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=1267f684ca3edd75d320ed5d4b7c0a7c
diff --git a/metadata/md5-cache/dev-db/percona-server-8.0.21.12 b/metadata/md5-cache/dev-db/percona-server-8.0.21.12
index 63c287e6db28..e610bd199bbd 100644
--- a/metadata/md5-cache/dev-db/percona-server-8.0.21.12
+++ b/metadata/md5-cache/dev-db/percona-server-8.0.21.12
@@ -12,6 +12,6 @@ RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/z
REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa? ( server ) profiling? ( server ) router? ( server ) tcmalloc? ( server )
RESTRICT=!test? ( test ) libressl? ( test )
SLOT=8.0
-SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.21-12/source/tarball/percona-server-8.0.21-12.tar.gz https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.21.12-patches-01.tar.xz
+SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.21-12/source/tarball/percona-server-8.0.21-12.tar.gz https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.21.12-patches-02.tar.xz
_eclasses_=check-reqs 38804be59703af0fbf462b3710024074 cmake 6b7438831d544f2fe59a3d4ab4103f52 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=f6463232be8914a3f51afa28375fcbf0
+_md5_=94090fbf49bed11d7aef68f5f88d25e2
diff --git a/metadata/md5-cache/dev-db/percona-server-8.0.20.11-r2 b/metadata/md5-cache/dev-db/percona-server-8.0.22.13
similarity index 58%
rename from metadata/md5-cache/dev-db/percona-server-8.0.20.11-r2
rename to metadata/md5-cache/dev-db/percona-server-8.0.22.13
index 0dc1e15b810f..0629f730c3ee 100644
--- a/metadata/md5-cache/dev-db/percona-server-8.0.20.11-r2
+++ b/metadata/md5-cache/dev-db/percona-server-8.0.22.13
@@ -1,6 +1,6 @@
BDEPEND=sys-devel/make dev-util/cmake
DEFINED_PHASES=compile config configure install postinst prepare pretend setup test unpack
-DEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( dev-libs/icu:= dev-libs/libevent:= >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) ldap? ( dev-libs/cyrus-sasl net-nds/openldap ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/yacc server? ( net-libs/rpcsvc-proto ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON )
+DEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) ldap? ( dev-libs/cyrus-sasl net-nds/openldap ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/yacc server? ( net-libs/rpcsvc-proto ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON )
DESCRIPTION=Fully compatible, enhanced and open source drop-in replacement for MySQL
EAPI=7
HOMEPAGE=https://www.percona.com/software/mysql-database/percona-server https://github.com/percona/percona-server
@@ -8,10 +8,10 @@ IUSE=cjk cracklib debug jemalloc latin1 ldap libressl numa pam +perl profiling r
KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=GPL-2
PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
-RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( dev-libs/icu:= dev-libs/libevent:= >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) ldap? ( dev-libs/cyrus-sasl net-nds/openldap ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster !dev-db/percona-server:0 !dev-db/percona-server:5.7 selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
+RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) ldap? ( dev-libs/cyrus-sasl net-nds/openldap ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster !dev-db/percona-server:0 !dev-db/percona-server:5.7 selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa? ( server ) profiling? ( server ) router? ( server ) tcmalloc? ( server )
RESTRICT=!test? ( test ) libressl? ( test )
SLOT=8.0
-SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.20-11/source/tarball/percona-server-8.0.20-11.tar.gz https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.20.11-patches-02.tar.xz
+SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.22-13/source/tarball/percona-server-8.0.22-13.tar.gz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.22.13-patches-01.tar.xz
_eclasses_=check-reqs 38804be59703af0fbf462b3710024074 cmake 6b7438831d544f2fe59a3d4ab4103f52 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=8866aa28bb0f1f034087b5877f02b356
+_md5_=35c9ba852eed3578602afc0a3fc43f47
diff --git a/metadata/md5-cache/dev-db/pgadmin4-4.29 b/metadata/md5-cache/dev-db/pgadmin4-4.29
new file mode 100644
index 000000000000..e22d4670fa80
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgadmin4-4.29
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install 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] ) dev-libs/libsodium[-minimal] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 doc? ( python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) ) virtual/imagemagick-tools[png] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GUI administration and development platform for PostgreSQL
+EAPI=7
+HOMEPAGE=https://www.pgadmin.org/
+IUSE=doc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=POSTGRESQL
+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] ) dev-libs/libsodium[-minimal] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 python_single_target_python3_6? ( >=dev-python/blinker-1.4[python_targets_python3_6(-)] >=dev-python/flask-1.0.2[python_targets_python3_6(-)] >=dev-python/flask-compress-1.4.0[python_targets_python3_6(-)] >=dev-python/flask-gravatar-0.5.0[python_targets_python3_6(-)] >=dev-python/flask-login-0.4.1[python_targets_python3_6(-)] >=dev-python/flask-mail-0.9.1[python_targets_python3_6(-)] >=dev-python/flask-migrate-2.4.0[python_targets_python3_6(-)] >=dev-python/flask-paranoid-0.2.0[python_targets_python3_6(-)] >=dev-python/flask-principal-0.4.0[python_targets_python3_6(-)] >=dev-python/flask-security-3.0.0[python_targets_python3_6(-)] >=dev-python/flask-sqlalchemy-2.4.1[python_targets_python3_6(-)] >=dev-python/flask-wtf-0.14.3[python_targets_python3_6(-)] >=dev-python/ldap3-2.5.1[python_targets_python3_6(-)] >=dev-python/passlib-1.7.2[python_targets_python3_6(-)] >=dev-python/psutil-5.7.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_6(-)] >=dev-python/pytz-2020.1[python_targets_python3_6(-)] >=dev-python/simplejson-3.16.0[python_targets_python3_6(-)] >=dev-python/six-1.12.0[python_targets_python3_6(-)] >=dev-python/speaklater-1.3[python_targets_python3_6(-)] >=dev-python/sqlalchemy-1.3.13[python_targets_python3_6(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_6(-)] >=dev-python/sshtunnel-0.1.5[python_targets_python3_6(-)] >=dev-python/werkzeug-0.15.0[python_targets_python3_6(-)] >=dev-python/wtforms-2.2.1[python_targets_python3_6(-)] dev-python/bcrypt[python_targets_python3_6(-)] dev-python/cryptography[python_targets_python3_6(-)] dev-python/python-email-validator[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/blinker-1.4[python_targets_python3_7(-)] >=dev-python/flask-1.0.2[python_targets_python3_7(-)] >=dev-python/flask-compress-1.4.0[python_targets_python3_7(-)] >=dev-python/flask-gravatar-0.5.0[python_targets_python3_7(-)] >=dev-python/flask-login-0.4.1[python_targets_python3_7(-)] >=dev-python/flask-mail-0.9.1[python_targets_python3_7(-)] >=dev-python/flask-migrate-2.4.0[python_targets_python3_7(-)] >=dev-python/flask-paranoid-0.2.0[python_targets_python3_7(-)] >=dev-python/flask-principal-0.4.0[python_targets_python3_7(-)] >=dev-python/flask-security-3.0.0[python_targets_python3_7(-)] >=dev-python/flask-sqlalchemy-2.4.1[python_targets_python3_7(-)] >=dev-python/flask-wtf-0.14.3[python_targets_python3_7(-)] >=dev-python/ldap3-2.5.1[python_targets_python3_7(-)] >=dev-python/passlib-1.7.2[python_targets_python3_7(-)] >=dev-python/psutil-5.7.0[python_targets_python3_7(-)] >=dev-python/psycopg-2.8[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_7(-)] >=dev-python/pytz-2020.1[python_targets_python3_7(-)] >=dev-python/simplejson-3.16.0[python_targets_python3_7(-)] >=dev-python/six-1.12.0[python_targets_python3_7(-)] >=dev-python/speaklater-1.3[python_targets_python3_7(-)] >=dev-python/sqlalchemy-1.3.13[python_targets_python3_7(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_7(-)] >=dev-python/sshtunnel-0.1.5[python_targets_python3_7(-)] >=dev-python/werkzeug-0.15.0[python_targets_python3_7(-)] >=dev-python/wtforms-2.2.1[python_targets_python3_7(-)] dev-python/bcrypt[python_targets_python3_7(-)] dev-python/cryptography[python_targets_python3_7(-)] dev-python/python-email-validator[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/blinker-1.4[python_targets_python3_8(-)] >=dev-python/flask-1.0.2[python_targets_python3_8(-)] >=dev-python/flask-compress-1.4.0[python_targets_python3_8(-)] >=dev-python/flask-gravatar-0.5.0[python_targets_python3_8(-)] >=dev-python/flask-login-0.4.1[python_targets_python3_8(-)] >=dev-python/flask-mail-0.9.1[python_targets_python3_8(-)] >=dev-python/flask-migrate-2.4.0[python_targets_python3_8(-)] >=dev-python/flask-paranoid-0.2.0[python_targets_python3_8(-)] >=dev-python/flask-principal-0.4.0[python_targets_python3_8(-)] >=dev-python/flask-security-3.0.0[python_targets_python3_8(-)] >=dev-python/flask-sqlalchemy-2.4.1[python_targets_python3_8(-)] >=dev-python/flask-wtf-0.14.3[python_targets_python3_8(-)] >=dev-python/ldap3-2.5.1[python_targets_python3_8(-)] >=dev-python/passlib-1.7.2[python_targets_python3_8(-)] >=dev-python/psutil-5.7.0[python_targets_python3_8(-)] >=dev-python/psycopg-2.8[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_8(-)] >=dev-python/pytz-2020.1[python_targets_python3_8(-)] >=dev-python/simplejson-3.16.0[python_targets_python3_8(-)] >=dev-python/six-1.12.0[python_targets_python3_8(-)] >=dev-python/speaklater-1.3[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.13[python_targets_python3_8(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_8(-)] >=dev-python/sshtunnel-0.1.5[python_targets_python3_8(-)] >=dev-python/werkzeug-0.15.0[python_targets_python3_8(-)] >=dev-python/wtforms-2.2.1[python_targets_python3_8(-)] dev-python/bcrypt[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] dev-python/python-email-validator[python_targets_python3_8(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v4.29/source/pgadmin4-4.29.tar.gz
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a estack d780995dc525ff7e6a2c4c043ffec242 multilib d410501a125f99ffb560b0c523cd3d1e python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=df16d9dd6d9ebd59281b998e09c7e864
diff --git a/metadata/md5-cache/dev-db/pgrouting-3.1.2 b/metadata/md5-cache/dev-db/pgrouting-3.1.2
new file mode 100644
index 000000000000..14b547146d72
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgrouting-3.1.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install 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-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
+DESCRIPTION=pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality.
+EAPI=7
+HOMEPAGE=https://pgrouting.org/
+IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 MIT Boost-1.0
+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-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/pgRouting/pgrouting/archive/v3.1.2.tar.gz -> pgrouting-3.1.2.tar.gz
+_eclasses_=cmake 6b7438831d544f2fe59a3d4ab4103f52 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 flag-o-matic fb54c9a3302f35aeae1c84f363e776f7 l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f postgres 2a85ebea21ca1da22ccc419fe84a8788 postgres-multi 563baf0dc59ded7d888047ea17689f21 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=142f24f30d6f01091687143a52b9df88
diff --git a/metadata/md5-cache/dev-db/postgis-3.0.3 b/metadata/md5-cache/dev-db/postgis-3.0.3-r1
similarity index 98%
rename from metadata/md5-cache/dev-db/postgis-3.0.3
rename to metadata/md5-cache/dev-db/postgis-3.0.3-r1
index 65b2dd544db2..4fba4ad998aa 100644
--- a/metadata/md5-cache/dev-db/postgis-3.0.3
+++ b/metadata/md5-cache/dev-db/postgis-3.0.3-r1
@@ -13,4 +13,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://download.osgeo.org/postgis/source/postgis-3.0.3.tar.gz
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a libtool f143db5a74ccd9ca28c1234deffede96 multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e postgres 2a85ebea21ca1da22ccc419fe84a8788 postgres-multi 563baf0dc59ded7d888047ea17689f21 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=848ab87ed98c847c82c0859715e6d8fc
+_md5_=aad72e76203ac4e96bf458553e4ab549
diff --git a/metadata/md5-cache/dev-db/postgis-3.1.0_alpha3 b/metadata/md5-cache/dev-db/postgis-3.1.0_alpha3-r1
similarity index 98%
rename from metadata/md5-cache/dev-db/postgis-3.1.0_alpha3
rename to metadata/md5-cache/dev-db/postgis-3.1.0_alpha3-r1
index 638eb896179f..59bd05ac09ce 100644
--- a/metadata/md5-cache/dev-db/postgis-3.1.0_alpha3
+++ b/metadata/md5-cache/dev-db/postgis-3.1.0_alpha3-r1
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://download.osgeo.org/postgis/source/postgis-3.1.0alpha3.tar.gz
_eclasses_=autotools b8cf7d8850baf5b731738e6d4f00937a libtool f143db5a74ccd9ca28c1234deffede96 multibuild b2c915190b051f55a23b9354b9849847 multilib d410501a125f99ffb560b0c523cd3d1e postgres 2a85ebea21ca1da22ccc419fe84a8788 postgres-multi 563baf0dc59ded7d888047ea17689f21 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=cafebda1e4a8c52054154ae9124e9c5e
+_md5_=75bd3d44e84186969beb3c39469c9cc7
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index eb4e0e913092..5e74dfdbfd73 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/goatee-0.3.1.2 b/metadata/md5-cache/dev-games/goatee-0.3.1.2
index c62cd136724a..e8b46d48a1b4 100644
--- a/metadata/md5-cache/dev-games/goatee-0.3.1.2
+++ b/metadata/md5-cache/dev-games/goatee-0.3.1.2
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/mtl-2.1:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/mtl-2.1:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 =dev-haskell/mtl-2.1:=[profile?] =dev
RESTRICT=!test? ( test )
SLOT=0/0.3.1.2
SRC_URI=https://hackage.haskell.org/package/goatee-0.3.1.2/goatee-0.3.1.2.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal f2babbc5251b22d1c1811b67f7fb8ad1 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=c33743bf7c2475ce7e6184d4e1715ad2
diff --git a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2 b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2
index 4a92335cc03d..a24b4f95fdf7 100644
--- a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2
+++ b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2
@@ -8,5 +8,5 @@ RDEPEND=games-misc/games-envd
RESTRICT=bindist mirror strip
SLOT=0
SRC_URI=mirror://idsoftware/quake4/source/linux/quake4-linux-1.4.2-sdk.x86.run
-_eclasses_=base c1ada9d5e2476b8888dea6fa878beaaf desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 games 9d243da279b8a6f86a76eab575bf69ab l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4 user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=base c1ada9d5e2476b8888dea6fa878beaaf desktop 8f9bfcc33705104f56748d9dedb3177a edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 games 9d243da279b8a6f86a76eab575bf69ab l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=98dc43073c2dc5815dc8ec70839cb33c
diff --git a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1 b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
index cfbd5730b4e6..a2a0e6f21d5b 100644
--- a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
+++ b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
@@ -7,5 +7,5 @@ LICENSE=QUAKE4
RESTRICT=bindist mirror strip
SLOT=0
SRC_URI=mirror://idsoftware/quake4/source/linux/quake4-linux-1.4.2-sdk.x86.run
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb unpacker 45b49db67094fdafbb6a16a2299e894b
_md5_=7fd8522f27dd4318b7e77c6307b71c21
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index b4535699bfe8..ae7e07bc932d 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/abstract-deque-0.3 b/metadata/md5-cache/dev-haskell/abstract-deque-0.3
index cc074d999694..47373e3b8704 100644
--- a/metadata/md5-cache/dev-haskell/abstract-deque-0.3
+++ b/metadata/md5-cache/dev-haskell/abstract-deque-0.3
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= usecas? ( >=dev-haskell/atomic-primops-0.5.0.2:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= usecas? ( >=dev-haskell/atomic-primops-0.5.0.2:=[profile?] ) >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Abstract, parameterized interface to mutable Deques
EAPI=7
HOMEPAGE=https://github.com/rrnewton/haskell-lockfree/wiki
@@ -9,5 +9,5 @@ LICENSE=BSD
RDEPEND=dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= usecas? ( >=dev-haskell/atomic-primops-0.5.0.2:=[profile?] )
SLOT=0/0.3
SRC_URI=https://hackage.haskell.org/package/abstract-deque-0.3/abstract-deque-0.3.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal f2babbc5251b22d1c1811b67f7fb8ad1 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=83df5b2508b46c057e3e10d52b954362
diff --git a/metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3 b/metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3
index 06f3c69dfca9..6b699a3c695a 100644
--- a/metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3
+++ b/metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/abstract-deque-0.3:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/test-framework-0.6:=[profile?] >=dev-haskell/test-framework-hunit-0.2.7:=[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 )
+DEPEND=>=dev-haskell/abstract-deque-0.3:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/test-framework-0.6:=[profile?] >=dev-haskell/test-framework-hunit-0.2.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
DESCRIPTION=A test-suite for any queue or double-ended queue satisfying an interface
EAPI=7
HOMEPAGE=https://github.com/rrnewton/haskell-lockfree/wiki
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/abstract-deque-0.3:=[profile?] dev-haskell/hunit:=[profile
RESTRICT=!test? ( test )
SLOT=0/0.3
SRC_URI=https://hackage.haskell.org/package/abstract-deque-tests-0.3/abstract-deque-tests-0.3.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal f2babbc5251b22d1c1811b67f7fb8ad1 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=31a2ca0eeb42e954085e5b0005f98476
diff --git a/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1 b/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1
index 054f9b764598..d865119741b4 100644
--- a/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1
+++ b/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1
@@ -1,5 +1,5 @@
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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Type classes generalizing the functionality of the 'monad-par' library
EAPI=7
HOMEPAGE=https://github.com/simonmar/monad-par
@@ -9,5 +9,5 @@ LICENSE=BSD
RDEPEND=>=dev-lang/ghc-7.4.1:=
SLOT=0/0.3.3
SRC_URI=https://hackage.haskell.org/package/abstract-par-0.3.3/abstract-par-0.3.3.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal f2babbc5251b22d1c1811b67f7fb8ad1 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=65daf1de9f320e79c539e13876da75cd
diff --git a/metadata/md5-cache/dev-haskell/ac-ppm-1.1.1 b/metadata/md5-cache/dev-haskell/ac-ppm-1.1.1
index 2b2a138dc897..ef9ff609a2f8 100644
--- a/metadata/md5-cache/dev-haskell/ac-ppm-1.1.1
+++ b/metadata/md5-cache/dev-haskell/ac-ppm-1.1.1
@@ -1,5 +1,5 @@
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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Trivial package for writing PPM images
EAPI=6
HOMEPAGE=https://hackage.haskell.org/package/AC-PPM
@@ -9,5 +9,5 @@ LICENSE=BSD
RDEPEND=>=dev-lang/ghc-7.4.1:=
SLOT=0/1.1.1
SRC_URI=https://hackage.haskell.org/package/AC-PPM-1.1.1/AC-PPM-1.1.1.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal f2babbc5251b22d1c1811b67f7fb8ad1 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=22691d32fdef3a5394fa1b941d4a7c6f
diff --git a/metadata/md5-cache/dev-haskell/adjunctions-4.4 b/metadata/md5-cache/dev-haskell/adjunctions-4.4
index ac9413be8f0b..c2a7d55e821a 100644
--- a/metadata/md5-cache/dev-haskell/adjunctions-4.4
+++ b/metadata/md5-cache/dev-haskell/adjunctions-4.4
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/comonad-4:=[profile?] =dev-haskell/contravariant-1:=[profile?] =dev-haskell/distributive-0.5.1:=[profile?] =dev-haskell/free-4:=[profile?] =dev-haskell/mtl-2.0.1:=[profile?] =dev-haskell/profunctors-4:=[profile?] =dev-haskell/semigroupoids-4:=[profile?] =dev-haskell/semigroups-0.11:=[profile?] =dev-haskell/tagged-0.7:=[profile?] =dev-haskell/transformers-compat-0.3:=[profile?] =dev-haskell/void-0.5.5.1:=[profile?] =dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/generic-deriving-1.11 =dev-haskell/hspec-2 =dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/comonad-4:=[profile?] =dev-haskell/contravariant-1:=[profile?] =dev-haskell/distributive-0.5.1:=[profile?] =dev-haskell/free-4:=[profile?] =dev-haskell/mtl-2.0.1:=[profile?] =dev-haskell/profunctors-4:=[profile?] =dev-haskell/semigroupoids-4:=[profile?] =dev-haskell/semigroups-0.11:=[profile?] =dev-haskell/tagged-0.7:=[profile?] =dev-haskell/transformers-compat-0.3:=[profile?] =dev-haskell/void-0.5.5.1:=[profile?] =dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/generic-deriving-1.11 =dev-haskell/hspec-2 =dev-haskell/comonad-4:=[profile?]
RESTRICT=!test? ( test )
SLOT=0/4.4
SRC_URI=https://hackage.haskell.org/package/adjunctions-4.4/adjunctions-4.4.tar.gz
-_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop 8f9bfcc33705104f56748d9dedb3177a eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 0a83d4ccf28a70ddf61e7073c96e515a estack d780995dc525ff7e6a2c4c043ffec242 eutils 69bd92aa099f708425db9f1f01d61213 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal f2babbc5251b22d1c1811b67f7fb8ad1 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=df8dae79fdb38b2ace61255ff7293263
diff --git a/metadata/md5-cache/dev-haskell/aeson-1.4.7.1 b/metadata/md5-cache/dev-haskell/aeson-1.4.7.1
index 4af9f0f99697..2026c4c76997 100644
--- a/metadata/md5-cache/dev-haskell/aeson-1.4.7.1
+++ b/metadata/md5-cache/dev-haskell/aeson-1.4.7.1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/attoparsec-0.13.2.2:=[profile?] =dev-haskell/base-compat-batteries-0.10.0:=[profile?] =dev-haskell/contravariant-1.4.1:=[profile?] =dev-haskell/dlist-0.8.0.4:=[profile?] =dev-haskell/fail-4.9:=[profile?] =dev-haskell/hashable-1.2.7.0:=[profile?] =dev-haskell/nats-1.1.1:=[profile?] =dev-haskell/primitive-0.6.3.0:=[profile?] =dev-haskell/scientific-0.3.6.2:=[profile?] =dev-haskell/semigroups-0.18.5:=[profile?] =dev-haskell/tagged-0.8.5:=[profile?] =dev-haskell/text-1.2.3.0:=[profile?] =dev-haskell/th-abstraction-0.2.8.0:=[profile?] =dev-haskell/time-compat-1.9.2.2:=[profile?] =dev-haskell/transformers-compat-0.6.2:=[profile?] =dev-haskell/unordered-containers-0.2.8.0:=[profile?] =dev-haskell/uuid-types-1.0.3:=[profile?]